Commit Graph
3289 Commits
Author SHA1 Message Date
宋辰轩 bae5fc00fc Merge branch 'master' into sprint/biz17 2023-02-17 15:57:51 +08:00
宋辰轩 6dfbdbdab6 * Update zui fonts and css. 2023-02-17 15:53:11 +08:00
qixinzhi 4580fb13ed Merge branch 'master' into sprint/biz17 2023-02-17 15:24:51 +08:00
qixinzhi e16b2a4275 * Update zui datagrid lib. 2023-02-17 15:24:18 +08:00
tianshujie 792f1c5a98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-17 08:33:25 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
Yagami da62f994d9 Merge branch 'sgm_dtable' into zentaopms_284 2023-02-15 15:49:53 +08:00
Yagami 8bc4f664d4 * Code for dtable. 2023-02-15 10:54:42 +08:00
qixinzhi 70fd09a754 * Add datagrid js lib. 2023-02-14 10:26:20 +08:00
liumengyi 2379ab313a * Finish task #84582. 2023-02-13 15:36:41 +08:00
caoyanyi 3cbc28df28 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-09 14:21:55 +08:00
guofeilong bf16c348ef * zui: Code for update theme css. 2023-02-09 08:43:03 +08:00
Yagami 7d5d82693a * Add dtable. 2023-02-08 17:45:51 +08:00
caoyanyi 03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +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
guofeilong 08b62c3108 * Code for add class admin-tab-menu 2023-02-08 10:03:56 +08:00
guofeilong f3bff30d3a * Code for update theme css in zui. 2023-02-07 14:18:57 +08:00
guofeilong 4297180081 * Code for css in nav. 2023-02-07 14:17:28 +08:00
guofeilong c66b3dd489 * Code for update zui.css 2023-02-07 14:07:44 +08:00
guofeilong 269c7a517e * Code for style in task#83732 2023-02-07 14:04:25 +08:00
guofeilong bd2afd5c4d * Code for css in zui. 2023-02-07 11:22:08 +08:00
guofeilong d23408e178 Merge branch 'dev/gfl_task_#83732' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-07 10:57:52 +08:00
guofeilong fd254834fe * Code for task #83732 2023-02-07 10:52:56 +08:00
caoyanyi 2f67a61a45 * Optimize page style. 2023-02-06 13:48:34 +08:00
guofeilong 54f3ba6ec1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-03 14:28:38 +08:00
guofeilong df8608ddc9 * Code for style problem in flowchart 2023-02-03 14:23:22 +08:00
guofeilong f2e45b7cd2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-03 10:07:37 +08:00
guofeilong 03d869e8d3 * Code for css in admin theme. 2023-02-03 10:01:55 +08:00
caoyanyi e16e72162e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-02 16:59:09 +08:00
guofeilong 8aa04874b3 * code for add icon download-alt and horn 2023-02-02 16:49:32 +08:00
guofeilong 5f629ca690 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-02 14:50:15 +08:00
guofeilong 6ba62547fb * code for theme class in task #83327 2023-02-02 14:39:32 +08:00
caoyanyi 2072f14285 * Modify nav style. 2023-02-02 13:32:05 +08:00
caoyanyi 038a09cc9b * Update svg file. 2023-02-02 10:37:02 +08:00
caoyanyi 43a8635da4 * Modify system menu style. 2023-02-02 09:26:51 +08:00
caoyanyi fd57156a90 * Optimize admin switcher style. 2023-02-01 16:33:39 +08:00
caoyanyi bfb0c22484 * Optimize page style. 2023-02-01 16:00:45 +08:00
guofeilong a56ebbab57 * change svg name 2023-02-01 14:07:20 +08:00
guofeilong 3e386ba9c8 * code for svg and handle conflict 2023-02-01 13:50:27 +08:00
caoyanyi dfb991ba7c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-01 08:54:25 +08:00
liuyongkai b05c2d6dae * Remove error commited file. 2023-01-31 14:10:16 +08:00
guofeilong 6df1f2daa6 * code for task_#83327 2023-01-30 16:37:24 +08:00
liumengyi 7b71ce60de * Add nav-steps component. 2023-01-12 08:30:04 +08:00
tanghucheng c4223144e5 * Change the automation introduction picture. 2023-01-06 16:35:36 +08:00
孙广明 2494eb0b63 Merge branch 'zenops_46' into 'master'
* Fix bug #31322.

See merge request easycorp/zentaopms!6688
2023-01-04 09:24:11 +00:00
tanghucheng a85663d8dc * Change icon for zanode resume. 2023-01-04 17:20:14 +08:00
孙广明 fb56b7377c Merge branch 'sprint/282_liumengyi_screencover' into 'master'
* Add the cover of screen 6.

See merge request easycorp/zentaopms!6681
2023-01-04 06:34:26 +00:00
liumengyi 7b243aba8e * Add the cover of screen 6. 2023-01-04 14:15:56 +08:00