1
0
mirror of https://github.com/astaxie/beego.git synced 2024-12-23 11:20:50 +00:00
Commit Graph

2185 Commits

Author SHA1 Message Date
JessonChan
f5adec31c6 improve the template reader function 2016-03-04 14:49:16 +08:00
JessonChan
6747c55a81 remove unused cache 2016-03-04 12:01:04 +08:00
JessonChan
1f46c1d231 add template read lock when dev mode 2016-03-04 12:00:43 +08:00
astaxie
4b99e41880 Merge pull request #1688 from ysqi/configIssue
fixed handle config issue
2016-03-03 09:50:14 +08:00
astaxie
70e63570f5 Merge pull request #1731 from math345/develop
fix bug: session id undecoded when destroy and sesssion memory provider push wrong
2016-03-02 13:26:57 +08:00
astaxie
36e3160904 add go1.6.0 and remove 1.3.3 2016-03-01 21:41:44 +08:00
astaxie
d81a768802 change couchbase to beego/go-couchbase 2016-03-01 16:54:37 +08:00
astaxie
f0dcaa7f84 remove couchbase dependence 2016-03-01 16:43:56 +08:00
iexploree
a144f117a3 remove comment 2016-03-01 13:39:36 +08:00
iexploree
477de9a3f3 fix bug: session id undecoded when destroy and sesssion memory provider push wrong 2016-03-01 10:51:47 +08:00
ysqi
ffbb45e567 Revert "ignore parse include config file error"
This reverts commit 891016a0a2.
2016-02-27 20:18:59 +08:00
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
891016a0a2 ignore parse include config file error 2016-02-14 18:55:42 +08:00
ysqi
d5f07d65bb panic parse config error 2016-02-14 18:54:40 +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