Commit Graph

  • f6948d016d add some design to menu template(logo and color) Artyom Kravchenko 2021-03-12 14:39:51 +03:00
  • bd500207a3 Fixed AdminPageUSer form Artyom Kravchenko 2021-03-12 13:58:27 +03:00
  • abe44fec5f Refactored some functions in AdminPageView Yuriy Kulakov 2021-03-12 13:01:41 +03:00
  • 5665282ce5 fixed UserProfile model Artyom Kravchenko 2021-03-12 12:34:45 +03:00
  • d2e76fdbd9
    Update model, add documentation todos, add sampla code for logging. Andrew Smirnov 2021-03-11 20:54:56 +03:00
  • 674df0e66b
    Add model for tracking unassigned tickets Andrew Smirnov 2021-03-11 20:28:04 +03:00
  • 9068febd30 bugfix Sokurov Idar 2021-03-11 19:55:09 +03:00
  • 72b70cc585 Fixed bug with api response Yuriy Kulakov 2021-03-11 19:29:16 +03:00
  • 60e1da2825 12-hour working day Sokurov Idar 2021-03-11 19:17:11 +03:00
  • 9b6238fa45 1/2 partof statistic.html Kiselev Igor 2021-03-11 19:03:45 +03:00
  • dd08821aea fix bag Sokurov Idar 2021-03-11 18:14:57 +03:00
  • ef9d0fc721 Merge branch 'develop' into feature/statistic/backend Sokurov Idar 2021-03-11 17:31:02 +03:00
  • b825bcdff3 Update class StatisticData Sokurov Idar 2021-03-11 17:30:55 +03:00
  • 7085532915 Merge branch 'bug/migrations' into 'develop' Татищев Юрий 2021-03-11 08:17:11 +00:00
  • c2d6a790f9
    Add meta with permissions to UserProfile, fix ./manage.py migrate errors Iurii Tatishchev 2021-03-11 00:10:44 -08:00
  • 3c43e0e38a
    Add models help text migration Iurii Tatishchev 2021-03-11 00:04:05 -08:00
  • 5efec2641a Refactor statistic page with class StatisticData Sokurov Idar 2021-03-09 00:53:11 +03:00
  • ce55ec61e6 extract function for easier processing a list of emails in future Sokurov Idar 2021-03-08 22:48:31 +03:00
  • 811ea45532 Merge branch 'develop' into feature/statistic/backend Sokurov Idar 2021-03-08 21:07:32 +03:00
  • b96deab2cb Update statistic backend Sokurov Idar 2021-03-08 21:07:09 +03:00
  • 49046022d7 small refactor: change variable`s names, add a bit documentation Sokurov Idar 2021-03-08 17:50:47 +03:00
  • 52f7858439 Merge branch 'feature/engineers_bug_page' into 'develop' Кравченко Артем 2021-03-08 13:41:54 +00:00
  • b01f5fb236 add button from menu for engineer rules request Artyom Kravchenko 2021-03-08 02:28:00 +03:00
  • 7ee8cc96af fixed get and end engineer role fuctions Artyom Kravchenko 2021-03-07 23:08:56 +03:00
  • 8488ea88c2 Added Django REST but have some bugs Yuriy Kulakov 2021-03-07 21:30:02 +03:00
  • fe944f4875 Fixed info bug on page Artyom Kravchenko 2021-03-06 01:36:19 +03:00
  • 21b29fdc11 Added statistic layout Vadim Melnikov 2021-03-05 19:07:13 +03:00
  • 4ab15526ee Final registration failed html page Vadim Melnikov 2021-03-05 14:31:45 +03:00
  • 4a604f0941 Merge branch 'develop' into feature/statistic/backend Sokurov Idar 2021-03-04 23:16:21 +03:00
  • 8566e2b5b6 Updated version with days iteration Sokurov Idar 2021-03-04 23:13:10 +03:00
  • 5909750fcc
    Remove todolist commant Andrew Smirnov 2021-03-04 20:56:38 +03:00
  • a393c31a13
    Merge remote-tracking branch 'origin/develop' into develop Andrew Smirnov 2021-03-04 20:56:02 +03:00
  • 1d7ff524b0
    Documentation fix Andrew Smirnov 2021-03-04 20:54:45 +03:00
  • ba548ded2e Merge branch 'feature/adm_ruleset/backend' into 'develop' Кравченко Артем 2021-03-04 17:50:44 +00:00
  • fa3716c2df Merge branch 'develop' into feature/adm_ruleset/backend Кулаков Юрий 2021-03-04 20:46:25 +03:00
  • 9ddf1db2a3 Fixed bug with permissions Кулаков Юрий 2021-03-04 20:45:55 +03:00
  • 656081295e
    Profile view page refactoring Andrew Smirnov 2021-03-04 20:01:10 +03:00
  • 3a448a399a Merge branch 'feature/adm_ruleset/backend' into 'develop' Кравченко Артем 2021-03-04 16:20:17 +00:00
  • 525bb25697 Merge branch 'develop' into feature/adm_ruleset/backend Yuriy Kulakov 2021-03-04 19:06:45 +03:00
  • 1fac1b4835 Merge branch 'develop' into feature/adm_ruleset/backend Yuriy Kulakov 2021-03-04 18:32:08 +03:00
  • d46b90010d Added permissions system to control page Yuriy Kulakov 2021-03-04 18:22:49 +03:00
  • dbe49d1c34 Merge branch 'feature/documentation' into 'develop' Кравченко Артем 2021-03-04 13:06:14 +00:00
  • fd1e048ebe statistic backend first version Sokurov Idar 2021-03-04 01:25:56 +03:00
  • cd47331ae7 After mergin develop Степаненко Ольга 2021-03-03 21:05:31 +03:00
  • 2bfa6619b1 Merge branch 'develop' into feature/documentation Степаненко Ольга 2021-03-03 21:02:40 +03:00
  • 0cda9da311 Add views and forms documentation Степаненко Ольга 2021-03-03 20:59:53 +03:00
  • 6cdd787cc8 add typehints to requirements Artyom Kravchenko 2021-03-03 13:46:44 +03:00
  • b84824f888 Merge branch 'feature/registration' into 'develop' Кравченко Артем 2021-03-02 20:10:29 +00:00
  • 4299b1ed37 Merge branch 'develop' into feature/registration Sokurov Idar 2021-03-02 21:53:43 +03:00
  • f50ce49d77 update login with email Sokurov Idar 2021-03-02 21:44:13 +03:00
  • 401b43e933 Merge branch 'feature/documentation' into 'develop' Кравченко Артем 2021-03-02 18:15:52 +00:00
  • 5f3684ef64 Merge branch 'feature/work/backend' into 'develop' Кравченко Артем 2021-03-02 18:15:16 +00:00
  • 09a423060c Merge 'develop' into 'feature/work/backend' Andrey Kovalev 2021-03-02 20:19:42 +03:00
  • 525a5a61d2 Change extra_func documentation Степаненко Ольга 2021-03-02 16:52:20 +03:00
  • edbe0a66af Change extra_func documentation Степаненко Ольга 2021-03-02 15:10:28 +03:00
  • 4a9b3d71a4 Add typehints Степаненко Ольга 2021-03-02 12:30:56 +03:00
  • f9e6b79f01 Change models documentation using snippets Степаненко Ольга 2021-03-02 09:52:18 +03:00
  • a64e641a33 Change conf using github snippet Степаненко Ольга 2021-03-01 21:18:27 +03:00
  • cd50427532 Change conf Степаненко Ольга 2021-03-01 20:52:39 +03:00
  • 042e59a989 Change conf Степаненко Ольга 2021-03-01 20:50:25 +03:00
  • f7522c9c69 Fix page html code Andrey Kovalev 2021-02-28 17:27:07 +03:00
  • bcc3bdcafa Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop Dmitriy Andreev 2021-02-26 21:54:22 +03:00
  • c9875596c0 Improved registration failed html a bit Vadim Melnikov 2021-02-26 18:18:33 +03:00
  • 1f55c66516 Merge branch 'feature/adm_ruleset/backend' into 'develop' Кравченко Артем 2021-02-26 07:13:28 +00:00
  • 8df2b66b7a Added engineers and light_agents count from organization to control page Кулаков Юрий 2021-02-25 21:57:04 +03:00
  • a12476ff70 changed function name Кулаков Юрий 2021-02-25 20:41:05 +03:00
  • 62b4b912e8 changed function name Кулаков Юрий 2021-02-25 20:38:29 +03:00
  • 7bb3bf79f1
    Small codestyle fixes Andrew Smirnov 2021-02-25 20:31:35 +03:00
  • 3337596749
    Remove useless auth check Andrew Smirnov 2021-02-25 20:05:04 +03:00
  • 8ac6b10af2 merged with develop Yuriy Kulakov 2021-02-25 19:31:26 +03:00
  • b1d42ece61 Fixed name parametrs in env Andrey Kovalev 2021-02-25 19:01:09 +03:00
  • d3313c7ecf Added kind of dirty registration failed html Vadim Melnikov 2021-02-25 18:52:57 +03:00
  • 918306aa48 Merge branch 'develop' into feature/adm_ruleset/backend Yuriy Kulakov 2021-02-25 18:41:08 +03:00
  • 61ea10f1d2 test role change Artyom Kravchenko 2021-02-25 18:24:14 +03:00
  • a6c8910b63 Merge branch 'feature/password_reset' into 'develop' Кравченко Артем 2021-02-25 14:21:51 +00:00
  • c71949dac6 Кнопка восстановления пароля привязана к странице Тонковид Роман 2021-02-25 16:13:49 +03:00
  • b0932c94b6 merge registration branch Artyom Kravchenko 2021-02-25 14:17:36 +03:00
  • 3f0aed5c73 Merge branch 'feature/adm_ruleset/html' into 'develop' Кравченко Артем 2021-02-25 08:49:51 +00:00
  • baf02cca44 Added user list function Yuriy Kulakov 2021-02-23 19:46:43 +03:00
  • 25734d847f Add password reset Сокуров Идар 2021-02-23 09:01:32 +00:00
  • 034c3eed70 Added admin control page Yuriy Kulakov 2021-02-21 21:35:36 +03:00
  • 8b512afadb fix bug, update registration Sokurov Idar 2021-02-19 17:55:27 +03:00
  • e955dfab99
    Fix registrationForm (add is_valid call) Andrew Smirnov 2021-02-18 21:04:45 +03:00
  • 0953a0627e Temporary Sokurov Idar 2021-02-18 20:58:10 +03:00
  • d19cfd103d done! Ivan Pesnya 2021-02-18 20:51:34 +03:00
  • ca1fab09c9
    Add logging framework usage example Andrew Smirnov 2021-02-18 20:45:56 +03:00
  • c2c1477983 small refactoring Sokurov Idar 2021-02-18 19:50:33 +03:00
  • b777d47041 Recreate registration v1 Sokurov Idar 2021-02-18 19:22:10 +03:00
  • 46dc0f6ab6 Merge branch 'feature/documentation' into 'develop' Кравченко Артем 2021-02-18 09:34:17 +00:00
  • cc44bdf068 Add template of users documentation Степаненко Ольга 2021-02-18 11:44:13 +03:00
  • ae5ed94bc9 Change extra_func documentation Степаненко Ольга 2021-02-18 10:49:17 +03:00
  • f25e2cd6ad Add forms documentation Степаненко Ольга 2021-02-18 09:23:11 +03:00
  • 774cbbe802 Fix warnings Степаненко Ольга 2021-02-18 09:19:00 +03:00
  • 61fa8761eb Merge branch 'develop' into feature/documentation Степаненко Ольга 2021-02-18 07:35:35 +03:00
  • 7708c0dbda Merge branch 'feature/logging/model' into 'develop' Кравченко Артем 2021-02-17 22:33:47 +00:00
  • 9342499d87 Added registration success layout Vadim Melnikov 2021-02-17 21:57:24 +03:00
  • 8ba662c0ca Fix role end-user -> admin Andrey Kovalev 2021-02-17 21:38:41 +03:00
  • bf69c870cd Add rights management backend Andrey Kovalev 2021-02-17 20:43:57 +03:00
  • 7e8bcb96e7 Added a model for logging user role changes Кулаков Юрий 2021-02-17 20:30:57 +03:00
  • 227038ea38 Merge branch 'feature/work/html' into 'develop' Кравченко Артем 2021-02-17 12:58:49 +00:00