Commit Graph

213 Commits

Author SHA1 Message Date
wangyidong
fb48b45f0a * fix bug and code for batch edit user. 2017-12-07 14:19:35 +08:00
Xiying Guan
f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
滔哥
371b945d32 framework 2017-10-20 15:49:07 +08:00
滔哥
984f3940c9 change .gitignore 2017-10-20 14:31:55 +08:00
lvtao320
303ad1cb7d Update helper.class.php 2017-10-20 14:26:43 +08:00
滔哥
129834b30f * childTask and multiTask 2017-10-20 13:50:48 +08:00
wangyidong
ded7a07ad7 * adjust for oa. 2017-09-04 14:46:02 +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
19def0f2fd * adjust for filter cookie. 2017-06-12 10:47:15 +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
12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
daitingting
0f28e3cd52 * Adjust codes. 2017-05-09 14:09:52 +08:00
daitingting
ce174f973c * Set as working as only test. 2017-05-05 12:09:19 +08:00
wangyidong
53653b0572 Finish task#3002 禅道迁移目录之后,model临时文件能够自动重新生成。,cost:1 left:0 2017-05-02 10:05:49 +08:00
wangyidong
3d6bca84ef * adjust for check and repair table. 2017-04-19 10:03:33 +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
7d42927406 * adjust for convertEncoding. 2017-01-16 10:45:57 +08:00
wangyidong
0a061c6f06 * fix bug #965. 2016-12-26 14:54:04 +08:00
wangyidong
4b929ab7ae * adjust for convert encoding. 2016-12-09 11:54:16 +08:00
wangyidong
41341bb9f5 * adjust for safe. 2016-12-07 17:22:28 +08:00
wangyidong
feb0e70608 * finish task #2689. 2016-11-30 17:13:40 +08:00
wangyidong
582e392429 * code for task #2699,2791. 2016-11-18 17:12:09 +08:00
wangyidong
ce574424d3 * finish task #2794. 2016-11-15 16:29:23 +08:00
wangyidong
4983a57ee9 * fix bug for delete. 2016-11-09 09:33:37 +08:00
wangyidong
985e18282f * fix for jsonEncode4Parse in php5.3. 2016-07-11 09:39:18 +08:00
wangyidong
90f6005bc4 * adjust for php5.2 json_encode. 2016-07-11 09:21:04 +08:00
wangyidong
6a280b79e2 * json encode for parseJSON. 2016-06-28 14:15:54 +08:00
wangyidong
50561070fe * adjust for json_encode. 2016-06-27 11:17:40 +08:00
wangyidong
52882750dc * fix and adjust code. 2016-06-03 16:43:42 +08:00
wangyidong
a512350363 * adjust code. 2016-05-03 17:13:11 +08:00
wangyidong
0e5971967b * remove check domain in getSiteCode. 2016-04-26 16:23:24 +08:00
wangyidong
8362b154c7 * change for get viewType. 2016-04-26 10:25:45 +08:00
wangyidong
c5dcca79bf * set homepage for product/project/qa. 2016-04-15 11:32:46 +08:00
wangyidong
bfeaca5fa3 * change for browse in mobile. 2016-04-11 10:14:46 +08:00
wangyidong
63010c7886 * fix for load siteCode config. 2016-03-23 10:44:22 +08:00
wangyidong
a015353dea * fix for http://www.zentao.net/thread/86375.html. 2016-03-23 10:35:39 +08:00
wangyidong
cb601c8e91 * fix bug for model merge hook and setClientTheme. 2016-03-16 14:42:15 +08:00