Commit Graph

341 Commits

Author SHA1 Message Date
wangyidong
aeaaeb67d8 * fix bug for cache. 2017-12-18 17:30:01 +08:00
wangyidong
1060a606c6 * finish task #3455. 2017-12-18 17:16:34 +08:00
滔哥
8bc6e888e8 * Task #3504 2017-12-08 13:50:20 +08:00
滔哥
cb9bba12a9 * Fix end date bug 2017-12-06 14:53:56 +08:00
wangyidong
dcec446d69 * fix bug for send mail with ztcloud. 2017-11-16 15:25:59 +08:00
wangyidong
97d490f008 * change for zh-tw lang. 2017-11-10 15:49:48 +08:00
wangyidong
9c2abdb523 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 13:39:30 +08:00
wangyidong
26b3e2c39f * finish task #3327. 2017-11-09 13:20:38 +08:00
滔哥
2f2c99f346 * Fix bug 2017-11-09 10:51:03 +08:00
liugang
930738c4a5 * Fix bug of dao::$cache. 2017-11-03 15:45:17 +08:00
滔哥
cd16f35a54 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-27 11:15:33 +08:00
滔哥
d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
wangyidong
8f90f7b8e6 * adjust for dao cache. 2017-10-27 11:14:13 +08:00
wangyidong
5bd85abc7c * fix for dao cache. 2017-10-27 10:57:15 +08:00
wangyidong
09e803a091 * adjust for dao cache. 2017-10-13 09:15:57 +08:00
pengjiangxiu
41a2fc9a8f * Finish task #3210. 2017-09-19 13:56:39 +08:00
wangyidong
66eabe8717 * fix for mail no subject. 2017-08-24 13:54:58 +08:00
wangyidong
b09ad76835 * adjust for safe. 2017-08-22 14:18:56 +08:00
wangyidong
a25a10d542 * finish task #3147 and update HTMLPurifier. 2017-08-16 13:32:34 +08:00
wangyidong
6db420de76 * adjust for framework page class. 2017-08-11 15:02:01 +08:00
wangyidong
a22d622db0 * fix for show <a> tag in modal with onlybody. 2017-07-17 17:11:13 +08:00
wangyidong
6179da02b8 * fix bug for process image url in windows. 2017-06-29 09:51:09 +08:00
pengjiangxiu
0d73f34c52 * fix filter params bug 2017-06-20 08:26:58 +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
wangyidong
a29c6f2143 * adjust code. 2017-06-14 16:11:08 +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
a7adfdc10c Fix bug#1014 markdown编辑器中的表格显示不正确 2017-04-21 14:13:18 +08:00
wangyidong
3d6bca84ef * adjust for check and repair table. 2017-04-19 10:03:33 +08:00
wangyidong
975a7b53c7 * adjust for check table. 2017-04-18 17:06:33 +08:00
wangyidong
05fc92c45c * adjust for upgrade. 2017-03-23 11:54:55 +08:00
wangyidong
c8d822e454 * rewrite convert pinyin. 2017-03-20 16:32:02 +08:00
wangyidong
c1427b373e * ignore empty order. 2017-02-24 10:23:04 +08:00
wangyidong
ce087026a7 * adjust for safe. 2017-02-14 16:04:02 +08:00
wangyidong
d17a138f05 * adjust for dao class. 2017-02-14 14:01:39 +08:00
wangyidong
4610fdad32 * check sql for safe in order and limit function. 2017-02-14 13:36:13 +08:00
wangyidong
1a004fc60c * finish task #2890. 2017-02-13 14:50:44 +08:00
wangyidong
6e374fbd13 * fix bug #966. 2016-12-30 10:32:10 +08:00
wangyidong
099aecdda6 * adjust for select with pinyin. 2016-12-29 17:35:02 +08:00
wangyidong
6ece360ab7 * adjust pinyin. 2016-12-29 17:30:13 +08:00
wangyidong
0866c20425 * adjust for send by ztcloud. 2016-12-29 16:20:18 +08:00
wangyidong
0873ca1864 * fix bug #973. 2016-12-28 09:27:04 +08:00
wangyidong
0a061c6f06 * fix bug #965. 2016-12-26 14:54:04 +08:00
wangyidong
1c6d9f4197 * adjust for ueditor and markdown. 2016-12-23 17:19:06 +08:00
wangyidong
86b0a414f5 * change for bind sendcloud. 2016-12-19 09:32:08 +08:00
wangyidong
6150ee7b76 * adjust for pinyin. 2016-12-09 09:38:13 +08:00
wangyidong
21eba69df9 * adjust for select with pinyin. 2016-12-06 14:22:18 +08:00
wangyidong
2f679cee93 * adjust for pinyin. 2016-12-06 10:33:09 +08:00