merge latest dev into awsbox_port
Showing
- lib/bcrypt.js 1 addition, 0 deletionslib/bcrypt.js
- lib/browserid/views.js 2 additions, 1 deletionlib/browserid/views.js
- lib/http_forward.js 4 additions, 0 deletionslib/http_forward.js
- lib/i18n.js 2 additions, 1 deletionlib/i18n.js
- lib/wsapi.js 3 additions, 3 deletionslib/wsapi.js
- lib/wsapi/address_info.js 3 additions, 1 deletionlib/wsapi/address_info.js
- lib/wsapi/auth_with_assertion.js 2 additions, 1 deletionlib/wsapi/auth_with_assertion.js
- lib/wsapi/authenticate_user.js 2 additions, 1 deletionlib/wsapi/authenticate_user.js
- lib/wsapi/complete_email_addition.js 2 additions, 1 deletionlib/wsapi/complete_email_addition.js
- lib/wsapi/have_email.js 2 additions, 1 deletionlib/wsapi/have_email.js
- lib/wsapi/session_context.js 2 additions, 1 deletionlib/wsapi/session_context.js
- resources/static/css/m.css 29 additions, 4 deletionsresources/static/css/m.css
- resources/static/dialog/controllers/actions.js 2 additions, 0 deletionsresources/static/dialog/controllers/actions.js
- resources/static/dialog/controllers/pick_email.js 5 additions, 1 deletionresources/static/dialog/controllers/pick_email.js
- resources/static/dialog/css/popup.css 5 additions, 5 deletionsresources/static/dialog/css/popup.css
- resources/static/dialog/views/development.ejs 3 additions, 0 deletionsresources/static/dialog/views/development.ejs
- resources/static/lib/hub.js 5 additions, 5 deletionsresources/static/lib/hub.js
- resources/static/shared/models/interaction_data.js 4 additions, 3 deletionsresources/static/shared/models/interaction_data.js
- resources/static/shared/modules/development.js 27 additions, 9 deletionsresources/static/shared/modules/development.js
- resources/static/shared/modules/interaction_data.js 49 additions, 1 deletionresources/static/shared/modules/interaction_data.js
Loading
Please register or sign in to comment