Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
55a2888
chore: updated configs
smarcet Nov 14, 2024
56560a7
chore: updated build deps
smarcet Nov 14, 2024
dd30372
fix: link setting on react router for video app
smarcet Nov 15, 2024
d828107
fix: python env
smarcet Nov 15, 2024
3214c43
fix: update google maps custom marker generation strategy
smarcet Feb 18, 2025
0cc9bcc
add bio prop and editor in admin (#382)
santipalenque Feb 18, 2025
3100dc4
fix: add mastodont social metwork icon
smarcet Feb 24, 2025
f6ad59a
fix: remove links to ss assets cache and replace those by CDN ones
smarcet Feb 27, 2025
620f23e
Elections
smarcet Oct 13, 2023
75da485
fix: update election email spec logic
smarcet Mar 4, 2025
4135e68
fix: logos replacement and css tweak (#383)
romanetar Mar 5, 2025
5a046a5
chore: remove hardcode css to hide site banner
smarcet Mar 12, 2025
ede9324
fix: add to CMS marketplace admin ConsultantServiceOfferedType entity
smarcet Mar 20, 2025
3376e8b
openstack map for epoxy 2
iamweswilson Mar 28, 2025
8cb1b17
fix: add error management to revocation process
smarcet Apr 3, 2025
5c9549d
chore: update site banner
smarcet Apr 17, 2025
9730b6b
change autocomplete min char limit (#386)
santipalenque Apr 23, 2025
b3d5a28
chore: increase mascots cache life time
smarcet Apr 24, 2025
7d651f5
fix: create MascotsDataIngestionTask CRON JOB
smarcet Apr 24, 2025
0968ab9
chore: update cannonical logo
smarcet May 22, 2025
142139c
fix: add default values for sort/sort direction if user provides inva…
smarcet Jun 3, 2025
db881aa
fix: paging offset calculation (#389)
romanetar Jun 3, 2025
3db4f3a
fix: Column 'Level' in where clause is ambiguous (#388)
romanetar Jun 3, 2025
5abc659
fix: typo
smarcet Jun 3, 2025
900b73f
fix: Ensure consistent font sizing across lists and nested lists (#387)
romanetar Jun 5, 2025
0ff28dc
fix: update text on site banner template (#390)
tomrndom Jun 17, 2025
3c786b9
chore: css fix
smarcet Jun 17, 2025
0cb8e0d
Feature/individual membership (#391)
smarcet Jul 8, 2025
9753b70
feat: add MembershipType as searcheable field
smarcet Jul 8, 2025
fe3486c
chore: change user survey deadline at landing page
smarcet Jul 9, 2025
7f8da41
Merge branch 'production' into production_rc
smarcet Jul 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@ software/css
speaker_bureau/css
registration/css
/summit-trackchair-app/css/
/.env
.env
docker-compose/*
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@
"urijs": "^1.18.10",
"webpack-dashboard": "^2.0.0",
"webui-popover": "^1.2.18",
"xhr2": "^0.1.3"
"xhr2": "^0.1.3",
"dropzone": "5.7.2",
"react-rte": "^0.16.3",
"video.js": "^7.8.2"
},
"license": "Apache-2.0",
"devDependencies": {
Expand Down
23 changes: 16 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
MySQL-python==1.2.5
nltk==3.2.4
pandas==0.20.2
python-dateutil==2.6.0
scikit-learn==0.18.2
scipy==0.19.1
sklearn==0.0
click==8.1.7
joblib==1.4.2
mysqlclient==2.2.6
nltk==3.9.1
numpy==2.1.3
pandas==2.2.3
python-dateutil==2.9.0.post0
pytz==2024.2
regex==2024.11.6
scikit-learn==1.5.2
scipy==1.14.1
setuptools==75.5.0
six==1.16.0
threadpoolctl==3.5.0
tqdm==4.67.0
tzdata==2024.2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { connect } from 'react-redux';
import { fetchAll, fetchReleases, ingestContributors, exportContributors } from './actions';
import { Pagination } from 'react-bootstrap';
import { AjaxLoader, Table, Dropdown } from 'openstack-uicore-foundation/lib/components';
import 'react-select/dist/react-select.css';
import Select from 'react-select';

class SangriaContributorsAdminApp extends React.Component
Expand Down
11 changes: 9 additions & 2 deletions scripts/setup_python_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,18 @@
ROOT_DIR=$PWD;

echo "installing python virtual env...";

if [[ -f "$ROOT_DIR/requirements.txt" ]]; then
echo "found requirements.txt files";
# install virtual env
cd $ROOT_DIR && virtualenv env;
source $ROOT_DIR/env/bin/activate;

echo "creating py venv"
python3 -m venv env
source $ROOT_DIR/env/bin/activate;

cd $ROOT_DIR && pip install --upgrade pip
cd $ROOT_DIR && pip install --upgrade setuptools

# install dependencies
$ROOT_DIR/env/bin/python env/bin/pip install -r requirements.txt;

Expand Down
2 changes: 1 addition & 1 deletion summit-video-app/code/SummitVideoApp.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public function __construct($dataRecord = null)
public function getJSONConfig()
{
$config = [
'baseURL' => rtrim($this->Link(), '/'),
'baseURL' => rtrim($this->RelativeLink(), '/'),
'initialState' => $this->getInitialState(),
'pollInterval' => SummitVideoApp::config()->video_poll_interval,
'securityToken' => SecurityToken::inst()->getValue()
Expand Down
2 changes: 0 additions & 2 deletions summit-video-app/ui/source/js/routes.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from 'react';
import { Router, Route, browserHistory, IndexRoute, Redirect } from 'react-router';
import URL from './utils/url';

import App from './components/pages/App';
import AllVideos from './components/pages/AllVideos';
import Summits from './components/pages/Summits';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
**/
import React from 'react';
import Select from 'react-select';
import 'react-select/dist/react-select.css';

export const SurveyLanguageSelector = ({onChange, className, defaultValue, items}) => {
let options = [];
Expand Down
2 changes: 1 addition & 1 deletion webpack/build-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fs.readdir(dir, (err, list) => {
`);
if (fs.existsSync(packagePath)) {
console.log('Loading dependencies...');
execSync(`cd ${moduleName}/ui && npm install`, {stdio: 'inherit'});
execSync(`cd ${moduleName}/ui && yarn install`, {stdio: 'inherit'});
execSync(`cd ${dir}`);
}
execSync(`node ./webpack ${moduleName}`, {stdio: 'inherit'});
Expand Down
Loading