孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
zhengrunyu
|
46a9f157b1
|
*Finish task #45148.
|
2021-11-30 10:56:09 +08:00 |
|
zhengrunyu
|
e78c876216
|
*Finish task #45148.
|
2021-11-30 09:22:04 +08:00 |
|
李玉春
|
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 |
|
tianshujie
|
96a46aa2ca
|
* Modify the code.
|
2021-11-29 14:16:10 +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 |
|
zhengrunyu
|
9dac5358e3
|
*Finish task #45148.
|
2021-11-26 15:20:17 +08:00 |
|
zhengrunyu
|
2f41e85fda
|
*Finish task #sprint/168_zhengrunyu_45148.
|
2021-11-26 08:30:55 +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 |
|
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
|
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 |
|
tanghucheng
|
939023de6d
|
* Finish task #44023 for max.
|
2021-11-15 10:19:35 +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 |
|