Commit Graph
50904 Commits
Author SHA1 Message Date
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +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
陈涛 8574f461f7 * Change CI configuration. 2023-02-15 11:08:37 +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
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
王怡栋 e7991dcc5f Merge branch 'ticket_369' into 'master'
* Adjust code for feedback #2187.

See merge request easycorp/zentaopms!6946
2023-02-14 08:09:40 +00:00
王怡栋 39388b32f7 Merge branch 'sprint/hufangzhou_fixlang' into 'master'
* Adjust the lang.

See merge request easycorp/zentaopms!6948
2023-02-14 08:03:56 +00:00
王怡栋 2c1a4b6113 Merge branch 'sprint/hufangzhou_bug_32104' into 'master'
* Fix bug #32104.

See merge request easycorp/zentaopms!6947
2023-02-14 08:03:39 +00:00
hufangzhou 30a251154e * Fix bug #31933. 2023-02-14 15:59:09 +08:00
王怡栋 48a2dc05bb Merge branch 'dev/gfl_bug#32126' into 'master'
* Code for bug #32126.

See merge request easycorp/zentaopms!6949
2023-02-14 07:52:05 +00:00
guofeilong dfa0267045 * Code for bug #32126. 2023-02-14 15:45:28 +08:00
hufangzhou cc4b6d5310 * Adjust the lang. 2023-02-14 15:35:45 +08:00
hufangzhou 63f0c823da * Fix bug #32104. 2023-02-14 15:21:20 +08:00
Yagami 786dacf52d * Fix bug #31524. 2023-02-14 15:05:22 +08:00
liuhong 254c6e9747 * Adjust code for feedback #2187. 2023-02-14 05:42:50 +00:00
孙广明 2ce8e96e31 Merge branch 'zenops_61' into 'master'
* Fix bug #32108.

See merge request easycorp/zentaopms!6944
2023-02-14 05:25:36 +00:00
zhaoke 9c920b1547 * Fix bug #32108. 2023-02-14 05:22:37 +00:00
王怡栋 20f17196b2 Merge branch 'ticket_366' into 'master'
Ticket 366

See merge request easycorp/zentaopms!6941
2023-02-14 05:04:09 +00:00
王怡栋 5c28eb1317 Merge branch 'daitingting_bug_#31996' into 'master'
* Fix bug #31996.

See merge request easycorp/zentaopms!6940
2023-02-14 05:03:43 +00:00
王怡栋 c31e104d8a Merge branch 'bug_32099' into 'master'
* Fix bug#32099

See merge request easycorp/zentaopms!6939
2023-02-14 05:03:13 +00:00
zenggang 397a40f648 * Fix bug#32099 2023-02-14 02:19:03 +00:00
王怡栋 a9cd5ed97b Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master'
* code for delete / after background-image: url

See merge request easycorp/zentaopms!6938
2023-02-14 02:00:13 +00:00
guofeilong bc88bfece2 * code for delete / after background-image: url 2023-02-14 09:56:33 +08:00
liuhong e9d2d7362a * Adjust code for feedback #2191 2023-02-14 01:43:35 +00:00
liuhong f86fe5a65d * Adjust code for feedback 2191. 2023-02-14 01:08:45 +00:00
王怡栋 50f2598c54 Merge branch 'master_xieqiyu_32089' into 'master'
* Code for bug#32089.

See merge request easycorp/zentaopms!6934
2023-02-13 09:24:17 +00:00
王怡栋 665081924d Merge branch 'sprint/hufangzhou_bug_32073' into 'master'
* Fix bug #32073.

See merge request easycorp/zentaopms!6933
2023-02-13 09:24:03 +00:00
王怡栋 67591cc509 Merge branch 'master_xieqiyu_26428' into 'master'
* Code for bug#26428.

See merge request easycorp/zentaopms!6932
2023-02-13 09:23:43 +00:00
王怡栋 a18abcc5c8 Merge branch 'ticket_336' into 'master'
Ticket 336

See merge request easycorp/zentaopms!6931
2023-02-13 09:23:10 +00:00