lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity
3,183 Commits 3 Branches 32 Tags 9.4 MiB
Commit Graph

3183 Commits

Author SHA1 Message Date
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
astaxie a7354d2d08 Revert "should use time.Since instead of time.Now().Sub" 2017-09-09 06:29:38 +08:00
astaxie 07a9a2d0f3 Merge pull request #2854 from wgliang/master 
should use time.Since instead of time.Now().Sub
 2017-09-09 06:29:31 +08:00
wangguoliang c8c25549e7 should use time.Since instead of time.Now().Sub 
Signed-off-by: wgliang <liangcszzu@163.com>
 2017-09-07 19:01:34 +08:00
Radar8 6641a436a2 validation: fix ErrorMap, added func AddError(key, message) 2017-09-06 16:49:21 +08:00
iclinux 1dd50fb65f Make parent process exit gracefully. 
With beego.BConfig.Listen.Graceful  enabled, when received SIGHUP, we'll fork a child process.
But the parent process still have jobs to finish, So we can't kill the parent process directly.
 2017-09-05 11:53:42 +08:00
zhufanmao 4bc4f77c29 return template build error 2017-09-02 17:55:26 +08:00
zhufanmao ef36ecd376 avoid some proxy not support select command 2017-08-31 20:26:32 +08:00
astaxie c6cef853c7 Merge pull request #2813 from mlgd/develop 
Add IPV6 compatibility
 2017-08-23 16:54:59 +08:00
astaxie 33ad8d5db4 Merge pull request #2815 from wisererik/patch-1 
Fix the quick start section of the orm/README.md
 2017-08-23 16:53:41 +08:00
astaxie 33e6d57754 Merge pull request #2820 from crazcalm/doc_error 
fixed mispelled word
 2017-08-22 23:18:31 +08:00
Marcus Willock afa57ca1f2 fixed mispelled word 2017-08-20 23:32:11 +08:00
Erik 510dd02a06 Fix the quick start section of the orm/README.md 
Increase the init method by adding the `RunSyncdb` method to resolve the problem that the table is not created.
 2017-08-11 11:34:18 +08:00
mlgd 166e88c103 Update input.go 2017-08-09 21:05:06 +02:00
mlgd 51b6adeb24 Add IPV6 compatibility 2017-08-09 10:23:03 +02:00
astaxie 51c19c374a Merge pull request #2801 from nightlyone/patch-1 
fix bad error code in seesion handling
 2017-08-06 22:29:05 +08:00
astaxie b23452dc3f Merge pull request #2805 from ninjacn/master 
comment edit
 2017-08-06 22:28:36 +08:00
astaxie f61038e6bd Merge pull request #2803 from iamzhout/log_add_milliseconds 
add millisecond to timestamp in log output
 2017-08-06 22:28:19 +08:00
Tao Zhou b9117e2ff1 add millisecond to timestamp in log output 2017-08-04 00:11:59 +08:00
姚鹏鸣 5a7a3da909 comment edit 2017-08-03 19:15:32 +08:00
Ingo Oeser 3f4502990a fix bad error code 
By providing a unique error code instead of a format specifier without using an error formatting function.
 2017-08-03 01:52:24 +02:00
astaxie e14113aa0e Merge pull request #2656 from BorisBorshevsky/develop 
Allow injecting dependencies to controllers
 2017-07-30 23:36:52 +08:00