Commit Graph

4834 Commits

Author SHA1 Message Date
Andrew Grigorev
b034273f95 Removed strange statement about encryption
base64 is not an encryption algorithm, and there is no mention of DES in this chapter
2018-04-09 04:52:42 +03:00
astaxie
412d6fd441 Merge pull request #968 from windard/zh_fix_typo
fix typo
2018-03-20 00:01:50 +08:00
windard
e0630852b7 fix typo 2018-03-19 15:44:27 +08:00
astaxie
33ec5e076d Merge pull request #964 from Hunternnm/master
Update ru/01.0.md ru/03.4.md ru/04.6.md
2018-03-11 10:51:32 +08:00
Ivan Porozhnyy
f00566b0d3 Update ru/04.6.md 2018-03-03 11:41:49 +02:00
Ivan Porozhnyy
52b3f215b0 Update ru/03.4.md 2018-03-03 11:14:44 +02:00
Ivan Porozhnyy
7bfa99a5fd Update ru/01.0.md 2018-03-03 11:00:24 +02:00
astaxie
fbb40b0897 Merge pull request #962 from 0x0400/patch-1
typo: 即 --> 既
2018-03-02 16:05:40 +08:00
Xingang Zhang
e1d460c4cc typo: 即 --> 既 2018-03-01 22:51:42 +08:00
astaxie
359a0d093a Merge pull request #961 from Lcrnice/master
Fix text
2018-02-24 21:15:02 +08:00
astaxie
b85b992f8b Merge pull request #960 from viccuad/patch-1
Add "hash" to redis data types list in description
2018-02-24 21:14:36 +08:00
astaxie
c2e889255b Merge pull request #955 from overcat/patch-1
spelling mistake
2018-02-24 21:14:18 +08:00
astaxie
42047921d1 Merge pull request #953 from zhilijiqi/patch-7
Update 10.3.md
2018-02-24 21:13:28 +08:00
astaxie
9d293af38f Merge pull request #952 from zhilijiqi/patch-6
Update 10.2.md
2018-02-24 21:12:59 +08:00
astaxie
1313cdec05 Merge pull request #951 from zhilijiqi/patch-5
Update 09.5.md
2018-02-24 21:09:45 +08:00
astaxie
e6f19ded59 Merge pull request #948 from zhilijiqi/patch-4
Update 05.6.md
2018-02-24 21:09:01 +08:00
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
LiuChuanRui
157dc17aea Fix text 2018-02-24 16:25:44 +08:00
Victor Cuadrado Juan
9d75d9507d Add "hash" to redis data types list in description 2018-02-13 16:36:30 +01:00
overcat
61f1718103 spelling mistake
https://www.jetbrains.com/go/
2018-02-04 19:03:02 +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
zhilijiqi
090e5fcfd9 Update 10.3.md
文字调
2018-01-23 03:17:12 +00:00
zhilijiqi
cd83d37030 Update 10.2.md
1格式化货币函数调用错误,
2缺少路径分割符"/",
3页面引用错误,删除"VV."
2018-01-22 12:47:06 +00:00
zhilijiqi
f31fc75702 Update 09.5.md
重复字符
2018-01-22 06:22:52 +00:00
zhilijiqi
aade35f593 Update 05.6.md
多了一个逗号,不知道是否会引起错误
2018-01-15 09:33:49 +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