Commit Graph
102 Commits
Author SHA1 Message Date
hufangzhou 21f7a2ecc1 * Fix bug #37338. 2023-08-18 11:24:38 +08:00
hufangzhou bf99140bc0 * Code for task #99341, hide renaming and deletion actions of attachments in the document's version history. 2023-08-04 10:25:43 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
chaideqing 1caeb75ad0 * Fix bug#34519, the document outline is not followed with switch version. 2023-05-19 16:27:25 +08:00
Yagami 5935f603f4 * Change judgment condition. 2023-05-04 18:57:45 +08:00
Yagami c4c20cae54 * Change judgment condition. 2023-05-04 18:04:34 +08:00
guofeilong dc050c72d9 * Code for bug #34524. 2023-04-21 15:34:36 +08:00
guofeilong e3245bf03c * Code for adjust title width js . 2023-04-21 14:38:47 +08:00
guofeilong 8dd356b7e1 * Code for delete emtpy lines . 2023-04-21 14:38:28 +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 5ecfcd3772 * Code for task #91380 . 2023-04-20 13:24:26 +08:00
guofeilong 418a6a5ff9 * Code for task #91379 . 2023-04-19 16:29:06 +08:00
guofeilong 4bd8a0b917 * Code for adjust style in drop. 2023-04-19 15:27:30 +08:00
guofeilong 70fd734b93 * Adjust code for add active to dropdown . 2023-04-19 15:27:07 +08:00
guofeilong 06ec49b150 * Code for task #91380 . 2023-04-19 08:53:48 +08:00
guofeilong c2440a0ab2 * Adjust code for task #91379 . 2023-04-18 16:57:21 +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 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
王怡栋 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 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
caoyanyi bb20772786 * Modify data field. 2023-04-14 16:17:32 +08:00
caoyanyi ab6f0c3259 * Add collections for doc view. 2023-04-14 16:13:52 +08:00
caoyanyi 202c682cc5 * Add views num to doc view. 2023-04-14 15:10:27 +08:00
caoyanyi 2c4f976c14 * Modify action edit style. 2023-04-14 09:16:57 +08:00
guofeilong 4b603d8495 * Adjust code for change icons . 2023-04-13 11:09:10 +08:00
wangyidong 594364c4e0 * code for task #90775. 2023-04-11 16:44:09 +08:00
guofeilong 3ff45d64ef * Code for add logic to show outlineMenu . 2023-04-11 16:09:50 +08:00
guofeilong a8a4faae24 * Code for task #90776 . 2023-04-11 14:39:53 +08:00
王怡栋 857b57b6eb Merge branch 'cyy_task' into 'master'
Cyy task

See merge request easycorp/zentaopms!7355
2023-04-11 06:05:51 +00:00
guofeilong 08614f32d1 * Code for task #90834 . 2023-04-11 13:59:22 +08:00
caoyanyi 5e5eb3396a * Code for task #90790. 2023-04-11 09:59:22 +08:00
caoyanyi e164c7be4d * Code for task #90971. 2023-04-10 16:13:54 +08:00
caoyanyi 09168e505f * Code for task #90790. 2023-04-10 10:38:25 +08:00
guofeilong 0cfc3d8426 * Code for adjust class in actions icon . 2023-04-07 16:08:30 +08:00
guofeilong 87fa888809 * Adjust code for add text-primary to icon history . 2023-04-07 15:31:20 +08:00
guofeilong 94ecc551e2 * Adjust code for event click in history . 2023-04-07 13:36:17 +08:00
guofeilong 09339199c1 * Adjust code for module view . 2023-04-07 11:12:19 +08:00
guofeilong 3cf6f46f62 * Code for task #89913 . 2023-04-07 10:21:57 +08:00
tianshujie 1bd3209351 * Code for task #89915. 2023-04-04 14:37:45 +08:00
wangyidong 28feaa2a2c * code for task #89524. 2023-04-03 13:41:37 +08:00
tianshujie 4f0953139c * Code for task #87405. 2023-03-31 10:59:40 +08:00
tianshujie be1d498c5a * Code for task #87405. 2023-03-30 13:17:43 +08:00
liuyongkai 3dfb278fc4 * Resolve ticket #2072. 2023-02-01 16:37:24 +08:00