 wangyidong
|
bb5ced8e4d
|
* fix bug #33745.
|
2023-04-12 17:42:49 +08:00 |
|
|
tianshujie
|
f2a92c6d57
|
* Fixed logical determination of document permissions.
|
2023-04-12 16:35:28 +08:00 |
|
|
tianshujie
|
6fe26dbc28
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 16:13:22 +08:00 |
|
|
tianshujie
|
542f843bd2
|
* Fix bug #34099.
|
2023-04-12 16:08:24 +08:00 |
|
|
wangyidong
|
bc58f409f7
|
* fix bug #34015.
|
2023-04-12 15:20:32 +08:00 |
|
|
tianshujie
|
8548a4bf10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:17:17 +08:00 |
|
|
tianshujie
|
4ba1446559
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:09:03 +08:00 |
|
|
tianshujie
|
5444be8677
|
* Code for task #90782.
|
2023-04-12 15:08:32 +08:00 |
|
|
caoyanyi
|
e627f1aadc
|
* Code for bug #34068.
|
2023-04-12 15:07:24 +08:00 |
|
|
tianshujie
|
b22fb42a7a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-12 14:36:01 +08:00 |
|
|
tianshujie
|
1f56b05cea
|
* Fix bug #34076.
|
2023-04-12 14:13:15 +08:00 |
|
|
tianshujie
|
754928d906
|
* Fix bug #34066.
|
2023-04-12 14:09:41 +08:00 |
|
|
tianshujie
|
f0d405aebf
|
* Fix bug #34076.
|
2023-04-12 14:04:15 +08:00 |
|
|
tianshujie
|
ea8ee0faf5
|
* Fix bug #34076.
|
2023-04-12 13:42:08 +08:00 |
|
|
caoyanyi
|
1b9bbe097d
|
* Code for bug #34060.
|
2023-04-12 11:23:05 +08:00 |
|
|
tianshujie
|
6ef8f58a4f
|
* Fix bug #34066.
|
2023-04-12 11:13:11 +08:00 |
|
|
caoyanyi
|
493e4a8589
|
* Modify no data tips.
|
2023-04-12 11:10:01 +08:00 |
|
|
tianshujie
|
b9fce15bfd
|
* Fixed tree highlighting on the left side of my space.
|
2023-04-12 10:59:09 +08:00 |
|
|
tianshujie
|
b8fc22feee
|
* Fix bug #34066.
|
2023-04-12 10:57:08 +08:00 |
|
|
caoyanyi
|
26b79296d4
|
* Code for bug #34013, task #90781.
|
2023-04-12 10:38:22 +08:00 |
|
|
王怡栋
|
78a9facdb3
|
Merge branch 'tsj_task' into 'master'
* Code f or dynamic
See merge request easycorp/zentaopms!7374
|
2023-04-12 01:55:43 +00:00 |
|
|
王怡栋
|
4fe94c261f
|
Merge branch 'cyy_90779' into 'master'
Cyy 90779
See merge request easycorp/zentaopms!7371
|
2023-04-12 01:54:21 +00:00 |
|
|
tianshujie
|
ab05c059eb
|
* Code for task #90780.
|
2023-04-12 09:28:15 +08:00 |
|
|
wangyidong
|
c4998656f4
|
* fix bug #34018.
|
2023-04-12 08:54:03 +08:00 |
|
|
caoyanyi
|
f194177369
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-11 17:13:05 +08:00 |
|
|
王怡栋
|
a0868cb0ff
|
Merge branch 'master' into 'tsj_dynamic'
# Conflicts:
# module/doc/model.php
|
2023-04-11 08:46:26 +00:00 |
|
|
caoyanyi
|
185550fcf4
|
* Code for task #90779.
|
2023-04-11 16:11:55 +08:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
wangyidong
|
8f519b0bde
|
* code for task #90783.
|
2023-04-11 15:04:08 +08:00 |
|
|
wangyidong
|
9bba7c624d
|
* code for task #90783.
|
2023-04-11 14:44:09 +08:00 |
|
|
王怡栋
|
b1b4e4cb43
|
Merge branch 'tsj_search' into 'master'
* Code for task #89911.
See merge request easycorp/zentaopms!7358
|
2023-04-11 06:06:54 +00:00 |
|
|
tianshujie
|
9401d27a5c
|
* Code for task #89911.
|
2023-04-11 13:39:58 +08:00 |
|
|
wangyidong
|
73ed3946e2
|
* code for task #90784.
|
2023-04-11 11:19:22 +08:00 |
|
|
wangyidong
|
f37eea5af8
|
* fix error.
|
2023-04-11 09:43:24 +08:00 |
|
|
王怡栋
|
f1bc3b73cc
|
Merge branch 'tsj_doc' into 'master'
* Code for task #90792.
See merge request easycorp/zentaopms!7343
|
2023-04-11 00:35:16 +00:00 |
|
|
wangyidong
|
97afbbcef4
|
* fix bug #33950.
|
2023-04-10 16:44:17 +08:00 |
|
|
wangyidong
|
18a60f895c
|
* code for task #89909.
|
2023-04-10 16:06:01 +08:00 |
|
|
tianshujie
|
b6458e2de7
|
* Code for task #89911.
|
2023-04-10 14:16:34 +08:00 |
|
|
wangyidong
|
36f455e28b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-10 13:20:45 +08:00 |
|
|
wangyidong
|
cfcff7243f
|
* code for task #89909.
|
2023-04-10 11:30:19 +08:00 |
|
|
tianshujie
|
a669f56285
|
* Code for task #89910.
|
2023-04-10 11:24:09 +08:00 |
|
|
wangyidong
|
ced89c0a0d
|
* code for task #89909.
|
2023-04-10 11:05:21 +08:00 |
|
|
wangyidong
|
616e133d81
|
* fix bug #33746.
|
2023-04-07 15:53:00 +08:00 |
|
|
caoyanyi
|
e9e6e3f0c5
|
* Adjust code.
|
2023-04-07 13:54:40 +08:00 |
|
|
caoyanyi
|
7790a2b758
|
* Modify create doc for lite vision.
|
2023-04-07 13:47:15 +08:00 |
|
|
caoyanyi
|
1168de36c5
|
* Modify project space for lite vision.
|
2023-04-07 13:33:32 +08:00 |
|
|
wangyidong
|
a065b6e7d7
|
* code for task #89916.
|
2023-04-07 13:11:17 +08:00 |
|
|
tianshujie
|
adb4e70bda
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-07 11:30:05 +08:00 |
|
|
tianshujie
|
3a30a4e65a
|
* Code for task #89910,89911.
|
2023-04-07 11:29:34 +08:00 |
|
|
wangyidong
|
38898d1a13
|
* code for task #89914.
|
2023-04-07 10:53:53 +08:00 |
|