Merge branches 'origin' and 'dev' into issue1527-delegate-authority
Showing
- ChangeLog 22 additions, 1 deletionChangeLog
- lib/static_resources.js 1 addition, 1 deletionlib/static_resources.js
- lib/wsapi/complete_email_addition.js 13 additions, 8 deletionslib/wsapi/complete_email_addition.js
- resources/static/dialog/controllers/actions.js 2 additions, 12 deletionsresources/static/dialog/controllers/actions.js
- resources/static/dialog/controllers/check_registration.js 4 additions, 1 deletionresources/static/dialog/controllers/check_registration.js
- resources/static/dialog/controllers/dialog.js 1 addition, 1 deletionresources/static/dialog/controllers/dialog.js
- resources/static/dialog/controllers/generate_assertion.js 4 additions, 4 deletionsresources/static/dialog/controllers/generate_assertion.js
- resources/static/dialog/css/popup.css 14 additions, 2 deletionsresources/static/dialog/css/popup.css
- resources/static/dialog/resources/state.js 86 additions, 51 deletionsresources/static/dialog/resources/state.js
- resources/static/dialog/start.js 1 addition, 1 deletionresources/static/dialog/start.js
- resources/static/dialog/views/is_this_your_computer.ejs 1 addition, 2 deletionsresources/static/dialog/views/is_this_your_computer.ejs
- resources/static/include_js/include.js 11 additions, 5 deletionsresources/static/include_js/include.js
- resources/static/shared/network.js 5 additions, 0 deletionsresources/static/shared/network.js
- resources/static/shared/storage.js 3 additions, 2 deletionsresources/static/shared/storage.js
- resources/static/test/cases/controllers/actions.js 31 additions, 96 deletionsresources/static/test/cases/controllers/actions.js
- resources/static/test/cases/controllers/check_registration.js 11 additions, 3 deletions...urces/static/test/cases/controllers/check_registration.js
- resources/static/test/cases/controllers/generate_assertion.js 1 addition, 1 deletion...urces/static/test/cases/controllers/generate_assertion.js
- resources/static/test/cases/resources/state.js 79 additions, 30 deletionsresources/static/test/cases/resources/state.js
- resources/static/test/cases/shared/network.js 38 additions, 8 deletionsresources/static/test/cases/shared/network.js
- resources/static/test/mocks/xhr.js 1 addition, 0 deletionsresources/static/test/mocks/xhr.js
Loading
Please register or sign in to comment