|
|
ccae7ada4b
|
Rename title for statistic and work pages
|
2021-05-29 23:23:29 -07:00 |
|
|
|
74661bd7a4
|
Add DOCS_URL to settings, update README and env.example
|
2021-05-29 22:59:20 -07:00 |
|
Kanris
|
a86f137ce0
|
fix master confl
|
2021-05-30 01:16:09 +03: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 |
|
|
|
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 |
|
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 |
|
Кравченко Артем
|
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 |
|
Степаненко Ольга
|
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 |
|
Сокуров Идар
|
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 |
|
Andrew Smirnov
|
9fcd1bb9f1
|
Merge branch 'develop' into feature/statistic/month_name_bug
|
2021-05-27 20:45:03 +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 |
|
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 |
|
Степаненко Ольга
|
8747fc4aa1
|
Merge branch 'develop' into feature/documentation
# Conflicts:
# README.md
# main/apiauth.py
# main/tests.py
# requirements/dev.txt
|
2021-05-27 15:39:09 +03:00 |
|
Степаненко Ольга
|
a908fc4388
|
Add user docs
|
2021-05-27 15:24:56 +03:00 |
|
Кравченко Артем
|
ad0c4b0960
|
Merge branch 'hotfix/control_page_design' into 'develop'
Улучшение дизайна сайта.
See merge request 2020-2021/online/s101/group-02/access_controller!87
|
2021-05-27 10:33:29 +00:00 |
|
Степаненко Ольга
|
22154ca7fc
|
Add tests docs: params for Mock
|
2021-05-26 21:13:35 +03:00 |
|
|
|
e595156f56
|
Change custom role ids to BigInt for postgres compatibility.
|
2021-05-26 09:10:26 -07: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
|
f803b35f4e
|
Added documentation for ControlAccessTests class
|
2021-05-25 20:35:53 +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 |
|
Степаненко Ольга
|
fdc1f3b448
|
Add tests docs, draft 2
|
2021-05-24 20:22:53 +03:00 |
|
Степаненко Ольга
|
dc47c12efc
|
Fix problem in test for pylint
|
2021-05-23 21:05:06 +03:00 |
|
Степаненко Ольга
|
975b608577
|
Add tests docs
|
2021-05-23 17:09:52 +03:00 |
|
Степаненко Ольга
|
f56a2a82bb
|
Merge branch 'develop' into feature/documentation
# Conflicts:
# main/apiauth.py
# main/tests.py
# requirements/common.txt
# requirements/dev.txt
|
2021-05-23 11:51:41 +03:00 |
|
Yuriy Kulakov
|
be6a8d1196
|
Removed js modules files from static
|
2021-05-21 20:52:22 +03:00 |
|
Andrew Smirnov
|
45ac484480
|
Update statistic docs
|
2021-05-20 20:41:55 +03:00 |
|
Andrew Smirnov
|
ee2959e16a
|
Merge branch 'develop' into feature/react_test
# Conflicts:
# main/tests.py
|
2021-05-20 20:23:27 +03:00 |
|
