Merge branch 'unify_errors' into dev
Showing
- browserid/static/dialog/controllers/dialog_controller.js 21 additions, 7 deletionsbrowserid/static/dialog/controllers/dialog_controller.js
- browserid/static/dialog/controllers/page_controller.js 17 additions, 3 deletionsbrowserid/static/dialog/controllers/page_controller.js
- browserid/static/dialog/css/popup.css 11 additions, 3 deletionsbrowserid/static/dialog/css/popup.css
- browserid/static/dialog/dialog.js 3 additions, 1 deletionbrowserid/static/dialog/dialog.js
- browserid/static/dialog/resources/error-messages.js 15 additions, 34 deletionsbrowserid/static/dialog/resources/error-messages.js
- browserid/static/dialog/resources/network.js 30 additions, 7 deletionsbrowserid/static/dialog/resources/network.js
- browserid/static/dialog/test/qunit/controllers/dialog_controller_unit_test.js 103 additions, 0 deletions...log/test/qunit/controllers/dialog_controller_unit_test.js
- browserid/static/dialog/test/qunit/controllers/page_controller_unit_test.js 35 additions, 3 deletions...ialog/test/qunit/controllers/page_controller_unit_test.js
- browserid/static/dialog/test/qunit/qunit.js 7 additions, 3 deletionsbrowserid/static/dialog/test/qunit/qunit.js
- browserid/static/dialog/test/qunit/resources/network_unit_test.js 12 additions, 4 deletions...d/static/dialog/test/qunit/resources/network_unit_test.js
- browserid/static/dialog/views/error.ejs 42 additions, 0 deletionsbrowserid/static/dialog/views/error.ejs
- browserid/static/dialog/views/offline.ejs 8 additions, 0 deletionsbrowserid/static/dialog/views/offline.ejs
- browserid/views/unsupported_dialog.ejs 1 addition, 1 deletionbrowserid/views/unsupported_dialog.ejs
Loading
Please register or sign in to comment