lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-12-29 01:15:47 +00:00
Code Issues Releases Activity
2,172 Commits 3 Branches 32 Tags 9.4 MiB
67fbafb380
Commit Graph

2172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
astaxie
67fbafb380 Merge pull request #1680 from ysqi/fix-router-error 
fix #1595
 2016-02-26 16:17:53 +08:00
astaxie
6eaa5537f5 Merge pull request #1652 from JessonChan/develop 
colorful console and go fmt
 2016-02-26 16:10:11 +08:00
astaxie
62cc987620 Merge pull request #1639 from youngsterxyf/logger-flush-close 
try to fix the little bug when calling Close or Flush in async mode
 2016-02-26 16:04:29 +08:00
astaxie
f0a41f978f Merge pull request #1727 from JessonChan/templates_bug_fix 
lock the templates map when goroutie update the map
 2016-02-26 15:56:47 +08:00
JessonChan
3da28535fe lock the templates map when goroutie update the map 2016-02-25 17:37:28 +08:00
ysqi
9411063574 fix #1595 2016-02-12 14:45:45 +08:00
astaxie
2b23764ee0 Merge pull request #1657 from lei-cao/slack 
Added slack
 2016-02-03 08:58:24 +08:00
Lei Cao
2301633d42 Added slack 2016-02-02 23:34:32 +08:00
youngsterxyf
2efe7c4c89 merge multi commit 2016-02-02 17:12:47 +08:00
youngsterxyf
c71ac7431d Merge branch 'develop' into logger-flush-close 2016-02-02 17:11:41 +08:00
JessonChan
360220161b remove useless var , name style fixed 2016-02-02 16:52:53 +08:00
JessonChan
5dec3d127c colorful console only the terminal supports 2016-02-02 16:37:09 +08:00
astaxie
16b01c362a Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-02-02 12:45:01 +08:00
astaxie
441f795a1a Merge pull request #1651 from thanhtranjs/develop 
Add GroupBy to QuerySeter
 2016-02-02 12:44:49 +08:00
astaxie
4906b600e3 fix the static url with / problem 2016-02-02 12:43:58 +08:00
Thanh Tran
bb50383aa9 Add GroupBy to QuerySeter 2016-02-02 11:28:43 +07:00
astaxie
631b4d36f9 Merge pull request #1647 from youngsterxyf/fix-issue1641 
fix issue #1641
 2016-02-02 09:23:12 +08:00
youngsterxyf
da38cbfe41 fix issue #1641 2016-02-01 22:40:34 +08:00
astaxie
09193213a0 add travis hooks 2016-01-31 23:28:56 +08:00
astaxie
0382146c60 fix the go vet for go tip 2016-01-29 13:11:11 +08:00
astaxie
1bf52e8922 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-01-29 10:26:40 +08:00
astaxie
5cd1ed8106 add test for tip 2016-01-29 00:01:04 +08:00
astaxie
bd79972d85 Merge pull request #1638 from pjoe/log_console_nocolor 
Add noColor option for console logger
 2016-01-28 22:39:02 +08:00
youngsterxyf
ecab397073 try to fix the little bug when calling Close or Flush in async mode 2016-01-28 21:53:44 +08:00
Pelle Johnsen
a043432398 Change option name from noColor to color 
Still same default behavior (with color)
 2016-01-28 07:50:07 +01:00
Pelle Johnsen
7f888e3d18 Add noColor option for console logger 
- Also added simple test
 2016-01-27 19:20:58 +01:00
astaxie
85c0fcd335 Merge pull request #1637 from pjoe/input_param_fix 
Fix Context.Input.SetParam not overwriting existing value
 2016-01-27 23:01:10 +08:00
astaxie
f769016126 Merge pull request #1632 from youngsterxyf/config-logic 
Config logic
 2016-01-27 22:25:00 +08:00
Pelle Johnsen
453d744db9 Fix Context.Input.SetParam not overwriting existing value 
- Also added tests for Context.Input.Param handling
 2016-01-27 14:58:50 +01:00
youngsterxyf
31ef4ae507 rename AppConfigPath, AppConfigProvider to appConfigPath, appConfigProvider, make public to private 2016-01-27 16:43:01 +08:00
youngsterxyf
ccce566ba7 accept @astaxie suggestion: change the sequence adapterName and configPath 2016-01-27 16:19:10 +08:00
youngsterxyf
e357f6846b accept @ysqi suggestion 2016-01-27 13:30:34 +08:00
youngsterxyf
321bcc606a fix bug of test case 2016-01-27 12:26:37 +08:00
youngsterxyf
e549d0fd9c move some code piece 2016-01-27 12:13:26 +08:00
youngsterxyf
c59a029ce7 Merge branch 'develop' into config-logic 2016-01-27 10:58:38 +08:00
astaxie
4ce094a29a Merge branch 'master' into develop 2016-01-27 10:14:34 +08:00
astaxie
fbb98fbe1f Merge pull request #1631 from yunkai/issue1 
Fix regression caused by commit ad65479
 2016-01-27 10:13:30 +08:00
youngsterxyf
20efd5236e fix bug 2016-01-27 00:42:07 +08:00
youngsterxyf
330b3b1931 enhancement code 2016-01-27 00:17:56 +08:00
youngsterxyf
d9e6250d08 fix config logic 2016-01-27 00:10:21 +08:00
Yunkai Zhang
e3810b599d Fix regression caused by commit ad65479 
Commit ad65479 will cause "Method Not Allow" in preflight response
when enable CORS plugin.

The root cause is that CORS plugin didn't generate http output after applied
commit ad65479, so the value of `ctx.ResponseWriter.Started` will be keep
`false`, and then later filter chains will be go on to run when CORS filter
finished.

This path will both fix "Method Not Allow" and the original bug
"multiple response.WriteHeader calls".

Signed-off-by: Yunkai Zhang <qiushu.zyk@taobao.com>
 2016-01-26 23:27:26 +08:00
astaxie
e1f9491aed Merge pull request #1608 from ysqi/iniSaveErrorFix 
Fixed #1607
 2016-01-26 21:46:31 +08:00
astaxie
6aeff53d8c Merge pull request #1625 from miraclesu/fix/mail_from 
Fix utils mail some bugs
 2016-01-26 21:42:21 +08:00
miraclesu
bf870eb9a2 mv mime.QEncoding.Encode logic to mail 
it is named qEncode
 2016-01-26 20:50:03 +08:00
miraclesu
f26d360ec9 Fix vet fail 2016-01-26 14:54:36 +08:00
astaxie
f73eaf6393 Merge pull request #1626 from JessonChan/develop 
log file name bug fixed
 2016-01-26 13:42:47 +08:00
JessonChan
e11d150e8b replace \t with space 2016-01-26 09:35:39 +08:00
JessonChan
f2567bc114 some typo fixed 2016-01-26 09:29:04 +08:00
JessonChan
b5a07c6ba8 log file name bug fixed 
this bug happens when daily rotate. ex,when it is 2016-01-22 23:59:59 and need a rotate,the file name should named with 2016-01-22 but named with 2016-01-23(next day)
 2016-01-26 09:20:49 +08:00
astaxie
01ccc75d6b Merge pull request #1615 from ysqi/routerErrorFix 
Fixed #1586
 2016-01-26 00:31:01 +08:00