Commit Graph

52316 Commits

Author SHA1 Message Date
wangyidong
1064bef3a7 * adjust code for editor. 2023-03-03 14:19:31 +08:00
caoyanyi
a42b9ed4c0 * Hide execution route to lite vision. 2023-03-03 13:40:13 +08:00
tianshujie
3387bf56e3 * Code for finish task 84527. 2023-03-03 13:03:53 +08:00
tianshujie
e9d3886dac Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 13:03:16 +08:00
tianshujie
c6cd9a6077 * Code for finish task 84527. 2023-03-03 13:01:50 +08:00
caoyanyi
4ef52ab414 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 11:29:32 +08:00
caoyanyi
25fafa5a86 * Modify lite vision language. 2023-03-03 11:29:15 +08:00
liumengyi
7851944450 * Finish task #85640. 2023-03-03 03:19:04 +00:00
wangyidong
7f2f970bd5 * delete dev-editor priv. 2023-03-03 10:28:19 +08:00
caoyanyi
935f0a764c * Modify page error. 2023-03-03 10:24:00 +08:00
guofeilong
079d6a1821 * Fix bug in func filterChildren . 2023-03-03 10:18:48 +08:00
孙广明
9d3a52f0af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7138
zentaopms_18.2
2023-03-03 02:15:41 +00:00
liuyongkai
10478231d8 * Fix bug #32374. 2023-03-03 10:11:06 +08:00
tianshujie
8dc3d3b291 * Code for finish task 84525. 2023-03-03 10:03:32 +08:00
王怡栋
b80d37fcfb Merge branch 'daitingting_bug_postparentisempty' into 'master'
* Fix bug for the post parent is empty.

See merge request easycorp/zentaopms!7136
2023-03-03 02:03:05 +00:00
孙广明
dc2e0858af Merge branch 'lyk_fixbug' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7137
2023-03-03 01:59:31 +00:00
Yagami
46661419f6 * Code for stage path. 2023-03-03 09:59:15 +08:00
liuyongkai
c2bfa8c8ab * Fix bug #32374. 2023-03-03 09:56:31 +08:00
daitingting
6880b7428b * Fix bug for the post parent is empty. 2023-03-03 01:53:23 +00:00
tianshujie
5a2ffd541d * Code for task 84525. 2023-03-03 09:07:21 +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
孙广明
6c22d36b40 Merge branch 'lyk_fixbug_32374' into 'master'
* Fix bug #32374.

See merge request easycorp/zentaopms!7135
2023-03-02 12:19:37 +00:00
Yagami
1ce1a24f1d * Fix execution-stage list bug. 2023-03-02 17:40:47 +08:00
liuyongkai
846129297d * Fix bug #32374. 2023-03-02 17:32:47 +08:00
liuyongkai
bc54729fff * Fix bug #32374. 2023-03-02 17:27:44 +08:00
王怡栋
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
tianshujie
8ea5eab784 * Code for task 84525. 2023-03-02 17:04:36 +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
tianshujie
ab978f408e * Change the order of items in the navigation tree. 2023-03-02 16:24:20 +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
tianshujie
d19a50e543 * Do not display common language items. 2023-03-02 15:58:39 +08:00
wangxuepeng
843d2898fa * Fix bug #85660. 2023-03-02 07:57:13 +00: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
tianshujie
9729366c98 * Modify the logic associated with the presentation of story language items. 2023-03-02 15:40:44 +08: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