Miscellaneous Fixes#344
Merged
Pita merged 9 commits intoether:masterfrom Jan 22, 2012
Merged
Conversation
Merged
Contributor
|
There is a merge conflict with this pull request. Can you please fix them? https://github.com/Pita/etherpad-lite/pull/314 |
The jQuery library does not need to be compressed; it is compressed as a consequence of being included in `pad.js`.
Default to 'node-js' only if no user agent can be found the normal way.
In the case that it is not defined, the configuration is `undefined`.
Contributor
Author
|
Rebased, it should merge cleanly now. |
Contributor
|
Thx a lot!!! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This branch makes several generally useful changes in order to simplify the process of modularizing the client’s JavaScript (#343 - cweider/etherpad-lite@modulize).
Serverheader.pad2.js.