Commit Graph
705 Commits
Author SHA1 Message Date
tianshujie f49368e220 * Add links to navigation. 2023-02-10 09:29:00 +08:00
tianshujie 2304fcd1bc * Do not print related links without permissions. 2023-02-10 09:28:16 +08:00
tianshujie 58f3310e03 * Reorder secondary navigation. 2023-02-10 09:27:40 +08:00
caoyanyi eaf6e693d7 * Add language. 2023-02-10 08:41:34 +08:00
guofeilong a641684b0a * Code for css in setting-dec refactors. 2023-02-10 08:33:00 +08:00
caoyanyi a55805c92f * Code for issue #745. 2023-02-09 16:57:05 +08:00
tianshujie 2cd3d404a1 * Resolve issue #744. 2023-02-09 16:48:53 +08:00
wangyidong 1ff0629556 * adjust for admin index page. 2023-02-09 16:29:00 +08:00
王怡栋 c316ca23ea Merge branch 'sprint/285_tsj' into 'sprint/285'
Sprint/285 tsj

See merge request easycorp/zentaopms!6906
2023-02-09 06:59:05 +00:00
tianshujie 9506850831 * Modify the parameters of the database navigation link. 2023-02-09 14:50:18 +08:00
tianshujie 173b9ad1d2 * Modify the style of the secondary development page. 2023-02-09 14:43:06 +08:00
tianshujie be37300935 * Code for finish task #83741. 2023-02-09 14:19:15 +08:00
tianshujie 78506e6ad4 * Add navigation highlighting. 2023-02-09 13:27:31 +08:00
tianshujie bd95b1eb84 * Code for finish task #83733. 2023-02-09 11:54:01 +08:00
tianshujie 789a39a52c * Example Modify the js jump logic. 2023-02-09 11:14:13 +08:00
tianshujie 081c55f5ab Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj 2023-02-09 10:54:28 +08:00
guofeilong cbbe375ebb * admin: css refacotrs. 2023-02-09 10:37:31 +08:00
caoyanyi 7e20b4813f * Modify sub menu active. 2023-02-09 10:38:05 +08:00
guofeilong 25e012a1d4 * Code for adjust .side.penl's height 2023-02-09 10:27:07 +08:00
guofeilong 34504c80d7 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-09 10:10:27 +08:00
guofeilong 760168cc50 * Code for admin.css refactors. 2023-02-09 10:10:22 +08:00
wangyidong 4ddfbece68 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-09 10:01:04 +08:00
tianshujie bc73b6d379 * Code for finish task #83727. 2023-02-09 09:59:56 +08:00
wangyidong 81e8a96d6f * code for task #83740. 2023-02-09 09:59:24 +08:00
tianshujie f53cd0d57a * Code for finish task #83726. 2023-02-09 09:29:06 +08:00
guofeilong 4a969c82fc * Code for admin.css refactors . 2023-02-09 09:28:39 +08:00
tianshujie 9769b60fe7 * The open,biz version removes the document template block. 2023-02-09 09:25:39 +08:00
wangyidong b3c22aeaa1 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 17:01:22 +08:00
wangyidong 7169cd0397 * adjust for video image. 2023-02-08 17:00:04 +08:00
caoyanyi c365db5074 * Code for task #83735. 2023-02-08 16:50:47 +08:00
wangyidong a12f2b07b4 * revert for api link. 2023-02-08 16:44:13 +08:00
wangyidong 43f31bbe44 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 16:27:17 +08:00
wangyidong bc833a572e * adjust for task #83746. 2023-02-08 16:06:45 +08:00
caoyanyi 88ad600143 * Adjust code. 2023-02-08 15:53:04 +08:00
caoyanyi 2e023d5dc1 * Adjust code. 2023-02-08 15:30:36 +08:00
caoyanyi 43866fe1c9 * Adjust code. 2023-02-08 15:29:53 +08:00
tianshujie 759b734665 * Code for finish task #83726. 2023-02-08 15:09:09 +08:00
guofeilong 093a84f9ee Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_getDate 2023-02-08 15:07:05 +08:00
guofeilong ffb6b0a0c3 * Code for genDateUsed 2023-02-08 14:57:43 +08:00
王怡栋 1a671984ef Merge branch 'sprint/cyy_83742' into 'sprint/285'
Sprint/cyy 83742

See merge request easycorp/zentaopms!6881
2023-02-08 06:53:30 +00:00
王怡栋 ea9ac74ab3 Merge branch 'sprint/285_tsj_83723' into 'sprint/285'
Sprint/285 tsj 83723

See merge request easycorp/zentaopms!6885
2023-02-08 06:52:12 +00:00
tianshujie aeea82dae9 * Code for finish task #83724. 2023-02-08 14:46:13 +08:00
caoyanyi 32623d2560 * Optimize admin page style. 2023-02-08 14:34:57 +08:00
tianshujie d5cfe17980 * Code for finish task #83743. 2023-02-08 14:11:23 +08:00
tianshujie dddee69dc6 * Code for finish task #83725. 2023-02-08 11:12:49 +08:00
guofeilong 8700d05e87 * Code for css refactors in admin 2023-02-08 11:04:45 +08:00
tianshujie 592550fa6a * Code for finish task #83723. 2023-02-08 10:54:31 +08:00
guofeilong 8829a07ffa Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#88327_refactors 2023-02-08 10:46:15 +08:00
tianshujie 82fe380a4c * Refactor. 2023-02-08 10:03:41 +08:00
tianshujie 42b65e5986 * Code for finish task #83722. 2023-02-08 09:33:14 +08:00