 qixinzhi
|
511240d0fa
|
Merge branch 'master' into sprint/biz17
|
2023-03-22 17:15:46 +08:00 |
|
|
caoyanyi
|
597131cd71
|
* Code for bug #33089, modify second menu active.
|
2023-03-20 15:14:23 +08:00 |
|
|
caoyanyi
|
8d16faa47d
|
* Code for bug #33021.
|
2023-03-16 15:11:00 +08:00 |
|
|
tianshujie
|
cd7195892c
|
* Fix bug 32831.
|
2023-03-13 10:37:30 +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
|
ac3cf573b7
|
* Modify language items for execution common.
|
2023-03-09 14:00:31 +08:00 |
|
|
caoyanyi
|
cea165d8bb
|
* Update product common lang.
|
2023-03-08 10:06:49 +08:00 |
|
|
caoyanyi
|
2e35bcb624
|
* Update project common lang.
|
2023-03-08 09:58:33 +08:00 |
|
|
liumengyi
|
3f63404953
|
* Finish task #86258.
|
2023-03-06 06:09:13 +00:00 |
|
|
王怡栋
|
3438722a8c
|
Merge branch 'master' into 'zentaopms_289'
# Conflicts:
# db/update18.2.sql
|
2023-03-06 03:26:34 +00:00 |
|
|
qixinzhi
|
b4e8de97e5
|
Merge branch 'master' into sprint/biz17
|
2023-03-06 09:04:52 +08:00 |
|
|
Yagami
|
f95691948a
|
Merge branch 'zentaopms_294'
|
2023-03-06 08:37:11 +08:00 |
|
|
guofeilong
|
40015657cc
|
* Code for task #85502
|
2023-03-02 10:16:48 +08:00 |
|
|
guofeilong
|
68e10e515e
|
* Code for task #85502
|
2023-03-01 13:54:45 +08:00 |
|
|
wangyidong
|
01bb8130dd
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-01 08:50:31 +08:00 |
|
|
wangyidong
|
1a352410a6
|
* code for task #85503.
|
2023-03-01 08:49:44 +08:00 |
|
|
tianshujie
|
eef2c1c356
|
* Change the order of the custom navigation.
|
2023-02-28 15:36:04 +08:00 |
|
|
tianshujie
|
2a003865f4
|
* Code for finish task #84526.
|
2023-02-28 09:09:16 +08:00 |
|
|
caoyanyi
|
f2441f7197
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-27 15:28:14 +08:00 |
|
|
孙广明
|
167539f822
|
Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.
See merge request easycorp/zentaopms!7076
|
2023-02-27 06:59:14 +00:00 |
|
|
liumengyi
|
4912b2004e
|
* Finish task #85630.
|
2023-02-27 06:54:39 +00:00 |
|
|
liugang
|
c9115f7a21
|
* Revert menus, privileges and pages of report.
|
2023-02-27 06:39:37 +00:00 |
|
|
liumengyi
|
a23d205435
|
* Modify menu name.
|
2023-02-27 06:24:08 +00:00 |
|
|
宋辰轩
|
1071241556
|
* Fix report-preview menu.
|
2023-02-23 16:15:14 +08:00 |
|
|
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
|
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 |
|
|
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
|
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 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +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 |
|
|
caoyanyi
|
dff2e8a00c
|
* Add search tab.
|
2023-02-14 14:01:16 +08: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 |
|
|
daitingting
|
060f843b07
|
* Fix bug #31996.
|
2023-02-10 05:15:12 +00:00 |
|
|
wangyuting2
|
e7a66de47f
|
* Fix admin model menu bug.
|
2023-02-10 10:31:32 +08:00 |
|
|
tianshujie
|
2b265f6157
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation
|
2023-02-07 09:01:49 +08:00 |
|