Commit Graph
29363 Commits
Author SHA1 Message Date
孙广明 87ab1ecc76 Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.

See merge request easycorp/zentaopms!587
2021-11-22 07:12:13 +00:00
zhengrunyu 995ca51b88 *Finish task #16529. 2021-11-22 15:06:52 +08:00
李玉春 8221875b47 Merge branch 'sprint/170_hufangzhou_16512' into 'sprint/170'
* Fix bug #16512.

See merge request easycorp/zentaopms!580
2021-11-22 06:55:26 +00:00
hufangzhou b924509817 * Remove the unused code. 2021-11-22 14:52:20 +08:00
孙广明 d3c2f014fe Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.

See merge request easycorp/zentaopms!584
2021-11-22 06:41:02 +00:00
zhengrunyu 1a9175f485 *Finish task #16529. 2021-11-22 14:36:56 +08:00
李玉春 4436dab22c Merge branch 'sprint/170_tianshujie_16533' into 'sprint/170'
* Fix bug #16533.

See merge request easycorp/zentaopms!579
2021-11-22 06:33:16 +00:00
tianshujie 23f78928dd * Modify the code. 2021-11-22 14:28:13 +08:00
tianshujie 8f1a017225 * Modify the code. 2021-11-22 14:14:17 +08:00
tianshujie c2ac079bbb * Modify the case module problem. 2021-11-22 14:01:02 +08:00
tianshujie 4058eae297 * Change parameters. 2021-11-22 13:52:19 +08:00
孙广明 1cca1f44d6 Merge branch 'sprint/173_lizhiqiang_16536' into 'sprint/170'
*Fix Bug #16536.

See merge request easycorp/zentaopms!577
2021-11-22 05:51:13 +00:00
hufangzhou 5492d27798 * Fix bug #16512. 2021-11-22 13:46:02 +08:00
tianshujie 69842996d6 * Fix bug #16533. 2021-11-22 13:45:44 +08:00
lizhiqiang 0047359ef6 *Fix Bug #16536. 2021-11-22 13:44:06 +08:00
lizhiqiang 86867b5d4e *Fix Bug #16532. 2021-11-22 13:37:38 +08:00
孙广明 2ebe6c5dca Merge branch 'sprint/170_zhengrunyu_16521' into 'sprint/170'
*Finish task #16521.

See merge request easycorp/zentaopms!576
2021-11-22 05:16:01 +00:00
李玉春 d272f1e392 Merge branch 'sprint/173_xieqiyu_16479' into 'sprint/170'
* Fix bug#16479.

See merge request easycorp/zentaopms!564
2021-11-22 05:04:14 +00:00
xieqiyu 0669e7385b * Fix bug#16519. 2021-11-22 12:33:27 +08:00
李玉春 2e37a3b27c Merge branch 'sprint/170_songchenxuan_16508' into 'sprint/170'
Sprint/170 songchenxuan 16508

See merge request easycorp/zentaopms!569
2021-11-22 03:51:26 +00:00
李玉春 87a25ad686 Merge branch 'sprint/170_mayue_16405' into 'sprint/170'
* Fix bug #16405.

See merge request easycorp/zentaopms!574
2021-11-22 03:50:25 +00:00
李玉春 89149f1ca9 Merge branch 'sprint/170_tianshujie_16528' into 'sprint/170'
* Fix bug #16528.

See merge request easycorp/zentaopms!573
2021-11-22 03:50:10 +00:00
李玉春 9c9203ca18 Merge branch 'sprint/170_tianshujie_16514' into 'sprint/170'
* Fix bug #16514.

See merge request easycorp/zentaopms!570
2021-11-22 03:49:35 +00:00
李玉春 a74768d5e6 Merge branch 'sprint/170_tianshujie_16486' into 'sprint/170'
* Fix bug #16486.

See merge request easycorp/zentaopms!563
2021-11-22 03:47:48 +00:00
李玉春 53efb2c9b1 Merge branch 'sprint/170_tianshujie_16502' into 'sprint/170'
* Fix bug #16502.

See merge request easycorp/zentaopms!562
2021-11-22 03:47:14 +00:00
mayue 90418ee41d * Fix bug #16405. 2021-11-22 11:30:00 +08:00
tianshujie a1c59d2ca0 * Fix bug #16528. 2021-11-22 11:23:09 +08:00
xieqiyu 13ae5b4d9a * Code for task#44503. 2021-11-22 11:16:48 +08:00
zhengrunyu a6db2057d9 *Finish task #16521. 2021-11-22 11:12:15 +08:00
tianshujie b209b35a3b * Fix bug #16514. 2021-11-22 11:06:08 +08:00
songchenxuan 318be4d78b * Fix bug 16508 2021-11-22 11:00:07 +08:00
songchenxuan ab5c52c902 * Fix bug 16508 2021-11-22 10:59:11 +08:00
孙广明 8b1d4b430d Merge branch 'sprint/170_zhengrunyu_16507' into 'sprint/170'
*Finish task #16507.

See merge request easycorp/zentaopms!566
2021-11-22 02:37:05 +00:00
zhengrunyu 293c0f12e2 *Finish task #16507. 2021-11-22 10:33:00 +08:00
zhengrunyu 43fab0b8d3 *Finish task #16507. 2021-11-22 10:27:12 +08:00
zhujinyong 56417d12a0 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-22 09:59:53 +08:00
xieqiyu dee3dd3be0 * Restore code. 2021-11-22 09:59:35 +08:00
zhujinyong e7606af189 * Fix english language. 2021-11-22 09:59:21 +08:00
zhujinyong 0d7c8a5e2d * Add array type for params type. 2021-11-22 09:55:20 +08:00
tianshujie 7a743f5786 * Fix bug #16486. 2021-11-22 09:51:19 +08:00
xieqiyu aae0921d23 * Fix bug#16479. 2021-11-22 09:47:35 +08:00
tianshujie c5de287171 * Fix bug #16502. 2021-11-22 09:32:13 +08:00
李玉春 8e7c536a8d Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
Modify the branch scope when creating and editing bugs.

See merge request easycorp/zentaopms!560
2021-11-22 01:00:45 +00:00
tianshujie 46ac0a5e88 * Modify the code. 2021-11-22 08:59:40 +08:00
朱金勇 da9dee64bc Merge branch 'sprint/170_liwenrui_xuan_integration' into 'sprint/170'
* add owt settings, and remove useless group permissions, xuan task #43732.

See merge request easycorp/zentaopms!387
2021-11-22 00:55:22 +00:00
李玉春 6b388c2d09 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
Sprint/173 xieqiyu fixbug

See merge request easycorp/zentaopms!559
2021-11-22 00:43:54 +00:00
李玉春 df3ac3a37f Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Modified language.

See merge request easycorp/zentaopms!556
2021-11-22 00:32:37 +00:00
李玉春 c84f624f16 Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'
* Modify the module tree in project story.

See merge request easycorp/zentaopms!558
2021-11-22 00:31:40 +00:00
zhujinyong c236f3b221 Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170 2021-11-22 08:11:01 +08:00
zhujinyong 5f8c33d682 * Move chinese to $lang->api. 2021-11-22 08:10:05 +08:00