Commit Graph

3004 Commits

Author SHA1 Message Date
BorisBorshevsky df37739c7d fix golint comments 2017-11-25 19:18:37 +02:00
astaxie a5dd5d161d
Merge pull request #2659 from ansiz/master
to close issue #1899(redis cache doubt)
2017-11-19 11:13:42 +08:00
astaxie 6827107177
Merge pull request #2706 from fat4lix/bugfix
Fix run controller if it set by RumController and RunMethod in Filterfunc
2017-11-19 11:12:48 +08:00
astaxie a30a89e57e
Merge pull request #2849 from iclinux/grace-patch
Make parent process exit gracefully.
2017-11-19 11:09:13 +08:00
astaxie d352e4abcb
Merge pull request #2852 from Radar8/master
validation: fix ErrorMap, added AddError(key, message)
2017-11-19 11:08:31 +08:00
astaxie a948d4c1e1 set default to apache format 2017-11-19 11:07:57 +08:00
astaxie b7eb3963f5
Merge pull request #2863 from gadelkareem/develop
Add JSON or Apache access log formatting option to config:  AccessLogsFormat = JSON_FORMAT or APACHE_FORMAT  ref #2738
2017-11-19 11:05:12 +08:00
astaxie f7afb3cb75
Merge pull request #2878 from silviucm/master
Add the ability to unregister fixed routes
2017-11-19 10:41:40 +08:00
astaxie 348bf51a42
Merge pull request #2914 from AbelZhou/master
Add sys env feature
2017-11-19 10:41:22 +08:00
astaxie dfea2cc5f3
Merge pull request #2928 from ilylia/develop
add Enum field to Schema
2017-11-19 10:27:11 +08:00
astaxie 532eab8e1d
Merge pull request #2932 from lotus-wu/Branch_v1.9.0
1.Add Mutual HTTPS  Option!
2017-11-19 10:26:59 +08:00
lotus 3872382a4b 1.Add Mutual HTTPS Option! 2017-11-15 22:42:30 +08:00
ilylia 4018693fbd add Enum field to Schema 2017-11-13 14:36:08 +08:00
astaxie 3b829504f6
Merge pull request #2920 from chenpeiyuan/develop
avoid unnecessary read of large log file
2017-11-07 09:35:09 -06:00
陈培远 80fa51468c avoid unnecessary read of large log file
If w.MaxLines is not set, there is no need to calc large log file’s lines. It may takes more than 10mins to calc a 10G file.
2017-11-07 22:58:39 +08:00
Abel 3504d2a4da Add host env feature. 2017-10-31 19:19:14 +08:00
Abel 229d8b9530 Add host env feature. 2017-10-30 13:54:36 +08:00
Silviu Capota-Mera 9536d460d0
Create test file for the route unregistering functionality 2017-10-28 14:49:41 -04:00
astaxie e211e4839c Merge pull request #2906 from mlgd/patch-1
Update for MySQL timezone detection bug
2017-10-27 09:47:09 -05:00
mlgd 3332dbe595 Update for MySQL timezone detection bug
Use "DefaultTimeLoc" for "al.TZ" default value
Don't set TZ on alias when t.Location() is empty

