Age | Commit message (Collapse) | Author |
|
|
|
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
|
|
|
|
|
|
|
|
Port 46e806cd2f14a5e45d66b4c23040855202818984 to glitch-soc
|
|
Port e02a13f64e5c2c93fa73a67a4ce32a7d1df24760 to glitch-soc
|
|
Port SCSS changes from 364f2ff9aa2b4bf601d68a12bce758aeb5530467
|
|
Port 750c67660de753065ec160b4e389ba0dda2f81cc to glitch-soc
|
|
Port missing parts from 2c51bc0ca5a4c3a4bb140b4b40dabdda859ebb94 to glitch-soc
|
|
Port 5092d17f2936146fa26e5d8a9b9e391f77010f28 to glitch-soc
|
|
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
Two changes too close to each other
- app/models/media_attachment.rb
New changes too close to glitch-soc only changes.
- app/models/user.rb
Two changes too close to each other.
- app/services/remove_status_service.rb
Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
Two changes too close to each other.
- config/locales/en.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
Reverted upstream's decision of enabling posting application by default.
|
|
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
|
|
IntersectionObserverArticle is made to save on RAM by avoiding fully rendering
items that are far out of view. However, it did not work for items spawned
outside the intersection observer.
|
|
|
|
Fixes #909
|
|
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
* fix large line breaks
* fix ascii art posts
|
|
|
|
|
|
* Add hashtag filter to profiles
GET /@:username/tagged/:hashtag
GET /api/v1/accounts/:id/statuses?tagged=:hashtag
* Display featured hashtags on public profile
* Use separate model for featured tags
* Update featured hashtag counters on-write
* Limit featured tags to 10
|
|
Thanks @ariasuni.
|
|
|
|
* Allow drag and drop uploads of multiple files to compose
* Calculate aggregate upload progress for single action
* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
|
|
* Add WebP support
* Remove the changes to the tooltip
refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
|
|
Improve sorting of default themes in the dropdown
|
|
Port 6513f6c953cdaad9118ea24a21f22fd2978bed28 to glitch-soc
|
|
Conflicts:
- README.md
Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
Two changes too close to each other, took both changes
|
|
|
|
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
|
|
Improve sorting of default themes in the dropdown
|
|
* Refactor uses of icons to an Icon component in web UI
* Refactor options passed to the Icon component
* Make tests work with absolute component paths
|
|
|
|
volume changes
Port a53dcaa29869e808707efcba541b02ee8d799e75 to glitch-soc
|
|
|
|
(#9929)
* Fix initial value of volume slider in video player and handle volume changes
* Clean up dead/incorrect code
|
|
|
|
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
|
|
|
|
|
|
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
|
|
Fixes #892
|
|
|
|
|
|
* Update Japanese translations.
* Delete unused translation.
|
|
compensation
Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
|
|
Port 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 to glitch-soc
|
|
|
|
Port b506ce119766bb3308f934e2d3de143b3ac6f5ad to glitch-soc
|