Merge branch 'dev' of github.com:mozilla/browserid into reset_password_flow
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- config/aws.json 1 addition, 2 deletionsconfig/aws.json
- lib/i18n.js 8 additions, 6 deletionslib/i18n.js
- lib/static/email_templates/reset.ejs 1 addition, 1 deletionlib/static/email_templates/reset.ejs
- lib/static_resources.js 3 additions, 2 deletionslib/static_resources.js
- package.json 1 addition, 1 deletionpackage.json
- resources/static/common/css/style.css 2 additions, 2 deletionsresources/static/common/css/style.css
- resources/static/common/js/dom-helpers.js 32 additions, 0 deletionsresources/static/common/js/dom-helpers.js
- resources/static/common/js/error-display.js 0 additions, 42 deletionsresources/static/common/js/error-display.js
- resources/static/common/js/gettext.js 10 additions, 13 deletionsresources/static/common/js/gettext.js
- resources/static/common/js/modules/extended-info.js 46 additions, 0 deletionsresources/static/common/js/modules/extended-info.js
- resources/static/common/js/modules/interaction_data.js 67 additions, 2 deletionsresources/static/common/js/modules/interaction_data.js
- resources/static/common/js/modules/page_module.js 2 additions, 8 deletionsresources/static/common/js/modules/page_module.js
- resources/static/common/js/modules/xhr_disable_form.js 34 additions, 6 deletionsresources/static/common/js/modules/xhr_disable_form.js
- resources/static/common/js/screens.js 25 additions, 3 deletionsresources/static/common/js/screens.js
- resources/static/dialog/css/m.css 9 additions, 1 deletionresources/static/dialog/css/m.css
- resources/static/dialog/css/style.css 5 additions, 5 deletionsresources/static/dialog/css/style.css
- resources/static/dialog/js/misc/helpers.js 4 additions, 1 deletionresources/static/dialog/js/misc/helpers.js
- resources/static/dialog/js/modules/is_this_your_computer.js 4 additions, 0 deletionsresources/static/dialog/js/modules/is_this_your_computer.js
- resources/static/dialog/views/authenticate.ejs 4 additions, 6 deletionsresources/static/dialog/views/authenticate.ejs
Loading
Please register or sign in to comment