Commit Graph
904 Commits
Author SHA1 Message Date
孙广明 b0f8dabcca Merge branch 'sprint/182_tianshujie_18496' into 'master'
* Filter out cards from other swimlanes when updating cards.

See merge request easycorp/zentaopms!1434
2022-01-17 07:23:01 +00:00
tianshujie 9b5fa61141 * Modify the code logic. 2022-01-17 15:20:17 +08:00
liumengyi a36a74eb7d * Fix bug of RD kanban creation and associating story. 2022-01-17 14:35:15 +08:00
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
孙广明 e94c1128e1 Merge branch 'sprint/180_songchenxuan_fix_code_review' into 'master'
*Code for code review.

See merge request easycorp/zentaopms!1287
2022-01-06 06:18:23 +00:00
songchenxuan 8927059720 *Code for code review. 2022-01-06 13:08:46 +08:00
xieqiyu a25ed2eedb * Fix bug of edit task has only main branch stories. 2022-01-05 14:03:09 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
xieqiyu 543c3df796 * Modify problem of search story. 2022-01-04 10:37:09 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
孙广明 3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
songchenxuan 147c03f2f0 *Fix bug #17684. 2021-12-21 10:17:51 +08:00
tianshujie 8ea2cc8e9e * Fix bug #17704,17740,17694. 2021-12-21 09:53:44 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
朱金勇 8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization

See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
Yurun e3db243569 Fix string 2021-12-14 10:40:43 +08:00
Yurun 66fd19444a Optimize story module 2021-12-13 15:22:56 +08:00
songchenxuan f77b8ddb9b *Finish task #45538. 2021-12-09 17:10:55 +08:00
mayue 147470bf29 * Fix bug #17248,17246. 2021-12-09 10:34:47 +08:00
zhouxin 728cb5a63e change get... to include... . 2021-12-08 08:52:25 +00:00
mayue 5761af1ed8 * Fix bug #17248,17246. 2021-12-08 16:31:24 +08:00
zhouxin 6d4ed2f256 Finish task #45801. 2021-12-08 03:09:43 +00:00
xieqiyu 985599a98a * Code for task#45026. 2021-12-01 14:57:53 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春 4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
hufangzhou 7a5a4d5807 * Rebuild the code. 2021-11-30 10:44:37 +08:00
hufangzhou 4736e3a01c * Solve the problem of mutual testing for task #45085. 2021-11-30 09:59:14 +08:00
tianshujie b51f3c957d * Adjust code of story model. 2021-11-29 17:34:50 +08:00
tianshujie 25d07bb7a9 * Delete unused code. 2021-11-29 17:17:59 +08:00
tianshujie 0c33d76709 * Finish task #45081. 2021-11-29 17:14:01 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
mayue fea372ea26 * Finish task #44987,44988,44989. 2021-11-29 15:45:56 +08:00
孙广明 8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
#   module/story/model.php
2021-11-29 07:26:45 +00:00
hufangzhou bf1ca5893e * Modify the url when refresh the tree browse in project module. 2021-11-29 15:20:48 +08:00
孙广明 5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
xieqiyu 22e4a664c1 * Code for task#45082. 2021-11-29 13:49:30 +08:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
xieqiyu 763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
tianshujie 7810fbc629 * Finish task #45081. 2021-11-26 14:59:02 +08:00
王怡栋 03f1dd727e * code for task #45184 and adjust api. 2021-11-26 14:18:28 +08:00
tianshujie 8bf6c34acd * Modify the logic of planning related stories and bugs. 2021-11-26 13:37:15 +08:00
tianshujie 774ee347f5 * Translate modified code. 2021-11-25 17:57:24 +08:00
tianshujie 3816d9a775 * Modify the scope of linked stories and bugs in the plan. 2021-11-25 13:16:20 +08:00
tianshujie 4f4a1f990b * Modify the logic of changing branches in stories. 2021-11-25 11:28:50 +08:00
tianshujie 600e4fdbba * Fix bug #16576,16576. 2021-11-23 14:45:20 +08:00
liyuchun 48909fa19b * Fix bug #16511. 2021-11-22 10:06:49 +08:00