mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	1488be7d96	Merge branch 'master' into glitch-soc/merge-upstream 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	6 years ago
Eugen Rochko	e5cee8062f	Fix blurhash and autoplay not working on public pages (#11585 )	6 years ago
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
Eugen Rochko	2c63e0292a	Fix admin validation being too strict about usernames (#10449 ) * Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase	6 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	7 years ago
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445 ) - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	7 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
りんすき	fbe7756da6	implement web share target (#6278 ) * web share target * fix * fix	7 years ago
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	8 years ago
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129 )	8 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	8 years ago
Clworld	f814661fca	Make share intent modal to make "signed in as" shown. (#4611 ) * Make share intent modal to make "signed in as" shown. * fix glitch on mobile.	8 years ago
Eugen Rochko	3c6503038e	Add protocol handler. Handle follow intents (#4511 ) * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	8 years ago

13 Commits (e4f8679eaeea062e1f9ca9f58703b51ff8162c35)