Commit Graph
50871 Commits
Author SHA1 Message Date
tianshujie bc73b6d379 * Code for finish task #83727. 2023-02-09 09:59:56 +08:00
tianshujie e5d74210b5 * Delete useless language items. 2023-02-09 09:31:35 +08:00
tianshujie f53cd0d57a * Code for finish task #83726. 2023-02-09 09:29:06 +08:00
tianshujie 9769b60fe7 * The open,biz version removes the document template block. 2023-02-09 09:25:39 +08:00
tianshujie 99e4b6eac6 * Add head of product,execution,kanban pager. 2023-02-09 09:12:18 +08:00
tianshujie a3a4c21ed9 * Delete useless language items. 2023-02-09 08:49:11 +08:00
tianshujie a7837f6ea2 * Code for finish task #83728. 2023-02-08 17:20:39 +08:00
tianshujie 759b734665 * Code for finish task #83726. 2023-02-08 15:09:09 +08:00
tianshujie 53c69571c9 * Code for finish task #83726. 2023-02-08 15:03:14 +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 3c2e056d46 * Adjust code. 2023-02-08 14:45:22 +08:00
caoyanyi ff1f245a45 Merge branch 'sprint/cyy_83742' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_83742 2023-02-08 14:35:23 +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
caoyanyi c97774f8a0 * Optimize admin page style. 2023-02-08 13:26:16 +08:00
caoyanyi adfc82feef * Optimize holiday import style. 2023-02-08 13:10:07 +08:00
caoyanyi 03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +08:00
王怡栋 98c99cf572 Merge branch 'dev/gfl_task_#88327_refactors' into 'sprint/285'
Dev/gfl task #88327 refactors

See merge request easycorp/zentaopms!6880
2023-02-08 03:13:27 +00:00
tianshujie dddee69dc6 * Code for finish task #83725. 2023-02-08 11:12:49 +08:00
tianshujie 987e5c6fa9 * Code for finish task #83736. 2023-02-08 11:11:03 +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 3c4c046f5f * Delete space. 2023-02-08 10:43:38 +08:00
tianshujie 144e485376 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj_83723 2023-02-08 10:42:52 +08:00
tianshujie c29df55df8 * Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 10:39:45 +08:00
王怡栋 552222709a Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #24872.

See merge request easycorp/zentaopms!6877
2023-02-08 02:22:50 +00:00
王怡栋 1148adad0c Merge branch 'dev/gfl_add_class_admin-tab-menu' into 'master'
* Code for add class admin-tab-menu

See merge request easycorp/zentaopms!6878
2023-02-08 02:22:24 +00:00
wangyuting2 2328bcb922 * Fix bug #24872. 2023-02-08 10:15:27 +08:00
guofeilong 08b62c3108 * Code for add class admin-tab-menu 2023-02-08 10:03:56 +08:00
tianshujie 82fe380a4c * Refactor. 2023-02-08 10:03:41 +08:00
王怡栋 fd92f0e6ae Merge branch 'zenops_61' into 'master'
Zenops 61

See merge request easycorp/zentaopms!6876
2023-02-08 01:55:38 +00:00
王怡栋 b8b5a62427 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #24665.

See merge request easycorp/zentaopms!6875
2023-02-08 01:53:25 +00:00
王怡栋 9ee0326acf Merge branch 'master_xieqiyu_31949' into 'master'
Master xieqiyu 31949

See merge request easycorp/zentaopms!6873
2023-02-08 01:52:56 +00:00
王怡栋 6a96936712 Merge branch 'sprint/285_navigation' into 'sprint/285'
Sprint/285 navigation

See merge request easycorp/zentaopms!6874
2023-02-08 01:51:39 +00:00
wangyuting2 3915c2c1d1 * Fix bug #24665. 2023-02-08 09:39:28 +08:00
tianshujie 42b65e5986 * Code for finish task #83722. 2023-02-08 09:33:14 +08:00
tianshujie 14eaa4428c * Code for finish task #83722. 2023-02-08 09:06:19 +08:00
xieqiyu 975b755c54 * Code for bug#31949. 2023-02-08 08:48:09 +08:00
xieqiyu bfe1a0ef5e * Code for bug#31949. 2023-02-08 08:37:38 +08:00
tianshujie a0ce833de1 * Code of finish task #83722. 2023-02-07 17:01:12 +08:00
tianshujie 1cc9d33efc * Code for finish task #83722. 2023-02-07 16:55:04 +08:00
guofeilong fb9f725975 * Code for update admin.html 2023-02-07 16:54:50 +08:00
guofeilong fff2b4a56f * Code for css in admin.html 2023-02-07 16:33:10 +08:00
tianshujie e89612ba41 Merge branch 'sprint/285_navigation' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-07 16:29:21 +08:00
tianshujie 52568a67be * Code for finish task #83722. 2023-02-07 16:29:02 +08:00
王怡栋 1bd84b68c7 Merge branch 'bugfix/liwenrui/chatavatarpermission' into 'master'
修复禅道客户端中上传群头像功能可能无权使用的问题

See merge request easycorp/zentaopms!6871
2023-02-07 06:56:40 +00:00
王怡栋 a1aa283d77 Merge branch 'master_xieqiyu_31948' into 'master'
* Code for bug#31948.

See merge request easycorp/zentaopms!6872
2023-02-07 06:56:13 +00:00