Commit Graph
1139 Commits
Author SHA1 Message Date
zhengrunyu 5b1a0f4b87 *change finished card and add status default 2022-01-27 10:35:33 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
songchenxuan 47b110a388 *International lang. 2022-01-25 09:55:10 +08:00
liumengyi 113a50f462 * Modify sql file. 2022-01-24 16:56:08 +08:00
liumengyi ecc9e22867 * Finish task 18883,add project team. 2022-01-24 16:54:30 +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
孙广明 e60e590ba8 Merge branch 'Fixbug' into 'master'
Fix bug 18885.

See merge request easycorp/zentaopms!1564
2022-01-24 06:27:05 +00:00
zhengrunyu cc299e0b45 Fix bug 18885. 2022-01-24 14:24:19 +08:00
孙广明 881367f7bd Merge branch 'sprint/183_hufangzhou_columnCreateMenu' into 'master'
* Code for task #47991.

See merge request easycorp/zentaopms!1561
2022-01-24 06:13:16 +00:00
hufangzhou 0530d95aac * Rename the importObject to object. 2022-01-24 14:11:52 +08:00
liumengyi 7633710cfa * Fix bug#18841, #18865, #18876, #18877, #18879 and #18891. 2022-01-24 13:31:12 +08:00
xieqiyu 780d82971f * Add sql. 2022-01-24 13:24:17 +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
zhengrunyu f06c5c5e30 *Finish task 47997 48003. 2022-01-24 08:36:25 +08:00
zhengrunyu 446f6e59d3 *Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003.*Finish task 47997 48003. 2022-01-21 14:31:00 +08:00
孙广明 cfb595e987 Merge branch 'sprint/183_mayue_47998' into 'master'
* Finish task #47998.

See merge request easycorp/zentaopms!1529
2022-01-21 06:00:56 +00:00
mayue aaaefa509c * Optimize code. 2022-01-21 13:32:58 +08:00
mayue 7b0694844c * Finish task #47998. 2022-01-21 08:32:21 +08:00
王怡栋 a8457f1665 Merge branch 'master' into 'sprint/183_hufangzhou_47986'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2022-01-20 08:04:32 +00:00
hufangzhou 9aee0590c5 * Finish task #47986. 2022-01-20 15:52:18 +08:00
孙广明 aaa112c33b Merge branch 'master' into 'sprint/183_mayue_47996'
# Conflicts:
#   db/update16.2.sql
2022-01-19 09:29:23 +00:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
mayue 39b7da7355 * Finish task #47996. 2022-01-19 16:50:40 +08:00
liumengyi cca28df709 * Fix bug and add sql file. 2022-01-19 13:13:08 +08:00
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
sgm0422 907f96ecfd * Adjust code. 2022-01-13 22:56:11 +08:00
孙广明 c4abe94616 * Code for kanban. 2022-01-13 11:45:17 +08:00
liyuchun c5aaae3eb8 * Finish task #47233. 2022-01-12 14:16:34 +08:00
tianshujie 6b4c03f5a4 * Add sql statement. 2022-01-12 08:35:17 +08:00
孙广明 b3681c395a * Refactor kanban. 2022-01-11 16:18:07 +08:00
孙广明 62b7f5eac1 Merge branch 'sprint/182_liumengyi_47340' into 'kanban'
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.

See merge request easycorp/zentaopms!1344
2022-01-11 07:53:14 +00:00
liumengyi ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
孙广明 0abf6e40db Merge branch '180_hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!1334
2022-01-11 01:21:03 +00:00
hufangzhou d0cfa7531e * Add the new version. 2022-01-11 09:19:47 +08:00
孙广明 9a744f651a Revert "Merge branch 'sgm_182db' into 'master'"
This reverts merge request !1325
2022-01-11 00:38:36 +00:00
李玉春 b904bc3c58 Merge branch 'sgm_182db' into 'master'
* Add upgrade.sql.

See merge request easycorp/zentaopms!1325
2022-01-11 00:11:48 +00:00
zhujinyong f3e681c99f * Add testTask table for update0.sql. 2022-01-10 21:12:04 +08:00
孙广明 ff6b122f3a * Add upgrade.sql. 2022-01-10 16:46:02 +08:00
hufangzhou 22f322fb94 * Fix bug #18220. 2022-01-05 20:47:05 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
liyuchun c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
tianshujie 15c13057d0 * Adjust the query plan logic. 2021-12-29 09:36:57 +08:00
liyuchun 9da21e20f0 * Finish task #46550. 2021-12-28 15:45:09 +08:00
zhujinyong 3183c8fe20 * Format sql. 2021-12-28 10:19:05 +08:00
tianshujie e2dcd9c5a9 * Add sql file. 2021-12-27 15:23:14 +08:00
hufangzhou 4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
朱金勇 00993b8884 Merge branch 'sprint/178_hufangzhou_api' into 'master'
* Add the zentao api lib for upgrade.

See merge request easycorp/zentaopms!1126
2021-12-24 05:42:09 +00:00
hufangzhou be2d532c77 * Add the zentao api lib for upgrade. 2021-12-24 09:33:45 +08:00