Commit Graph

75 Commits

Author SHA1 Message Date
Yagami
6a0af253dc * Fix task #6489. 2019-11-21 13:50:01 +08:00
Yagami
a8f40667f9 * Finish task #6489. 2019-11-15 09:51:25 +08:00
wangyidong
d6d649bdb4 * fix bug #1940. 2019-10-22 10:21:49 +08:00
wangyidong
cf3c318d07 * adjust for find questions. 2019-10-16 17:14:40 +08:00
wangyidong
1142a5a52a * finish task #6426. 2019-10-16 10:16:50 +08:00
wangyidong
6f38d68c1d * fix bug #2726. 2019-09-06 09:44:58 +08:00
wangyidong
5afc39c8e7 * finish task #6229. 2019-08-20 17:24:40 +08:00
wangyidong
0d11f9d881 * code for task #6180. 2019-08-07 13:10:07 +08:00
Catouse
c995214ff6 * fix bug #2379 and finish task #5247. 2019-01-25 16:59:57 +08:00
wangyidong
bd38aa3e86 * adjust for count method with group by. 2018-11-16 08:41:19 +08:00
wangyidong
e0950c3e8b * finish task #4940. 2018-09-26 15:11:54 +08:00
Catouse
21746c43a2 * fix cannot click submit button in hiddenwin form when trigger a error from remote server. 2018-09-20 16:26:25 +08:00
wangyidong
321d665abb * finish task #4655. 2018-08-08 11:30:57 +08:00
wangyidong
a53031cfdc * adjust for cleanINT. 2018-07-09 14:25:10 +08:00
liugang
a895d97dae * Change ojbect to object. 2018-07-03 09:00:26 +08:00
wangyidong
9e085e4b9b * finish task #4491. 2018-07-02 10:08:14 +08:00
wangyidong
02a5b86697 * adjust for ux. 2018-06-22 16:20:37 +08:00
liugang
1266a30bbc * Remove class btn-default.
* Merge conflicts.
2018-05-17 13:35:56 +08:00
Catouse
b6eb107c17 * output debug in config object. 2018-05-14 17:39:33 +08:00
Catouse
28300630ea * remove debug property from config object. 2018-05-08 17:11:15 +08:00
Catouse
de33978595 * change front helper class to output better js code. 2018-05-08 14:00:10 +08:00
wangyidong
56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
liugang
4d0e6ba52e * Check fields in groupBy function and limit function for safety. 2018-04-16 15:46:45 +08:00
daitingting
3b7afb5483 * Add condition for set function. 2018-03-27 10:24:56 +08:00
guanxiying
3877c7f111 * Fix check Limit code in orderby function. 2018-03-22 08:11:41 +08:00
wangyidong
8d64b4c9eb * change for 9.8.1 version. 2018-03-13 11:29:28 +08:00
wangyidong
c05073c2f9 * fix bug. 2018-01-19 18:00:26 +08:00
wangyidong
a4d4683a93 * fix bug #1347. 2018-01-17 10:43:13 +08:00
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
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
b09ad76835 * adjust for safe. 2017-08-22 14:18:56 +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