Merge and port upstream's composer change #2644
Merged
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
Co-authored-by: Claire <[email protected]>
…oc/merge-upstream-composer Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Port 6936e5a to glitch-soc Co-authored-by: Claire <[email protected]> Signed-off-by: Claire <[email protected]>
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
2 times, most recently
from
8b79fa1 to
47fd18d
Compare
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
2 times, most recently
from
74541aa to
47c67b1
Compare
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
from
3cce898 to
22448ef
Compare
|
kind of a mess but most of the functionality is back |
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
5 times, most recently
from
6bcbf77 to
b2bcd3d
Compare
|
Could the local-only setting be integrated with the Visibility options? This could save up some space. |
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
from
78379f8 to
d9c4f89
Compare
That could make sense, but that would be more work, and also I'm afraid this would not be visually apparent enough once the option is closed? |
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
2 times, most recently
from
3935f74 to
cdf9499
Compare
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
from
cdf9499 to
978cbad
Compare
ClearlyClaire
changed the title
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
from
978cbad to
a59b4eb
Compare
ClearlyClaire
force-pushed
the
glitch-soc/merge-dreaded-upstream-composer-change
branch
from
a59b4eb to
6eede9d
Compare
|
Some features are still missing, but they are kind of a pain to do… |
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.
Fixes #2591
Unlike most changes, this will need to be ported straight away due to the widespread translation string changes.
List of glitch-soc features that need to be reimplemented for the new design
LinkvsPermalinkMerge upstream changes up to 6936e5a
Conflicts
Conflicts:
app/javascript/mastodon/features/compose/components/compose_form.jsx:Upstream completely redesigned this, and glitch-soc had different handling for the character limit.
Ported upstream's change to the new version.
app/javascript/mastodon/features/compose/components/poll_form.jsx:Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options.
Ported glitch-soc's changes to the new version.
Additional change:
app/javascript/styles/components.scss:Change how the new image is looked up.
Ported changes
Additional changes
A whole lot!