Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump werkzeug from 0.15.6 to 2.2.3 #257

Open
wants to merge 184 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
91bee49
Added support fot branch-issue bot
dpuenteramirez Jan 22, 2022
0d194ba
Copyright now takes the current year and MEC link updated #1
dpuenteramirez Jan 22, 2022
2e98296
Minor mods #1
dpuenteramirez Jan 25, 2022
a4ffad7
Added support for Self-Trainig and SVC #2
dpuenteramirez Jan 30, 2022
aa3d904
Added a file with the dump version of the working DB #2
dpuenteramirez Jan 30, 2022
1f6f895
Allow git to track the DB changes so no dump is required
dpuenteramirez Feb 2, 2022
9bf8411
Added 'Semi Supervised Classification' as a new Algorithm Type #3
dpuenteramirez Feb 2, 2022
8f2a2c9
Added SemiSupervised functionality #3
dpuenteramirez Feb 2, 2022
9d9b362
Added support for spanish index #9 Added structure for languages #8
dpuenteramirez Feb 3, 2022
9a5d6bd
Merge pull request #10 from dpr1005/development
dpuenteramirez Feb 3, 2022
30c81f2
Added SSL algs to DB, added lib files, created ssl structure of exec #4
dpuenteramirez Feb 3, 2022
d656d24
Added more multilingual based on tags #8
dpuenteramirez Feb 3, 2022
9bb05c6
Fixed a couple typos - nothing to worry about #1
dpuenteramirez Feb 3, 2022
1c9b06f
Required tweeks to SSL algs to integrate them #4 #5 #6 #7
dpuenteramirez Feb 4, 2022
4c92226
Updated SSL execution structure #4
dpuenteramirez Feb 4, 2022
ae385a2
Merge pull request #11 from dpr1005/development
dpuenteramirez Feb 4, 2022
f07eaa3
Added CrossValidation and fixed predictions #4
dpuenteramirez Feb 4, 2022
e4069c5
Merge pull request #12 from dpr1005/development
dpuenteramirez Feb 4, 2022
9013bb9
Added validation for target class in SemiSupervised #4
dpuenteramirez Feb 8, 2022
ec3a0c7
Merge pull request #13 from dpr1005/development
dpuenteramirez Feb 8, 2022
3178b1b
Fixed popup validation #14
dpuenteramirez Feb 8, 2022
3759fe8
Merge pull request #15 from dpr1005/hotfix
dpuenteramirez Feb 8, 2022
3470092
Merge pull request #16 from dpr1005/development
dpuenteramirez Feb 8, 2022
74cc18c
Added ENN - pipe it remains #17 #18
dpuenteramirez Feb 10, 2022
3a8d3c9
ENN working with Semi Supervised Classification #17 #18
dpuenteramirez Feb 11, 2022
cb1cef3
CNN working with Semi Supervised Classification #17 #19
dpuenteramirez Feb 11, 2022
6763aed
Added filters RNN, MSS, ICF, DROP3 to DB #17 #20 #21 #22 #23
dpuenteramirez Feb 11, 2022
2c0d35a
Updated is_ssl filters #17 #20 #21 #22 #23
dpuenteramirez Feb 11, 2022
4eb945e
Merge pull request #26 from dpr1005/development
dpuenteramirez Feb 11, 2022
cac371d
is_ssl filters now work with Sklearn #17 #25
dpuenteramirez Feb 12, 2022
0f60313
Merge pull request #27 from dpr1005/development
dpuenteramirez Feb 12, 2022
7d9f2a4
is_ssl filters now work with Weka #17 #24
dpuenteramirez Feb 13, 2022
192eb17
Merge pull request #28 from dpr1005/development
dpuenteramirez Feb 13, 2022
d6eae08
New fields added to register form and DB #29
dpuenteramirez Feb 16, 2022
0f49b63
Added initial structure to administration page #30
dpuenteramirez Feb 16, 2022
b17b6ca
Merge pull request #31 from dpr1005/development
dpuenteramirez Feb 16, 2022
d2a1a55
Admin interface #30
dpuenteramirez Feb 18, 2022
e3405be
Merge pull request #32 from dpr1005/development
dpuenteramirez Feb 18, 2022
5fbb89f
Created Jenkinsfile
dpuenteramirez Feb 18, 2022
7773f0d
Update Jenkinsfile
dpuenteramirez Feb 18, 2022
3884b6e
Update Jenkinsfile
dpuenteramirez Feb 18, 2022
ba03d9f
Update Jenkinsfile
dpuenteramirez Feb 18, 2022
937cf6f
Added user creation, deletion, safety measures for admins #34
dpuenteramirez Feb 19, 2022
5e57ce4
Merge pull request #35 from dpr1005/development
dpuenteramirez Feb 19, 2022
f124e70
Created analytics dasboard with a version on map and stats #33 #36 #37
dpuenteramirez Feb 20, 2022
4289564
Removed line at the end of the admin sidebar #40
dpuenteramirez Feb 20, 2022
bcb8daf
Added popups to the admin map with country and number of users #37
dpuenteramirez Feb 20, 2022
0dfeba0
Fixed: now new user appears at auto refresh #41
dpuenteramirez Feb 21, 2022
126d838
Merge pull request #42 from dpr1005/hotfix
dpuenteramirez Feb 21, 2022
827c977
Fixed with world map popup #37
dpuenteramirez Feb 21, 2022
94a0ece
Added old buttons to admin navbar #46
dpuenteramirez Feb 23, 2022
d859dc4
Created loadoing screen for dashboard #47
dpuenteramirez Feb 23, 2022
4cb599d
Updated dashboard with proper structure and line chart of last exps #38
dpuenteramirez Feb 23, 2022
9915904
Updated dashboards with map, pie and charts #39 #33
dpuenteramirez Feb 24, 2022
ac291e1
Finished main dashboard page #43 #39
dpuenteramirez Feb 24, 2022
7caf2ab
Merge pull request #50 from dpr1005/development
dpuenteramirez Feb 24, 2022
5f9b70a
Added general user usage -> finished analytics dashboard #33 #45
dpuenteramirez Feb 26, 2022
035f539
Merge pull request #51 from dpr1005/development
dpuenteramirez Feb 26, 2022
24ca0ae
Updated user profile layout and added new user fields #48 #52
dpuenteramirez Feb 26, 2022
09887a5
Removed dataset preview
dpuenteramirez Feb 26, 2022
60b4ac7
Fixed Exp date editing breaing DB on commit #53
dpuenteramirez Feb 27, 2022
3aa0753
Merge pull request #54 from dpr1005/hotfix
dpuenteramirez Feb 27, 2022
3f6be7d
Finished form for updating user data #48 #52
dpuenteramirez Feb 27, 2022
9fb2751
Merge pull request #55 from dpr1005/development
dpuenteramirez Feb 27, 2022
d96794e
Play around with Jenkins #44
dpuenteramirez Feb 28, 2022
ff848be
Starting collecting data for system monitor #49
dpuenteramirez Mar 1, 2022
6d032fa
Added stats for users #56
dpuenteramirez Mar 1, 2022
bdc153c
Updated system monitor #49
dpuenteramirez Mar 1, 2022
5cd796a
Modified x-ticks with each weekday name #63
dpuenteramirez Mar 2, 2022
6ada6d2
Added runtime stats to datasets hitogram #64
dpuenteramirez Mar 2, 2022
64d3386
Updated the new base.html #66
dpuenteramirez Mar 2, 2022
c1ccdc3
Added concurrency to retrieve data while the app is running #67
dpuenteramirez Mar 3, 2022
ff68027
CodeBeat ignore file #44
dpuenteramirez Mar 3, 2022
34f8d7e
Merge pull request #68 from dpr1005/development
dpuenteramirez Mar 3, 2022
45ef7c6
Update README.md
dpuenteramirez Mar 3, 2022
b24764e
Added final way to retrieve and store sysem analytics #67
dpuenteramirez Mar 4, 2022
d3cc7c4
Updated base html for Register #66
dpuenteramirez Mar 4, 2022
783eae0
Updated Register's page to the new layout #60
dpuenteramirez Mar 4, 2022
fdb7b51
Updated Login's page to the new layout #61
dpuenteramirez Mar 4, 2022
5304d5f
Updated refs to the new layout base file #62
dpuenteramirez Mar 4, 2022
aaa6a0e
Updated Results' page to the new layout #62
dpuenteramirez Mar 4, 2022
3921b0c
Updated predict page and some minor changes #62
dpuenteramirez Mar 4, 2022
35082c4
Updated New Experiment's page and some minor changes #59 #57
dpuenteramirez Mar 4, 2022
5c76dbf
Merge pull request #69 from dpr1005/development
dpuenteramirez Mar 4, 2022
f8ea2f9
Update README.md
dpuenteramirez Mar 4, 2022
d0ad292
Updated codebeat ignore excluding bootsrap files #44
dpuenteramirez Mar 4, 2022
71061f4
Update README.md
dpuenteramirez Mar 4, 2022
7d9947a
Merge branch 'master' into development
dpuenteramirez Mar 4, 2022
064d37b
Merge pull request #70 from dpr1005/development
dpuenteramirez Mar 4, 2022
2b4740b
Updated index to the new layout and minor changes #58
dpuenteramirez Mar 6, 2022
a328e3a
Merge pull request #71 from dpr1005/development
dpuenteramirez Mar 6, 2022
4e299b7
Live monitor method setup #49
dpuenteramirez Mar 7, 2022
9f970ac
Pre CI #44
dpuenteramirez Mar 7, 2022
e5f2bfa
Test Datasets #44
dpuenteramirez Mar 8, 2022
196bf96
Rearranged test structure #44
dpuenteramirez Mar 8, 2022
6137159
Updated travis ci config #72
dpuenteramirez Mar 8, 2022
cfe1c68
Fixed Firefox addon #72
dpuenteramirez Mar 8, 2022
50adb86
Merge pull request #74 from dpr1005/CICD
dpuenteramirez Mar 8, 2022
289a4d6
Added profile pics
dpuenteramirez Mar 8, 2022
66e3c38
Merge pull request #75 from dpr1005/development
dpuenteramirez Mar 8, 2022
3b38df2
Added test loginLogout #73
dpuenteramirez Mar 8, 2022
5db10d1
Updated travis ci config file #72
dpuenteramirez Mar 8, 2022
59c7730
Added waiting time to travis #72
dpuenteramirez Mar 8, 2022
e3c2610
Added some requeriments. OBJ see why travis fails on install depen #72
dpuenteramirez Mar 8, 2022
13479e2
Travis fails due to sklearn old version #72
dpuenteramirez Mar 8, 2022
378bb3f
Updated imbalanced-learn required version #72
dpuenteramirez Mar 8, 2022
4074348
More dependencies that were left ot in req.txt #72
dpuenteramirez Mar 8, 2022
ad8d331
Req modules versions #44
dpuenteramirez Mar 8, 2022
861df38
Added wtforms to requeriments #44
dpuenteramirez Mar 8, 2022
0e57b01
Trying to fix SQLAChemy on travis #44
dpuenteramirez Mar 8, 2022
a526505
Added psutil to requeriments #44
dpuenteramirez Mar 8, 2022
2f6ac20
Changed travis so the app will run in the background #44 #72
dpuenteramirez Mar 8, 2022
a4834ce
Updated app.py so it canwork both intravis and user usage #44
dpuenteramirez Mar 8, 2022
85a6830
Updated test_loginLogout #73
dpuenteramirez Mar 8, 2022
a172220
Generated iterations by id #73
dpuenteramirez Mar 8, 2022
d6b80b7
Removed actions from test_loginLogout #73
dpuenteramirez Mar 8, 2022
d82c0ed
Merge pull request #76 from dpr1005/development
dpuenteramirez Mar 8, 2022
417d0a4
Updated README.md badges
dpuenteramirez Mar 8, 2022
e28b2a3
Update README.md
dpuenteramirez Mar 8, 2022
19a8fa1
Merge pull request #77 from dpr1005/development
dpuenteramirez Mar 8, 2022
e6133c4
Update README.md
dpuenteramirez Mar 8, 2022
4926cad
Minor interface updates #79
dpuenteramirez Mar 9, 2022
a02bcc8
Users may change its profile picture #80
dpuenteramirez Mar 9, 2022
4234f33
Improved users views quality #82
dpuenteramirez Mar 9, 2022
dd41c29
Improved depth 0 code quality based on Codacy comments #82
dpuenteramirez Mar 9, 2022
850e935
Improved code quality files #82
dpuenteramirez Mar 9, 2022
f88a4b8
Merge pull request #84 from dpr1005/development
dpuenteramirez Mar 9, 2022
8900309
First charts on live dashboard #78
dpuenteramirez Mar 10, 2022
5f5b5e6
Added memory and storage stats #85
dpuenteramirez Mar 10, 2022
3b43796
System Load Chart #86
dpuenteramirez Mar 14, 2022
b7f4fb0
Finished Live monitor system with new io cpu network charts #87 #49
dpuenteramirez Mar 17, 2022
d830096
Merge pull request #88 from dpr1005/development
dpuenteramirez Mar 17, 2022
04971bf
Fixed live monitor logs not exiting yet #89
dpuenteramirez Mar 19, 2022
ab7f330
Updated icons to match its card #90
dpuenteramirez Mar 19, 2022
9c2c3f6
Default header added to dataset #81
dpuenteramirez Mar 19, 2022
9813853
Fixed initial report o live monitor #91
dpuenteramirez Mar 29, 2022
885f971
Changed <i> to <em>
dpuenteramirez Mar 29, 2022
6e5bc29
Merge pull request #92 from dpr1005/development
dpuenteramirez Mar 29, 2022
267002b
Fixed NaN values being passed to plots #94
dpuenteramirez Apr 2, 2022
576500c
Added swith button to autoreload or not Live Monitor Page #93
dpuenteramirez Apr 2, 2022
31cacfe
Update README.md
dpuenteramirez Apr 7, 2022
c085704
Minor change
dpuenteramirez Apr 12, 2022
55d8a70
Fixed odd used time #96
dpuenteramirez Apr 14, 2022
3e3045e
Fixed some log issues #97
dpuenteramirez Apr 14, 2022
347ffe4
Added sklearn preprocessing LabelEncoder #98
dpuenteramirez Apr 14, 2022
b43336d
Fixed users institution #99
dpuenteramirez Apr 14, 2022
2e9eba0
Fixed last week user stats not showing #95
dpuenteramirez Apr 14, 2022
522dced
Removed Codebeat badge
dpuenteramirez Apr 17, 2022
e5b405d
Updated working DB with latest experiment configs #101
dpuenteramirez Apr 25, 2022
458eb54
Updated PIP before installing requeriments
dpuenteramirez Apr 26, 2022
1f450f0
Update requirements.txt
dpuenteramirez Apr 26, 2022
ea579d2
Updated Flask Login Version to 0.6.0 from 0.4.1
dpuenteramirez Apr 27, 2022
b9a4f31
Updated Python Weka Wrapper from 0.1.7 to 0.2.9
dpuenteramirez Apr 27, 2022
fee8e70
Changed task_skeleton to not look by default for y names #102
dpuenteramirez Apr 30, 2022
1164538
Merge pull request #103 from dpr1005/hotfix
dpuenteramirez Apr 30, 2022
5367431
Cleaned databases prod ready #104
dpuenteramirez May 5, 2022
23b3a61
Added default admin datasets #104
dpuenteramirez May 5, 2022
f741d07
Updated .gitignore to omit DB changes #104
dpuenteramirez May 5, 2022
9bd17f6
Changed weka wrapper version #104
dpuenteramirez May 5, 2022
bc35183
Updated Travis-CI to use miniconda #105
dpuenteramirez May 5, 2022
959e095
Removed extra PIP install #105
dpuenteramirez May 5, 2022
a029592
Updated imbalanced-learn version to 0.9.0 #105
dpuenteramirez May 5, 2022
59ef40c
Downgraded imbalanced-learn to 0.7.0 #105
dpuenteramirez May 5, 2022
112bd08
Updated Weka Files #105
dpuenteramirez May 5, 2022
465714d
Now runs with 16 workers #106
dpuenteramirez May 5, 2022
a3efd5d
Updated refs integrity and chenged <i> to <em> #107
dpuenteramirez May 5, 2022
179e158
Update README.md
dpuenteramirez May 5, 2022
0d7994f
Pre Release all files #108
dpuenteramirez May 5, 2022
7f3d3d1
Merge pull request #108 from dpr1005/development
dpuenteramirez May 5, 2022
ec7a932
Bump urllib3 from 1.25.6 to 1.26.5
dependabot[bot] May 6, 2022
27dd526
Bump jinja2 from 2.11.2 to 2.11.3
dependabot[bot] May 6, 2022
7f86ef6
Merge pull request #111 from dpr1005/dependabot/pip/urllib3-1.26.5
dpuenteramirez May 6, 2022
60b1182
Merge pull request #110 from dpr1005/dependabot/pip/jinja2-2.11.3
dpuenteramirez May 6, 2022
67f1d38
Update UBUMLaaS_env.yml
dpuenteramirez May 6, 2022
3a182f5
Update README to final version #112
dpuenteramirez May 10, 2022
6233772
Updated README Badges #112
dpuenteramirez May 10, 2022
81c22db
Update README links #112
dpuenteramirez May 10, 2022
9b17374
Restored initial state of .gitignore
dpuenteramirez Jun 6, 2022
5e768a4
Updated ENV_VARS to ease integration
dpuenteramirez Jun 6, 2022
554e6f0
Production Ready Tests OK
dpuenteramirez Jun 6, 2022
24e9b8e
Fixed IS-SSL filters #113
dpuenteramirez Jun 10, 2022
3966d63
Merge pull request #256 from dpuenteramirez/master
jlgarridol Dec 2, 2022
0a24e4f
Update README.md
jlgarridol Dec 2, 2022
cf0ed8c
Bump werkzeug from 0.15.6 to 2.2.3
dependabot[bot] Feb 15, 2023
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
Prev Previous commit
Next Next commit
Added support for spanish index #9 Added structure for languages #8
  • Loading branch information
