96 Commits

Author SHA1 Message Date
chaideqing
dfd963af7c * Fix bug #42422. 2023-12-27 11:03:57 +08:00
liumengyi
4681a8ad72 * Modify css. 2023-08-14 11:19:35 +08:00
hufangzhou
095a20770e * Fix bug #36981. 2023-08-07 10:25:52 +08:00
chaideqing
73d22a6e6b * Fix bug#34517, the style of the outlineMenu is displayed in the document history. 2023-05-18 16:17:43 +08:00
guofeilong
956a320141 * Adjust code for bug #34524 . 2023-04-21 15:37:54 +08:00
guofeilong
f17df69fa2 * Code for bug # 34524 . 2023-04-21 15:12:38 +08:00
guofeilong
e3245bf03c * Code for adjust title width js . 2023-04-21 14:38:47 +08:00
guofeilong
6ac8651e73 * Code for hide scroll in view . 2023-04-21 14:38:28 +08:00
guofeilong
682d386e7d * Adjust code for css in left-tree . 2023-04-21 10:08:23 +08:00
guofeilong
74d165887e * Code for bug #34521 . 2023-04-21 09:49:14 +08:00
guofeilong
7a89f0b6d3 * Adjust code for bug icon-diamond in btn-group . 2023-04-21 09:28:35 +08:00
guofeilong
222a718c0e * Adjust code for bug #34267 . 2023-04-20 13:24:26 +08:00
tianshujie
9cfaf694ec * Replace favorites button. 2023-04-20 11:25:46 +08:00
王怡栋
27bcdacb34 Merge branch 'master' into 'dev/gfl_fixbug'
# Conflicts:
#   module/doc/css/view.css
2023-04-20 01:16:43 +00:00
caoyanyi
ffac4c9567 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-20 09:12:48 +08:00
guofeilong
fa65768e1c * Code for bug #34267 . 2023-04-20 08:58:30 +08:00
tianshujie
44794fcd43 * Change button color. 2023-04-19 16:49:29 +08:00
guofeilong
938821853c * Adjust code for task#91379 . 2023-04-19 16:47:13 +08:00
guofeilong
a9db84f2c6 * Code for adjust padding-x in drop . 2023-04-19 16:28:29 +08:00
tianshujie
06c8d50719 * Modify the editor style. 2023-04-19 09:09:26 +08:00
王怡栋
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
61ff47b68a * Code for task #91378. 2023-04-18 13:53:11 +08:00
tianshujie
d165ce39b9 * Code for task #91378. 2023-04-18 13:40:47 +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
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
guofeilong
af5e9ab505 * Code for task #91379 . 2023-04-17 15:58:39 +08:00
tianshujie
f4cda4d780 * Code for task #91378. 2023-04-17 10:57:00 +08:00
guofeilong
2f169c2d7a * Adjust code for css in right menu . 2023-04-14 16:24:56 +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
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
caoyanyi
202c682cc5 * Add views num to doc view. 2023-04-14 15:10:27 +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
guofeilong
c8b6a19080 * Adjust code for bug #34164 . 2023-04-14 10:39:33 +08:00
王怡栋
f58a67cfc3 Merge branch 'dev/gfl_zentaopms_305' into 'master'
Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7415
2023-04-14 02:29:23 +00:00
wangyidong
bcd61687c6 * fix bug for style. 2023-04-14 10:25:56 +08:00
guofeilong
c82c461261 * Adjust code for class h-full-adjust . 2023-04-14 10:23:06 +08:00
caoyanyi
eae7f23245 * Fix bug #34156. 2023-04-14 10:18:06 +08:00
caoyanyi
50b734184f * Fix bug #34165. 2023-04-14 09:39:29 +08:00
guofeilong
486b9f466e * Adjust code for css in docDetail . 2023-04-14 09:06:52 +08:00
guofeilong
b7893e356d - Delete js and view code for crumbs in docDetail . 2023-04-14 08:40:47 +08:00
guofeilong
b73c301143 * Code for task 90776 . 2023-04-13 13:27:03 +08:00
guofeilong
53da287c46 * Code for task #90971. 2023-04-13 11:08:39 +08:00
guofeilong
03bf3e54e6 * Code for adjust width . 2023-04-13 11:08:39 +08:00
guofeilong
e8d43fe0b0 * Code for task #90776 . 2023-04-12 13:37:48 +08:00