mastodon/app/javascript/flavours/glitch
Thibaut Girka a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
2020-05-03 21:23:49 +02:00
..
actions [Glitch] Add local only to hashtag timeline 2020-04-20 16:52:56 +02:00
components [Glitch] Fix expanded video player issues 2020-04-25 15:28:16 +02:00
containers [Glitch] Fix expanded video player issues 2020-04-25 15:28:16 +02:00
features [Glitch] Fix expanded video player issues 2020-04-25 15:28:16 +02:00
images Port 7badad7797 to glitch frontend 2018-01-18 10:25:37 -06:00
locales Add glitch-soc front-end support for many upstream translations 2020-01-20 16:43:18 +01:00
middleware [Glitch] Fix 404 and 410 API errors being silently discarded in WebUI 2020-04-02 20:39:44 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
reducers [Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists 2020-04-12 17:01:41 +02:00
selectors [Glitch] Code style improvements in JavaScript 2020-03-08 20:43:53 +01:00
store [Glitch] Code style improvements in JavaScript 2020-03-08 20:43:53 +01:00
styles [Glitch] Set max-width and max-height to gif video 2020-04-25 15:26:42 +02:00
util [Glitch] Fix uninformative error message when uploading unsupported image files 2020-04-25 15:29:01 +02:00
names.yml i18n: Update Polish translation 2018-01-04 14:42:58 +01:00
theme.yml Fix menu in settings/admin pages 2019-09-30 17:01:16 +02:00