archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-02-01 15:23:03 +00:00
Code Issues Projects Releases Wiki Activity
2,379 Commits 13 Branches 87 Tags
Commit Graph

2379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lichengyin
2b15e4279a fix windows test error 2015-12-17 16:24:30 +08:00
lichengyin
e12cdd1322 fix windows test error 2015-12-17 16:16:21 +08:00
lichengyin
99d5544791 fix windows test error 2015-12-17 16:14:25 +08:00
lichengyin
4d386c6f99 fix windows test error 2015-12-17 16:10:40 +08:00
lichengyin
9a3143d087 fix windows test error 2015-12-17 16:08:36 +08:00
lichengyin
3f28342192 fix windows test error 2015-12-17 15:55:21 +08:00
lichengyin
da4754508c fix windows test error 2015-12-17 15:50:11 +08:00
lichengyin
5f81d073fc fix windows test error 2015-12-17 15:48:13 +08:00
lichengyin
aba4bd4ef9 fix windows test error 2015-12-17 15:44:42 +08:00
lichengyin
24a21e13ae fix windows error 2015-12-17 15:30:47 +08:00
lichengyin
89d17c82c8 fix windows error 2015-12-17 15:28:52 +08:00
lichengyin
ae38a9e37e fix windows error 2015-12-17 15:25:33 +08:00
lichengyin
0d136d2d95 use think.sep instead of / 2015-12-17 14:48:05 +08:00
lichengyin
124f5231e1 when parse json payload error, use query string parse instead 2015-12-17 11:06:21 +08:00
lichengyin
ebb85e4f1a avoid http._file changed when change file data 2015-12-17 10:28:06 +08:00
lichengyin
24c8db4b1c fix parse query error when pathname has encode chars 2015-12-17 10:13:32 +08:00
lichengyin
521c979eb2 optimise think.js 2015-12-17 09:56:00 +08:00
lichengyin
e3c30c3d05 Merge branch 'master' into 2.1 
* master:
  fix parse rest resource id
 2015-12-15 09:17:37 +08:00
lichengyin
08502e35d3 fix parse rest resource id 2015-12-15 09:17:18 +08:00
lichengyin
cf1da558e1 change db config in template 2015-12-10 10:32:00 +08:00
lichengyin
834ad2611b use async to get template file content 2015-12-09 19:02:46 +08:00
lichengyin
5020d003f2 prevent next middlewares invoked when middleware return null in hook 2015-12-09 18:53:23 +08:00
lichengyin
ffd25e81b7 change language to lowercase 2015-12-09 18:48:29 +08:00
lichengyin
09292c600d add countSelect test case 2015-12-09 18:13:55 +08:00
lichengyin
49b816e2e6 Merge branch 'master' into 2.1 
* master:
  release 2.0.13
  clear bootstrap files cache before load
  fix parseConfig error when has adapter config
  fix error when use alias in countSelect method
  open auto escape in nunjucks
  fix test error
  修复update的时候因为误删了id字段导致不能关联更新的bug
  cache adapter的bug修复
  release 2.0.12
  fix auto reload fail in windows

Conflicts:
	src/core/think.js
	src/index.js
	src/model/base.js
	test/model/base.js
 2015-12-09 17:29:14 +08:00
lichengyin
286b6b6517 fix model test error 2015-12-09 17:10:44 +08:00
lichengyin
71c7721702 release 2.0.13 2.0.13 2015-12-08 09:05:54 +08:00
lichengyin
2f8a4b2070 clear bootstrap files cache before load 2015-12-07 11:57:23 +08:00
lichengyin
639aae0aa8 fix parseConfig error when has adapter config 2015-12-07 10:38:13 +08:00
lichengyin
344b91271a fix error when use alias in countSelect method 2015-12-07 10:36:30 +08:00
lichengyin
8685b12bb6 open auto escape in nunjucks 2015-12-07 10:34:48 +08:00
lichengyin
39bfa0352c fix test error 2015-12-07 10:34:32 +08:00
Welefen Lee
5655b1e792 Merge pull request #220 from akira-cn/master 
修复update的时候因为误删了id字段导致不能关联更新的bug
 2015-12-07 09:34:35 +08:00
akira_cn
ba781ecbbd 修复update的时候因为误删了id字段导致不能关联更新的bug 2015-12-05 00:47:00 +08:00
akira_cn
7173654dc8 Merge branch '2.1' of github.com:75team/thinkjs into 2.1 2015-12-05 00:20:18 +08:00
akira_cn
3362602ed4 修复update的时候因为误删了id字段导致不能关联更新的bug 2015-12-05 00:19:44 +08:00
lichengyin
c4ba0241ea change position of runtime path 2015-12-04 21:59:33 +08:00
lichengyin
e793908e3f fix nunjucks test error 2015-12-04 18:52:03 +08:00
lichengyin
8979b94f02 add think global variable for nunjucks template engine 2015-12-04 18:29:05 +08:00
lichengyin
75d91e3274 update nunjucks to 2.2.0 2015-12-04 18:18:38 +08:00
lichengyin
e7db00cf4a separate file .thinkjsrc to thinkjsrc & es6_thinkjsrc 2015-12-04 18:16:15 +08:00
lichengyin
043c778e4a replace http to https in template file index_index.html 2015-12-04 18:14:46 +08:00
lichengyin
3581c6267c change filename .gitignore to gitignore in template/plugin 2015-12-04 15:43:38 +08:00
lichengyin
3499973b2b fix can not create .gitignore file when new app 2015-12-04 15:37:32 +08:00
lichengyin
a3142be6dc fix parseConfig error when has adapter config 2015-12-04 15:33:39 +08:00
lichengyin
381d4a6f0a Merge branch '2.1' of github.com:75team/thinkjs into 2.1 
# By akira_cn
# Via akira_cn
* '2.1' of github.com:75team/thinkjs:
  编译文件后重新加载的时候会导致bootstrap中的adapter等数据被清除，因此bootstrap必须重新加载
  修复memcache、redis的cache adapter的bug;
 2015-12-04 14:22:13 +08:00
lichengyin
6100eefcda change fn,variable name avoid equal to method name 2015-12-04 14:22:04 +08:00
akira_cn
47d68d35a1 编译文件后重新加载的时候会导致bootstrap中的adapter等数据被清除，因此bootstrap必须重新加载 2015-12-04 03:04:17 +08:00
akira_cn
a9ddcb0972 修复memcache、redis的cache adapter的bug; 2015-12-03 22:53:31 +08:00
akira-cn
3e7125444f Merge pull request #218 from akira-cn/master 
cache adapter的bug修复
 2015-12-03 22:49:16 +08:00