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

1177 Commits

Author SHA1 Message Date
astaxie
474a16a7a0 beego: improve the static file server 2014-08-04 15:31:27 +08:00
astaxie
1d36b19cab Merge branch 'develop' of https://github.com/astaxie/beego into develop 2014-08-04 15:00:42 +08:00
astaxie
deed251794 Merge pull request #720 from MicroMoon/patch-1
revise the comment of SliceIntersect
2014-08-02 23:28:08 +08:00
Stan Sun
22ba252c8f fix the comment of SliceIntersect
The implementations of SliceDiff and SliceIntersect are the same.
However, the comments of them are opposite.
The former is (slice1 - slice2) while the latter is (slice2- slice1)
2014-08-02 17:54:57 +08:00
astaxie
008ae39ff6 Merge branch 'master' into develop 2014-08-01 17:04:22 +08:00
astaxie
0836b9e13f fix #718 2014-08-01 17:03:28 +08:00
astaxie
7a39a3c52f middleware: error page set the content-type 2014-08-01 16:46:51 +08:00
astaxie
509af636b1 Merge pull request #716 from 4eek/docfix-validations-HasErrors
Fixed docs: HasErrors is a method not a variable
2014-07-29 22:04:26 +08:00
Kevin Fourie
daf8b1101f Fixed docs: HasErrors is a method not a variable 2014-07-29 15:05:04 +02:00
astaxie
428aec1c24 Merge pull request #715 from MicroMoon/develop
revise a comment
2014-07-28 09:52:26 +08:00
stansun
a804d242d9 revise a comment
If it gets a msg from the buffer chan, it will write the message to
outputs.
2014-07-27 07:13:17 -04:00
astaxie
7ddd20340b orm: delete the old docs 2014-07-26 23:25:59 +08:00
astaxie
e7fcb824c1 utils: fix the safemap Items 2014-07-26 23:25:51 +08:00
astaxie
ee9749d640 beego:fix #685
move XsrfToken& CheckXsrfCookie to context
2014-07-24 23:12:21 +08:00
astaxie
d7090689e8 cache: change the memcache &redis driver
change the memcache to the newest
2014-07-24 22:54:56 +08:00
astaxie
52d153da87 Merge pull request #710 from francoishill/patch-8
Update smtp.go (develop branch)
2014-07-22 13:45:24 +08:00
Francois
6ce55e8884 Update smtp.go (develop branch)
For mail servers that do not require Authentication we must pass NIL for the SendMail parameter 2 (the auth parameter). Otherwise it fails to send the mail.
2014-07-22 07:21:47 +02:00
astaxie
91ee42ceeb beego:update the Abort Status 2014-07-18 15:38:29 +08:00
astaxie
d17f107fc4 beego: fix #702 auto render 2014-07-18 13:29:54 +08:00
astaxie
ae8bb8ce82 Merge pull request #701 from fuxiaohei/develop
code style simplify
2014-07-17 16:51:01 +08:00
fuxiaohei
38188098c5 fix testing fail 2014-07-17 16:48:10 +08:00
fuxiaohei
c372328f88 code style simplify 2014-07-17 16:22:52 +08:00
fuxiaohei
a6ced64441 code style simplify 2014-07-17 16:22:41 +08:00
astaxie
69094b2786 remove koding link 2014-07-17 16:05:17 +08:00
astaxie
08397fef45 Merge pull request #700 from fuxiaohei/develop
code style simplify
2014-07-17 15:58:37 +08:00
fuxiaohei
84da1c924a code style simplify 2014-07-17 15:56:06 +08:00
fuxiaohei
f733b5707a code style simplify 2014-07-17 15:49:40 +08:00
fuxiaohei
9d0798edc6 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2014-07-17 15:46:28 +08:00
astaxie
1858f3073b session: fix #688 2014-07-16 23:05:38 +08:00
astaxie
e6d6419a65 beego: static file support robots.txt 2014-07-16 22:27:53 +08:00
fuxiaohei
e52386b52d code style simplify 2014-07-15 10:01:26 +08:00
fuxiaohei
024817aacb Merge branch 'develop' of https://github.com/astaxie/beego into develop 2014-07-15 09:47:49 +08:00
fuxiaohei
9d0ad3f974 code style simplify 2014-07-13 18:11:13 +08:00
astaxie
6357c88d97 Merge pull request #694 from fuxiaohei/develop
code style simplify
2014-07-13 18:10:51 +08:00
fuxiaohei
9457e61a0c code style simplify 2014-07-12 22:12:06 +08:00
astaxie
f657509a42 Merge pull request #693 from fuxiaohei/develop
code style simplify
2014-07-12 19:33:32 +08:00
fuxiaohei
20e05a3908 code style simplify 2014-07-12 16:03:14 +08:00
fuxiaohei
77c40e6f7b code style simplify 2014-07-12 15:51:47 +08:00
fuxiaohei
ea2ed90ab0 Merge remote-tracking branch 'remotes/astaxie/develop' into develop 2014-07-12 15:32:37 +08:00
astaxie
15759f60ed Merge pull request #692 from fuxiaohei/develop
code style simplify
2014-07-12 14:18:30 +08:00
fuxiaohei
0e3e22efbe merge update 2014-07-12 09:57:43 +08:00
fuxiaohei
a906bf1174 code style simplify 2014-07-12 09:52:15 +08:00
astaxie
a6379481cf Merge pull request #691 from FGM/logger-rfc5424
Issue #682: convert logs package to RFC5424 logging levels.
2014-07-11 21:35:56 +08:00
Frederic G. MARAND
7d09ac252a Issue #682: convert logs package to RFC5424 logging levels. 2014-07-11 11:15:34 +02:00
fuxiaohei
0ff058bd25 code style simplify 2014-07-11 10:01:49 +08:00
astaxie
dbe75f90d5 Merge pull request #689 from fuxiaohei/develop
code style simplify
2014-07-11 09:55:56 +08:00
astaxie
ca1fd96ea5 Merge pull request #687 from fuxiaohei/develop
code style simplify
2014-07-10 16:48:04 +08:00
fuxiaohei
0b1b121db8 code style simplify 2014-07-10 13:38:05 +08:00
fuxiaohei
8683ee7c67 code style simplify 2014-07-10 13:28:54 +08:00
fuxiaohei
007db805be code style simplify 2014-07-10 13:04:18 +08:00