1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-24 04:20:55 +00:00
Commit Graph

3638 Commits

Author SHA1 Message Date
Michael Hatch
baf2c63d5c Merge branch 'astaxie-master' 2014-08-23 10:09:37 -05:00
astaxie
771179a3c6 Merge pull request #769 from JessonChan/develop
improve and typo fixed
2014-08-23 09:46:43 +08:00
JessonChan
c07b1d881b typo fixed 2014-08-23 07:07:12 +08:00
JessonChan
d8f2b05e08 improve the code and delete NO NEED URL CHECK 2014-08-23 07:02:47 +08:00
JessonChan
7b2fe824d5 typo fixed 2014-08-23 06:48:40 +08:00
JessonChan
02301caac1 modify desc 2014-08-23 06:47:42 +08:00
astaxie
98c2307763 Merge pull request #767 from JessonChan/develop
bug fixed
2014-08-22 22:02:40 +08:00
JessonChan
485c2e865c bug fixed 2014-08-22 17:43:05 +08:00
JessonChan
b390667374 Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
	httplib/httplib.go
2014-08-22 17:39:57 +08:00
jessonchan
f684de2385 fixed bug-request dump too early 2014-08-22 17:12:46 +08:00
astaxie
35b4022ee0 httplib: set the default proto 2014-08-22 17:03:56 +08:00
astaxie
77294a5881 utils: fix the SliceIntersect 2014-08-22 16:50:07 +08:00
jessonchan
7b39bd7042 refactor 2014-08-22 16:43:42 +08:00
astaxie
01e4084587 toolbox: fix the go routine asleep 2014-08-22 13:56:36 +08:00
astaxie
bf429a3a20 Merge pull request #762 from pdf/pointer_field_support
Add support for basic type pointer fields
2014-08-22 13:41:58 +08:00
astaxie
f8ff79d77d Merge pull request #764 from smallfish/master
Update README
2014-08-22 13:41:01 +08:00
陈小玉
e9487d3571 Update README 2014-08-22 13:32:54 +08:00
Peter Fern
d7c3727f96 Add support for basic type pointer fields
Allows models like:

```
type User struct {
	Id    int64
	Name  string
	Email *string `orm:"null"`
}
```

This helps a lot when doing JSON marshalling/unmarshalling.

Pointer fields should always be declared with the NULL orm tag for sanity, this
probably requires documentation.
2014-08-22 14:25:32 +10:00
astaxie
03eb1fc104 toolbox: add notify when add & delete task 2014-08-21 15:56:41 +08:00
astaxie
0a967875da Merge pull request #757 from smallfish/develop
Add new function SetBasicAuth, and update README
2014-08-21 09:01:45 +08:00
陈小玉
6ae8bc1a16 Update README 2014-08-21 00:08:08 +08:00
陈小玉
e70537f8b3 Update README 2014-08-21 00:03:03 +08:00
smallfish
9a583323a8 Add SetBasicAuth function for HTTP Auth 2014-08-20 23:36:58 +08:00
astaxie
ff9c8d94e6 Merge pull request #753 from smallfish/develop
format comments
2014-08-20 16:40:26 +08:00
astaxie
7f977a0c8c beego: change the colour 2014-08-20 11:54:25 +08:00
astaxie
aaabeff44f change the route info 2014-08-20 10:59:38 +08:00
smallfish
f85ac088c3 format comments 2014-08-19 16:48:30 +08:00
astaxie
26da23266a Merge branch 'master' into develop 2014-08-19 09:49:07 +08:00
astaxie
80274684e0 context: redirect should writer to response instantly 2014-08-19 09:48:21 +08:00
astaxie
be005f9774 Merge pull request #750 from smallfish/develop
Update httplib support read data from response buffer, add some testcase...
2014-08-18 21:33:02 +08:00
smallfish
c16b7be9ac rollback the ToFile func implement, and add testcase 2014-08-18 21:29:45 +08:00
smallfish
de87529387 Update httplib support read data from response buffer, add some testcases 2014-08-18 21:01:49 +08:00
astaxie
c4fa17921e comments for godocs 2014-08-18 16:44:40 +08:00
astaxie
724137e605 Merge branch 'master' into develop 2014-08-18 16:42:16 +08:00
astaxie
a144769515 update the documents & comments 2014-08-18 16:41:43 +08:00
astaxie
05089be427 Merge pull request #749 from smallfish/master
rename SetAgent and ToXML, and update some testcase
2014-08-18 15:07:11 +08:00
smallfish
7668c54d05 update testcase for httplib 2014-08-18 15:03:34 +08:00
smallfish
86752a55b6 rename SetAgent and ToXML 2014-08-18 15:03:10 +08:00
astaxie
e07d780dcf update the router info 2014-08-18 15:00:27 +08:00
astaxie
e566322643 beego: change the version from 1.4.0 to 1.3.2 2014-08-18 14:46:43 +08:00
astaxie
51ee1e77c2 beego: close the file when finish init 2014-08-18 14:42:17 +08:00
astaxie
986e91b7d6 beego: update the debug info rules 2014-08-18 14:35:43 +08:00
astaxie
8b8638c507 Merge pull request #748 from smallfish/master
Remove some unnecessary code
2014-08-17 21:36:10 +08:00
smallfish
d27c5c8daf Remove some unnecessary code 2014-08-17 21:13:29 +08:00
astaxie
86121deac4 Merge pull request #747 from francoishill/patch-12
Another change to match with logs/log.go (and RFC 5424 specs)
2014-08-16 10:10:16 +08:00
astaxie
6b02e1e9d4 Merge pull request #746 from francoishill/patch-11
To match with logs/log.go (and RFC 5424 specs)
2014-08-16 10:09:32 +08:00
astaxie
83696d95c3 Merge pull request #745 from francoishill/patch-10
Makes more sense to Use Debug instead of Info?
2014-08-16 09:40:01 +08:00
Francois
7be8114616 To match with logs/log.go (and RFC 5424 specs) 2014-08-15 21:30:59 +02:00
Francois
1dbbb89ad1 To match with logs/log.go (and RFC 5424 specs) 2014-08-15 21:12:57 +02:00
Francois
75904effd9 Makes more sense to Use Debug instead of Info? 2014-08-15 21:11:16 +02:00