Merge branch 'dev' into issue_1240_tos_update
Conflicts: resources/static/dialog/views/required_email.ejs resources/static/dialog/views/set_password.ejs
Showing
- lib/browserid/views.js 5 additions, 6 deletionslib/browserid/views.js
- lib/load_gen/common.js 6 additions, 3 deletionslib/load_gen/common.js
- lib/load_gen/crypto.js 2 additions, 1 deletionlib/load_gen/crypto.js
- package.json 1 addition, 1 deletionpackage.json
- resources/static/css/common.css 6 additions, 0 deletionsresources/static/css/common.css
- resources/static/dialog/css/m.css 3 additions, 0 deletionsresources/static/dialog/css/m.css
- resources/static/dialog/resources/screen_size_hacks.js 4 additions, 1 deletionresources/static/dialog/resources/screen_size_hacks.js
- resources/static/dialog/views/add_email.ejs 2 additions, 2 deletionsresources/static/dialog/views/add_email.ejs
- resources/static/dialog/views/authenticate.ejs 2 additions, 2 deletionsresources/static/dialog/views/authenticate.ejs
- resources/static/dialog/views/primary_user_verified.ejs 2 additions, 2 deletionsresources/static/dialog/views/primary_user_verified.ejs
- resources/static/dialog/views/required_email.ejs 2 additions, 2 deletionsresources/static/dialog/views/required_email.ejs
- resources/static/dialog/views/set_password.ejs 5 additions, 5 deletionsresources/static/dialog/views/set_password.ejs
- resources/static/dialog/views/verify_primary_user.ejs 2 additions, 2 deletionsresources/static/dialog/views/verify_primary_user.ejs
- resources/static/fonts/LICENSE.txt 203 additions, 0 deletionsresources/static/fonts/LICENSE.txt
- resources/static/include_js/include.js 19 additions, 20 deletionsresources/static/include_js/include.js
- resources/static/lib/jschannel.js 16 additions, 16 deletionsresources/static/lib/jschannel.js
- resources/static/lib/winchan.js 2 additions, 2 deletionsresources/static/lib/winchan.js
- resources/static/provisioning_api.js 16 additions, 16 deletionsresources/static/provisioning_api.js
- tests/cache-header-tests.js 2 additions, 2 deletionstests/cache-header-tests.js
Loading
Please register or sign in to comment