Commit Graph
585 Commits
Author SHA1 Message Date
孙广明 80a39e398d Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Fix bug #23738.

See merge request easycorp/zentaopms!3930
2022-06-15 05:27:13 +00:00
liumengyi 23be41cd71 * Fix bug #23738. 2022-06-15 13:25:41 +08:00
孙广明 9df2853a61 Merge branch 'sprint_204_57094' into 'master'
Sprint 204 57094

See merge request easycorp/zentaopms!3928
2022-06-15 03:09:37 +00:00
liumengyi 8a8666f158 * Finish task #57099. 2022-06-15 10:06:26 +08:00
liumengyi ee49b70482 * Finish task #57089. 2022-06-14 16:42:12 +08:00
sunjun 431a832cda sprint_204_57094 2022-06-14 08:13:25 +00:00
王怡栋 ee4ce60394 Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.

See merge request easycorp/zentaopms!3912
2022-06-14 07:26:14 +00:00
liumengyi 5ad98df2ca * Fix bug #23648. 2022-06-14 15:17:57 +08:00
孙广明 dbb1ccc413 Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558

See merge request easycorp/zentaopms!3892
2022-06-14 06:58:39 +00:00
王怡栋 d682c68483 Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.

See merge request easycorp/zentaopms!3906
2022-06-14 06:30:53 +00:00
xieqiyu 8814f0f6dd * Finish task#56931. 2022-06-14 14:12:57 +08:00
zhouxudong c16b1fd1c3 * Finish task #56910. 2022-06-14 02:44:20 +00:00
zhouxudong 3fcccf17f1 * Finish task #56910. 2022-06-14 01:47:39 +00:00
zenggang 8bfc6dec02 * Finish task#56558 2022-06-13 09:46:02 +00:00
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