Commit Graph
673 Commits
Author SHA1 Message Date
xieqiyu 856afd0b76 * Fix bug#16471. 2021-11-21 02:23:33 +08:00
mayue 2b258a7665 * Modify style. 2021-11-19 15:11:07 +08:00
tianshujie 70f8e0d320 * Fix execution and project linked product prompt issues. 2021-11-19 08:44:53 +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
孙广明 8f2c87cae1 Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'
# Conflicts:
#   module/execution/view/create.html.php
2021-11-18 06:03:46 +00: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
tianshujie 7044ccbf2c * Modify logic. 2021-11-18 11:17:22 +08:00
tianshujie e8f77ac632 * Modify logic. 2021-11-18 11:10:02 +08:00
tianshujie 4e02c5ba53 * Fix product issues during replication sprint. 2021-11-18 10:48:31 +08:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
tianshujie 69d7441ce3 * Linked product issues when modifying replication sprint. 2021-11-18 10:12:45 +08:00
李玉春 9c4b07e8b7 Merge branch 'sprint/170' into 'sprint/173_lizhiqiang__16336'
# Conflicts:
#   module/execution/view/bug.html.php
2021-11-18 01:04:00 +00: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
lizhiqiang 791ea627de * Finish bug #16336. 2021-11-17 17:57:04 +08:00
李玉春 508539166d Merge branch 'sprint/170_mayue_16257' into 'sprint/170'
* Fix bug #16257.

See merge request easycorp/zentaopms!493
2021-11-17 09:45:57 +00:00
mayue bf7e878ae4 * Fix bug #16257. 2021-11-17 17:44:22 +08:00
mayue 9979876a0d * Fix bug #16257. 2021-11-17 16:54:16 +08:00
zhouxin b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
mayue 2f4ed8f1c0 * Fix bug #16000. 2021-11-17 15:00:40 +08:00
mayue a2f3100ea5 * Modify branch. 2021-11-15 16:18:26 +08:00
李玉春 a8523d317a Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.

See merge request easycorp/zentaopms!437
2021-11-15 05:05:00 +00: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
songchenxuan 2dbfab7e5a * Fix bug #16043. 2021-11-12 10:29:30 +08:00
tianshujie e349618c4c * Fix bug #16205. 2021-11-12 08:48:52 +08:00
tianshujie 382e3103d0 * Fix bug #16205. 2021-11-12 08:46:19 +08:00
tianshujie 34ad92ab78 * Modify the judgment logic. 2021-11-11 17:50:47 +08:00
王怡栋 1f8bb88e8c * revert ajaxSetUnfoldID. 2021-11-11 16:19:56 +08:00
tianshujie 4940500fe1 * Fix the trunk display problem when execution manage products. 2021-11-11 13:59:52 +08:00
tianshujie 5582354037 * When repairing the project and execution linked products, the branch judgment problem. 2021-11-11 09:42:37 +08:00
tianshujie 11887cffe9 * The product is selected by default when modifying the branch. 2021-11-11 09:00:05 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
tianshujie c29ea5077a * Finish task #43901. 2021-11-10 13:10:11 +08:00
李玉春 fe315477ea Update manageproducts.html.php 2021-11-10 02:53:53 +00:00
tianshujie 0ac42fe56b * Modify variable value. 2021-11-10 10:49:53 +08:00
tianshujie fb7f493036 * Modify the error code. 2021-11-10 09:58:49 +08:00
tianshujie 8174540183 * Remove useless code. 2021-11-10 09:22:08 +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 8c731d67fe Finish task #43918. 2021-11-09 13:14:05 +08:00
root c0169fd823 * Finish task #43918. 2021-11-09 11:27:30 +08:00