Commit Graph
1265 Commits
Author SHA1 Message Date
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
liumengyi 6138501ff7 * Finish task #59479. 2022-07-04 14:35:05 +08:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00
李玉春 e8982be13f Merge branch 'sprint/wangzemei/bug24393' into 'master'
* Fix bug24393

See merge request easycorp/zentaopms!4306
2022-07-01 05:19:38 +00:00
孙广明 e37ccb374b Merge branch 'zg_24663' into 'master'
* Fix bug #24663,24668

See merge request easycorp/zentaopms!4301
2022-07-01 05:08:49 +00: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
wangzemei 85e14d173a * Fix bug24393 2022-07-01 04:23:39 +00:00
zenggang b57e6522ef * Fix bug#24668 2022-07-01 03:24:45 +00:00
zenggang dbced34eb7 * Adjust code 2022-06-30 09:20:00 +00:00
zenggang 3ccb521c65 * Fix bug#24561 2022-06-30 09:06:44 +00:00
zhouxudong e87d50a738 * Fix bug #23741. 2022-06-30 07:35:12 +00:00
liumengyi 076a744a0a * Fix bug #23914, #23999. 2022-06-30 13:58:18 +08:00
liumengyi 59acd48cd3 * Fix bug #24599. 2022-06-30 13:42:52 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
tianshujie 1e4a9b750b * Restore code. 2022-06-29 10:50:38 +08:00
xieqiyu ff2a952493 * Fix bug#24304. 2022-06-28 09:03:40 +08:00
王怡栋 d84d8cac4a Merge branch 'master_xieqiyu_58585' into 'master'
* Finish task#58585.

See merge request easycorp/zentaopms!4159
2022-06-28 00:26:01 +00:00
xieqiyu f7b01e1a0e * Finish task#58585. 2022-06-28 08:14:06 +08:00
tianshujie 468db7bc30 * Fix bug #23955. 2022-06-24 14:30:37 +08:00
tianshujie 77685a86df * Add comment. 2022-06-24 09:18:32 +08:00
tianshujie c4bdf0ea3d * Fix bug #23958. 2022-06-24 08:42:39 +08:00
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
王怡栋 f23d4b8abd Merge branch 'sprint/206_tianshujie_58288' into 'master'
Sprint/206 tianshujie 58288

See merge request easycorp/zentaopms!4109
2022-06-23 07:08:36 +00:00
tianshujie 64505acdf3 * Finish task #58288. 2022-06-23 15:07:47 +08:00
tianshujie bf7f947f72 * Finish task #58288. 2022-06-23 15:05:22 +08:00
tianshujie b253c6b248 * Resole issue #684. 2022-06-23 15:04:15 +08:00
liumengyi d9e4aaf940 * Fix bug #24206. 2022-06-23 14:39:27 +08:00
liumengyi 48948cd563 * Fix issue #683. 2022-06-23 13:09:36 +08:00
王怡栋 e6f8af9c13 Merge branch 'master' into 'sgm_kanbanwip'
# Conflicts:
#   db/update17.1.sql
2022-06-23 03:23:53 +00:00
孙广明 3eb9719ad2 * Finish task #58241. 2022-06-23 11:16:55 +08:00
孙广明 d710725155 * Add set wip. 2022-06-23 10:00:48 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
tianshujie 413248e27d Merge branch 'sprint/206_liumengyi_58288' of https://gitlab.zcorp.cc/easycorp/zentaopms into liu 2022-06-23 09:42:58 +08:00
tianshujie 31f920d59f * Modify the indentation. 2022-06-23 09:42:26 +08:00
liumengyi c26c9dc110 * Optimize code for task #58288. 2022-06-23 09:39:29 +08: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
tianshujie 36712610f3 * Finish task #58290. 2022-06-22 17:28:29 +08:00
tianshujie 106c312a23 * Finish task #58290. 2022-06-22 17:17:34 +08:00
liumengyi 4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
tianshujie a2e0cc5cb3 * Finish task #58290. 2022-06-22 16:51:28 +08:00
tianshujie ad97a3a56b Merge branch 'sprint/206_liumengyi_58288' of https://gitlab.zcorp.cc/easycorp/zentaopms into liu 2022-06-22 16:30:28 +08:00
tianshujie b91ab9dbc8 * Finish task #58288. 2022-06-22 16:30:02 +08:00
liumengyi b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
tianshujie e2669481c7 * Added German and French. 2022-06-22 15:28:45 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
liumengyi 8f0073050f * Finish task #58288. 2022-06-22 15:23:38 +08:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
sunjun 138aa7d507 sprint_206_58259 2022-06-22 03:16:39 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00