Merge design branch into dev, full site and dialog redesign.
Conflicts: browserid/lib/wsapi.js
Showing
- browserid/app.js 17 additions, 14 deletionsbrowserid/app.js
- browserid/lib/db.js 1 addition, 0 deletionsbrowserid/lib/db.js
- browserid/lib/db_json.js 13 additions, 7 deletionsbrowserid/lib/db_json.js
- browserid/lib/db_mysql.js 23 additions, 12 deletionsbrowserid/lib/db_mysql.js
- browserid/lib/email.js 10 additions, 2 deletionsbrowserid/lib/email.js
- browserid/lib/wsapi.js 155 additions, 106 deletionsbrowserid/lib/wsapi.js
- browserid/static/css/github.css 0 additions, 129 deletionsbrowserid/static/css/github.css
- browserid/static/css/m.css 210 additions, 0 deletionsbrowserid/static/css/m.css
- browserid/static/css/style.css 871 additions, 212 deletionsbrowserid/static/css/style.css
- browserid/static/dialog/controllers/addemail_controller.js 0 additions, 79 deletionsbrowserid/static/dialog/controllers/addemail_controller.js
- browserid/static/dialog/controllers/authenticate_controller.js 126 additions, 26 deletions...erid/static/dialog/controllers/authenticate_controller.js
- browserid/static/dialog/controllers/checkregistration_controller.js 17 additions, 62 deletions...static/dialog/controllers/checkregistration_controller.js
- browserid/static/dialog/controllers/createaccount_controller.js 0 additions, 164 deletions...rid/static/dialog/controllers/createaccount_controller.js
- browserid/static/dialog/controllers/dialog_controller.js 61 additions, 57 deletionsbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/dialog/controllers/forgotpassword_controller.js 0 additions, 111 deletions...id/static/dialog/controllers/forgotpassword_controller.js
- browserid/static/dialog/controllers/page_controller.js 23 additions, 19 deletionsbrowserid/static/dialog/controllers/page_controller.js
- browserid/static/dialog/controllers/pickemail_controller.js 63 additions, 17 deletionsbrowserid/static/dialog/controllers/pickemail_controller.js
- browserid/static/dialog/css/m.css 65 additions, 0 deletionsbrowserid/static/dialog/css/m.css
- browserid/static/dialog/css/popup.css 521 additions, 0 deletionsbrowserid/static/dialog/css/popup.css
- browserid/static/dialog/dialog.js 3 additions, 15 deletionsbrowserid/static/dialog/dialog.js
Loading
Please register or sign in to comment