Commit Graph
171 Commits
Author SHA1 Message Date
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
tianshujie d95a2fee68 * Fix bug #23918. 2022-06-17 14:59:22 +08:00
tianshujie 6848485eb4 * Finish task #57095. 2022-06-16 11:05:01 +08:00
tianshujie 061e25fd51 * Finish task #57095. 2022-06-16 08:53:15 +08:00
tianshujie cdc590c16b * Finish task #57095. 2022-06-16 08:27:34 +08:00
王怡栋 4985d76009 Merge branch 'sprint/hufangzhou_56361' into 'master'
* Finish task #56361.

See merge request easycorp/zentaopms!3945
2022-06-15 09:28:14 +00:00
孙广明 1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
tianshujie 1f0f1ff36e * Finish task #57095. 2022-06-15 16:52:26 +08:00
tianshujie 7f000fd968 * Finish task #57095. 2022-06-15 16:41:12 +08:00
tianshujie 520ab92338 * Finish task #57095. 2022-06-15 16:17:16 +08:00
hufangzhou 9b32199272 * Finish task #56361. 2022-06-15 15:11:41 +08:00
tianshujie 2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
孙广明 d568e34896 * Code for sprint code width. 2022-06-15 13:53:06 +08:00
王怡栋 043aed24ec Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Finish task  #57089, #57099.

See merge request easycorp/zentaopms!3927
2022-06-15 02:21:35 +00:00
liumengyi 9a74ea6d5d * Fix bug of task #57089. 2022-06-15 10:05:52 +08:00
caoyanyi 8c5d59f15d * Fix bug #23633. 2022-06-15 08:41:06 +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
王怡栋 7d3ea4b91e Merge branch 'sprint200_fix_bug_23486' into 'master'
* Fix bug#23494,bug#23486.

See merge request easycorp/zentaopms!3839
2022-06-09 09:17:19 +00:00
leiyong 4d5ccc180e * Fix bug#23494,bug#23486. 2022-06-09 08:58:05 +00:00
liumengyi f3ce4377a8 * Fix bug #23506, #23439. 2022-06-09 16:22:58 +08:00
tianshujie 74f80b8d71 * Finish task #56469. 2022-06-09 13:24:58 +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
liumengyi 2a9f945c77 * Fix bug #23407. 2022-06-08 13:25:06 +08:00
liumengyi 5e74d3bd9f * Finish task #56454. 2022-06-08 10:32:01 +08:00
tianshujie 020528cdbb * Fix bug #23335. 2022-06-07 08:59:51 +08:00
tianshujie d2242277e7 * Fix bug #23335. 2022-06-07 08:57:24 +08:00
liumengyi 4e71cb29a8 * Fix bug #23031. 2022-06-02 14:12:00 +08:00
tianshujie 240cefb5df * Fixed kanban card style issues. 2022-05-30 09:21:39 +08:00
tianshujie e037b9c102 * Fixed kanban card avatar style. 2022-05-30 09:14:58 +08:00
tianshujie 5fe9641ce9 * Fix the display style of the task card. 2022-05-30 09:04:53 +08:00
leiyong 2370066590 * Fix bug#22948. 2022-05-27 01:51:14 +00:00
王怡栋 a0af734e79 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
Sprint/master zhouxudong 54991

See merge request easycorp/zentaopms!3626
2022-05-26 09:28:41 +00:00
zhouxudong 715527fd59 * Finish task #54991. 2022-05-26 09:19:50 +00:00
zhouxudong e70628fef0 * Finish task #54991. 2022-05-26 07:40:28 +00:00
zhouxudong 93c4c7bc5e * Fix bug #22936. 2022-05-25 08:52:09 +00:00
zhouxudong b57ec6aef4 * Fix bug #22722. 2022-05-24 02:59:16 +00:00
zenggang 463ff11e9d * Add project name 2022-05-19 07:03:55 +00:00
xieqiyu ce7c0afdc1 * Finish task#53666. 2022-05-11 18:24:13 +08:00
tanghucheng bc1a55d155 * Fix bug #14850. 2022-04-24 13:39:19 +08:00
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
Hao Sun b411c07de8 * bug #19078, hide scrollbar on dragging card in ".kanban". 2022-04-18 17:34:44 +08:00
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +08:00
Hao Sun 8b336e8694 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:06:46 +08:00
Hao Sun 8b58e71667 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:05:54 +08:00
tanghucheng 1d168b0468 * Fix bug #21408,21406,20199. 2022-04-02 14:06:41 +08:00
zhouxudong 90db981a65 Fix bug #19300. 2022-03-30 15:33:03 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie 778bc04e51 * Fix bug #21228. 2022-03-29 08:55:51 +08:00
tianshujie a3b55806f5 * Fix bug #17212. 2022-03-25 10:25:37 +08:00