Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
12,105 Commits 2 Branches 292 Tags
2dbc8f4e38ff9b7e7047d5ec844a39fa46f85f6d
Commit Graph
361 Commits
Author SHA1 Message Date
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 5a529bcc54 * Refact view page and edit page of company. 2018-04-19 18:27:16 +08:00
wangyidong b9ab24ef89 * adjust for release module. 2018-04-18 11:18:41 +08:00
liugang 55fe6144b6 * Extend groupBy function of baseDAO. 2018-04-16 15:49:48 +08:00
liugang 532b35c2b3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-16 15:47:29 +08:00
liugang 4d0e6ba52e * Check fields in groupBy function and limit function for safety. 2018-04-16 15:46:45 +08:00
daitingting dafec6b33d * Rewrite create page of story. 2018-04-16 10:20:32 +08:00
daitingting 2fa7aa63b3 * Add title for select options. 
* Set wrap for options over width.
 2018-03-30 14:42:11 +08:00
wangyidong f459f4a3da * code for task #3663. 2018-03-28 13:52:26 +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 ea04270362 * adjust for block. 2018-03-07 14:31:26 +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 d71d582f3d * adjust code. 2017-12-29 11:25:53 +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
滔哥 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