Fixups to allow running out of subdirectory#2624
Merged
engelgabriel merged 15 commits intodevelopfrom Mar 28, 2016
Merged
Conversation
- Do not depend on specific version of ostrio:cookies to use newer versions with fixes - Update all packages with latest versions
- downgrade sandstorm to working (original) version - avatar path fixup
…s publicly available
# Conflicts: # .meteor/versions # packages/rocketchat-lib/server/startup/settings.coffee # packages/rocketchat-theme/assets/stylesheets/fontello.css
# Conflicts: # packages/rocketchat-lib/server/startup/settings.coffee # packages/rocketchat-theme/assets/stylesheets/fontello.css # packages/rocketchat-theme/assets/stylesheets/utils/_octicons.less
|
Any ETA for this patch? |
Member
Author
|
@lunitic Will be merged after our weekly release to give us more time to test in develop |
|
@rodrigok good then I will help test it later this week |
Member
|
Will probably close #2655 |
# Conflicts: # .jshintrc # packages/rocketchat-lib/lib/startup/settingsOnLoadSiteUrl.coffee
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.
Improvements from #2518
Closes #1696
Closes #335
Closes #2401