Commit Graph
24500 Commits
Author SHA1 Message Date
dingguodong 07bcb9012e Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169 2021-10-29 17:33:56 +08:00
dingguodong ff55234a7b * Correct codes in job and compile module. 2021-10-29 17:33:13 +08:00
孙广明 6877e4c7f0 Merge branch 'sprint/169_mayue_15835' into 'sprint/169'
* Fix a bug #15835.

See merge request easycorp/zentaopms!242
2021-10-29 09:30:36 +00:00
孙广明 0a8de60c4e Merge branch 'sprint/169_zhouxin_43617' into 'sprint/169'
Finish task #43617.

See merge request easycorp/zentaopms!229
2021-10-29 07:17:58 +00:00
mayue 217927ce09 * Fix a bug #15835. 2021-10-29 14:47:21 +08:00
zhouxin 4f1126ada7 Finish task #43617. 2021-10-29 11:28:41 +08:00
孙广明 f1fbcdf74e Merge branch 'sprint/169_tanghucheng_43619' into 'sprint/169'
Finish task #43619,63620

See merge request easycorp/zentaopms!220
2021-10-29 02:28:44 +00:00
tanghucheng 162846d43f * Finish task #43619,43620. 2021-10-29 10:22:56 +08:00
dingguodong f3b6a38403 * Adjust and correct codes for gitlab module. 2021-10-29 10:06:50 +08:00
tanghucheng 8d1e5cd785 * Finish task #43619,43620. 2021-10-29 09:17:57 +08:00
李玉春 07d6f3e27e Merge branch 'sprint/169_mayue_15696' into 'sprint/169'
*Fix a bug #15696.

See merge request easycorp/zentaopms!217
2021-10-28 08:28:19 +00:00
mayue af5c3178ee *Fix a bug #15696. 2021-10-28 16:21:31 +08:00
孙广明 d2df32b6d2 Merge branch 'spirnt/169_liyuchun_api' into 'sprint/169'
* Adjust style of api index.

See merge request easycorp/zentaopms!212
2021-10-28 07:39:36 +00:00
李玉春 90746c0c40 Merge branch 'sprint/169_mayue_15778' into 'sprint/169'
*Fix a bug #15778.

See merge request easycorp/zentaopms!211
2021-10-28 07:17:23 +00:00
mayue 539fb5d7b0 *Fix a bug #15778. 2021-10-28 15:13:15 +08:00
liyuchun 886f54508f * Adjust style of api index. 2021-10-28 15:10:23 +08:00
mayue 936770dc65 *Fix a bug #15778. 2021-10-28 14:48:20 +08:00
xiawenlong a4aef73aa6 * Finish Task #43676,43675,43672,43671,43679,43669 2021-10-28 14:41:31 +08:00
tanghucheng 488c4a8cb2 * Finish task #43619,43620 2021-10-28 13:50:41 +08:00
李玉春 c326a859ec Merge branch 'sprint/169_mayue_15776' into 'sprint/169'
*Fix a bug #15776.

See merge request easycorp/zentaopms!205
2021-10-28 05:35:09 +00:00
mayue 92b450679a *Fix a bug #15776. 2021-10-28 13:32:15 +08:00
孙广明 2b064a057e Merge branch 'sprint/169_zhouxin_43618' into 'sprint/169'
Finish task #43618.

See merge request easycorp/zentaopms!199
2021-10-28 05:24:56 +00:00
李玉春 dd359d9877 Merge branch 'sprint/169_xiawenlong' into 'sprint/169'
* Finish Task #43624

See merge request easycorp/zentaopms!203
2021-10-28 05:15:55 +00:00
xiawenlong 3d52f403d0 * Finish Task #43624 2021-10-28 13:02:38 +08:00
zhouxin 26cc334d95 Finish task #43618. 2021-10-28 10:37:01 +08:00
mayue ef9821f709 *Fix a bug #15793. 2021-10-28 10:10:04 +08:00
mayue 60afff4fcd *Fix a bug #15793. 2021-10-28 10:04:55 +08:00
mayue a2a8552221 *Fix a bug #15793. 2021-10-28 09:52:35 +08:00
李玉春 92895e16b5 Merge branch 'sprint/169_zhouxin_43556' into 'sprint/169'
Fix bug 43556

See merge request easycorp/zentaopms!190
2021-10-27 09:24:46 +00:00
孙广明 0b6b0ee956 Merge branch 'sprint/169_zhouxin_43539' into 'sprint/169'
Fix bug #43539

See merge request easycorp/zentaopms!176
2021-10-27 09:18:04 +00:00
孙广明 968c53b3ab Merge branch 'sprint/169_tanghucheng_43541' into 'sprint/169'
Finish task #43541

See merge request easycorp/zentaopms!186
2021-10-27 09:00:41 +00:00
zhouxin cf7826954e Fix bug #43556. 2021-10-27 16:55:26 +08:00
tianshujie 896300727d * Fix bug #43537. 2021-10-27 16:54:43 +08:00
tanghucheng 82d42ca24a * Finish task #43541. 2021-10-27 16:37:30 +08:00
tanghucheng 9cc238ca96 * Finish task #43541. 2021-10-27 16:34:43 +08:00
tanghucheng 4ea309a73d * Finish task #43541. 2021-10-27 16:30:56 +08:00
tanghucheng a0d22615b8 Merge branch 'sprint/169_tanghucheng_43541' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_tanghucheng_43541 2021-10-27 16:19:24 +08:00
tanghucheng 635f4e1c35 * Finish task #43541. 2021-10-27 16:14:35 +08:00
孙广明 3ded66986e Merge branch 'sprint/169_xieqiyu_43555' into 'sprint/169'
* Finish task#43555.

See merge request easycorp/zentaopms!182
2021-10-27 07:45:57 +00:00
xieqiyu 9c588bd32e * Finish task#43555. 2021-10-27 15:24:29 +08:00
李玉春 6d3b95f797 Merge branch 'sprint/169_mayue_15741' into 'sprint/169'
*Fix a bug #15741.

See merge request easycorp/zentaopms!179
2021-10-27 07:07:58 +00:00
mayue b2ea4ec71f *Fix a bug #15741. 2021-10-27 14:39:57 +08:00
tanghucheng d2cca97b50 * Finish task #43541. 2021-10-27 14:19:38 +08:00
zhouxin 0417c40e83 Fix bug #43539. 2021-10-27 14:10:45 +08:00
李玉春 ee48738da8 Merge branch 'sprint/169_tianshujie_43540' into 'sprint/169'
* Fix bug #43540.

See merge request easycorp/zentaopms!174
2021-10-27 06:10:09 +00:00
tianshujie 9fac2ea22e * Fix bug #43540. 2021-10-27 13:50:27 +08:00
dingguodong 36cf32bb9b * Make codes meet the CR rules. 2021-10-27 11:08:37 +08:00
dingguodong 0a93db90f2 * Add comments and notes. 2021-10-27 10:41:03 +08:00
dingguodong e7c337c8b5 * Fix the bug that compile can run scheduled job. 2021-10-27 10:39:54 +08:00
dingguodong fff67388f8 * Fix the bug that user can not select pipeline from jenkins. 2021-10-27 10:39:11 +08:00