Merge branch 'dev' of github.com:mozilla/browserid into dev
Showing
- .travis.yml 7 additions, 1 deletion.travis.yml
- ChangeLog 26 additions, 1 deletionChangeLog
- README.md 9 additions, 5 deletionsREADME.md
- docs/PRIMARY_PROTOCOL.md 2 additions, 1 deletiondocs/PRIMARY_PROTOCOL.md
- lib/i18n.js 4 additions, 1 deletionlib/i18n.js
- lib/static_resources.js 26 additions, 6 deletionslib/static_resources.js
- package.json 5 additions, 4 deletionspackage.json
- resources/static/dialog/controllers/pick_email.js 1 addition, 1 deletionresources/static/dialog/controllers/pick_email.js
- resources/static/dialog/css/popup.css 0 additions, 4 deletionsresources/static/dialog/css/popup.css
- resources/static/dialog/views/pick_email.ejs 4 additions, 2 deletionsresources/static/dialog/views/pick_email.ejs
- scripts/browserid.spec 2 additions, 3 deletionsscripts/browserid.spec
- scripts/compress 63 additions, 0 deletionsscripts/compress
- scripts/compress-locales.sh 0 additions, 80 deletionsscripts/compress-locales.sh
- scripts/compress-worker.js 91 additions, 0 deletionsscripts/compress-worker.js
- scripts/compress.sh 0 additions, 86 deletionsscripts/compress.sh
- scripts/create_templates.js 24 additions, 3 deletionsscripts/create_templates.js
- scripts/deploy/vm.js 1 addition, 1 deletionscripts/deploy/vm.js
- scripts/phantomrunner.js 0 additions, 0 deletionsscripts/phantomrunner.js
- scripts/production_locales 0 additions, 18 deletionsscripts/production_locales
- scripts/test 67 additions, 0 deletionsscripts/test
Loading
Please register or sign in to comment