Commit Graph
48410 Commits
Author SHA1 Message Date
朱金勇 88dd3e8db3 Merge branch 'change-checksafefile' into 'master'
* If run in container, no need check ok.txt.

See merge request easycorp/zentaopms!6414
2022-11-30 06:05:27 +00:00
Lufei 35b4ba9e92 * If run in container, no need check ok.txt. 2022-11-30 11:19:31 +08:00
王怡栋 c71b65d8b0 Merge branch 'zentaopms_266_task#77610' into 'master'
* Finish task #77610.

See merge request easycorp/zentaopms!6410
2022-11-30 02:06:19 +00:00
王怡栋 aa46a1a6bc Merge branch 'sprint/konglingmao_feedback#508' into 'master'
* Resolved feedback #508, fixed image display error when export to html.

See merge request easycorp/zentaopms!6409
2022-11-30 02:04:50 +00:00
王怡栋 8dde745cbe Merge branch 'master_bug_30061' into 'master'
* Fix bug #30061.

See merge request easycorp/zentaopms!6408
2022-11-30 02:03:29 +00:00
王怡栋 f667a850a1 Merge branch 'sprint/konglingmao_feedback#1514' into 'master'
* Resolved feedback #1514,add execution linkage when project empty.

See merge request easycorp/zentaopms!6389
2022-11-30 02:03:06 +00:00
wangyuting 5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
孔令茂 1dfe049a97 * Resolved feedback #508, fixed image display error when export to html. 2022-11-30 01:19:51 +00:00
liuhong 68ad91c71b * Fix bug #30061. 2022-11-30 00:53:11 +00:00
朱金勇 9254620aa8 Merge branch 'fix_api_scheme' into 'master'
* Fix baseUrl scheme error for api createDemoData.

See merge request easycorp/zentaopms!6407
2022-11-30 00:20:44 +00:00
孔令茂 e5cfde941d * Optimize project linkage on create bug page. 2022-11-29 13:20:50 +00:00
孔令茂 0b298bf63c * Resolved feedback #1514,add execution linkage when project empty. 2022-11-29 13:20:50 +00:00
朱金勇 e3d103a251 Merge branch 'remove_useless_output' into 'master'
- Remove useless output.

See merge request easycorp/zentaopms!6406
2022-11-29 11:05:19 +00:00
Lufei 12e1539301 * Fix baseUrl scheme error for api createDemoData. 2022-11-29 18:28:13 +08:00
wangyidong c04b6ff12b * change method name getnotemptybuilds to filterlinked. 2022-11-29 17:09:40 +08:00
wangyidong 5f0355999c * adjust for link for de lang. 2022-11-29 16:55:40 +08:00
Lufei cc8254f1a0 - Remove useless output. 2022-11-29 16:46:52 +08:00
王怡栋 77d338052d Merge branch 'zentaopms266_wyd' into 'master'
* code for task #77242.

See merge request easycorp/zentaopms!6405
2022-11-29 08:18:07 +00:00
wangyidong 8d41badb9e * code for task #77242. 2022-11-29 15:50:49 +08:00
王怡栋 f20065e99f Merge branch 'bug_29140' into 'master'
* Fix bug#29140

See merge request easycorp/zentaopms!6401
2022-11-29 06:47:40 +00:00
王怡栋 cdb70c5158 Merge branch 'bug_30309' into 'master'
* Fix bug#30309

See merge request easycorp/zentaopms!6399
2022-11-29 06:47:17 +00:00
王怡栋 6111ca8fae Merge branch 'zentaopms266_wyd' into 'master'
* code for task #77617.

See merge request easycorp/zentaopms!6402
2022-11-29 06:45:38 +00:00
wangyidong 71c1466f5a * code for task #77617. 2022-11-29 14:42:05 +08:00
zenggang b908e942a8 * Fix bug#29140 2022-11-29 06:35:11 +00:00
zenggang 9b63267e10 * Fix bug#30309 2022-11-29 03:01: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