Commit Graph
1285 Commits
Author SHA1 Message Date
Wenrui LI 2702a886da * query group by vision when authorizing user. 2022-01-21 10:18:05 +08:00
zhujinyong 2e85ff6e08 Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-19 09:08:22 +08:00
zhujinyong 8ed8e31da9 * Fix doc menu for lite. 2022-01-19 09:08:07 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
zhujinyong faff9d3dbd + Switch vision. 2022-01-18 11:50:29 +08:00
liumengyi 79813a2166 * Modify judgment. 2022-01-17 18:53:45 +08:00
liumengyi c11615933a * Fix bug #18625. 2022-01-17 18:51:50 +08:00
liumengyi 47e7cd7f10 * Fix bug #18625. 2022-01-17 18:46:58 +08:00
liumengyi 842ca07618 * Fix bug #18625. 2022-01-17 18:25:39 +08:00
孙广明 66515d7ed8 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.

See merge request easycorp/zentaopms!1420
2022-01-17 00:57:03 +00:00
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
mayue a2765b7427 * Optimize code. 2022-01-06 13:50:43 +08:00
mayue fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
zhujinyong e944c4a428 Merge branch 'sprint/180_sunhao/task46524' into sprint/180 2021-12-31 11:21:25 +08:00
Hao Sun dff300cf88 * Task #46524, refactor user selector for page "project/managemembers". 2021-12-30 17:02:32 +08:00
mayue 9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
王怡栋 0d2f111a67 * fix error for php8.0. 2021-12-24 08:40:34 +08:00
朱金勇 8ba0385b58 Merge branch 'sql-optimization-zhangrunyu' into 'master'
SQL optimization

See merge request easycorp/zentaopms!924
2021-12-20 00:47:21 +00:00
liyuchun df21c2f8bf * Fix bug #17521. 2021-12-14 16:56:40 +08:00
Yurun c89277b5fc Optimize user module 2021-12-11 09:06:08 +08:00
王怡栋 c16478c5d0 * fix for upgrade from lower version. 2021-12-03 15:47:39 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
王怡栋 8fc78ccd45 * adjust for api. 2021-11-29 13:06:47 +08:00
liumengyi 5dbd0ad4b9 * Fix bug #16869. 2021-11-29 10:28:52 +08:00
liumengyi b6acb88c21 * Fix bug #16869. 2021-11-29 09:55:00 +08:00
liumengyi c72bdbbdfb * Finish task #45158. 2021-11-26 10:50:16 +08:00
liumengyi a9b865aa9f * Finish task #45158. 2021-11-26 10:47:53 +08:00
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
王怡栋 57c6ae78a8 * adjust for search. 2021-11-24 14:24:35 +08:00
孙广明 2dc2c46737 * Fix bug #16703. 2021-11-24 10:55:42 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
liyuchun 412fbb2305 * Finish task #44370. 2021-11-16 16:25:00 +08:00
王怡栋 77b0b5d61e * code for task #44305. 2021-11-16 09:31:10 +08:00
王怡栋 3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
zhouxin b28abf1c4c Finish task#43538. 2021-10-26 13:02:12 +08:00
王怡栋 784f729a81 * code for task #43338. 2021-10-21 15:10:40 +08:00
xieqiyu 3e8e0dbcce * Fix bug#15457. 2021-10-16 15:32:13 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
hufangzhou 3363c1adbf * Code for bug #15518. 2021-10-14 14:28:49 +08:00
hufangzhou 52e49919d2 * Code for bug #15518. 2021-10-14 13:51:59 +08:00
liyuchun cfdce3652f * Finish task #43187. 2021-10-14 13:51:47 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇 fa879ae303 Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!39
2021-09-28 07:35:23 +00:00
tianshujie 4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00