Commit Graph
1017 Commits
Author SHA1 Message Date
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春 392463cace Merge branch 'sprint/168_sgm_45161' into 'sprint/168'
Sprint/168 sgm 45161

See merge request easycorp/zentaopms!641
2021-11-30 05:16:08 +00:00
孙广明 9e9c024982 * Adjust lang. 2021-11-30 13:10:51 +08:00
孙广明 d58fb3c8e7 * Add lang and comment. 2021-11-30 13:08:17 +08:00
孙广明 eb6bd79963 * Remove unused file. 2021-11-29 13:09:43 +08:00
孙广明 19e08aafdc * Finish task #45161. 2021-11-29 10:29:56 +08:00
孙广明 8656350081 * Remove noproject merge method. 2021-11-25 15:28:54 +08:00
孙广明 182106be13 * Finish task #45153. 2021-11-25 15:14:10 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
hufangzhou 8b651bd59c * Modify the lang file when merge data for upgrade. 2021-11-18 13:35:58 +08:00
hufangzhou 21faa0dc2a * Finish task #44361. 2021-11-18 11:30:28 +08:00
hufangzhou 6e1f7dfbf7 * Finish task #44361. 2021-11-17 18:06:48 +08:00
hufangzhou 0d39951950 * Code for task #44361. 2021-11-17 16:14:53 +08:00
xieqiyu f6884fd700 * Modify comment. 2021-11-15 13:09:42 +08:00
xieqiyu 55e0e9591b * Process branch and module when upgrade. 2021-11-15 13:07:07 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
tianshujie e893c7f6c3 * Add upgrade sql. 2021-11-04 15:42:39 +08:00
tianshujie c8cecbdae1 * Fix bug #15958. 2021-11-03 11:15:34 +08:00
tianshujie c57171f5b2 * Fix bug #15958. 2021-11-03 10:34:16 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
hufangzhou 5377de8a81 * Fix bug #15817. 2021-10-28 14:24:36 +08:00
zhujinyong ec8b31e847 Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into 169 2021-10-27 11:06:45 +08:00
tianshujie a71cacdaa8 * Refactoring the Kanban function. 2021-10-26 10:25:33 +08:00
tianshujie 3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
hufangzhou bf6b658810 * Fix bug #15717. 2021-10-22 08:45:02 +08:00
hufangzhou e5d8340402 * Add the upgrade sql in upgrade module. 2021-10-19 13:48:28 +08:00
hufangzhou cf3654bd0d * Modify the variable name. 2021-10-18 16:34:33 +08:00
hufangzhou 20fbf2436c * Modify the variable name. 2021-10-18 16:32:31 +08:00
hufangzhou 5691e39633 * Fix bug #15557. 2021-10-18 16:27:36 +08:00
hufangzhou c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
tianshujie 5c867b2c96 * Fix bug #15525. 2021-10-14 14:11:14 +08:00
tianshujie 77f7f7407f * Fix bug #15522. 2021-10-14 13:16:40 +08:00
tianshujie 993a02eb78 * Fix bug #15521. 2021-10-14 11:31:38 +08:00
tianshujie 264a20d583 * Fix bug #15516. 2021-10-14 10:47:07 +08:00
tianshujie 880c8893c8 * Fix bug #15484. 2021-10-13 15:11:26 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
王怡栋 01b7db1dd6 * adjust for upgrade. 2021-09-18 13:51:15 +08:00
liyuchun e4ab2d8a80 * Fix bug #15245. 2021-09-18 11:19:12 +08:00
tianshujie 3d5ff75dec * Fix the problem of upgrade build error. 2021-09-14 16:42:39 +08:00
dingguodong 7ba0c35e35 * Correct the misspelled word. 2021-09-13 10:45:02 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
王怡栋 f3a07d930a * finish task #42428. 2021-09-08 13:24:37 +08:00
tianshujie a580403a3e * Finish task #42427. 2021-09-08 11:22:05 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
王怡栋 003f03589c * finish task #42159. 2021-09-02 16:47:50 +08:00
王怡栋 553255a1bf * adjust for upgrade. 2021-09-02 11:16:23 +08:00