Commit Graph
117 Commits
Author SHA1 Message Date
guofeilong c62dbb7792 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:47:19 +08:00
孙广明 fccd283453 Merge branch 'sprint/292_liumengyi_32202' into 'master'
* Fix bug #32202,#32281, and finish task #42089.

See merge request easycorp/zentaopms!7051
2023-02-24 03:22:19 +00:00
liumengyi ae5ad1bba8 * Fix bug #32421. 2023-02-24 02:31:15 +00:00
liumengyi f2d6a76c93 * Modify method to management method. 2023-02-24 02:07:22 +00:00
caoyanyi a65210515c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 09:14:45 +08:00
wangyuting2 7de68720de * Fix bug #27133. 2023-02-24 08:47:54 +08:00
liumengyi a876a53bf2 * Finish task #42089. 2023-02-23 06:04:12 +00:00
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
tianshujie deae64dcd1 * Add a prompt for the execution type. 2023-02-22 10:38:25 +08:00
tianshujie 9e7fe8f35d * Code for finish task #85414. 2023-02-22 10:22:29 +08:00
tianshujie 200e97d5b8 * Code for finish task #85414. 2023-02-22 09:55:00 +08:00
zhujinyong 5551177931 + Add error of different type. 2023-02-21 10:24:00 +08:00
hufangzhou 75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
Yagami 38a68912ff Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 13:56:28 +08:00
Yagami 15ff524a7d * Finish task #84590. 2023-02-16 13:56:15 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi 84970085ec * Finish task #83942. 2023-02-08 14:14:08 +08:00
liumengyi ed7d5cc4dd * Finish task #83942. 2023-02-07 10:17:09 +08:00
liumengyi b9d784a037 * Fix bug #31928. 2023-02-06 09:37:00 +08:00
liumengyi 8f17a289b3 * Finish task #83214. 2023-01-30 15:23:59 +08:00
lanzongjun d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
lanzongjun 7bef1eaf28 * Finish Task #78670 2022-12-05 11:22:24 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
lanzongjun 9eebd0051d * Finish Task #77799 2022-11-30 13:44:25 +08:00
lanzongjun ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
lanzongjun d671be8b02 project link plan tips 2022-11-29 16:22:24 +08:00
Yagami a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
xieqiyu f86b9b0b17 * Fix bug#29440. 2022-11-15 09:51:31 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
tanghucheng df2e70c0cb * Fix bug #29031. 2022-11-03 14:56:05 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2 ce602cc78e * Finish task #73061. 2022-10-24 08:00:00 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
李玉春 7f1d674a73 Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
2022-10-09 06:50:04 +00:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
曹延义 84e1f0295d * Code for task #71876. 2022-10-09 11:15:44 +08:00
liuhong 0f9ee29fec *Fix bug #28214. 2022-09-30 07:20:17 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
liuhong 55700db5f3 *Fix bug #27970. 2022-09-26 13:39:56 +00:00
wangyidong 154023878a * code for task #69248. 2022-09-19 11:29:40 +08:00
mayue b9efaee057 * Optimize code. 2022-08-31 13:39:59 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
xieqiyu f47daae589 * Modify story review and other about story. 2022-08-22 14:34:37 +08:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
王怡栋 896f7d2fb1 Merge branch 'master_liuhong_63775' into 'master'
*Finish task #63775

See merge request easycorp/zentaopms!4873
2022-08-10 01:31:10 +00:00
tanghucheng d4fb654e5a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_task 2022-08-10 08:26:32 +08:00
tanghucheng 2b1046d40b * Finish task #63793. 2022-08-09 17:34:51 +08:00