glitch-soc/public
Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
2024-09-12 20:05:08 +02:00
..
avatars/original png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
emoji Add new emojis from `jdecked/twemoji` 15.0 (#28404) 2024-01-11 16:15:08 +00:00
headers/original png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01: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 All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
badge.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
clock.js cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
embed.js Change embedded posts to use web UI (#31766) 2024-09-12 09:41:19 +00:00
logo-cybre-glitch.gif All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
oops.gif New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
oops.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
riot-glitch.png cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
robots.txt Change: Block GPTBot (#26396) 2023-08-09 11:58:46 +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 png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
web-push-icon_favourite.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
web-push-icon_reblog.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00