Commit Graph

548 Commits

Author SHA1 Message Date
betazk 84c7a6f7c0 Merge pull request #1 from betazk/test-branch
Update statement.go
2014-04-24 13:46:59 +08:00
betazk 3af0482e1b Update statement.go
delete the COLUMN in genAddColumnStr function
2014-04-24 13:38:07 +08:00
Lunny Xiao 86ce70fea2 Merge pull request #111 from micln/patch-1
Format
2014-04-23 19:26:04 +08:00
Holo 96d483e845 Format
Format directory 6.1
2014-04-23 16:47:52 +08:00
Lunny Xiao f419c31da1 bug fixs #105 2014-04-23 15:25:27 +08:00
Lunny Xiao edbdf1e612 docs small improved 2014-04-23 14:57:40 +08:00
Lunny Xiao 129f77f43c bug fixed 2014-04-23 14:01:53 +08:00
Lunny Xiao 8c79a0cc1d new dialect interface 2014-04-23 14:01:04 +08:00
Nash Tsai a4d3be797f Revert "update"
This reverts commit a25f371cbf.
2014-04-22 18:51:56 +08:00
S.W.H 991c033dac Merge pull request #109 from admpub/master
update
2014-04-21 23:18:00 +08:00
商讯在线 a25f371cbf update
Signed-off-by: 商讯在线 <swhbox@foxmail.com>
2014-04-21 23:07:37 +08:00
S.W.H 007ae2f188 Merge pull request #11 from go-xorm/master
update
2014-04-21 20:34:49 +08:00
Lunny Xiao f76246da0a small improvement 2014-04-21 17:49:34 +08:00
Lunny Xiao 57a6bb1157 bug fixed for mssql dialect 2014-04-21 16:31:56 +08:00
Lunny Xiao 445394e41f bug fixed 2014-04-21 16:17:30 +08:00
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