mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/public
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 		2022-11-06 09:50:41 +01:00
..
avatars/original png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
emoji Add assets from Twemoji 14.0 (#19733) 2022-11-04 16:08:41 +01: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 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 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 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 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