Commit Graph
27679 Commits
Author SHA1 Message Date
李玉春 c357477762 Merge branch 'devops18_47047' into 'master'
* Finish task#47047

See merge request easycorp/zentaopms!1272
2022-01-06 03:00:38 +00:00
李玉春 4ca46cc91f Merge branch 'devops18_47057' into 'master'
* Finish task#47057

See merge request easycorp/zentaopms!1260
2022-01-06 02:59:30 +00:00
李玉春 d8c5bcb3b4 Merge branch 'sprint/180_mayue_18114' into 'master'
* Fix bug #18114.

See merge request easycorp/zentaopms!1279
2022-01-06 02:58:30 +00:00
孙广明 962da1c6a2 Merge branch 'sprint/180_xieqiyu_fixbug' into 'master'
* Fix bug of edit task has only main branch stories.

See merge request easycorp/zentaopms!1270
2022-01-06 02:42:31 +00:00
mayue 314173d072 * Fix bug #18114. 2022-01-06 09:09:35 +08:00
孙广明 f485b31fb9 Merge branch 'sprint/181_liumengyi_edit' into 'master'
* Fix bug #18173.

See merge request easycorp/zentaopms!1275
2022-01-06 00:55:33 +00:00
hufangzhou 22f322fb94 * Fix bug #18220. 2022-01-05 20:47:05 +08:00
liumengyi b88740a836 * Fix bug #18173. 2022-01-05 17:28:21 +08:00
孙广明 cc7f405f4d Merge branch 'sprint/181_liumengyi_edit' into 'master'
* Fix bug #18173.

See merge request easycorp/zentaopms!1273
2022-01-05 07:14:46 +00:00
孙广明 4ca0780fb0 Merge branch 'sprint/180_songchenxuan_18183,18184' into 'master'
*Fix bug 18183,18184.

See merge request easycorp/zentaopms!1274
2022-01-05 07:12:38 +00:00
songchenxuan bc637ef419 *Fix bug 18183,18184. 2022-01-05 15:11:26 +08:00
songchenxuan ecc3ae4608 *Fix bug 18183,18184. 2022-01-05 15:06:56 +08:00
liumengyi 18f60b7825 * Fix bug #18173. 2022-01-05 14:57:14 +08:00
孙广明 30f5033357 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18201.

See merge request easycorp/zentaopms!1269
2022-01-05 06:48:31 +00:00
zenggang 08132a448d * Adjust code 2022-01-05 06:39:32 +00:00
王怡栋 a7707776a4 Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #17956.

See merge request easycorp/zentaopms!1264
2022-01-05 06:31:19 +00:00
zenggang 79859569b3 * Finish task#47047 2022-01-05 06:24:19 +00:00
xieqiyu a25ed2eedb * Fix bug of edit task has only main branch stories. 2022-01-05 14:03:09 +08:00
zhouxin d34b83cd96 Fix bug #18201. 2022-01-05 05:54:10 +00:00
liyuchun 5ef3cb51a8 * Fix bug #17952. 2022-01-05 13:45:14 +08:00
zhouxin ee431f18e3 Fix bug #18199. 2022-01-05 05:09:08 +00:00
liyuchun 818a1d7332 * Fix bug #17956. 2022-01-05 11:20:43 +08:00
zenggang 443a00c606 * Finish task#47057 2022-01-05 02:16:33 +00:00
caoyanyi 5d9dc4885b * Finish task #47051. 2022-01-05 02:03:30 +00:00
zhujinyong 90ffee0f0c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-01-05 09:06:07 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
孙广明 44b222eca6 Merge branch 'sprint/180_songchenxuan_46518' into 'sprint/180'
Sprint/180 songchenxuan 46518

See merge request easycorp/zentaopms!1254
2022-01-05 05:17:12 +00:00
孙广明 a2bd7cfcf3 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18199.

See merge request easycorp/zentaopms!1266
2022-01-05 05:15:13 +00:00
songchenxuan 185f2c190a *Finish task #46518. 2022-01-05 13:15:01 +08:00
songchenxuan dee36b8125 *Finish task #46158. 2022-01-05 13:13:35 +08:00
孙广明 2ad05dd024 Merge branch 'sprint/180_hufangzhou_closeModel' into 'master'
* Compatible with Firefox browser.

See merge request easycorp/zentaopms!1262
2022-01-05 05:11:43 +00:00
songchenxuan 2cac43a56f *Finish task #46518. 2022-01-05 13:11:34 +08:00
孙广明 0ffc96d670 Merge branch 'sprint/181_tianshujie_code' into 'master'
* Fix problems in code review.

See merge request easycorp/zentaopms!1263
2022-01-05 05:11:21 +00:00
孙广明 e3b3c11e5b Merge branch 'sprint/180_xieqiyu_modifyProblem' into 'sprint/180'
* Modify upgrade tips style.

See merge request easycorp/zentaopms!1265
2022-01-05 05:10:14 +00:00
xieqiyu 8f05f4c257 * Modify upgrade tips style. 2022-01-05 13:04:57 +08:00
tianshujie 0a3f8e4969 * Edit comment of browse.js file. 2022-01-05 11:06:31 +08:00
tianshujie ac03f67bdb * Fix problems in code review. 2022-01-05 11:02:34 +08:00
hufangzhou 4d78e4b9d3 * Compatible with Firefox browser. 2022-01-05 10:54:34 +08:00
liumengyi 3837af7a86 * Modify code format for kanban and productplan. 2022-01-05 10:54:30 +08:00
liumengyi ad55c5197d * Modify code format for kanban and productplan. 2022-01-05 10:53:45 +08:00
songchenxuan 5b3d3e5ce2 *Finish task #46018. 2022-01-05 09:40:43 +08:00
songchenxuan 0d2445bcb3 *Finish task #46518. 2022-01-05 09:02:58 +08:00
songchenxuan b00bfee1bc *Finish task #46518. 2022-01-05 08:59:42 +08:00
songchenxuan 3690892764 *Finish task #46518. 2022-01-04 17:40:56 +08:00
mayue 15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
songchenxuan 294edf6aa0 *Finish task #46518. 2022-01-04 16:58:29 +08:00
李玉春 76a3ebdd7b Merge branch 'sprint/181_zhengrunyu_18165' into 'master'
*Fixbug 18172.

See merge request easycorp/zentaopms!1257
2022-01-04 08:50:03 +00:00
zhengrunyu 18a744763f *Fixbug 18172. 2022-01-04 16:47:33 +08:00
王怡栋 2df95c203e Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #18150.

See merge request easycorp/zentaopms!1256
2022-01-04 08:17:56 +00:00