Commit Graph

6335 Commits

Author SHA1 Message Date
prance
2a7e2e66b5 change OR version 2022-01-30 22:06:15 +01:00
prance
8694374775 idk??XD 2022-01-30 22:02:21 +01:00
098564e333 add link to log in view when on sign up view and vice-versa 2022-01-30 21:43:10 +01:00
5ac24962c5 add logout link to OpenRefine index view 2022-01-30 21:15:07 +01:00
f6e4a1f7e4 add unversioned files from new version of OpenRefine 2022-01-30 21:12:55 +01:00
b37b4153bf update OpenRefine 2022-01-30 21:12:14 +01:00
prance
b633a4c51e increase delay to 3s 2022-01-30 20:33:46 +01:00
prance
1888dd2c9a set error page 2022-01-30 20:31:13 +01:00
prance
0c7b221f3f change logo path 2022-01-30 20:27:17 +01:00
prance
de8925fe9a change staticfiles 2022-01-30 20:25:22 +01:00
prance
e3c124df80 change error page 2022-01-30 20:23:32 +01:00
prance
b466d09c18 change logo path 2022-01-30 20:10:13 +01:00
prance
f4cf7fea8b Merge remote-tracking branch 'origin/master' 2022-01-30 19:45:33 +01:00
prance
b90ba1271c decrease loader delay to 1 second 2022-01-30 19:45:27 +01:00
makram89
a6999dad38 Merge remote-tracking branch 'origin/master' 2022-01-30 19:39:16 +01:00
makram89
5d020957b7 gitingore 2022-01-30 19:38:42 +01:00
prance
767091c4b8 decrease clearing period 2022-01-30 19:37:09 +01:00
prance
cf9eb34e96 get "welcome" back as home 2022-01-30 19:34:46 +01:00
prance
415e3e1f9d add default proxy pass before ifs 2022-01-30 19:22:11 +01:00
prance
cfcdc0547b change period to float 2022-01-30 18:59:15 +01:00
prance
8f794f1e12 chnage task name 2022-01-30 18:49:19 +01:00
prance
2b191b5f19 add celery 2022-01-30 18:47:42 +01:00
prance
4936a15f72 make refresh time shorter 2022-01-30 18:34:27 +01:00
makram89
e5eade040d wsgi fix 2022-01-30 18:25:26 +01:00
makram89
8e476f0c7d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/MUOR/configs/muor.conf
#	MUOR/MUOR/configs/muor_after_location_block.conf
#	MUOR/MUOR/configs/muor_before_location_block.conf
2022-01-30 18:24:22 +01:00
makram89
6d46a2a5de wsgi fix 2022-01-30 18:23:31 +01:00
prance
f8461d47a9 add timeout 2022-01-30 18:09:09 +01:00
prance
5c9b73492e remove uwsgi params 2022-01-30 18:06:23 +01:00
makram89
b6c99a4f02 path fix 2022-01-30 17:58:30 +01:00
prance
1727ac9e01 add domain to allowed hosts 2022-01-30 17:57:33 +01:00
prance
117222cafd change loading of loader page 2022-01-30 17:53:37 +01:00
makram89
e30255f504 try-fix 2022-01-30 17:18:02 +01:00
prance
dd7ef6f600 fix try_files in nginx conf 2022-01-30 17:12:48 +01:00
makram89
8bba3ad255 uwsgi-4 2022-01-30 17:10:25 +01:00
makram89
b100058ba3 uwsgi-3 2022-01-30 17:06:17 +01:00
makram89
003937d4cd Merge remote-tracking branch 'origin/master' 2022-01-30 17:03:22 +01:00
makram89
819139c42a uwsgi-2 2022-01-30 17:03:16 +01:00
prance
b4e184c4d7 Merge remote-tracking branch 'origin/master' 2022-01-30 16:45:39 +01:00
prance
d5162ce41b add loader page 2022-01-30 16:45:32 +01:00
makram89
3f25594788 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/requirements.txt
2022-01-30 16:43:11 +01:00
makram89
c39ad275ff uwsgi 2022-01-30 16:42:28 +01:00
prance
7f10c50614 change loader from template to static html 2022-01-30 16:37:06 +01:00
prance
14288de087 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/MUOR/settings.py
2022-01-30 16:33:05 +01:00
prance
14a2e7d185 add celery with task clearing task 2022-01-30 16:32:09 +01:00
makram89
6c078fda8b settings correction 2022-01-30 15:40:05 +01:00
makram89
5243b24a5a docekr image in settings 2022-01-30 15:36:34 +01:00
makram89
5ab91ec250 Merge remote-tracking branch 'origin/master' 2022-01-30 15:30:46 +01:00
makram89
1c67dc4ae3 uwsgi.ini 2022-01-30 15:30:37 +01:00
5416298d8a Merge pull request 'add loader view' (#5) from RANDOMSEC-32 into master
Reviewed-on: #5
2022-01-30 15:27:37 +01:00
af8b9aa131 add loader view 2022-01-30 15:25:45 +01:00