Commit Graph
27699 Commits
Author SHA1 Message Date
孙广明 0325b07527 Merge branch 'sprint/180_xieqiyu_46520' into 'master'
* Fix bug: test task count error.

See merge request easycorp/zentaopms!1288
2022-01-06 05:26:24 +00:00
孙广明 d1eab22822 Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Fix bug for batch edit.

See merge request easycorp/zentaopms!1289
2022-01-06 05:22:05 +00:00
liumengyi f8da5c8503 * Fix bug for batch edit. 2022-01-06 13:20:16 +08:00
zhouxin 7c1d29f971 Fix bug. 2022-01-06 05:12:36 +00:00
xieqiyu ac110317ee * Fix bug: test task count error. 2022-01-06 13:11:08 +08:00
zhouxin b74b175a9a Do some little change. 2022-01-06 05:01:18 +00:00
朱金勇 cb699a9f5a Merge branch 'sprint/181_tianshujie_lang' into 'master'
* Modify the English language item of the currency.

See merge request easycorp/zentaopms!1277
2022-01-06 04:53:49 +00:00
李玉春 a19708adeb Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
#   module/project/config.php
2022-01-06 04:01:16 +00:00
zhouxin 0b08489176 Fix bug. 2022-01-06 03:57:50 +00:00
李玉春 ad0303f83d Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug

See merge request easycorp/zentaopms!1284
2022-01-06 03:34:05 +00:00
zhengrunyu 3c4b34dc9c *Fix bug 2022-01-06 11:32:56 +08:00
李玉春 0943f58b83 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug.

See merge request easycorp/zentaopms!1282
2022-01-06 03:27:12 +00:00
李玉春 0451b2c8b9 Merge branch 'sprint/180_xieqiyu_18250' into 'master'
* Fix bug#18250.

See merge request easycorp/zentaopms!1283
2022-01-06 03:27:01 +00:00
zhouxin 520f6077bd Add testtask and release table. 2022-01-06 03:25:52 +00:00
孙广明 be84dfdf10 Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code chenge status of parent and fix bug

See merge request easycorp/zentaopms!1280
2022-01-06 03:22:44 +00:00
xieqiyu f78a39f5a1 * Fix bug#18250. 2022-01-06 11:21:43 +08:00
zhouxin 05192bdb3e Fix bug. 2022-01-06 03:21:03 +00:00
zhengrunyu 666760a95c *Code bug. 2022-01-06 11:20:27 +08:00
zhengrunyu c0b16334ee *Code chenge status of parent and fix bug 2022-01-06 11:12:29 +08:00
李玉春 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
tianshujie 5929a4fc32 * Modify the English language item of the currency. 2022-01-06 10:35:25 +08: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