Merge branch 'dev' of github.com:mozilla/browserid into dev
Conflicts: resources/views/index.ejs
No related branches found
No related tags found
Showing
- resources/static/css/style.css 10 additions, 4 deletionsresources/static/css/style.css
- resources/static/dialog/css/popup.css 10 additions, 27 deletionsresources/static/dialog/css/popup.css
- resources/static/dialog/start.js 1 addition, 1 deletionresources/static/dialog/start.js
- resources/static/pages/start.js 64 additions, 47 deletionsresources/static/pages/start.js
- resources/static/shared/modules/code_check.js 14 additions, 16 deletionsresources/static/shared/modules/code_check.js
- resources/static/shared/modules/page_module.js 20 additions, 17 deletionsresources/static/shared/modules/page_module.js
- resources/static/shared/modules/xhr_delay.js 16 additions, 3 deletionsresources/static/shared/modules/xhr_delay.js
- resources/static/shared/network.js 1 addition, 3 deletionsresources/static/shared/network.js
- resources/static/shared/screens.js 2 additions, 1 deletionresources/static/shared/screens.js
- resources/static/test/qunit/shared/modules/code_check_unit_test.js 22 additions, 21 deletions.../static/test/qunit/shared/modules/code_check_unit_test.js
- resources/static/test/qunit/shared/modules/page_module_unit_test.js 13 additions, 39 deletions...static/test/qunit/shared/modules/page_module_unit_test.js
- resources/static/test/qunit/shared/modules/xhr_delay_unit_test.js 13 additions, 4 deletions...s/static/test/qunit/shared/modules/xhr_delay_unit_test.js
- resources/static/test/qunit/testHelpers/helpers.js 16 additions, 0 deletionsresources/static/test/qunit/testHelpers/helpers.js
- resources/views/dialog.ejs 7 additions, 1 deletionresources/views/dialog.ejs
- resources/views/dialog_layout.ejs 1 addition, 1 deletionresources/views/dialog_layout.ejs
- resources/views/index.ejs 1 addition, 0 deletionsresources/views/index.ejs
- resources/views/layout.ejs 4 additions, 1 deletionresources/views/layout.ejs
- resources/views/signin.ejs 4 additions, 8 deletionsresources/views/signin.ejs
- resources/views/test.ejs 6 additions, 2 deletionsresources/views/test.ejs
- scripts/compress.sh 2 additions, 2 deletionsscripts/compress.sh
Loading
Please register or sign in to comment