CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
147 Commits 2 Branches 0 Tags
Commit Graph

147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timofey Mazurov
46012f487b Merged develop into current 2021-03-15 19:09:45 +03:00
Timofey Mazurov
b8883cc857 Added logging to database 2021-03-14 21:27:26 +03:00
Timofey Mazurov
e193ae0f55 Added default date to change_time field 2021-03-14 20:34:46 +03:00
Timofey Mazurov
6f3356ad25 Removed logging settings 2021-03-14 20:33:57 +03:00
Artyom Kravchenko
f6948d016d add some design to menu template(logo and color) 2021-03-12 14:39:51 +03:00
Artyom Kravchenko
bd500207a3 Fixed AdminPageUSer form 2021-03-12 13:58:27 +03:00
Artyom Kravchenko
5665282ce5 fixed UserProfile model 2021-03-12 12:34:45 +03:00
Sokurov Idar
9068febd30 bugfix 2021-03-11 19:55:09 +03:00
Sokurov Idar
60e1da2825 12-hour working day 2021-03-11 19:17:11 +03:00
Sokurov Idar
dd08821aea fix bag 2021-03-11 18:14:57 +03:00
Sokurov Idar
ef9d0fc721 Merge branch 'develop' into feature/statistic/backend 2021-03-11 17:31:02 +03:00
Sokurov Idar
b825bcdff3 Update class StatisticData 2021-03-11 17:30:55 +03:00
Татищев Юрий
7085532915 Merge branch 'bug/migrations' into 'develop' 
#46 | Ошибка при запуске `./manage.py migrate`

See merge request 2020-2021/online/s101/group-02/access_controller!32
 2021-03-11 08:17:11 +00:00
Iurii Tatishchev
c2d6a790f9
Add meta with permissions to UserProfile, fix ./manage.py migrate errors 2021-03-11 00:10:44 -08:00
Iurii Tatishchev
3c43e0e38a
Add models help text migration 2021-03-11 00:04:05 -08:00
Sokurov Idar
5efec2641a Refactor statistic page with class StatisticData 2021-03-09 00:53:11 +03:00
Sokurov Idar
ce55ec61e6 extract function for easier processing a list of emails in future 2021-03-08 22:48:31 +03:00
Sokurov Idar
811ea45532 Merge branch 'develop' into feature/statistic/backend 2021-03-08 21:07:32 +03:00
Sokurov Idar
b96deab2cb Update statistic backend 2021-03-08 21:07:09 +03:00
Sokurov Idar
49046022d7 small refactor: change variable`s names, add a bit documentation 2021-03-08 17:50:47 +03:00
Кравченко Артем
52f7858439 Merge branch 'feature/engineers_bug_page' into 'develop' 
Feature/engineers bug page

See merge request 2020-2021/online/s101/group-02/access_controller!31
 2021-03-08 13:41:54 +00:00
Artyom Kravchenko
b01f5fb236 add button from menu for engineer rules request 2021-03-08 02:28:00 +03:00
Artyom Kravchenko
7ee8cc96af fixed get and end engineer role fuctions 2021-03-07 23:08:56 +03:00
Artyom Kravchenko
fe944f4875 Fixed info bug on page 2021-03-06 01:36:19 +03:00
Sokurov Idar
4a604f0941 Merge branch 'develop' into feature/statistic/backend 
# Conflicts:
#	access_controller/urls.py
#	main/forms.py
#	main/views.py
 2021-03-04 23:16:21 +03:00
Sokurov Idar
8566e2b5b6 Updated version with days iteration 2021-03-04 23:13:10 +03:00
Andrew Smirnov
5909750fcc
Remove todolist commant 2021-03-04 20:56:38 +03:00
Andrew Smirnov
a393c31a13
Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	main/views.py
 2021-03-04 20:56:02 +03:00
Andrew Smirnov
1d7ff524b0
Documentation fix 
Add enchant, remove intersphinx useless links, remove napoleon, fix todos
 2021-03-04 20:54:45 +03:00
Кравченко Артем
ba548ded2e Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!29
 2021-03-04 17:50:44 +00:00
Кулаков Юрий
fa3716c2df Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 20:46:25 +03:00
Кулаков Юрий
9ddf1db2a3 Fixed bug with permissions 2021-03-04 20:45:55 +03:00
Andrew Smirnov
656081295e
Profile view page refactoring 2021-03-04 20:01:10 +03:00
Кравченко Артем
3a448a399a Merge branch 'feature/adm_ruleset/backend' into 'develop' 
Feature/adm ruleset/backend

See merge request 2020-2021/online/s101/group-02/access_controller!28
 2021-03-04 16:20:17 +00:00
Yuriy Kulakov
525bb25697 Merge branch 'develop' into feature/adm_ruleset/backend 2021-03-04 19:06:45 +03:00
Yuriy Kulakov
1fac1b4835 Merge branch 'develop' into feature/adm_ruleset/backend 
# Conflicts:
#	main/views.py
 2021-03-04 18:32:08 +03:00
Yuriy Kulakov
d46b90010d Added permissions system to control page 2021-03-04 18:22:49 +03:00
Кравченко Артем
dbe49d1c34 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!27
 2021-03-04 13:06:14 +00:00
Sokurov Idar
fd1e048ebe statistic backend first version 2021-03-04 01:25:56 +03:00
Степаненко Ольга
cd47331ae7 After mergin develop 2021-03-03 21:05:31 +03:00
Степаненко Ольга
2bfa6619b1 Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/forms.py
#	requirements.txt
 2021-03-03 21:02:40 +03:00
Степаненко Ольга
0cda9da311 Add views and forms documentation 2021-03-03 20:59:53 +03:00
Artyom Kravchenko
6cdd787cc8 add typehints to requirements 2021-03-03 13:46:44 +03:00
Кравченко Артем
b84824f888 Merge branch 'feature/registration' into 'develop' 
Feature/registration

See merge request 2020-2021/online/s101/group-02/access_controller!26
 2021-03-02 20:10:29 +00:00
Sokurov Idar
4299b1ed37 Merge branch 'develop' into feature/registration 
# Conflicts:
#	access_controller/urls.py
#	main/extra_func.py
#	main/forms.py
#	main/views.py
 2021-03-02 21:53:43 +03:00
Sokurov Idar
f50ce49d77 update login with email 2021-03-02 21:44:13 +03:00
Кравченко Артем
401b43e933 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!25
 2021-03-02 18:15:52 +00:00
Кравченко Артем
5f3684ef64 Merge branch 'feature/work/backend' into 'develop' 
Feature/work/backend

See merge request 2020-2021/online/s101/group-02/access_controller!24
 2021-03-02 18:15:16 +00:00
Andrey Kovalev
09a423060c Merge 'develop' into 'feature/work/backend' 2021-03-02 20:19:42 +03:00
Степаненко Ольга
525a5a61d2 Change extra_func documentation 2021-03-02 16:52:20 +03:00