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

126 Commits

Author SHA1 Message Date
Кравченко Артем
8a6df6ac1f Merge branch 'feature/favicon' into 'develop' 
Feature/favicon

See merge request 2020-2021/online/s101/group-02/access_controller!96
 2021-05-29 14:25:29 +00:00
Степаненко Ольга
2037791ce8 Merge with dev 2021-05-29 17:20:35 +03:00
Кравченко Артем
73ceb174a6 Merge branch 'feature/documentation' into 'develop' 
Feature/documentation

See merge request 2020-2021/online/s101/group-02/access_controller!95
 2021-05-29 14:18:31 +00:00
Степаненко Ольга
e4da328cb6 Add favicon to pages 2021-05-29 17:10:56 +03:00
Степаненко Ольга
f19d9a504a First step to create button for doc 2021-05-28 18:51:52 +03:00
Kiselev Igor
d3939fa1ec Added favicon 2021-05-28 17:47:49 +03:00
Yuriy Kulakov
e5e6541ac8 Merge branch 'develop' into feature/react_test 2021-05-28 13:56:11 +03:00
Andrew Smirnov
9fcd1bb9f1
Merge branch 'develop' into feature/statistic/month_name_bug 2021-05-27 20:45:03 +03:00
Yuriy Kulakov
55cba3b036 Updated design of control page 2021-05-27 20:00:28 +03:00
Yuriy Kulakov
0a85ddacd2 Merge branch 'develop' into feature/react_test 
# Conflicts:
#	access_controller/settings.py
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js
 2021-05-27 19:35:59 +03:00
Dmitriy Andreev
8b3f8b8b87 Page design became better for user. Changes in profile, work, control and statistic pages. 2021-05-26 17:47:32 +03:00
Dmitriy Andreev
72030040b8 Fix looking of profile, work and control pages 2021-05-26 17:05:48 +03:00
Dmitriy Andreev
bdd5a68b26 profile look fix 2021-05-26 15:34:28 +03:00
Yuriy Kulakov
3cdc944ce4 Merge branch 'develop' into feature/react_test 
# Conflicts:
#	README.md
#	main/tests.py
 2021-05-25 19:55:07 +03:00
Andrew Smirnov
ee2959e16a
Merge branch 'develop' into feature/react_test 
# Conflicts:
#	main/tests.py
 2021-05-20 20:23:27 +03:00
Andrew Smirnov
c3fc3e0e4e
Merge branch 'develop' into feature/pylint 
# Conflicts:
#	main/apiauth.py
#	main/tests.py
#	requirements/common.txt
#	requirements/dev.txt
 2021-05-20 19:58:30 +03:00
Andrew Smirnov
5748e3f842
Merge branch 'develop' into feature/statistic/month_name_bug 2021-05-20 19:43:39 +03:00
Кравченко Артем
9f8fd5f584 Merge branch 'feature/registration_failed/html' into 'develop' 
Feature/registration failed/html

See merge request 2020-2021/online/s101/group-02/access_controller!84
 2021-05-20 15:21:45 +00:00
Степаненко Ольга
aba5d9d563 Rename parametrs to snack_case. Pylint 10. 2021-05-15 15:44:21 +03:00
Andrew Smirnov
95b685a812
Merge branch 'develop' into feature/statistic/month_name_bug 
# Conflicts:
#	main/extra_func.py
 2021-05-13 20:56:04 +03:00
Andrew Smirnov
8b70827f07
Merge branch 'develop' into feature/react_test 
# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js
 2021-05-13 20:02:27 +03:00
Andrew Smirnov
6d3e4a0ac8
Merge branch 'develop' into fix/profile_page_look 2021-05-13 19:58:26 +03:00
Andrew Smirnov
c1329e6788
Merge branch 'develop' into feature/registration_failed/html 2021-05-13 19:57:44 +03:00
Andrew Smirnov
23eb2bf2ec
Fix month display on statistics page 2021-05-13 19:55:21 +03:00
Kiselev Igor
5f88a4f297 Fixed statistic view date bug 2021-05-13 17:51:28 +03:00
Сокуров Идар
76cd782ff4 Add get tickets tests 2021-05-13 04:49:02 +00:00
Андреев Дмитрий
63949dd54e Fix/header 2021-05-10 15:05:34 +00:00
Yuriy Kulakov
e32f12019e Added control page tests and fixed bugs 2021-05-07 22:29:50 +03:00
Сокуров Идар
0086d4909e Feature/tests/make_eng from work and control pages 2021-05-06 15:22:57 +00:00
Yuriy Kulakov
79fb2412d6 Added webpack for js 2021-05-04 18:19:30 +03:00
Yuriy Kulakov
f4e5b9192e Changed scripts' sources at control ppage 2021-04-30 20:55:42 +03:00
Andrew Smirnov
edd103b782
Merge branch 'develop' into feature/profile_page_lookfix 2021-04-29 20:13:47 +03:00
Andrew Smirnov
bac3cf4dfd
Merge develop into feature/registration_failed/html 2021-04-29 20:03:04 +03:00
Yuriy Kulakov
82fde03db9 Merge branch 'develop' into feature/react_test 
# Conflicts:
#	static/main/js/control_page/control.js
 2021-04-29 16:52:31 +03:00
Yuriy Kulakov
760d28a768 Update package.json 2021-04-29 16:33:41 +03:00
Dmitriy Andreev
6b9cd05227 Profile page lookfix 2021-04-28 22:21:37 +03:00
Yuriy Kulakov
3b9ae4f2fa Added django_node_assets 2021-04-27 20:24:58 +03:00
Sokurov Idar
b2e7c84913 change notifications duration 2021-04-26 22:00:38 +03:00
Sokurov Idar
5c3801c317 Add password change page 2021-04-26 21:47:45 +03:00
Sokurov Idar
05a4bc70f2 minor fix 2021-04-20 23:01:31 +03:00
Sokurov Idar
cff6443eca Add notifications on work page, rebase already exists with notifications.js 2021-04-20 22:55:22 +03:00
Artyom Kravchenko
ecf32a0ae7 merge st_button 2021-04-19 13:39:43 +03:00
Yuriy Kulakov
af63ee29f3 Now the first column of table at control page is checkbox 2021-04-18 19:15:23 +03:00
Vadim Melnikov
2ec95dcb00 Added statistics button + fixed stats page buttons highlight 2021-04-16 16:14:37 +03:00
Andrew Smirnov
06256c202d
Fix statistic html 2021-04-15 20:28:43 +03:00
Artyom Kravchenko
afec8e59e4 merge take tickets 2021-04-15 18:47:58 +03:00
Artyom Kravchenko
423951b144 merge button colors 2021-04-14 10:35:47 +03:00
Sokurov Idar
2c14f65d4f Merge branch 'develop' into feature/registration_bug 
# Conflicts:
#	main/views.py
 2021-04-13 22:11:31 +03:00
Sokurov Idar
8a0a1639fc Add new page if email has not sent 2021-04-13 20:58:36 +03:00
Vadim Melnikov
7604c88777 Added highlight for login/register buttons a.k.a. finished the task 2021-04-12 22:14:04 +03:00