Commit Graph
42499 Commits
Author SHA1 Message Date
王怡栋 179d3998f2 Merge branch 'dev/gfl_views_refacotrs_admin' into 'master'
* Adjust code in admin.

See merge request easycorp/zentaopms!7133
2023-03-02 09:08:27 +00:00
王怡栋 2534dd97e4 Merge branch 'admin_bug_32593' into 'master'
Admin bug 32593

See merge request easycorp/zentaopms!7134
2023-03-02 09:08:12 +00:00
caoyanyi 58d9fd2ee9 * Fix bug #32593. 2023-03-02 17:04:44 +08:00
郭飞龙 95184b53a3 * Adjust code in control.php. 2023-03-02 09:00:04 +00:00
guofeilong f1c5c8c82c * Adjust code in admin. 2023-03-02 16:58:42 +08:00
wangyidong d693d5884c * fix bug #32431. 2023-03-02 16:20:40 +08:00
孙广明 067461a66d Merge branch 'fixbug_liumengyi_32592' into 'master'
* Fix bug 32592 32603.

See merge request easycorp/zentaopms!7132
2023-03-02 08:09:44 +00:00
Yagami e8ae96f563 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-02 16:06:17 +08:00
Yagami fda9efd09c * Remove request stages in bug batch-create page. 2023-03-02 16:05:35 +08:00
wangyidong 3935b86775 * fix bug #32306. 2023-03-02 16:01:53 +08:00
liumengyi 285dcf409b * Fix bug #32513. 2023-03-02 07:56:48 +00:00
liumengyi fc44446224 * Fix bug #32603. 2023-03-02 07:49:41 +00:00
liumengyi 17bc1bfacc * Fix bug #32592. 2023-03-02 07:47:56 +00:00
zhujinyong baedeadce7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-02 15:39:19 +08:00
孙广明 50ece3fadf Merge branch 'fixbug_liumengyi_32588' into 'master'
* Fix bug #32513.

See merge request easycorp/zentaopms!7131
2023-03-02 07:37:29 +00:00
zhujinyong 7dce298f90 * Fix bug: hide execution of request, design. 2023-03-02 15:37:05 +08:00
liumengyi ee007fe1f6 * Fix bug #32513. 2023-03-02 07:35:35 +00:00
王怡栋 fae74892db Merge branch 'dev/gfl_admin_view_refactors' into 'master'
* Code for view refactors in admin .

See merge request easycorp/zentaopms!7129
2023-03-02 07:10:47 +00:00
郭飞龙 7ebf700fd4 * Adjust code. 2023-03-02 06:57:28 +00:00
王怡栋 461c4f8b23 Merge branch 'liuhong_bug' into 'master'
Liuhong bug

See merge request easycorp/zentaopms!7130
2023-03-02 06:55:47 +00:00
caoyanyi a261f37af4 * Add zentao api get. 2023-03-02 14:51:35 +08:00
guofeilong 75b2f2abe6 * Code for view refactors in admin . 2023-03-02 14:34:20 +08:00
liuhong 6aaea2823e * Fix bug for testcase create view 2023-03-02 06:09:51 +00:00
孙广明 7989ef5e0f Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7128
2023-03-02 05:51:27 +00:00
tianshujie bf3081471d * Optimized creating requirements page. 2023-03-02 13:48:04 +08:00
tianshujie 89db51f678 * Code for fix bug 32562. 2023-03-02 13:30:19 +08:00
孙广明 b2ac5e5063 Merge branch 'fixbug_liumengyi_32588' into 'master'
* Fix bug #32588.

See merge request easycorp/zentaopms!7126
2023-03-02 05:25:07 +00:00
tianshujie aba725ef30 * Code for fix bug 32562. 2023-03-02 13:12:55 +08:00
王怡栋 82fd53a51e Merge branch 'zentaopms_wangyuting' into 'master'
* Fix warning.

See merge request easycorp/zentaopms!7124
2023-03-02 05:08:08 +00:00
liumengyi f898b790ef * Fix bug #32588. 2023-03-02 03:23:59 +00:00
hufangzhou 0da04e4c4d * Change the EasyCorp to ZenTao Software. 2023-03-02 03:10:58 +00:00
wangyuting2 872138ec11 * Fix warning. 2023-03-02 11:03:12 +08:00
孙广明 e72b84ac8e Merge branch 'fixbug_zhaoke_32141' into 'master'
* Fix bug#32141.

See merge request easycorp/zentaopms!7122
2023-03-02 02:21:46 +00:00
zhaoke a01f62d591 * Fix bug#32141. 2023-03-02 10:13:03 +08:00
wangyidong 6ba9f87069 * code for bug #32512. 2023-03-02 10:08:29 +08:00
Yagami 72304989ac Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-02 09:19:18 +08:00
Yagami 477c1fe2f2 * Fix bug #32577. 2023-03-02 09:19:05 +08:00
孙广明 c11a4b3c0d Merge branch 'fixbug_liumengyi_32582' into 'master'
* Fix bug #32582.

See merge request easycorp/zentaopms!7120
2023-03-02 01:11:54 +00:00
王怡栋 da8d452b3f Merge branch 'zanode_adjust' into 'master'
* Adjust code

See merge request easycorp/zentaopms!7119
2023-03-02 01:10:34 +00:00
liumengyi cb7757e92d * Fix bug #32582. 2023-03-02 01:02:17 +00:00
zenggang 41a51b8b25 * Adjust code 2023-03-02 00:52:42 +00:00
孙广明 1ec9676309 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug 32578, and fix bug of set path.

See merge request easycorp/zentaopms!7118
2023-03-02 00:48:31 +00:00
Yagami 73b5269051 * Fix bug #32428. 2023-03-02 08:37:15 +08:00
liumengyi 72b0baa4cd * Fix bug #32578, and fix bug of set path. 2023-03-02 00:29:11 +00:00
liuhong 426e369ef1 * Fix the lack of story data 2023-03-02 00:22:30 +00:00
wangyidong 2e596f3907 * add title for show all desc. 2023-03-01 18:34:09 +08:00
王怡栋 a5dce3a095 Merge branch 'dev/gfl_module_admin' into 'master'
* Code for change lang in admin.

See merge request easycorp/zentaopms!7117
2023-03-01 10:28:05 +00:00
王怡栋 036f823ff0 Merge branch 'dev/gfl_bug#32448' into 'master'
* Code for bug #32448.

See merge request easycorp/zentaopms!7116
2023-03-01 10:27:40 +00:00
王怡栋 8aceed5e5a Merge branch 'sprint/hufangzhou_formatcode' into 'master'
* Format the code and remove type restriction when batch change execution's status.

See merge request easycorp/zentaopms!7112
2023-03-01 10:15:45 +00:00
王怡栋 a1c1af8469 Merge branch 'sprint/hufangzhou_bug_32426' into 'master'
* Fix bug #32426.

See merge request easycorp/zentaopms!7105
2023-03-01 10:15:30 +00:00