lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity
2,685 Commits 3 Branches 32 Tags 9.4 MiB
Commit Graph

2685 Commits

Author SHA1 Message Date
Faissal Elamraoui d77160dafe ignore .vscode folder 2016-12-29 22:30:56 +01:00
Faissal Elamraoui 189c73986b Merge pull request #2351 from amrfaissal/add-safemap-count 
Add Count method to BeeMap struct
 2016-12-29 11:42:47 +01:00
Faissal Elamraoui fe21305bb3 Removes redundant check if key exists in BeeMap 2016-12-29 11:11:39 +01:00
Faissal Elamraoui 75ec8d33a2 Rewrite safemap_test suite 2016-12-28 12:44:35 +01:00
Faissal Elamraoui d736d0ca87 Adds Count method to BeeMap struct 
This adds a Count() method to BeeMap struct that returns the number of
items within the safe map.
 2016-12-28 12:44:35 +01:00
astaxie 99093693c8 Merge pull request #2346 from legendtkl/master 
Modify func camelString() to be more robust
 2016-12-26 20:24:49 +08:00
legendtkl c9c284be27 Modify func camelString to be more robust 
1. In previous edition, for case "pic_url_1", the func will return
"PicUrl_1", but "PicUrl1" seems to be more reasonable.
2. More test cases please refer to utils_test.go
 2016-12-25 21:09:06 +08:00
astaxie fa12dcf792 Merge pull request #2341 from kabab/content_type 
Changing content type for template
 2016-12-23 23:06:52 +08:00
astaxie b93f5c6f9c Merge pull request #2311 from amrfaissal/fix-2310 
Ability to register pre/post signal handlers
 2016-12-23 20:06:25 +08:00
astaxie f9791c1221 Merge pull request #2319 from mlgd/patch-1 
Remove a regression on AppPath
 2016-12-23 20:03:32 +08:00
Amine KABAB 8fac2d8d58 Don't rewrite content-type 2016-12-14 17:19:31 +00:00
mlgd e90f4bee1a Remove a regression on AppPath 
The application path is incorrect on Windows with the command line "go run". AppPath is assigned to the temp directory instead the folder project
 2016-12-09 09:37:10 +01:00
Faissal Elamraoui eb50221a15 Added method to register Pre/Post signal handlers 2016-12-06 13:48:31 +01:00
Faissal Elamraoui fc4801494d Added hookable signals 2016-12-06 13:48:31 +01:00
astaxie eba6afd6fb Merge pull request #2307 from CodeJuan/master 
set perm of rotated log to 440
 2016-12-06 15:10:00 +08:00
astaxie 81328b72fa Merge pull request #2309 from mengskysama/patch-1 
statistics lock
 2016-12-06 15:03:10 +08:00
mengskysama c0c113036b statistics lock 2016-12-06 14:57:15 +08:00
codejuan b788d74fd1 set perm of rotated log to 440 2016-12-06 12:44:00 +08:00
astaxie 90999717dd Merge branch 'develop' 2016-12-05 23:14:26 +08:00
astaxie a20ccde90d beego 1.7.2 2016-12-05 22:58:29 +08:00
astaxie d548ddeb5b Merge pull request #2267 from centos-ren/develop 
Fix :supervisor work dir
 2016-12-05 22:57:38 +08:00
astaxie de99ac5da5 Merge pull request #2197 from OlegFX/master 
policies implementation
 2016-12-05 22:45:07 +08:00
astaxie e2d9d34c75 Merge pull request #2272 from szyhf/Fix#2263 
Another Fix to #2263
 2016-12-05 22:40:54 +08:00
astaxie bdb525831d Merge pull request #2293 from DusanKasan/develop 
resolves #2291, introduces AndNotCond/OrNotCond to orm.Condition
 2016-12-05 22:40:35 +08:00
astaxie 22dba90ec4 Merge pull request #2305 from songtianyi/fixtypo-Getfiles 
typo fix in comments, Getfiles-->GetFiles
 2016-12-05 15:09:57 +08:00
