Commit Graph
516 Commits
Author SHA1 Message Date
Hao Sun 834689d226 * bug #23877, fix user picker not work as expected. 2022-06-17 04:04:28 +00:00
xieqiyu d0ac2813ec * Fix bug#23725. 2022-06-17 09:55:30 +08:00
tianshujie d351c15090 * Fix bug #23828. 2022-06-16 13:23:57 +08:00
王怡栋 ae6f603d1e Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban's setLane.

See merge request easycorp/zentaopms!3969
2022-06-16 05:02:33 +00:00
zhouxudong 85fc6dec5d * Fix bug about kanban's setLane. 2022-06-16 04:05:54 +00:00
xieqiyu 16ea32d744 * Fix bug#23657. 2022-06-16 08:18:00 +08:00
王怡栋 f064336c1f Merge branch 'sprint/tianshujie_57095' into 'master'
* Finish task #57095.

See merge request easycorp/zentaopms!3951
2022-06-15 09:28:49 +00: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
tianshujie 4fcf0b7dc3 * Finish task #57095. 2022-06-15 17:26:39 +08: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 b6a1b3eb79 * Finish task #57095. 2022-06-15 16:55:28 +08:00
tianshujie 1f0f1ff36e * Finish task #57095. 2022-06-15 16:52:26 +08:00
hufangzhou d83ce3c27c * Can't post the disabled value to rear end. 2022-06-15 16:06:39 +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
王怡栋 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
zhujinyong 87f50aa3be Merge branch 'sprint/sunhao/task56391' 2022-06-14 17:12:21 +08:00
liumengyi ee49b70482 * Finish task #57089. 2022-06-14 16:42:12 +08:00
Hao Sun 8d7ce128ee * fix picker not update on deselect member. 2022-06-14 08:32:54 +00:00
Hao Sun fd21045b41 * task #56391, support for disable selected member with picker. 2022-06-14 08:11:47 +00: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
liumengyi 6aaf4f6308 * Fix bug for task #57090. 2022-06-14 14:39:55 +08:00
liumengyi d1a44ab424 * Finish task #57090. 2022-06-14 13:58:18 +08:00
liumengyi 2d4f3be98a * Finish task #57090. 2022-06-14 13:56:38 +08:00
liumengyi 347fcb16c7 * Fix bug #23648, #23650. 2022-06-14 13:47:33 +08:00
zenggang 8bfc6dec02 * Finish task#56558 2022-06-13 09:46:02 +00:00
liumengyi 39dabf6ff3 * Finish task #57099. 2022-06-13 16:02:23 +08:00
liumengyi 76b3f952a0 * Fix issue #673. 2022-06-13 10:02:33 +08:00
zhouxudong 51f5d5bd3a * Finish task #56648. 2022-06-10 02:29:54 +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
tianshujie b8792fcb90 * Finish task #56469. 2022-06-10 08:35:22 +08: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
李玉春 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
王怡栋 ce38afd825 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3817
2022-06-09 06:35:07 +00:00
王怡栋 084f66dd51 Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
#   module/kanban/model.php
2022-06-09 06:32:06 +00:00
zhouxudong 1da6718278 * Finish task #56362. 2022-06-09 05:30:57 +00:00
tianshujie 74f80b8d71 * Finish task #56469. 2022-06-09 13:24:58 +08:00
zhouxudong 89d4ecfd35 * Finish task #56362. 2022-06-09 03:43:20 +00:00
zhouxudong acf028e0a9 * Fix bug. 2022-06-09 03:24:15 +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
caoyanyi 35a857fd38 * Adjust code. 2022-06-09 10:33:39 +08:00
liumengyi 2279c5d602 * Fix bug #23439. 2022-06-09 09:45:06 +08:00
liumengyi 56b622e91a * Fix bug #23439. 2022-06-08 17:09:03 +08:00
caoyanyi 55f6cdb651 * Finish task #56548. 2022-06-08 15:53:37 +08:00
liumengyi a7fcd0f372 * Fix bug #23416. 2022-06-08 15:33:49 +08:00