mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	6 years ago
Eugen Rochko	de5305a3a5	Fix redirecting non-functional accounts on public pages (#11978 ) Fix #11969	6 years ago
Thibaut Girka	9044a2b051	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.	6 years ago
Eugen Rochko	b54b725d6b	Fix uncaught domain normalization error in remote follow (#11703 )	6 years ago
Thibaut Girka	249991c498	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml	6 years ago
Eugen Rochko	63c7fe8e48	Refactor controllers for statuses, accounts, and more (#11249 )	6 years ago
Thibaut Girka	bfeac6747a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.	7 years ago
Eugen Rochko	78fa926ed5	Add remote interaction dialog for toots (#8202 ) * Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
Eugen Rochko	2092d5c0ad	Improve embeds (#7919 ) * Make embeds cacheable by reverse proxy * Make follow button on embeds open remote follow modal Instead of web+mastodon://, also, turn the button blue, and add a sign up prompt to the remote follow modal	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
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523 )	8 years ago
Matt Jankowski	6e4c7d6211	Conditional validations no longer accept strings for if/unless (#3124 )	8 years ago
Matt Jankowski	a4859446ab	Coverage for remote follows (#2694 ) * Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts	8 years ago
Matt Jankowski	0687ab8ae3	Clean up generation of account webfinger string (#1477 ) * Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation	8 years ago
Drew DeVault	f7e35d90db	Remote follow improvements This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.	8 years ago
Eugen Rochko	75122e162d	Fix uri expansion during remote follow	9 years ago
Eugen Rochko	8f47f6a7ec	Adding remote follow button	9 years ago

20 Commits (e4f8679eaeea062e1f9ca9f58703b51ff8162c35)