Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x

2018-07-16 14:50:42 +02:00

..

admin

Add logging of admin actions (#5757)

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

concerns

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

2018-05-03 17:23:44 -05:00

form

Improve admin page (#4121)

2017-07-18 16:38:22 +02:00

web

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

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

account_domain_block_spec.rb

Spec AccountDomainBlock (#3816)

2017-06-18 02:59:49 +02:00

account_filter_spec.rb

Add coverage for ReportFilter and AccountFilter (#3236)

2017-05-22 15:50:58 -04:00

account_moderation_note_spec.rb

Lists (#5703)

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

account_spec.rb

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

2018-07-09 07:13:59 +02:00

backup_spec.rb

Account archive download (#6460)

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

block_spec.rb

Cover Block more (#3837)

2017-06-19 11:31:37 +02:00

conversation_mute_spec.rb

Feature conversations muting (#3017)

2017-05-15 03:04:13 +02:00

conversation_spec.rb

Add conversation model, <ostatus:conversation /> (#3016)

2017-05-12 19:09:21 +02:00

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

Cover DomainBlock more (#3838)

2017-06-19 11:31:27 +02:00

email_domain_block_spec.rb

Add uniqueness to block email domains (#5692)

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

export_spec.rb

Cover Export more (#3840)

2017-06-19 11:30:27 +02:00

favourite_spec.rb

Cover Favourite more (#3841)

2017-06-19 01:38:50 +02:00

follow_request_spec.rb

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

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

follow_spec.rb

Introduce recent to Follow (#3247)

2017-05-23 13:12:19 +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

Validate data of Imports (#4782)

2017-09-02 20:45:42 +02:00

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

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

mention_spec.rb

add more tests to models

2017-04-05 00:29:56 +02:00

mute_spec.rb

Mute button progress so far. WIP, doesn't entirely work correctly.

2017-03-01 22:31:21 -06:00

notification_spec.rb

Change columns in notifications nonnullable (#6764)

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

preview_card_spec.rb

Fix #463 - Fetch and display previews of URLs using OpenGraph tags

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

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

Add tests for RemoteProfile (#5665)

2017-11-12 16:23:31 +09:00

report_filter_spec.rb

Add coverage for ReportFilter and AccountFilter (#3236)

2017-05-22 15:50:58 -04:00

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-06-21 20:49:57 +02:00

stream_entry_spec.rb

Add tests for StreamEntry (#5687)

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

subscription_spec.rb

Misc spec coverage improvements (#2821)

2017-05-05 14:56:00 -04:00

tag_spec.rb

Add a test for Tag#to_param (#5705)

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

user_spec.rb

Change language opt-out to language opt-in (#7823)

2018-06-17 13:54:02 +02:00