Commit Graph
544 Commits
Author SHA1 Message Date
liumengyi e7bbfe300c * Fix bug #26839. 2022-08-24 16:26:06 +08:00
xieqiyu 40771942f7 Merge remote-tracking branch 'origin' into master_xieqiyu_draftStory 2022-08-22 17:47:50 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
liumengyi 66532261dd * Fix bug for no execution view. 2022-08-22 15:54:42 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
王怡栋 0c1750f575 Merge branch 'sprint/hufangzhou_action' into 'master'
* Add the ignored object type config for plugin.

See merge request easycorp/zentaopms!5028
2022-08-19 05:12:45 +00:00
曾刚 caed6b27cd Fix bug#26664 2022-08-19 05:10:19 +00:00
hufangzhou 9a5c9299b3 * Add the ignored object type config for plugin. 2022-08-19 11:16:04 +08:00
tianshujie 98694da2ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-18 16:47:14 +08:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
liumengyi ce3e1bf617 * Finish task #64967. 2022-08-18 10:37:17 +08:00
xieqiyu a61ad52efa * Code for task#62968. 2022-08-17 08:41:05 +08:00
liyuchun a4b8a6eba2 Merge branch 'master' into zenops_41 2022-08-15 09:38:48 +08:00
李玉春 bd3999375c Merge branch 'sprint/224_tianshujie_case' into 'master'
Sprint/224 tianshujie case

See merge request easycorp/zentaopms!4962
2022-08-15 00:13:45 +00:00
tianshujie ab19aa2d46 * Add a null judgment to the method. 2022-08-13 17:15:06 +08:00
caoyanyi 74874aa869 * Modify delete mr log. 2022-08-12 16:46:01 +08:00
liumengyi 8dc2999075 * Fix bug #26379. 2022-08-12 15:44:01 +08:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
caoyanyi ffb8077e2c * Modify restore repo tips. 2022-08-08 08:51:34 +08:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
daitingting 73810a1e26 * Fix bug #25943. 2022-08-04 08:14:08 +00:00
tanghucheng b88cbfa913 * Code for get history log. 2022-08-02 08:54:40 +08:00
liyuchun f3044011d8 * Finish task #62870. 2022-08-01 05:58:24 +00:00
liumengyi f9c408db4c * Fix bug for dynamic view. 2022-07-27 09:20:58 +08:00
liumengyi 8d9aace2de * Fix bug. 2022-07-22 13:42:08 +08:00
liumengyi d83ed1092d * Fix bug #25554. 2022-07-22 13:17:18 +08:00
liumengyi 374ec6f55d * Fix bug #25554. 2022-07-22 11:06:51 +08:00
liumengyi 0d7bc07e69 * Optimize code for bug #25559. 2022-07-21 17:40:26 +08:00
liumengyi 9be334f34b * Fix bug #25554, #25558, #25559, #25570. 2022-07-21 17:38:27 +08:00
liumengyi 14cf90f0e5 * Fix bug #25554, #25558, #25559, #25570. 2022-07-21 17:24:51 +08:00
王怡栋 d349931e82 Merge branch 'sprint/217_liumengyi_61171' into 'master'
* Finish task #61171, #61170.

See merge request easycorp/zentaopms!4610
2022-07-20 06:23:40 +00:00
liumengyi 45eb1e2f99 * Fix bug for task #61171. 2022-07-20 13:54:23 +08:00
liumengyi ecada98f89 * Fix bug for task #61171. 2022-07-20 13:15:34 +08:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
caoyanyi c8527bdea4 Merge branch 'master' into zenops_38 2022-07-14 08:37:24 +08:00
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
2022-07-13 05:58:05 +00:00
liyuchun 6cef93edd9 * Finish task #60453. 2022-07-12 06:30:13 +00:00
liumengyi 9e5a0ff356 * Fix bug for task #59469. 2022-07-07 12:06:41 +08:00
liumengyi 7c2eae9399 * Fix bug of task #59469. 2022-07-06 13:22:01 +08:00
liumengyi 957d6f3249 * Fix bug of task #59469. 2022-07-06 11:11:45 +08:00
liumengyi 2ab56b9f51 * Finish task #59469. 2022-07-05 20:38:07 +08:00
chaideqing 5965752003 * adjust xuanxuan notification center logic, task #58691 2022-07-01 16:27:40 +08:00
孙广明 50dce20f6f * Code for action error. 2022-06-29 16:20:07 +08:00
孙广明 b9f3120c8b * Fix bug #24508. 2022-06-29 13:29:03 +08:00
孙广明 ad17666521 * Code for action details. 2022-06-28 15:32:08 +08:00
孙广明 3cac1a020c * Refactor action getDynamic. 2022-06-28 15:02:19 +08:00
tianshujie 33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
王怡栋 196b78a0aa Merge branch 'sprint/201_tianshujie_56476' into 'master'
Sprint/201 tianshujie 56476

See merge request easycorp/zentaopms!3794
2022-06-08 06:48:46 +00:00
tianshujie 9cb0df56c6 * Finish task #56453. 2022-06-08 11:05:32 +08:00