mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2021-01-21	Merge branch 'main' into glitch-soc/merge-upstream	Claire

2021-01-21	Fix Google Translate breaking web interface (#15610)	ThibG
	- marks the page as a whole as untranslatable - still marks user text as translatable Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-11-06	Add subresource integrity for JS and CSS assets (#15096)	Eugen Rochko
	Fix #2744
2020-05-03	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	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-04-28	Fix /public showing public instead of community timeline for logged-in users ↵	ThibG
	(#13499)
2019-11-06	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - `package.json`
2019-10-27	Change message of public timeline for local only (#12224)	Yamagishi Kazutoshi

2019-08-19	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
2019-08-16	Fix blurhash and autoplay not working on public pages (#11585)	Eugen Rochko

2019-03-13	[Glitch] Redesign landing page	Eugen Rochko
	Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
2019-03-12	Redesign landing page (#10232)	Eugen Rochko