Merge v1.1 bugfixes into V1.1 master #834
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: src/node/handler/PadMessageHandler.js src/static/css/pad.css src/templates/pad.html
Bugfix for aceInitInnerdocbodyHead broken by jquery packaging commit
…y-pads Timeslider realtimeupdate+readonly pads
Since we're already in the proper path for the pad, why worry about it? Replacing the entire path of the URL with /p/padname may have seemed like a good idea at the time, but really, for a 302 we only need a relative pathname. This patch provides the proper way.
Don't rewrite in a stupid way
Makes plugin install/uninstall restart Express&socket.io
Conflicts: src/node/hooks/express/padurlsanitize.js
Changes from pita/master not in develop :(
Remove windows settings json
Bug workaround for plugin manager
Support node 0.8
Fix run.sh
Bugfix for readonly timeslider
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Peter please test and accept pull request if you are happy.
We also need to use a release tag so people know this is 1.1.1 or something!
ta