Commit Graph

6276 Commits

Author SHA1 Message Date
prance
b02e5bbb38 imporve nginx configs 2022-01-28 01:28:46 +01:00
prance
840fb66840 literówka XD 2022-01-28 00:42:53 +01:00
prance
d55ac7c5d1 change config files 2022-01-28 00:41:41 +01:00
makram89
5bb0a56053 port_fixes 2022-01-28 00:41:18 +01:00
prance
2a3c514e4c add NGINXConf runs 2022-01-28 00:27:12 +01:00
prance
948444bdb9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	MUOR/MUOR/signals.py
2022-01-28 00:15:29 +01:00
prance
8773236047 change method of session key retrival 2022-01-28 00:14:14 +01:00
makram89
a33dc0dee0 ports fix 2022-01-28 00:13:08 +01:00
makram89
e1441af9a3 docker - kinda works 2022-01-28 00:00:44 +01:00
makram89
e8b9824873 apps 2022-01-27 23:51:56 +01:00
makram89
7a858d2199 Merge remote-tracking branch 'origin/master' 2022-01-27 23:30:17 +01:00
makram89
1ca8118142 decorator container logg_off 2022-01-27 23:30:11 +01:00
prance
f02e4cd8a3 change home view 2022-01-27 23:23:22 +01:00
makram89
341339ca8b decorator container start-up 2022-01-27 23:18:02 +01:00
prance
f87290b6b5 change foregin key to one to one field and add MUOR app to settings. 2022-01-27 22:49:57 +01:00
prance
4072c90e68 Add NGINXConfigurator.py 2022-01-27 22:46:44 +01:00
makram89
768fd10de0 decorator volume creator 2022-01-27 22:46:31 +01:00
makram89
638d9aceb5 class ready 2022-01-27 22:05:35 +01:00
makram89
01dc798a5f Merge remote-tracking branch 'origin/master' 2022-01-27 21:48:49 +01:00
makram89
9248218bfd turn on container 2022-01-27 21:48:00 +01:00
prance
bfc9e07273 Add sessionid to model 2022-01-27 21:46:24 +01:00
9ed3608b9e Merge pull request 'profile + docker class' (#4) from RANDOMSEC-20 into master
Reviewed-on: #4
2022-01-27 21:16:10 +01:00
makram89
0229e8fff7 profile + docker class 2022-01-27 21:15:13 +01:00
prance
4dddb42eaa Add models file 2022-01-27 20:00:07 +01:00
prance
16d8d324a4 Delete OpenRefineAuth and change password requirements 2022-01-27 19:28:09 +01:00
prance
829efffce7 Cleanup 2022-01-27 19:17:26 +01:00
057a7399c1 Merge pull request 'RANDOMSEC-24' (#3) from RANDOMSEC-24 into master
Reviewed-on: #3
2022-01-27 18:40:06 +01:00
19a4a3573f remove unused css files 2022-01-25 18:50:12 +01:00
8e6e9c1d5b style views with bootstrap 4 + css 2022-01-25 18:48:45 +01:00
bc109087ba Merge pull request 'RANDOMSEC-19' (#2) from RANDOMSEC-19 into master
Reviewed-on: #2
2022-01-25 16:47:24 +01:00
mnajborowski
44446bbff0 fix asgi and wsgi descriptions 2022-01-25 16:46:10 +01:00
mnajborowski
03b521702e shorten auth urls 2022-01-25 16:44:47 +01:00
mnajborowski
5509f81818 rollback renaming Serwer_django package to config 2022-01-25 16:23:46 +01:00
76cceaaec2 Merge remote-tracking branch 'origin/master' into RANDOMSEC-19
# Conflicts:
#	Serwer_django/config/settings.py
#	Serwer_django/config/urls.py
#	Serwer_django/db.sqlite3
#	Serwer_django/templates/base.html
#	Serwer_django/templates/home.html
#	Serwer_django/templates/registration/login.html
2022-01-23 22:35:07 +01:00
d2ed7529e6 rest of the changes 2022-01-23 22:34:40 +01:00
1e52627d3f add static files 2022-01-23 22:34:29 +01:00
defafa6e4b add auth templates 2022-01-23 22:34:16 +01:00
0826b66e33 remove gitignore 2022-01-23 22:33:33 +01:00
2db875b5c9 modify package in environment in manage.py 2022-01-23 22:33:12 +01:00
04e87711c2 add signup view 2022-01-23 22:32:35 +01:00
1c85c034b3 reorder packages 2022-01-23 22:32:21 +01:00
6d4c075ccb add gitignore 2022-01-23 22:26:43 +01:00
makram89
cb1e578f72 wyswietlanie domyslnego widoku logowania + tresc 2022-01-18 17:44:28 +01:00
makram89
f0946c1887 dzango init+ 2022-01-11 16:24:53 +01:00
makram89
798a3d3558 django init 2022-01-11 15:48:51 +01:00
makram89
b9b7c89962 Merge branch 'master' of https://git.wmi.amu.edu.pl/s434730/RandomSec 2022-01-04 16:37:17 +01:00
makram89
14b25c6504 Files schema refactor 2022-01-04 16:31:32 +01:00
211e69472a Merge pull request 'update readme' (#1) from RANDOMSEC-14 into master
Reviewed-on: #1
2022-01-01 17:54:49 +01:00
makram89
b45a95f37c addition 2021-12-21 16:39:20 +01:00
makram89
7ec5d76b19 update readme 2021-12-21 15:50:21 +01:00