 tianshujie
|
9df90e87a5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort
|
2023-04-18 10:44:37 +08:00 |
|
|
tianshujie
|
4a46d918b1
|
* Code for task #91391.
|
2023-04-18 10:43:03 +08:00 |
|
|
王怡栋
|
29f2ba65e3
|
Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34293,34299.
See merge request easycorp/zentaopms!7444
|
2023-04-18 02:41:20 +00:00 |
|
|
guofeilong
|
367be9d52a
|
* Code for task #91379 .
|
2023-04-18 10:36:34 +08:00 |
|
|
tianshujie
|
7605903fe9
|
* Fix bug #34274.
|
2023-04-18 10:29:48 +08:00 |
|
|
tianshujie
|
32161d8d66
|
* Code for task #91391.
|
2023-04-18 10:23:03 +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 |
|
|
wangyidong
|
0ef2c25165
|
* fix bug.
|
2023-04-18 09:16:34 +08:00 |
|
|
tianshujie
|
b4c325c56e
|
* Code for task #91378.
|
2023-04-18 09:13:45 +08:00 |
|
|
caoyanyi
|
07a5cb6f94
|
* Fix bug #34293,34299.
|
2023-04-18 09:07:50 +08:00 |
|
|
tianshujie
|
4a980b4d7c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort
|
2023-04-18 08:34:41 +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 |
|
|
tianshujie
|
fb521320e0
|
* Code for task #91391.
|
2023-04-17 17:21:06 +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
|
7a8d7ace0b
|
* Code for task #91391.
|
2023-04-17 16:41:36 +08:00 |
|
|
guofeilong
|
cde83aa2b0
|
* Code for task #91379 .
|
2023-04-17 16:01:32 +08:00 |
|
|
guofeilong
|
af5e9ab505
|
* Code for task #91379 .
|
2023-04-17 15:58:39 +08:00 |
|
|
tianshujie
|
c689f25199
|
* Code for task #91391.
|
2023-04-17 14:07:09 +08:00 |
|
|
tianshujie
|
8fc7ca7525
|
* Code for task #91391.
|
2023-04-17 13:56:21 +08:00 |
|
|
tianshujie
|
21f7143919
|
* Code for task #91391.
|
2023-04-17 11:12:09 +08:00 |
|
|
tianshujie
|
f4cda4d780
|
* Code for task #91378.
|
2023-04-17 10:57:00 +08:00 |
|
|
王怡栋
|
d776871aca
|
Merge branch 'tsj_block' into 'master'
Tsj block
See merge request easycorp/zentaopms!7428
|
2023-04-14 09:31:50 +00:00 |
|
|
guofeilong
|
3f3799eae8
|
* Adjust code for css in tree-item .
|
2023-04-14 16:50:34 +08:00 |
|
|
guofeilong
|
2f169c2d7a
|
* Adjust code for css in right menu .
|
2023-04-14 16:24:56 +08:00 |
|
|
caoyanyi
|
bb20772786
|
* Modify data field.
|
2023-04-14 16:17:32 +08:00 |
|
|
caoyanyi
|
159f604619
|
* Remove unused code.
|
2023-04-14 16:16:24 +08:00 |
|
|
tianshujie
|
d0f0d5bbbe
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_block
|
2023-04-14 16:14:59 +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 |
|
|
tianshujie
|
beffe82709
|
* Code for task #43816.
|
2023-04-14 16:11:06 +08:00 |
|
|
guofeilong
|
3c4e36b4d9
|
* Adjust code for bug #34195 .
|
2023-04-14 16:10:24 +08:00 |
|
|
guofeilong
|
e7e52ca98e
|
* Adjust code for bug #34193.
|
2023-04-14 16:01:45 +08:00 |
|
|
王怡栋
|
368fbe6f57
|
Merge branch 'cyy_fixbug' into 'master'
* Add edited by me doc list.
See merge request easycorp/zentaopms!7421
|
2023-04-14 07:49:35 +00:00 |
|
|
guofeilong
|
0dee3ed3e6
|
* Code for bug #34192 .
|
2023-04-14 15:47:40 +08:00 |
|
|
tianshujie
|
2c1fb2826b
|
* Code for story #43815.
|
2023-04-14 15:31:41 +08:00 |
|
|
guofeilong
|
e0bad0e4b2
|
* Code for bug #34193 .
|
2023-04-14 15:31:21 +08:00 |
|
|
guofeilong
|
8062513f54
|
* Adjust code for lefttree refactors .
|
2023-04-14 15:13:24 +08:00 |
|
|
caoyanyi
|
202c682cc5
|
* Add views num to doc view.
|
2023-04-14 15:10:27 +08:00 |
|
|
guofeilong
|
487214058b
|
* Adjust code for icon replace img .
|
2023-04-14 15:07:34 +08:00 |
|
|
caoyanyi
|
bc6888da5e
|
* Add edited by me doc list.
|
2023-04-14 14:36:10 +08:00 |
|
|
王怡栋
|
600b9c4949
|
Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug
See merge request easycorp/zentaopms!7410
|
2023-04-14 06:30:31 +00:00 |
|
|
王怡栋
|
d4eee84a04
|
Merge branch 'master' into 'tsj_issue'
# Conflicts:
# module/doc/css/common.css
|
2023-04-14 06:29:28 +00:00 |
|
|
王怡栋
|
65e15bbf25
|
Merge branch 'tsj_task' into 'master'
Tsj task
See merge request easycorp/zentaopms!7419
|
2023-04-14 06:27:52 +00:00 |
|
|
tianshujie
|
9cb069b33a
|
* Optimized Level 2.5 dropdown interaction.
|
2023-04-14 13:47:27 +08:00 |
|