Yuriy Kulakov
|
3cdc944ce4
|
Merge branch 'develop' into feature/react_test
# Conflicts:
# README.md
# main/tests.py
|
2021-05-25 19:55:07 +03:00 |
|
Yuriy Kulakov
|
be6a8d1196
|
Removed js modules files from static
|
2021-05-21 20:52:22 +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 |
|
Кравченко Артем
|
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 |
|
Yuriy Kulakov
|
fe1f22efbd
|
Merge branch 'develop' into feature/react_test
|
2021-05-16 20:44:11 +03:00 |
|
Andrew Smirnov
|
839a333691
|
Merge branch 'develop' into feature/pylint
# Conflicts:
# main/tests.py
# main/views.py
# main/zendesk_admin.py
# requirements/common.txt
|
2021-05-13 20:45:06 +03:00 |
|
Andrew Smirnov
|
edd32094c0
|
Remov django-node-assets from settings, add sudo request in npm install -g npx
|
2021-05-13 20:10:38 +03:00 |
|
|
|
86995e01b3
|
Add python-dotenv
|
2021-05-13 17:04:56 +00: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
|
c1329e6788
|
Merge branch 'develop' into feature/registration_failed/html
|
2021-05-13 19:57:44 +03:00 |
|
Степаненко Ольга
|
a6ceae8240
|
Pylint 10
|
2021-05-12 20:34:52 +03:00 |
|
Сокуров Идар
|
0086d4909e
|
Feature/tests/make_eng from work and control pages
|
2021-05-06 15:22:57 +00:00 |
|
Степаненко Ольга
|
5ea0aa9454
|
Fix
|
2021-05-06 18:17:20 +03:00 |
|
Степаненко Ольга
|
0dc840bba7
|
Merge remote-tracking branch 'origin/feature/pylint' into feature/pylint
# Conflicts:
# README.md
# access_controller/settings.py
# main/extra_func.py
# main/models.py
# main/views.py
|
2021-05-06 18:10:57 +03:00 |
|
Степаненко Ольга
|
22d4833ae0
|
Pylint for lesson
|
2021-05-06 17:53:28 +03:00 |
|
Степаненко Ольга
|
12db461b5d
|
Pylint for views
|
2021-05-06 16:42:15 +03:00 |
|
Степаненко Ольга
|
f24c94914f
|
Change User to get_user_model - fix problems
|
2021-05-06 12:43:44 +03:00 |
|
Степаненко Ольга
|
9c9b4dd08b
|
Change User to get_user_model
|
2021-05-06 12:26:45 +03:00 |
|
Степаненко Ольга
|
4b25ec4b33
|
Merge branch 'develop' into feature/pylint
# Conflicts:
# main/extra_func.py
# main/tests.py
|
2021-05-06 12:00:39 +03:00 |
|
Сокуров Идар
|
66339c4f6b
|
Add registration tests
|
2021-05-05 23:44:24 +00:00 |
|
Andrew Smirnov
|
eea8e0aab8
|
Pylint improvements
|
2021-04-29 20:37:38 +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 |
|
Степаненко Ольга
|
2e3e567d2d
|
Use pylint for some files
|
2021-04-28 18:57:36 +03:00 |
|
Степаненко Ольга
|
d828afc504
|
Merge branch 'develop' into feature/pylint
|
2021-04-28 14:27:27 +03:00 |
|
Степаненко Ольга
|
d8b15d087b
|
Add pylint settings - .pylintrc file
|
2021-04-28 11:53:29 +03:00 |
|
Yuriy Kulakov
|
3b9ae4f2fa
|
Added django_node_assets
|
2021-04-27 20:24:58 +03:00 |
|
Sokurov Idar
|
5c3801c317
|
Add password change page
|
2021-04-26 21:47:45 +03:00 |
|
Artyom Kravchenko
|
f4d4cffa9f
|
tmp commit
|
2021-04-19 17:52:10 +03:00 |
|
|
|
cc08c0171b
|
Merge branch 'develop' into feature/docker
|
2021-04-15 09:40:00 -07:00 |
|
|
|
508324c62c
|
Move email, secrets, run params to env. Update README.md
|
2021-04-09 01:34:19 -07:00 |
|
Artyom Kravchenko
|
0e6f016d1e
|
Merge branch 'develop' into feature/docker
|
2021-04-08 15:45:43 +03:00 |
|
Artyom Kravchenko
|
19fc23808c
|
test nginx
|
2021-04-08 15:39:47 +03:00 |
|
Artyom Kravchenko
|
870cbca99c
|
tmp commit
|
2021-04-06 18:04:13 +03:00 |
|
Artyom Kravchenko
|
ff8834f22d
|
fixed migrations bug
|
2021-03-31 15:02:37 +03:00 |
|
Artyom Kravchenko
|
7de09037c1
|
add env params
|
2021-03-31 10:54:16 +03:00 |
|
Artyom Kravchenko
|
d58c1c9fd8
|
db path fixed
|
2021-03-30 23:30:31 +03:00 |
|
Artyom Kravchenko
|
4f106c4e17
|
merge dev
|
2021-03-30 17:32:35 +03:00 |
|
Artyom Kravchenko
|
e96ee7ac5b
|
modified setings for starting db with docker volume
|
2021-03-22 17:08:17 +03:00 |
|
|
|
0c2e2d81bc
|
#43 | Add max agents setting. Spots left count on /work/<id> and /control/
|
2021-03-19 23:45:08 -07:00 |
|
Sokurov Idar
|
e563475ecd
|
Merge branch 'develop' into hotfix/ticket_unassignment
# Conflicts:
# access_controller/settings.py
# main/extra_func.py
# main/views.py
|
2021-03-18 20:18:13 +03:00 |
|
Sokurov Idar
|
5ec2407211
|
Add ticket unassignment
|
2021-03-17 09:35:15 +03:00 |
|
Sokurov Idar
|
a430ee871d
|
Add ticket unassignment(exclude solved tickets)
|
2021-03-14 17:13:41 +03:00 |
|
Yuriy Kulakov
|
d300cc2f06
|
Merge branch 'develop' into feature/periodic
# Conflicts:
# access_controller/settings.py
# access_controller/urls.py
# main/extra_func.py
# main/views.py
|
2021-03-12 15:37:50 +03:00 |
|
Sokurov Idar
|
60e1da2825
|
12-hour working day
|
2021-03-11 19:17:11 +03:00 |
|
Yuriy Kulakov
|
8488ea88c2
|
Added Django REST but have some bugs
|
2021-03-07 21:30:02 +03:00 |
|
Sokurov Idar
|
4a604f0941
|
Merge branch 'develop' into feature/statistic/backend
# Conflicts:
# access_controller/urls.py
# main/forms.py
# main/views.py
|
2021-03-04 23:16:21 +03:00 |
|
Кулаков Юрий
|
9ddf1db2a3
|
Fixed bug with permissions
|
2021-03-04 20:45:55 +03:00 |
|
Sokurov Idar
|
fd1e048ebe
|
statistic backend first version
|
2021-03-04 01:25:56 +03:00 |
|
