Commit Graph

3384 Commits

Author SHA1 Message Date
liumengyi
0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00
tianshujie
23f362cd59 * Fixed language item issues. 2023-03-13 15:30:24 +08:00
tianshujie
c524e23d7e * Skip form staging. 2023-03-13 14:00:16 +08:00
王怡栋
a776b3897f Merge branch 'dev/gfl_fix_bug' into 'master'
Dev/gfl fix bug

See merge request easycorp/zentaopms!7178
2023-03-13 03:18:59 +00:00
xieqiyu
84e8ea04f5 * Code for bug#32835. 2023-03-13 02:50:03 +00:00
tianshujie
00a69ba40e * Fix bug 32821. 2023-03-13 09:58:51 +08:00
tianshujie
b7ab8ae8f3 * Fix bug 32819. 2023-03-13 09:06:31 +08:00
guofeilong
eaafb20075 * Add class no-stash to save form draft. 2023-03-10 14:40:00 +08:00
caoyanyi
ef62dca574 Merge branch 'dev/gfl_theme_refactors' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-10 10:04:06 +08:00
caoyanyi
3eb831772e * Optimize print kanban page checkbox style. 2023-03-10 08:48:14 +08:00
tianshujie
665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
孙广明
806e3a4742 Merge branch 'sprint/295_liumengyi_86258' into 'master'
* Finish task #86281 86258.

See merge request easycorp/zentaopms!7166
2023-03-09 08:07:59 +00:00
tianshujie
b924688fe8 * Fix bug #32711. 2023-03-09 10:20:20 +08:00
孙广明
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
chaideqing
2c65356ae6 * Refactor code. 2023-03-08 10:29:57 +08: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
liumengyi
3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00: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
chaideqing
ba7ff2154e * Refactor code. 2023-03-03 15:06:35 +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
chaideqing
81e76a0e1e * Fix feedback2356 edit function. 2023-03-02 15:55:01 +08: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
chaideqing
df651dd614 * Fix feedback 2356. 2023-03-02 13:02:04 +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