 wangyidong
|
4bb52f334f
|
* code for xuanxuan.
|
2021-04-29 10:55:42 +08:00 |
|
|
wangyidong
|
2f0c62524c
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 16:28:28 +08:00 |
|
|
wangyidong
|
faf4c2b4dd
|
* fix bug and xuanxuan.
|
2021-04-28 16:27:34 +08:00 |
|
|
tianshujie98
|
5beeb1c894
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 16:01:23 +08:00 |
|
|
tianshujie98
|
d6ff645901
|
* Fix bug #12440.
|
2021-04-28 16:01:01 +08:00 |
|
|
hufangzhou
|
29e9ed0f51
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 15:59:32 +08:00 |
|
|
hufangzhou
|
1ba92805c1
|
* Fix bug #12439.
|
2021-04-28 15:59:29 +08:00 |
|
|
tianshujie98
|
e70e2a7a22
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 15:52:44 +08:00 |
|
|
Guanxiying
|
b9c059ce40
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 15:52:29 +08:00 |
|
|
tianshujie98
|
77ac56be5b
|
* Fix bug #12437.
|
2021-04-28 15:52:21 +08:00 |
|
|
Guanxiying
|
616341779a
|
* Fix get projects error.
|
2021-04-28 15:52:14 +08:00 |
|
|
tianshujie98
|
9edbd23c41
|
* Fix bug #12440.
|
2021-04-28 15:19:26 +08:00 |
|
|
hufangzhou
|
53b42e6eb2
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 15:07:17 +08:00 |
|
|
hufangzhou
|
bc71469cd1
|
* Adjust the product getSwitcher link under the testtask module.
|
2021-04-28 15:07:12 +08:00 |
|
|
tianshujie98
|
08da42d6f4
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 14:54:46 +08:00 |
|
|
tianshujie98
|
2ec29e2c70
|
* Fix bug #12031.
|
2021-04-28 14:54:22 +08:00 |
|
|
hufangzhou
|
bbf9941348
|
* Adjust the code.
|
2021-04-28 14:29:53 +08:00 |
|
|
hufangzhou
|
a937d44c8b
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 14:27:46 +08:00 |
|
|
hufangzhou
|
88e140be8f
|
* Update the user view when create project.
|
2021-04-28 14:27:41 +08:00 |
|
|
wangyidong
|
75ddc26f82
|
* adjust for demo sql.
|
2021-04-28 13:44:22 +08:00 |
|
|
zhujinyong
|
375b47bf83
|
* wrap get file size.
|
2021-04-28 13:12:56 +08:00 |
|
|
Yagami
|
2e03100a96
|
* Fix bug.
|
2021-04-28 13:12:21 +08:00 |
|
|
Guanxiying
|
67a4154017
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 11:41:46 +08:00 |
|
|
Guanxiying
|
962685950e
|
* Add field param to comments of getById function.
|
2021-04-28 11:41:02 +08:00 |
|
|
Guanxiying
|
3ec725bfa6
|
* Fix spelling mistakes.
|
2021-04-28 11:39:46 +08:00 |
|
|
wangyidong
|
b9dc226197
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 11:10:11 +08:00 |
|
|
wangyidong
|
c201e15bb4
|
* fix bug.
|
2021-04-28 11:09:03 +08:00 |
|
|
hufangzhou
|
1eeeef6cf6
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 11:00:32 +08:00 |
|
|
hufangzhou
|
09acfbbc53
|
* Modify the project doc lib acl when the project acl is program.
|
2021-04-28 11:00:28 +08:00 |
|
|
wangyidong
|
3cf8005a7d
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 10:54:24 +08:00 |
|
|
wangyidong
|
3b8dd3db34
|
* fix bug #12050.
|
2021-04-28 10:53:52 +08:00 |
|
|
Guanxiying
|
a43d99ff02
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 09:57:13 +08:00 |
|
|
Guanxiying
|
96d2f5a07d
|
* Fix comments of public funtions.
|
2021-04-28 09:56:44 +08:00 |
|
|
tianshujie98
|
92da7aa0dd
|
* Fix the issue of the module that created the bug.
|
2021-04-28 09:46:55 +08:00 |
|
|
qiyu-xie
|
f29b1e949a
|
* Fix bug#11391.
|
2021-04-28 09:36:38 +08:00 |
|
|
wangyidong
|
a2f78623de
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-28 09:19:10 +08:00 |
|
|
wangyidong
|
33bc4ee8b3
|
* adjust for load lang.
|
2021-04-28 09:18:59 +08:00 |
|
|
wangyidong
|
1e744baa53
|
* adjust for bug #11171.
|
2021-04-28 09:17:53 +08:00 |
|
|
tianshujie98
|
9cd7618fbc
|
* Remove useless code.
|
2021-04-28 08:29:25 +08:00 |
|
|
Guanxiying
|
3264f6146f
|
* Fix comments of getById function.
|
2021-04-27 19:17:15 +08:00 |
|
|
Guanxiying
|
4f963166b8
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-27 19:15:16 +08:00 |
|
|
Guanxiying
|
7c07fb49ba
|
* Add zendata path.
|
2021-04-27 19:14:54 +08:00 |
|
|
Guanxiying
|
56639160c4
|
* Add getbyid file.
|
2021-04-27 19:12:54 +08:00 |
|
|
Guanxiying
|
f154f10c9e
|
* Add chdir and fix run and expect funtion.
|
2021-04-27 19:05:12 +08:00 |
|
|
tianshujie98
|
12b33378f2
|
* Fix bug #12386.
|
2021-04-27 17:21:28 +08:00 |
|
|
hufangzhou
|
43d74042f0
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-27 16:57:35 +08:00 |
|
|
hufangzhou
|
1c1b100a69
|
* Adjust the project doclib acl when merge data.
|
2021-04-27 16:57:31 +08:00 |
|
|
zhujinyong
|
d3922df5a9
|
* Recovery file upload.
|
2021-04-27 16:56:44 +08:00 |
|
|
tianshujie98
|
df4a023a7d
|
* Fix bug #12426.
|
2021-04-27 16:55:07 +08:00 |
|
|
hufangzhou
|
acd04944e7
|
Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3
|
2021-04-27 16:17:56 +08:00 |
|