傅小黑
5b1afcdb5a
add timeout description for file and memory cache.
2013-12-24 21:56:48 +08:00
傅小黑
053e7a6aa6
Merge remote-tracking branch 'astaxie/master'
2013-12-24 21:09:17 +08:00
astaxie
62188a37c6
Merge branch 'master' of https://github.com/astaxie/beego
2013-12-24 15:27:23 +08:00
astaxie
0b659961ba
clearly the router, If user set the third params, will not follow the RESTful method
2013-12-24 15:27:00 +08:00
astaxie
37aa2dc19f
Merge pull request #409 from RickyLin/master
...
Added LayoutSections property to Controller
2013-12-23 23:21:42 -08:00
傅小黑
ba94479efd
Merge remote-tracking branch 'astaxie/master'
2013-12-24 13:05:09 +08:00
Ricky Lin
4a3902432a
Added LayoutSections property to Controller
...
users can define 0 or multipe sections in the Layout template file so
all kinds of content such as scripts, css can go to proper sections in
the generated html file.
2013-12-24 00:13:24 +08:00
astaxie
fc19f8f183
Merge pull request #408 from jinguoli/master
...
convert to unix eol
2013-12-23 05:16:14 -08:00
jinguoli
8c9320725b
convert to unix eol
2013-12-23 11:46:11 +08:00
astaxie
0eaa58e0ca
Merge pull request #406 from wangdx/patch-2
...
name → Name
2013-12-22 04:09:56 -08:00
dongxu
2add87b829
name → Name
...
typo
2013-12-22 17:57:45 +08:00
傅小黑
ba3a9bee4c
Merge remote-tracking branch 'astaxie/master'
2013-12-22 16:25:08 +08:00
astaxie
5260a60ad2
Merge pull request #405 from wangdx/patch-1
...
RESTFul → RESTful
2013-12-21 23:58:20 -08:00
dongxu
eb5d11c01b
Update README.md
...
RESTFul → RESTful
2013-12-22 15:56:15 +08:00
傅小黑
f96eec6dea
fix a code broken when documenting
2013-12-22 15:31:49 +08:00
astaxie
e858f903a3
Merge pull request #404 from fuxiaohei/master
...
add comments in cache package
2013-12-21 23:28:43 -08:00
傅小黑
4037f952ec
fix a code broken when documenting
2013-12-22 15:23:43 +08:00
傅小黑
6cb3f588c7
fix comments typo in beego package/
2013-12-22 15:09:33 +08:00
傅小黑
8b0929b4bc
add comments in cache package files.
2013-12-22 13:35:02 +08:00
slene
fc339fc3e0
orm detect mysql timezone #403
2013-12-21 21:00:29 +08:00
astaxie
2c868a9557
make datePatterns hide
2013-12-21 20:44:34 +08:00
astaxie
8ba6dbb9a0
Merge pull request #402 from fuxiaohei/master
...
add api comments in file memzipfile.go,reload.go,router.go,template.go and templatefunc.go
2013-12-21 03:55:10 -08:00
傅小黑
ff18ae2562
add api comments in file memzipfile.go,reload.go,router.go,template.go and templatefunc.go, fix spelling error GetInitListner as GetInitListener.
2013-12-21 13:19:24 +08:00
astaxie
57781d1001
when panic show the request url
2013-12-21 01:20:35 +08:00
astaxie
419c3fc772
remove contextBuffer fix #396
2013-12-21 00:34:59 +08:00
astaxie
2ad399db05
Merge pull request #400 from fuxiaohei/master
...
add api comments
2013-12-20 07:23:12 -08:00
傅小黑
eb9b958309
gofmt commented go file
2013-12-20 23:15:00 +08:00
傅小黑
ce332713c4
gofmt commented go files
2013-12-20 22:35:16 +08:00
astaxie
e18b9f0321
Merge pull request #399 from Max-Liu/master
...
repaired the wrong IP when using in localhost (Mac os x)
2013-12-20 06:19:23 -08:00
傅小黑
b459cf2347
add api comments in file config.go, controller.go, filter.go and flash.go
2013-12-20 21:16:26 +08:00
傅小黑
933e98e4f2
add api comments in file beego.go
2013-12-20 19:36:54 +08:00
傅小黑
3f3bf299a6
add api comments in file app.go
2013-12-20 19:20:13 +08:00
Max Lau
b08a4a86c1
repaired the wrong IP when using in localhost (Mac os x)
...
it returns “[“ when using beego in local host(Mac os x 10.9) , it
appears that Request.remoAddr returns “[::1]:****”
2013-12-20 18:56:02 +08:00
astaxie
3f0e55de56
reverse pull request 397, it not a bug. Just should this way
2013-12-20 13:20:09 +08:00
astaxie
235d2740c7
Merge pull request #397 from pengfei-xue/devel
...
fix routing bug
2013-12-19 21:06:54 -08:00
Pengfei Xue
00020139c5
fix routing bug
2013-12-20 11:38:29 +08:00
slene
7aa307bd24
fix: re-parse config in windows
2013-12-20 11:21:48 +08:00
astaxie
1c434dc6f4
Merge pull request #394 from fuxiaohei/master
...
add api comments in file admin.go
2013-12-19 07:51:22 -08:00
傅小黑
8cc8b022ee
add api comments in file admin.go
2013-12-19 23:46:06 +08:00
astaxie
05e197ffff
fix #391
2013-12-19 22:02:25 +08:00
astaxie
d718d9c8ee
beego 1.0 release
2013-12-19 21:09:45 +08:00
astaxie
f752c98d81
Merge branch 'master' of https://github.com/astaxie/beego
2013-12-19 19:52:52 +08:00
astaxie
7c3d1d3402
fix type HasTemplateEXt to HasTemplateExt
2013-12-19 19:52:01 +08:00
slene
764bbd9897
#390 should use filepath.Dir instead of path.Dir for.
2013-12-19 19:04:57 +08:00
astaxie
67b9c63528
Merge pull request #390 from 1fei/master
...
更新logs的初始化部分
2013-12-19 02:54:37 -08:00
1fei
b87e122ac4
Update smtp.go
2013-12-19 18:16:06 +08:00
1fei
dcaff38cb9
Update file.go
2013-12-19 18:15:46 +08:00
1fei
b68c814c50
Update console.go
...
使用json直接初始化系统变量,代码更简单,并且便于后期扩展
2013-12-19 18:15:00 +08:00
1fei
9076ce7d17
Update conn.go
...
使用json直接初始化相关变量,代码更简单。如果把协议的首字母改大写会更简单,但不好改谢大的协议。
2013-12-19 18:13:10 +08:00
astaxie
c9ccb9cc71
Merge pull request #389 from 1fei/master
...
Update httplib.go
2013-12-19 01:10:08 -08:00