Commit Graph
546 Commits
Author SHA1 Message Date
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
王怡栋 df6d8bcb0e Merge branch 'sprint/201' into 'master'
Sprint/201

See merge request easycorp/zentaopms!3793
2022-06-08 06:45:01 +00:00
zhouxudong 596ea0124b * Finish task #56383. 2022-06-08 05:01:16 +00:00
liumengyi 5e74d3bd9f * Finish task #56454. 2022-06-08 10:32:01 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tianshujie 246d0f8654 * Fix bug #23259. 2022-06-06 14:15:07 +08:00
tianshujie 6635e019cf * Fix bug #23289. 2022-06-06 14:01:55 +08:00
李玉春 66ca553dad Merge branch 'sprint/master_zhouxudong_23111' into 'master'
Sprint/master zhouxudong 23111 19265

See merge request easycorp/zentaopms!3722
2022-06-02 06:32:26 +00:00
zhouxudong 3e4db334a5 * Fix bug #19265. 2022-06-02 06:24:53 +00:00
tianshujie d8f8e9cce0 * Modify variable name. 2022-06-02 13:26:10 +08:00
tianshujie c170d62313 * Resoled issue #656. 2022-06-02 13:16:37 +08:00
tianshujie aec74869fe * Finish task #55675. 2022-06-01 14:47:21 +08:00
tianshujie 3e10f3d0c9 * Finish task #55675. 2022-06-01 14:25:44 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie 5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
tianshujie b9a37d04a2 * Finish task #55675. 2022-06-01 11:08:51 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
liumengyi 52fc5e45ec * Fix bug #22665. 2022-05-25 13:40:38 +08:00
sunjun 2219a42fa2 fixbug_sunjun_194 2022-05-25 05:09:51 +00:00
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
#   module/kanban/config.php
2022-05-25 02:27:08 +00:00
liumengyi 743ea79536 * Fix bug #22665. 2022-05-25 10:04:18 +08:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
tianshujie 3b98d078af * Fix bug #22595. 2022-05-20 08:17:06 +08:00
xieqiyu 087b3ac65f * Code for task#54467. 2022-05-19 16:20:35 +08:00