Commit graph

1268 commits

Author SHA1 Message Date
Luis Aleixo
a73f8ec5de Changed routes.yaml file name and respective reference in README 2022-01-13 16:36:01 +01:00
Nicola Tarocco
07fe51ee06 Merge branch 'move-prod-to-okd4' into 'master'
Changes to move PROD to OKD4

See merge request cara/cara!317
2022-01-10 17:46:41 +01:00
Nicola Tarocco
b9a5f7844f Changes to move PROD to OKD4 2022-01-10 17:41:37 +01:00
Andre Henriques
6efa34a506 Merge branch 'feature/red_scale' into 'master'
CERN COVID19 level

Closes #235

See merge request cara/cara!315
2022-01-10 16:42:32 +01:00
Luis Aleixo
5260f0921a Updated CERN Covid level 2022-01-10 13:34:39 +01:00
Andre Henriques
c15a48881b Merge branch 'feature/dropdown_size' into 'master'
Changed Virus variant dropdown size

See merge request cara/cara!314
2022-01-07 09:47:23 +01:00
Luis Aleixo
095329bf1e Changed Virus variant dropdown size 2022-01-07 09:36:30 +01:00
Andre Henriques
0c34d9c478 Merge branch 'feature/themes_fix' into 'master'
Cern theme directory fix

See merge request cara/cara!313
2022-01-06 22:18:31 +01:00
Luis Aleixo
3594783c2e wrong cern theme directory fix 2022-01-06 19:44:26 +01:00
Andre Henriques
789e60340f Merge branch 'feature/omicron_voc' into 'master'
Added omicron, based on 3 early studies.

See merge request cara/cara!310
2022-01-06 17:51:18 +01:00
James Devine
54a791709f Added omicron, based on 3 early studies. 2022-01-06 17:51:18 +01:00
Andre Henriques
afd5eb9ca9 Merge branch 'feature/Acknowledgements' into 'master'
Setting Acknowledgements on landing page with text from template_environment

See merge request cara/cara!312
2022-01-06 17:38:25 +01:00
Luis Aleixo
4e5b8e80a0 Setting Acknowledgements on landing page with text from template_environment 2022-01-06 17:19:49 +01:00
Andre Henriques
b721563092 Merge branch 'feature/numpy_version' into 'master'
Changed numpy version

See merge request cara/cara!311
2022-01-06 14:33:53 +01:00
Luis Aleixo
e4a7a1bfd0 Changed numpy version 2022-01-06 14:29:16 +01:00
Andre Henriques
ac8dd82a73 Merge branch 'feature/base_theme_improvements' into 'master'
COVID Information link and CARA@CERN section only for CERN theme

Closes #217 and #209

See merge request cara/cara!290
2021-12-21 16:13:29 +01:00
Luis Aleixo
aa653331ee Merge branch 'master' into feature/base_theme_improvements 2021-12-21 15:02:40 +00:00
Luis Aleixo
6cb508ac97 Merge branch 'fix-dc-okd4' into 'master'
fix wrong DeploymentConfig tag

See merge request cara/cara!309
2021-12-21 16:01:46 +01:00
Nicola Tarocco
d387988bd9 fix wrong DeploymentConfig tag 2021-12-21 15:00:41 +01:00
Luis Aleixo
a30d386430 Merge branch 'master' into feature/base_theme_improvements 2021-12-21 11:12:54 +00:00
Nicola Tarocco
ccbe0ff0cb fix oc tag when deploying to test-cara 2021-12-21 12:10:45 +01:00
Luis Aleixo
66b668f469 Changed deploymentconfig cara_theme calue 2021-12-21 11:08:24 +00:00
Luis Aleixo
1d04b734db Merge branch 'master' into feature/base_theme_improvements 2021-12-21 10:59:13 +00:00
Nicola Tarocco
0c51d3d8ac Merge branch 'fixed-okd3-okd4' into 'master'
fixes to deploy test to OKD4 and prod to OKD3

