1
0
mirror of https://github.com/astaxie/beego.git synced 2024-06-23 02:54:13 +00:00
Commit Graph

2094 Commits

Author SHA1 Message Date
ysqi
3d7354b9d2 import reset 2016-01-24 11:10:04 +08:00
ysqi
007af6224e Fixed #1586 2016-01-23 19:13:19 +08:00
astaxie
af346e871b Merge pull request #1603 from coseyo/remote_develop
fix conf load bug
2016-01-22 20:34:46 +08:00
coseyo
cb5fd49612 fix conf load bug 2016-01-22 18:03:02 +08:00
astaxie
0f85c82a21 Merge pull request #1594 from nemtsevp/patch-2
Exceptions in controller methods
2016-01-21 14:57:02 +08:00
nemtsevp
93b04e8a3b Exceptions in controller methods
Exceptions in methods names should be changed according to controller.go
2016-01-21 09:44:17 +03:00
astaxie
07937dea9a Merge pull request #1588 from Kavin-Cao/master
template.go 的beegoTplFuncMap注释有误
2016-01-20 14:18:35 +08:00
bradycao
5757e6548e template.go 的urlfor Func注释有误
template.go 的urlfor Func注释有误
2016-01-19 10:14:16 +08:00
bradycao
b48f251043 Merge remote-tracking branch 'refs/remotes/astaxie/master' 2016-01-19 09:43:43 +08:00
astaxie
befeac5b61 Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-01-18 23:30:12 +08:00
astaxie
23bb36d35c fix the issue #1573 2016-01-18 23:29:56 +08:00
astaxie
4b52a38183 Merge pull request #1575 from youngsterxyf/develop
simplify the implementation of splitPath in tree.go
2016-01-18 16:33:23 +08:00
youngsterxyf
30e5634bdb simplify the implementation of splitPath in tree.go 2016-01-18 16:13:31 +08:00
astaxie
fa8f6e5a53 session destroy 2016-01-18 16:11:27 +08:00
astaxie
6e987bfdaf Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-01-18 15:28:18 +08:00
astaxie
918b9e510f fix the add tempfunc 2016-01-18 15:27:33 +08:00
astaxie
12e5584c01 Merge pull request #1574 from youngsterxyf/develop
DRY
2016-01-18 15:24:53 +08:00
youngsterxyf
ac3b013de7 DRY 2016-01-18 15:17:42 +08:00
astaxie
089242eda0 memcache test mulit return map has no sequence 2016-01-18 00:36:05 +08:00
astaxie
92d0b9ae95 golint the config.go 2016-01-18 00:22:31 +08:00
astaxie
6f786e1dea golint config.go 2016-01-18 00:22:11 +08:00
astaxie
eb0bc084ec make the code mode readable
golint all the files
2016-01-18 00:18:52 +08:00
astaxie
f925bb9058 golint all the files 2016-01-18 00:18:21 +08:00
astaxie
da36d1d0e7 fix the wrong io.Writer 2016-01-18 00:03:39 +08:00
astaxie
48f19b4191 Merge pull request #1571 from astaxie/develop
beego 1.6.0 released
2016-01-17 23:58:34 +08:00
astaxie
9adf20d72e gofmt -s 2016-01-17 23:57:07 +08:00
astaxie
90d1349665 fix typo 2016-01-17 23:48:17 +08:00
astaxie
9b2597be68 fix the mail send empty subject 2016-01-17 23:48:09 +08:00
astaxie
895748d632 beego 1.6.0 released 2016-01-17 22:55:09 +08:00
astaxie
566aab4354 mail send support Address format 2016-01-17 22:49:02 +08:00
astaxie
a304bb9c25 Revert "add test case for tidb"
This reverts commit f70d2cc373.
2016-01-17 18:35:11 +08:00
astaxie
f70d2cc373 add test case for tidb 2016-01-17 18:24:29 +08:00
astaxie
897cf57840 use travis-ci.org as build-status 2016-01-15 14:59:16 +08:00
astaxie
8e6b0a6d7b Merge pull request #1567 from JessonChan/develop
some typo fixed
2016-01-15 14:40:14 +08:00
astaxie
797571c85f fix the ORM test case 2016-01-15 14:36:45 +08:00
JessonChan
814e4ac031 rename the docsSepc to docs_spec 2016-01-15 14:14:09 +08:00
JessonChan
52083de720 typo fixed
seperator => separator
2016-01-15 14:07:37 +08:00
astaxie
a069c73b3a test case bool default value is true 2016-01-15 14:02:08 +08:00
astaxie
7dbeb2c39a fix the default value 2016-01-15 08:43:02 +08:00
astaxie
4375ca84d1 fix the sqlite m2m 2016-01-14 23:49:28 +08:00
astaxie
0eaf923a27 Merge pull request #1560 from JessonChan/log_enhancement
Log enhancement
2016-01-13 22:57:39 +08:00
astaxie
9c55985915 update readme 2016-01-13 22:20:34 +08:00
astaxie
6976c0f51d add CONTRIBUTING.md 2016-01-13 22:02:36 +08:00
JessonChan
5befc67389 Merge remote-tracking branch 'remotes/upstream/develop' into log_enhancement 2016-01-13 10:15:00 +08:00
JessonChan
fb5b04506a code refactor and format 2016-01-13 09:24:27 +08:00
JessonChan
7663d50c97 remove the lock writer 2016-01-13 09:21:55 +08:00
JessonChan
58730e3528 test file modify 2016-01-13 09:21:32 +08:00
JessonChan
e1b73b33d0 improve code 2016-01-13 08:21:44 +08:00
JessonChan
c535dc386e fast format 2016-01-12 22:54:39 +08:00
JessonChan
69804afc1b use pool to logMsg 2016-01-12 22:39:40 +08:00