encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-31 07:57:55 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,903 Commits 16 Branches 134 Tags 128 MiB
87ade870c3
Commit Graph

191 Commits

Author SHA1 Message Date
Xavier Ordoquy
328000fb34 Merge pull request #3624 from d6bels/master 
Login form autofocus
 2016-01-20 18:21:03 +01:00
Xavier Ordoquy
e7fbd264ca Merge pull request #3703 from sniegu/master 
Add missing csrf_token in AdminRenderer post form.
 2016-01-19 16:58:39 +01:00
Michael Lissner
f15026be10 Fixes #3756, adding the name to the HTML title, if it exists. 2015-12-22 10:31:18 -08:00
Piotr Śniegowski
2faa7bc288 Add missing csrf_token in AdminRenderer post form. 2015-12-04 23:23:56 +01:00
Adam Wester
6d1ed851b5 #3228 - add confirm modal for delete 2015-12-01 07:51:29 -05:00
Xavier Ordoquy
edc5a79b85 Merge pull request #3497 from Ins1ne/feature/3340 
update docs about detail page link for AdminRenderer
 2015-11-18 17:38:07 +01:00
d6bels
82eb4c8d71 Login form autofocus 2015-11-11 10:51:20 +01:00
nfletton
f85ad301eb Fix regression causing raw data form to not display 2015-11-04 15:43:25 -07:00
Marlon
3c6ce9dfc0 Fix trans template tag error 
Trans template tag requires `{% load i18n %}` at top of template.
 2015-10-28 22:47:52 -05:00
Tom Christie
c53c9eddfe Merge pull request #3315 from tomchristie/filters 
First pass at HTML rendering for filters
 2015-10-22 11:42:35 +01:00
Tom Christie
6305ae8916 Merge pull request #3475 from tomchristie/forms-api 
Forms API
 2015-10-22 09:59:57 +01:00
Tom Christie
34eb18b498 Merge branch 'master' into filters 
Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py
 2015-10-19 13:14:42 +01:00
Aider Ibragimov
79008ea210 fix typo for adding jquery string in AdminRenderer 2015-10-14 15:56:26 +03:00
Aider Ibragimov
5342f22009 return typo back for new pr, update docs 2015-10-14 15:54:43 +03:00
Aider Ibragimov
b19865f88d fix typo in adding jquery string, update docs about detail page link for AdminRenderer 2015-10-14 15:14:35 +03:00
Tom Christie
41182c6f06 Formns API 2015-10-06 10:58:20 +01:00
Tom Christie
eec1156f63 AJAX forms in admin interface 2015-09-17 16:53:28 +01:00
Tom Christie
566812ac0b Remove method and content overriding 2015-09-17 15:17:29 +01:00
Tom Christie
f34777a2e9 Translations for HTML filters 2015-08-28 14:55:22 +01:00
Tom Christie
aeb57913c9 Filter HTML refinments 2015-08-27 14:25:44 +01:00
Tom Christie
5db900c625 First pass at HTML rendering for filters 2015-08-21 16:13:52 +01:00
Tom Christie
c271568bf5 Remove erronous checkin 2015-08-21 10:57:46 +01:00
Tom Christie
f4412d0827 Docs for select cutoffs 2015-08-21 10:52:44 +01:00
Tom Christie
d86fd67895 Fix display of select multiple HTML fields. Closes #3290. 2015-08-20 12:11:14 +01:00
Tom Christie
27ac5a3680 Support grouped choices 2015-08-06 11:43:03 +01:00
Tom Christie
5b39d820be Remove 'load url from future' tags in templates. 2015-07-30 15:14:02 +01:00
Tom Christie
1f55bc747b Merge pull request #2926 from tomchristie/admin-style 
Admin style renderer
 2015-07-30 15:01:37 +01:00
Tom Christie
f1e2135b04 Restyle horizontal checkbox. Closes #2783. 2015-07-27 13:11:24 +01:00
Tom Christie
4c1597efe0 Error modals 2015-07-23 16:16:48 +01:00
Tom Christie
b996266431 Merge master 2015-07-23 15:28:29 +01:00
José Padilla
83ef64dbf5 Document setting URL_FORMAT_OVERRIDE to None 
This also hides the format dropdown from the
Browsable API if URL_FORMAT_OVERRIDE is disabled.

Closes #3057
 2015-06-23 07:50:44 -04:00
