Merge branch 'dev' into issue_1518_unknown_path
Conflicts: resources/static/pages/start.js
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- ChangeLog 20 additions, 2 deletionsChangeLog
- bin/router 4 additions, 2 deletionsbin/router
- config/aws.json 3 additions, 1 deletionconfig/aws.json
- config/local.json 4 additions, 1 deletionconfig/local.json
- config/production.json 4 additions, 1 deletionconfig/production.json
- example/primary/provision.html 1 addition, 1 deletionexample/primary/provision.html
- lib/browserid/prove_template.ejs 1 addition, 1 deletionlib/browserid/prove_template.ejs
- lib/browserid/views.js 16 additions, 3 deletionslib/browserid/views.js
- lib/configuration.js 4 additions, 0 deletionslib/configuration.js
- lib/heartbeat.js 80 additions, 16 deletionslib/heartbeat.js
- lib/static_resources.js 2 additions, 1 deletionlib/static_resources.js
- package.json 3 additions, 2 deletionspackage.json
- resources/static/communication_iframe/start.js 5 additions, 0 deletionsresources/static/communication_iframe/start.js
- resources/static/css/common.css 10 additions, 1 deletionresources/static/css/common.css
- resources/static/css/m.css 46 additions, 39 deletionsresources/static/css/m.css
- resources/static/css/style.css 138 additions, 88 deletionsresources/static/css/style.css
- resources/static/dialog/controllers/actions.js 0 additions, 1 deletionresources/static/dialog/controllers/actions.js
- resources/static/dialog/controllers/add_email.js 23 additions, 1 deletionresources/static/dialog/controllers/add_email.js
- resources/static/dialog/controllers/authenticate.js 2 additions, 0 deletionsresources/static/dialog/controllers/authenticate.js
Loading
Please register or sign in to comment