See merge request cara/cara!308
2021-12-21 11:58:11 +01:00
Nicola Tarocco
dfef879611 fixes to deploy test to OKD4 and prod to OKD3 2021-12-21 11:55:30 +01:00
Luis Aleixo
2aba369ca2 Merge branch 'master' into feature/base_theme_improvements 2021-12-21 10:48:10 +00:00
Nicola Tarocco
eae34e95eb Merge branch 'migrate_okd4' into 'master'
Migrate infrastructure to OKD4

See merge request cara/cara!302
2021-12-21 11:38:54 +01:00
Nicola Tarocco
3266d806d5 changes after migration to OKD4 2021-12-21 11:29:43 +01:00
Luis Aleixo
abb428635e Merge branch 'master' into feature/base_theme_improvements 2021-12-16 12:13:39 +00:00
Andre Henriques
6bd8b70241 Merge branch 'feature/mobile_options' into 'master'
Remove ExpertApp from mobile and tablet screen sizes

Closes #221

See merge request cara/cara!305
2021-12-16 11:37:12 +01:00
Luis Aleixo
091bd1bdc2 Remove ExpertApp from mobile and tablet screen sizes 2021-12-16 11:37:11 +01:00
Andre Henriques
cf827977d5 Merge branch 'feature/benchmarks' into 'master'
Server Performance Tests

See merge request cara/cara!306
2021-12-15 11:35:56 +01:00
Luis Aleixo
4a45e9c263 Renamed files and added docstrings on each method. 2021-12-13 10:39:33 +00:00
Luis Aleixo
f448173078 Added locust test file and README 2021-12-13 10:39:33 +00:00
Andre Henriques
a07dfaf168 Merge branch 'feature/windows_opening_interval' into 'master'
Confusion about when the window opens

See merge request cara/cara!291
2021-12-10 09:47:25 +01:00
Luis Aleixo
79f51c6411 Consideration on the time the first person (either infected or exposed) arrives at the enclosed space 2021-12-09 14:26:29 +01:00
Andre Henriques
e9d6bb4f38 Merge branch 'feature/mask_icons' into 'master'
Added mask icons

Closes #223

See merge request cara/cara!301
2021-12-07 18:34:43 +01:00
Luis Aleixo
08432e2a0e Changed FFP2 label 2021-12-07 17:08:58 +01:00
Andre Henriques
ffe0c32630 Merge branch 'feature/conference_activity' into 'master'
Edited training option to accomplish trainings

Closes #224

See merge request cara/cara!300
2021-12-07 09:06:57 +01:00
Andre Henriques
5dd9ff5750 Merge branch 'feature/cern_level' into 'master'
CERN COVID19 level

Closes #225

See merge request cara/cara!303
2021-12-06 14:35:32 +01:00
Luis Aleixo
8e91234628 COVID level scale update #225 2021-12-06 14:23:35 +01:00
Luis Aleixo
b7575d0f9f Changed 1 to I and turned mask icon clickable 2021-12-03 12:00:25 +01:00
Luis Aleixo
a5b28998ec Added mask icons fixes #223 2021-12-03 11:30:46 +01:00
Luis Aleixo
91eee9aa5a changed test for cern theme path 2021-12-02 16:51:53 +01:00
Luis Aleixo
344204ef1b Added placeholders from rebase 2021-12-02 16:51:12 +01:00
Luis Aleixo
d3d5b2ae6b Changed README on how to run CARA with CERN theme 2021-12-02 16:45:43 +01:00
Luis Aleixo
1705a2c96d room_data tooltip missing from form 2021-12-02 16:45:43 +01:00
Luis Aleixo
e3f1c166f8 Error on form file directory fix 2021-12-02 16:45:31 +01:00
Luis Aleixo
a0108026f3 Remove GIS Portal info from room data tooltip 2021-12-02 16:44:19 +01:00
Luis Aleixo
de5b4f6ec4 All theme files elevated to app directory. 2021-12-02 16:44:19 +01:00