Commit Graph

409 Commits

Author SHA1 Message Date
iIronside
3420a4a048 the document module is finished 2021-12-27 16:50:17 +03:00
iIronside
f3deab46cc write migrations for documents 2021-12-23 14:34:21 +03:00
164771dc89
Merge pull request #81 from apuc/add_task
Add task
2021-12-23 11:51:56 +03:00
iIronside
ac4e5d62ec changes in manager and manager_employee, replaced user_id to card_id 2021-12-23 11:28:27 +03:00
iIronside
ce25dc44ea Merge remote-tracking branch 'origin/add_task' into add_task 2021-12-21 17:39:44 +03:00
iIronside
1fa8fa5009 changes in task_user, replaced user_id to card_id 2021-12-21 17:39:21 +03:00
iIronside
e07dd0eff6 update foreign key in task in task 2021-12-20 17:49:11 +03:00
cae7ae68d0
Merge pull request #80 from apuc/add_task
Add task
2021-12-17 16:41:38 +03:00
andrey
da9334dcf6 merge 2021-12-17 16:40:31 +03:00
iIronside
ef0889aac6 add filters, some improvements 2021-12-17 15:16:45 +03:00
iIronside
994353d557 add multi-assignment to tasks and projects 2021-12-16 17:14:33 +03:00
andrey
243d7ae4c0 Merge branch 'master' of https://github.com/apuc/guild 2021-12-11 15:54:37 +03:00
0bba94878f
Merge pull request #77 from q6q9/move-resume-in-page
Переместил резюме
2021-12-11 15:53:51 +03:00
anatolidew
5c80f72ee5 Переместил резюме 2021-12-10 15:29:07 +03:00
iIronside
27c0951202 return relation from project_user to user_card 2021-12-10 10:53:43 +03:00
andrey
2f565bd97a Merge branch 'master' of https://github.com/apuc/guild 2021-12-06 17:07:37 +03:00
andrey
25377d272d report by date 2021-12-06 17:07:27 +03:00
afe743a6f3
Merge pull request #76 from apuc/add_task
changed the creator for tasks from project_user to user, fixed api, d…
2021-12-06 17:06:46 +03:00
iIronside
e78ff7d779 changed the creator for tasks from project_user to user, fixed api, documentation, filters, some other fixes 2021-12-06 15:13:31 +03:00
andrey
31c35676f3 profile search fix 2021-11-30 17:18:07 +03:00
andrey
c3f2f76f5c Merge branch 'master' of https://github.com/apuc/guild 2021-11-30 16:54:13 +03:00
andrey
941a3964c6 profile and reports fix 2021-11-30 16:54:04 +03:00
7a963fd4ae
Merge pull request #75 from q6q9/new-api-docs
* обновление документации апи
2021-11-30 12:42:36 +03:00
anatolidew
234d5036fd * обновление документации апи 2021-11-30 11:29:43 +03:00
andrey
df5823730f Merge branch 'master' of https://github.com/apuc/guild 2021-11-29 18:22:02 +03:00
andrey
57cb9df4bf api cors 2021-11-29 18:21:50 +03:00
402e1863e4
Merge pull request #74 from q6q9/api-reports
Api reports
2021-11-29 18:21:04 +03:00
anatolidew
d00c93d4be * Убрал лишнее 2021-11-29 18:17:23 +03:00
anatolidew
8ae7b9a125 * Просмотр 1 репорта
* Создание тасков
2021-11-29 18:16:28 +03:00
53514bee94
Merge pull request #72 from q6q9/changes
add resume & fix bag minutes
2021-11-29 13:53:26 +03:00
e405b790fd
Merge pull request #73 from q6q9/ru-datepicker
русский датапикер
2021-11-29 13:50:54 +03:00
anatolidew
e742c582bc русский датапикер 2021-11-29 13:22:25 +03:00
anatolidew
8400da1033 * убрал лишнее 2021-11-25 14:19:38 +03:00
anatolidew
c4139baeb2 * баг с минутами
* добавлено редактирование портфолио
2021-11-25 14:04:14 +03:00
fd384ec957
Merge pull request #71 from apuc/add_task
drop ForeignKey user_project_user in m211123_082634_change_foreign_ke…
2021-11-25 13:13:54 +03:00
iIronside
daae8b16b6 drop ForeignKey user_project_user in m211123_082634_change_foreign_key_in_project_user_from_user_card_table_to_user_table 2021-11-25 13:08:10 +03:00
dc3db9e68a
Merge pull request #70 from apuc/add_task
Add task
2021-11-25 13:02:08 +03:00
iIronside
9e964222ae add api, docs 2021-11-25 12:33:08 +03:00
iIronside
7d886ff7c3 add task, fixed executors in all projects 2021-11-24 13:05:12 +03:00
andrey
8e490ce518 Merge branch 'add_minutes' of https://github.com/q6q9/guild into add_minutes 2021-11-23 16:16:09 +03:00
iIronside
a058b1baa1 the project-user is finished 2021-11-23 14:58:28 +03:00
iIronside
ae99b9c4df add task module 2021-11-23 13:13:19 +03:00
anatolidew
b45e9a9033 * миграция на минуты 2021-11-23 11:03:19 +03:00
anatolidew
28294fc8ca * убрал лишнее 2021-11-23 11:01:35 +03:00
anatolidew
45fcfe16d1 * добавил минуты
* исправил баг в календаре с 12 месяцем ('yyyy-00-dd' => 'yyyy-12-dd')
2021-11-23 10:55:41 +03:00
iIronside
12648f16f8 complete the manager module 2021-11-22 15:34:46 +03:00
iIronside
957e777da5 merge 2021-11-17 16:45:52 +03:00
iIronside
4869d47e33 Merge branch 'master' of https://github.com/apuc/guild into add_questionnare 2021-11-17 16:31:05 +03:00
iIronside
759bc9c748 set secure and visible option in left menu 2021-11-17 15:57:53 +03:00
iIronside
964d5491f3 Merge remote-tracking branch 'origin/add_questionnare' into add_questionnare
# Conflicts:
#	backend/views/layouts/left.php
2021-11-17 15:45:04 +03:00