Commit Graph
235 Commits
Author SHA1 Message Date
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
xieqiyu 0b9e65b245 * Fix bug#18983. 2022-01-26 10:27:50 +08:00
xieqiyu 11a69d6206 * Adjust classic mode. 2022-01-26 09:47:01 +08:00
xieqiyu c7e52521e3 * Fix bug#18962. 2022-01-25 17:20:19 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
孙广明 8207c2b2a7 * Fix code style. 2022-01-25 17:12:39 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
孙广明 73f9642ec4 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18952, #18904.

See merge request easycorp/zentaopms!1602
2022-01-25 07:03:00 +00:00
xieqiyu 7feffbdcfa * Modify test problem. 2022-01-25 14:57:15 +08:00
liumengyi 9667299ce4 * Fix bug #18952, #18904. 2022-01-25 14:41:27 +08:00
孙广明 703b4c713b Merge branch 'Fixbug' into 'master'
*Add finishCard and activateCard's history and dynamic.

See merge request easycorp/zentaopms!1594
2022-01-25 05:19:26 +00:00
zhengrunyu bf807ad822 *Add finishCard and activateCard's history and dynamic. 2022-01-25 13:14:25 +08:00
孙广明 b2d1125ff9 * Fix delete kanban column bug. 2022-01-25 08:47:57 +08:00
孙广明 81ce7460b4 * Fix kanban bug. 2022-01-24 16:13:36 +08:00
孙广明 72de0a1b9c Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/js/view.js
#   module/kanban/model.php
2022-01-24 07:28:48 +00:00
xieqiyu 41d4d5a132 * Modify the duplicate name function. 2022-01-24 14:38:52 +08:00
hufangzhou 0530d95aac * Rename the importObject to object. 2022-01-24 14:11:52 +08:00
孙广明 9dc7763593 Merge branch 'sprint/183_zhouxin_fixbugs' into 'master'
Fix bug #18847#18846 and add ditto for batchcreatecard.html.php.

See merge request easycorp/zentaopms!1553
2022-01-24 05:25:42 +00:00
zhouxin b519ac8607 Fix bug #18847#18846 and add ditto for batchcreatecard.html.php. 2022-01-24 05:12:33 +00:00
xieqiyu f8062df4dc * Adjust the code structure. 2022-01-24 13:08:45 +08:00
xieqiyu 8959feba2a * Optimize the code. 2022-01-24 12:07:16 +08:00
孙广明 e3da935f16 Merge branch 'sprint/183_liumengyi_47973' into 'master'
* Finish task #47973.

See merge request easycorp/zentaopms!1551
2022-01-24 02:48:50 +00:00
liumengyi bc9f51c63d * Finish task #47973. 2022-01-24 10:36:33 +08:00
李玉春 782df170ea Merge branch 'sgm_48004' into 'master'
Sgm 48004

See merge request easycorp/zentaopms!1550
2022-01-24 02:20:38 +00:00
xieqiyu 895d345775 * Code for task#47991. 2022-01-24 09:59:49 +08:00
孙广明 b4d294c395 * Finish task #48004. 2022-01-24 09:53:33 +08:00
zhengrunyu cff61e144d *Fix bug 2022-01-24 09:32:24 +08:00
孙广明 3b100b47d2 Merge branch 'master' into 'sprint/183_zhengrunyu_48003'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php
2022-01-24 01:26:45 +00:00
xieqiyu c582ffed5b * Code for task#47989. 2022-01-24 09:20:26 +08:00
zhengrunyu f06c5c5e30 *Finish task 47997 48003. 2022-01-24 08:36:25 +08:00
xieqiyu 6e5e5f96f6 * Code for task#47993. 2022-01-23 20:34:31 +08:00
xieqiyu 71b287e1fa * Code for task#47987. 2022-01-23 19:37:44 +08:00
xieqiyu 1f79e9e7dd * Code for task#47995. 2022-01-22 22:24:49 +08:00