mastodon-glitch/public
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +02:00
..
avatars/original add new avatar placeholder missing.png (#6728) 2018-03-11 14:55:38 +01:00
emoji Update Twemoji to 12.1.5 (#13021) 2020-04-19 23:38:31 +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
android-chrome-192x192.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
apple-touch-icon.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
background-cybre.png
badge.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
browserconfig.xml New logo (#4306) 2017-07-23 02:40:39 +02:00
clock.js cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
embed.js Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
favicon-dev.ico Use the "m" version of the logo for favicons (#4345) 2017-07-24 19:54:59 +02:00
favicon.ico Use the "m" version of the logo for favicons (#4345) 2017-07-24 19:54:59 +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
mask-icon.svg New logo (#4306) 2017-07-23 02:40:39 +02:00
mstile-150x150.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
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 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 fix #4356 : place sw.js to assets/sw.js (#4357) 2017-07-28 01:55:52 +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