Commit Graph

3384 Commits

Author SHA1 Message Date
Marko Tibold
0bf89f267e Merge remote-tracking branch 'upstream/master' 2011-12-30 16:40:06 +01:00
Marko Tibold
b137b5ee56 Merge remote-tracking branch 'upstream/master' 2011-12-30 16:35:22 +01:00
Tom Christie
615e8d7e77 Added @yandy. Thanks! 2011-12-30 15:34:39 +00:00
Tom Christie
b8bfebc837 ep.io fixes 2011-12-30 15:33:14 +00:00
Tom Christie
904f197474 Replace field-errors with field_errors 2011-12-30 15:33:13 +00:00
Tom Christie
da42c4fe87 Merge pull request #101 from yandy/pub
change the key name "field-errors" to "field_errors".
2011-12-30 07:31:46 -08:00
Marko Tibold
28f1b027aa Merge remote-tracking branch 'origin/master' 2011-12-30 16:17:12 +01:00
Marko Tibold
b297325369 Merge remote-tracking branch 'upstream/master' 2011-12-30 16:14:39 +01:00
Marko Tibold
abf0ee8b97 some more refactoring and some style enhancements. Just committing
to stay in sync.
2011-12-30 16:13:24 +01:00
Marko Tibold
a1d31c8a3a drop linkchecking 2011-12-30 16:01:15 +01:00
Michael Ding
c7b9100f19 change the key name "field-errors" to "field_errors".
as "-" is not allowed as a part of key name in javascript
2011-12-30 22:52:01 +08:00
Tom Christie
ff9cb862d1 Keep it simple. 2011-12-30 13:06:57 +00:00
Marko Tibold
23979a9953 Added django 1.4 aplha 1. 2011-12-30 13:42:01 +01:00
Tom Christie
08a1fb9a70 Use 2.7, fool. 2011-12-30 12:21:33 +00:00
Marko Tibold
1b28339e5b Merge remote-tracking branch 'upstream/master' 2011-12-30 01:37:32 +01:00
Marko Tibold
91cee26ad8 Some initial refactoring of the docs. 2011-12-30 01:36:43 +01:00
Tom Christie
a0c4dca946 Version: 0.3.1-dev 2011-12-29 14:00:31 +00:00
Tom Christie
3cf6fab3d9 Version 0.3.0 2011-12-29 13:57:41 +00:00
Tom Christie
d87113ff60 For now just point the examples at rest.ep.io
Would be nice to keep the custom subdomain, but too much of a PITA
right now.
2011-12-29 13:54:39 +00:00
Tom Christie
833bcbf69d Added ekohl 2011-12-29 13:35:09 +00:00
Tom Christie
07349597ab whitespace fixes 2011-12-29 13:31:12 +00:00
Tom Christie
1bdc5eacc6 Add JSONP. Fixes #82 2011-12-29 13:24:52 +00:00
Marko Tibold
500b0dcddc Added epio configuration. 2011-12-24 13:18:48 +01:00
Tom Christie
ee4cba9081 Add CI link. 2011-12-22 10:30:13 +00:00
Marko Tibold
1096e06c2d set linkcheck_timeout to very large, to prevent timeouts on the CI. 2011-12-21 02:23:26 +01:00
Tom Christie
6e6dc21376 Fix version test. 2011-12-21 00:52:41 +00:00
Marko Tibold
a3ddd9e4c9 Fix style consistency. 2011-12-21 01:24:16 +01:00
Marko Tibold
4b3c63f155 Make sure the optional markdown functionality is also tested. 2011-12-21 01:22:10 +01:00
Marko Tibold
8162303bc7 Merge branch 'alazaro-master' 2011-12-21 01:10:10 +01:00
Marko Tibold
90ddec03b7 Fixes #94
Modified alazaro's commit sot that both markdown < 2.1 and >= 2.1 are
supported

The test checks if either matches the old or the new style.
2011-12-21 01:06:24 +01:00
Tom Christie
443694ebe6 Added Anthony Nemitz 2011-12-20 12:20:17 +00:00
Tom Christie
ebbc60a640 Merge pull request #97 from anemitz/master
ADMIN_MEDIA_PREFIX no longer supported in django1.4
2011-12-20 04:19:42 -08:00
Anthony Nemitz
9f63e8dd1d ADMIN_MEDIA_PREFIX is deprecated in django1.4 2011-12-19 22:09:09 -08:00
Tom Christie
8af629f566 Fold license text to 80 chars 2011-12-16 10:06:12 +00:00
Marko Tibold
1c8b40fb5f Merge branch 'master' of https://github.com/alazaro/django-rest-framework into alazaro-master 2011-12-15 23:05:30 +01:00
Marko Tibold
c1858a2a9a Merge remote-tracking branch 'upstream/master' 2011-12-15 19:39:56 +01:00
Tom Christie
28ccabf165 Use coverage>=3.4, since that's what we've got in tox.ini at the moment. Refs #96 2011-12-15 16:22:10 +00:00
Tom Christie
83910ff7a4 Update requirements. Refs #96 2011-12-15 16:20:37 +00:00
Marko Tibold
c509c2bff2 Merge remote-tracking branch 'upstream/master' 2011-12-15 14:56:47 +01:00
Marko Tibold
beccc54d11 Update docs/howto/setup.rst 2011-12-15 14:56:01 +01:00
Marko Tibold
59904576a2 reduced output to errors and warnings only 2011-12-15 12:25:56 +01:00
Marko Tibold
670dbe6d75 Don't output html to a tempdir, but keep them. 2011-12-15 01:16:09 +01:00
Marko Tibold
0f16db7614 see previous commit message. 2011-12-15 00:31:57 +01:00
Marko Tibold
e2b9359a2d Adding a docs env to the tox project.
This will run the linkcheck and build the html docs, turning any warnings into
errors.
Also changed the theme to sphinx-doc and added version to be displayed in the
docs.
2011-12-15 00:27:29 +01:00
alazaro
4a60575132 Fixed test broken by markdown update
Removed unused code. No longer needed with  markdown 2.1.0.
2011-12-14 23:36:13 +01:00
Tom Christie
8cabab2703 CSRF for non-dict like .DATA. Fixes #85 2011-12-14 20:19:17 +00:00
Tom Christie
67b13bd1bc More general requirements. 2011-12-14 20:11:02 +00:00
Tom Christie
d53f7f45b4 Use 1.4's CSRFMiddleware, so that PUT and DELETE get CSRF validation if session authentication is being used 2011-12-14 20:10:06 +00:00
Tom Christie
050f07e7b1 Ensure that external projects do not need to add 'djangorestframework.tests' to INSTALLED_APPS during testing. 2011-12-14 19:23:48 +00:00
Marko Tibold
4f38e78580 Merge pull request #92 from mwesterhof/master
Serializer.serialize_model fix of uncaught _SkipField exceptions
2011-12-13 04:06:40 -08:00