1
0
mirror of https://github.com/beego/bee.git synced 2024-12-27 08:10:59 +00:00
Commit Graph

428 Commits

Author SHA1 Message Date
astaxie
bf2329c288 Merge branch 'develop' of https://github.com/beego/bee into develop 2016-01-07 10:17:42 +08:00
astaxie
04f8b3436e add goxc 2016-01-07 10:17:34 +08:00
astaxie
5f211a2486 Merge pull request #155 from damonchen/develop
fix: https://github.com/beego/bee/issues/154
2016-01-06 22:23:42 +08:00
tianqi
d9e7af689f change replace windows seperator to filepath.Slash 2016-01-06 22:09:12 +08:00
tianqi
2b4a3d19d2 fix: https://github.com/beego/bee/issues/154 2016-01-06 21:44:12 +08:00
astaxie
0ee483de97 fix the typo 2016-01-06 13:59:49 +08:00
astaxie
807c3de8a7 fix issue with new version 2016-01-06 11:55:56 +08:00
astaxie
20d77d9979 Merge branch 'master' into develop 2015-12-18 14:42:37 +08:00
astaxie
fa5d72e565 Merge pull request #144 from yanyiwu/patch-1
Fix bug about issue #143
2015-12-11 00:33:34 +08:00
Yanyi Wu
69c2bb9058 Fix bug about issue #143 2015-11-27 11:42:14 +08:00
astaxie
583f7f0969 Merge pull request #142 from FarYoung/patch-2
add post and put json invalid fomart filter
2015-11-26 08:09:47 +08:00
FarYoung
f2bbe62bce add post and put json invalid fomart filter 2015-11-25 22:24:10 +08:00
astaxie
7813d6aab0 Merge pull request #140 from WnP/beego-dev-changes
update migration.Sql to migration.SQL to match beego develop
2015-11-10 10:41:18 +08:00
astaxie
755eaad4fe Merge pull request #139 from WnP/logfmt
fix typo and missing end-of-line
2015-11-10 10:40:59 +08:00
Steeve Chailloux
d3153578ca update migration.Sql to migration.SQL to match beego develop 2015-11-09 20:09:26 -06:00
Steeve Chailloux
f664b678d9 fix typo and missing end-of-line 2015-11-09 19:48:53 -06:00
astaxie
25eedc9a1a Merge pull request #135 from fugr/develop
update to match beego develop
2015-10-23 01:54:05 +08:00
fugr
dec41734bd ServeJson-->ServeJSON,update to match beego develop 2015-10-22 11:32:21 +08:00
astaxie
e2ee2a8a79 update the status cide 2015-10-16 23:44:11 +08:00
astaxie
581b80bc6c Merge pull request #132 from haibin/develop
Fix no error message issue
2015-10-11 18:01:13 +08:00
Haibin Liu
5c6eeae33a Fix no error message issue 2015-09-28 07:42:11 +08:00
astaxie
d70592fd14 Merge pull request #131 from pjoe/update_to_match_beego_develop
Update generate docs to match changes in beego develop branch
2015-09-22 21:31:16 +08:00
Pelle Johnsen
faaa3320bc Update to match changes in beego develop branch
Mainly changes casing: Api > API and Url > URL
2015-09-22 14:53:43 +02:00
astaxie
f11cad19ec Merge pull request #124 from pjoe/generate-fixes
Generate fixes for model and controller
2015-07-17 01:49:08 +08:00
Pelle Johnsen
f385056264 Generate fixes for model and controller
- use int64 for all places handling model id
- use controller code from appcode if a matching model is found
2015-07-16 19:36:02 +02:00
astaxie
f74078b69f Merge pull request #122 from simpleton/bug/docs
make docs works when EnableDocs = false
2015-07-02 21:37:19 +08:00
simsun
f50dce1d52 make docs works when EnableDocs = false 2015-07-01 23:55:13 +08:00
astaxie
6c98bdfbbc Merge pull request #121 from lei-cao/master
Issue-119: flags for excluding Godeps.
2015-06-17 15:32:00 +08:00
Lei Cao
60e4f1b872 Issue-119: flags for excluding Godeps. 2015-06-17 14:59:59 +08:00
astaxie
0c2ed7a9a4 Merge pull request #120 from sacheendra/master
add jsonb and timestamp with time zone to postgres data types
2015-06-10 12:37:56 +08:00
Sacheendra Talluri
47e8ce32d9 add jsonb and timestamp with time zone to postgres data types 2015-06-09 14:29:43 -05:00
astaxie
fadb5d2af9 Merge pull request #117 from westonplatter/master
migrate. allow postgres migrations to run.
2015-05-21 15:58:25 +08:00
Weston Platter
21b91413e8 migrate. allow postgres migrations to run. 2015-05-21 00:18:04 -06:00
astaxie
425e86f0bb Merge pull request #116 from westonplatter/master
migrate. print out error message.
2015-05-20 12:52:21 +08:00
Weston Platter
50ce2204ce migrate. changed docs to reference PostgreSQL driver as "postgres"
instead of "postgresql"
2015-05-19 22:50:13 -06:00
Weston Platter
9f829a1da2 migrate. print out error message. 2015-05-19 22:41:13 -06:00
astaxie
3c56a5feaf fix the build 2015-05-14 21:23:11 +08:00
astaxie
146c3b9655 Merge pull request #114 from lei-cao/master
Using local package name for renamed packages.
2015-05-14 17:55:28 +08:00
astaxie
4cecebb2bb Merge pull request #113 from shinriyo/patch-1
ERROR message is strange
2015-05-14 17:49:58 +08:00
Lei Cao
a1fe5bf010 Using local package name for renamed packages. 2015-05-14 15:56:19 +08:00
shinriyo
361eb4d235 ERROR message is strange
Web cant't create directory "$GOPATH"
$GOPATH/src is correct
2015-05-14 14:36:46 +09:00
astaxie
e23253bc23 fix #99 2015-05-09 18:20:08 +08:00
astaxie
ad453bb3e0 fix #107 2015-05-09 15:31:55 +08:00
astaxie
1aa857a9ea change the version to 1.3.0 2015-05-09 15:07:26 +08:00
astaxie
d5ba3ff52f Merge pull request #73 from Lao-liu/master
自动生成基于数据库的Hprose发布服务。
2015-05-09 15:00:21 +08:00
astaxie
fb17bcd4d5 Merge pull request #106 from 0x0001/master
new和api命令支持符号链接目录
2015-05-09 14:48:39 +08:00
astaxie
9530a63356 Merge pull request #84 from hilyjiang/master
Wait 1s before autobuild util there is no file change.
2015-05-09 14:45:47 +08:00
astaxie
52d6031795 Merge pull request #75 from jmsegrev/master
Fix for api docs generate bug
2015-05-09 14:41:37 +08:00
astaxie
59e10cc2c7 Merge pull request #109 from Frylock13/patch-1
Update g_controllers.go
2015-04-26 15:09:17 +08:00
Vitaly A
43ef051a29 Update g_controllers.go 2015-04-26 05:26:26 +03:00