 孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
tianshujie
|
508d7d78bf
|
* Fix bug #16939 and modify the scope of the plan when editing bugs.
|
2021-11-30 14:14:14 +08:00 |
|
|
孙广明
|
801c9ce3d0
|
Merge branch 'sprint/169' into sprint/168
|
2021-11-30 13:47:05 +08:00 |
|
|
孙广明
|
e752382609
|
* Remove unused code.
|
2021-11-30 11:30:50 +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 |
|
|
chaideqing
|
74f7a95902
|
* optimize zentao buglist/storylist/tasklist show when in xuanxuan card
|
2021-11-29 14:55:14 +08: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 |
|
|
liumengyi
|
d374d467cc
|
* Fix bug #16805.
|
2021-11-26 14:31:33 +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 |
|
|
孙广明
|
00b34e5e1f
|
Merge branch 'sprint/29_zhouxin_45099' into 'sprint/168'
Finish task #45099.
See merge request easycorp/zentaopms!619
|
2021-11-26 01:06:42 +00:00 |
|
|
tianshujie
|
774ee347f5
|
* Translate modified code.
|
2021-11-25 17:57:24 +08:00 |
|
|
liumengyi
|
4c090eefe2
|
* Finish task #45155.
|
2021-11-25 15:58:10 +08:00 |
|
|
zhouxin
|
cd9290d80b
|
Finish task #45099.
|
2021-11-25 07:26:24 +00:00 |
|
|
liumengyi
|
7fa6f3ef5c
|
* Finish task #45155:.
|
2021-11-25 13:53:13 +08:00 |
|
|
tianshujie
|
f342b1a219
|
* Modify search stories and bug issues.
|
2021-11-25 13:29:04 +08:00 |
|
|
liumengyi
|
bcf7283bc7
|
* Finish task #45155.
|
2021-11-25 13:28:45 +08:00 |
|
|
tianshujie
|
3816d9a775
|
* Modify the scope of linked stories and bugs in the plan.
|
2021-11-25 13:16:20 +08:00 |
|
|
chaideqing
|
45556985f7
|
* refactor ifelse code
|
2021-11-24 11:22:07 +08:00 |
|
|
chaideqing
|
70677f0673
|
modify zentao bug/task/story card page's srollbar and actionbar
|
2021-11-24 10:50:51 +08:00 |
|
|
王怡栋
|
74a41448dc
|
* add lang for mobile api.
|
2021-11-23 09:35:16 +08:00 |
|
|
hufangzhou
|
6d03387d4b
|
* Add the new version.
|
2021-11-22 16:48:28 +08:00 |
|
|
王怡栋
|
6b32de5910
|
Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* fix scroll bar css invalid after merge
See merge request easycorp/zentaopms!582
|
2021-11-22 08:15:47 +00:00 |
|
|
liyuchun
|
5dc23ad4f2
|
* Adjust create bug view.
|
2021-11-22 14:48:33 +08:00 |
|
|
孙广明
|
d3c2f014fe
|
Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.
See merge request easycorp/zentaopms!584
|
2021-11-22 06:41:02 +00:00 |
|
|
zhengrunyu
|
1a9175f485
|
*Finish task #16529.
|
2021-11-22 14:36:56 +08:00 |
|
|
tianshujie
|
8f1a017225
|
* Modify the code.
|
2021-11-22 14:14:17 +08:00 |
|
|
tianshujie
|
4058eae297
|
* Change parameters.
|
2021-11-22 13:52:19 +08:00 |
|
|
qixinzhi
|
f5d89fee3d
|
* fix scroll bar css invalid after merge
|
2021-11-22 13:51:27 +08:00 |
|
|
tianshujie
|
69842996d6
|
* Fix bug #16533.
|
2021-11-22 13:45:44 +08:00 |
|
|
liyuchun
|
da47c729d9
|
* Adjust execution button name.
|
2021-11-22 13:36:52 +08:00 |
|
|
李玉春
|
d272f1e392
|
Merge branch 'sprint/173_xieqiyu_16479' into 'sprint/170'
* Fix bug#16479.
See merge request easycorp/zentaopms!564
|
2021-11-22 05:04:14 +00:00 |
|
|
李玉春
|
2e37a3b27c
|
Merge branch 'sprint/170_songchenxuan_16508' into 'sprint/170'
Sprint/170 songchenxuan 16508
See merge request easycorp/zentaopms!569
|
2021-11-22 03:51:26 +00:00 |
|
|
tianshujie
|
a1c59d2ca0
|
* Fix bug #16528.
|
2021-11-22 11:23:09 +08:00 |
|
|
xieqiyu
|
13ae5b4d9a
|
* Code for task#44503.
|
2021-11-22 11:16:48 +08:00 |
|
|
songchenxuan
|
318be4d78b
|
* Fix bug 16508
|
2021-11-22 11:00:07 +08:00 |
|
|
songchenxuan
|
ab5c52c902
|
* Fix bug 16508
|
2021-11-22 10:59:11 +08:00 |
|
|
liumengyi
|
3836941efd
|
* Fix Bug #16505.
|
2021-11-22 10:26:45 +08:00 |
|
|
孙广明
|
11f2c39369
|
Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168'
Sprint/172 liyuchun bug
See merge request easycorp/zentaopms!561
|
2021-11-22 01:13:44 +00:00 |
|
|
liyuchun
|
f943413c6d
|
* Adjust style.
|
2021-11-22 09:12:08 +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
|
46ac0a5e88
|
* Modify the code.
|
2021-11-22 08:59:40 +08:00 |
|
|
文睿 李
|
36c7fc5a94
|
Merge branch 'sprint/168' into 'sprint/168_chaideqing_44635'
# Conflicts:
# module/bug/css/x.view.css
|
2021-11-22 00:23:13 +00:00 |
|