Commit Graph
115 Commits
Author SHA1 Message Date
孙广明 007dd4f43c * Adjust kanban style. 2021-12-23 14:01:37 +08:00
孙广明 197a1bceea * Finish task #46165. 2021-12-22 09:41:39 +08:00
孙广明 eaf86c493d * Fix js error. 2021-12-17 15:55:34 +08:00
孙广明 302a576ed1 * Fix kanban js. 2021-12-17 15:54:00 +08:00
孙广明 87c12c800a * Fix code details. 2021-12-17 15:43:19 +08:00
孙广明 9f7eecf9c6 * Finish task #46164. 2021-12-17 15:25:59 +08:00
liumengyi 6ec0f178a4 * Modify judgment method. 2021-12-10 11:04:30 +08:00
孙广明 44bbe31440 * Fix kanban bug. 2021-12-09 10:34:47 +08:00
李玉春 7cd00e0d84 Merge branch 'revert-aacf4ec4' into 'master'
Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'"

See merge request easycorp/zentaopms!783
2021-12-06 02:41:55 +00:00
孙广明 679d8aeb5e Merge branch 'sprint/174_sunhao/improve_kanban' into 'master'
* Bug #17056, fix duplicated modal in execution kanban page.

See merge request easycorp/zentaopms!782
2021-12-06 02:39:26 +00:00
孙广明 11d9ad6044 Revert "Merge branch 'sprint/175_tianshujie_17056' into 'master'"
This reverts merge request !781
2021-12-06 02:37:20 +00:00
tianshujie 183bf88f28 * Fix bug #17056. 2021-12-06 10:22:47 +08:00
Hao Sun 2ed3d819e8 * Bug #17056, fix duplicated modal in execution kanban page. 2021-12-06 10:06:35 +08:00
Hao Sun 74ef8b9a10 * refactor: comment. 2021-12-06 09:36:59 +08:00
朱金勇 789a419696 Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'
* Support for using kanban in old browsers without CSS flex.

See merge request easycorp/zentaopms!757
2021-12-03 00:50:26 +00:00
Hao Sun 3230cff401 * fix kanban not work in ie. 2021-12-02 17:03:41 +08:00
liyuchun da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
Hao Sun 5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00
Hao Sun 229f49fc69 * only update kanban when remote data is difference. 2021-12-01 08:29:33 +08:00
Hao Sun 9d7449acae * refactor. 2021-12-01 08:29:07 +08:00
Hao Sun 88e67add78 * refactor usage of kanban. 2021-11-30 14:21:24 +08:00
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
liyuchun fa1ffa32bb * Fix bug #16163. 2021-11-12 11:13:37 +08:00
liyuchun 4865431f22 * Fix bug #16166. 2021-11-12 10:36:57 +08:00
liyuchun 4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +08:00
Hao Sun a233ecdf4b * fix iframe modal show double times on click at second time. 2021-11-09 19:55:15 +08:00
孙广明 521a8e871d * Finish task #44139. 2021-11-09 14:39:07 +08:00
李玉春 60766cee16 Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.

See merge request easycorp/zentaopms!359
2021-11-09 06:36:52 +00:00
孙广明 21d6cbd160 * Fix logic error. 2021-11-09 14:24:49 +08:00
孙广明 a8ce426a32 Merge branch 'sprint/168' into 'sprint/168_liyuchun_43954'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 05:04:22 +00:00
孙广明 954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun 7589eca470 * Finish task #43954. 2021-11-09 09:50:00 +08:00
liyuchun f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +08:00
李玉春 d66bd6f3d3 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Adjust kanban layout.

See merge request easycorp/zentaopms!278
2021-11-09 00:32:48 +00:00
liyuchun bddeb2d5b2 * Remove more button in group lane. 2021-11-08 16:50:12 +08:00
holan20180123 30b0c8db07 * Finish task #43938,#43939. 2021-11-07 20:31:28 +08:00
liyuchun a25e86cb59 * Adjust error of kanban action. 2021-11-03 09:15:07 +08:00
李玉春 f011907e1f Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.

See merge request easycorp/zentaopms!281
2021-11-02 06:13:46 +00:00
孙广明 90b6253107 * Fix var name. 2021-11-02 14:12:18 +08:00
李玉春 86c7464aca Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168'
* Assign btn check priv.

See merge request easycorp/zentaopms!282
2021-11-02 06:09:04 +00:00
孙广明 cc321393f6 * Change var name. 2021-11-02 14:05:53 +08:00
孙广明 c7f0e74517 * Assign btn check priv. 2021-11-02 13:59:41 +08:00
Hao Sun f786d077e4 * improve layout of execution kanban. 2021-11-02 11:17:12 +08:00
liyuchun 59364de4d8 * Fix bug #15851. 2021-11-02 10:18:44 +08:00
liyuchun fcce47b768 * Fix bug #15852. 2021-11-02 09:48:49 +08:00
liyuchun 84de930ed1 * Fix bug #15853. 2021-11-02 09:27:06 +08:00
李玉春 cb3e573d30 Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.

See merge request easycorp/zentaopms!269
2021-11-02 00:34:38 +00:00
tianshujie 5fc96f394c * Modify format. 2021-11-02 08:19:10 +08:00
tianshujie 5444d35cde * Fix bug #15902. 2021-11-01 17:34:25 +08:00
孙广明 1c98dbd28b Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15887,#15877,#15874.

See merge request easycorp/zentaopms!266
2021-11-01 09:18:16 +00:00