 tianshujie
|
338599b562
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-18 14:16:36 +08:00 |
|
|
wangyidong
|
0d31625643
|
* code for task #91388.
|
2023-04-18 13:05:14 +08:00 |
|
|
tianshujie
|
775088ac63
|
* Fix bug #34276.
|
2023-04-18 11:05:14 +08:00 |
|
|
caoyanyi
|
8e69054983
|
* Fix bug #32491, Adjust to no increase in traffic within 3 seconds.
|
2023-04-18 10:15:07 +08:00 |
|
|
caoyanyi
|
99ed7687cb
|
* Fix bug #34292.
|
2023-04-18 09:48:51 +08:00 |
|
|
caoyanyi
|
07a5cb6f94
|
* Fix bug #34293,34299.
|
2023-04-18 09:07:50 +08:00 |
|
|
王怡栋
|
d78cb60d48
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/doc/model.php
# module/group/lang/resource.php
|
2023-04-18 00:25:53 +00:00 |
|
|
tianshujie
|
04a8604aa6
|
* Fix bug #34295.
|
2023-04-18 08:22:38 +08:00 |
|
|
wangyidong
|
fed027e5a7
|
* fix bug.
|
2023-04-17 17:39:42 +08:00 |
|
|
tianshujie
|
84712f0f51
|
* Fix bug #34297.
|
2023-04-17 17:26:07 +08:00 |
|
|
wangyidong
|
5399ec46be
|
* code for task #91381.
|
2023-04-17 17:14:56 +08:00 |
|
|
王怡栋
|
cf9d4348ab
|
Merge branch 'tsj_sort' into 'master'
Tsj sort
See merge request easycorp/zentaopms!7440
|
2023-04-17 08:42:15 +00:00 |
|
|
tianshujie
|
8fc7ca7525
|
* Code for task #91391.
|
2023-04-17 13:56:21 +08:00 |
|
|
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 |
|