1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-14 17:30:55 +00:00
Commit Graph

2267 Commits

Author SHA1 Message Date
astaxie
d1bba02958 refact beego config 2015-12-09 23:35:04 +08:00
nkbai
e8fe859a58 格式调整 2015-12-09 09:03:10 +08:00
nkbai
82e0105d22 Revert "windows下静态文件映射找不到问题,"
windows下路径需要filepath.ToSlash

This reverts commit 2c8cb5693e.
2015-12-04 23:15:06 +08:00
nkbai
ff0762cc19 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-03 15:50:21 +08:00
astaxie
3d4ad560f8 Merge pull request #1423 from JessonChan/fargo
fix the  accept encoding
2015-12-02 21:08:34 +08:00
astaxie
36664634f9 Merge pull request #1467 from astaxie/revert-1464-master
Revert "Update orm_querym2m.go"
2015-12-02 16:35:44 +08:00
astaxie
ed99c013a6 Revert "Update orm_querym2m.go" 2015-12-02 16:35:36 +08:00
astaxie
a1d5f958c5 Merge pull request #1464 from gobenon/master
Update orm_querym2m.go
2015-12-02 16:35:05 +08:00
astaxie
5d902264e5 Merge pull request #1459 from ryanchapman/develop
Log config parsing errors
2015-12-02 16:34:35 +08:00
gobenon
50f8f3bd20 Update orm_querym2m.go 2015-11-30 18:23:58 +02:00
nkbai
74ebcd28b2 grace init中的工作可以延后进行
实际上如果没有使用graceful启动,这些init的工作完全没用
当然其他模块也应该存在这样的工作,比如session中的sess_utils.go中的init工作
2015-11-30 16:15:35 +08:00
Ryan A. Chapman
7151b96465 Log config parsing errors
Beego currently handles the case of "conf/app.conf"
not existing, but all other errors are not logged.
This fixes that.

I ran into an issue where beego was not listening on the
correct port, and it turned out that the conf/app.conf file
had a colon ":" instead of an equal sign "=" (confusion of
INI vs YAML formats).  When there was a parsing error, beego
would give up on parsing app.conf and not log anything to the
console.
2015-11-29 15:09:28 -07:00
nkbai
2c8cb5693e windows下静态文件映射找不到问题,
path.Clean和filepath.Clean是有区别的
2015-11-27 12:10:39 +08:00
nkbai
d693ecf046 Revert "这种if型的初始化是有问题的"
This reverts commit 50132df809.
2015-11-26 20:37:36 +08:00
nkbai
6aaca2eca8 router.go Header 毫无用处
context/output.go 简化一下代码,更清晰
2015-11-26 14:56:39 +08:00
nkbai
f0474214fe GetInt等函数稍微简化一下,这样看上去更合理一些 2015-11-25 23:39:26 +08:00
astaxie
2c94d9eab2 Merge pull request #1451 from gobenon/master
fix issue 1438 opened by Ayelet Regev
2015-11-25 09:29:28 +08:00
JessonChan
40700a8532 Merge remote-tracking branch 'remotes/upstream/develop' into fargo
# Conflicts:
#	memzipfile.go
2015-11-25 09:11:32 +08:00
astaxie
fb7314f8ac Merge pull request #1450 from astaxie/revert-1439-master
Revert "Adding support for junction tables with other fields which arent FK and PK."
2015-11-24 23:00:15 +08:00
astaxie
b7fcd4f0b9 Revert "Adding support for junction tables with other fields which arent FK and PK." 2015-11-24 23:00:07 +08:00
astaxie
e48e09a4ab Merge pull request #1439 from gobenon/master
Adding support for junction tables with other fields which arent FK and PK.
2015-11-24 23:00:04 +08:00
astaxie
235b58504a Merge pull request #1449 from nkbai/master
controller_test.go 既然叫test,那就按照go的规则进行test吧
2015-11-24 15:54:46 +08:00
nkbai
5e915cb614 controller_test.go 既然叫test,那就按照go的规则进行test吧 2015-11-24 14:55:59 +08:00
JessonChan
9170b91075 go style format (remove the blank after comments) 2015-11-21 08:46:19 +08:00
astaxie
25320bf86a Merge pull request #1441 from nkbai/master
fix #1433
2015-11-20 21:50:55 +08:00
nkbai
50132df809 这种if型的初始化是有问题的 2015-11-20 21:34:01 +08:00
nkbai
83696a40f6 fix #1433 2015-11-20 11:18:45 +08:00
gobenon
efd30bdba7 Update orm_querym2m.go 2015-11-19 16:46:14 +02:00
gobenon
01aa1085e0 Merge pull request #1 from gobenon/gobenon-m2mpatch-1
Update orm_querym2m.go
2015-11-19 14:32:24 +02:00
gobenon
ca37557a26 Update orm_querym2m.go 2015-11-19 14:30:14 +02:00
astaxie
5a1e821a42 Merge pull request #1434 from WnP/pg-fix
fix postgres syntax error during migration
2015-11-19 12:25:21 +08:00
Steeve Chailloux
29ac961c10 fix postgres syntax error during migration 2015-11-18 06:46:44 -06:00
JessonChan
5d01afe3a6 isOk to check whether the file is latest 2015-11-16 14:05:05 +08:00
JessonChan
d963bb79bd avoid map-lock delete 2015-11-16 10:31:27 +08:00
JessonChan
bc2195b07f code simplify 2015-11-12 16:59:07 +08:00
JessonChan
46fbeaadad refactor accept encoder ,simplify the struct 2015-11-12 12:03:53 +08:00
JessonChan
214030fad4 bytes reader replace string reader 2015-11-12 11:44:29 +08:00
JessonChan
f8db8ae9c3 add some comments 2015-11-12 10:48:36 +08:00
JessonChan
a9881388f7 accept encoder header setting fixed 2015-11-12 10:08:57 +08:00
JessonChan
1200b7c347 method refactor 2015-11-11 18:06:18 +08:00
JessonChan
b25a1355f9 remove old code 2015-11-11 16:27:41 +08:00
JessonChan
d2c60619fa new static file support code 2015-11-11 16:22:40 +08:00
JessonChan
82c50b972d new test file 2015-11-11 16:22:05 +08:00
JessonChan
15b0b9b66d delete old static file code 2015-11-11 16:21:04 +08:00
JessonChan
e4c6e5d2e1 change package 2015-11-11 13:47:47 +08:00
JessonChan
f457ea0fe9 refactor encoder package 2015-11-11 13:47:36 +08:00
JessonChan
7ef9b3d55b runnable typo fixed 2015-11-10 14:07:26 +08:00
JessonChan
39e29caf9b refactor to fix encoder type bug 2015-11-10 13:42:10 +08:00
JessonChan
7ccf049a50 bug fixed 2015-11-10 13:27:33 +08:00
JessonChan
7964f7f163 test bug fixed 2015-11-10 13:16:16 +08:00