Commit Graph
543 Commits
Author SHA1 Message Date
xieqiyu e10272248b * Code for task#59546. Update create story and copy bug. 2022-07-07 09:06:33 +08:00
孙广明 c97ff18621 Merge branch 'master' into 'sprint213_zg'
# Conflicts:
#   module/execution/css/cfd.css
#   module/execution/js/cfd.js
2022-07-06 07:02:38 +00:00
mayue ef88d29c90 * Fix bug #24811#24814. 2022-07-06 14:58:46 +08:00
zenggang 8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
孙广明 6fe5ef5a23 Merge branch 'sprint_59473' into 'master'
Sprint 59473

See merge request easycorp/zentaopms!4362
2022-07-06 01:13:32 +00:00
sunjun d34e8f8638 sprint_59473 2022-07-06 00:29:14 +00:00
sunjun 84e078c1b2 sprint_59473 2022-07-05 14:35:33 +00:00
孙广明 1166775664 Merge branch 'sgm_kanban' into 'master'
* Code for cfd.

See merge request easycorp/zentaopms!4355
2022-07-05 08:53:26 +00:00
孙广明 9ed8604daf * Code for cfd. 2022-07-05 16:52:47 +08:00
sunjun 2a28c13c7e sprint_59473 2022-07-05 07:39:55 +00:00
xieqiyu 2148419cb2 * Code for task#59543. 2022-07-05 14:43:37 +08:00
xieqiyu 74b3fb5eeb * Code for task#59544. Update lane color and set column and WIP. 2022-07-05 13:59:03 +08:00
xieqiyu 704711ce6f * Code for task#59545,#59546. Update lane name. 2022-07-05 10:32:39 +08:00
xieqiyu c58e61ed26 * Code for task#59544,#59546. Add update region when delete lane. 2022-07-05 09:26:18 +08:00
王怡栋 4b2b0ac214 Merge branch 'sprint/208_tianshujie_24393' into 'master'
* Restore code.

See merge request easycorp/zentaopms!4303
2022-07-01 05:00:40 +00:00
tianshujie 707efd0393 * Fix card rendering issues. 2022-07-01 09:40:00 +08:00
tianshujie 1e4a9b750b * Restore code. 2022-06-29 10:50:38 +08:00
tianshujie c4bdf0ea3d * Fix bug #23958. 2022-06-24 08:42:39 +08:00
孙广明 33dd17eb8a Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765

See merge request easycorp/zentaopms!4094
2022-06-23 05:30:16 +00:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
mayue 6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
liumengyi b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
孙广明 34ddc497ba Merge branch 'zentaopms_207' 2022-06-22 08:33:17 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
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