Age | Commit message (Collapse) | Author |
|
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
|
|
|
|
|
|
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
|
|
|
|
|
|
|
|
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
|
|
|
|
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
|
|
|
|
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
|
|
|
|
* Add responsive panels to the single-column layout
* Fixes
* Fix not being able to save the preference
* Fix code style issues
* Set max-height on the compose textarea and add a link to relationship manager
|
|
Conflicts:
- streaming/index.js
|
|
- Add potential side panels to single column layout
- Hide FAB on large screens
|
|
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
|
|
* Move TabsBar rendering logic from CSS to the ColumnsArea component
* Add forceSingleColumn mode
* Add unread notifications counter to tabs bar
* Add toggle to control `forceSingleColumn`
* Increase paddings in mobile layout responsively at large sizes
|
|
|
|
|
|
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
|
|
* Fix typo in light theme
* Fix background color of empty column
|
|
|
|
* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox
|
|
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
|
|
* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus
|
|
* Add distinction between hover and active/focus states
* Resolves #10198
|
|
|
|
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
|
|
|
|
|
|
|
|
|
|
Conflicts:
- app/models/media_attachment.rb
|
|
|
|
already-blocked domain (#10663)
* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded
|
|
* Add "view context" button to media modal when opened from gallery
* Add "view context" button to video modal
Allow closing the video modal by navigating back in the browser,
just like the media modal
|
|
* Make the "mark media as sensitive" button more obvious in web UI
* Use eye-slash icon instead of eye icon to mean "hide"
|
|
page (#10674)
|
|
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
|
|
* Add blurhash
* Use fallback color for spoiler when blurhash missing
* Federate the blurhash and accept it as long as it's at most 5x5
* Display unknown media attachments as blurhash placeholders
* Improve style of embed actions and spoiler button
* Change blurhash resolution from 3x3 to 4x4
* Improve dependency definitions
* Fix code style issues
|
|
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
|
|
|
|
|