 wangyidong
|
cdb476bc4b
|
* adjust for safe file timeout.
|
2023-03-01 15:58:56 +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 |
|
|
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 |
|
|
caoyanyi
|
a576a06b3f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-27 09:05:16 +08:00 |
|
|
Yagami
|
b151d1fb32
|
* Finish task #85459.
|
2023-02-24 14:50:37 +08:00 |
|
|
guofeilong
|
c62dbb7792
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-24 13:47:19 +08:00 |
|
|
zhujinyong
|
7de18de447
|
* Fix bug: No 'more' menu.
|
2023-02-24 11:27:45 +08:00 |
|
|
caoyanyi
|
83a64cb3cf
|
* Update home button text.
|
2023-02-24 09:02:48 +08:00 |
|
|
caoyanyi
|
1be6a534a8
|
* Modify home btn title.
|
2023-02-23 17:20:17 +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
|
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 |
|