929 Commits

Author	SHA1	Message	Date
soddy	2dc865247d	session设置memory模式timeout无效 ... session设置memory模式时，timeout设置无效，修改了memory.js中的get方法，将Date.now() * 改成了 Date.now() +	2016-06-03 16:56:29 +08:00
lichengyin	5fb336924f	Fix eslint error	2016-05-25 14:29:00 +08:00
Welefen Lee	1670b942ce	Merge pull request #354 from UtillYou/master ... add order support for 'countSelect' on postgresql	2016-05-25 14:24:04 +08:00
lichengyin	cabf6b0f24	Remove set http status when handle error action	2016-05-19 19:23:57 +08:00
吴胜松	eb0b63d99c	修复了countSelect方法不能在postgresql中使用order的问题。 ... 方式为：通过在调用count方法前保存可能出现的order条件，在实际调用count时去除order条件，然后在select重新添加上可能的order条件	2016-05-16 17:09:48 +08:00
吴胜松	b38b3b1590	修正之前错误的提交	2016-05-16 16:48:09 +08:00
吴胜松	1c8ca7dcf0	Merge branch 'master' of https://github.com/UtillYou/thinkjs	2016-05-16 15:58:29 +08:00
lichengyin	78e9016aca	Fix wrong spelling	2016-05-14 12:54:55 +08:00
吴胜松	a2ce6e8ba0	add order support for 'countSelect' on postgresql	2016-05-13 18:31:37 +08:00
吴胜松	a5f7ea1e4c	add order support for 'countSelect' on postgresql	2016-05-13 18:26:29 +08:00
lichengyin	49fe90749c	Merge branch 'master' of github.com:75team/thinkjs ... # By 吴胜松 # Via Welefen Lee (1) and 吴胜松 (1) * 'master' of github.com:75team/thinkjs: fix postgresql idle connection closed determination	2016-05-11 08:24:10 +08:00
lichengyin	9964f6d3f0	Fix error when table field is keyword in increment & decrement method, fix #351	2016-05-11 08:23:57 +08:00
Welefen Lee	1bd00b4729	Merge pull request #350 from UtillYou/master ... fix postgresql idle connection closed determination	2016-05-09 15:43:18 +08:00
吴胜松	f606bb8527	fix postgresql idle connection closed determination	2016-05-09 15:35:38 +08:00
lichengyin	81828214a8	Support array for limit method in model	2016-05-05 16:00:48 +08:00
lichengyin	e9ab397d2d	Make model as argument for select condition in relation model	2016-05-05 15:57:50 +08:00
lichengyin	2bae4c12bb	Support set item value in logic validation	2016-05-05 10:10:42 +08:00
lichengyin	ffe63847fe	Fix error when set int:0 in logic validation	2016-05-05 09:58:31 +08:00
snadn	0c9aa0c670	添加view_parse返回结果判断	2016-04-29 08:37:28 +08:00
lichengyin	5b1ff5a356	Fix can not get insert id for postgresql, fix #338	2016-04-27 09:52:42 +08:00
lichengyin	fe4c767b2a	Fix not add cookie in db session	2016-04-26 17:56:30 +08:00
lichengyin	4a33aff075	Add prop method for http	2016-04-26 16:29:52 +08:00
lichengyin	15a993ce55	Add thenUpdate method for model, fix #312	2016-04-26 15:02:50 +08:00
lichengyin	199b231afb	Fix socket.io adapter, fix #342	2016-04-26 14:42:29 +08:00
lichengyin	62f0cf0388	Fix a promise was created in a handler but was not returned from it, fix #318	2016-04-26 12:12:38 +08:00
lichengyin	9b9e6a3446	Use node-mysql2 to replace node-mysql, fix #308	2016-04-26 11:58:55 +08:00
lichengyin	7d1e407e68	Fix can not auto update table schema in development env, fix #322	2016-04-26 11:30:06 +08:00
lichengyin	9abd98f8c0	Fix can not get cookie after set it, fix #314	2016-04-26 11:01:03 +08:00
lichengyin	c29a049667	Add beforeDelete(),beforeSelect(),beforeFind() for model, fix #327	2016-04-26 10:58:01 +08:00
Welefen Lee	651167dddb	Merge pull request #335 from qq312384485/master ... 修复与socket.io c++ client通信失败的问题	2016-04-23 16:52:38 +08:00
ZengYuhang	532481ed6d	修复语法错误	2016-04-23 16:19:53 +08:00
lichengyin	07bf0ece44	Fix test error	2016-04-23 15:34:52 +08:00
lichengyin	214b5a0ae2	update	2016-04-23 10:28:47 +08:00
ZengYuhang	e7d11efe90	修复与socket.io c++ client通信失败的问题	2016-04-22 15:41:30 +08:00
lichengyin	f131bcaa06	Add tpl_file property for http object	2016-04-20 09:56:26 +08:00
lichengyin	7d967aa6ec	Support http.getPayload method return buffer, fix #328	2016-04-19 11:15:54 +08:00
lichengyin	7538319c4e	Set colors.enabled = true;	2016-04-19 10:48:17 +08:00
ken	a5ec3abcad	Update mongo.js ... 增加 beforeUpadte	2016-04-15 16:32:27 +08:00
lichengyin	738ac1ef94	Ignore empty file when file compiling	2016-04-15 14:21:05 +08:00
ken	69b0d09d96	Update socket.io.js ... 优化语句	2016-04-15 01:59:32 +08:00
ken	83002308fc	Update app.js ... 暴露server 让更多控件可以使用	2016-04-15 01:56:13 +08:00
lichengyin	65dcb9703c	Fix test error	2016-04-07 18:19:52 +08:00
ken	b3ee761ddc	fixed multi connect and namespace ... fixed multi socket and namespace	2016-04-06 19:00:17 +08:00
lichengyin	0c3310756e	Fix missing a grade dirname in error message	2016-03-30 15:30:15 +08:00
lichengyin	13b510dd20	Fix parse bool value error for postgresql	2016-03-29 19:09:47 +08:00
lichengyin	7f4192bc4c	Fix parse bool value error for postgresql	2016-03-29 17:47:50 +08:00
lichengyin	0baf5a2bdc	Optimize session, when session cookie not exist, ignore fetch data	2016-03-29 10:27:12 +08:00
lichengyin	20c4c9b049	Optimise file session, if session data is empty and not changed, ignore flush	2016-03-29 10:16:36 +08:00
lichengyin	46fa36dad2	Rename encoding to charset in mysql	2016-03-27 16:24:30 +08:00
lichengyin	4498024eac	Fix get sum data error when field has ( and comma, fix #302	2016-03-25 13:05:47 +08:00