 王怡栋
|
6c74871804
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7453
|
2023-04-18 06:43:52 +00:00 |
|
|
guofeilong
|
fa99c2a707
|
* Code for task #91379 .
|
2023-04-18 14:40:13 +08:00 |
|
|
tianshujie
|
338599b562
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-18 14:16:36 +08:00 |
|
|
tianshujie
|
0f49022d88
|
* Fix bug #34260.
|
2023-04-18 13:49:55 +08:00 |
|
|
王怡栋
|
70a1625a13
|
Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34288, Modify bottom height.
See merge request easycorp/zentaopms!7450
|
2023-04-18 05:49:05 +00:00 |
|
|
tianshujie
|
d165ce39b9
|
* Code for task #91378.
|
2023-04-18 13:40:47 +08:00 |
|
|
wangyidong
|
dcc3fd9331
|
* fix bug #34278.
|
2023-04-18 13:33:09 +08:00 |
|
|
wangyidong
|
0d31625643
|
* code for task #91388.
|
2023-04-18 13:05:14 +08:00 |
|
|
caoyanyi
|
77605330f2
|
* Modify catalog select style.
|
2023-04-18 11:16:24 +08:00 |
|
|
caoyanyi
|
ab7bfba897
|
* Fix bug #34185, Modify sidebar-toggle.
|
2023-04-18 11:09:19 +08:00 |
|
|
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 |
|
|
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
|
fb521320e0
|
* Code for task #91391.
|
2023-04-17 17:21:06 +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
|
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
|
f4cda4d780
|
* Code for task #91378.
|
2023-04-17 10:57:00 +08:00 |
|
|
guofeilong
|
3f3799eae8
|
* Adjust code for css in tree-item .
|
2023-04-14 16:50:34 +08:00 |
|
|
caoyanyi
|
bb20772786
|
* Modify data field.
|
2023-04-14 16:17:32 +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 |
|
|
caoyanyi
|
ab6f0c3259
|
* Add collections for doc view.
|
2023-04-14 16:13:52 +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
|
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
|
f954e7935c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue
|
2023-04-14 13:31:12 +08:00 |
|
|
caoyanyi
|
896f117c66
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-14 13:13:48 +08:00 |
|
|
tianshujie
|
2088b588b1
|
* Modify the interaction of the Create document button.
|
2023-04-14 11:17:56 +08:00 |
|
|
tianshujie
|
8208c02908
|
* Fix bug #34161.
|
2023-04-14 10:52:36 +08:00 |
|
|
tianshujie
|
f14efad6ac
|
* Optimized jump link.
|
2023-04-14 10:32:08 +08:00 |
|
|
tianshujie
|
9180c13a89
|
* Optimized jump logic.
|
2023-04-14 10:16:42 +08:00 |
|
|
tianshujie
|
4f80045c48
|
* Modify method name.
|
2023-04-14 10:02:08 +08:00 |
|
|
wangyidong
|
2380df4a49
|
* remove default save path.
|
2023-04-14 09:52:51 +08:00 |
|
|
wangyidong
|
3ee191bd66
|
* remove save path when create doc.
|
2023-04-14 09:49:57 +08:00 |
|
|
caoyanyi
|
123bb67c54
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-14 09:22:20 +08:00 |
|
|
caoyanyi
|
2c4f976c14
|
* Modify action edit style.
|
2023-04-14 09:16:57 +08:00 |
|
|
wangyidong
|
c5681e0433
|
* code for issue #767.
|
2023-04-14 09:10:00 +08:00 |
|