Commit Graph
1228 Commits
Author SHA1 Message Date
王怡栋 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
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
王怡栋 1f1242ca9c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
add cp gantt task move

See merge request easycorp/zentaopms!4953
2022-08-12 09:06:24 +00:00
lanzongjun 0c117ef702 add gantt move order 2022-08-12 16:49:27 +08:00
caoyanyi 74874aa869 * Modify delete mr log. 2022-08-12 16:46:01 +08:00
lanzongjun 9fa80dcd94 add cp gantt task move 2022-08-12 16:15:08 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
liumengyi 8dc2999075 * Fix bug #26379. 2022-08-12 15:44:01 +08:00
caoyanyi e45d44ccaa Merge branch 'master' into zenops_41 2022-08-11 16:04:36 +08:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
liyuchun 6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
王怡栋 ed951dc12e Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4835
2022-08-08 03:25:42 +00:00
mayue 0b362d4061 * Add lang . 2022-08-08 11:23:36 +08:00
mayue fc0a0b2d61 * Optimize code. 2022-08-08 10:56:43 +08:00
caoyanyi ffb8077e2c * Modify restore repo tips. 2022-08-08 08:51:34 +08:00
lanzongjun 9c6356fded debug 2022-08-05 15:50:24 +08:00
lanzongjun 408150ff5c debug 2022-08-05 15:40:25 +08:00
liumengyi 18d1bc47fb * Fix issue #706. 2022-08-05 10:24:09 +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
liumengyi 66990b3fc9 * Fix bug #25965. 2022-08-03 13:14:45 +08:00
caoyanyi 78c4226f3a * Add repo action log. 2022-08-03 10:24:00 +08: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
caoyanyi 542156de2a * Add actions. 2022-07-26 14:54:48 +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
王怡栋 0420767f2f Merge branch 'sprint/217_25551' into 'master'
* Fix bug#25551,25591,25593

See merge request easycorp/zentaopms!4627
2022-07-22 02:20:54 +00:00
zenggang c368f63f6d * Adjust code 2022-07-22 02:01:47 +00: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
zenggang 27e19c459a * Fix bug#25551 2022-07-21 08:23:50 +00:00
zenggang 0655809533 * Fix sprint217 bugs. 2022-07-21 04:06:11 +00:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00: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