Commit Graph
3216 Commits
Author SHA1 Message Date
孙广明 100b668d66 Merge branch 'wxp_bug86289' into 'master'
Fix bug #86289.

See merge request easycorp/zentaopms!7149
2023-03-09 01:33:34 +00:00
wangxuepeng 01481058b2 Fix bug #86289. 2023-03-08 02:40:26 +00:00
孙广明 429661db3b Merge branch 'zentaopms_289' into 'master'
Zentaopms 289

See merge request easycorp/zentaopms!7150
2023-03-08 01:26:34 +00:00
孙广明 59c05f91c7 Merge branch 'fixbug_liumengyi_32633' into 'master'
* Fix bug 32603 32632 32633.

See merge request easycorp/zentaopms!7142
2023-03-08 01:24:54 +00:00
tianshujie d650f56116 * Restore code. 2023-03-08 08:49:47 +08:00
tianshujie 66e6e8f48e * Added custom filter tag language entries. 2023-03-07 08:57:37 +08:00
wangxuepeng 37a87a6682 Fix bug #86289. 2023-03-07 00:50:14 +00:00
tianshujie cd7d8f4ff6 * Modify language item for product common. 2023-03-06 15:27:45 +08:00
tianshujie e1b6e852af * Unified filter label format. 2023-03-06 14:02:09 +08:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
liumengyi 47c874ae0c * Fix bug #32633. 2023-03-06 00:41:04 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie f9a666909c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-06 08:30:49 +08:00
Yagami 46661419f6 * Code for stage path. 2023-03-03 09:59:15 +08:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
Yagami 1ce1a24f1d * Fix execution-stage list bug. 2023-03-02 17:40:47 +08:00
liumengyi 285dcf409b * Fix bug #32513. 2023-03-02 07:56:48 +00:00
liumengyi 17bc1bfacc * Fix bug #32592. 2023-03-02 07:47:56 +00: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
liumengyi ee007fe1f6 * Fix bug #32513. 2023-03-02 07:35:35 +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
tianshujie aba725ef30 * Code for fix bug 32562. 2023-03-02 13:12:55 +08:00
liumengyi f898b790ef * Fix bug #32588. 2023-03-02 03:23:59 +00:00
tianshujie 3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08: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
孙广明 7631bf7b80 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug #32558.

See merge request easycorp/zentaopms!7115
2023-03-01 09:15:21 +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
liumengyi aa7540d163 * Fix bug #32558. 2023-03-01 08:47:10 +00:00
tianshujie f159017f45 * Code for fix bug #32562. 2023-03-01 16:22:34 +08:00
liumengyi 9567ecadfb * Fix bug of check date. 2023-03-01 08:11:25 +00:00
孙广明 f4d8409742 Merge branch 'fixbug_liumengyi_32559' into 'master'
* Fix bug 32558.

See merge request easycorp/zentaopms!7111
2023-03-01 07:50:35 +00:00
孙广明 65884c2dd9 Merge branch 'fixbug_liumengyi_32423' into 'master'
* Fix bug  32423 32540 32157.

See merge request easycorp/zentaopms!7110
2023-03-01 07:49:18 +00:00
hufangzhou e89d668fc5 * Format the code and remove type restriction when batch change execution's status. 2023-03-01 07:44:23 +00:00
liumengyi fcf2ca081f * Fix bug #32559. 2023-03-01 07:44:17 +00:00
caoyanyi edc301d455 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 15:24:30 +08:00
liumengyi ba064c9aa8 * Fix bug #32559. 2023-03-01 07:05:35 +00:00
Yagami 9fe8ffa4af Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-01 14:48:22 +08:00
Yagami 97c421c5b4 * Fix bug #32374. 2023-03-01 14:48:12 +08:00
liumengyi 2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
孙广明 cef80a4330 Merge branch 'sprint/hufangzhou_fixbug_32533' into 'master'
* Fix bug #32533.

See merge request easycorp/zentaopms!7107
2023-03-01 06:34:02 +00:00
孙广明 630e1eb570 Merge branch 'wxp_bug85658_' into 'master'
* Fix bug #85658.

See merge request easycorp/zentaopms!7108
2023-03-01 06:33:47 +00:00
孙广明 dc4027286e Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32513.

See merge request easycorp/zentaopms!7106
2023-03-01 06:33:24 +00:00
wangxuepeng 9c840db309 * Fix bug #85658. 2023-03-01 06:25:32 +00:00
wangxuepeng 01cfe5655b * Finish task #85658. 2023-03-01 06:16:25 +00:00
tianshujie 0233152d1e * Change the project to a variable. 2023-03-01 13:45:52 +08:00
hufangzhou c262a060bd * Fix bug #32533. 2023-03-01 05:32:58 +00:00
liumengyi 951e4a09e1 * Fix bug #32513. 2023-03-01 05:06:42 +00:00
caoyanyi bec24aafa9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 11:52:44 +08:00