Merge branch 'dev' of github.com:mozilla/browserid into dev
Showing
- ChangeLog 4 additions, 0 deletionsChangeLog
- lib/configuration.js 1 addition, 1 deletionlib/configuration.js
- lib/email.js 2 additions, 3 deletionslib/email.js
- lib/wsapi.js 4 additions, 13 deletionslib/wsapi.js
- package.json 1 addition, 1 deletionpackage.json
- resources/static/css/common.css 34 additions, 0 deletionsresources/static/css/common.css
- resources/static/css/style.css 1 addition, 19 deletionsresources/static/css/style.css
- resources/static/dialog/controllers/actions.js 1 addition, 1 deletionresources/static/dialog/controllers/actions.js
- resources/static/dialog/controllers/pick_email.js 11 additions, 16 deletionsresources/static/dialog/controllers/pick_email.js
- resources/static/dialog/css/m.css 8 additions, 1 deletionresources/static/dialog/css/m.css
- resources/static/dialog/css/popup.css 2 additions, 20 deletionsresources/static/dialog/css/popup.css
- resources/static/dialog/start.js 18 additions, 29 deletionsresources/static/dialog/start.js
- resources/static/dialog/views/error.ejs 11 additions, 5 deletionsresources/static/dialog/views/error.ejs
- resources/static/dialog/views/pick_email.ejs 5 additions, 5 deletionsresources/static/dialog/views/pick_email.ejs
- resources/static/include_js/include.js 4 additions, 4 deletionsresources/static/include_js/include.js
- resources/static/lib/jschannel.js 1 addition, 1 deletionresources/static/lib/jschannel.js
- resources/static/pages/manage_account.js 4 additions, 5 deletionsresources/static/pages/manage_account.js
- resources/static/pages/start.js 44 additions, 57 deletionsresources/static/pages/start.js
- resources/static/provisioning_api.js 3 additions, 3 deletionsresources/static/provisioning_api.js
- resources/static/shared/error-messages.js 40 additions, 37 deletionsresources/static/shared/error-messages.js
Loading
Please register or sign in to comment