1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-16 15:10:54 +00:00
Commit Graph

1874 Commits

Author SHA1 Message Date
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
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
astaxie
2c94d9eab2 Merge pull request #1451 from gobenon/master
fix issue 1438 opened by Ayelet Regev
2015-11-25 09:29:28 +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
astaxie
25320bf86a Merge pull request #1441 from nkbai/master
fix #1433
2015-11-20 21:50:55 +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
astaxie
821b2f832e fix the type assert 2015-11-09 11:03:57 +08:00
astaxie
9b725c73c3 Merge pull request #1376 from JessonChan/develop
static file code refactor and bug fixed
2015-11-08 23:21:16 +08:00
JessonChan
860568cb6c modified as astaxie reviews
https://github.com/astaxie/beego/pull/1376
2015-11-06 18:51:53 +08:00
astaxie
dc3e324f38 Merge pull request #1418 from ElvizLai/patch-1
Update context.go
2015-11-05 22:39:34 +08:00
Yongzheng Lai
b8fc42d38d Update context.go
all this status was setting in error.go, this line will cause multi-resp
2015-11-05 21:20:57 +08:00
astaxie
a26dee556d fix #1335 2015-11-05 00:19:09 +08:00
astaxie
fd4630c6dd impove the ResponseWriter. fix #1410 2015-11-04 23:52:42 +08:00
astaxie
e3120226fa Merge pull request #1414 from FlamingTree/develop
bugfix: graceful failed when both enable http and https
2015-11-04 23:27:27 +08:00
astaxie
25bec8bbe9 Merge pull request #1381 from ADone/m2m_reverse_bug
fix #671
2015-11-04 23:20:22 +08:00
astaxie
a257a924a1 Merge pull request #1379 from pjoe/non_int_fk
orm: Fix handling of rel(fk) to model with string pk
2015-11-04 22:26:33 +08:00
astaxie
c7e9a86b00 Merge pull request #1415 from johndeng/develop
Fixed typos
2015-11-04 13:08:37 +08:00
John Deng
205de8418d Fixed typos 2015-11-03 23:43:34 +08:00
shaoguang
f81929c28c bugfix: graceful failed when both enable http and https 2015-11-03 14:53:26 +08:00
astaxie
58ed1436cc Merge pull request #1409 from superhacker777/patch-2
XSRFFormHtml() should also generate XSRF token.
2015-10-28 15:54:07 +08:00
Mikhail Devyatov
5d18a7466c XSRFFormHtml() should also generate XSRF token. 2015-10-27 20:16:47 +03:00
astaxie
912abe3272 fix #1388 2015-10-12 21:26:18 +08:00
astaxie
4ba50e5df5 fix #1385 2015-10-12 20:50:58 +08:00
astaxie
332fa44231 Merge pull request #1384 from pjoe/update_err_fix
Fix dbBase.Update not returning error on failure
2015-10-12 20:43:22 +08:00
Pelle Johnsen
174e758d19 Fix dbBase.Update not returning error 2015-09-28 14:07:35 +02:00
Pelle Johnsen
cfcce4f5dc Fix handling of rel(fk) to model with string pk 2015-09-22 12:23:51 +02:00
JessonChan
1abf85ed2a simplify the switch code 2015-09-22 15:18:24 +08:00
JessonChan
d4f3dfd527 return when find static path 2015-09-22 14:15:41 +08:00
JessonChan
6ad215a9bb mem zip file var refactor 2015-09-22 14:11:02 +08:00
JessonChan
9c17f73489 code refactor 2015-09-22 13:48:34 +08:00
JessonChan
4995f91547 code refactor 2015-09-22 13:46:20 +08:00
JessonChan
936cb735e1 file extensions bug fixed 2015-09-22 13:27:35 +08:00
JessonChan
f708ce0299 当有设置的压缩类型时,丢弃默认类型(css,js) 2015-09-22 12:24:52 +08:00
JessonChan
dc38b324e0 code bug fixed 2015-09-22 12:19:31 +08:00
JessonChan
b9fb3a62f5 static file name default lower case 2015-09-22 11:59:48 +08:00
astaxie
95ef4c7136 server index.html in beego with ServeContent 2015-09-21 23:56:24 +08:00
astaxie
eb85e8e328 path.Clean can't clean window separate .."
"
2015-09-20 19:59:30 +08:00
astaxie
e26720496f remove the dupl 2015-09-19 20:05:57 +08:00
astaxie
8af8936ee0 Merge pull request #1368 from JessonChan/fargo
error bug fixed and clean code
2015-09-19 15:10:22 +08:00
JessonChan
07a424581d // beego.Run("localhost") 2015-09-19 05:53:28 +08:00