Commit Graph
24730 Commits
Author SHA1 Message Date
qiyu-xie 910eb61cd4 * Fix bug#12748. 2021-05-31 16:04:26 +08:00
wangyidong 18fd0d937c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 14:52:15 +08:00
wangyidong 8fad1f8c06 * change for edit project field. 2021-05-31 14:51:43 +08:00
qiyu-xie 00fec1d638 * Fix bug#12748. 2021-05-31 14:12:25 +08:00
tianshujie98 c959629020 * Fix todo transfer bug issue. 2021-05-31 13:58:07 +08:00
holan20180123 2ba2125664 * Fix bug #12839. 2021-05-31 13:21:43 +08:00
wangyidong e327e6feb5 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 13:09:17 +08:00
wangyidong 3a18190245 * fix for get projects for gitlib.com. 2021-05-31 13:08:31 +08:00
leiyong 49cd722bd3 * Fix bug. 2021-05-31 12:27:16 +08:00
tianshujie98 d3d3456ad3 * Add the story identification of the required review. 2021-05-31 11:23:02 +08:00
tianshujie98 ad26f52a97 * Fix opportunity editing issue. 2021-05-31 11:12:46 +08:00
tianshujie98 124d7c70d8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 11:11:02 +08:00
hufangzhou 23dd18af7e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 11:03:30 +08:00
hufangzhou 31b10ab2ac * Fix a bug. 2021-05-31 11:03:26 +08:00
tianshujie98 d51d13af6a * Fix the value range of projects when todo transfer tasks. 2021-05-31 10:59:03 +08:00
tianshujie98 1d0d901747 * Add empty. 2021-05-31 10:35:02 +08:00
hufangzhou f2a4de0a42 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-31 10:22:13 +08:00
hufangzhou 2384e37658 Adjust the code. 2021-05-31 10:22:08 +08:00
tianshujie98 f48ce1d43b * Add function to get team member pairs of project members. 2021-05-31 10:17:55 +08:00
wangyidong daf84879db * adjust for sync gitlab. 2021-05-31 10:07:20 +08:00
wangyidong cab32bab5b * fix bug for #12853. 2021-05-28 15:55:21 +08:00
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