Merge branch 'dev' into issue_1826_rp_name_font
Conflicts: resources/static/dialog/css/style.css
No related branches found
No related tags found
Showing
- bin/browserid 6 additions, 0 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
- package.json 1 addition, 1 deletionpackage.json
- resources/static/authentication_api.js 2 additions, 3 deletionsresources/static/authentication_api.js
- resources/static/common/css/style.css 14 additions, 0 deletionsresources/static/common/css/style.css
- resources/static/common/js/lib/dom-jquery.js 2 additions, 4 deletionsresources/static/common/js/lib/dom-jquery.js
- resources/static/common/js/lib/micrajax.js 9 additions, 5 deletionsresources/static/common/js/lib/micrajax.js
- resources/static/common/js/modules/page_module.js 2 additions, 0 deletionsresources/static/common/js/modules/page_module.js
- resources/static/common/js/network.js 3 additions, 5 deletionsresources/static/common/js/network.js
- resources/static/common/js/user.js 8 additions, 0 deletionsresources/static/common/js/user.js
- resources/static/dialog/css/style.css 20 additions, 13 deletionsresources/static/dialog/css/style.css
- resources/static/dialog/js/misc/helpers.js 8 additions, 2 deletionsresources/static/dialog/js/misc/helpers.js
- resources/static/dialog/js/misc/state.js 87 additions, 25 deletionsresources/static/dialog/js/misc/state.js
- resources/static/dialog/js/modules/actions.js 4 additions, 4 deletionsresources/static/dialog/js/modules/actions.js
- resources/static/dialog/js/modules/add_email.js 4 additions, 6 deletionsresources/static/dialog/js/modules/add_email.js
- resources/static/dialog/js/modules/authenticate.js 17 additions, 7 deletionsresources/static/dialog/js/modules/authenticate.js
Loading
Please register or sign in to comment