Commit Graph
81 Commits
Author SHA1 Message Date
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 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00: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
liumengyi 6958fefc27 * Finish task #61975. 2022-07-26 09:34:59 +08:00
hufangzhou 9a1156054e * Finish task #58573. 2022-06-28 09:49:46 +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
田淑杰 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
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
songchenxuan 8a014b58f4 *Fix task #45535 bug. 2021-12-15 08:37:31 +08:00
songchenxuan ad01a91304 *Finish task #45535. 2021-12-13 11:22:20 +08:00
liyuchun d188fbd7b8 * Fix bug #16389,#16387. 2021-11-18 22:54:48 +08:00
liyuchun fac2119507 * Fix bug #15541. 2021-10-18 10:28:47 +08:00
liyuchun c8fe1f5e14 * Fix bug #15541. 2021-10-18 10:21:08 +08:00
liyuchun e3291b0e2a * Fix bug #15541. 2021-10-18 09:07:11 +08:00
tianshujie ae5003bde1 * Fix bug #15541. 2021-10-15 13:57:42 +08:00
tianshujie 4d8095c106 * Finish task #43169. 2021-10-15 09:28:50 +08:00
liyuchun 01e57a1c57 * Fix bug #15514. 2021-10-14 10:05:53 +08:00
liyuchun 756576f2e4 * Finish task #43205. 2021-10-14 09:00:36 +08:00
liyuchun 2330adc576 * Adjsut update user view error. 2021-10-13 17:16:53 +08:00
liyuchun 6359266cf9 * Adjust logic of update whitelist when update user view. 2021-10-13 16:37:24 +08:00
liyuchun 9f36655aea * Finish task #43205. 2021-10-13 15:29:53 +08:00
liyuchun 36a6d9f4e3 * Finish task #42834. 2021-09-26 14:43:28 +08:00
孙广明 e281a4d639 * Fix code error. 2021-09-08 17:26:52 +08:00
孙广明 5eaa7bc277 * Fix details. 2021-09-08 16:06:37 +08:00
王怡栋 8529a59731 * fix for switch program by dropmenu when create project. 2021-08-24 14:42:49 +08:00
tianshujie98 2729cd843e * Finish task #41563. 2021-08-20 15:27:18 +08:00
holan20180123 f7b9887fe0 * Finish task #41565. 2021-08-19 09:46:24 +08:00
qiyu-xie a760652e04 * Finish task#41559. 2021-08-18 16:36:38 +08:00
holan20180123 e818e038ed * Finish task #41237. 2021-08-13 14:00:57 +08:00
qiyu-xie 28e579f781 * Task#41218. 2021-08-11 22:21:06 +08:00
holan20180123 487662ad62 * Finish task #41237. 2021-08-11 10:58:03 +08:00
王怡栋 ceb74bf406 * fix for updateWhitelist. 2021-08-09 17:11:34 +08:00
王怡栋 f6904dc8ab * adjust for updatewhitelist when increase. 2021-08-09 17:04:12 +08:00
Yagami c1559f9ac8 * Fix whitelist bug. 2021-08-06 18:55:45 +08:00
wangyidong ba2c8018d6 * fix for update userview. 2021-07-13 10:24:57 +08:00
holan20180123 c2d05fcbab Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-07 08:16:06 +08:00
holan20180123 41d59a0688 * Fix bug 12627. 2021-06-07 08:15:32 +08:00
tianshujie98 c587c18b46 * Finish task #38889. 2021-06-04 13:18:23 +08:00
holan20180123 6d00f3253a * Fix bug #12626. 2021-05-13 17:10:34 +08:00
holan20180123 0a2a86ce85 * Fix error. 2021-05-13 13:20:43 +08:00
tianshujie98 b42ef1e5a5 * Finish task #38160. 2021-05-13 10:06:06 +08:00
leiyong 261e7ddbdc * Fix bug. 2021-04-01 08:26:55 +03:00