New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade to upstream everything #3
Open
glebm
wants to merge
29
commits into
aniki21:master
Choose a base branch
from
glebm:xmas
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Also removes jquery and jbuilder (unused)
Thredded no longer provides emoji. I've changed the Society to use twemoji. If you don't like them, revert this commit and then see https://github.com/thredded/thredded/pull/739/files
Note: After you merge this, run |
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.
Most customizations preserved, now implemented using Thredded / Rails extension mechanisms.
The unread functionality is now provided by Thredded and it uses the default Thredded UI.
Spoilers are now also provided by Thredded (
<spoiler></spoiler>
now works, youtube embeds in spoilers as well, etc)."Accepts BBCode..." etc done via a view hook.
Moderator flag implemented via a view hook + its own controller.
Thredded no longer supports gemoji out of the box. I've added Twemoji instead. If you don't like them, we can revert to the old ones (based on thredded/thredded#739).
See individual commits for details.