Commit Graph
1615 Commits
Author SHA1 Message Date
Wenrui LI de89804dfb * add vision column to effort table. 2022-01-27 14:16:01 +08:00
孙广明 2993776ce2 Merge branch 'master' into 'Fixbug'
# Conflicts:
#   module/kanban/js/view.js
2022-01-27 03:02:56 +00:00
zhengrunyu 5b1a0f4b87 *change finished card and add status default 2022-01-27 10:35:33 +08:00
liumengyi a7cae5e57f * Fix bug #19060. 2022-01-27 10:32:29 +08:00
liumengyi 655b067c0b * Fix bug #19060. 2022-01-27 10:02:21 +08:00
tanghucheng 02281ff345 * Adjust for index block. 2022-01-26 17:22:36 +08:00
Wenrui LI 2a756e219d * tweak db files. 2022-01-26 15:08:34 +08:00
Wenrui LI ef7e9b390a * fix config table lacking vision. 2022-01-26 14:23:51 +08:00
hufangzhou b0ab0f8ae4 * Add the new version. 2022-01-26 13:47:00 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
Wenrui LI 30f61c2acc * add vision for todo and tweak todo create to set vision, part of task #47905. 2022-01-25 14:03:24 +08:00
Wenrui LI 794472aa35 * adjust config table for customizing settings per vision, and set story review rules with vision. 2022-01-25 13:10:52 +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
tanghucheng 954f96147c * Adjust for search. 2022-01-24 10:52:19 +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
tanghucheng 6b2521aca4 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-21 11:07:20 +08:00
tanghucheng 565ade2d53 * adjust for dynamic. 2022-01-21 11:06:22 +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
王怡栋 31e3b2ed08 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-20 11:09:56 +08:00
王怡栋 7a409f61be * adjust for lite kanban. 2022-01-20 11:09:00 +08:00
Wenrui LI 7f87e44d12 * set doc/doclib vision on creation. 2022-01-20 11:06:30 +08:00
Wenrui LI 60c5cbb906 * add vision to lang table. 2022-01-20 10:04:06 +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
Wenrui LI a2b55ad3b3 * change zentao sql to match vision. 2022-01-19 16:47:16 +08:00
Wenrui LI 9b78d18465 * tweak group and privs for lite vision, task #47917,47916. 2022-01-19 16:45:58 +08:00
王怡栋 f8e0c430cd * adjust for kanban in lite. 2022-01-19 13:41:29 +08:00
liumengyi cca28df709 * Fix bug and add sql file. 2022-01-19 13:13:08 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +08:00
王怡栋 d8577f7d28 * adjust for project kanban. 2022-01-17 17:25:20 +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