Commit Graph
406 Commits
Author SHA1 Message Date
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 418a6a5ff9 * Code for task #91379 . 2023-04-19 16:29:06 +08:00
guofeilong a9db84f2c6 * Code for adjust padding-x in drop . 2023-04-19 16:28:29 +08:00
王怡栋 01c8d5d893 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7474
2023-04-19 07:49:35 +00:00
tianshujie 18cba3006d * Modified create Project library page style. 2023-04-19 15:34:59 +08:00
guofeilong 4bd8a0b917 * Code for adjust style in drop. 2023-04-19 15:27:30 +08:00
tianshujie eb31e77d09 * Change the width of the create page control. 2023-04-19 14:32:44 +08:00
tianshujie c17bf269f6 * Fix bug #34338. 2023-04-19 10:31:22 +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 338599b562 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:16:36 +08:00
tianshujie 61ff47b68a * Code for task #91378. 2023-04-18 13:53:11 +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 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
caoyanyi 8104185c61 * Fix bug #34288, Modify bottom height. 2023-04-18 10:47:35 +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
王怡栋 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
guofeilong c8b6a19080 * Adjust code for bug #34164 . 2023-04-14 10:39:33 +08:00