Commit Graph
48386 Commits
Author SHA1 Message Date
wangyuting 5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
wangyidong e460772fc4 * code for task #77129. 2022-11-29 10:52:01 +08:00
王怡栋 1ded7cf032 Merge branch 'sprint/feedback1446' into 'master'
* Fix feedback #1446.

See merge request easycorp/zentaopms!6397
2022-11-29 01:33:39 +00:00
chaideqing db08e26957 * Fix feedback #1446. 2022-11-29 08:48:10 +08:00
王怡栋 7a3a07061e Merge branch 'cyy_repo' into 'master'
* Modify git branh check.

See merge request easycorp/zentaopms!6393
2022-11-28 08:38:14 +00:00
王怡栋 31a54fcc24 Merge branch 'zentaopms_266_task_#77605' into 'master'
* Finish task #77605.

See merge request easycorp/zentaopms!6396
2022-11-28 08:37:57 +00:00
王怡栋 3c8bd022d4 Merge branch 'zentaopms_266_task#77611' into 'master'
* Finish task #77611.

See merge request easycorp/zentaopms!6392
2022-11-28 08:37:00 +00:00
王怡栋 b389198bea Merge branch 'sprint/hufangzhou_feedback_1479' into 'master'
* Handle feedback #1479.

See merge request easycorp/zentaopms!6391
2022-11-28 08:36:37 +00:00
daitingting 7025eeb91e * Finish task #77605. 2022-11-28 08:09:10 +00:00
孙广明 d5110488b3 Merge branch 'lyk_feedback_1459' into 'master'
* Resolve feedback #1459.

See merge request easycorp/zentaopms!6394
2022-11-28 06:58:01 +00:00
liuyongkai 9455b09e17 * Resolve feedback #1459. 2022-11-28 14:55:02 +08:00
liuyongkai 64fb4c10ca * Resolve feedback #1459. 2022-11-28 14:15:58 +08:00
caoyanyi 591f4ab7b1 * Adjust code. 2022-11-28 13:30:32 +08:00
caoyanyi b5c140fa52 * Modify git branh check. 2022-11-28 13:29:22 +08:00
wangyuting fc51e379f0 * Finish task #77611. 2022-11-28 05:22:22 +00:00
hufangzhou d839f6f593 * Handle feedback #1479. 2022-11-28 05:10:00 +00:00
王怡栋 3c9b13d794 Merge branch 'sprint/wangzemei/green' into 'master'
* Green theme: fix the background image width

See merge request easycorp/zentaopms!6390
2022-11-28 03:22:36 +00:00
wangzemei 4412e7e888 * Green theme: fix the background image width 2022-11-28 11:11:12 +08:00
孙广明 f4286ebdc0 Merge branch 'master_xieqiyu_30277' into 'master'
* Fix bug#30277.

See merge request easycorp/zentaopms!6387
zentaopms_18.0.beta1
2022-11-25 09:55:24 +00:00
胡方舟 13448090a3 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6388
2022-11-25 09:52:30 +00:00
wangyuting 88f5f0dd3b * Fix bug. 2022-11-25 09:47:27 +00:00
xieqiyu 679fe9d5f2 * Fix bug#30277. 2022-11-25 16:24:54 +08:00
王怡栋 3707c77b53 Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #30282.

See merge request easycorp/zentaopms!6386
2022-11-25 08:14:24 +00:00
tanghucheng 8f20075c51 * Fix bug #30282. 2022-11-25 16:12:51 +08:00
王怡栋 c4b3e8d18a * code for bug #devops. 2022-11-25 15:57:52 +08:00
王怡栋 46d98dcada Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 15:56:16 +08:00
王怡栋 a14dc11193 * fix bug #30271. 2022-11-25 15:55:07 +08:00
王怡栋 593c7d41b2 Merge branch 'zentaopms_263_bug_#30020' into 'master'
* Fix bug #30020.

See merge request easycorp/zentaopms!6385
2022-11-25 07:40:55 +00:00
daitingting a2aa5c325a * Fix bug #30020. 2022-11-25 07:36:53 +00:00
孙广明 33f1b35873 Merge branch 'master_xieqiyu_code' into 'master'
* Delete unused code.

See merge request easycorp/zentaopms!6384
2022-11-25 07:14:56 +00:00
王怡栋 647547faac * fix for upgrade. 2022-11-25 15:13:23 +08:00
xieqiyu 79a9c38403 * Delete unused code. 2022-11-25 15:11:54 +08:00
Yagami 83a76c2636 * Fix execution list bug. 2022-11-25 14:47:13 +08:00
Yagami 545b81abe7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 14:10:22 +08:00
Yagami 76b3882e55 * Fix project manage products bug. 2022-11-25 14:10:07 +08:00
王怡栋 808930a6b1 Merge branch 'zentaopms_263_fix_review' into 'master'
Zentaopms 263 fix review

See merge request easycorp/zentaopms!6383
2022-11-25 06:00:09 +00:00
王怡栋 67a0be29e7 * fix bug. 2022-11-25 13:59:22 +08:00
daitingting c366e94749 * Remove debugging codes. 2022-11-25 05:52:42 +00:00
daitingting 8650982994 * Fix issues of function review. 2022-11-25 05:50:02 +00:00
王怡栋 c9bcde900d * fix bug for link multiple builds. 2022-11-25 13:42:42 +08:00
王怡栋 c9c16d1a34 * fix for release product lang. 2022-11-25 13:34:40 +08:00
孙广明 c40b00d760 Merge branch 'master_xieqiyu_30186' into 'master'
* Fix bug#30186.

See merge request easycorp/zentaopms!6382
2022-11-25 05:24:38 +00:00
xieqiyu e5dcaf9f33 * Delete empty line. 2022-11-25 13:23:06 +08:00
xieqiyu 03705737f7 * Fix bug#30186. 2022-11-25 13:20:07 +08:00
Yagami eda6dc67ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 13:10:25 +08:00
Yagami 4f16057c77 * Code for manage products. 2022-11-25 13:10:10 +08:00
王怡栋 e90baa91f9 Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.

See merge request easycorp/zentaopms!6381
2022-11-25 05:02:58 +00:00
朱金勇 edcf2491cf Merge branch 'fix/path' into 'master'
* Optimize index and checktable file.

See merge request easycorp/zentaopms!6379
2022-11-25 04:12:57 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
王怡栋 1391d6b213 Merge branch 'zentaopms_263_bug#30132' into 'master'
* Adjust history data.

See merge request easycorp/zentaopms!6380
2022-11-25 03:10:45 +00:00