Age | Commit message (Collapse) | Author |
|
|
|
Port 3e9dc4044bb7e1ef6131fbd6430ed85b3cc2fcfa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 755e8c76ab28a99905c66082757d892939e70c49 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port b1484cf3ceebe1f1f083e4c06872493dc0a68511 to glitch-soc
Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
to a glitch-soc-specific dependency
|
|
|
|
|
|
* Fixed emoji detection problem to append border
* Add tests
* Add missing semicolon
* Fixed wrong result when includes different variation selector
* Add missing semicolon
* Remove grapheme-splitter and Change emoji list to array from string
* Update comment
* Remove spaces
Co-authored-by: ThibG <thib@sitedethib.com>
|
|
Fixes #14018
|
|
|
|
|
|
|
|
Port 6b6a9d0ea362f4e301b56ae817f6c5d1761234b6 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port db319c0fdc8a81718a64e0ff905d5ba628551fd2 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port c66403b2579587d8c1448be3ad30dc388d5f29c3 to glitch-soc
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 8e96510b2528056e84cf8d0ed68d2e686e566180 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict due to glitch-soc having to take care of local-only
pinned toots in that controller.
Took upstream's changes and restored the local-only special
handling.
- `app/controllers/auth/sessions_controller.rb`:
Minor conflicts due to the theming system, applied upstream
changes, adapted the following two files for glitch-soc's
theming system:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`
- `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
Minor conflict due to glitch-soc having to handle local-only
toots specially. Applied upstream changes and restored
the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
Minor conflict due to the theming system.
- `package.json`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
- `yarn.lock`:
Upstream dependency updated, too close to a glitch-soc-only
dependency in the file.
|
|
|
|
|
|
* Refactor list of emoji requiring added outlines so that it can be theme-specific
* Split inaccessible emoji to emoji requiring an outline and ones that can be inverted
* Drop the “silouhettes” from black emoji as they seem to have changed color
* Add inaccessible emojis list for the light theme
* Use bordered emoji variant instead of unreliable CSS
|
|
* FIX: filters ignore media descriptions
* remove parentheses to make codeclimate happy
* combine the text and run the regular expression only once.
https://github.com/tootsuite/mastodon/pull/13837#discussion_r431752581
* Fix use of “filter” instead of “compact”, fix coding style issues
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
|
|
* Use preview card blurhash in WebUI
* Handle sensitive preview cards
|
|
|
|
Port b4a8400afd88a2ae8822757e5d30975494be2512 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 64154c5161d4d5c82877fba549d72068cc7f9e16 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
|
|
|
|
|
|
|
|
Port cc650bc023e00d07c5796b7602d86597bb437f45 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 5aff2a6957e861162d67c4610277e9bb2a6f8186 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Unfortunately, Firefox does not support the `keepalive` parameter
I used in the previous PR. However it supports the `navigator.sendBeacon`
API that allows that kind of things, but does not allow setting headers.
Therefore, this PR replaces it with a `sendBeacon` call that passes the
bearer token in the POST data.
Doorkeeper will then handle the auth token out of the box, as long as
it is passed as form data. Passing the query as JSON does not work.
|
|
* Periodically save timeline markers
This saves timeline markers immediately upon message arrival, but not more
than once every 5 minutes.
This does not change how the markers are saved on closing the window,
except that it avoids submitting them if there is no need for it.
* Use the Fetch API when possible instead of XHR on window unload
|
|
|
|
|
|
Web UI
Port 40d81620b00f6c4ed30b78f95b443a08e62ae8fa to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 3a1a21ad5725bed7f82b516b4174272c1e931223 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Fixes #1333
|
|
(#13834)
|
|
|
|
Port c9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
|
|
account is muted
Port 92f85bea528c5eca97a2f075c53f7dcafdf5cb41 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 48503384d00525fe61a038bdb8a55868fdc1db92 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|