luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-20 08:59:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers
History
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +02:00
..
activitypub
admin Add confirmation step to account suspensions (#8353) 2018-08-22 11:53:41 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2018-08-27 18:09:28 +02:00
auth Add force_login option to OAuth authorize page (#8655) 2018-09-09 04:10:44 +02:00
concerns Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
oauth Add force_login option to OAuth authorize page (#8655) 2018-09-09 04:10:44 +02:00
settings Migrate glitch-soc keyword mutes to Mastodon's 2018-07-09 19:19:23 +02:00
well_known
about_controller_spec.rb Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
accounts_controller_spec.rb
application_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
authorize_interactions_controller_spec.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
emojis_controller_spec.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
home_controller_spec.rb
intents_controller_spec.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
remote_follow_controller_spec.rb
remote_unfollows_controller_spec.rb
shares_controller_spec.rb
statuses_controller_spec.rb
stream_entries_controller_spec.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
tags_controller_spec.rb