Commit Graph

61 Commits

Author SHA1 Message Date
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
hufangzhou
8acfd6867f * Finish task#8205. 2020-11-12 10:49:33 +08:00
holan20180123
2365e400f6 * Finish task #8047. 2020-09-30 11:46:29 +08:00
holan20180123
b8cd16bb07 * Finish task #8047. 2020-09-30 11:44:26 +08:00
leiyong
cc046270aa * Project add type selection. 2020-09-21 14:56:13 +08:00
Yagami
66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
hufangzhou
1cec435441 * Finish task#7749. 2020-08-31 17:18:13 +08:00
holan20180123
14c6a36b0c * Finish task #7750. 2020-08-31 09:17:57 +08:00
sgm0422
0dc6796414 * Fix pgmID to pgm. 2020-07-01 15:55:35 +08:00
sgm0422
e480ce7902 * Code for cmmi. 2020-06-22 10:28:20 +08:00
wangyidong
1c29b742a0 * finish task #7079. 2020-04-28 13:26:10 +08:00
wangyidong
3e1795e257 * fix bug and config ur and sr. 2020-04-17 08:19:55 +08:00
wangyidong
9e83e63996 * code for php7.4. 2020-03-18 16:48:14 +08:00
wangyidong
6630dd0bb7 * code for task #6708. 2019-12-10 13:55:01 +08:00
guanxiying
0f74d12896 * Revert httponly param when set lang and theme cookie. 2019-11-21 15:41:41 +08:00
guanxiying
4e481bed19 * Add httpOnly param when setcookie. 2019-11-21 13:31:35 +08:00
wangyidong
7244bcda02 * code for task #6510. 2019-11-19 11:13:17 +08:00
wangyidong
c8835a5015 * adjust for check referer for api. 2019-11-13 10:08:17 +08:00
wangyidong
f522a79633 * change for CSRF. 2019-10-15 11:23:31 +08:00
wangyidong
f71f9c35c6 * adjust for english notes. 2019-08-21 10:12:08 +08:00
liugang
782de27ac6 * Optimize codes and add comments. 2019-07-29 15:53:31 +08:00
liugang
308bb3d1be * If the module and method if defined in workflow, run workflow engine. 2019-07-08 10:56:47 +08:00
wangyidong
670fb65ca0 * fix for include defaultvalue. 2019-03-28 11:21:52 +08:00
chenfei
58d5f35e26 * Finish task #5324. 2019-03-19 08:04:39 +08:00
wangyidong
8735d788e6 * adjust for task #5180. 2018-12-26 15:51:53 +08:00
wangyidong
7a8cc5c077 * adjust for check priv. 2018-12-20 14:35:11 +08:00
wangyidong
addb812be3 * finish task #5002. 2018-10-12 16:09:53 +08:00
wangyidong
d98adeccba * finish task #4976. 2018-10-12 09:08:12 +08:00
wangyidong
75e0e6555b * finish task #4976. 2018-10-11 15:38:26 +08:00
liugang
a895d97dae * Change ojbect to object. 2018-07-03 09:00:26 +08:00
wangyidong
51ce938acc * adjust code and fix bug. 2018-02-08 08:25:02 +08:00
wangyidong
783c5acfa3 * finish task #3570. 2018-01-04 09:46:30 +08:00
wangyidong
f77214be22 * adjust for merge ext model. 2017-07-28 13:37:05 +08:00
wangyidong
a4522a9e05 * change for merge hook. 2017-07-20 13:04:21 +08:00
wangyidong
9b863fe982 * fix bugs. 2017-07-17 16:49:59 +08:00
wangyidong
152daa4c39 * adjust framework. 2017-07-10 14:12:12 +08:00
wangyidong
5924091515 * adjust for framework and fix bug for search use today. 2017-07-05 13:17:45 +08:00
wangyidong
834bcdaeda * adjust for framework. 2017-07-03 09:39:12 +08:00
pengjiangxiu
c8f4f4fc0f fix bug for router-setParamsByPathInfo 2017-06-22 15:26:49 +08:00
pengjiangxiu
1920d57d3a * Adjust filter and framework 2017-06-22 13:35:16 +08:00
wangyidong
d18cc65d90 * merge new framework. 2017-06-16 16:52:45 +08:00
wangyidong
db4eca22ae * merge framework. 2017-06-15 11:37:04 +08:00
pengjiangxiu
757b9ecf71 * Adjust for framework. 2017-06-15 09:48:51 +08:00
wangyidong
de5c536659 * adjust for framework. 2017-06-14 15:23:38 +08:00
wangyidong
a37df65bc8 * mereg zentaophp framework to zentao. 2017-06-09 17:06:18 +08:00
wangyidong
90d12565de * fix bug. 2017-06-01 10:23:54 +08:00
wangyidong
a32496e911 * remove urlencode. 2017-02-14 13:39:43 +08:00
wangyidong
1a004fc60c * finish task #2890. 2017-02-13 14:50:44 +08:00
wangyidong
0a061c6f06 * fix bug #965. 2016-12-26 14:54:04 +08:00
wangyidong
41341bb9f5 * adjust for safe. 2016-12-07 17:22:28 +08:00