CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
462 Commits 2 Branches 0 Tags
Commit Graph

462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Smirnov
c1329e6788
Merge branch 'develop' into feature/registration_failed/html 2021-05-13 19:57:44 +03:00
Татищев Юрий
796ffb0898 Merge branch 'feature/tests/profile' into 'develop' 
#77 | Add profile tests

See merge request 2020-2021/online/s101/group-02/access_controller!77
 2021-05-13 04:57:51 +00:00
Сокуров Идар
74f8b1ce1f Add profile tests 2021-05-13 04:57:51 +00:00
Татищев Юрий
082c804dbd Merge branch 'feature/tests/get_tickets' into 'develop' 
#76 | Add get tickets tests

See merge request 2020-2021/online/s101/group-02/access_controller!76
 2021-05-13 04:49:02 +00:00
Сокуров Идар
76cd782ff4 Add get tickets tests 2021-05-13 04:49:02 +00:00
Степаненко Ольга
a6ceae8240 Pylint 10 2021-05-12 20:34:52 +03:00
Татищев Юрий
16feae1bf1 Merge branch 'feature/tests/reset_pass' into 'develop' 
Add reset password tests

See merge request 2020-2021/online/s101/group-02/access_controller!74
 2021-05-11 05:56:40 +00:00
Сокуров Идар
e19cbdb85a Add reset password tests 2021-05-11 05:56:39 +00:00
Степаненко Ольга
f803d81caf Pylint for extra_func.py 2021-05-10 20:49:55 +03:00
Степаненко Ольга
015016bd6e Merge with "develop", begin to check again 2021-05-10 20:43:17 +03:00
Степаненко Ольга
492260dc79 Merge branch 'develop' into feature/pylint 
# Conflicts:
#	main/extra_func.py
#	main/tests.py
#	main/views.py
 2021-05-10 20:22:39 +03:00
Iurii Tatishchev
956a024ba2
Fix data.json 2021-05-10 08:14:41 -07:00
Татищев Юрий
b9d937f3fc Merge branch 'fix/header' into 'develop' 
Fix/header

See merge request 2020-2021/online/s101/group-02/access_controller!73
 2021-05-10 15:05:34 +00:00
Андреев Дмитрий
63949dd54e Fix/header 2021-05-10 15:05:34 +00:00
Dmitriy Andreev
818a3b7dbf Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop 2021-05-09 15:05:43 +03:00
Iurii Tatishchev
e886004069
Remove unnecessary files. 2021-05-06 09:07:21 -07:00
Iurii Tatishchev
be1bfdd259
Revert "Move main helper files to main/lib." 
This reverts commit 6bc1c6d1089ceadd24bcd10a809816a51abb5068.
 2021-05-06 08:47:15 -07:00
Iurii Tatishchev
d426e9a2c4
fix 2021-05-06 08:46:41 -07:00
Iurii Tatishchev
6bc1c6d108
Move main helper files to main/lib. 2021-05-06 08:45:15 -07:00
Татищев Юрий
3481a9891c Merge branch 'feature/profiling' into 'develop' 
Ускорение получения тикетов

See merge request 2020-2021/online/s101/group-02/access_controller!69
 2021-05-06 15:37:23 +00:00
Iurii Tatishchev
cc4c4ffdc2
Merge branch 'develop' into feature/profiling 2021-05-06 08:33:03 -07:00
Татищев Юрий
881b6ffd55 Merge branch 'feature/tests/make_eng' into 'develop' 
#70 | Test make engineer from work and control pages

See merge request 2020-2021/online/s101/group-02/access_controller!68
 2021-05-06 15:22:58 +00: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
Степаненко Ольга
8646e668c1 Pylint for extra_func 2021-05-06 17:36:38 +03:00
Степаненко Ольга
12db461b5d Pylint for views 2021-05-06 16:42:15 +03:00
Степаненко Ольга
bb74072c32 Change set_context function, using **kwargs 2021-05-06 15:23:22 +03:00
Степаненко Ольга
b9cb22e2e5 Commit for lesson 2021-05-06 14:49:45 +03:00
Степаненко Ольга
e0b855d27a Add ru tokenizer 2021-05-06 14:37:08 +03:00
Степаненко Ольга
0be4c1b1ca Merge branch 'feature/pylint' into feature/documentation 2021-05-06 12:51:55 +03:00
Степаненко Ольга
276c979b73 Change make_engineer 2021-05-06 12:51:40 +03:00
Степаненко Ольга
9c54fcca11 Merge branch 'feature/pylint' into feature/documentation 
# Conflicts:
#	main/extra_func.py
 2021-05-06 12:44:12 +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
Степаненко Ольга
ab275fe3f8 Remove second argument from light_agent and make_engineer functions 2021-05-06 11:56:11 +03:00
Степаненко Ольга
cd1196efb2 Merge with develop 2021-05-06 11:26:22 +03:00
Степаненко Ольга
af0c58c50b Merge branch 'develop' into feature/documentation 
# Conflicts:
#	main/extra_func.py
#	main/tests.py
 2021-05-06 11:25:22 +03:00
Степаненко Ольга
4041790e6f Spell new docs, create new README 2021-05-06 11:17:34 +03:00
Татищев Юрий
58717022c5 Merge branch 'hotfix/logs' into 'develop' 
Added logging for work pages

See merge request 2020-2021/online/s101/group-02/access_controller!70
 2021-05-05 23:54:13 +00:00
Timofey Mazurov
f77256937e Added logging for work pages 2021-05-06 02:44:53 +03:00
Татищев Юрий
824077fbd9 Merge branch 'feature/register_tests' into 'develop' 
#72 | Add registration tests

See merge request 2020-2021/online/s101/group-02/access_controller!64
 2021-05-05 23:44:24 +00:00
Сокуров Идар
66339c4f6b Add registration tests 2021-05-05 23:44:24 +00:00
Sokurov Idar
cf2e9ccf21 Add get group tickets requests 2021-05-06 00:41:20 +03:00
Dmitriy Andreev
75a1677f16 data.json fix 2021-05-05 20:57:48 +03:00
Dmitriy Andreev
9f0ccf23e7 Changes data.json in local 2021-05-05 20:43:25 +03:00
Andrew Smirnov
010dff2f9d
Fix model docs and enchant spelling tokenizer 2021-04-29 21:08:11 +03:00
Andrew Smirnov
eb1ef72adb
Merge branch 'develop' into feature/pylint 
# Conflicts:
#	main/extra_func.py
 2021-04-29 20:38:20 +03:00