Commit Graph
3262 Commits
Author SHA1 Message Date
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
tianshujie 52a40837df * Fix bug #33617. 2023-04-04 10:33:46 +08:00
wangyidong efc419ca6e * code for task #89166. 2023-03-30 17:36:19 +08:00
tianshujie d30de7b7a2 * Code for task #89153. 2023-03-29 13:23:39 +08:00
tianshujie 300cbe8f04 * Add empty option for execution Drop-down selection. 2023-03-29 11:32:48 +08:00
tianshujie 340228242e * Remove the document library of the parent stage. 2023-03-29 11:28:45 +08:00
孙广明 5f20f3ad9c Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33127.

See merge request easycorp/zentaopms!7257
2023-03-21 06:04:36 +00:00
liumengyi 7d1d39187f * Fix bug #33139. 2023-03-21 05:39:04 +00:00
王怡栋 cf737b035e Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33139, #33127

See merge request easycorp/zentaopms!7255
2023-03-21 05:27:39 +00:00
liumengyi 1037f1aa82 * Fix bug #33139. 2023-03-21 03:27:35 +00:00
caoyanyi 2d3f0d3dcb * Code for bug #33141. 2023-03-21 10:59:07 +08:00
liumengyi c5083612cb * Fix bug #33127. 2023-03-21 02:31:54 +00:00
Yagami 4c4daf6a2e * Fix bug #33084. 2023-03-20 14:06:52 +08:00
王怡栋 c1259d1e77 Merge branch 'sprint/feedback2356' into 'master'
Sprint/feedback2356

See merge request easycorp/zentaopms!7140
2023-03-20 02:25:54 +00:00
Yagami 4c88c29318 * Fix bug #33009. 2023-03-17 09:14:07 +08:00
王怡栋 031a63a433 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/story/control.php
2023-03-16 08:27:36 +00:00
hufangzhou 131dcf5f24 * Fix bug #32960. 2023-03-16 15:54:11 +08:00
caoyanyi d5ef16c75a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-16 14:32:19 +08:00
caoyanyi d435783cae * Modify font color. 2023-03-16 14:09:01 +08:00
wangyidong 7e78d0e54a * fix bug #32156. 2023-03-16 10:40:58 +08:00
liumengyi 6c9f1435a0 * Fix bug #32992. 2023-03-16 02:32:00 +00:00
liumengyi 068784e472 * Fix bug #32954. 2023-03-16 02:17:48 +00:00
liumengyi ee56283107 * Fix bug #32465. 2023-03-15 07:17:32 +00:00
liumengyi 6fc0fd1867 * Fix bug #32618. 2023-03-15 06:59:37 +00:00
管西迎 93ca7dda5f Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.

See merge request easycorp/zentaopms!7192
2023-03-15 02:55:12 +00:00
tianshujie e49090d03a * Fix bug 32911. 2023-03-15 09:43:54 +08:00
孙广明 d235b8e924 Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.

See merge request easycorp/zentaopms!7184
2023-03-14 09:15:08 +00:00
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