Commit Graph
26580 Commits
Author SHA1 Message Date
tianshujie98 18fd529d8e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 15:04:46 +08:00
tianshujie98 201285215b * Finish task #41244. 2021-08-11 15:04:29 +08:00
王怡栋 ba6360d671 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 13:58:47 +08:00
王怡栋 f5caade0e4 * fix bug for fulltext search and action. 2021-08-11 13:57:55 +08:00
holan20180123 ff08e8e0c6 * Finish task #41237. 2021-08-11 13:55:59 +08:00
holan20180123 a2afd53537 * Finish task #41235. 2021-08-11 13:05:43 +08:00
zhujinyong ea4da56cbe Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 11:41:43 +08:00
zhujinyong c13d5a1183 * Adjust code for my api. 2021-08-11 11:41:06 +08:00
王怡栋 925d78059f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 11:30:13 +08:00
Hao Sun aca7ac4e54 * fix page reload when click url is '#...'. 2021-08-11 11:29:38 +08:00
holan20180123 487662ad62 * Finish task #41237. 2021-08-11 10:58:03 +08:00
王怡栋 3adf8b4257 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 10:55:02 +08:00
Hao Sun fa86185291 * bug #14163, fix position of show-more-menu button in left menu. 2021-08-11 10:52:03 +08:00
hufangzhou ffe3bc0b31 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 10:26:49 +08:00
hufangzhou c90b7150a4 * Fix bug #14168. 2021-08-11 10:26:44 +08:00
王怡栋 5b33d7efde * change for api. 2021-08-11 10:23:00 +08:00
qiyu-xie 89d0a5c23e * Task#41220. 2021-08-11 10:03:41 +08:00
zenggang f58777432b * adjust my module api 2021-08-11 09:24:32 +08:00
tianshujie98 b16fa82740 * Compatible with lower version avatar output problem. 2021-08-11 09:15:29 +08:00
qiyu-xie a92ac04bac * Modify program list user avatar. 2021-08-11 09:07:31 +08:00
hufangzhou e28bf4f749 * Add the delete user dynamic action. 2021-08-11 08:22:22 +08:00
zenggang a246041747 + my module api 2021-08-10 19:12:17 +08:00
qiyu-xie d4a914e1df * Fix an error at task list. 2021-08-10 17:40:14 +08:00
tianshujie98 975bb6117a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 17:22:44 +08:00
tianshujie98 e4d86ff8d9 * Finish task #41231. 2021-08-10 17:22:28 +08:00
qiyu-xie e7a7b31264 * Modify task#41219. 2021-08-10 17:16:52 +08:00
dingguodong df3de3ba71 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 16:50:14 +08:00
dingguodong 1073b0cc36 * Optimize code for getData in entry and program model. 2021-08-10 16:48:35 +08:00
王怡栋 3cac516fb3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 16:26:46 +08:00
qiyu-xie 14c03ae920 * Finish task#41219. 2021-08-10 16:26:29 +08:00
王怡栋 d030b71784 * Adjust for check https. 2021-08-10 16:26:24 +08:00
hufangzhou 3c19d74e00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 15:53:18 +08:00
hufangzhou 6d5eb4fa8e * Finish task #41242. 2021-08-10 15:53:13 +08:00
leiyong 63038c836c * Finish task#40904. 2021-08-10 15:31:33 +08:00
tianshujie98 5020a6f181 * Fix the main library permission issue when upgrading the project. 2021-08-10 15:15:57 +08:00
tianshujie98 4eda336b27 * Finish task #41234. 2021-08-10 14:39:30 +08:00
dingguodong b53a22019e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 14:09:56 +08:00
dingguodong 74b26a72b0 * Put isonlybody back to api/helper.class.php . 2021-08-10 14:09:30 +08:00
zhujinyong 5a9f7f7a5d Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 14:07:59 +08:00
王怡栋 746cb1f8c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 14:06:49 +08:00
王怡栋 d0632b8ff3 * adjust show action. 2021-08-10 14:06:35 +08:00
zhujinyong cb40696190 * Enable CSRF protection by default. 2021-08-10 14:02:41 +08:00
dingguodong c4b9c9ef3c * Filter projectissues by label. 2021-08-10 13:57:13 +08:00
dingguodong 1f87bc88ee * Use same params for createLink function to removing warns. 2021-08-10 13:53:46 +08:00
qiyu-xie 853a0fb71c * Finish task#41219. 2021-08-10 13:38:01 +08:00
hufangzhou 8f351f9b22 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 13:34:32 +08:00
hufangzhou 96dc983fb6 * Finish task #41232. 2021-08-10 13:34:28 +08:00
dingguodong 5d14c1f8ce * Put some functions which call biz logic into entry model. 2021-08-10 13:26:05 +08:00
dingguodong 04c5a40c20 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 13:15:42 +08:00
dingguodong 4c9a8772b6 * Put general method createLink for API into helper. 2021-08-10 13:14:39 +08:00