dpuenteramirez committed Feb 3, 2022
commit 9d9b362c83772ec676931985fb6a5e5c153d36db
Binary file added ubumlaas/static/img/en_flag.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ubumlaas/static/img/es_flag.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions ubumlaas/static/js/cookies.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
function setCookie(cname, cvalue, exdays) {
const d = new Date();
d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
let expires = "expires=" + d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/;SameSite=None;Secure";
}

function getCookie(cname) {
let name = cname + "=";
let ca = document.cookie.split(';');
for (let i = 0; i < ca.length; i++) {
let c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}

function checkCookieLanguage() {
let language = getCookie("language");
if (language != "") {
return language;
} else {
setCookie("language", "en_EN", 30);
return "en_EN";
}
}

function updateCookieLanguage(newLanguage) {
setCookie("language", newLanguage, 30);
}
40 changes: 40 additions & 0 deletions ubumlaas/static/js/translate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
function Translate() {
//initialization
this.init = function (attribute, lng) {
this.attribute = attribute;
this.lng = lng;
}
//translate
this.process = function (url) {
_self = this;
var xrhFile = new XMLHttpRequest();
//load content data
xrhFile.open("GET", url + this.lng + ".json", true);
xrhFile.onreadystatechange = function () {
if (xrhFile.readyState === 4) {
if (xrhFile.status === 200 || xrhFile.status == 0) {
var LngObject = JSON.parse(xrhFile.responseText);
//console.log(LngObject["name1"]);
var allDom = document.getElementsByTagName("*");
for (var i = 0; i < allDom.length; i++) {
var elem = allDom[i];
var key = elem.getAttribute(_self.attribute);

if (key != null) {
//console.log(key);
elem.innerHTML = LngObject[key];
}
}

}
}
}
xrhFile.send();
}

}

updateLanguage = function(language){
setCookie("language", language, 30);
window.location.reload(true);
}
30 changes: 30 additions & 0 deletions ubumlaas/static/languages/en_EN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"PAGE_TITLE": "UBUMLaaS",
"HEADING": "UBUMLaaS",
"HOME": "Home",
"MENU_ABOUT_US": "About Us",
"NEW_EXPERIMENT": "New Experiment",
"LAUNCHED_EXPERIMENTS": "My launched experiments",
"LOGOUT": "Logout",
"REGISTER": "Register",
"LOGIN": "Login",
"WELCOME": "Welcome to UBUMLaaS",
"CREATE_EXPERIMENT": "Create a new experiment",
"SLOGAN": "In God we trust, all others must bring data.",
"COPYRIGHT": "All rights reserved.",
"EMAIL": "Email",
"USERNAME": "Username",
"PASSWD": "Password",
"CONFIRM_PASSWD": "Confirm password",
"REGISTER_TITLE": "Register",
"REGISTER_BUTTON": "Register",
"LOCATION": "Location",
"QUICK_LINKS": "Quick Links",
"CONTACT_US": "Contact Us",
"NEED_ACCOUNT": "Do you need an account?",
"REGISTER_NOW": "Register Now",
"SPAIN": "Spain",
"PHONE": "Phone",
"UBU": "University of Burgos",
"ABOUT": "About"
}
30 changes: 30 additions & 0 deletions ubumlaas/static/languages/es_ES.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"PAGE_TITLE": "UBUMLaaS",
"HEADING": "UBUMLaaS",
"HOME": "Inicio",
"MENU_ABOUT_US": "Sobre nosotros",
"NEW_EXPERIMENT": "Nuevo experimento",
"LAUNCHED_EXPERIMENTS": "Mis experimentos",
"LOGOUT": "Cerrar sesión",
"REGISTER": "Regístrarte",
"LOGIN": "Iniciar sesión",
"WELCOME": "Bienvenido a UBUMLaaS",
"CREATE_EXPERIMENT": "Crear un experimento",
"SLOGAN": "In God we trust, all others must bring data.",
"COPYRIGHT": "Todos los derechos reservados.",
"EMAIL": "Correo eletrónico",
"USERNAME": "Usuario",
"PASSWD": "Contraseña",
"CONFIRM_PASSWD": "Confirmar contraseña",
"REGISTER_TITLE": "Registro",
"REGISTER_BUTTON": "Registrarme",
"LOCATION": "Localización",
"QUICK_LINKS": "Enlaces rápidos",
"CONTACT_US": "Contáctanos",
"NEED_ACCOUNT": "¿Necesitas una cuenta?",
"REGISTER_NOW": "Regístrate ahora",
"SPAIN": "España",
"PHONE": "Teléfono",
"UBU": "Universidad de Burgos",
"ABOUT": "Acerca"
}