Commit Graph
43593 Commits
Author SHA1 Message Date
liyuchun 9bade59d7b * Fix bug #26342. 2022-08-12 17:27:15 +08:00
liyuchun 32613a2045 * Finish task #64263. 2022-08-12 17:10:47 +08:00
李玉春 c70e0f7376 Merge branch 'cyy_mr_edit' into 'zenops_41'
* Modify edit mr page.

See merge request easycorp/zentaopms!4938
2022-08-12 06:33:30 +00:00
caoyanyi 3cc56c314d * Adjust codes. 2022-08-12 14:27:08 +08:00
caoyanyi 9bf8e1925a * Modify gogos check. 2022-08-12 14:23:19 +08:00
caoyanyi c8bbeb43e4 * Remove extra. 2022-08-11 16:59:20 +08:00
caoyanyi b0ad47a7e9 * Modify edit mr page. 2022-08-11 16:49:11 +08:00
caoyanyi e45d44ccaa Merge branch 'master' into zenops_41 2022-08-11 16:04:36 +08:00
李玉春 cfa6b03e8e Merge branch 'cyy_bug' into 'master'
* Modify mr error.

See merge request easycorp/zentaopms!4936
2022-08-11 08:00:47 +00:00
caoyanyi 0e6bc3432e * Modify mr error. 2022-08-11 15:59:51 +08:00
liyuchun 8e3e41b805 * Finish task #62872. 2022-08-11 15:59:46 +08:00
wangyidong 02bab0a206 Merge branch 'sprint/devplat_31' 2022-08-11 15:21:36 +08:00
daitingting 5f9da4f6ec * Adjust upgrade version. 2022-08-11 07:17:44 +00:00
daitingting 145b7d2bc5 * Update defalut likages for approval review. 2022-08-11 06:57:44 +00:00
李玉春 45bf46e52a Merge branch 'cyy_repo' into 'zenops_41'
* Modify repo unique check.

See merge request easycorp/zentaopms!4928
2022-08-11 06:42:32 +00:00
李玉春 79877417f3 Merge branch 'cyy_mr' into 'zenops_41'
* Modify edit mr.

See merge request easycorp/zentaopms!4927
2022-08-11 06:41:59 +00:00
caoyanyi 690901bc16 * Modify repo unique check. 2022-08-11 14:40:50 +08:00
liyuchun a49e357a33 Merge branch 'zenops_41' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_41 2022-08-11 14:40:16 +08:00
liyuchun 99dfc212ff * Finish task #62872. 2022-08-11 14:39:43 +08:00
caoyanyi 22a6755bfe * Modify edit mr. 2022-08-11 14:26:04 +08:00
wangyidong 1915ef01e5 * fix for get plans when no product. 2022-08-11 14:21:22 +08:00
wangyidong d4ed167e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-11 14:12:52 +08:00
wangyidong 579d614d77 Merge branch 'sprint/devplat_31' 2022-08-11 14:12:44 +08:00
李玉春 6e16aeaea5 Merge branch 'cyy_mr' into 'zenops_41'
* Add Gogs mr param.

See merge request easycorp/zentaopms!4923
2022-08-11 06:09:26 +00:00
caoyanyi 5011a49dc0 * Modify edit mr. 2022-08-11 14:02:14 +08:00
王怡栋 0125b85cd4 Merge branch 'sprint/master_guofeilong_fixbug_261443' into 'master'
Sprint/master guofeilong fixbug 261443

See merge request easycorp/zentaopms!4925
2022-08-11 06:00:45 +00:00
liuruogu 64acdb8693 * Fix bug #26173. 2022-08-11 05:53:27 +00:00
guofeilong 25444755d3 * Delete debugger 2022-08-11 05:51:42 +00:00
guofeilong 04c79e6fbb * Fix bug #26143 2022-08-11 05:49:24 +00:00
liuruogu 5a6d41baed * Fix bug #26173. 2022-08-11 05:47:19 +00:00
caoyanyi c2aec6c152 * Add Gogs mr param. 2022-08-11 13:43:07 +08:00
sunguangming a978f21f69 * Fix file unit case. 2022-08-11 13:31:51 +08:00
sunguangming 17c5bdca14 * Add unit case for file. 2022-08-11 13:21:50 +08:00
王怡栋 61f3904ff0 Merge branch 'sprint/devplat_31' into 'master'
* Add flow fields when upgrade from biz7.3.

See merge request easycorp/zentaopms!4922
2022-08-11 05:20:51 +00:00
王怡栋 fd4ad2daaa Merge branch 'sprint/hufangzhou_updateLang' into 'master'
* Modify the lang item.

See merge request easycorp/zentaopms!4921
2022-08-11 04:12:06 +00:00
王怡栋 dca269ee84 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4918
2022-08-11 04:11:23 +00:00
王怡栋 8e722c7d98 Merge branch 'master_xieqiyu_63769' into 'master'
* Finish task#63769.

See merge request easycorp/zentaopms!4916
2022-08-11 04:10:48 +00:00
hufangzhou 9e80429e03 * Modify the lang item. 2022-08-11 11:34:02 +08:00
daitingting bbf17e6bff * Add flow fields when upgrade from biz7.3. 2022-08-11 03:22:42 +00:00
胡方舟 f2365a4937 Merge branch 'sprint/tianshujie' into 'master'
* Initializes the module control.

See merge request easycorp/zentaopms!4919
2022-08-11 03:07:20 +00:00
孙广明 22b0ba7314 Merge branch 'sprint/224_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!4920
2022-08-11 02:56:57 +00:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
tianshujie bfbf6bcc45 * Initializes the module control. 2022-08-11 10:53:17 +08:00
xieqiyu 809b70a5b8 * Code for task#63769. Story#32949. 2022-08-11 10:29:04 +08:00
tanghucheng 47ad64d1bc * Code for port. 2022-08-11 10:27:03 +08:00
王怡栋 8901f60b25 Merge branch 'sprint/224_liumengyi_fixbug' into 'master'
* Fix bug #26246.

See merge request easycorp/zentaopms!4917
2022-08-11 02:26:49 +00:00
王怡栋 1ccc55aea4 Merge branch 'fix_bug#25891' into 'master'
* Fix bug 25891.

See merge request easycorp/zentaopms!4915
2022-08-11 02:15:29 +00:00
王怡栋 0fca3e9f13 Merge branch 'leiyong_fix_bug_0811' into 'master'
* Fix single sign-on.

See merge request easycorp/zentaopms!4914
2022-08-11 02:15:16 +00:00
王怡栋 93947c8127 Merge branch 'sprint/master_zhouxudong_26294' into 'master'
* Fix bug #26294.

See merge request easycorp/zentaopms!4913
2022-08-11 02:15:06 +00:00
王怡栋 ce74ee1f30 Merge branch 'sprint/max41_mayue_bug#26242' into 'master'
Sprint/max41 mayue bug#26242

See merge request easycorp/zentaopms!4911
2022-08-11 02:14:55 +00:00