mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2020-01-11	move parenthesis to correct place	multiple creatures

2020-01-11	pass monsterfork api exposure setting to initial state serializer	multiple creatures

2019-04-08	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
2019-04-06	Fix admin validation being too strict about usernames (#10449)	Eugen Rochko
	* Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase
2018-05-11	Merge branch 'master' into glitch-soc/merge	Thibaut Girka
	Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml
2018-05-11	Add REST API for Web Push Notifications subscriptions (#7445)	Eugen Rochko
	- POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)
2018-01-17	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2018-01-17	implement web share target (#6278)	りんすき
	* web share target * fix * fix
2018-01-02	Merge remote-tracking branch 'origin/master' into merge-upstream	David Yip
	Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
2018-01-02	Show mastodon on modal (#6129)	Akihiko Odaki

2017-11-20	Finalized theme loading and stuff	kibigo!

2017-08-16	Make share intent modal to make "signed in as" shown. (#4611)	Clworld
	* Make share intent modal to make "signed in as" shown. * fix glitch on mobile.
2017-08-14	Add protocol handler. Handle follow intents (#4511)	Eugen Rochko
	* Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS