Commit Graph

128 Commits

Author SHA1 Message Date
leiyong
22a353533e * Fix bug#11206. 2021-04-02 06:14:21 +03:00
Yagami
48706314d7 * Fix bug. 2021-04-01 16:28:28 +08:00
tianshujie98
e1b120bb0a * Fix bug. 2021-03-31 08:20:50 +08:00
holan20180123
f5a667ce24 * Fix bug #11049. 2021-03-29 11:29:45 +08:00
holan20180123
a5827af318 * Finish task #36473. 2021-03-12 09:35:14 +08:00
wangyidong
cc64eafe95 * Adjust code for upgrade module. 2021-03-05 13:05:19 +08:00
holan20180123
b5a16df369 * Code for task #36028. 2021-03-03 11:09:34 +08:00
holan20180123
c363ab1741 * Finish task #36396. 2021-03-02 08:52:14 +08:00
qiyu-xie
29abbb19ab * The merged products will not be displayed without sprints. 2021-02-25 14:28:44 +08:00
tianshujie98
be7b0343cf * Fix bug. 2021-02-25 10:49:58 +08:00
tianshujie98
1814445397 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-25 10:19:26 +08:00
tianshujie98
28573a0b2a * Update sprints history. 2021-02-25 10:19:11 +08:00
qiyu-xie
f534192438 * Process program when merging product lines. 2021-02-24 17:04:26 +08:00
tianshujie98
4c4d11feb2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-24 16:19:22 +08:00
tianshujie98
3372be4081 * Finish task #36010. 2021-02-24 16:18:34 +08:00
holan20180123
1bdb3c024d * Add default line when merge data. 2021-02-24 16:11:28 +08:00
tianshujie98
f724db20e0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-24 15:37:20 +08:00
tianshujie98
1ab1717597 * Finish task #36010. 2021-02-24 15:36:40 +08:00
qiyu-xie
0f23c8706d * Fix the program name when selected product already has program. 2021-02-24 15:04:24 +08:00
tianshujie98
0ab1fea6b1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-24 14:12:54 +08:00
tianshujie98
0bc35e1f0f * Finish task #36004. 2021-02-24 14:12:27 +08:00
holan20180123
eaa13b4280 * Finish task #36041. 2021-02-24 13:40:18 +08:00
holan20180123
f2606bb1e0 * Code for task #36041. 2021-02-24 11:32:01 +08:00
wangyidong
535fb750b3 * code for change after15mode to mode. 2021-02-23 09:12:48 +08:00
wangyidong
2cde205721 * finish task #36013. 2021-02-22 16:18:06 +08:00
hufangzhou
183ee6bbc8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-22 14:03:20 +08:00
hufangzhou
3ade008ce6 * Finish task#36071. 2021-02-22 13:59:12 +08:00
wangyidong
6787d19ac7 * finish task #36010. 2021-02-22 13:04:18 +08:00
Yagami
b668ce1970 * Finish task #36028,#36068,#36072. 2021-02-22 11:05:30 +08:00
wangyidong
98cea3e643 * finish task #35998. 2021-02-22 10:55:54 +08:00
qiyu-xie
83c4669281 * Finish task#36086. 2021-02-20 17:00:25 +08:00
holan20180123
6c7d50e989 * Finish task #36085. 2021-02-20 10:55:24 +08:00
holan20180123
05a30dd9aa * Finish task #36029,#36084. 2021-02-20 10:45:43 +08:00
wangyidong
6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
sgm0422
750e6ea3fc * Fix upgrade logic. 2021-02-01 15:57:37 +08:00
sgm0422
105cef004e * Fix detail. 2021-01-28 21:42:43 +08:00
Yagami
ac77fa3a15 * Merge code. 2021-01-27 15:20:27 +08:00
wangyidong
b12d189779 * Merge from github. 2021-01-26 13:35:21 +08:00
Yagami
aeee54b1f3 * Add upgrade repo logic. 2021-01-08 13:31:05 +08:00
Yagami
0ef98d9653 * Add title. 2020-12-18 16:57:25 +08:00
leiyong
ea0cff9182 * Modify upgrade model.php logic. 2020-11-20 15:29:11 +08:00
leiyong
4f4f6cbf9d * Adjust upgrade module. 2020-11-20 14:38:28 +08:00
leiyong
55976aeb26 * Query the program and project logic when upgrading. 2020-11-19 17:32:08 +08:00
leiyong
ef4db941b7 * Finish task#8301. 2020-11-17 14:03:10 +08:00
Yagami
4a5b1437c1 * Fix detials. 2020-11-03 14:49:58 +08:00
Yagami
efeea142bc * Add video. 2020-11-03 13:33:30 +08:00
Yagami
18131e47ef * Fix bugs. 2020-11-02 10:09:40 +08:00
Yagami
10b4182206 * Fix upgrade error. 2020-10-30 13:55:45 +08:00
Yagami
04c6164681 * Fix bug. 2020-10-30 10:47:16 +08:00
Yagami
d1f2919365 * Fix details. 2020-10-30 10:30:38 +08:00