1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
mastodon/public
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
..
avatars/original add new avatar placeholder missing.png () 2018-03-11 14:55:38 +01:00
emoji Add border around 🕺 emoji () 2020-09-10 19:08:03 +02:00
headers/original Optimize public/headers/missing.png () 2018-04-09 11:34:48 +02:00
ocr/lang-data Add OCR tool to media editing modal () 2019-08-15 15:13:26 +02:00
sounds Add artist, title, and date metadata to boop.{mp3,ogg} () 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 () 2018-07-05 15:20:16 +02:00
apple-touch-icon.png Crush PNGs to reduce overall size () 2018-07-05 15:20:16 +02:00
background-cybre.png All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
badge.png Crush PNGs to reduce overall size () 2018-07-05 15:20:16 +02:00
browserconfig.xml New logo () 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 () 2017-09-09 16:23:44 +02:00
favicon-dev.ico Use the "m" version of the logo for favicons () 2017-07-24 19:54:59 +02:00
favicon.ico Use the "m" version of the logo for favicons () 2017-07-24 19:54:59 +02:00
inert.css Remove 'unsafe-inline' from Content-Security-Policy style-src () 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
mask-icon.svg New logo () 2017-07-23 02:40:39 +02:00
mstile-150x150.png Crush PNGs to reduce overall size () 2018-07-05 15:20:16 +02:00
oops.gif New error page graphic. Other error page improvements () 2017-09-25 23:05:54 +02:00
oops.png Change error graphic to hover-to-play () 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/ () 2019-05-02 00:10:19 +02:00
sw.js fix : place sw.js to assets/sw.js () 2017-07-28 01:55:52 +02:00
web-push-icon_expand.png Crush PNGs to reduce overall size () 2018-07-05 15:20:16 +02:00
web-push-icon_favourite.png Crush PNGs to reduce overall size () 2018-07-05 15:20:16 +02:00
web-push-icon_reblog.png Use consistent icons for web push notifications, same as web UI () 2017-07-28 18:13:42 +02:00