Commit Graph

635 Commits

Author SHA1 Message Date
songchenxuan
3f132af95b *Finish task #45539. 2021-12-07 14:51:23 +08:00
songchenxuan
dde57a36cc *Finish task #45539. 2021-12-07 14:03:20 +08:00
songchenxuan
05ea668852 *Finish task #45539. 2021-12-07 10:34:56 +08:00
tanghucheng
be4c1f3041 * Merge programplan into stage. 2021-12-03 14:31:47 +08:00
tianshujie
a5598ddf64 * Fix bug #16897. 2021-12-02 10:04:02 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春
adb7b76f3c Merge branch 'sprint/174_songchenxuan_45049' into 'master'
Sprint/174 songchenxuan 45049

See merge request easycorp/zentaopms!643
2021-11-30 03:19:07 +00:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
tianshujie
7e225ce3f7 * Finish task #45081,45012. 2021-11-30 09:18:05 +08:00
songchenxuan
d19f60d9df * Finish task 45049. 2021-11-30 08:57:36 +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
孙广明
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
songchenxuan
45040819ae * Finish task 45049. 2021-11-29 14:00:06 +08:00
xieqiyu
763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
songchenxuan
35206b32a8 * Finish task #45049. 2021-11-26 14:00:01 +08:00
songchenxuan
ee53bd1ad2 * Finish task #45049. 2021-11-26 13:33:35 +08:00
tianshujie
774ee347f5 * Translate modified code. 2021-11-25 17:57:24 +08:00
tianshujie
f342b1a219 * Modify search stories and bug issues. 2021-11-25 13:29:04 +08:00
tianshujie
3816d9a775 * Modify the scope of linked stories and bugs in the plan. 2021-11-25 13:16:20 +08:00
xieqiyu
13ae5b4d9a * Code for task#44503. 2021-11-22 11:16:48 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +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
wangjianhua
e011da6fd2 - Finish task 44503. Remove usless variable. 2021-11-18 09:02:45 +00:00
tianshujie
9c6c4dfc9c * Fix bug #16429. 2021-11-18 16:30:45 +08:00
tianshujie
662a1960f5 * Fix bug #16431. 2021-11-18 15:35:54 +08:00
孙广明
6085ad3089 Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496

See merge request easycorp/zentaopms!511
2021-11-18 06:59:45 +00:00
tianshujie
5e473398be * Batch modify the judgment of the branch to which the bug belongs. 2021-11-18 13:49:04 +08:00
王怡栋
3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
mayue
c9baf6fddd * Fix bug #16332. 2021-11-18 10:04:16 +08:00
王怡栋
fc50ece3e2 * code for task #44319. 2021-11-18 08:56:53 +08:00
李玉春
851430dc48 Merge branch 'sprint/168_liumengyi_44369' into 'sprint/168'
* Finish task #44369.

See merge request easycorp/zentaopms!486
2021-11-17 07:21:54 +00:00
wangjianhua
f0ee430add * Insert branch name into drop list of bug search form. 2021-11-17 07:18:27 +00:00
liumengyi
30204c1568 * Finish task #44369. 2021-11-17 14:39:37 +08:00
mayue
0dd5dd1955 * Finish task #44493,44494. 2021-11-17 10:27:02 +08:00
mayue
8b8c4fe180 * Finish task #44493,44494. 2021-11-17 09:30:34 +08:00
mayue
102561019d * Finish task #44493,44494. 2021-11-16 18:20:35 +08:00
liyuchun
b5cfba165e * Finish task #44367. 2021-11-16 17:25:30 +08:00
hufangzhou
7d9793eaa3 * Modify the get by search. 2021-11-11 11:29:54 +08:00
hufangzhou
8e9f8b860e * Fix bug #16092. 2021-11-11 11:07:23 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
孙广明
5812a1e510 Merge branch 'sprint/170_tianshujie_43903' into 'sprint/170'
* Finish task  #43903

See merge request easycorp/zentaopms!319
2021-11-05 03:22:17 +00:00
tianshujie
6cb70ab01d * Finish task #43903. 2021-11-05 08:59:55 +08:00
dingna
708957c6b2 * Adjust code for task#43913. 2021-11-04 17:37:26 +08:00
dingna
ccabbde1e0 * Adjust code for task#43913. 2021-11-04 16:21:59 +08:00
dingna
4f30e04c95 * Adjust code for task#43913. 2021-11-04 16:18:02 +08:00
dingna
966abc3d55 * Adjust code for task#43913. 2021-11-04 16:06:08 +08:00
dingna
421cb2dfa8 * Adjust code for task#43913. 2021-11-04 14:48:51 +08:00
dingna
0afeb5620a * Adjust code for task#43913. 2021-11-04 14:45:40 +08:00