Merge branch 'dev' into issue_1240_tos_update
Conflicts: resources/static/test/cases/dialog/js/modules/dialog.js resources/static/test/cases/dialog/js/modules/verify_primary_user.js
No related branches found
No related tags found
Showing
- bin/browserid 3 additions, 3 deletionsbin/browserid
- example/primary/provision.html 3 additions, 6 deletionsexample/primary/provision.html
- example/primary/sign_in.html 8 additions, 15 deletionsexample/primary/sign_in.html
- example/rp/index.html 0 additions, 13 deletionsexample/rp/index.html
- lib/configuration.js 0 additions, 4 deletionslib/configuration.js
- lib/static_resources.js 3 additions, 0 deletionslib/static_resources.js
- resources/static/authentication_api.js 2 additions, 3 deletionsresources/static/authentication_api.js
- resources/static/dialog/js/modules/dialog.js 12 additions, 18 deletionsresources/static/dialog/js/modules/dialog.js
- resources/static/dialog/js/modules/verify_primary_user.js 6 additions, 7 deletionsresources/static/dialog/js/modules/verify_primary_user.js
- resources/static/dialog/js/start.js 1 addition, 1 deletionresources/static/dialog/js/start.js
- resources/static/include_js/include.js 26 additions, 2 deletionsresources/static/include_js/include.js
- resources/static/test/cases/dialog/js/modules/dialog.js 14 additions, 62 deletionsresources/static/test/cases/dialog/js/modules/dialog.js
- resources/static/test/cases/dialog/js/modules/verify_primary_user.js 4 additions, 5 deletions...tatic/test/cases/dialog/js/modules/verify_primary_user.js
- resources/static/test/mocks/window.js 1 addition, 0 deletionsresources/static/test/mocks/window.js
- resources/views/about.ejs 3 additions, 3 deletionsresources/views/about.ejs
- resources/views/layout.ejs 1 addition, 1 deletionresources/views/layout.ejs
- tests/static-resource-test.js 1 addition, 1 deletiontests/static-resource-test.js
Loading
Please register or sign in to comment