Commit Graph
207 Commits
Author SHA1 Message Date
liumengyi 38131e168f * Optimize code. 2023-07-05 10:56:20 +08:00
liumengyi 58ef402188 * Refactor ui of personel::addWhitelist. 2023-07-05 10:52:37 +08:00
wangyuting b506ad935c * Adjust personnel invest page style. 2023-06-30 19:24:00 +08:00
wangyuting 78520c137f * Finish personnel invest page. 2023-06-30 19:17:01 +08:00
tianshujie 43d76ff864 * Refactor the manage memebers of execution team. 2023-06-25 18:35:34 +08:00
liumengyi bc66054557 * Refactor company::browse. 2023-06-14 11:28:48 +08:00
liumengyi da91114b75 * Change dtable config of personnel::whitelist. 2023-06-13 13:07:30 +08:00
liumengyi 63831dca8b * Modify dtable config in personnel. 2023-06-13 09:34:05 +08:00
liumengyi 1a04f04545 * Fix error of personnel::whitelist. 2023-06-13 09:00:03 +08:00
liumengyi 0dd1c402bf * Fix error in dept-getTreeMenu. 2023-06-09 08:49:27 +08:00
liumengyi e94680c759 * Refactor ui of personnel::accessible. 2023-06-08 09:47:24 +08:00
liumengyi 4d6142dfc0 * Refactor ui of personnel::whitelist. 2023-06-07 15:09:32 +08:00
zhouxin 2e547e8378 * Fix comment to personal.class.php. 2023-05-26 13:13:52 +08:00
zhouxin 7b7668136b * Batch fix illegal comment. 2023-05-25 17:07:43 +08:00
zhouxin 77a2da90d9 * Batch modify quote for unit test. 2023-05-25 13:43:27 +08:00
liugang b58cda66db - Remove unused code: $this->view->position. 2023-05-22 14:43:26 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
caoyanyi 97addfcfb4 * Fix bug #33931. 2023-04-21 10:36:50 +08:00
hufangzhou 202a93daeb * Finish task #89288. 2023-03-28 16:57:26 +08:00
liushasha 99e3faa665 * Resolve ticket #484. 2023-03-27 08:32:44 +00:00
caoyanyi 1328ae82bc * Update project common language. 2023-03-07 15:38:49 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
liyuchun 8285a1d2d6 * Update user view when edit whitelist. 2022-10-26 14:32:51 +08:00
wangyuting2 d946208950 * Fix bug #28756. 2022-10-21 01:07:38 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
曹延义 b29d0f75c9 * Finish task #71894. 2022-10-09 15:54:13 +08:00
xieqiyu cb55199df4 * Modify the test case of personnel and product. 2022-09-04 16:36:37 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
tianshujie d515c08c5e * Fix bug #25683. 2022-07-28 13:42:31 +08:00
liumengyi cc459683b1 * Fix bug #25699. 2022-07-26 16:07:11 +08:00
liumengyi 26b412ef35 * Fix bug #25688. 2022-07-26 14:23:46 +08:00
王怡栋 284aea9aac Merge branch 'sprint/220_liumengyi_61971' into 'master'
* Finish task #61971,#61972,#61973,#61974,#61975,#61976.

See merge request easycorp/zentaopms!4651
2022-07-26 05:01:29 +00:00
liumengyi 7afb73fabe * Fix bug for task #61976. 2022-07-26 11:19:10 +08:00
liumengyi 6958fefc27 * Finish task #61975. 2022-07-26 09:34:59 +08:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
xieqiyu 4ba8f585b3 * Fix bug#24370. 2022-06-30 08:26:33 +08:00
xieqiyu 3dff44e506 * Fix bug#24370. 2022-06-30 08:24:25 +08:00
hufangzhou 9a1156054e * Finish task #58573. 2022-06-28 09:49:46 +08:00
zhouxudong 6314aad2e3 * Finish task #58575 #58602. 2022-06-27 08:38:11 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
xieqiyu 86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15:01 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
lanzongjun 956f302c57 * fix bug #14842 2022-04-25 17:27:56 +08:00
田淑杰 dffd633c11 * Fix bug #21917. 2022-04-22 15:11:37 +08:00
田淑杰 2aca0841d5 * Fix bug #21916. 2022-04-22 14:06:43 +08:00
tianshujie 1e43b5cbf1 * Fix bug #17523. 2022-03-31 09:33:59 +08:00