李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
tianshujie
|
adb2c12935
|
* Modify the code.
|
2021-11-29 15:54:48 +08:00 |
|
孙广明
|
5ad303eca9
|
Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080
See merge request easycorp/zentaopms!644
|
2021-11-29 06:58:17 +00:00 |
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +08:00 |
|
xieqiyu
|
763ae6ea87
|
* Code for task#45082.
|
2021-11-28 19:54:47 +08:00 |
|
tianshujie
|
582f0e036d
|
* Finish task #45043.
|
2021-11-27 18:14:41 +08:00 |
|
tianshujie
|
3bddd21087
|
* Finish task #45083.
|
2021-11-27 17:58:52 +08:00 |
|
tianshujie
|
f4d1a727a7
|
* Finish task #45084,44994,44993.
|
2021-11-27 17:41:42 +08:00 |
|
tianshujie
|
066db150a4
|
* Solve the problem of plan creation and execution error.
|
2021-11-27 09:52:47 +08:00 |
|
王怡栋
|
c15bf759b9
|
* code for task #44937.
|
2021-11-26 10:40:54 +08:00 |
|
朱金勇
|
293a375ec8
|
Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.
See merge request easycorp/zentaopms!616
|
2021-11-25 06:45:58 +00:00 |
|
mayue
|
1cf28e1120
|
* Fix bug #16605.
|
2021-11-25 13:20:54 +08:00 |
|
王怡栋
|
385cb41a0e
|
* code for task #44938.
|
2021-11-25 11:35:46 +08:00 |
|
mayue
|
c2c13a9079
|
* Fix bug #16605.
|
2021-11-25 09:53:49 +08:00 |
|
mayue
|
c40360d556
|
* Fix bug #16605.
|
2021-11-25 09:43:34 +08:00 |
|
王怡栋
|
d9ee0bfbf7
|
Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
# module/mr/model.php
|
2021-11-25 00:32:52 +00:00 |
|
tianshujie
|
179e766478
|
* Modify function name.
|
2021-11-24 16:45:08 +08:00 |
|
zhouxin
|
2b3df26fd8
|
Fix bug 16564.
|
2021-11-23 18:47:56 +08:00 |
|
tianshujie
|
33e557cd18
|
* Fix bug #16577.
|
2021-11-23 15:07:07 +08:00 |
|
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 |
|
王怡栋
|
74a41448dc
|
* add lang for mobile api.
|
2021-11-23 09:35:16 +08:00 |
|
王怡栋
|
90a913ca4b
|
Merge branch 'sprint/170'
|
2021-11-22 16:59:40 +08:00 |
|
hufangzhou
|
6d03387d4b
|
* Add the new version.
|
2021-11-22 16:48:28 +08:00 |
|
tianshujie
|
7802bc6a47
|
* Fix bug #16541.
|
2021-11-22 16:01:31 +08:00 |
|
zhengrunyu
|
a6db2057d9
|
*Finish task #16521.
|
2021-11-22 11:12:15 +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 |
|
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 |
|