sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-21 19:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'DanielHeath/develop' into develop

Browse source 
Conflicts:
	views/static/front.jade
This commit is contained in:
Tyler Renelle 2014-01-05 16:35:35 -07:00
commit eeaeb5c006
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
views/static/front.jade
View file

@ -40,9 +40,9 @@ block content
.tab-pane.active#login-tab
form(ng-submit='auth()', method='POST')
.control-group
input(type='text', ng-model='loginUsername', placeholder=env.t('username'))
input(type='text', ng-model='loginUsername', placeholder=env.t('username'), name='username')
.control-group
input(type='password', ng-model='loginPassword', placeholder=env.t('password'))
input(type='password', ng-model='loginPassword', placeholder=env.t('password'), name='password')
//-.control-group
label.checkbox
input(type='checkbox', ng-click='useUUID = !useUUID')
@ -87,4 +87,4 @@ block content
=env.t('accept2Terms')
a(href='/static/privacy' target='_blank')=env.t('privacy')
| .
input.btn.btn-primary(type='submit', value=env.t('register'))
input.btn.btn-primary(type='submit', value=env.t('register'))