Commit Graph
51039 Commits
Author SHA1 Message Date
tianshujie be00a4a8ae * Code for finish task #84580. 2023-02-16 09:29:05 +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
Yagami 8de77be199 * Adjust dtable style. 2023-02-16 08:40:26 +08:00
胡方舟 d2de5abe26 Merge branch 'zenops_61' into 'master'
* Fix delete node fail.

See merge request easycorp/zentaopms!6967
zentaopms_18.1
2023-02-16 00:20:13 +00:00
zhaoke eee007f88f * Fix delete node fail. 2023-02-15 17:43:14 +08:00
王怡栋 3a6bca8dc2 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.

See merge request easycorp/zentaopms!6966
2023-02-15 09:22:38 +00:00
朱金勇 004ab38be6 Merge branch 'sprint/hufangzhou_changeCompanyName' into 'master'
* Change the Easy Soft to ZenTao Software.

See merge request easycorp/zentaopms!6965
2023-02-15 09:20:48 +00:00
wangyuting2 a86eb599d9 * Fix project extend priv bug. 2023-02-15 17:20:35 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi b9ae54ede7 * Fix bug of task #84592. 2023-02-15 08:58:18 +00:00
zhujinyong fd6df950a8 * Only show leaf executions for switcher. 2023-02-15 16:35:39 +08:00
tianshujie c3d7d4cda3 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-15 16:31:53 +08:00
tianshujie 4f65445e8e * Code for finish task #84576. 2023-02-15 16:31:18 +08:00
liumengyi e2a8d207cb * Fix bug of task #84599. 2023-02-15 08:26:32 +00:00
liumengyi af5fbbab18 * Fix bug of task #84584. 2023-02-15 08:17:12 +00:00
Yagami da62f994d9 Merge branch 'sgm_dtable' into zentaopms_284 2023-02-15 15:49:53 +08:00
Yagami f84907df9a * Finish task #83941. 2023-02-15 15:47:20 +08:00
王怡栋 9393ee5558 Merge branch 'ticket_bug_366' into 'master'
* Resolved feedback 2191.

See merge request easycorp/zentaopms!6963
2023-02-15 07:26:56 +00:00
王怡栋 051a5b4bd9 Merge branch 'master_xieqiyu_32169' into 'master'
* Code for bug#32169.

See merge request easycorp/zentaopms!6962
2023-02-15 07:26:24 +00:00
xieqiyu 8de570fedf * Code for bug#32169. 2023-02-15 14:51:58 +08:00
liuhong a767115e92 * Resolved feedback 2191. 2023-02-15 06:16:55 +00:00
王怡栋 1d8546b946 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Adjust edit story plan css

See merge request easycorp/zentaopms!6961
2023-02-15 06:10:41 +00:00
刘刚 8b57ace39a Merge branch 'lyk_bug_32163' into 'master'
* Fix bug #32163. feedback #2170.

See merge request easycorp/zentaopms!6960
2023-02-15 06:02:04 +00:00
liuyongkai 088962b4f3 * Fix bug #32163. feedback #2170. 2023-02-15 13:54:01 +08:00
lanzongjun 3038649d34 * Adjust edit story plan css 2023-02-15 13:49:28 +08:00
Yagami b903cd3828 * Fix bug #32160. 2023-02-15 13:27:42 +08:00
王怡栋 255472632b Merge branch 'mayue_fix_bug#32147' into 'master'
* Fix bug #32147.

See merge request easycorp/zentaopms!6959
2023-02-15 05:03:23 +00:00
Yagami 874710e7c4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-15 11:31:55 +08:00
Yagami a9d56a3f77 * Fix bug #32159. 2023-02-15 11:31:42 +08:00
mayue a681b0d23b * Fix bug #32147. 2023-02-15 11:24:38 +08:00
王怡栋 3c9f973aef Merge branch 'tsj_fixbug' into 'master'
* Fix bug #32145.

See merge request easycorp/zentaopms!6955
2023-02-15 03:23:18 +00:00
胡方舟 6455f4847f Merge branch 'feature/master/sonar_migrate' into 'master'
* Change CI configuration.

See merge request easycorp/zentaopms!6957
2023-02-15 03:16:37 +00:00
Yagami 947307c349 * Fix bugs for dtable. 2023-02-15 11:14:09 +08:00
陈涛 8574f461f7 * Change CI configuration. 2023-02-15 11:08:37 +08:00
Yagami 8640678b78 Merge branch 'sgm_dtable' of https://gitlab.zcorp.cc/easycorp/zentaopms into sgm_dtable 2023-02-15 10:54:51 +08:00
Yagami 8bc4f664d4 * Code for dtable. 2023-02-15 10:54:42 +08:00
zhujinyong f1e1580ef7 * Finish task #84596. 2023-02-15 10:25:30 +08:00
tianshujie 2b82314b52 * Fix bug #32145. 2023-02-15 10:08:15 +08:00
孙广明 3ee59db92c Merge branch 'zhouxin_feedback_2213' into 'master'
* Resolve feedback #2213.

See merge request easycorp/zentaopms!6953
2023-02-15 02:01:16 +00:00
zhouxin 576c422a96 * Resolve feedback #2213. 2023-02-15 09:43:56 +08:00
王怡栋 1f87384b9b Merge branch 'cyy_repo_bug' into 'master'
* Modify commit link object error.

See merge request easycorp/zentaopms!6952
2023-02-15 01:13:05 +00:00
caoyanyi 15f9047883 * Modify commit link object error. 2023-02-15 09:10:26 +08:00
孙广明 bd7084c8b5 Merge branch 'zenops_61' into 'master'
Zenops 61

See merge request easycorp/zentaopms!6951
2023-02-15 00:35:50 +00:00
zhaoke 807971cb91 * Renmove console. 2023-02-15 00:33:15 +00:00
tianshujie f989173e10 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-15 08:29:48 +08:00
孙广明 b6f4477420 Merge branch 'tsj_sortable' into 'zentaopms_284'
Tsj sortable

See merge request easycorp/zentaopms!6945
2023-02-15 00:21:22 +00:00
zhaoke a2c3fee694 * Fix bug #32141. 2023-02-14 10:33:32 +00:00
hufangzhou 2aec80f62c * Fix bug #32140. 2023-02-14 17:36:21 +08:00
hufangzhou 0b89cd77d5 * Fix bug of task #83954. 2023-02-14 08:49:53 +00:00
liumengyi f12271a1f2 * Finish task #84592. 2023-02-14 16:24:14 +08:00