Commit Graph

2602 Commits

Author SHA1 Message Date
astaxie 58ffc6f5f8 fix #1877 2016-09-13 22:43:40 +08:00
astaxie d5fb74aa94 Merge pull request #2158 from simpleelegant/develop
Add support "SELECT FOR UPDATE" to orm. Resolve issue #2157
2016-09-12 21:48:14 +08:00
Wang Yujian 11247d41a7 Add support "SELECT FOR UPDATE" to orm. Resolve issue #2157 2016-09-12 20:07:30 +00:00
astaxie 5b21c7cd71 fix #1802 2016-09-12 21:13:21 +08:00
astaxie dd0f05b1f1 fix the method color 2016-09-11 22:00:14 +08:00
astaxie a32241e7d3 fix #2142 2016-09-11 21:27:27 +08:00
astaxie 0ef357ebd7 session:output error 2016-09-11 21:02:11 +08:00
astaxie 32dd976620 Merge pull request #2146 from philchia/develop
Fix the typo
2016-09-08 17:42:10 +08:00
Phil fcd8a2024e Add jianliao and slack log adapter 2016-09-08 17:21:11 +08:00
Phil 30661472c8 Fix the typo 2016-09-07 13:33:11 +08:00
astaxie 6ced26660e Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-09-06 23:05:54 +08:00
astaxie 7d6c45d4c9 add RegisterModelWithSuffix #2140 2016-09-06 23:05:41 +08:00
astaxie 8b9d6eee1a Merge pull request #2132 from Zaaksam/master
beego.ParseForm() improvement
2016-09-02 16:23:14 +08:00
Zaaksam 11ef5929aa update TestParseForm 2016-09-02 16:08:04 +08:00
astaxie c697b98006 enhancement 2016-09-01 23:28:34 +08:00
Zaaksam 7c2e563879 beego.ParseForm() improvement 2016-09-01 15:04:57 +08:00
astaxie 56aa224a6e simplfy the code 2016-08-31 22:47:31 +08:00
astaxie 8c37a07adb optimize the ORM 2016-08-31 00:07:19 +08:00
astaxie 161c061376 fix cache/memcache test 2016-08-30 23:24:30 +08:00
astaxie aa091cea42 improvement the error if use &&Struct 2016-08-30 22:02:11 +08:00
astaxie 7df74c0a30 fix #1521 2016-08-30 21:24:56 +08:00
astaxie 1e1e900278 fix #2126 2016-08-30 21:00:27 +08:00
astaxie fb2343567b fix #2125 2016-08-30 20:40:46 +08:00
astaxie 3f67c62dd8 revert the snakeString 2016-08-30 00:15:02 +08:00
astaxie bb860d2752 Merge pull request #2124 from astaxie/revert-2071-issue_accept_encoding
Revert "route variables should not have underline"
2016-08-29 13:42:53 +08:00
astaxie f280dab880 Revert "route variables should not have underline" 2016-08-29 13:42:40 +08:00
astaxie 7283aead42 Merge pull request #2116 from raphael10241024/self
fix#2039 & test
2016-08-24 23:15:53 +08:00
YakunZ 0ad4038d9f fix#2039 & test 2016-08-24 16:04:22 +08:00
astaxie 227678c2ef Set SetLogFuncCallDepth default to 4 2016-08-23 23:48:47 +08:00
astaxie c611da2e3c Merge pull request #2112 from lday0321/master
log output format improvement
2016-08-23 23:18:10 +08:00
chenlei106 00e986cd3b log output format improvement
move log level info ahead to filename info, better readability
2016-08-23 16:16:57 +08:00
astaxie bed907653e Merge pull request #2102 from tnextday/develop
update swagger ParameterItems
2016-08-22 11:42:22 +08:00
tnextday 7253ff2f8c update schema define 2016-08-20 15:03:41 +08:00
tnextday 715c2c4312 Merge commit 'efbde1ee77517486eac03e814e01d724ddad18e6' into develop 2016-08-20 11:22:17 +08:00
tnextday 9224cd3ef7 add ParameterItems in Parameter 2016-08-20 11:22:03 +08:00
astaxie efbde1ee77 add *Item into Schema 2016-08-19 23:52:19 +08:00
astaxie 8b525b1aa5 fix #1656 2016-08-19 00:31:46 +08:00
astaxie 86b3162aff fix #1695 update docs 2016-08-19 00:11:19 +08:00
astaxie 3c016a0b2d Merge pull request #2100 from tnextday/develop
update swagger define
2016-08-18 23:29:06 +08:00
tnextday ffd748bf75 update swagger 2016-08-18 22:26:15 +08:00
tnextday 1c54ff27c4 update swagger define 2016-08-18 21:24:54 +08:00
astaxie 7760d24761 fix the typo 2016-08-17 23:52:34 +08:00
astaxie 3672f96a9d fix the typo 2016-08-17 22:56:21 +08:00
astaxie 68311b286e gofmt -s -w . 2016-08-17 22:49:30 +08:00
astaxie bed1d9bd27 update the performance 2016-08-17 22:33:36 +08:00
astaxie 44a57e86dd fix #2090 2016-08-17 22:05:54 +08:00
astaxie 3362f83662 change to v1.7.0 2016-08-16 23:54:52 +08:00
astaxie 7813cb5783 Merge pull request #2096 from Maxgis/feature_session
session.NewManager second params shoube be a object not a string
2016-08-16 23:51:35 +08:00
maxin ef0d3d80dc set session.managerconfig public 2016-08-13 21:07:27 +08:00
astaxie 47b238728d Merge branch 'develop' of https://github.com/astaxie/beego into develop 2016-08-13 14:44:22 +08:00