Commit Graph

571 Commits

Author SHA1 Message Date
liumengyi
76b3f952a0 * Fix issue #673. 2022-06-13 10:02:33 +08:00
王怡栋
a9981b0a33 Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
#   module/execution/control.php
#   module/execution/js/kanban.js
#   module/kanban/control.php
#   module/kanban/model.php
2022-06-10 01:05:39 +00:00
liumengyi
a5d2a87fdf * Finish task #56469. 2022-06-09 17:33:46 +08:00
李玉春
f8581fd2c4 Merge branch 'zentaopms_199' into 'master'
Zentaopms 199

See merge request easycorp/zentaopms!3832
2022-06-09 07:38:52 +00:00
王怡栋
ad0ebf0aa1 Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-06-09 07:24:23 +00:00
liumengyi
63717f4fd0 * Fix bug of task #56454. 2022-06-09 15:18:56 +08:00
tianshujie
74f80b8d71 * Finish task #56469. 2022-06-09 13:24:58 +08:00
leiyong
38a7d7334a * Fix bug#23481,bug#23466. 2022-06-09 03:42:53 +00:00
王怡栋
fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
caoyanyi
55f6cdb651 * Finish task #56548. 2022-06-08 15:53:37 +08:00
liumengyi
5e74d3bd9f * Finish task #56454. 2022-06-08 10:32:01 +08:00
xieqiyu
86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15:01 +08:00
宋辰轩
9ff12274e2 * Fix bug #23291. 2022-06-06 15:00:09 +08:00
孙广明
2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
孙广明
c671cc3186 Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674

See merge request easycorp/zentaopms!3691
2022-06-01 08:57:31 +00:00
zhouxin
bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
tianshujie
7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
tianshujie
b9a37d04a2 * Finish task #55675. 2022-06-01 11:08:51 +08:00
xieqiyu
b041e5c885 * After creating a bug in the execution bug list, you jump to the execution testcase list. 2022-05-31 20:28:13 +08:00
tianshujie
0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
zenggang
764c2bec29 * Fix bug#22897 2022-05-25 08:27:25 +00:00
zenggang
7d5615ffac * Adjust story sort default to desc 2022-05-24 09:10:28 +00:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
李玉春
3c59f5c4a0 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
* Fix bug #22617.

See merge request easycorp/zentaopms!3540
2022-05-20 03:09:22 +00:00
tianshujie
4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
孙广明
97f5dcdc9f Merge branch 'sprint190_zg_bugs' into 'master'
* Fix bug#22554,22673,22555

See merge request easycorp/zentaopms!3508
2022-05-20 01:41:31 +00:00
zhouxudong
ab9f80ecfb * Finish task #54478. 2022-05-19 08:52:19 +00:00
zenggang
de835ecb3e * Fix bug#22555 2022-05-19 08:08:39 +00:00
zhouxin
8a2e6d63cb * Fix bug. 2022-05-19 03:07:55 +00:00
zhouxin
235b04f76e * Finis task #54352. 2022-05-19 02:02:22 +00:00
liumengyi
be5daac0ba * Fix bug #22628. 2022-05-18 15:23:12 +08:00
孙广明
cecff5ddec Merge branch 'sprint/191_liumengyi_54336' into 'master'
Sprint/191 liumengyi 54336

See merge request easycorp/zentaopms!3474
2022-05-18 03:17:58 +00:00
liumengyi
e83da7c524 * Fix bug for task #54336. 2022-05-18 11:15:21 +08:00
wangyidong
e9289b68d5 * adjust for data. 2022-05-18 11:11:11 +08:00
tanghucheng
d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
孙广明
270715e54b Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631

See merge request easycorp/zentaopms!3410
2022-05-17 01:15:01 +00:00
xieqiyu
e1942b98b2 * Show execution deadline at burn in view page. 2022-05-16 11:13:11 +08:00
sunjun
a4f026d786 sprint_sunjun_631 2022-05-16 09:08:47 +08:00
sunjun
e9aab00257 sprint_sunjun_631 2022-05-14 19:39:22 +08:00
sunjun
845c84a1eb *sprint_sunjun_631 2022-05-13 02:53:47 +00:00
xieqiyu
89491d97de * Resolve issue#629. 2022-05-13 03:02:26 +08:00
xieqiyu
914f474592 * Code for task#53666. 2022-05-12 22:58:17 +08:00
王怡栋
5674160b7e Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666

See merge request easycorp/zentaopms!3353
2022-05-12 05:05:25 +00:00
xieqiyu
dab8c1bb1e * Modify review code. 2022-05-12 10:55:50 +08:00
xieqiyu
ffa1ec828d * Code for task#53661. 2022-05-12 10:38:22 +08:00
xieqiyu
1cab87893e * Finish task#53661. 2022-05-12 09:19:49 +08:00
xieqiyu
691de86d4a * Code for task#53661. 2022-05-12 08:15:25 +08:00
xieqiyu
ce7c0afdc1 * Finish task#53666. 2022-05-11 18:24:13 +08:00
zhouxudong
02476229d9 * Fix bug #22337. 2022-05-11 06:59:17 +00:00
zhouxudong
f498199820 * Fix bug #22337. 2022-05-11 06:55:32 +00:00