558 Commits

Author SHA1 Message Date
023ba628dd
Drone CI fix global variables again
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-10 22:43:47 -07:00
a2a5ef8fa6
Drone CI add style pipeline with pylint 2021-10-10 22:42:11 -07:00
583cf626fd
Drone CI fix global variables
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-10 22:37:37 -07:00
4dfa245cc9
Drone CI shared venv 2021-10-10 22:35:04 -07:00
9c24eb6b61
Drone CI fix S3 endpoint setting typo
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-10 21:02:46 -07:00
e0bb287b7c
Drone CI change S3 endpoint to local
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 20:59:27 -07:00
2ccf8a4eb3
Drone CI change S3 region to secret
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 20:50:42 -07:00
121eca8d64
Drone CI S3 "expecting 'ap-southeast-1'"?
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 20:41:18 -07:00
9773dd2dde
Drone CI switch to S3 DNS style
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 20:37:33 -07:00
300fc71e6b
Drone CI switch back to Minio S3
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 18:06:24 -07:00
080e04c520
Drone CI switch to AWS S3 for testing
All checks were successful
continuous-integration/drone/push Build is passing
2021-10-10 17:48:19 -07:00
1dd7a1c3c4
Drone CI debug S3 settings
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 17:21:53 -07:00
30bda495c1
Drone CI fix S3 region
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 14:40:42 -07:00
2d57145a6e
Drone CI global variables
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 14:33:46 -07:00
951d4fac83
Add env to Drone CI
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2021-10-10 14:30:29 -07:00
9aa315e2c2
Experiment with Drone CI
Some checks failed
continuous-integration/drone/push Build is failing
2021-10-10 14:18:39 -07:00
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