Sokurov Idar
|
5c3801c317
|
Add password change page
|
2021-04-26 21:47:45 +03:00 |
|
Сокуров Идар
|
30e4d93c81
|
Update views.py
|
2021-04-20 20:30:11 +00:00 |
|
Sokurov Idar
|
05a4bc70f2
|
minor fix
|
2021-04-20 23:01:31 +03:00 |
|
Sokurov Idar
|
cff6443eca
|
Add notifications on work page, rebase already exists with notifications.js
|
2021-04-20 22:55:22 +03:00 |
|
 Сокуров ИдарandCaZzzer
|
9543a2935c
|
Hotfix/gmail. Issue #57
|
2021-04-15 04:45:18 +00:00 |
|
Sokurov Idar
|
2c14f65d4f
|
Merge branch 'develop' into feature/registration_bug
# Conflicts:
# main/views.py
|
2021-04-13 22:11:31 +03:00 |
|
Sokurov Idar
|
8a0a1639fc
|
Add new page if email has not sent
|
2021-04-13 20:58:36 +03:00 |
|
Сокуров Идар
|
68b1f64d36
|
Change sequence of actions
|
2021-04-13 14:15:12 +00:00 |
|
Sokurov Idar
|
8c0a589173
|
Add SMTP error check
|
2021-04-11 01:12:07 +03:00 |
|
Sokurov Idar
|
f47840f292
|
small refactoring
|
2021-03-29 22:37:18 +03:00 |
|
Sokurov Idar
|
9e49a12524
|
Merge branch 'develop' into feature/statistic/main
# Conflicts:
# main/models.py
# main/views.py
|
2021-03-29 21:45:07 +03:00 |
|
Sokurov Idar
|
6fd81c3ccc
|
marge statistic/backend and statistic/frontend
|
2021-03-29 21:40:13 +03:00 |
|
Sokurov Idar
|
b50a6668a6
|
Merge branch 'develop' into feature/statistic/html
|
2021-03-18 22:59:40 +03:00 |
|
Sokurov Idar
|
358351d6da
|
optimize imports
|
2021-03-18 20:19:08 +03: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
|
b5c3a12193
|
minor fix
|
2021-03-18 20:07:21 +03:00 |
|
Sokurov Idar
|
5ec2407211
|
Add ticket unassignment
|
2021-03-17 09:35:15 +03:00 |
|
Sokurov Idar
|
0cc788c039
|
minor fix
|
2021-03-14 17:26:41 +03:00 |
|
Sokurov Idar
|
a430ee871d
|
Add ticket unassignment(exclude solved tickets)
|
2021-03-14 17:13:41 +03:00 |
|
Sokurov Idar
|
1cd8874e03
|
Merge branch 'develop' into hotfix/ticket_unassignment
# Conflicts:
# main/models.py
|
2021-03-14 13:12:59 +03:00 |
|
Sokurov Idar
|
9068febd30
|
bugfix
|
2021-03-11 19:55:09 +03:00 |
|
Sokurov Idar
|
60e1da2825
|
12-hour working day
|
2021-03-11 19:17:11 +03:00 |
|
Sokurov Idar
|
dd08821aea
|
fix bag
|
2021-03-11 18:14:57 +03:00 |
|
Sokurov Idar
|
ef9d0fc721
|
Merge branch 'develop' into feature/statistic/backend
|
2021-03-11 17:31:02 +03:00 |
|
Sokurov Idar
|
b825bcdff3
|
Update class StatisticData
|
2021-03-11 17:30:55 +03:00 |
|
Sokurov Idar
|
5efec2641a
|
Refactor statistic page with class StatisticData
|
2021-03-09 00:53:11 +03:00 |
|
Sokurov Idar
|
ce55ec61e6
|
extract function for easier processing a list of emails in future
|
2021-03-08 22:48:31 +03:00 |
|
Sokurov Idar
|
811ea45532
|
Merge branch 'develop' into feature/statistic/backend
|
2021-03-08 21:07:32 +03:00 |
|
Sokurov Idar
|
b96deab2cb
|
Update statistic backend
|
2021-03-08 21:07:09 +03:00 |
|
Sokurov Idar
|
49046022d7
|
small refactor: change variable`s names, add a bit documentation
|
2021-03-08 17:50:47 +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 |
|
Sokurov Idar
|
8566e2b5b6
|
Updated version with days iteration
|
2021-03-04 23:13:10 +03:00 |
|
Sokurov Idar
|
fd1e048ebe
|
statistic backend first version
|
2021-03-04 01:25:56 +03:00 |
|
Sokurov Idar
|
4299b1ed37
|
Merge branch 'develop' into feature/registration
# Conflicts:
# access_controller/urls.py
# main/extra_func.py
# main/forms.py
# main/views.py
|
2021-03-02 21:53:43 +03:00 |
|
Sokurov Idar
|
f50ce49d77
|
update login with email
|
2021-03-02 21:44:13 +03:00 |
|
Сокуров Идар
|
25734d847f
|
Add password reset
|
2021-02-23 09:01:32 +00:00 |
|
Sokurov Idar
|
8b512afadb
|
fix bug, update registration
|
2021-02-19 17:55:27 +03:00 |
|
Sokurov Idar
|
0953a0627e
|
Temporary
|
2021-02-18 20:58:10 +03:00 |
|
Sokurov Idar
|
c2c1477983
|
small refactoring
|
2021-02-18 19:50:33 +03:00 |
|
Sokurov Idar
|
b777d47041
|
Recreate registration v1
|
2021-02-18 19:22:10 +03:00 |
|
Sokurov Idar
|
023eb69c0a
|
add models migration
|
2021-02-16 22:33:54 +03:00 |
|
Sokurov Idar
|
21ab4bf6cc
|
Complete registration, small update profile.html
|
2021-02-16 22:32:29 +03:00 |
|
Sokurov Idar
|
d91f5b8ba8
|
Add media to staticfiles, update profile.html
|
2021-02-11 21:26:02 +03:00 |
|
Sokurov Idar
|
8de78e06c4
|
Merge branch 'feature/registration'
|
2021-02-10 19:16:27 +03:00 |
|
Sokurov Idar
|
e5964f6eaf
|
Merge branch 'feature/registration' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into feature/registration
# Conflicts:
# main/views.py
|
2021-02-10 19:16:16 +03:00 |
|
Sokurov Idar
|
938b9894fe
|
Add Zendesk password check
Add Bootstrap to forms
Add custom form
|
2021-02-10 19:05:46 +03:00 |
|
Сокуров Идар
|
0bc34f8100
|
Update main/views.py, README.md files
|
2021-02-08 17:17:03 +00:00 |
|
Sokurov Idar
|
729c0bec7e
|
Email on zendesk exist check
|
2021-02-08 20:12:24 +03:00 |
|
Sokurov Idar
|
16fd0e3983
|
Merge remote-tracking branch 'origin/feature/profile_page' into feature/registration
# Conflicts:
# access_controller/urls.py
# main/views.py
|
2021-02-08 19:12:51 +03:00 |
|
Sokurov Idar
|
b8e3d11c6f
|
Add first version registration
|
2021-02-08 19:10:44 +03:00 |
|
Сокуров Идар
|
d686a1566e
|
Small fix profile.html
|
2021-02-07 14:13:50 +00:00 |
|
Сокуров Идар
|
0583e350db
|
Add request access button
|
2021-02-06 12:27:45 +00:00 |
|
Sokurov Idar
|
3d4a49a350
|
fix typo
|
2021-02-06 14:45:39 +03:00 |
|
Sokurov Idar
|
981e793e3e
|
Add profile page and temporary base.html
|
2021-02-06 14:33:55 +03:00 |
|