Commit Graph
572 Commits
Author SHA1 Message Date
王怡栋 42cd9ccc98 Merge branch 'sprint/215_tianshujie_25128' into 'master'
Sprint/215 tianshujie 25128

See merge request easycorp/zentaopms!4483
2022-07-12 09:21:23 +00:00
王怡栋 11f2eb8a0f Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476

See merge request easycorp/zentaopms!4485
2022-07-12 09:20:31 +00:00
tianshujie 64151e0bef * Fix bug #25128. 2022-07-12 16:18:05 +08:00
王怡栋 d0c15d321f Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!4472
2022-07-12 07:41:56 +00:00
王怡栋 8423bbb096 Merge branch 'sprint/215_tianshujie_60475' into 'master'
Sprint/215 tianshujie 60475

See merge request easycorp/zentaopms!4479
2022-07-12 07:39:54 +00:00
tianshujie a73cfac42c * Finish task #60475. 2022-07-12 15:33:44 +08:00
zhouxudong 69101c8409 * Fix bug about taskkanban. 2022-07-12 06:06:02 +00:00
xieqiyu 658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
liumengyi 154c18ee43 * Finish task #60476. 2022-07-12 11:07:16 +08:00
tianshujie 40ba26dda6 * Finish task #60475. 2022-07-12 09:21:58 +08:00
zhouxudong fd2b8ec129 * Fix bug. 2022-07-11 12:56:31 +00:00
liumengyi f9b24fb48c * Fix bug of task #23123. 2022-07-08 13:52:33 +08:00
zenggang 9fd03b84f2 * Adjust code 2022-07-06 06:47:31 +00:00
zenggang 8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
liumengyi 6138501ff7 * Finish task #59479. 2022-07-04 14:35:05 +08:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00
zenggang b57e6522ef * Fix bug#24668 2022-07-01 03:24:45 +00:00
zenggang dbced34eb7 * Adjust code 2022-06-30 09:20:00 +00:00
zenggang 3ccb521c65 * Fix bug#24561 2022-06-30 09:06:44 +00:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
tianshujie 64505acdf3 * Finish task #58288. 2022-06-23 15:07:47 +08:00
tianshujie bf7f947f72 * Finish task #58288. 2022-06-23 15:05:22 +08:00
liumengyi 4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
liumengyi b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
liumengyi 8f0073050f * Finish task #58288. 2022-06-22 15:23:38 +08:00
tanghucheng 09268cfe23 * Fix bug . 2022-06-20 10:50:54 +08:00
Hao Sun c34385954d * support for updating kanban without refresh the whole page. 2022-06-15 06:05:59 +00:00
mayue a70fd10f87 * Fix bug #23410. 2022-06-14 11:17:25 +08:00
孙广明 23ae4cea1c Merge branch 'master_xieqiyu_56376' into 'master'
* Finish task#56376.

See merge request easycorp/zentaopms!3859
2022-06-10 04:29:59 +00:00
xieqiyu 3e4fd3aa0f * Finish task#56376. 2022-06-10 12:01:27 +08:00
王怡栋 097faf3c7d Merge branch 'sprint/master_zhouxudong_56374' into 'master'
Sprint/master zhouxudong 56374

See merge request easycorp/zentaopms!3849
2022-06-10 02:01:58 +00:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00
tianshujie 3f1dc22664 * Finish task #56469. 2022-06-10 09:22:50 +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
liumengyi f3ce4377a8 * Fix bug #23506, #23439. 2022-06-09 16:22:58 +08:00
王怡栋 c9a29bb420 Merge branch 'master' into 'sprint200_leiyong_task_56384'
# Conflicts:
#   module/kanban/view/space.html.php
2022-06-09 07:40:03 +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
王怡栋 084f66dd51 Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
#   module/kanban/model.php
2022-06-09 06:32:06 +00:00
leiyong aec5b3612e * Finish task#56384. 2022-06-09 06:23:50 +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
zhouxudong ea746e862f * Finish task #56362. 2022-06-09 03:04:12 +00:00
孙广明 ea2fe3e532 Merge branch 'sprint200_leiyong_task_56378' into 'sprint_200'
Sprint200 leiyong task 56378

See merge request easycorp/zentaopms!3801
2022-06-09 02:40:35 +00:00
leiyong b471a3cdad * Adjust code. 2022-06-09 02:36:56 +00:00
liumengyi b6073c2220 * Fix bug. 2022-06-09 09:53:27 +08:00
leiyong ce0dbc7d91 * Finish task#56373. 2022-06-08 10:53:01 +00:00
zhouxudong 6265fcd76f * Finish task #56383. 2022-06-08 09:37:10 +00:00
zhouxudong 0dc3a87d2e * Finish task #56383 2022-06-08 08:02:47 +00:00
liumengyi 7b80bfeedd * Fix bug #23422. 2022-06-08 15:43:17 +08:00