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 |
|
Кравченко Артем
|
385d75de3e
|
Merge branch 'feature/documentation' into 'develop'
Feature/documentation
See merge request 2020-2021/online/s101/group-02/access_controller!89
|
2021-05-27 12:59:23 +00:00 |
|
Степаненко Ольга
|
bcae073fff
|
Merge with dev
|
2021-05-27 15:54:12 +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 |
|
|
|
e7c8d0935c
|
Merge branch 'hotfix/models' into 'develop'
Change Custom Role ids to BigInt for Postgres Compatibility
See merge request 2020-2021/online/s101/group-02/access_controller!88
|
2021-05-26 16:37:02 +00: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 |
|
Dmitriy Andreev
|
709718ec44
|
Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop
|
2021-05-26 14:41:04 +03:00 |
|
|
|
852a800f61
|
Merge branch 'hotfix/pipeline' into 'develop'
Hotfix/pipeline
See merge request 2020-2021/online/s101/group-02/access_controller!86
|
2021-05-25 19:28:44 +00:00 |
|
|
|
614b82c24d
|
Update README.md pylint section
|
2021-05-25 12:22:43 -07:00 |
|
Sokurov Idar
|
33421ca112
|
del inint.py
|
2021-05-25 21:45:28 +03:00 |
|
Yuriy Kulakov
|
f803b35f4e
|
Added documentation for ControlAccessTests class
|
2021-05-25 20:35:53 +03:00 |
|
Yuriy Kulakov
|
09938ec2fd
|
Updated .gitignore
|
2021-05-25 20:04:39 +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 |
|
|
|
724d246b6b
|
Remove venv from git
|
2021-05-25 09:44:02 -07:00 |
|
Кравченко Артем
|
6ec670a82f
|
Merge branch 'feature/pylint' into 'develop'
Feature/pylint
See merge request 2020-2021/online/s101/group-02/access_controller!75
|
2021-05-25 14:03:00 +00: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 |
|
Andrew Smirnov
|
8039e286ef
|
Fix tests.py, add migration, fix pylint
|
2021-05-20 20:11:53 +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 |
|
Степаненко Ольга
|
26f32327b3
|
Update REDME
|
2021-05-20 18:49:04 +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 |
|
Кравченко Артем
|
1453810fb8
|
Merge branch 'fix/profile_page_look' into 'develop'
Fix/profile page look
See merge request 2020-2021/online/s101/group-02/access_controller!72
|
2021-05-20 15:21:12 +00:00 |
|
Kanris
|
d9f2842bfe
|
Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop
|
2021-05-20 18:13:42 +03:00 |
|
Kanris
|
832889ec8a
|
fixed bug password and token a mutually exclusive
|
2021-05-20 18:13:08 +03:00 |
|
Степаненко Ольга
|
029b602f96
|
Update docs (statistic, zendesk_admin)
|
2021-05-20 17:45:25 +03:00 |
|
Степаненко Ольга
|
1114c916e9
|
Update docs (views, extra_func, forms, models)
|
2021-05-20 16:19:42 +03:00 |
|
|
|
de0da89f0a
|
Add coverage, set up CI.
|
2021-05-19 23:58:30 -07:00 |
|
|
|
c95c0fe00b
|
Delete unused main/apiauth.py
|
2021-05-19 21:46:30 -07:00 |
|
