Commit Graph
29333 Commits
Author SHA1 Message Date
李玉春 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
tianshujie b209b35a3b * Fix bug #16514. 2021-11-22 11:06:08 +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
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
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
hufangzhou c1f2dfd857 * Modify the module tree in project story. 2021-11-21 16:10:21 +08:00
xieqiyu c82113ab84 * Modify the drop-down range of versions when submitting tests. 2021-11-21 11:33:43 +08:00
tianshujie 0408f2f8ce * Modify the execution scope of creating and editing bugs. 2021-11-21 10:46:35 +08:00
tianshujie fb6ce99d18 * Fix bug #16490. 2021-11-21 09:34:14 +08:00
xieqiyu 2a18aba808 * Display branch when batch edit testcase. 2021-11-21 03:38:48 +08:00
xieqiyu 856afd0b76 * Fix bug#16471. 2021-11-21 02:23:33 +08:00
xieqiyu d91735a9b2 * Fix bug#16465. 2021-11-21 02:13:19 +08:00
xieqiyu 13a0788f37 * Fix bug#16435. 2021-11-21 02:06:38 +08:00
xieqiyu 1fe78e5771 * Fix bug#16489. 2021-11-21 00:55:33 +08:00
tianshujie 47a651b599 * Deal with the scope of the product when creating and editing bugs. 2021-11-19 19:21:34 +08:00
李玉春 01bfb0629e Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
* fix bugs #16477,#16485 produced by task 44491.

See merge request easycorp/zentaopms!557
2021-11-19 09:30:35 +00:00
Lwrless 2fcb053765 * remove owt related stuff, moved to zentaobiz. 2021-11-19 16:33:10 +08:00
wangjianhua fa32609ca0 * Fix bug #16477和#16485 2021-11-19 08:31:58 +00:00
liyuchun d168cf83cb Merge branch 'sprint/170_tianshujie_issue' into sprint/170 2021-11-19 15:37:08 +08:00
李玉春 214f0a767e Merge branch 'sprint/170' into 'sprint/170_tianshujie_issue'
# Conflicts:
#   module/testcase/control.php
#   module/testcase/view/create.html.php
2021-11-19 07:36:48 +00:00
tianshujie 3d09288eca * Modify the code. 2021-11-19 15:33:19 +08:00
zhouxin b98f417d97 Delete a blank line. 2021-11-19 15:32:45 +08:00
zhouxin 02c028365b Modified language. 2021-11-19 15:27:52 +08:00
李玉春 51e7f68851 Merge branch 'sprint/170_mayue_modify_style' into 'sprint/170'
* Modify style.

See merge request easycorp/zentaopms!555
2021-11-19 07:14:27 +00:00
mayue 2b258a7665 * Modify style. 2021-11-19 15:11:07 +08:00
mayue 9828fa18f0 * Modify style. 2021-11-19 14:59:56 +08:00
tianshujie db6be58c1a * Modify batch create bug page. 2021-11-19 13:12:47 +08:00
tianshujie 256c76c0b8 * Modify code logic. 2021-11-19 11:40:58 +08:00
tianshujie 53a34f1546 * Modify the code. 2021-11-19 11:27:36 +08:00
tianshujie 3045b1a234 * Fix the scope of the products listed in the edit case. 2021-11-19 10:54:18 +08:00
李玉春 94f44c39c8 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
* Fix an error for batch run testcase.

See merge request easycorp/zentaopms!549
2021-11-19 02:47:45 +00:00
xieqiyu 8b3198bb0a * Fix an error for batch run testcase. 2021-11-19 10:39:38 +08:00
孙广明 8ffbccc050 Merge branch 'sprint/170_songchenxuan_16411' into 'sprint/170'
* Fix bug 16411.

See merge request easycorp/zentaopms!546
2021-11-19 02:36:47 +00:00
songchenxuan 0a351a6280 * Fix bug 16411. 2021-11-19 10:32:37 +08:00
liyuchun af1d122219 Merge branch 'sprint/170_songchenxuan_16417' into sprint/170 2021-11-19 10:25:27 +08:00