Commit Graph

783 Commits

Author SHA1 Message Date
Lunny Xiao 00be2b792a Merge branch 'master' of github.com:go-xorm/xorm
Conflicts:
	engine.go
	session.go
2014-04-21 11:13:53 +08:00
Nash Tsai e86d5fd165 update changelog 2014-04-21 10:08:46 +08:00
Nash Tsai 97f31837ed update readme 2014-04-21 10:07:36 +08:00
Nash Tsai 1a4556f2d6 update README 2014-04-21 10:02:47 +08:00
Nash Tsai 23a3beaced convert to Engine's TZ location for TimeStruct when Get() 2014-04-21 09:58:12 +08:00
Nash Tsai 4afa1bc3dd fixed time.Time struct scan handling 2014-04-20 23:49:16 +08:00
Nash Tsai 2123467ce6 resolved merge 2014-04-20 18:19:06 +08:00
Lunny Xiao 0b7c242ddf bug fixed 2014-04-20 16:01:53 +08:00
S.W.H e3041f8706 Merge pull request #10 from go-xorm/master
bug fixed
2014-04-19 20:59:53 +08:00
Lunny Xiao 2d58f8fe46 bug fixed 2014-04-19 11:08:15 +08:00
Nash Tsai 0a22f9c018 resolved merge 2014-04-19 00:44:14 +08:00
Lunny Xiao 82e73d6002 bug fixed for Incr 2014-04-18 22:14:15 +08:00
Lunny Xiao 9a6458134a set db to dialect 2014-04-18 18:39:07 +08:00
Nash Tsai aa150a7ba2 update QuickStart 2014-04-18 16:46:58 +08:00
Nash Tsai 783e905649 Merge remote-tracking branch 'origin/dev' 2014-04-18 16:42:05 +08:00
Lunny Xiao 0d9c1a02eb add back SetMaxConns for compitable and set @deprecated 2014-04-18 10:52:33 +08:00
Nash Tsai ede19553c7 update version to v0.4.0 RC1 2014-04-17 23:43:57 +08:00
Nash Tsai 1b3785471f update changelog 2014-04-17 23:31:14 +08:00
Nash Tsai 3ef0b27d4a resolved merge from origin/dev 2014-04-17 23:25:50 +08:00
Nash Tsai a953d0a94c resolved merge 2014-04-17 23:24:23 +08:00
Nash Tsai 077621b771 pump version 0.4.0 M1 release 2014-04-17 23:22:32 +08:00
Nash Tsai b7690b1668 use time.Location struct instead of TimeZone string 2014-04-17 23:21:42 +08:00
S.W.H 7c747e6742 Merge pull request #103 from admpub/master
update
2014-04-17 22:42:14 +08:00
商讯在线 99a0987009 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-17 22:34:19 +08:00
S.W.H b21b2f598c Merge pull request #9 from go-xorm/master
update
2014-04-17 22:18:41 +08:00
Nash Tsai 52f7a96bfe resolved merge from origin/dev branch 2014-04-17 21:28:26 +08:00
Lunny Xiao 14ba638eb8 Merge branch 'dev' of github.com:go-xorm/xorm into dev
Conflicts:
	docs/QuickStart.md
	docs/QuickStartEn.md
	examples/cache.go
	examples/maxconnect.go
2014-04-17 17:21:29 +08:00
Nash Tsai 5de5a1c678 tidy up example codes 2014-04-17 17:08:21 +08:00
Lunny Xiao 3fd97df375 bug #100 resolved 2014-04-17 10:18:26 +08:00
Lunny Xiao e53ab0f412 Merge branch 'dev' of github.com:go-xorm/xorm into dev 2014-04-17 10:13:45 +08:00
Lunny Xiao 05e99e39c6 bug fixed 2014-04-17 10:13:16 +08:00
S.W.H 41e3d14f20 Merge pull request #99 from admpub/master
improved
2014-04-16 21:05:53 +08:00
商讯在线 a4876ffec2 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-16 20:56:04 +08:00
商讯在线 e8c0ff31b3 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-16 20:08:53 +08:00
S.W.H 1c100c7659 Merge pull request #7 from go-xorm/master
更新到最新版
2014-04-16 19:39:39 +08:00
Nash Tsai 58cdbaeab0 update xorm 0.3.2 changelog 2014-04-16 10:51:18 +08:00
Nash Tsai 895d976804 fixed cases Drivers and Dialects are not registered, where sql driver is loaded after xorm.init(), using explicit call to register Drivers and Dialects upon xorm.NewEngine() call 2014-04-16 01:25:01 +08:00
S.W.H 69701b973d Merge pull request #98 from admpub/master
Repair Time problem
2014-04-15 23:45:26 +08:00
商讯在线 aa9b62f275 update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-15 23:27:08 +08:00
Lunny Xiao 06e3d289d4 Merge pull request #97 from JamesMura/patch-2
Updated the references to the old repository
2014-04-15 21:56:42 +08:00
James Muranga ec58fa60ba Updated the references to the old repository
changed the links to point to https://github.com/go-xorm/xorm not https://github.com/lunny/xorm
2014-04-15 16:52:19 +03:00
Lunny Xiao 7eed0a92f1 Merge pull request #96 from JamesMura/patch-1
Fixing typo in README.md
2014-04-15 21:42:19 +08:00
James Muranga 4df762f350 Fixing typo in readme.md
schema
2014-04-15 15:09:20 +03:00
S.W.H 9682b65488 Merge pull request #5 from go-xorm/master
update
2014-04-15 19:52:04 +08:00
Nash Tsai 145358a74e update API comments 2014-04-15 14:37:10 +08:00
Nash Tsai 4b572f8460 Merge branch 'master' of github.com:go-xorm/xorm 2014-04-15 14:15:04 +08:00
Lunny Xiao 9a7a6cd4d2 move Inc() to Incr() 2014-04-15 12:14:18 +08:00
Lunny Xiao 1161484c92 Merge branch 'dev' of https://github.com/unphp/xorm into unphp-dev 2014-04-15 11:46:43 +08:00
Lunny Xiao feb1f45e72 Added NewDB(), DB(), Clone() and removed pool object and other improvements 2014-04-15 11:39:29 +08:00
unphp e2aa0ef2c2 Method In provides a update string 2014-04-15 10:55:32 +08:00