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

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

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

Serialize webfinger XML with Ox instead of Nokogiri (#7319)

2018-05-02 22:28:46 +02:00

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

Cover AccountFollowController more in spec (#3227)

2017-05-22 16:29:48 +02:00

account_unfollow_controller_spec.rb

Cover AccountUnfollowController more in spec (#3228)

2017-05-22 17:58:49 +02:00

accounts_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

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

Add tests for followers_accounts_controller (#7794)

2018-06-13 10:28:39 +09:00

following_accounts_controller_spec.rb

Add tests for following accounts controller (#7800)

2018-06-14 10:49:17 +09:00

home_controller_spec.rb

Redirect from Web tag timeline to public tag timeline if not signed in (#6633)

2018-03-05 19:29:36 +01:00

intents_controller_spec.rb

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

invites_controller_spec.rb

Fix tests for invites controller (regression from 4d81809f36fcbfe787e23d490f2cb0ad943ab32c) (#7597)

2018-05-23 06:32:10 +02:00

manifests_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

media_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

remote_follow_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

remote_unfollows_controller_spec.rb

Add tests for remote_unfollows_controller (#7879)

2018-06-24 19:55:55 +09:00

shares_controller_spec.rb

Add tests for shares_controller (#7835)

2018-06-18 10:45:20 +09:00

statuses_controller_spec.rb

Paginate descendant statuses in public page (#7148)

2018-04-23 19:27:35 +02:00

stream_entries_controller_spec.rb

Misc. typos (#8694)

2018-09-14 00:53:09 +02:00

tags_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00