 tianshujie
|
f4cda4d780
|
* Code for task #91378.
|
2023-04-17 10:57:00 +08:00 |
|
|
caoyanyi
|
159f604619
|
* Remove unused code.
|
2023-04-14 16:16:24 +08:00 |
|
|
caoyanyi
|
6c6461336f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-14 16:14:55 +08:00 |
|
|
wangyidong
|
e5ff2093cb
|
* code for change collector field to collects.
|
2023-04-14 16:14:42 +08:00 |
|
|
caoyanyi
|
ab6f0c3259
|
* Add collections for doc view.
|
2023-04-14 16:13:52 +08:00 |
|
|
caoyanyi
|
bc6888da5e
|
* Add edited by me doc list.
|
2023-04-14 14:36:10 +08:00 |
|
|
tianshujie
|
9cb069b33a
|
* Optimized Level 2.5 dropdown interaction.
|
2023-04-14 13:47:27 +08:00 |
|
|
tianshujie
|
f954e7935c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue
|
2023-04-14 13:31:12 +08:00 |
|
|
tianshujie
|
99c8caffaf
|
* Fix bug #34184.
|
2023-04-14 11:30:25 +08:00 |
|
|
tianshujie
|
2088b588b1
|
* Modify the interaction of the Create document button.
|
2023-04-14 11:17:56 +08:00 |
|
|
wangyidong
|
44db4dd94f
|
* code for doc sidebarHeader.
|
2023-04-14 09:35:20 +08:00 |
|
|
wangyidong
|
c5681e0433
|
* code for issue #767.
|
2023-04-14 09:10:00 +08:00 |
|
|
tianshujie
|
155f9cf5d3
|
* Resolve issue #777.
|
2023-04-14 08:57:18 +08:00 |
|
|
王怡栋
|
e6be417612
|
Merge branch 'master' into 'tsj_task'
# Conflicts:
# module/doc/view/lefttree.html.php
|
2023-04-13 09:03:14 +00:00 |
|
|
tianshujie
|
e279e91070
|
* Resolve issue #775.
|
2023-04-13 16:22:45 +08:00 |
|
|
王怡栋
|
5ac6adcb09
|
Merge branch 'master' into 'cyy_fixbug'
# Conflicts:
# module/doc/view/lefttree.html.php
|
2023-04-13 05:30:11 +00:00 |
|
|
朱金勇
|
bb531cfd2c
|
* Fix bugs in dmdb.
|
2023-04-13 05:10:17 +00:00 |
|
|
caoyanyi
|
293a22158c
|
* Modify api lib sort, Fix bug #33899.
|
2023-04-13 11:22:14 +08:00 |
|
|
tianshujie
|
22f4b33a66
|
* Code for story #43645,43646.
|
2023-04-13 11:19:28 +08:00 |
|
|
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 |
|