Commit Graph
27720 Commits
Author SHA1 Message Date
zhengrunyu 16aa3247a0 *Fix bug. 2022-01-06 15:45:45 +08:00
zhengrunyu 8539bc7883 *Unset required. 2022-01-06 15:19:51 +08:00
zhengrunyu ea5a484019 *Fix bug. 2022-01-06 14:31:08 +08:00
孙广明 1ec9dcb113 Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Fix bug for batch edit.

See merge request easycorp/zentaopms!1294
2022-01-06 06:20:21 +00:00
孙广明 27e9e40cb9 Merge branch 'master' into 'sprint/181_zhengrunyu_Fixbug'
# Conflicts:
#   module/productplan/control.php
2022-01-06 06:19:17 +00:00
liumengyi 038b8b01c2 * Fix bug for batch edit. 2022-01-06 14:19:08 +08:00
孙广明 e94c1128e1 Merge branch 'sprint/180_songchenxuan_fix_code_review' into 'master'
*Code for code review.

See merge request easycorp/zentaopms!1287
2022-01-06 06:18:23 +00:00
zhengrunyu f2874479c2 *Adjust code. 2022-01-06 14:16:18 +08:00
liumengyi b28777ecfd * Fix bug for batch edit. 2022-01-06 14:04:18 +08:00
zhengrunyu 133316ba45 *Adjust code. 2022-01-06 14:03:25 +08:00
songchenxuan 2de429b441 *Code for code review. 2022-01-06 14:01:21 +08:00
songchenxuan 8a0448c99d *Code for code review. 2022-01-06 13:56:06 +08:00
孙广明 db0e90f53e Merge branch 'sprint/180_mayue_bug18147,18149' into 'master'
* Fix bug #18147,18149.

See merge request easycorp/zentaopms!1290
2022-01-06 05:55:04 +00:00
孙广明 8745c6ded0 Merge branch 'sprint/32_tianshujie_18095' into 'master'
* Fix bug #18095.

See merge request easycorp/zentaopms!1292
2022-01-06 05:53:48 +00:00
songchenxuan e51d0283e9 *Code for code review. 2022-01-06 13:51:33 +08:00
mayue a2765b7427 * Optimize code. 2022-01-06 13:50:43 +08:00
tianshujie 127b69d4c7 * Fix bug #18095. 2022-01-06 13:47:18 +08:00
tanghucheng b5de7cebfa * Fix bug. 2022-01-06 13:46:58 +08:00
mayue fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
songchenxuan 1cf45ada5c *Code for code review. 2022-01-06 13:34:53 +08:00
孙广明 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
songchenxuan 8927059720 *Code for code review. 2022-01-06 13:08:46 +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