Commit Graph
1167 Commits
Author SHA1 Message Date
xieqiyu 924f288ed5 * Fix bug#27406,#27235. 2022-09-08 16:55:57 +08:00
xieqiyu 5f427364c7 * Fix bug#27346. 2022-09-08 13:47:57 +08:00
王怡栋 a1e31e99e3 Merge branch 'master_xieqiyu_66957' into 'master'
* Code for task#68109.

See merge request easycorp/zentaopms!5266
2022-09-06 02:57:03 +00:00
xieqiyu 8db8c3974b * Code for task#68109. 2022-09-06 08:55:35 +08:00
lanzongjun c4ed80d958 * fix bug #27198 2022-09-05 10:59:46 +08:00
mayue 66eec9f4db * Finish task #66987. 2022-09-01 13:39:16 +08:00
lanzongjun 9a3fd86d66 fix code 2022-09-01 13:20:11 +08:00
lanzongjun 4767bcd66f add dy reviewissue 2022-09-01 10:31:49 +08:00
lanzongjun 71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun 0afb47e9df * fix task #66994 2022-08-30 16:12:02 +08:00
liumengyi 3805d90035 * Fix bug for action. 2022-08-26 09:17:07 +08:00
王怡栋 0d9c57b293 Merge branch 'sprint/231_dongli_64972' into 'master'
* Fix bug #26824.

See merge request easycorp/zentaopms!5099
2022-08-25 02:17:34 +00:00
dongli 98ca0e913d * Fix bug #26824. 2022-08-24 09:12:00 +00:00
liumengyi e7bbfe300c * Fix bug #26839. 2022-08-24 16:26:06 +08:00
dongli 7e193ef699 * Fix bug #64973. 2022-08-24 03:10:12 +00:00
王怡栋 03ea51fe76 Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
dongli 0e393e120b * Remove useless spaces. 2022-08-24 01:10:59 +00:00
dongli 17a439cac3 * Finish task #64972,64973,64969. 2022-08-24 00:55:13 +00:00
dongli f3b8e63376 * Finsh task #64972,64973,64969. 2022-08-23 10:46:03 +00:00
dongli a825fa54ae * Finish task #64972,64973. 2022-08-23 07:15:16 +00:00
dongli 57528ecba5 * Finish task #64972,64973. 2022-08-23 06:59:18 +00:00
dongli cedf77727b * Finish task #64972,64973. 2022-08-22 13:03:04 +00: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
孙广明 eda772428a Merge branch 'sprint/max43_mayue_bug#26638' into 'master'
Sprint/max43 mayue bug#26638

See merge request easycorp/zentaopms!5051
2022-08-22 09:11:01 +00:00
liumengyi 66532261dd * Fix bug for no execution view. 2022-08-22 15:54:42 +08:00
mayue 93c0360d42 * Add other language. 2022-08-22 14:50:33 +08:00
mayue 90068c5a8f * Fix bug #26638. 2022-08-22 14:45:51 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
dongli 6df526827c * Finish task #64969. 2022-08-19 07:53:49 +00:00
dongli b0be7fe54b * Finish task #64969. 2022-08-19 07:50:31 +00:00
dongli 08f38590e1 * Finish task #64969. 2022-08-19 07:45:42 +00:00
dongli 27881df431 * Finish #task64969. 2022-08-19 07:23:57 +00:00
dongli 475cb7bf60 Remove the unused code. 2022-08-19 07:13:21 +00:00
dongli 37cf24c795 Remove the unused code. 2022-08-19 07:10:46 +00:00
dongli 71c48926fd * Finish task #64969. 2022-08-19 05:31:03 +00:00
dongli e3800e4e49 * Finish task #64969. 2022-08-19 05:31:03 +00:00
dongli 9fa036cb34 Revert "* Finish task #64969."
This reverts commit bacc10ccc0.
2022-08-19 05:31:02 +00:00
dongli 93adfc3971 * Finish task #64969. 2022-08-19 05:31:02 +00: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
dongli 730c638598 * Finish task #64969. 2022-08-19 04:57:54 +00:00
dongli a68ba64ad8 Revert "* Finish task #64969."
This reverts commit bacc10ccc0.
2022-08-19 04:50:57 +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
dongli bacc10ccc0 * Finish task #64969. 2022-08-18 06:41:41 +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