You can set your MySQL server timezone on main.go init function.
Example :
orm.DefaultTimeLoc, _ = time.LoadLocation("Europe/Paris")
2017-10-26 14:32:42 +02:00
Abel b9c8c08c03 Add host env feature. 2017-10-26 19:25:05 +08:00
astaxie 663f22d849 Merge pull request #2893 from melotusme/master
Typo fixed
2017-10-23 06:48:46 -05:00
astaxie fbaa4d1233 Merge pull request #2898 from skOak/swagger
remove omitempty for swagger.Response.Description, because it's Required according to Swagger2.0 Spec
2017-10-23 06:48:22 -05:00
astaxie 7dc8991140 Merge pull request #2894 from skOak/develop
add custom middleware options for beego.Run()
2017-10-23 06:48:03 -05:00
hemin 0ce70b8c99 remove omitempty for swagger.Response.Description, because it's Required according to Swagger2.0 Spec 2017-10-18 22:34:24 +08:00
astaxie b169ea4b63 Merge pull request #2896 from tinycedar/master
misc: fix typos
2017-10-17 21:22:27 +08:00
Daniel Lin 72ec4df679 Merge branch 'master' into master 2017-10-17 04:30:59 -05:00
hzlinqien b91263a254 misc: fix typos 2017-10-17 17:27:03 +08:00
hemin e91afb1938 add custom middleware options for beego.Run() 2017-10-16 14:55:08 +08:00
zhirong 74eb613919 Typo fixed 2017-10-16 00:06:20 +08:00
astaxie 32d4310861 Merge pull request #2886 from hurisheng/patch-1
add XMLBody method for httplib
2017-10-14 07:57:02 -05:00
astaxie c56704f3fd Merge branch 'master' into develop 2017-10-14 17:53:40 +08:00
astaxie c5118e9535 Merge pull request #2889 from lidaobing/fix_typo
fix typo
2017-10-14 03:28:56 -05:00
LI Daobing 9b57566963 fix typo 2017-10-11 14:35:31 +08:00
Silviu Capota-Mera 8d59e7afd1 for the root path, all methods must be covered
use continue instead of return
2017-10-07 13:16:36 -04:00
Silviu Capota-Mera fd733f76f0 simplify replacement of the base (root) tree 2017-10-07 12:14:28 -04:00
Hu Risheng 37d4bb3df5 add XMLBody method for httplib 2017-10-05 14:34:52 -05:00
Silviu Capota-Mera 5697c6d7cc Remove redundant return to pass gosimple Travis check 2017-09-25 23:17:57 -04:00
Silviu Capota-Mera 51a6162363 Update app.go 2017-09-25 21:45:42 -04:00
Silviu Capota-Mera 5a12b3d020 Add the ability to unregister fixed routes
Certain web application inherit most of the routes from a base application by using the underscore import 
(e.g. import _ "myoldapp.com/routers").
The new application might want to only overwrite certain pages, such as "/about" or "/faq"

The proposed new UnregisterFixedRoute method allows unregistering of the specified paths.
 Usage (replace "GET" with "*" for all methods):
  beego.UnregisterFixedRoute("/yourpreviouspath", "GET")
  beego.Router("/yourpreviouspath", yourControllerAddress, "get:GetNewPage")
The children paths are left intact.
For example, /yourpreviouspath/oldchildsubpath should still continue to function in legacy mode.
2017-09-25 20:52:19 -04:00
Waleed Gadelkareem bebd2c469d Remove typo 2017-09-13 22:15:40 +02:00
Waleed Gadelkareem d15e66a4ff check if SetEscapeHTML exists instead of checking Go version 2017-09-13 22:14:41 +02:00
Waleed Gadelkareem c04d43695c fix dependency go-version for travis 2017-09-13 03:16:33 +02:00
Waleed Gadelkareem d813334a24 Merge branch 'develop' of github.com:gadelkareem/beego into develop 2017-09-13 03:10:08 +02:00
Waleed Gadelkareem 9fef2f2eb4 Do not escape html if Golang version < 1.7 2017-09-13 03:09:53 +02:00
Waleed Gadelkareem 0c746f4547 Merge branch 'master' into develop 2017-09-13 02:16:50 +02:00
Waleed Gadelkareem f5c8b1c6ac Merge branch 'master' of github.com:gadelkareem/beego 2017-09-13 02:05:15 +02:00
Waleed Gadelkareem 4921014c64 Add JSON or Apache access log formatting option to config: AccessLogsFormat = JSON_FORMAT or APACHE_FORMAT ref #2738 2017-09-13 02:03:46 +02:00
astaxie 520753415f Merge pull request #2846 from hikenote/master
return template build error rather than log error
2017-09-09 06:42:02 +08:00
astaxie 3162da131d Merge pull request #2858 from astaxie/revert-2854-master
Revert "should use time.Since instead of time.Now().Sub"
2017-09-09 06:29:59 +08:00