Tom Christie
59b47eac14
Fix cache_throttle typo
2014-08-20 12:32:24 +01:00
Tom Christie
6ffc97c808
Merge pull request #1770 from tomchristie/2.4.0
...
2.4.0 Release.
2014-08-20 12:06:29 +01:00
Tom Christie
f7b3e1e62b
Latest sponsor update
2014-08-20 11:09:04 +01:00
Tom Christie
874d2be83c
Release notes
2014-08-20 00:19:03 +01:00
Tom Christie
0c65e028b6
Release notes
2014-08-19 23:25:12 +01:00
Tom Christie
63d02dbea8
Drop six from compat. 1.4.2 is now the lowest supported version.
2014-08-19 17:06:55 +01:00
Tom Christie
00c0dfc66f
Documentation on runtests.py
2014-08-19 16:29:05 +01:00
Tom Christie
e385a7b8eb
Merge master
2014-08-19 10:11:10 +01:00
Tom Christie
c092b4df78
Merge pull request #1641 from javins/login-title
...
Refactor login template to extend base.
2014-08-18 20:28:34 +01:00
Tom Christie
2aad8e4b35
Merge pull request #1654 from carltongibson/1559-take-2
...
Allow use of native migrations in 1.7 — Take 2
2014-08-18 18:54:43 +01:00
Carlton Gibson
ae2ab496c2
Updated docs for South v1.0
2014-08-18 13:48:46 +02:00
Tom Christie
38a0e3e627
Sponsor update
2014-08-16 14:02:44 +01:00
Tom Christie
172b9c74f9
Latest sponsor update
2014-08-15 17:48:43 +01:00
Tom Christie
967798e832
Added compile to the sponsors
2014-08-15 17:39:51 +01:00
Tom Christie
4c60639595
Added Holvi
2014-08-15 16:19:13 +01:00
Tom Christie
e624871a68
Latest backer update
2014-08-15 15:46:26 +01:00
Tom Christie
a5561954d7
Latest sponsor updates
2014-08-15 15:36:49 +01:00
catherinedodge
bfd0b261db
Fixed small typo
2014-08-14 13:39:21 -04:00
Tom Christie
63d5634c66
Minor sponsor correction
2014-08-14 16:59:40 +01:00
Tom Christie
bdb884aceb
Latest sponsor update
2014-08-14 16:57:21 +01:00
Tom Christie
c52075f392
Latest sponsor update
2014-08-13 14:02:09 +01:00
Tom Christie
5d674927b8
Minor docs style change
2014-08-12 14:59:17 +01:00
Tom Christie
c716f35825
Added Cantemo
2014-08-12 14:57:27 +01:00
Tom Christie
7551db23ca
Added Rob Spectre
2014-08-12 13:47:34 +01:00
Tom Christie
f46b55b75f
Added OpenEye as a silver sponsor
2014-08-12 13:44:00 +01:00
Kevin London
bc03d2b553
Updated links to Bootstrap components
...
The previous links landed on the the main page and no longer directly linked to specific areas.
2014-08-07 16:32:40 -07:00
Tom Christie
83597a4b0f
Latest sponsor update
2014-08-05 15:31:39 +01:00
Tom Christie
322476c386
Latest sponsor update
2014-08-04 09:20:27 +01:00
Tom Christie
7bc9954fdb
Update sponsorships
2014-08-02 15:28:34 +01:00
Tom Christie
d0fdcdfdad
Added pathwright
2014-08-02 15:18:03 +01:00
Tom Christie
3ac075a227
Update Nephila sponsorship
2014-08-02 15:08:14 +01:00
Tom Christie
f58dde59c4
Sponsor updated
2014-08-02 15:05:03 +01:00
Tom Christie
9af3dc0ba5
Added ProReNata AB
2014-08-01 13:54:26 +01:00
Tom Christie
5377bda942
Fix LaterPay link
2014-08-01 13:42:51 +01:00
Tom Christie
f87aadb3ce
Latest sponsor updates
2014-08-01 11:35:48 +01:00
Tom Christie
6677374e9b
Kickstarter sponsors
2014-07-31 22:33:45 +01:00
Tom Christie
8044416523
Add platinum sponsors
2014-07-31 20:19:28 +01:00
Xavier Ordoquy
4876bec9f5
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
rest_framework/fields.py
2014-07-26 00:06:56 +02:00
Tom Christie
ead0e60099
Docs for kickstarter announcement
2014-07-17 17:17:41 +01:00
Carlton Gibson
d98245ac22
Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559
...
Conflicts:
docs/topics/release-notes.md
2014-06-24 10:30:08 +02:00
Carlton Gibson
3f727ce738
Added (first pass) notes to docs & release notes. Backed out SOUTH_MIGRATION_MODULES setting from rest_framework.settings
2014-06-24 09:02:44 +02:00
Xavier Ordoquy
2489e38a06
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/viewsets.md
rest_framework/serializers.py
rest_framework/throttling.py
tests/test_generics.py
tests/test_serializers.py
tox.ini
2014-06-23 14:02:45 +02:00
Walt Javins
b4c7717cb8
Refactor login template to extend base.
...
While experimenting with extending DRF, I found that the login page
1) had no title, and 2) duplicated <head> info from base.html.
This change adds a new {% block body %} to the base.html template
which allows override of the entire html <body>. login_base.html
has its duplicated head info stripped, and now extends base.html
to share common html <head> templating.
As part of this change, pretify.css is unnecessarily added to
login_base.html. If this is deemed a problem, it will be easy to
block that css out, and have login_base.html override the block.
Ideally, I would have liked to create a new api_base.html that extends
base.html, move the api specific logic into that template, and leave
base.html content agnostic, to truely be a unifying base for all DRF
pages. But this change would break current apps that override
api.html and expect base.html to be the immediate super template. :/
This change is benificial because it:
- removes duplication of header declarations (mostly css includes)
- adds a html title to the login page
- standardizes html header info across all DRF pages
Docs are updated to reflect the new structure.
2014-06-13 22:26:00 -07:00
Tom Christie
1386767013
Version 2.3.14
2014-06-12 11:47:26 +01:00
Xavier Ordoquy
15c2c58b43
Updated the release-notes.
2014-05-01 08:43:49 +02:00
Xavier Ordoquy
7b4463f739
Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
...
Conflicts:
rest_framework/runtests/urls.py
tests/test_response.py
tox.ini
2014-05-01 08:01:38 +02:00
Xavier Ordoquy
2aca69a946
Merge remote-tracking branch 'reference/master' into feature/pytest
...
Conflicts:
tests/test_serializer.py
2014-04-30 22:24:01 +02:00
Xavier Ordoquy
56b4390316
Merge remote-tracking branch 'origin/master' into 2.4.0
...
Conflicts:
.travis.yml
rest_framework/serializers.py
rest_framework/tests/test_authentication.py
2014-04-30 22:21:26 +02:00
Xavier Ordoquy
f4a82dd5da
Updated the release notes.
2014-04-24 14:33:36 +02:00
Xavier Ordoquy
1797a74e82
Merge remote-tracking branch 'pelme/pytest' into feature/pytest
...
Conflicts:
.travis.yml
rest_framework/runtests/runtests.py
tests/test_filters.py
tests/test_pagination.py
tox.ini
2014-04-17 09:53:44 +02:00
