mastodon/public
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
avatars/original add new avatar placeholder missing.png (#6728) 2018-03-11 14:55:38 +01:00
emoji Fix light-mode emoji borders. (#18131) 2022-04-29 19:23:03 +02:00
headers/original Optimize public/headers/missing.png (#7084) 2018-04-09 11:34:48 +02:00
ocr/lang-data Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
sounds Add artist, title, and date metadata to boop.{mp3,ogg} (#5531) 2017-10-28 00:05:04 +09:00
500.html Fix error 500 page 2018-03-16 22:31:20 +01:00
background-cybre.png
badge.png Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
clock.js
embed.js fix: embed.js doesn't expands iframes height (#18301) 2022-05-04 03:20:44 +02:00
favicon.ico Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
inert.css Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679) 2020-05-08 21:22:57 +02:00
logo-cybre-glitch.gif
oops.gif New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
oops.png Change error graphic to hover-to-play (#10055) 2019-02-15 23:33:25 +01:00
riot-glitch.png
robots.txt Disallow robots from indexing /interact/ (#10666) 2019-05-02 00:10:19 +02:00
sw.js Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) 2022-08-25 20:10:01 +02:00
sw.js.map Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) 2022-08-25 20:10:01 +02:00
web-push-icon_expand.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
web-push-icon_favourite.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
web-push-icon_reblog.png Use consistent icons for web push notifications, same as web UI (#4426) 2017-07-28 18:13:42 +02:00