songtianyi 7af6dad58e typo fix in comments, Getfiles-->GetFiles 2016-12-05 12:49:21 +08:00
astaxie 5af26446ec Merge pull request #2299 from amrfaissal/fix-2294 
Fix xml.GetSection() function which causes a panic
 2016-11-30 14:25:14 +08:00
Faissal Elamraoui 39d40ba8fa This fixes #2294 2016-11-29 14:55:57 +01:00
Faissal Elamraoui 5bc3e30653 Added ToString method which converts values of any type to string 2016-11-29 14:55:56 +01:00
Dusan Kasan 34e2b26b99 resolves #2291, introduces AndNotCond/OrNotCond to orm.Condition 2016-11-28 09:49:06 +01:00
astaxie 24015e9ace Merge pull request #2285 from cat2neat/fix-bodyclose 
Fix http body may not be closed
 2016-11-20 19:48:09 +08:00
cat2neat 9ff88f0b35 Fix http body may not be closed 2016-11-20 05:16:52 +00:00
astaxie 27c59a8017 Merge pull request #2278 from mgenov/err_fix 
beego/session: return proper error when session is not found
 2016-11-13 16:03:55 +08:00
Miroslav Genov a74ebaa1eb beego/session: return proper error when session is not found 
Parent errs was returned instead of err which is returned from the last
statement.
 2016-11-13 10:01:29 +02:00
Back b5c29d6143 Fix #2263 
Update db_mysql.go instead of db.go, in order to avoid affect other database.
 2016-11-08 13:39:31 +08:00
Daniel 0a822209c8 Fix :supervisor work dir 2016-11-08 11:14:48 +08:00
astaxie 3baac14095 Merge pull request #2257 from xiaoqiang0/develop 
swagger: add 'Default' for Parameter
 2016-11-07 22:48:06 +08:00
Zhang Qiang ef3655877a swagger: add 'Default' for Parameter 2016-11-03 22:59:23 +08:00
astaxie 5a8c40710c Merge pull request #2228 from Hepri/develop 
Rework getFlatParams for time.Time
 2016-10-30 10:48:49 +08:00
astaxie b635af5a8c Merge pull request #2248 from smacker/RouterPattern-in-ctx 
Add RouterPattern to context.Input
 2016-10-30 10:48:15 +08:00
Maxim Sukharev 683e6856ef Add RouterPattern to context.Input 
Right now beego adds this param only in dev mode, but I noticed that it's very useful to have in prod environment to.
My current use case - filter that sends logs in newrelic. Pattern there will help a lot to generate correct transaction name.
 2016-10-28 10:44:16 +07:00
Sergey Shcherbina 8beefc8bfd Fixed bug when all "time.Time" params in raw sql queries formatted as time 2016-10-17 21:51:31 +05:00
astaxie e430de3307 Merge pull request #2223 from tailnode/develop 
修复windows上app.conf中include其他配置文件时找不到文件的BUG
 2016-10-14 21:11:25 +08:00
mengyuan 2b442e842e fix path issue in windows 2016-10-14 16:52:03 +08:00
astaxie 41633900da Merge pull request #2218 from WatchtowerSecurity/NameFix 
Name fix
 2016-10-13 21:24:11 +08:00
astaxie aaf6e775d6 Merge pull request #2216 from WatchtowerSecurity/httponlyfix 
HTTPOnly Configurable
 2016-10-13 21:19:28 +08:00
astaxie 2f6fc3f62b Merge pull request #2213 from axyu/develop 
fix log func call depth bug
 2016-10-13 21:18:54 +08:00
astaxie 84310b1652 Merge pull request #2205 from jirfag/master 
add GetUint(8|16|32|64) to controller
 2016-10-13 21:17:54 +08:00
astaxie 5ceac1dd04 string convert int fail use math/big fix #756 2016-10-12 15:04:31 +08:00
GrimTheReaper 51b31c6cb0 Changed the name to match. 2016-10-11 11:06:52 -05:00