Commit Graph
267 Commits
Author SHA1 Message Date
孙广明 887657308a Merge branch 'sprint/189_liumengyi_53663' into 'master'
* Finish task #53663.

See merge request easycorp/zentaopms!3311
2022-05-10 09:23:24 +00:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
liumengyi 987edcc3cf * Finish task #53663. 2022-05-10 16:29:56 +08:00
liumengyi c5ee9d9873 * Finish task #53663. 2022-05-10 15:35:32 +08:00
tianshujie 4e2de99018 * Stages of updating trunk stories. 2022-05-10 14:25:01 +08:00
tianshujie c3fdb74a24 * Finish task #53668. 2022-05-10 10:12:48 +08:00
tianshujie c00b2a9cc6 * Fix bug #21638. 2022-04-11 15:41:09 +08:00
Zongjun Lan 1542533e44 * fix bug #21455#21413 2022-04-02 14:36:13 +08:00
tianshujie 5e7034e5c1 * Fix bug #20653. 2022-03-23 14:11:25 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
Zongjun Lan 2af12a5c0d * fix bug #20905 2022-03-18 10:12:06 +08:00
Zongjun Lan 4c8a7a3eae * fix bug #20905 2022-03-18 10:11:22 +08:00
Zongjun Lan 2435d84cdc * fix bug #20905 2022-03-18 10:06:04 +08:00
Zongjun Lan 9a53b1d0fe * fix bug #20905 2022-03-18 09:39:52 +08:00
xieqiyu 00a8efaf80 * Fix bug#18756. 2022-03-17 13:37:20 +08:00
tianshujie 050cefdbcd * Fix bug #20837. 2022-03-16 16:19:39 +08:00
tianshujie a18c511ab0 * Fix bug #19312. 2022-03-16 09:25:11 +08:00
tianshujie 6a7671fb9a * Fix bug #19312. 2022-03-15 14:32:44 +08:00
zhujinyong 819fad539e * Finish story#31282, story#31284. 2022-03-10 16:21:27 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
孙华伟 719cd91f8e Update kanban control.php 2022-03-09 01:08:17 +00:00
孙华伟 8f3dc47e67 Update kanban control.php 2022-03-09 00:55:06 +00:00
zhouxudong 027fbc1472 * Fix bug #19120. 2022-03-08 17:12:52 +08:00
孙华伟 67a0272d96 *Story #31107. 2022-03-08 14:41:51 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
zhouxin a9995c6fe0 Finish task #49692. 2022-02-22 09:00:47 +00:00
王怡栋 6486986b5a Merge branch 'sprint/185_tanghucheng_49418' into 'sprint/185'
* Finish task #49415,49418,49425,49418,49402.

See merge request easycorp/zentaopms!1873
2022-02-22 01:49:27 +00:00
zhujinyong 002e215a3d * Move die to return. 2022-02-22 09:02:00 +08:00
tanghucheng 9b6903f6eb * Finish task#49418. 2022-02-21 17:23:09 +08:00
tanghucheng 422811bcbd * code for task #49697. 2022-02-21 17:01:42 +08:00
liumengyi 5e645da507 * Fix bug #19308. 2022-02-16 14:55:21 +08:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
tianshujie 4394d09195 * Solve the problem of getting regional data. 2022-01-28 14:31:35 +08:00
liumengyi 06275780d2 * Modify code format. 2022-01-28 13:29:19 +08:00
liumengyi 4c26d32564 * Fix bug #19126. 2022-01-28 13:20:14 +08:00
孙广明 82a5aa5bd7 Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Add title for batchcreatecard page.

See merge request easycorp/zentaopms!1692
2022-01-27 08:59:15 +00:00
zhouxin 05e3d863bc Add title for batchcreatecard page. 2022-01-27 08:56:08 +00:00
tianshujie cb68227989 * Fix bug #19109. 2022-01-27 16:42:07 +08:00
李玉春 f0c7c87228 Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1683
2022-01-27 07:44:03 +00:00
孙广明 827308efe2 * Fix bug. 2022-01-27 15:39:14 +08:00
孙广明 ab273f5720 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1677
2022-01-27 07:36:25 +00:00
xieqiyu cbaffa5ea9 * Fix bug#19096. 2022-01-27 14:28:06 +08:00
liumengyi 28a481e82d * Fix bug #19090. 2022-01-27 14:05:23 +08:00
liumengyi 4e54d16ccf * Modify batch create card assignedto users. 2022-01-27 13:53:44 +08:00
liumengyi 221909550d * Kanban whitelist can only be selected from space whitelist. 2022-01-27 12:58:12 +08:00
liumengyi 56be31302b * Fix bug #19063. 2022-01-27 10:18:07 +08:00
孙广明 8e4e9f6328 Merge branch 'sprint/183_liumengyi_19020' into 'master'
* Fix bug #19028, #19030.

See merge request easycorp/zentaopms!1651
2022-01-26 06:21:02 +00:00
liumengyi dd0ae6c80f * Fix bug #19028, #19030. 2022-01-26 14:19:17 +08:00
孙广明 94ddacd400 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1639
2022-01-26 05:53:04 +00:00
liumengyi aba10f0435 * Fix bug #19020. 2022-01-26 13:36:12 +08:00