José Padilla
5e917789ec Consistent 2 space tabbing and formatting 2015-06-18 09:00:05 -04:00
Tom Christie
99e97fa9d3 Cleanup hyperlink rendering implementation 2015-06-03 11:47:33 +01:00
Tom Christie
25bb3b1502 Use chevron control for row linking, rather than hyperlinking first item 2015-06-03 11:15:54 +01:00
Tom Christie
90f2e26679 Add Hyperlink and rendering in admin style renderer 2015-06-03 11:00:38 +01:00
Tom Christie
b4d82a0f55 Preserve format query param 2015-05-15 09:18:45 +01:00
Tom Christie
9424e59b9e Styling of nested lists/objects in detail view 2015-05-12 16:28:49 +01:00
Tom Christie
a1421cd4a3 Basic formatting for dict and list values 2015-05-12 16:18:45 +01:00
Tom Christie
9a504efd26 Basic formatting for admin cells 2015-05-12 15:21:49 +01:00
Tom Christie
995aa47570 First pass templates for admin style 2015-05-12 14:49:09 +01:00
Tom Christie
992971d648 Merge pull request #2631 from Ins1ne/feature/issue-2559 
Allow blank/null on radio.html choices
 2015-03-16 12:11:33 +00:00
mochawich
2266fec99d fixed missing anchor closing tag 
when next_url is none, big part of page html will be rendered under the <a href='#'> as it does not have a closing tag.
 2015-03-13 17:03:51 +01:00
Aider Ibragimov
7159b31023 update vertical and inline layouts for radio choices 2015-03-07 07:17:22 +03:00
Aider Ibragimov
fdd811ec53 Allow blank/null on radio.html choices 2015-03-04 08:22:46 +03:00
José Padilla
bb8690cfb3 Disable select field if no choices available 2015-02-20 11:43:12 -04:00
Tom Christie
43d983fae8 Add paging controls 2015-01-22 17:25:12 +00:00
Tom Christie
d76e83dd78 Tweaks, and add pagination controls for offset/limit. 2015-01-15 16:52:07 +00:00
Tom Christie
3833a5bb8a Include pagination control in browsable API 2015-01-14 16:51:26 +00:00
Andrew Seier
35768344db Remove ‘/‘ from inside variable block {{ }} 
manage.py compress —force causes a warning here.
 2014-12-23 12:12:22 -08:00
Andrew Seier
399cb165b0 Remove commented code (warning during compression) 
manage.py compress —force causes a warning here.
 2014-12-23 12:11:45 -08:00
José Padilla
afe7ed9333 Add allow_blank for ChoiceField #2184 
This makes a ChoiceField optional in HTML if
model field has `blank=True` set.
 2014-12-09 09:25:06 -04:00
Loic Bistuer
b90f4228b2 Ported a couple of templates to Bootstrap 3.x. 2014-12-08 09:06:52 +07:00
Tom Christie
ecc26f6cb1 Style tweaks to login template. 2014-11-25 09:07:25 +00:00
Tom Christie
735d2257b4 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-25 08:59:59 +00:00
Tom Christie
bdacb66244 Lowercase HTML label tag. Refs #2121. 2014-11-25 08:59:45 +00:00
Andreas Bernacca
2ec0e7417f removed the whole footer section 2014-11-21 22:45:28 +01:00
Andreas Bernacca
fe9a758d7e remove sponsored by dabapps 2014-11-21 22:15:43 +01:00
Tom Christie
6ec96d0bac Resolve PUT and POST buttons in browsable API 2014-11-20 13:43:38 +00:00
Tom Christie
9c6bead8b6 Add --- null option for selects. Closes #2096. 2014-11-20 12:38:08 +00:00
Tom Christie
f573aaee4e List serializer no explicitly renders as 'not supported for HTML input' 2014-11-18 17:25:05 +00:00
Tom Christie
5f580cad52 Remove class='form-control' for file inputs. Closes #2065. 2014-11-17 18:17:44 +00:00
Tom Christie
02844a1507 Fix up fieldset templates. Closes #2039 2014-11-07 15:22:17 +00:00
Tom Christie
159c3de9fc Merge master 2014-10-31 15:19:15 +00:00
Tom Christie
45b5f23f31 Update to bootstrap 3. Closes #1085 2014-10-31 14:56:41 +00:00
Tom Christie
e8ea365c15 Moar form styling 2014-10-15 15:11:01 +01:00
Tom Christie
36fbc7678c Moar form styling 2014-10-15 13:35:12 +01:00
Tom Christie
cc1c423255 Reorganize to use template_pack in form rendering 2014-10-15 11:12:34 +01:00
Tom Christie
e558f806c0 Drop template includes 2014-10-15 10:04:01 +01:00
Tom Christie
a0e852a4d5 Use BoundField .name on fields 2014-10-09 16:30:06 +01:00
Tom Christie
5d247a65c8 First pass on nested serializers in HTML 2014-10-09 15:11:19 +01:00
Tom Christie
df7b6fcf58 First pass on incorperating the form rendering into the browsable API 2014-10-02 16:24:24 +01:00
Tom Christie
ffc6aa3abc More forms support 2014-10-01 21:35:27 +01:00
Tom Christie
c171fa21ac First pass at HTML form rendering 2014-10-01 19:44:46 +01:00
Anton D. Kachalov
802913d5e4 [templates/rest_framework/base.html] Separate object-form' and generic-content-form' IDs for POST and PUT forms 
Signed-off-by: Anton D. Kachalov <mouse@yandex-team.ru>
 2014-09-26 16:07:46 +04:00
