Commit Graph
51852 Commits
Author SHA1 Message Date
郭飞龙 7ebf700fd4 * Adjust code. 2023-03-02 06:57:28 +00:00
guofeilong 75b2f2abe6 * Code for view refactors in admin . 2023-03-02 14:34:20 +08: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
孙广明 e71852aa6c Merge branch 'sprint/hufangzhou_weixin' into 'master'
* Change weixin images.

See merge request easycorp/zentaopms!7127
2023-03-02 05:40:13 +00:00
hufangzhou c5b40fea23 * Change weixin images. 2023-03-02 05:34:58 +00: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
王怡栋 8a331da638 Merge branch 'sprint/hufangzhou_companyName' into 'master'
* Change the EasyCorp to ZenTao Software.

See merge request easycorp/zentaopms!7125
2023-03-02 05:07:56 +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
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
王怡栋 b8b59cba27 Merge branch 'sprint/hufangzhou_bug_32476' into 'master'
* Fix bug #32476.

See merge request easycorp/zentaopms!7103
2023-03-01 10:15:15 +00:00
guofeilong e23d18108b * Code for change lang in admin. 2023-03-01 17:22:08 +08:00
孙广明 7631bf7b80 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug #32558.

See merge request easycorp/zentaopms!7115
2023-03-01 09:15:21 +00:00
孙广明 656d213820 Merge branch 'sprint/hufangzhou_bug_32490' into 'master'
* Fix bug #32490.

See merge request easycorp/zentaopms!7114
2023-03-01 09:14:14 +00:00
孙广明 db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
guofeilong 4ad274cf1b * Code for bug #32448. 2023-03-01 17:12:53 +08:00
zhujinyong ed3a128e50 Fix bug #32570. 2023-03-01 17:07:41 +08:00
Yagami 48020c2b5d * Fix bug #32459. 2023-03-01 17:04:39 +08:00
Yagami bb6e606e90 * Fix bug #32566. 2023-03-01 16:56:15 +08:00
liumengyi aa7540d163 * Fix bug #32558. 2023-03-01 08:47:10 +00:00
hufangzhou 38dcd2e51e * Fix bug #32490. 2023-03-01 08:46:17 +00:00
Yagami 3bbc047673 * Show productplan in bug. 2023-03-01 16:36:57 +08:00
tianshujie 046187237e * Code for fix bug #32561. 2023-03-01 16:35:24 +08:00
孙广明 2b07c0f889 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug of check date.

See merge request easycorp/zentaopms!7113
2023-03-01 08:23:26 +00:00
tianshujie f159017f45 * Code for fix bug #32562. 2023-03-01 16:22:34 +08:00
liumengyi bc5bdab5d4 * Fix bug #32569. 2023-03-01 08:22:01 +00:00
liumengyi 9567ecadfb * Fix bug of check date. 2023-03-01 08:11:25 +00:00
zhujinyong 996ea7bf93 * Fix bug #32563. 2023-03-01 15:59:46 +08:00
tianshujie fdc0e3fa41 * Code for fix bug #32567. 2023-03-01 15:56:55 +08:00