iironside
|
4322db751f
|
Merge branch 'master' into add_a_test_task_completion_date_to_user_card
|
2022-03-14 14:35:37 +03:00 |
|
iironside
|
c99aac589d
|
Merge branch 'master' into add_document
# Conflicts:
# frontend-access.log
# frontend-error.log
|
2022-03-14 14:34:11 +03:00 |
|
iironside
|
60ad6c0e00
|
added user response verification before saving
|
2022-03-14 13:06:20 +03:00 |
|
|
|
fef52d8ff7
|
Merge pull request #88 from apuc/fix_user_response
in UserResponseController extends ApiController
|
2022-03-11 14:43:28 +03:00 |
|
iironside
|
b053a429a3
|
in UserResponseController extends ApiController
|
2022-03-11 14:37:44 +03:00 |
|
iironside
|
99f79d3d08
|
the display of February has been fixed in the calendar
|
2022-03-11 10:56:16 +03:00 |
|
iironside
|
15ae213a66
|
Merge branch 'master' into add_a_test_task_completion_date_to_user_card
|
2022-03-10 11:39:09 +03:00 |
|
iironside
|
1e15d376fd
|
achievements add image to index page
|
2022-03-10 11:08:04 +03:00 |
|
iironside
|
c4d35ace86
|
add module test task
|
2022-03-09 19:25:28 +03:00 |
|
|
|
ce4bbf07e2
|
Merge pull request #87 from apuc/add_a_test_task_completion_date_to_user_card
Add a test task completion date to user card
|
2022-03-09 13:04:15 +03:00 |
|
iironside
|
7874fc3447
|
set the user to the first place in the report table
|
2022-03-09 12:18:59 +03:00 |
|
iironside
|
46a62c300e
|
the background of the days are changed in the calendar
|
2022-03-08 14:51:10 +03:00 |
|
iironside
|
e55583a44d
|
add_a_test_task_completion_date_to_user_card
|
2022-03-07 12:32:01 +03:00 |
|
iironside
|
ba96ae3119
|
Merge branch 'master' into add_document
|
2022-03-07 11:08:08 +03:00 |
|
andrey
|
daee4e3e68
|
fix
|
2022-03-03 17:24:45 +03:00 |
|
iIronside
|
937118a2dd
|
update doc
|
2022-02-15 15:16:19 +03:00 |
|
iIronside
|
e410a59c16
|
add method to fin reports by date
|
2022-02-15 12:42:56 +03:00 |
|
iIronside
|
40853b6167
|
add title and testing_date to user_questionnaire
|
2022-02-15 11:29:16 +03:00 |
|
iIronside
|
d126d8323f
|
added services, added documentation
|
2022-01-16 23:54:13 +03:00 |
|
|
|
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 |
|
