Commit Graph
26549 Commits
Author SHA1 Message Date
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
tianshujie98 43f80cfc49 * Finish task #41228. 2021-08-10 13:14:03 +08:00
holan20180123 1e71901af9 * Finish task #41243. 2021-08-10 13:11:38 +08:00
hufangzhou b4f28ca7d7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 11:32:59 +08:00
hufangzhou 55d843ff40 * Finish task #41233. 2021-08-10 11:32:55 +08:00
tianshujie98 751900edf9 * Finish task #41215. 2021-08-10 11:31:15 +08:00
hufangzhou 105458335f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-10 11:29:19 +08:00
hufangzhou c070427e11 * Adjust the page style when the account without anyone custom doclib. 2021-08-10 11:29:14 +08:00
dingguodong 0fd19fec5b * Optimize createLink for every request type. 2021-08-10 10:42:45 +08:00
dingguodong 944ac9aec7 * Make createLink support PATH_INFO2. 2021-08-10 08:59:00 +08:00
dingguodong c641348c5c * Refactor send404 function and set to uniformed format. 2021-08-09 17:24:21 +08:00
王怡栋 ceb74bf406 * fix for updateWhitelist. 2021-08-09 17:11:34 +08:00
王怡栋 77df60a20d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-09 17:04:41 +08:00
王怡栋 f6904dc8ab * adjust for updatewhitelist when increase. 2021-08-09 17:04:12 +08:00
dingguodong c2d6dd8de6 * Refactor send404 function and set to uniformed format. 2021-08-09 16:59:23 +08:00
dingguodong 9fbd5e7507 * Change function name and optimize codes for API. 2021-08-09 16:47:19 +08:00
Hao Sun 8b1d769e67 * forbid open index/index in app's iframe to prevent infinite nesting. 2021-08-09 16:31:39 +08:00
dingguodong bc723e845b * Remove useless code and correct bad comments. 2021-08-09 16:07:50 +08:00
dingguodong 837be6276c * Correct bad comments of function. 2021-08-09 15:49:28 +08:00
dingguodong eea88163eb * Change default avatar creation rules. 2021-08-09 15:40:07 +08:00
dingguodong c453b99194 * Return details of assignedTo and openedBy for API. 2021-08-09 15:31:49 +08:00
dingguodong c231c51d63 * Correct codes for checkEntry functions. 2021-08-09 15:30:50 +08:00
qiyu-xie 506d2ec05f * Fix bug#14091. 2021-08-09 14:32:14 +08:00
wangyidong b22f1df1d6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-09 14:26:51 +08:00
wangyidong 0c6c88d2e6 * adjust for lower php version. 2021-08-09 14:26:22 +08:00
tianshujie98 7e28815aee * Fix bug #13862. 2021-08-09 14:15:31 +08:00
tianshujie98 6311a90388 * Fix bug #13932. 2021-08-09 13:57:25 +08:00
hufangzhou baae5fb361 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-09 13:53:53 +08:00
hufangzhou 26ce07e38d * Fix bug #13762. 2021-08-09 13:53:49 +08:00
tianshujie98 f9269d1c77 * Fix bug #13903. 2021-08-09 13:23:09 +08:00
hufangzhou 474d6597c4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-09 10:32:43 +08:00
hufangzhou 6888bea503 * Fix bug #14008. 2021-08-09 10:32:38 +08:00