allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test
Grant access, when valid session is available and sessionNoPassword is set
typo
Merge branch 'upstream/develop'
Fix getRevisionChangeset API call making etherpad crash
Update CONTRIBUTING.md
Fix timeslider export dropdown
Create a customizable timeslider toolbar
Fix redo toolbar command, again.
Update docs
Merge pull request #2120 from ether/fix/timeslider-editbar

Add a customizable toolbar for timeslider
docs: update api version
Merge branch 'release/1.4.0'
Merge branch 'master' into develop
Update README.md

Added support for node v0.11 in the installation description
Merge pull request #2123 from ether/master

Update README.md
Toolbar: Fix timeslider button

Wouldn't play nice with url params in document.location
fixes #2124
Merge pull request #2126 from ether/fix/toolbar-timeslider-button

Toolbar: Fix timeslider button
Localisation updates from https://translatewiki.net.
Localisation updates from https://translatewiki.net.