Commit Graph

4811 Commits

Author SHA1 Message Date
astaxie
e3c52b77d5 Merge pull request #947 from emrekeskinmac/master
merge conflict error fixed 052ca2a
2018-02-24 21:08:23 +08:00
astaxie
174c4e2689 Merge pull request #945 from zhilijiqi/patch-2
Update 05.5.md
2018-02-24 21:07:56 +08:00
astaxie
e867f9c59c Merge pull request #946 from zhilijiqi/patch-3
Update 05.5.md
2018-02-24 21:07:09 +08:00
astaxie
22ddf325ba Merge pull request #944 from isLishude/patch-2
fix url markdown
2018-02-24 21:00:37 +08:00
astaxie
ae6c57e689 Merge pull request #943 from isLishude/patch-1
omit 2nd value from range
2018-02-04 18:09:47 +08:00
Emre
b153668e4a merge conflict error fixed 2018-01-12 21:32:32 +03:00
Emre
052ca2a390 merge conflict error fixed 2018-01-12 21:28:50 +03:00
zhilijiqi
df858def31 Update 05.5.md
没有默认返回值,也没有 panic err
2018-01-11 18:25:41 +08:00
zhilijiqi
0dbbf27192 Update 05.5.md
1、init函数中mysql演示配置和下面不一致,容易引起误解
2、orm := orm.NewOrm(),命名冲突。报名和变量名冲突。
3、使用原生sql示例缺少包名orm,易引起误会
2018-01-11 18:18:48 +08:00
isLishude
cf2d86b448 fix url markdown 2018-01-09 21:32:48 +08:00
isLishude
ea012b2688 omit 2nd value from range 2018-01-09 19:16:40 +08:00
astaxie
73307a94c6 Merge pull request #942 from zhilijiqi/patch-1
int 和 string 使用 == 比较,可能会产生问题
2018-01-08 21:43:31 +08:00
zhilijiqi
4acb53f116 int 和 string 使用 == 比较,可能会产生问题
```Go

slice:=[]string{"1","2"}

for _, v := range slice {
	if v == r.Form.Get("gender") {
		return true
	}
}
return false
2018-01-08 11:38:34 +08:00
astaxie
6a8c7e4ae1 Merge pull request #941 from invzhi/master
Fix mistake in code and format comma
2018-01-04 17:30:27 +08:00
invzhi
8d3cb8c70e Fix mistake in code 2018-01-02 15:07:07 +08:00
invzhi
d24d5c8e25 Merge remote-tracking branch 'upstream/master' 2018-01-02 15:00:37 +08:00
astaxie
8f0acc3eb6 Merge pull request #928 from jhaynie/patch-1
Fix example to close the rows object
2018-01-01 18:42:27 +08:00
astaxie
6b1cbc9636 Merge pull request #939 from emrekeskinmac/patch-1
Update 02.2.md
2018-01-01 18:42:04 +08:00
astaxie
39511ed730 Merge pull request #938 from yuansmin/master
fix example User
2018-01-01 18:41:06 +08:00
astaxie
b67c173753 Merge pull request #940 from jasonrogena/02.1-typo
'is in' Grammatical Error In en/02.1
2018-01-01 18:40:16 +08:00
invzhi
378a143829 Use ',' instead of ',' 2017-12-28 08:57:01 +08:00
Jason Rogena
986d27a143 'is in' Grammatical Error In en/02.1
Fix a grammatical error in en/02.1 by changing the following sentence
from:
  One of the significant improvements in in code formatting.
to:
  One of the significant improvements is in code formatting.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>
2017-12-22 12:31:51 +03:00
Emre Keskin
e9fabce626 Update 02.2.md
a small arrangement
2017-12-21 23:27:33 +03:00
yuansmin
301ef4b174 fix example User 2017-12-21 13:20:29 +08:00
invzhi
9ec8f82415 Merge remote-tracking branch 'upstream/master' 2017-12-18 21:28:13 +08:00
astaxie
b6e7b62f0f Merge pull request #934 from yizhiheng/patch-1
Fix a little mistake in Chinese docs
2017-12-18 19:30:41 +08:00
astaxie
f3ed9164cc Merge pull request #935 from invzhi/master
Update some code and tweak format details
2017-12-18 19:30:14 +08:00
astaxie
018021a8cc Merge pull request #936 from starriv/patch-1
Update 02.2.md
2017-12-18 19:24:09 +08:00
starriv
e83062476f Update 02.2.md
fix bug
2017-12-18 16:55:04 +08:00
invzhi
f221a62577 Add comma 2017-12-16 19:23:46 +08:00
invzhi
ba974656c6 Remove dead code 2017-12-12 20:43:31 +08:00
invzhi
ebd5fea9ed Separate code from different package 2017-12-12 20:24:53 +08:00
invzhi
aaf5b4b109 Use ',' instead of ',' 2017-12-12 20:23:13 +08:00
invzhi
a5adbc7e7e Add space in comments 2017-12-12 19:46:12 +08:00
invzhi
ef86349c68 Rename 'maxlifetime' to 'maxLifeTime' 2017-12-12 19:30:41 +08:00
invzhi
d01f0230cb Add space after ',' 2017-12-12 19:24:22 +08:00
invzhi
b724060135 Update code 2017-12-12 19:22:53 +08:00
invzhi
75e5460ba9 Format 2017-12-12 09:05:59 +08:00
invzhi
69ff82cb10 Update code 2017-12-12 09:03:17 +08:00
Zhiheng Yi
212e740ec5 Update 03.1.md 2017-12-11 13:57:30 -05:00
astaxie
0ba3aab169 Merge pull request #933 from invzhi/master
Tweak many details
2017-12-11 22:13:29 +08:00
invzhi
abc3961a5b Fix abandoned usage: use 'rand.Read' instead of 'rand.Reader' to generate a random string 2017-12-11 20:58:15 +08:00
invzhi
ac119ccb0f Use ',' instead of ',' 2017-12-11 20:15:12 +08:00
invzhi
0e3809fc5c Fix typo: provide -> provider 2017-12-11 20:13:23 +08:00
invzhi
d84a731d6c Modify zh/06.1.md 2017-12-11 18:41:47 +08:00
astaxie
ef0d8b5693 Merge pull request #932 from invzhi/master
Fix typo: userdeatail -> userdetail
2017-12-10 18:24:02 +08:00
invzhi
2d93df8025 Modify zh/06.1.md 2017-12-07 21:28:23 +08:00
invzhi
7690ccd82c Modify zh/05.1.md 2017-12-07 20:26:22 +08:00
astaxie
50e98d975c Merge pull request #931 from baijinping/patch-1
修复拼写错误
2017-12-07 11:21:35 +08:00
baijinping
44652d73d3 修复拼写错误 2017-12-07 10:41:39 +08:00