Commit Graph
24709 Commits
Author SHA1 Message Date
hufangzhou 3bc71badd7 * Adjust the code. 2021-05-28 15:43:40 +08:00
wangyidong f5c1986d8b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-28 13:22:51 +08:00
wangyidong a09aab24f8 * fix for sync gitlab. 2021-05-28 13:22:28 +08:00
hufangzhou dabb26abbf Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-28 11:34:21 +08:00
hufangzhou 2c5347622f * Adjust the code. 2021-05-28 11:34:16 +08:00
tianshujie98 7ac9d6450d * Record return session. 2021-05-28 11:30:57 +08:00
hufangzhou 5553c101e6 * Finish task #38393. 2021-05-28 10:21:46 +08:00
hufangzhou 2670d1840e * Add the trainplanList session. 2021-05-28 09:16:52 +08:00
tianshujie98 129448e74b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-28 08:57:55 +08:00
tianshujie98 bcc1dc1484 * Fix dynamic issue. 2021-05-28 08:57:38 +08:00
hufangzhou 1441f64b63 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-27 17:50:49 +08:00
hufangzhou ac6cabfeca * Add the lang items. 2021-05-27 17:50:45 +08:00
tianshujie98 3d1e94daa1 * Finish task #38381. 2021-05-27 17:37:34 +08:00
tianshujie98 2b296ecd42 * Finish task #38375. 2021-05-27 15:34:58 +08:00
Hao Sun 3e97c2111f * update zenicon, add new icon "icon-summary"(培训总结). 2021-05-27 15:32:43 +08:00
wangyidong bf365b9188 * adjust for gitlab branch. 2021-05-27 14:16:44 +08:00
wangyidong 49febd6e96 * fix bug for show pager. 2021-05-26 17:29:33 +08:00
tianshujie98 4e87dc7970 * Add actions of opportunity. 2021-05-26 11:46:10 +08:00
hufangzhou adc77673d9 * Fix bug #12786. 2021-05-25 08:58:40 +08:00
hufangzhou 0751031d0a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 17:02:48 +08:00
hufangzhou 2d39d6e69d * Fix bug #12789, bug #12788. 2021-05-24 17:02:41 +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
hufangzhou 97d582a859 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 13:06:49 +08:00
hufangzhou d2688a7eab * Fix bug #12784, bug #12783. 2021-05-24 13:06:44 +08:00
tianshujie98 cc475e4740 * Modify English language file. 2021-05-24 12:08:41 +08:00
hufangzhou 16ffbd5b44 * Fix bug #12782. 2021-05-24 12:03:53 +08:00
hufangzhou 1c7573cbef * Fix bug #12780. 2021-05-24 11:36:45 +08:00
hufangzhou b978d2967c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 11:10:43 +08:00
hufangzhou 9376551b52 * Do not allow remove the reviewer who has been reviewed when edit the story. 2021-05-24 11:10:38 +08:00
tianshujie98 6048f6a0d0 * Modify bug query conditions. 2021-05-24 11:09:05 +08:00
Hao Sun a8608cffc2 * bug #12758, skip to watch form changes in advnace table. 2021-05-24 10:12:53 +08:00
Hao Sun fc7f7f102d * bug #12708, improve UI of tips for unsaved forms. 2021-05-24 09:59:45 +08:00
tianshujie98 076f1fca1d * Fix bug #12749. 2021-05-24 09:41:56 +08:00
hufangzhou 772a358c46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-24 09:30:18 +08:00
hufangzhou e9eb91aebe * Adjust the code. 2021-05-24 09:30:14 +08:00
Hao Sun 3e44ff7a49 * bug #12704, fix tips of unsaved form for lang 'zh-cn'. 2021-05-24 09:27:34 +08:00
Hao Sun 9d67ef41aa * bug #12715, fix alert for unsaved form not work as expected. 2021-05-24 09:23:51 +08:00
tianshujie98 d55163f464 * Add empty judgment. 2021-05-24 08:56:32 +08:00
tianshujie98 6c47912596 * Fix bug #12755. 2021-05-24 08:56:11 +08:00
hufangzhou d4d96d6478 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 17:23:30 +08:00
hufangzhou f477c9f4f7 * Fix bug #12785. 2021-05-21 17:23:24 +08:00
wangyidong f79dec9b8a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 16:59:34 +08:00
wangyidong 5206f44c1e * adjust for upgrade. 2021-05-21 16:59:19 +08:00
hufangzhou 265d38cf7e * Fix a bug. 2021-05-21 16:16:09 +08:00
hufangzhou ab8a03d6d4 * Fix an error. 2021-05-21 16:00:06 +08:00
hufangzhou 2e81e60f55 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 15:44:00 +08:00
hufangzhou b221f21a42 * Fix bug #12774. 2021-05-21 15:43:56 +08:00
tianshujie98 cbe619e34c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 15:21:50 +08:00
tianshujie98 8dcfa8f189 * Add English item. 2021-05-21 15:21:31 +08:00
hufangzhou 01ce722fbe Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-21 14:14:31 +08:00