Commit Graph

482 Commits

Author SHA1 Message Date
4cbb004c4d
Merge pull request #86 from apuc/add_document
update get-template-list method
2022-01-14 18:00:05 +03:00
iIronside
495eb9a1a4 update get-template-list method 2022-01-14 17:34:11 +03:00
andrey
8806be42b2 fix api controllers 2022-01-14 17:05:29 +03:00
a189c07c02
Merge pull request #85 from apuc/add_document
add column document_type to template table
2022-01-14 17:01:57 +03:00
iIronside
c1ff229aa7 add column document_type to template table 2022-01-14 15:39:09 +03:00
7081961bce
Merge pull request #84 from apuc/add_document
Add document
2022-01-14 13:45:21 +03:00
iIronside
e09f38f24b actionProfileWithReportPermission 2022-01-14 12:56:39 +03:00
iIronside
b123d250e1 in api added methods: document created and get profile with reports permission 2022-01-14 10:09:02 +03:00
iIronside
920aa2e751 add some api method 2022-01-11 14:49:32 +03:00
iIronside
13a9bdcca0 add some api method 2022-01-11 13:37:30 +03:00
iIronside
aaf4ee9f53 add accompanying document 2022-01-11 12:06:01 +03:00
iIronside
9c07e81fab Merge branch 'api_update_login_method' into add_document 2022-01-11 09:54:06 +03:00
iIronside
77b5db56b7 add migration, fix delete tmp document, update extend controllers i api 2022-01-11 00:20:54 +03:00
iIronside
f077df791f fix template delete method 2022-01-10 16:05:51 +03:00
iIronside
9cabf3e7f8 completion of the document module 2022-01-10 15:22:51 +03:00
13568090b1
Merge pull request #83 from apuc/api_update_login_method
api added id in response to login
2022-01-07 17:49:53 +03:00
464dda1e39
Merge pull request #82 from apuc/add_document
Add document
2022-01-07 17:49:30 +03:00
iIronside
faed561f9c api added id in response to login 2022-01-07 15:14:46 +03:00
iIronside
d31a4757ff intermediate commit 2022-01-07 15:04:11 +03:00
iIronside
e16e72dcc1 Merge remote-tracking branch 'origin/add_document' into add_document
# Conflicts:
#	frontend-access.log
#	frontend-error.log
2022-01-05 17:45:43 +03:00
iIronside
18b7fb0765 update api for manager 2022-01-05 17:44:13 +03:00
iIronside
f9d3b654f6 update api for manager 2022-01-05 17:11:31 +03:00
iIronside
dccf3c012e Add documents to template 2022-01-05 16:14:38 +03:00
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