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

..

admin

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01:00

concerns

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-31 19:10:57 +02:00

form

…

web

Add REST API for Web Push Notifications subscriptions (#7445)

2018-05-11 11:49:12 +02:00

account_domain_block_spec.rb

…

account_filter_spec.rb

…

account_moderation_note_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

account_pin_spec.rb

Public profile endorsements (accounts picked by profile owner) (#8146)

2018-08-09 09:56:53 +02:00

account_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

backup_spec.rb

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

block_spec.rb

…

conversation_mute_spec.rb

…

conversation_spec.rb

…

custom_emoji_spec.rb

Change custom emoji search to ILIKE instead of = (#7099)

2018-04-10 15:46:27 +02:00

custom_filter_spec.rb

Keyword/phrase filtering (#7905)

2018-06-29 15:34:36 +02:00

domain_block_spec.rb

…

email_domain_block_spec.rb

Add uniqueness to block email domains (#5692)

2017-11-14 20:37:17 +01:00

export_spec.rb

Show exact number of followers/statuses on export page/in tooltip (#8199)

2018-08-14 21:56:17 +02:00

favourite_spec.rb

…

follow_request_spec.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-04 14:16:30 -05:00

follow_spec.rb

Implement Undo { Accept { Follow } } (fixes #8234) (#8245)

2018-08-17 16:24:56 +02:00

home_feed_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

identity_spec.rb

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

import_spec.rb

…

invite_spec.rb

Add consumable invites (#5814)

2017-11-27 16:07:59 +01:00

list_account_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

list_spec.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

media_attachment_spec.rb

Resize images by area instead of fixed dimensions (#8083)

2018-07-28 03:33:00 +02:00

mention_spec.rb

…

mute_spec.rb

…

notification_spec.rb

Change columns in notifications nonnullable (#6764)

2018-03-24 12:51:28 +01:00

preview_card_spec.rb

…

relay_spec.rb

Add federation relay support (#7998)

2018-07-13 02:16:06 +02:00

remote_follow_spec.rb

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

remote_profile_spec.rb

…

report_filter_spec.rb

…

report_spec.rb

Add missing tests for report.rb (#7324)

2018-05-03 10:42:36 +02:00

session_activation_spec.rb

Add tests for SessionActivation (#5668)

2017-11-13 09:54:48 +09:00

setting_spec.rb

Isolate each specs for cache store (#6450)

2018-02-17 22:35:05 +01:00

site_upload_spec.rb

Add a test for SiteUpload#cache_key (#5685)

2017-11-14 20:44:11 +01:00

status_pin_spec.rb

Append '.test' to hostname in stub data (#7260)

2018-04-25 14:12:28 +02:00

status_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-22 20:56:32 +02:00

status_stat_spec.rb

Move status counters to separate table, count replies (#8104)

2018-08-14 19:19:32 +02:00

stream_entry_spec.rb

Add tests for StreamEntry (#5687)

2017-11-15 02:00:58 +01:00

subscription_spec.rb

Misc. typos (#8694)

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

tag_spec.rb

Add a test for Tag#to_param (#5705)

2017-11-15 16:04:41 +01:00

user_spec.rb

Allow mods to disable login, improve message when login disabled (#8329)

2018-08-23 23:26:29 +02:00