Commit Graph
313 Commits
Author SHA1 Message Date
reneeteng 8dc96ee49b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-18 15:42:22 +08:00
reneeteng 354b119a2c Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-08-17 10:03:12 +08:00
Hao Sun aeca480f65 * improve button style in left menu. 2021-08-16 14:49:08 +08:00
Hao Sun c3884a8b8e * fix click tabs bar not work. 2021-08-16 14:18:16 +08:00
holan20180123 1b4eba82ba * Finish task #41439. 2021-08-16 13:46:31 +08:00
Hao Sun c1bc10b477 * refactor. 2021-08-16 10:15:58 +08:00
Hao Sun a6bd22b09d * show tooltip for left menu. 2021-08-16 10:15:53 +08:00
Hao Sun 4d42368a7f * fix UI for more menu not work as expected. 2021-08-16 09:37:39 +08:00
Hao Sun 8cfe9d4f50 * fix menu button not clickable. 2021-08-16 09:24:41 +08:00
Hao Sun a14ee06288 * improve UI of left menu. 2021-08-13 17:57:28 +08:00
王怡栋 9e7e2d83b4 * reset session for user avatar. 2021-08-12 10:45:23 +08:00
reneeteng e47b403c7b Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-08-11 14:38:08 +08:00
Hao Sun fa86185291 * bug #14163, fix position of show-more-menu button in left menu. 2021-08-11 10:52:03 +08:00
Hao Sun 8b1d769e67 * forbid open index/index in app's iframe to prevent infinite nesting. 2021-08-09 16:31:39 +08:00
Hao Sun 4bfa8f6cad * improve UI. 2021-07-30 14:38:39 +08:00
Hao Sun d201e9c65b * allow fullscreen for app page which opened with iframe. 2021-07-29 15:49:10 +08:00
holan20180123 6ce1007028 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-26 13:31:04 +08:00
holan20180123 db9c20ddec * Adjust upgrade tips. 2021-07-26 13:30:56 +08:00
Hao Sun 4d90a115cb * change style of devops item in menu. 2021-07-26 11:32:48 +08:00
Hao Sun e3ca8c84f8 * task #40521, add new theme "blue"(青春蓝). 2021-07-23 17:44:58 +08:00
holan20180123 4c82e0cd9e * Finish task #40505. 2021-07-23 14:00:29 +08:00
reneeteng 495caf1c77 Merge branch 'master' of https://github.com/easysoft/zentaopms 2021-07-23 13:57:53 +08:00
holan20180123 44232d3925 * Finish task #40500. 2021-07-23 11:15:00 +08:00
reneeteng cc0257cf63 * Update lang file. 2021-07-20 10:47:04 +08:00
tianshujie98 690980d60a * Fix an error. 2021-07-13 14:41:02 +08:00
tianshujie98 867452258d * Fix bug. 2021-07-12 15:40:29 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
tianshujie98 7653154b20 * Adjust code. 2021-06-30 10:28:51 +08:00
tianshujie98 e9cbc7b383 * Adjust code. 2021-06-29 15:08:33 +08:00
Hao Sun c898114c7c * bug #13286, fix xxs bug. 2021-06-22 16:51:14 +08:00
wangyidong 3893084999 * adjust for mhtml. 2021-06-08 13:33:34 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
hufangzhou 2c5347622f * Adjust the code. 2021-05-28 11:34:16 +08:00
tianshujie98 2b296ecd42 * Finish task #38375. 2021-05-27 15:34:58 +08:00
Hao Sun 667f3799c2 * bug #12716, fix active wrong menu item when opening action is canceled. 2021-05-24 14:07:46 +08:00
Hao Sun 33a5e6d13e * task #38159, story #25767, alert when leave page with unsaved form. 2021-05-16 16:12:12 +08:00
holan20180123 f83a4e4b41 * Fix bug #12368. 2021-04-27 11:37:39 +08:00
Catouse 532f087884 * improve UI of more apps menu. 2021-04-26 17:53:46 +08:00
holan20180123 9d5d20170f * Fix menu error. 2021-04-25 09:27:21 +08:00
holan20180123 c342f47628 * Fix bug #12210. 2021-04-21 09:21:39 +08:00
Yagami 1bf545170d * Fix user menu highlight. 2021-04-15 14:53:29 +08:00
wangyidong dbd5cef729 * finish task #37534. 2021-04-15 09:43:12 +08:00
leiyong 003fc32680 * Finish task#37389. 2021-04-13 02:56:00 +00:00
Yagami 52511f5e7a * Fix todo calendar hight light. 2021-04-08 17:11:31 +08:00
leiyong 1a8a95c24d * Fix bug#11783. 2021-04-02 14:29:21 +03:00
wangyidong 09cb13310f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 17:52:49 +08:00
leiyong e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
wangyidong 50b77c9dcd * remove hiddenwin in index page. 2021-04-01 16:53:00 +08:00
zhujinyong d966b2e214 * Ajdust openApp logic. 2021-03-31 16:07:11 +08:00
holan20180123 dd2c894dd6 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 10:15:39 +08:00