astaxie
81328b72fa
Merge pull request #2309 from mengskysama/patch-1
...
statistics lock
2016-12-06 15:03:10 +08:00
mengskysama
c0c113036b
statistics lock
2016-12-06 14:57:15 +08:00
astaxie
90999717dd
Merge branch 'develop'
2016-12-05 23:14:26 +08:00
astaxie
a20ccde90d
beego 1.7.2
2016-12-05 22:58:29 +08:00
astaxie
d548ddeb5b
Merge pull request #2267 from centos-ren/develop
...
Fix :supervisor work dir
2016-12-05 22:57:38 +08:00
astaxie
de99ac5da5
Merge pull request #2197 from OlegFX/master
...
policies implementation
2016-12-05 22:45:07 +08:00
astaxie
e2d9d34c75
Merge pull request #2272 from szyhf/Fix#2263
...
Another Fix to #2263
2016-12-05 22:40:54 +08:00
astaxie
bdb525831d
Merge pull request #2293 from DusanKasan/develop
...
resolves #2291 , introduces AndNotCond/OrNotCond to orm.Condition
2016-12-05 22:40:35 +08:00
astaxie
22dba90ec4
Merge pull request #2305 from songtianyi/fixtypo-Getfiles
...
typo fix in comments, Getfiles-->GetFiles
2016-12-05 15:09:57 +08:00
songtianyi
7af6dad58e
typo fix in comments, Getfiles-->GetFiles
2016-12-05 12:49:21 +08:00
astaxie
5af26446ec
Merge pull request #2299 from amrfaissal/fix-2294
...
Fix xml.GetSection() function which causes a panic
2016-11-30 14:25:14 +08:00
Faissal Elamraoui
39d40ba8fa
This fixes #2294
2016-11-29 14:55:57 +01:00
Faissal Elamraoui
5bc3e30653
Added ToString method which converts values of any type to string
2016-11-29 14:55:56 +01:00
Dusan Kasan
34e2b26b99
resolves #2291 , introduces AndNotCond/OrNotCond to orm.Condition
2016-11-28 09:49:06 +01:00
astaxie
24015e9ace
Merge pull request #2285 from cat2neat/fix-bodyclose
...
Fix http body may not be closed
2016-11-20 19:48:09 +08:00
cat2neat
9ff88f0b35
Fix http body may not be closed
2016-11-20 05:16:52 +00:00
astaxie
27c59a8017
Merge pull request #2278 from mgenov/err_fix
...
beego/session: return proper error when session is not found
2016-11-13 16:03:55 +08:00
Miroslav Genov
a74ebaa1eb
beego/session: return proper error when session is not found
...
Parent errs was returned instead of err which is returned from the last
statement.
2016-11-13 10:01:29 +02:00
Back
b5c29d6143
Fix #2263
...
Update db_mysql.go instead of db.go, in order to avoid affect other database.
2016-11-08 13:39:31 +08:00
Daniel
0a822209c8
Fix :supervisor work dir
2016-11-08 11:14:48 +08:00
astaxie
3baac14095
Merge pull request #2257 from xiaoqiang0/develop
...
swagger: add 'Default' for Parameter
2016-11-07 22:48:06 +08:00
Zhang Qiang
ef3655877a
swagger: add 'Default' for Parameter
2016-11-03 22:59:23 +08:00
astaxie
5a8c40710c
Merge pull request #2228 from Hepri/develop
...
Rework getFlatParams for time.Time
2016-10-30 10:48:49 +08:00
astaxie
b635af5a8c
Merge pull request #2248 from smacker/RouterPattern-in-ctx
...
Add RouterPattern to context.Input
2016-10-30 10:48:15 +08:00
Maxim Sukharev
683e6856ef
Add RouterPattern to context.Input
...
Right now beego adds this param only in dev mode, but I noticed that it's very useful to have in prod environment to.
My current use case - filter that sends logs in newrelic. Pattern there will help a lot to generate correct transaction name.
2016-10-28 10:44:16 +07:00
Sergey Shcherbina
8beefc8bfd
Fixed bug when all "time.Time" params in raw sql queries formatted as time
2016-10-17 21:51:31 +05:00
astaxie
e430de3307
Merge pull request #2223 from tailnode/develop
...
修复windows上app.conf中include其他配置文件时找不到文件的BUG
2016-10-14 21:11:25 +08:00
mengyuan
2b442e842e
fix path issue in windows
2016-10-14 16:52:03 +08:00
astaxie
41633900da
Merge pull request #2218 from WatchtowerSecurity/NameFix
...
Name fix
2016-10-13 21:24:11 +08:00
astaxie
aaf6e775d6
Merge pull request #2216 from WatchtowerSecurity/httponlyfix
...
HTTPOnly Configurable
2016-10-13 21:19:28 +08:00
astaxie
2f6fc3f62b
Merge pull request #2213 from axyu/develop
...
fix log func call depth bug
2016-10-13 21:18:54 +08:00
astaxie
84310b1652
Merge pull request #2205 from jirfag/master
...
add GetUint(8|16|32|64) to controller
2016-10-13 21:17:54 +08:00
astaxie
5ceac1dd04
string convert int fail use math/big fix #756
2016-10-12 15:04:31 +08:00
GrimTheReaper
51b31c6cb0
Changed the name to match.
2016-10-11 11:06:52 -05:00
GrimTheReaper
5488a5bbd7
Forgot to fix it here
2016-10-11 11:06:22 -05:00
GrimTheReaper
33f7f46670
Updated the name
2016-10-11 10:49:19 -05:00
GrimTheReaper
3c05eafbc4
HTTP Only Configurable
2016-10-10 09:50:34 -05:00
yuanxuan
dfa9e03980
fix log func call depth bug
2016-10-09 15:19:21 +08:00
astaxie
53e996d4c3
Merge pull request #2211 from ihippik/patch-2
...
Default values
2016-10-08 17:52:07 +08:00
Konstantin
b151a9616e
Default values
2016-10-08 11:28:47 +03:00
Denis Isaev
1effb6ce30
add GetUint(8|16|32|64) to controller
2016-10-02 07:42:06 +00:00
olegdemchenko
0be05eb47c
policies implementation
2016-09-28 21:21:07 +03:00
astaxie
1090ca0154
Merge pull request #2190 from szyhf/develop
...
fix to advice in #2187
2016-09-28 20:17:41 +08:00
astaxie
a328584238
Merge pull request #2193 from LyricTian/develop
...
httplib add CheckRedirect
2016-09-28 20:16:48 +08:00
lyric
f19ad3fdd3
httplib add CheckRedirect
2016-09-28 18:04:51 +08:00
Back
836be7ab9a
fix to advice in #2187
...
Clear BConfig.Log.Outputs's default "console" while user has set "LogOutputs" in config file.
2016-09-28 16:20:41 +08:00
astaxie
bba04dd864
Merge pull request #2184 from rahal/master
...
Emailer : Should use config Username only if no From is provided.
2016-09-28 07:56:12 +08:00
rahal
9499b3eb90
Emailer : Should use config Username only if no From is provided.
...
Should fix the case where Username is not an email.
2016-09-27 16:21:41 +01:00
astaxie
9f6bbe3c51
add foundation link
2016-09-23 14:16:16 +08:00
astaxie
2d87d4feaf
Merge branch 'master' into develop
2016-09-22 23:18:45 +08:00
