|
|
977f1858a7
|
Merge branch 'develop'
|
2021-05-29 23:23:49 -07:00 |
|
|
|
ccae7ada4b
|
Rename title for statistic and work pages
|
2021-05-29 23:23:29 -07:00 |
|
|
|
1d3dacd25b
|
Merge branch 'develop'
|
2021-05-29 23:02:50 -07:00 |
|
|
|
74661bd7a4
|
Add DOCS_URL to settings, update README and env.example
|
2021-05-29 22:59:20 -07:00 |
|
Кравченко Артем
|
773e669b98
|
Merge branch 'develop' into 'master'
Develop
See merge request 2020-2021/online/s101/group-02/access_controller!101
|
2021-05-29 22:18:09 +00:00 |
|
Kanris
|
2494be9be6
|
Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop
|
2021-05-30 01:16:36 +03:00 |
|
Kanris
|
a86f137ce0
|
fix master confl
|
2021-05-30 01:16:09 +03:00 |
|
|
|
630349eb02
|
Update documentation.sh
|
2021-05-29 15:11:52 -07:00 |
|
Kanris
|
295cdbb19e
|
fix migrations
|
2021-05-30 01:06:34 +03:00 |
|
Kanris
|
418df9ddba
|
fix tick
|
2021-05-30 00:59:45 +03:00 |
|
Кравченко Артем
|
b2ccee4f28
|
Merge branch 'hotfix/statistic' into 'develop'
fix bug and fix months display
See merge request 2020-2021/online/s101/group-02/access_controller!99
|
2021-05-29 21:57:00 +00:00 |
|
|
|
2f2f6fa09f
|
Fix get_tickets
|
2021-05-29 14:39:59 -07:00 |
|
Sokurov Idar
|
daa93d5a4d
|
fix bug and fix months display
|
2021-05-30 00:34:32 +03:00 |
|
|
|
a03456c60c
|
Add npm to Dockerfile
|
2021-05-29 14:22:23 -07:00 |
|
Kanris
|
6c7b61946d
|
merge dev
|
2021-05-30 00:11:18 +03:00 |
|
Kanris
|
4c0e8944b7
|
fix
|
2021-05-30 00:05:32 +03:00 |
|
Kanris
|
b98bec8a4a
|
tmp
|
2021-05-30 00:03:52 +03:00 |
|
Кравченко Артем
|
64d72d681b
|
Merge branch 'hotfix/get_tickets' into 'develop'
Hotfix/get tickets
See merge request 2020-2021/online/s101/group-02/access_controller!98
|
2021-05-29 21:02:58 +00:00 |
|
Sokurov Idar
|
d943f474b1
|
Merge branch 'develop' into hotfix/get_tickets
|
2021-05-29 23:59:51 +03:00 |
|
Sokurov Idar
|
505f585754
|
fix request method
|
2021-05-29 23:58:44 +03:00 |
|
Kanris
|
a8221682db
|
pull dev
|
2021-05-29 23:23:44 +03:00 |
|
Kanris
|
cbe10e9be9
|
pull dev
|
2021-05-29 23:16:49 +03:00 |
|
|
|
abd1965285
|
Add pylint to CI, production CD
|
2021-05-29 07:30:22 -07:00 |
|
Кравченко Артем
|
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 |
|
Степаненко Ольга
|
01ea7fec99
|
Fix one more problem
|
2021-05-29 16:51:16 +03:00 |
|
Степаненко Ольга
|
e8e45624d9
|
Fix problems
|
2021-05-29 16:43:11 +03:00 |
|
Степаненко Ольга
|
da4ff455d5
|
Add link to Ura's server doc
|
2021-05-29 16:30:43 +03:00 |
|
Кравченко Артем
|
e80c327d85
|
Merge branch 'feature/react_test' into 'develop'
Feature/react test
See merge request 2020-2021/online/s101/group-02/access_controller!85
|
2021-05-28 21:06:10 +00:00 |
|
Кравченко Артем
|
557de38505
|
Merge branch 'hotfix/control_permission' into 'develop'
Fix change permissions when role has changed
See merge request 2020-2021/online/s101/group-02/access_controller!91
|
2021-05-28 21:05:44 +00: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 |
|
Степаненко Ольга
|
1bcb24b9eb
|
Merge branch 'develop' into feature/documentation
|
2021-05-28 11:42:46 +03:00 |
|
Кравченко Артем
|
547b318d1b
|
Merge branch 'feature/statistic/month_name_bug' into 'develop'
Feature/statistic/month name bug
See merge request 2020-2021/online/s101/group-02/access_controller!90
|
2021-05-27 21:45:06 +00:00 |
|
Сокуров Идар
|
bc3c73a03d
|
typo
|
2021-05-27 21:24:47 +00:00 |
|
Sokurov Idar
|
cad6b1c917
|
Fix change permissions when role has changed
|
2021-05-28 00:15:50 +03:00 |
|
Yuriy Kulakov
|
07057c8667
|
Merge branch 'feature/react_test' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into feature/react_test
# Conflicts:
# README.rst
|
2021-05-27 21:21:36 +03:00 |
|
Yuriy Kulakov
|
cdffaed91c
|
Updated README.rst
|
2021-05-27 21:19:37 +03:00 |
|
Andrew Smirnov
|
9fcd1bb9f1
|
Merge branch 'develop' into feature/statistic/month_name_bug
|
2021-05-27 20:45:03 +03:00 |
|
Andrew Smirnov
|
581d6ea4ad
|
Merge branch 'develop' into feature/react_test
|
2021-05-27 20:40:25 +03:00 |
|
Andrew Smirnov
|
fbc6535975
|
Fix pylint, add documentation gen script
|
2021-05-27 20:16:51 +03:00 |
|
Yuriy Kulakov
|
49174804b4
|
Merge branch 'develop' into feature/react_test
|
2021-05-27 20:06:22 +03:00 |
|
Yuriy Kulakov
|
55cba3b036
|
Updated design of control page
|
2021-05-27 20:00:28 +03:00 |
|
Yuriy Kulakov
|
df06c8f807
|
Deleted unused files
|
2021-05-27 19:37:08 +03:00 |
|
Andrew Smirnov
|
9f2d9f11ae
|
Add migration
|
2021-05-27 19:36:02 +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 |
|
Степаненко Ольга
|
7d80372bac
|
Add autodoc-process-signature to sphinx.events
|
2021-05-27 17:47:40 +03:00 |
|
