 caoyanyi
|
e7c8ceed8d
|
* Modify dynamic language.
|
2023-02-23 10:10:11 +08:00 |
|
|
caoyanyi
|
6caaf4c316
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-23 08:32:25 +08:00 |
|
|
tianshujie
|
12cdb2f6d7
|
* Modify menu param.
|
2023-02-22 16:11:21 +08:00 |
|
|
caoyanyi
|
7c257b5e1e
|
* Code for issue #762.
|
2023-02-22 15:16:48 +08:00 |
|
|
tianshujie
|
5b2cafa380
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 14:13:51 +08:00 |
|
|
孙广明
|
6c1ed365ab
|
Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.
See merge request easycorp/zentaopms!7010
|
2023-02-21 05:50:04 +00:00 |
|
|
tianshujie
|
517fb3c796
|
* Code for finish task #85046.
|
2023-02-21 13:13:13 +08:00 |
|
|
liumengyi
|
95e3978fb0
|
* Finish task #85038, #85039.
|
2023-02-21 01:05:24 +00:00 |
|
|
caoyanyi
|
653c393eb1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-21 09:01:07 +08:00 |
|
|
tianshujie
|
3962b7a087
|
* Code for finish task #84575.
|
2023-02-20 08:40:32 +08:00 |
|
|
tianshujie
|
5aee651454
|
* Code for finish task #84575.
|
2023-02-18 18:39:07 +08:00 |
|
|
caoyanyi
|
c8374b1e14
|
Merge branch 'master' into zentaopms_289
|
2023-02-17 10:11:16 +08:00 |
|
|
tianshujie
|
792f1c5a98
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-17 08:33:25 +08:00 |
|
|
wangyidong
|
9e1cfb2b25
|
* code for task #84532.
|
2023-02-16 14:53:30 +08:00 |
|
|
tianshujie
|
ad1d1631a3
|
* Code for finish task #84593.
|
2023-02-16 14:42:27 +08:00 |
|
|
wangyidong
|
1b70d6e8a4
|
* code for task #84532.
|
2023-02-16 13:55:23 +08:00 |
|
|
caoyanyi
|
b478779676
|
* Fix bug #32184,32192,32193.
|
2023-02-16 11:09:18 +08:00 |
|
|
tianshujie
|
be00a4a8ae
|
* Code for finish task #84580.
|
2023-02-16 09:29:05 +08:00 |
|
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|
|
tianshujie
|
4d2a846c9e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-16 08:59:34 +08:00 |
|
|
tianshujie
|
484f34396c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 08:59:00 +08:00 |
|
|
王怡栋
|
3a6bca8dc2
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.
See merge request easycorp/zentaopms!6966
|
2023-02-15 09:22:38 +00:00 |
|
|
wangyuting2
|
a86eb599d9
|
* Fix project extend priv bug.
|
2023-02-15 17:20:35 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
wangyidong
|
dfb7a22c12
|
* adjust code.
|
2023-02-15 15:54:02 +08:00 |
|
|
Yagami
|
da62f994d9
|
Merge branch 'sgm_dtable' into zentaopms_284
|
2023-02-15 15:49:53 +08:00 |
|
|
liuhong
|
a767115e92
|
* Resolved feedback 2191.
|
2023-02-15 06:16:55 +00:00 |
|
|
Yagami
|
947307c349
|
* Fix bugs for dtable.
|
2023-02-15 11:14:09 +08:00 |
|
|
caoyanyi
|
a3d9cda86b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-15 09:13:10 +08:00 |
|
|
tianshujie
|
f989173e10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-15 08:29:48 +08:00 |
|
|
tianshujie
|
b2fef4f696
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-15 08:19:27 +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 |
|
|
wangyidong
|
ff5bc056bd
|
* code for replace menu lang.
|
2023-02-14 13:35:12 +08: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 |
|
|
liuhong
|
e9d2d7362a
|
* Adjust code for feedback #2191
|
2023-02-14 01:43:35 +00:00 |
|
|
guofeilong
|
6bf8c6388e
|
* Code for add menuOrder in langItem .
|
2023-02-14 08:45:35 +08:00 |
|
|
guofeilong
|
b9d288fd23
|
* Code for add langitem.html.php
|
2023-02-13 16:56:34 +08:00 |
|
|
tianshujie
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
|
zenggang
|
317ddd5fbc
|
* Fix bug #32024
|
2023-02-13 02:02:32 +00:00 |
|
|
wangyidong
|
ff66b39a2a
|
* code for task #83736.
|
2023-02-10 17:37:50 +08:00 |
|
|
liumengyi
|
a5807a3a68
|
* Hide change table mode when currentModule is execution and currentMethod is all.
|
2023-02-10 13:40:30 +08:00 |
|
|
daitingting
|
060f843b07
|
* Fix bug #31996.
|
2023-02-10 05:15:12 +00:00 |
|
|
tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
|
wangyuting2
|
e7a66de47f
|
* Fix admin model menu bug.
|
2023-02-10 10:31:32 +08:00 |
|
|
hufangzhou
|
8d26dceb4b
|
* Compatible with php5.3.
|
2023-02-09 05:54:15 +00:00 |
|
|
Yagami
|
7d5d82693a
|
* Add dtable.
|
2023-02-08 17:45:51 +08:00 |
|