Commit Graph
44649 Commits
Author SHA1 Message Date
王怡栋 9f2a83fa19 Merge branch 'bug_26943' into 'master'
* Fix bug#26943

See merge request easycorp/zentaopms!5258
2022-09-05 05:08:45 +00:00
王怡栋 9ed4f6bdd4 Merge branch 'sprint/hufangzhou_25840' into 'master'
* Fix bug #25840.

See merge request easycorp/zentaopms!5252
2022-09-05 05:08:21 +00:00
王怡栋 88a75824f7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #27198

See merge request easycorp/zentaopms!5251
2022-09-05 05:05:12 +00:00
lanzongjun 499e5f875a add module tree 2022-09-05 11:33:06 +08:00
wangyidong 86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
lanzongjun c4ed80d958 * fix bug #27198 2022-09-05 10:59:46 +08:00
sunguangming bd80adb658 * Code for recordestimate style. 2022-09-05 09:19:10 +08:00
李玉春 beb53a780b Merge branch 'dht_unittest' into 'master'
Add unittest.

See merge request easycorp/zentaopms!5243
2022-09-05 01:02:35 +00:00
denghongtao f2888debdc * Delete getswitcher. 2022-09-05 00:59:44 +00:00
wangyidong cff2453097 * fix bug #26362. 2022-09-05 08:54:26 +08:00
wangyidong c5a129d777 * fix bug #27243. 2022-09-05 08:47:10 +08:00
denghongtao ac86140b61 - Delete notes. 2022-09-05 00:46:00 +00:00
denghongtao ad21b6149c * Fix unittest. 2022-09-05 00:36:23 +00:00
wangyidong 574fd06e71 * adjust for task #67404. 2022-09-05 08:36:17 +08:00
李玉春 2b36876115 Merge branch 'cyy_ops_test' into 'master'
Cyy ops test

See merge request easycorp/zentaopms!5250
2022-09-05 00:30:15 +00:00
朱金勇 da5f72ad2e Merge branch 'sprint/return' into 'master'
* Fix return value declaration error of getFeishuData.

See merge request easycorp/zentaopms!5260
2022-09-05 00:19:14 +00:00
Lufei 51bd204786 * Fix return value declaration error of getFeishuData. 2022-09-03 09:58:36 +08:00
wangyidong 4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
王怡栋 158bd704f8 Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug #27135,#27034.

See merge request easycorp/zentaopms!5255
2022-09-02 09:08:48 +00:00
liumengyi 623aa4ef63 * Fix bug. 2022-09-02 17:07:52 +08:00
liumengyi 823a9af768 * Fix bug. 2022-09-02 17:03:56 +08:00
zenggang e96c5b3818 * Fix bug#26943 2022-09-02 09:00:58 +00:00
王怡栋 5cad8843e7 Merge branch 'master_xieqiyu_27244' into 'master'
* Fix bug#27244.

See merge request easycorp/zentaopms!5257
2022-09-02 08:38:50 +00:00
liumengyi 4274a50e94 * Fix bug #27034. 2022-09-02 16:25:51 +08:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
xieqiyu 6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
lanzongjun 68f3005568 feedback action modify todolist 2022-09-02 14:30:02 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
liumengyi 87d7696f90 * Fix bug #27135. 2022-09-02 14:19:47 +08:00
sunguangming 54c54108e6 * Code for task effort. 2022-09-02 14:17:39 +08:00
sunguangming dbcc64cc4c * Add order to effort. 2022-09-02 14:05:14 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
hufangzhou c0c86877cb Merge branch 'sprint/hufangzhou_25840' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/hufangzhou_25840 2022-09-02 13:49:13 +08:00
孙广明 547879695e Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug #27238, and fix bug for set switcher.

See merge request easycorp/zentaopms!5253
2022-09-02 05:49:05 +00:00
hufangzhou c77fde0166 * Code for bug #25840. 2022-09-02 13:48:50 +08:00
liumengyi c5e91ea120 * Optimize code for bug #27238. 2022-09-02 13:48:24 +08:00
hufangzhou 3fe5830e76 * Code for bug #25832. 2022-09-02 13:47:27 +08:00
liumengyi 3509477e6b * Fix bug #27238, and fix bug for set switcher. 2022-09-02 13:44:45 +08:00
hufangzhou 159fcd07e7 * Fix bug #25840. 2022-09-02 13:37:05 +08:00
caoyanyi 86e536203b * Modify server url. 2022-09-02 13:35:16 +08:00
caoyanyi c050d86893 * Modify gitea test case. 2022-09-02 13:18:45 +08:00
lanzongjun 91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
caoyanyi 041204feb8 * Modify gogs test case. 2022-09-02 13:09:44 +08:00
caoyanyi dc19e45bf5 Merge branch 'master' into cyy_ops_test 2022-09-02 13:09:35 +08:00
王怡栋 1a9ba95c43 Merge branch 'master_xieqiyu_66955' into 'master'
* Code for task#66955.

See merge request easycorp/zentaopms!5245
2022-09-02 05:07:46 +00:00
denghongtao cd4d03806d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dht_unittest 2022-09-02 05:07:28 +00:00
王怡栋 413c6d64ba Merge branch 'sprint/hufangzhou_26131' into 'master'
* Fix bug #26131.

See merge request easycorp/zentaopms!5244
2022-09-02 05:04:18 +00:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 2e870f698b * Fix bug #27225. 2022-09-02 04:32:07 +00:00