Commit Graph

24825 Commits

Author SHA1 Message Date
tianshujie98
3d91cef47c * Finish task #38919. 2021-06-04 15:47:43 +08:00
tianshujie98
954b1d5a35 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 15:46:12 +08:00
tianshujie98
10d2d37ee6 * Finish task #38918. 2021-06-04 15:45:59 +08:00
wangyidong
1a11405e6b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 15:36:42 +08:00
wangyidong
e858eb9d98 * fix bug. 2021-06-04 15:36:26 +08:00
tianshujie98
635515190f * Finish task #38878. 2021-06-04 15:24:53 +08:00
tianshujie98
fd979e7e32 * Finish task #38888. 2021-06-04 15:20:59 +08:00
tianshujie98
849d43b4b2 * Fix action bug. 2021-06-04 15:06:02 +08:00
qiyu-xie
dbb2d5f650 * Adjust code. 2021-06-04 14:41:08 +08:00
tianshujie98
266c354102 * Finish task #38877. 2021-06-04 14:26:49 +08:00
tianshujie98
0eef651b56 * finish task #38880. 2021-06-04 13:57:20 +08:00
tianshujie98
c587c18b46 * Finish task #38889. 2021-06-04 13:18:23 +08:00
tianshujie98
bebed24d04 * Finish task #38894. 2021-06-04 12:49:40 +08:00
wangyidong
9d1876b009 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 12:11:22 +08:00
wangyidong
f6594c7022 * adjust version and adjust test. 2021-06-04 12:10:48 +08:00
tianshujie98
de0257819b * Adjust code. 2021-06-04 12:02:47 +08:00
tianshujie98
3cc93bd722 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 08:56:35 +08:00
tianshujie98
b157d011e8 * Fix bug #13022. 2021-06-04 08:56:21 +08:00
holan20180123
5389de2709 * Adjust code for review. 2021-06-04 08:51:45 +08:00
hufangzhou
fdb263a4f2 * Adjust the code. 2021-06-04 08:03:02 +08:00
tianshujie98
761c0c5f35 * Fix bug. 2021-06-03 10:28:11 +08:00
tianshujie98
fe1c5ad01a * Fix todo problems. 2021-06-03 10:14:07 +08:00
wangyidong
742984af62 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-03 10:08:55 +08:00
wangyidong
8919772d94 * finish task #38651. 2021-06-03 10:08:21 +08:00
qiyu-xie
ec041a4168 * Add getById method testcase of trainplan module. 2021-06-03 10:00:48 +08:00
wangyidong
101054020b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-03 09:47:34 +08:00
wangyidong
4696a6dceb * code for xhtml. 2021-06-03 09:47:06 +08:00
hufangzhou
2ad0a9319a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-03 09:29:28 +08:00
hufangzhou
0537771b0f * Add getbyid method testcase of gapanalysis module. 2021-06-03 09:29:24 +08:00
holan20180123
f8ab352864 * Add unit testcase of branch module. 2021-06-03 09:07:37 +08:00
hufangzhou
cf6dfd8a3f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-02 17:31:20 +08:00
hufangzhou
f4947017f4 * Adjust the code. 2021-06-02 17:31:15 +08:00
qiyu-xie
abb3131648 * Fix bug#12967. 2021-06-02 16:10:55 +08:00
qiyu-xie
1280fab624 * Fix bug#12966,#12965. 2021-06-02 15:40:26 +08:00
qiyu-xie
581d35e006 * Fix bug#12123. 2021-06-02 13:25:55 +08:00
hufangzhou
82014234d4 * Adjust the status and stage of story when batch create in project or execution module. 2021-06-02 13:19:21 +08:00
hufangzhou
e18e065a59 * Fix a bug. 2021-06-02 11:40:57 +08:00
hufangzhou
c21ce93554 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-02 10:47:31 +08:00
hufangzhou
d7d324f78f * Fix bug #12840. 2021-06-02 10:47:26 +08:00
tianshujie98
2dc084e911 * Modify the required item prompt language item. 2021-06-02 10:25:21 +08:00
tianshujie98
246f8c7232 * Edit required language. 2021-06-02 09:41:41 +08:00
tianshujie98
7179382ac5 * Fix navigation highlight problem. 2021-06-02 09:29:51 +08:00
tianshujie98
50e4f6611e * Fix bug #12955. 2021-06-02 09:24:18 +08:00
tianshujie98
246332c661 * Fix an error. 2021-06-02 09:17:41 +08:00
tianshujie98
f335d5747d * Fix the problem of project admin group. 2021-06-02 09:02:51 +08:00
tianshujie98
984351e067 * Fix bug #12948. 2021-06-01 17:22:24 +08:00
tianshujie98
0bff58d014 * Fix bug #12674. 2021-06-01 17:08:18 +08:00
tianshujie98
3cb954f0cb * Fix start problem. 2021-06-01 16:48:57 +08:00
tianshujie98
1d8647bb51 * Fix bug #12947. 2021-06-01 16:44:29 +08:00
hufangzhou
f0f36ee496 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 16:16:12 +08:00