Tom Christie
7dce364a35 Merge pull request #1829 from cezar77/login-form-errors 
Display validation errors on login form
 2014-09-05 12:59:26 +01:00
Cezar Pendarovski
2531b5cd86 Remove light gray bordering from the well with general message error 2014-09-05 13:28:47 +02:00
Cezar Pendarovski
34b3ee9ea1 Place general error message in well 2014-09-05 11:06:30 +02:00
Cezar Pendarovski
d3ee26ba99 Change bootstrap class warning to error 2014-09-05 10:55:49 +02:00
Cezar Pendarovski
6106701c06 Input fields get hightlighted if login fails and username is persisted 2014-09-05 09:38:54 +02:00
Cezar Pendarovski
3bc858c30b General message error goes above submit button 2014-09-04 17:51:45 +02:00
Cezar Pendarovski
ea259e8bde Error messages are displayed below the input fields 2014-09-04 16:01:27 +02:00
Cezar Pendarovski
d56efb8f82 Display validation errors on login form 2014-09-04 15:26:00 +02:00
Carlton Gibson
4947303f20 Moved li tags inside optional_login 
as per https://github.com/tomchristie/django-rest-framework/pull/1820#discussion_r16987993
 2014-09-03 09:54:36 +02:00
Carlton Gibson
fa0ef17737 Remove Login Dropdown when Auth Views are not registered. 
Fixes #1738
 2014-09-02 14:53:37 +02:00
Daniel Roseman
b554c67d14 Restore body block to base template. 2014-08-30 13:28:12 +01:00
Cezar Pendarovski
5380889275 Validation errors in the rendered HTML fixed 2014-08-28 10:39:01 +02:00
Cezar Pendarovski
e5d88a80a9 Put all TextNodes (method names) back to same line with parent element 2014-08-27 09:41:33 +02:00
Cezar Pendarovski
f6cbd88618 Merge remote-tracking branch 'upstream/master' into fix-1719 
Conflicts:
	rest_framework/templates/rest_framework/base.html
 2014-08-25 17:28:22 +02:00
Cezar Pendarovski
1e2bd1294e Fixed the issue with the non-draggable horizontal scrollbar 2014-08-22 09:53:03 +02: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
Jason Alan Palmer
2d6469348d Remove duplicate class attributes 
These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style
 2014-08-05 10:25:48 -04: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
Xavier Ordoquy
d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini
 2014-04-13 00:05:57 +02:00
Keats
6cd0394e20 Display the media type of the API response on the browsable API 2014-02-26 23:47:35 +00:00
Tom Christie
78494401c5 Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains 2014-01-08 15:22:41 +00:00
Tom Christie
e3ae33017d Added "nofollow" against docs link. 2014-01-06 15:01:45 +00:00
Tom Christie
9c41c007af Merge branch 'master' into 2.4.0 
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py
 2013-12-13 16:32:34 +00:00
Jakub Roztočil
be55a3c5c7 Removed commented-out credits from footer to make django-debug-toolbar work. 
The comment, although valid, caused that the Django debug toolbar's injected HTML was partially commented-out and thus the toolbar didn't work as expected.
 2013-10-24 17:53:02 +02:00
Omer Katz
d31fd33f4b Allow to customize description so that markup can be accepted if needed. 2013-10-16 09:15:02 -04:00