 caoyanyi
|
a3d9cda86b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-15 09:13:10 +08:00 |
|
|
王怡栋
|
1f87384b9b
|
Merge branch 'cyy_repo_bug' into 'master'
* Modify commit link object error.
See merge request easycorp/zentaopms!6952
|
2023-02-15 01:13:05 +00:00 |
|
|
caoyanyi
|
15f9047883
|
* Modify commit link object error.
|
2023-02-15 09:10:26 +08:00 |
|
|
孙广明
|
bd7084c8b5
|
Merge branch 'zenops_61' into 'master'
Zenops 61
See merge request easycorp/zentaopms!6951
|
2023-02-15 00:35:50 +00:00 |
|
|
zhaoke
|
807971cb91
|
* Renmove console.
|
2023-02-15 00:33:15 +00:00 |
|
|
zhaoke
|
a2c3fee694
|
* Fix bug #32141.
|
2023-02-14 10:33:32 +00:00 |
|
|
hufangzhou
|
2aec80f62c
|
* Fix bug #32140.
|
2023-02-14 17:36:21 +08:00 |
|
|
王怡栋
|
e7991dcc5f
|
Merge branch 'ticket_369' into 'master'
* Adjust code for feedback #2187.
See merge request easycorp/zentaopms!6946
|
2023-02-14 08:09:40 +00:00 |
|
|
王怡栋
|
39388b32f7
|
Merge branch 'sprint/hufangzhou_fixlang' into 'master'
* Adjust the lang.
See merge request easycorp/zentaopms!6948
|
2023-02-14 08:03:56 +00:00 |
|
|
王怡栋
|
2c1a4b6113
|
Merge branch 'sprint/hufangzhou_bug_32104' into 'master'
* Fix bug #32104.
See merge request easycorp/zentaopms!6947
|
2023-02-14 08:03:39 +00:00 |
|
|
hufangzhou
|
30a251154e
|
* Fix bug #31933.
|
2023-02-14 15:59:09 +08:00 |
|
|
王怡栋
|
48a2dc05bb
|
Merge branch 'dev/gfl_bug#32126' into 'master'
* Code for bug #32126.
See merge request easycorp/zentaopms!6949
|
2023-02-14 07:52:05 +00:00 |
|
|
guofeilong
|
dfa0267045
|
* Code for bug #32126.
|
2023-02-14 15:45:28 +08:00 |
|
|
hufangzhou
|
cc4b6d5310
|
* Adjust the lang.
|
2023-02-14 15:35:45 +08:00 |
|
|
hufangzhou
|
63f0c823da
|
* Fix bug #32104.
|
2023-02-14 15:21:20 +08:00 |
|
|
Yagami
|
786dacf52d
|
* Fix bug #31524.
|
2023-02-14 15:05:22 +08:00 |
|
|
wangyidong
|
41ddc2562b
|
* fix bug.
|
2023-02-14 14:38:21 +08:00 |
|
|
wangyidong
|
ec1d388334
|
* fix bug.
|
2023-02-14 14:32:09 +08:00 |
|
|
caoyanyi
|
ff6516dd46
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-14 14:01:34 +08:00 |
|
|
caoyanyi
|
dff2e8a00c
|
* Add search tab.
|
2023-02-14 14:01:16 +08:00 |
|
|
liuhong
|
254c6e9747
|
* Adjust code for feedback #2187.
|
2023-02-14 05:42:50 +00:00 |
|
|
wangyidong
|
ff5bc056bd
|
* code for replace menu lang.
|
2023-02-14 13:35:12 +08:00 |
|
|
孙广明
|
2ce8e96e31
|
Merge branch 'zenops_61' into 'master'
* Fix bug #32108.
See merge request easycorp/zentaopms!6944
|
2023-02-14 05:25:36 +00:00 |
|
|
zhaoke
|
9c920b1547
|
* Fix bug #32108.
|
2023-02-14 05:22:37 +00:00 |
|
|
王怡栋
|
20f17196b2
|
Merge branch 'ticket_366' into 'master'
Ticket 366
See merge request easycorp/zentaopms!6941
|
2023-02-14 05:04:09 +00:00 |
|
|
王怡栋
|
5c28eb1317
|
Merge branch 'daitingting_bug_#31996' into 'master'
* Fix bug #31996.
See merge request easycorp/zentaopms!6940
|
2023-02-14 05:03:43 +00:00 |
|
|
王怡栋
|
c31e104d8a
|
Merge branch 'bug_32099' into 'master'
* Fix bug#32099
See merge request easycorp/zentaopms!6939
|
2023-02-14 05:03:13 +00:00 |
|
|
王怡栋
|
00e30d7351
|
Merge branch 'sprint/cyy_84606' into 'zentaopms_289'
* Add section aplit when language get.
See merge request easycorp/zentaopms!6942
|
2023-02-14 05:02:48 +00:00 |
|
|
王怡栋
|
4ad481e1ff
|
Merge branch 'zentaopms_289_langItem' into 'zentaopms_289'
Zentaopms 289 lang item
See merge request easycorp/zentaopms!6943
|
2023-02-14 03:55:04 +00:00 |
|
|
guofeilong
|
31b8e72a3f
|
* Code for css in langitem.
|
2023-02-14 11:48:07 +08:00 |
|
|
caoyanyi
|
00725d482f
|
* Add section aplit when language get.
|
2023-02-14 10:49:29 +08:00 |
|
|
zenggang
|
397a40f648
|
* Fix bug#32099
|
2023-02-14 02:19:03 +00:00 |
|
|
王怡栋
|
a9cd5ed97b
|
Merge branch 'dev/gfl_finish_bug_in_flow-item' into 'master'
* code for delete / after background-image: url
See merge request easycorp/zentaopms!6938
|
2023-02-14 02:00:13 +00:00 |
|
|
guofeilong
|
bc88bfece2
|
* code for delete / after background-image: url
|
2023-02-14 09:56:33 +08:00 |
|
|
liuhong
|
e9d2d7362a
|
* Adjust code for feedback #2191
|
2023-02-14 01:43:35 +00:00 |
|
|
liuhong
|
f86fe5a65d
|
* Adjust code for feedback 2191.
|
2023-02-14 01:08:45 +00:00 |
|
|
guofeilong
|
6bf8c6388e
|
* Code for add menuOrder in langItem .
|
2023-02-14 08:45:35 +08:00 |
|
|
王怡栋
|
abb6d4b7a2
|
Merge branch 'zentaopms_289_langItem' into 'zentaopms_289'
Zentaopms 289 lang item
See merge request easycorp/zentaopms!6936
|
2023-02-14 00:44:01 +00:00 |
|
|
guofeilong
|
f25bcb9edc
|
- Code for dev/control.php refactors.
|
2023-02-14 08:39:58 +08:00 |
|
|
guofeilong
|
14e13dee6f
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_langItem
|
2023-02-14 08:34:08 +08:00 |
|
|
王怡栋
|
50f2598c54
|
Merge branch 'master_xieqiyu_32089' into 'master'
* Code for bug#32089.
See merge request easycorp/zentaopms!6934
|
2023-02-13 09:24:17 +00:00 |
|
|
王怡栋
|
665081924d
|
Merge branch 'sprint/hufangzhou_bug_32073' into 'master'
* Fix bug #32073.
See merge request easycorp/zentaopms!6933
|
2023-02-13 09:24:03 +00:00 |
|
|
王怡栋
|
67591cc509
|
Merge branch 'master_xieqiyu_26428' into 'master'
* Code for bug#26428.
See merge request easycorp/zentaopms!6932
|
2023-02-13 09:23:43 +00:00 |
|
|
王怡栋
|
a18abcc5c8
|
Merge branch 'ticket_336' into 'master'
Ticket 336
See merge request easycorp/zentaopms!6931
|
2023-02-13 09:23:10 +00:00 |
|
|
王怡栋
|
9b95d6e487
|
Merge branch 'sprint/hufangzhou_bug_32075' into 'master'
* Fix bug #32075.
See merge request easycorp/zentaopms!6930
|
2023-02-13 09:22:40 +00:00 |
|
|
孙广明
|
1d2ef1445c
|
Merge branch 'zenops_61' into 'master'
Fix bugs
See merge request easycorp/zentaopms!6935
|
2023-02-13 09:11:38 +00:00 |
|
|
xieqiyu
|
b0b04b0144
|
* Code for bug#32089.
|
2023-02-13 17:08:33 +08:00 |
|
|
guofeilong
|
b9d288fd23
|
* Code for add langitem.html.php
|
2023-02-13 16:56:34 +08:00 |
|
|
hufangzhou
|
7108816fa5
|
* Fix bug #32073.
|
2023-02-13 16:30:13 +08:00 |
|
|
xieqiyu
|
19c28c527e
|
* Code for bug#26428.
|
2023-02-13 16:06:20 +08:00 |
|