Commit Graph
221 Commits
Author SHA1 Message Date
tianshujie ec5ca42e49 * Fix bug #16577. 2021-11-23 15:01:51 +08:00
hufangzhou c0d4264148 * Fix bug #16564. 2021-11-23 10:10:14 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
李玉春 8e7c536a8d Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
Modify the branch scope when creating and editing bugs.

See merge request easycorp/zentaopms!560
2021-11-22 01:00:45 +00:00
tianshujie 0408f2f8ce * Modify the execution scope of creating and editing bugs. 2021-11-21 10:46:35 +08:00
xieqiyu 856afd0b76 * Fix bug#16471. 2021-11-21 02:23:33 +08:00
李玉春 36e39591be Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503

See merge request easycorp/zentaopms!516
2021-11-18 09:19:19 +00:00
李玉春 15967171de Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.

See merge request easycorp/zentaopms!513
2021-11-18 06:33:49 +00:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
lizhiqiang e5653c5dd7 *Finish Bug #16371. 2021-11-18 14:21:34 +08:00
zhouxin b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
李玉春 e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
wangjianhua 6aa55f5011 * Finish task 44503. Add branch name before version name. 2021-11-18 03:52:39 +00:00
xieqiyu a9c2c09338 * Optimize the code. 2021-11-18 11:41:17 +08:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
xieqiyu 84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
xieqiyu 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
mayue a2f3100ea5 * Modify branch. 2021-11-15 16:18:26 +08:00
zhouxin b5ab5a03d7 Finish task #43916. 2021-11-15 10:07:01 +08:00
zhouxin e57d1d1cc7 Finish task #43916. 2021-11-12 14:06:44 +08:00
tianshujie 35504f6745 * Combine the acquisition branch into a function. 2021-11-10 09:17:28 +08:00
tianshujie fe99d1fafb * Finish task #43901. 2021-11-09 19:56:48 +08:00
李玉春 98f519fe31 Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
#   module/branch/model.php
#   module/story/model.php
2021-11-09 07:53:17 +00:00
李玉春 d75156dd74 Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.

See merge request easycorp/zentaopms!361
2021-11-09 06:00:23 +00:00
root c0169fd823 * Finish task #43918. 2021-11-09 11:27:30 +08:00
root 67635b0317 * Finish task #43918. 2021-11-09 10:39:02 +08:00
root c55a455a16 * Finish task #43918. 2021-11-09 10:37:48 +08:00
tianshujie eedcc1aed5 * Modify code logic. 2021-11-09 10:28:16 +08:00
tianshujie 3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
zhouxin 92fb767ff9 Finish task #43916. 2021-11-08 14:34:44 +08:00
root d6361de047 * Finish task 43917 2021-11-04 17:38:34 +08:00
root 24c8e0948d * Finish task 43917 2021-11-04 17:24:52 +08:00
tianshujie ca70d43ca0 * Fix the task pri language item of the max version. 2021-11-03 13:09:20 +08:00
xieqiyu 92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
hufangzhou a80eca0ab5 * Fix bug #15477. 2021-10-12 15:42:58 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇 ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.

See merge request easycorp/zentaopms!41
2021-10-09 01:32:30 +00:00
王怡栋 a14fc4e7f9 * finish task #42848. 2021-09-30 15:49:24 +08:00
zenggang f139f00e61 * Task 42862,previously committed to the master branch, now resubmit to the 165 branch 2021-09-30 11:19:05 +08:00
zenggang 6798a9cb46 * Fix bug#15280 2021-09-26 17:10:11 +08:00
王怡栋 77d501887d * fix bug for save execution session. 2021-09-15 14:34:13 +08:00
tianshujie c473a76d01 * Fix bug #15136. 2021-09-14 08:56:22 +08:00
tianshujie 8219bc43d3 * Fix bug #14966. 2021-09-13 09:52:24 +08:00
王怡栋 2fadc69fa3 * fix bug #15083,15079. 2021-09-10 11:34:10 +08:00
tianshujie 9e8583ee1e * Ignore admin when judging permissions. 2021-09-09 11:06:58 +08:00
tianshujie 2a86208f65 * Fix bug #14957. 2021-09-09 10:51:06 +08:00
tianshujie 1609837ff7 * Fix bug #14982. 2021-09-09 09:12:42 +08:00
tianshujie c88d7f16e2 * Finish task #42385. 2021-09-09 08:56:01 +08:00
liyuchun 69c1b44157 * Fix bug #15061. 2021-09-08 16:53:55 +08:00