Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.

2020-12-19 00:55:12 +01:00

..

importer

…

push_notifications

…

account_notes.js

…

accounts.js

…

alerts.js

…

announcements.js

…

app.js

Fix pop-out player appearing on mobile screens in web UI (#15157)

2020-11-16 05:16:39 +01:00

blocks.js

…

bookmarks.js

…

bundles.js

…

columns.js

…

compose.js

Merge branch 'master' into glitch-soc/merge-upstream

2020-11-12 22:13:57 +01:00

conversations.js

…

custom_emojis.js

…

directory.js

…

domain_blocks.js

…

dropdown_menu.js

…

emojis.js

…

favourites.js

…

filters.js

…

height_cache.js

…

identity_proofs.js

…

interactions.js

…

lists.js

…

markers.js

Fix alert when failing to save timeline markers in web UI (#15285)

2020-12-07 03:23:43 +01:00

modal.js

…

mutes.js

…

notifications.js

Change notification permission handling (#15176)

2020-12-15 18:43:54 +01:00

onboarding.js

Change how missing desktop notifications permission is displayed (#14985)

2020-10-15 16:24:47 +02:00

picture_in_picture.js

…

pin_statuses.js

…

polls.js

…

reports.js

…

search.js

…

settings.js

…

statuses.js

…

store.js

…

streaming.js

…

suggestions.js

…

timelines.js

…

trends.js

…