Skip to content

Merge upstream #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BrickXu merged 7 commits into from
Nov 25, 2014
Merged

Merge upstream #1

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
790a651
Fixed database update instructions
LuRsT Nov 24, 2014
918b9cc
Added missing import in tutorial snippet
LuRsT Nov 24, 2014
eb77de4
Merge pull request #2117 from LuRsT/patch-6
xordoquy Nov 24, 2014
3371131
Merge pull request #2116 from LuRsT/patch-5
lovelydinosaur Nov 24, 2014
bdacb66
Lowercase HTML label tag. Refs #2121.
lovelydinosaur Nov 25, 2014
735d225
Merge branch 'master' of https://github.com/tomchristie/django-rest-f…
lovelydinosaur Nov 25, 2014
ecc26f6
Style tweaks to login template.
lovelydinosaur Nov 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Lowercase HTML label tag. Refs encode#2121.
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Nov 25, 2014
commit bdacb6624484209fb008293a9dc40c06a439ef71
4 changes: 2 additions & 2 deletions rest_framework/templates/rest_framework/login_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div id="div_id_username"
class="clearfix control-group {% if form.username.errors %}error{% endif %}">
<div class="controls">
<Label class="span4">Username:</label>
<label class="span4">Username:</label>
<input style="height: 25px" type="text" name="username" maxlength="100"
autocapitalize="off"
autocorrect="off" class="span12 textinput textInput"
Expand All @@ -38,7 +38,7 @@
<div id="div_id_password"
class="clearfix control-group {% if form.password.errors %}error{% endif %}">
<div class="controls">
<Label class="span4">Password:</label>
<label class="span4">Password:</label>
<input style="height: 25px" type="password" name="password" maxlength="100"
autocapitalize="off" autocorrect="off" class="span12 textinput textInput"
id="id_password" required>
Expand Down