Commit Graph

507 Commits

Author SHA1 Message Date
c65b7d10cc
Merge pull request #108 from apuc/for_managers_show_only_employees
For managers show only employees
2023-03-16 17:51:59 +03:00
iIronside
1f375a52d8 Merge branch 'master' into for_managers_show_only_employees
# Conflicts:
#	console/controllers/RbacController.php
2023-03-16 17:45:47 +03:00
562392c644
Merge pull request #107 from apuc/update_projects_and_tasks
Update projects and tasks
2023-03-16 17:32:26 +03:00
45eca8738b
Merge pull request #106 from apuc/php8
commit composer.json
2023-03-16 17:29:57 +03:00
iIronside
f5e69511fb add status to login method 2023-02-21 23:08:46 +03:00
iIronside
06cfa93adf add status to login method 2023-02-21 21:22:12 +03:00
iIronside
89e635798c for managers show only employees, show all profiles for users with permission show_all_profiles 2023-01-26 15:28:15 +03:00
iIronside
10853b44f8 tmp commit 2023-01-26 11:05:59 +03:00
iIronside
be30fc1a08 fix secure 2023-01-25 12:56:30 +03:00
iIronside
f2c77fb72c add methods to project task category 2023-01-25 11:50:07 +03:00
iIronside
a353cbec6c Merge branch 'master' into update_projects_and_tasks 2023-01-25 10:38:17 +03:00
iIronside
78aaef28df add api for project 2023-01-24 17:32:46 +03:00
iIronside
8a1f99c707 add mark to project 2023-01-23 17:50:52 +03:00
iIronside
9eba04cae2 rename task to project_task and task_user to project_task_user; create project_task_category, fix bug in create project method 2023-01-23 11:40:45 +03:00
iIronside
3ac2d54ec2 fix actionReportsByDate 2023-01-19 17:16:43 +03:00
iIronside
3e236c5869 check commit 2023-01-19 17:08:16 +03:00
iIronside
9b46ec36dd fix reports 2023-01-19 16:48:49 +03:00
iIronside
c0399b30b0 fix reports 2023-01-19 16:45:21 +03:00
iIronside
56ec8d8b13 fix reports 2023-01-19 16:40:01 +03:00
iIronside
2f8e6466f4 fix reports 2023-01-19 16:35:26 +03:00
iIronside
bb9959edf1 fix reports 2023-01-19 16:29:22 +03:00
iIronside
b5a9d4be40 tmp commit 2023-01-19 14:50:55 +03:00
iIronside
097ecfe087 fix actionFindByDate in ReportsController 2023-01-19 14:30:49 +03:00
iIronside
bbc11fc559 fix actionFindByDate in ReportsController 2023-01-19 13:55:28 +03:00
iIronside
8b2bb7468c rename task to project task, task_user to project_task_user, fix behavior 2023-01-18 15:30:38 +03:00
iIronside
ae88946b2b commit composer.json 2023-01-17 19:15:19 +03:00
iIronside
c9ce085289 hide salary sum for user without access 2023-01-17 17:28:34 +03:00
ef9705ded0
Merge pull request #105 from apuc/configure_accesses
configure accesses rule
2023-01-17 13:12:16 +03:00
iIronside
55f412c8eb fix CORSE add Access-Control-Allow-Origin to Headers 2023-01-13 15:46:15 +03:00
iIronside
1394e89d45 fix return header in api controller 2023-01-12 16:12:48 +03:00
iIronside
f08cc3b7fa fix change header in api controller 2023-01-12 16:00:07 +03:00
iIronside
18ca568485 fix findByDate in ReportSearchForm 2023-01-10 17:45:53 +03:00
354c6fd497
Merge pull request #104 from apuc/portfolio
Portfolio
2022-12-30 21:51:52 +03:00
iIronside
320c1de8ae configure accesses rule 2022-12-28 11:45:57 +03:00
iIronside
87d936a207 Merge branch 'master' into portfolio 2022-12-27 11:45:48 +03:00
iIronside
74214f090e add portfolio projects 2022-12-27 11:45:28 +03:00
iIronside
56dbef433d fix user login 2022-12-26 15:23:46 +03:00
iIronside
24e3dce192 change permission for reports 2022-12-23 20:35:12 +03:00
iIronside
aea2c52124 update get profile method in api 2022-12-23 17:42:35 +03:00
iIronside
9104b870a7 update login method in api 2022-12-23 17:40:43 +03:00
iIronside
7477da270d add link_telegram to user profile view 2022-12-22 09:10:15 +03:00
iIronside
e0366b9d8c add find reports by date to api 2022-12-20 19:24:38 +03:00
iIronside
3c922a6627 add at_project field to user_card 2022-12-19 16:21:19 +03:00
iIronside
b6d958bdc0 fix add report 2022-12-16 20:18:25 +03:00
iIronside
ac03d43a40 fix add report 2022-12-16 18:54:13 +03:00
iIronside
701e332537 move fields to up 2022-12-09 18:12:37 +03:00
iIronside
38935fddd3 fix download buttons and sort order 2022-12-09 18:05:14 +03:00
7486334234
Merge pull request #102 from apuc/add_fields_to_document
custom fields have been added to the documents
2022-12-09 17:48:05 +03:00
iIronside
5b455b59f9 custom fields have been added to the documents 2022-12-09 16:28:22 +03:00
aad1b14473
Merge pull request #101 from apuc/add_company_manager_role
add company-manager role
2022-12-05 14:13:00 +03:00