Commit Graph
1200 Commits
Author SHA1 Message Date
孙广明 33fc87131e * Add pro/biz/max sql to open. 2022-03-08 08:55:16 +08:00
hufangzhou 50d99f6e02 * Adjust the sql. 2022-03-07 15:12:11 +08:00
王怡栋 a783b5d736 Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/batchcreate.html.php
2022-03-07 05:25:38 +00:00
tanghucheng 79a38cc9ad * Fix bug. 2022-03-07 13:04:06 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
tanghucheng b99e04cab3 * Fix bug. 2022-03-01 09:56:19 +08:00
zhouxin 5dc91f9a30 Finish task #49886#49883. 2022-02-28 09:14:19 +00:00
zhujinyong 851cf70593 * Fix error of api demo. 2022-02-28 13:01:06 +08:00
孙广明 725f4abbae * Add upgrade sql to install. 2022-02-28 11:00:43 +08:00
hufangzhou bc89a1051d * Rewrite the Makefile. 2022-02-24 16:17:25 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
孙广明 ffbbfe417f Merge branch 'sprint/185' into 'sprint/185_zhangzilong_49284'
# Conflicts:
#   db/update16.4.sql
2022-02-18 06:23:22 +00:00
zhangzilong 0c4035711f * Finish task #49284. 2022-02-18 13:15:48 +08:00
zhengrunyu 22f29fd8d4 *Fix bug 49283 2022-02-18 10:40:09 +08:00
zhengrunyu 45900728eb *Add sql 2022-02-18 09:19:21 +08:00
zhangzilong 4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
李玉春 62097d0731 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49286'
# Conflicts:
#   db/update16.4.sql
2022-02-17 07:23:41 +00:00
zhengrunyu 56b22d9b83 * Add sql 2022-02-17 14:35:30 +08:00
zhengrunyu 5083af2323 *Finish task 49286. 2022-02-17 10:47:56 +08:00
Wenrui LI 4ec144c99e * fix bad merge. 2022-02-17 10:42:11 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
王怡栋 6e7b0af562 * code for task #48841. 2022-02-15 09:57:45 +08:00
hufangzhou aaeeaf1743 * Add the new version. 2022-02-15 08:47:29 +08:00
李玉春 80770f7791 Merge branch 'devops21_zhangzilong_19161' into 'master'
* Code for bug 19161.

See merge request easycorp/zentaopms!1790
2022-02-14 08:51:47 +00:00
zhangzilong 4a24552cf9 * Code for bug 19161. 2022-02-14 16:32:43 +08:00
liyuchun e556307ba4 * Finish task #48612. 2022-02-11 08:13:20 +08:00
zhangzilong 8d62f55bcf * Code for bug #19161. 2022-02-09 16:42:59 +08:00
zhangzilong 21faf4f026 * Add update16.3.sql for bug #19161. 2022-02-09 15:41:23 +08:00
zhangzilong ddbfc3770d * Code for bug #19161. 2022-02-09 15:05:51 +08:00
zhangzilong 805dd01dc7 * Code for bug #19161. 2022-02-09 11:35:27 +08:00
王怡栋 e4bd16a9e2 * code task #48564. 2022-02-09 09:30:56 +08:00
王怡栋 af13e0610b * code for task #48560. 2022-02-08 11:26:13 +08:00
zhangzilong fb8708557d * Fix bug #19161. 2022-02-08 08:42:16 +08:00
tanghucheng f264c07984 * add vision for story. 2022-01-28 09:50:21 +08:00
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