5137 Commits

Author	SHA1	Message	Date
Eugen Rochko	e55dce3176	Add federation relay support (#7998) ... * Add federation relay support * Add admin UI for managing relays * Include actor on relay-related activities * Fix i18n	2018-07-13 02:16:06 +02:00
Thibaut Girka	ddfcedcfe4	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-12 19:26:20 +02:00
Thibaut Girka	57f31b361f	Add an option restricting secondary toot privacy to that of the toot being replied to	2018-07-12 19:15:44 +02:00
mayaeh	401559c376	Fix whole-word selection and i18n: Add Japanese translation for Whole-word (#8004) ... * Add Japanese translation for "Whole word" and add it's description. * Fix to enable "Whole-word" selection.	2018-07-12 17:58:26 +02:00
Thibaut Girka	d8b13b46f7	Move privacyPreference to utils	2018-07-12 15:31:42 +02:00
Thibaut Girka	cd05378b59	[Glitch] Refactor privacyPrefence() to use priority list ... Port f2d9a3c239 to glitch-soc	2018-07-12 15:31:42 +02:00
Thibaut Girka	d67cb13d84	Use options rather than a boolean ... This prepares for a third option that would restrict privacy to privacyPreference(replyPrivacy, sideArmBasePrivacy)	2018-07-12 11:22:34 +02:00
Thibaut Girka	8c8707771d	Do not store duplicate reply_privacy	2018-07-12 11:22:34 +02:00
Ash Levy	6f06d16b1e	add option to enable auto visibility on secondary toot button	2018-07-12 11:22:34 +02:00
Thibaut Girka	7cb7ecaf7e	[Glitch] Make whole-word filter regex consistent between Ruby and JS ... Port front-end part of 20fefdb714 to glitch-soc	2018-07-11 22:06:34 +02:00
Thibaut Girka	debc6544d9	[Glitch] Add follow button to detailed status, add gradient to mask bio cut-off (fixes #566) ... Port 30e1da7668 to glitch-soc	2018-07-11 22:05:15 +02:00
Thibaut Girka	6f0f583abe	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-11 17:57:08 +02:00
Eugen Rochko	ffd444d221	Weblate translations (2018-07-11) (#7992) ... * Translated using Weblate (German) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Galician) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Occitan) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Italian) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Slovak) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Danish) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (French) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Greek) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Danish) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Slovenian) Currently translated at 41.9% (26 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sl/ * Translated using Weblate (Danish) Currently translated at 70.9% (450 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Dutch) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (German) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.6% (632 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (636 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Persian) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Danish) Currently translated at 65.3% (64 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Japanese) Currently translated at 95.9% (94 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Greek) Currently translated at 74.4% (73 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 93.8% (92 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (Danish) Currently translated at 67.3% (66 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Dutch) Currently translated at 100.0% (636 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/oc/ * Translated using Weblate (Occitan) Currently translated at 99.8% (635 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Arabic) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.7% (77 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Danish) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Persian) Currently translated at 99.6% (634 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Added translation using Weblate (Czech) * Added translation using Weblate (Czech) * Added translation using Weblate (Czech) * Added translation using Weblate (Czech) * Added translation using Weblate (Czech) * Added translation using Weblate (Czech) * Translated using Weblate (Czech) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/ * Translated using Weblate (Czech) Currently translated at 8.0% (5 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Czech) Currently translated at 0.9% (3 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 1.0% (1 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (Czech) Currently translated at 1.2% (1 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Korean) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Slovak) Currently translated at 80.6% (79 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 98.9% (97 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Danish) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Danish) Currently translated at 72.0% (458 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Danish) Currently translated at 91.8% (90 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Italian) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 98.9% (97 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ * Translated using Weblate (Czech) Currently translated at 5.1% (4 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 5.3% (34 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Japanese) Currently translated at 93.5% (73 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 96.9% (95 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Danish) Currently translated at 75.1% (478 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (French) Currently translated at 96.9% (95 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (636 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.6% (304 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (635 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 97.4% (620 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 93.8% (92 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Japanese) Currently translated at 93.5% (73 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Danish) Currently translated at 75.1% (478 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (78 of 78 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (635 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 97.6% (621 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 98.9% (97 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Greek) Currently translated at 99.5% (633 of 636 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (305 of 305 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * i18n-tasks normalize && yarn manage:translations	2018-07-11 01:14:38 +02:00
Eugen Rochko	bfce6a5485	Add link to filters in web UI dropdown (#7990)	2018-07-11 00:56:54 +02:00
Thibaut Girka	612b00d1bb	Display reply indicator even when replying to contentless toot (fixes #564)	2018-07-10 22:53:04 +02:00
Thibaut Girka	ef1d660596	make sure reblogged's filter is set correctly	2018-07-10 14:06:04 +02:00
Thibaut Girka	faa4db7975	[Glitch] Add option to not consider word boundaries when processing keyword filtering ... Port 1ca4e51eb3 to glitch-soc	2018-07-10 14:06:04 +02:00
Thibaut Girka	6777dfc8d9	[Glitch] In keyword filter, account for reblogs, HTML and whole-words ... Port 404c7702ec to glitch-soc	2018-07-10 14:06:04 +02:00
Thibaut Girka	00c1386b9d	[Glitch] Fix filters not affecting notifications in web UI ... Port cfeb3beb4e to glitch-soc	2018-07-10 14:06:04 +02:00
Thibaut Girka	0bb1720495	Add client-side custom filter support to glitch-soc ... Port cdb101340a to glitch-soc, but without dropping support for regexp filters yet.	2018-07-10 14:06:04 +02:00
Thibaut Girka	33c1607c83	[Glitch] Fix Chrome issue with sizes="0px"	2018-07-10 10:53:36 +02:00
Ash Levy	e96a4434c7	add keybind in composer textarea for secondary submit	2018-07-10 10:53:22 +02:00
Eugen Rochko	20fefdb714	Make whole-word filter regex consistent between Ruby and JS (#7987)	2018-07-10 03:01:50 +02:00
Thibaut Girka	402da8065c	Migrate glitch-soc keyword mutes to Mastodon's ... Completely remove glitch-soc's Keyword Mutes, migrate existing database records to CustomFilters. Handling of client-side filters is still not implemented in the glitch-soc front-end.	2018-07-09 19:19:23 +02:00
Thibaut Girka	ee41947e9d	Set appropriate assets pack for the keyword filter page	2018-07-09 19:19:23 +02:00
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.	2018-07-09 07:13:59 +02:00
ThibG	1ca4e51eb3	Add option to not consider word boundaries when processing keyword filtering (#7975) ... * Add option to not consider word boundaries when filtering phrases * Add a few tests for keyword/phrase filtering	2018-07-09 02:22:09 +02:00
Eugen Rochko	30e1da7668	Add follow button to detailed status, add gradient to mask bio cut-off (#7979) ... * Add follow button to detailed status, add gradient to mask bio cut-off * In landing strip, show sign up link even if closed (different href) Point to joinmastodon.org	2018-07-07 22:20:14 +02:00
Eugen Rochko	6b9e03e002	Add API method to remove a suggestion (#7978) ... DELETE /api/v1/suggestions/:account_id When blocking, remove suggestion from both sides. Muting not affected, since muting is supposed to be invisible to the target.	2018-07-07 21:09:54 +02:00
Eugen Rochko	cfeb3beb4e	Fix filters not affecting notifications in web UI (#7977) ... * Hook up filtering to statuses in notifications column * Filter notifications for sound, desktop notifications	2018-07-07 19:31:19 +02:00
Thibaut Girka	c699b2d141	Remove duplicate code for handling muted users ... The mute check was indeed streamlined in f62539ce5c and we somehow kept some of the old code when merging.	2018-07-07 19:10:13 +02:00
Eugen Rochko	cd509d2146	Remove .p-name microformat class (#7961) ... Fix #7926	2018-07-07 18:51:56 +02:00
Eugen Rochko	9804ec3a6d	Fix missing irreversible in filters API, expires_in param (#7976)	2018-07-07 18:51:45 +02:00
Lynx Kotoura	c930b61770	Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) ... This reverts commit 7da74e3157.	2018-07-06 13:19:18 +02:00
Lynx Kotoura	617f40fc2b	Fix gradient, regression from #7927 (#7963)	2018-07-06 13:16:31 +02:00
Eugen Rochko	f89c595ea0	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
Eugen Rochko	404c7702ec	In keyword filter, account for reblogs, HTML and whole-words (#7960) ... * In keyword filter, account for reblogs, HTML and whole-words * Match whole words in JS filter, too * Fix typo	2018-07-06 02:15:44 +02:00
Eugen Rochko	8461cd4bb5	Send undo of boost to original poster if reblog (#7959) ... Fix #7874	2018-07-05 20:57:50 +02:00
Eugen Rochko	baff4a7ce0	If signed in, redirect autofollow invite to profile page (#7956) ... Fix #7944	2018-07-05 20:57:35 +02:00
Eugen Rochko	32a4b524fb	In e-mail validator, fallback from MX to A record (#7955) ... Fix #7831	2018-07-05 20:57:24 +02:00
Eugen Rochko	4b198b172d	Check reblogged status for blocked/muted mentions (#7957)	2018-07-05 18:43:37 +02:00
Eugen Rochko	1f6ed4f86a	Add more granular OAuth scopes (#7929) ... * Add more granular OAuth scopes * Add human-readable descriptions of the new scopes * Ensure new scopes look good on the app UI * Add tests * Group scopes in screen and color-code dangerous ones * Fix wrong extra scope	2018-07-05 18:31:35 +02:00
Maciek Baron	ca2cc556f1	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02:00
Renato "Lond" Cerqueira	b2051a6256	Weblate translations (2018-07-05) (#7950) ... * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.5% (620 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.6% (306 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 97.2% (606 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Swedish) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 97.5% (608 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Finnish) Currently translated at 96.6% (602 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Added translation using Weblate (Danish) * Added translation using Weblate (Danish) * Added translation using Weblate (Danish) * Added translation using Weblate (Danish) * Added translation using Weblate (Danish) * Translated using Weblate (Danish) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/da/ * Added translation using Weblate (Danish) * Translated using Weblate (Danish) Currently translated at 81.6% (58 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Danish) Currently translated at 58.0% (36 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Danish) Currently translated at 73.6% (56 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Swedish) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Added translation using Weblate (Swedish) * Translated using Weblate (Swedish) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Danish) Currently translated at 80.7% (248 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 37.2% (232 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (632 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 98.7% (76 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Danish) Currently translated at 78.9% (60 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Danish) Currently translated at 87.0% (67 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Persian) Currently translated at 98.7% (625 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Danish) Currently translated at 81.1% (249 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Slovak) Currently translated at 94.8% (73 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 97.4% (617 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 96.1% (74 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 97.4% (75 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Korean) Currently translated at 99.8% (632 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Galician) Currently translated at 100.0% (633 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Slovak) Currently translated at 96.1% (74 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 97.4% (617 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Persian) Currently translated at 99.6% (631 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Occitan) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 99.8% (632 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (German) Currently translated at 99.3% (629 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Slovak) Currently translated at 97.4% (617 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 98.7% (76 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Danish) Currently translated at 94.8% (73 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Danish) Currently translated at 92.1% (283 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 40.9% (259 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Italian) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 84.5% (535 of 633 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Catalan) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Danish) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Danish) Currently translated at 86.8% (66 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sl/ * Translated using Weblate (Arabic) Currently translated at 96.2% (610 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Slovenian) Currently translated at 29.0% (18 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sl/ * Translated using Weblate (Japanese) Currently translated at 93.5% (72 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (632 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Greek) Currently translated at 98.1% (622 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Danish) Currently translated at 98.3% (302 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Greek) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Danish) Currently translated at 63.4% (402 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Danish) Currently translated at 62.9% (39 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 97.4% (618 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.5% (72 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.5% (72 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Added translation using Weblate (Greek) * Added translation using Weblate (Greek) * Translated using Weblate (Danish) Currently translated at 70.6% (448 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Galician) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (French) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Greek) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ * Translated using Weblate (Greek) Currently translated at 61.2% (38 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/ * Translated using Weblate (Danish) Currently translated at 98.6% (303 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Greek) Currently translated at 72.5% (45 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 97.4% (618 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 93.5% (72 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Greek) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/ * Added translation using Weblate (Greek) * Translated using Weblate (Greek) Currently translated at 99.6% (306 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Danish) Currently translated at 66.1% (41 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Greek) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/ * Added translation using Weblate (Greek) * Translated using Weblate (Greek) Currently translated at 14.2% (11 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Arabic) Currently translated at 98.7% (76 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 96.3% (611 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Greek) Currently translated at 53.2% (41 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 55.8% (43 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 57.1% (44 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 61.0% (47 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (77 of 77 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Add Danish language	2018-07-05 21:50:16 +09:00
Maciek Baron	1e65cdf821	Add comment, test to unescapeHTML (#7949)	2018-07-05 19:19:38 +09:00
Maciek Baron	cdfe51e325	Fix #6395 - overlapping profile name and domain (#7927)	2018-07-04 17:36:33 +02:00
Marek Lach	7da74e3157	Fix dark background error on user-mention autosuggest (#7937)	2018-07-04 17:35:57 +02:00
Maciek Baron	f2d9a3c239	Refactor privacyPrefence() to use priority list (#7945)	2018-07-04 17:35:35 +02:00
Maciek Baron	0bfa0f2374	Add white outline to black emojis (fix #5083) (#7936)	2018-07-04 17:35:02 +02:00
Maciek Baron	f3af1a96a8	Check if router is injected in media modal (#7941)	2018-07-04 15:34:28 +02:00
Maciek Baron	9dc413b025	Respect noindex rule in remote follow view (fix #7869) (#7939)	2018-07-04 02:58:44 +02:00
Eugen Rochko	8ff0d64d05	What is on your mind -> What's on your mind (#7938)	2018-07-04 08:49:57 +09:00
Eugen Rochko	5b6db8a62a	Disable service worker media cache and IndexedDB storage (#7932) ... Fix #7893 Fix #7615	2018-07-03 19:50:18 +02:00
Renato "Lond" Cerqueira	4045b50bd6	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935) ... This replace calls of String#match? with rails Regex#match? This follows the same idea used to keep Rails 5.2 compatible with Ruby 2.2.2 in https://github.com/rails/rails/pull/32973	2018-07-03 19:47:09 +02:00
Maciek Baron	bbbe3ed6ba	Allow the media modal to be closed by pressing back (#7934)	2018-07-03 16:12:05 +02:00
Eugen Rochko	b0968623fa	Fix check for PotentialFriendshipTracker when replying (#7933)	2018-07-03 05:00:44 +02:00
Eugen Rochko	23e1f143de	Fix M hotkey inserting @undefined when in detailed status (#7931) ... Fix #7903	2018-07-03 09:17:18 +09:00
Eugen Rochko	30b377cc15	Fix style of attachment list on /about (#7930)	2018-07-03 01:48:09 +02:00
Eugen Rochko	da8fe8079e	Re-add follow recommendations API (#7918) ... * Re-add follow recommendations API GET /api/v1/suggestions Removed in 8efa081f21 due to Neo4J dependency. The algorithm uses triadic closures, takes into account suspensions, blocks, mutes, domain blocks, excludes locked and moved accounts, and prefers more recently updated accounts. * Track interactions with people you don't follow Replying to, favouriting and reblogging someone you're not following will make them show up in follow recommendations. The interactions have different weights: - Replying is 1 - Favouriting is 10 (decidedly positive interaction, but private) - Reblogging is 20 Following them, muting or blocking will remove them from the list, obviously. * Remove triadic closures, ensure potential friendships are trimmed	2018-07-03 01:47:56 +02:00
Shaun Gillies	ac82c9380f	Display full username in tooltip on search and autosuggest #7478 (#7920)	2018-07-01 04:16:13 +02:00
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	2018-07-01 04:12:34 +02:00
Marty McGuire	8fea9cc311	Typo in signature verification failure logging (#7916) ... `@signature_verification_failure_reason` is used in most places but`@signed_verification_failure_reason` appears in two places. Likely those errors are not returned.	2018-06-30 13:11:38 +02:00
Marcin Mikołajczak	dfd9cd463d	i18n: Update Polish translation (#7915) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-06-30 02:42:00 +02:00
MIYAGI Hikaru	ddd0bb69e1	Merge HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY into ALLOW_ACCESS_TO_HIDDEN_SERVICE (#7901) ... If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address. I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.	2018-06-29 15:36:02 +02:00
Eugen Rochko	cdb101340a	Keyword/phrase filtering (#7905) ... * Add keyword filtering GET|POST /api/v1/filters GET|PUT|DELETE /api/v1/filters/:id - Irreversible filters can drop toots from home or notifications - Other filters can hide toots through the client app - Filters use a phrase valid in particular contexts, expiration * Make sure expired filters don't get applied client-side * Add missing API methods * Remove "regex filter" from column settings * Add tests * Add test for FeedManager * Add CustomFilter test * Add UI for managing filters * Add streaming API event to allow syncing filters * Fix tests	2018-06-29 15:34:36 +02:00
Quentí	fbee9b5ac8	Missing translations (#7896)	2018-06-27 10:10:53 +09:00
ふぁぼ原	20bb90ced6	On the mobile UI, move the search column to the right (#7877)	2018-06-26 20:35:11 +02:00
Yamagishi Kazutoshi	349d0196b2	Weblate translations (2018-06-25) (#7890) ... * Translated using Weblate (Basque) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (German) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Persian) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Basque) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Japanese) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (German) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.6% (621 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Slovak) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Telugu) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Slovak) Currently translated at 96.6% (602 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Catalan) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.1% (618 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.6% (306 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Malay) Currently translated at 0.4% (3 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/ * Translated using Weblate (Occitan) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ Work in Progress * Translated using Weblate (French) Currently translated at 94.3% (67 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 94.3% (67 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Slovak) Currently translated at 97.1% (605 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 36.2% (226 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 94.0% (586 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 99.3% (305 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 96.9% (604 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 97.5% (608 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Italian) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 84.4% (526 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 97.1% (605 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 97.2% (606 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-06-25 13:31:48 +02:00
Eugen Rochko	45b5e60909	Fix Chrome issue with sizes="0px" (#7886) ... "Do not dumb here. Not dumb area here."	2018-06-25 00:12:15 +02:00
ThibG	c18d55e8c2	Merge pull request #553 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-06-24 15:27:51 +02:00
Thibaut Girka	f364a27922	Increase padding of toots	2018-06-24 14:46:02 +02:00
Thibaut Girka	ccbaf32bca	Fix margins of toot text	2018-06-24 14:46:02 +02:00
Thibaut Girka	4b0f27ba78	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-24 14:32:22 +02:00
ThibG	50a2854f92	Fix jpeg files sometimes being returned with a .jpe extension (#7881) ... While this isn't exactly *wrong*, files uploaded with a “.jpe” extension will keep that extension, which will often cause them to be served with an incorrect mimetype.	2018-06-24 13:33:06 +02:00
Shuhei Kitagawa	23955d956e	Add tests for remote_unfollows_controller (#7879)	2018-06-24 19:55:55 +09:00
ThibG	03cfe366fd	Merge pull request #550 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-06-22 00:10:43 +02:00
Thibaut Girka	0c3a337e04	Fix confirmations_controller	2018-06-21 23:48:54 +02:00
Mélanie Chauvel (ariasuni)	f0f8b242c4	Fix CW field still having animation in when reduce motion is enabled (#7872)	2018-06-21 23:05:01 +02:00
Thibaut Girka	f0161702d8	[Glitch] Submit report using meta key ... Port 64d7a63f18 to glitch-soc	2018-06-21 22:28:50 +02:00
Thibaut Girka	d0faac9027	Fix clicking on collapsed toots with a background (fixes #547)	2018-06-21 22:17:19 +02:00
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	2018-06-21 20:49:57 +02:00
Shuhei Kitagawa	7f59206944	Replace bypass option with bypass_sign_in (#7867)	2018-06-21 10:41:49 +09:00
Hinaloe	c3b40a6950	Return collect response when fail put cache to storage (#7863) ... * return collect response when fail put cache to storage * cleanup callback	2018-06-20 20:55:17 +02:00
kedama	926bfce465	Fix broken single column getting-started menu (Fix #7854) (#7862) ... * Fix lack of height of the getting-started menu. (Fix #7854) Include the height of navigation bar at the height of getting-started menu. * Remove item "Security" on the getting-started menu.	2018-06-20 15:22:07 +02:00
Eugen Rochko	2a1089839d	Weblate translations (2018-06-19) (#7847) ... * Translated using Weblate (Dutch) Currently translated at 100.0% (623 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Greek) Currently translated at 99.6% (621 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Japanese) Currently translated at 92.9% (66 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 97.1% (69 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Catalan) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 95.8% (597 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 94.3% (67 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Greek) Currently translated at 99.6% (621 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Dutch) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Korean) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Slovak) Currently translated at 96.3% (600 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.7% (68 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 99.8% (622 of 623 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (71 of 71 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Normalize	2018-06-19 02:25:29 +02:00
Eugen Rochko	fc09b3722a	Always send content for backwards-compatibility (#7844)	2018-06-18 23:58:13 +02:00
Eugen Rochko	908a9671d0	Serialize language into ActivityPub JSON (#7840) ... * Serialize language into ActivityPub JSON * Only use contentMap if language is present	2018-06-18 22:43:01 +02:00
Eugen Rochko	50689f0d41	Create special case to prefer "jpeg" over "jpe" file extension (#7841)	2018-06-18 17:27:05 +02:00
Yamagishi Kazutoshi	7e9e7c642d	Weblate translations (2018-06-18) (#7839) ... * Translated using Weblate (German) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (German) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.6% (620 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 95.5% (65 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Japanese) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (French) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Occitan) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Basque) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Arabic) Currently translated at 95.0% (591 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (622 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Italian) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 84.5% (526 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Basque) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (622 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-06-18 15:41:40 +02:00
Lynx Kotoura	434ec913dd	Change list icons different from the getting-started icons (#7838)	2018-06-18 15:33:11 +02:00
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828) ... * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	2018-06-17 18:57:31 +02:00
Hinaloe	b347d55432	DataTransfer.types may Array-like object (#7827)	2018-06-18 01:10:58 +09:00
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	2018-06-17 13:54:02 +02:00
Lynx Kotoura	31e5d7efd7	Fix the action with X button on compose form (#7826)	2018-06-17 13:47:56 +02:00
Eugen Rochko	5e9d51c24b	Do not pre-emojify note HTML in accounts REST API (#7821) ... Fix #7820	2018-06-16 18:47:19 +02:00
Thibaut Girka	26c20a4ec7	[Glitch] Preserve newlines in delete & redraft and desktop notifications ... Port c75493755f to glitch-soc	2018-06-16 15:09:28 +02:00
Thibaut Girka	a01faecfcb	[Glitch] Add redraft function ... Port bd0791d800 to glitch-soc	2018-06-16 15:09:28 +02:00
ThibG	c08a249558	Merge pull request #544 from ThibG/glitch-soc/merge-upstream ... Merge branch 'master' into glitch-soc/merge-upstream	2018-06-16 15:08:52 +02:00
Lynx Kotoura	9c08a368e7	Adjust account__action-bar contents (#7818)	2018-06-16 12:57:25 +02:00
Lynx Kotoura	a9ef82febb	Fix autosuggest-textarea backgrounds and some minor adjustments (#7817)	2018-06-16 12:56:45 +02:00
Yamagishi Kazutoshi	ea23ef8cb6	Weblate translations (2018-06-16) (#7815) ... * Translated using Weblate (Occitan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Dutch) Currently translated at 100.0% (622 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Occitan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Persian) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Occitan) Currently translated at 99.5% (618 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Italian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 84.0% (522 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Japanese) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Greek) Currently translated at 84.0% (522 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 95.9% (596 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Greek) Currently translated at 99.3% (302 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.3% (302 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.3% (302 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 94.5% (587 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Greek) Currently translated at 96.7% (294 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Korean) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Arabic) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 91.9% (571 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Greek) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Arabic) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 96.2% (598 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Serbian) Currently translated at 80.8% (502 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovenian) Currently translated at 14.6% (91 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Occitan) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 99.6% (620 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Arabic) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Japanese) Currently translated at 94.1% (64 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (621 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 96.3% (599 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 98.5% (67 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Persian) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 99.6% (620 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused * Translated using Weblate (Catalan) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (621 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Korean) Currently translated at 100.0% (68 of 68 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (621 of 622 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-06-16 12:56:28 +02:00
Jeong Arm	0f6622f7d1	Add missing Korean translations (#7819) ... * Add missing Korean translations * i18n-tasks normalize	2018-06-16 18:47:42 +09:00
SerCom_KC	b469a8d688	Update Chinese (Simplified) Translations (#7816) ... * i18n: (zh-CN) #7805 * i18n: (zh-CN) #7801 * i18n: (zh-CN) #7803 * yarn manage:translations zh-CN * i18n: (zh-CN) #7765	2018-06-16 18:24:54 +09:00
Masoud Abkenar	97b2ba4240	Update fa.json (#7814) ... somehow weblate cannot transfer translation of these two words to here	2018-06-16 10:05:45 +09:00
Thibaut Girka	e8ccac468a	[Glitch] Add vendor prefix for background-clip ... Port e0354aba7c to glitch-soc	2018-06-15 22:14:48 +02:00
David Yip	8cafeedc25	Port 85470ec872 to glitch emoji picker. ... Fixes #541.	2018-06-15 22:10:50 +02:00
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	2018-06-15 20:51:39 +02:00
Eugen Rochko	09147186b7	Fix regression where CW is focused on reply (#7811)	2018-06-15 19:49:32 +02:00
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	2018-06-15 18:00:23 +02:00
Eugen Rochko	33dd9bf36d	Fix vertical alignment of navigation bar (#7807)	2018-06-15 18:00:03 +02:00
Eugen Rochko	c3b3594305	Remove placeholder text for media-only toots (#7806) ... Ref: cfa9b6e13a This breaks compatibility with pre-2.3.0 Mastodon and older software, but at the time of writing the network is >80% above that version. Compatibility broken only for toots with no text.	2018-06-15 15:51:51 +02:00
Eugen Rochko	1cc775200e	Add "find friends", "invite people", and more to getting started footer (#7803) ... - Find friends from Twitter (bridge) - Invite people (when invites enabled) - Security (change e-mail/password) - Developers (create OAuth apps/tokens)	2018-06-15 15:51:37 +02:00
chr v1.x	4f42238c29	Put "Media Only" option in column settings instead of content area headline (#7801) ... * Action/reducer for changing column settings takes a path and a value instead of a javascript object * Settings menu version and column headline version working simultaneously * remove column headline entirely * remove css for headlines that aren't possible now * Remove commented out code from unfruitful attempt at this feature * Give direct timeline its own column settings bc it doesn't have a media only option * Fix typo in public timeline code that was preventing per-column settings from working properly * Fix codeclimate issues * Missing semicolons * Use redux state to set onlyMedia, let that do the update instead of a callback. Consequently, unpinned setting works without history modification * Unused import	2018-06-15 11:15:15 +02:00
Jenkins	afceef74c2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-14 06:17:24 +00:00
Yamagishi Kazutoshi	f972815f1b	Hide status content when spoiler text is not empty (#7797)	2018-06-14 08:03:51 +02:00
Yamagishi Kazutoshi	79a468016a	Fix "Invalid DOM property class" (#7798)	2018-06-14 08:03:07 +02:00
Lain Iwakura	6bae583d2f	Handle character limit in initial state in frontend.	2018-06-14 01:56:11 +02:00
chr v1.x	0338da1699	Add profile options on compose form (#7789) ... * Add profile options on compose form * Remove unused imports to appease codeclimate * Play nicely with cancel button and use ellipsis-v instead of hamburger * Fix whitespace and quotes to appease codeclimate	2018-06-13 14:44:50 +02:00
David Yip	5cff053944	Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions	2018-06-12 18:13:30 -05:00
David Yip	fac6e392e9	Port emojimart 2.6.1 changes to glitch flavour ... See also the following commits: - 0c3ce41031 - 268d90e810	2018-06-12 17:43:50 -05:00
David Yip	908a770d2b	keyword mute: use mentions scope in home feed filtering (#454) ... If a status shows up in mentions because all keyword mutes that might apply to it are marked as "don't apply to mentions", then it ought to show up in the home feed also.	2018-06-12 17:14:35 -05:00
David Yip	e931cf656d	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ... Conflicts: app/models/glitch/keyword_mute.rb	2018-06-12 16:39:30 -05:00
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-06-12 13:17:21 +00:00
Lynx Kotoura	7e27a3c225	Uniform media and video spoiler settings and fix them of the light theme (#7778)	2018-06-10 16:54:22 +02:00
Yamagishi Kazutoshi	01ee460ceb	Weblate translations (2018-06-10) (#7779) ... * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Persian) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 66.3% (412 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Korean) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.9% (596 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-06-10 16:53:49 +02:00
kedama	a99179d31f	Control the focus when clicking the "CW" button. (#7776) ... * Focus to the spoiler text when CW turns on. * Focus back to the textarea when CW turns off.	2018-06-10 16:13:30 +02:00
Renato "Lond" Cerqueira	268d90e810	Rename emoji sheet to avoid caching issue (#7777)	2018-06-10 16:12:47 +02:00
Shuhei Kitagawa	7086aa598b	Add tests for intents_controller (#7763)	2018-06-09 22:47:50 +02:00
Eugen Rochko	10f51c9886	Fix domain hiding logic (#7765) ... * Send rejections to followers when user hides domain they're on * Use account domain blocks for "authorized followers" action Replace soft-blocking (block & unblock) behaviour with follow rejection * Split sync and async work of account domain blocking Do not create domain block when removing followers by domain, that is probably unexpected from the user's perspective. * Adjust confirmation message for domain block * yarn manage:translations	2018-06-09 22:46:54 +02:00
Lynx Kotoura	91e5d9f8af	Fix background color of emoji-mart-bar in light theme (#7768) ... * Fix background color of emoji-mart-bar * Uniform emoji-mart-search background color in light theme as default	2018-06-09 22:21:37 +02:00
Lynx Kotoura	3df8c40508	Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)	2018-06-09 22:20:57 +02:00
Eugen Rochko	17dc07f667	Fix has_one association on Web::PushSubscription (#7767) ... * Fix has_one association on Web::PushSubscription * Fix code style issues	2018-06-09 21:11:14 +02:00
Thibaut Girka	7d3c0e4cb4	Delete references to removed constants (fixes #537)	2018-06-09 18:14:23 +02:00
David Yip	f9eb4ea80a	Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 ... Hardcode default skin/theme in error layout (fixes #373)	2018-06-09 10:39:55 -05:00
SerCom_KC	fc132915ec	Update Chinese (Simplified) translations (#7769) ... * i18n: (zh-CN) #7718 * i18n: (zh-CN) #7735 * i18n: (zh-CN) #7676	2018-06-09 17:07:23 +02:00
Renato "Lond" Cerqueira	85470ec872	Fix issues with updated emoji mart (#7761) ... * Changes behavior from search light to keep custom search The new version of emoji-mart needs the search function to constantly receive the custom emoji array. This changes the behavior back to the previous one in the search light method to keep the emoji autocomplete as before * Change test order The order was breaking the tests * Fix codeclimate issues * Update to emoji mart to version without issue in picker Fixes #7760	2018-06-08 13:28:04 +02:00
Yamagishi Kazutoshi	6671297e7a	Weblate translations (2018-06-08) (#7759) ... * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (303 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Persian) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 66.3% (412 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (304 of 304 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-06-08 04:50:52 +02:00
Eugen Rochko	6ba7d9d0d9	Do not accept ActivityPub follow requests from blocked user (#7756) ... * Do not accept ActivityPub follow requests from blocked user Fix #7745 * Deliver auto-rejection immediately when follow-requested by blocked account * Fix trailing whitespace	2018-06-08 00:14:06 +02:00
Eugen Rochko	9b9e96eae5	Add "Edit profile" link to public profile page, increase bottom padding (#7754)	2018-06-07 22:40:55 +02:00
Renato "Lond" Cerqueira	0c3ce41031	Update to emojimart 2.6.1 (#7746) ... * Update to emojimart 2.6.1 WIP using local updated version. Sheet comes from emoji-data@4.0.4, file sheet_twitter_32_indexed_256.png. * Update to 2.6.1 and uncompress data if needed * Remove changes that were not needed * Fix yarn lock file * Match emojiToShowFilter behavior to new version of emoji-mart * Fix codeclimate issue * Match custom emoji behavior to new version of emoji-mart * Replace emoji without shortcode in tests * Fix code climate issues	2018-06-07 19:40:23 +02:00
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	2018-06-07 05:13:49 -05:00
David Yip	f8d50a4070	Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation ... Use history.state to decide whether we should goBack() or go to / (fixes #247)	2018-06-06 23:56:48 -05:00
Marcin Mikołajczak	2304d52599	🌍🇵🇱 (#7753) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-06-07 13:37:43 +09:00
Eugen Rochko	59b42188a7	Filter out blocked/muted people from profile timelines (#7747) ... Fix #7741	2018-06-06 21:13:30 +02:00
Yamagishi Kazutoshi	683707839f	Fix fetch of remote image with multiple Content-Type headers (#7749)	2018-06-06 20:50:07 +02:00
Eugen Rochko	c75493755f	Preserve newlines in delete & redraft and desktop notifications (#7750) ... Fix #7748	2018-06-06 20:49:53 +02:00
Yamagishi Kazutoshi	b7b331ad0d	Add missing dot for remote image (#7751)	2018-06-06 20:49:39 +02:00
David Yip	68373e799b	Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists ... Escape metacharacters in non-whole-word keyword mutes (#463, #533)	2018-06-05 21:38:04 -05:00
Renato "Lond" Cerqueira	d8b4f39007	Weblate translations 20180605 (#7743) ... * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Slovak) Currently translated at 95.4% (593 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	2018-06-05 20:28:29 +02:00
Renato "Lond" Cerqueira	aa177bdca7	Add missing locale strings (#7742) ... ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	2018-06-06 03:11:03 +09:00
David Yip	a640c322c1	Escape metacharacters in non-whole-word keyword mutes. Fixes #533. ... Also addresses #463.	2018-06-05 02:49:28 -05:00
Eugen Rochko	bd0791d800	Add redraft function (#7735) ... * Add redraft function Fix #7010 * Add explicit confirmation * Add explicit confirmation message	2018-06-05 00:17:38 +02:00
David Yip	f009fef40b	Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists ... keyword mute: Store keywords in a list, not a regex	2018-06-04 15:58:23 -05:00
nightpool	5fb013878f	Fix context performance by partially reverting #7083 (#7734) ... * Fix context performance by partially reverting #7083 * Fix code style issue * fix off-by-1 error in thread limits * code style fix	2018-06-04 22:20:12 +02:00
Yamagishi Kazutoshi	dc73241bd9	Detect extname from Content-Type (#7733)	2018-06-04 18:58:36 +02:00
Yamagishi Kazutoshi	e3fb528d12	Skip processing when HEAD method returns 501 (#7730)	2018-06-04 13:42:53 +02:00
Yamagishi Kazutoshi	e0354aba7c	Add vendor prefix for background-clip (#7727)	2018-06-04 13:24:20 +02:00
Lynx Kotoura	bb0edbd988	Change border color of activity-stream (#7724)	2018-06-04 13:13:31 +02:00
Yamagishi Kazutoshi	64d7a63f18	Submit report using meta key (#7729)	2018-06-04 13:09:52 +02:00
Yamagishi Kazutoshi	c0fc4e9935	Remove unnecessary underline on accounts table (#7728)	2018-06-04 13:09:36 +02:00
David Yip	97d2df77aa	Add apply-to-mentions option to keyword mute UI. #454.	2018-06-04 02:51:28 -05:00
David Yip	26573ad7e6	Thread scopes through #matches?. #454. ... Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is used to calculate scope. Next up: additions to the test suite to demonstrate how scoping works.	2018-06-03 23:00:50 -05:00
Eugen Rochko	1bbe81030c	Display numbers in account header using shortNumberFormat for consistency (#7723)	2018-06-04 05:15:50 +02:00
Akihiko Odaki	5bf5003384	Do not mark remote status sensitive even if spoiler text is present (#7395) ... Old statuses and statuses from Pawoo, which runs a modified version of Mastodon, may not have been marked sensitive even if spoiler text is present. Such statuses are still not marked sensitve if they are local or arrived before version upgrade. Marking recently fetched remote status sensitive contradicts the behavior. Considering what people expected when they authored such statuses, this change removes the sensitivity enforcement.	2018-06-04 04:46:14 +02:00
Lynx Kotoura	73923ea6c4	Fix activity-stream-tabs colors and set text variables for text colors (#7722)	2018-06-04 04:39:42 +02:00
Eugen Rochko	e18390cfe6	Fix bug in order of conversations in web UI (#7721)	2018-06-04 04:19:16 +02:00
David Yip	c55263027a	Merge remote-tracking branch 'origin/master' into gs-master	2018-06-03 19:44:05 -05:00
Eugen Rochko	0deb9fa6b9	Remove trending hashtags (#7711) ... * Delete trends_controller.rb * Update routes.rb * Update trending_tags.rb * Update index.js * Update index.js * Update search_results.js * Update async-components.js * Update index.js * Delete trends.js * Delete trends.js * Delete trends_container.js * Delete trends.js * Update search_results.js * Update search_results_container.js	2018-06-04 02:18:18 +02:00
David Yip	37d495eeeb	keyword mute: Store keywords as a list ... This has a couple of advantages over the regex approach: - Keywords are individually addressable, which makes it easier to gather statistics (#363) - Keywords can be individually applied to different feeds, e.g. skipping mentions (#454) It *does* end up creating many more Regexp objects. I'm not yet sure if the difference is significant.	2018-06-03 18:12:55 -05:00
David Yip	5dd2a78034	Merge pull request #528 from glitch-soc/merge-upstream ... Merge with tootsuite/master	2018-06-03 03:01:09 -05:00
David Yip	8343f56b2c	Whoops, forgot to clean up a conflict.	2018-06-03 02:35:54 -05:00
David Yip	cfdbb36bdf	Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null ... Prevent a rare crash when a status' root node is undefined	2018-06-02 16:19:06 -05:00
David Yip	3550470c18	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.	2018-06-02 16:15:36 -05:00
David Yip	a641d1b5b8	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-06-02 16:08:31 -05:00
Yamagishi Kazutoshi	89c86ee521	Weblate translations (2018-06-02) (#7705) ... * Translated using Weblate (Korean) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.6% (302 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.1% (616 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant_HK/ * Translated using Weblate (Slovenian) Currently translated at 14.4% (90 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Occitan) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ to check if with O or U * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Dutch) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ * Translated using Weblate (Korean) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (303 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (302 of 303 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * i18n-tasks normalize && yarn manage:translations	2018-06-02 03:03:08 +02:00
Eugen Rochko	6e6c0e9613	Use different algorithm for trending tags (#7697)	2018-06-01 19:19:44 +02:00
Eugen Rochko	8d6e4e0485	Fix margin between compose warning, reply indicator and textarea (#7701)	2018-06-01 19:19:30 +02:00
Eugen Rochko	73c0c36e7b	Improve trends layout (#7700) ... * Allow collapsing trends, responsively hide trends * Add trends column	2018-06-01 19:18:37 +02:00
Yamagishi Kazutoshi	69b45350fe	Add loading indicator for trending tags (#7693)	2018-06-01 14:22:42 +02:00
Yamagishi Kazutoshi	bfa12239e8	Update ESLint for Code Climate (#7696) ... * Update babel-eslint to version 8.2.3 * Update eslint to version 4.19.1 * Update eslint-plugin-promise to version 3.8.0 * Update eslint-plugin-react to version 7.8.2 * Upgrade eslint-plugin-jsx-a11y to version 6.0.3 * yarn test:lint --fix	2018-06-01 14:03:19 +02:00
Yamagishi Kazutoshi	15ce60f610	Fix duplicate key attributes (#7694)	2018-06-01 14:02:49 +02:00
David Yip	9ad5de8a3a	Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks ... Make active bookmarks red (fixes #493)	2018-06-01 00:36:48 -05:00
Spencer Alves	e5f25a73f2	Adjust spacing between status icons	2018-05-31 21:55:44 -07:00
Spencer Alves	7d2e6429c2	Merge branch 'glitch' into thread-icon	2018-05-31 21:33:16 -07:00
Eugen Rochko	1e938b966e	Exclude unlisted, private and direct toots from affecting trends (#7686)	2018-05-31 16:47:28 +02:00
Eugen Rochko	0ce5339a7b	Make the refresh trends button refresh trends (#7685)	2018-05-31 16:46:02 +02:00
Mélanie Chauvel (ariasuni)	691107263c	Put the CW field between the toot we are replying to and the toot field (#7508) ... * Remove Collapsable and use CSS instead * Put the CW field between the toot we are replying to and the toot field * Use same spacing between all fields in the composing column	2018-05-31 15:16:31 +02:00
Thibaut Girka	b9fdeceb3c	Make active bookmarks red (fixes #493)	2018-05-31 14:39:48 +02:00
Thibaut Girka	cc396f085d	Use history.state to decide whether we should goBack() or go to / (fixes #247) ... So far, glitch-soc used history.length to decide whether to call `goBack()` or go to / in order to not leave the webUI. This made clicking the “Back” button go to the “Getting started” column instead of going back in the browser's history when such an action would leave the web UI, but also when: - The WebUI is refreshed (F5) - A tab is restored - The history length reaches its maximum (e.g., 50 in Firefox) This commit fixes these shortcomings by checking `window.history.state`. Indeed, we only want to go back in the browser's history when the current location has been reached from within the WebUI, which only happens via `pushState` as far as I know. Since browser store the serialized state in the browser history, this also survives page reload and session restoration.	2018-05-31 14:39:02 +02:00
Thibaut Girka	f86d280fd6	Use props.router instead of context.router, as we are using withRouter	2018-05-31 14:39:02 +02:00
Thibaut Girka	e8a9627f66	Hardcode default skin/theme in error layout (fixes #373) ... This is a bit hackish. The best way would simply to somehow use Mastodon's ApplicationController with `use_pack 'error'` from the Rake task, but I'm not sure how to do that.	2018-05-31 14:38:48 +02:00
Thibaut Girka	893f2aff20	Prevent a rare crash when a status' root node is undefined	2018-05-31 14:38:29 +02:00
Thibaut Girka	e396fbfe3b	Fix direct timeline	2018-05-31 14:37:13 +02:00
Yamagishi Kazutoshi	648a22637c	Weblate translations (2018-05-31) (#7681) ... * Translated using Weblate (Basque) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/eu/ * Translated using Weblate (Corsican) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/ * Translated using Weblate (Italian) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Basque) Currently translated at 99.3% (297 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 55.2% (42 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 8.5% (53 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 9.0% (56 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Finnish) Currently translated at 98.9% (296 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 98.9% (296 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 98.9% (296 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Corsican) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Basque) Currently translated at 41.3% (257 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ * Translated using Weblate (Basque) Currently translated at 56.5% (43 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Arabic) Currently translated at 90.8% (564 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (German) Currently translated at 96.9% (64 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 98.4% (65 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Basque) Currently translated at 42.9% (267 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Italian) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Basque) Currently translated at 71.0% (54 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Slovak) Currently translated at 95.3% (592 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 43.8% (272 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Japanese) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 95.3% (592 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.5% (618 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese) Currently translated at 83.7% (520 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Japanese) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Slovak) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 91.9% (571 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * yarn manage:translations && i18n-tasks noramlize && i18n-tasks remove-unused * remove body_html: '' * Translated using Weblate (Galician) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Basque) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * yarn manage:translations	2018-05-31 13:00:40 +02:00
Marcin Mikołajczak	063d4d4ccc	🌍: 🇵🇱⬆️ (#7679) ... * 🌍: 🇵🇱⬆️ Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * yarn manage:translations	2018-05-31 11:15:38 +09:00
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-31 01:17:25 +00:00
Eugen Rochko	ad40bf5e0c	Speed up some rake tasks by moving execution to Sidekiq (#7678) ... * Speed up some rake tasks by moving execution to Sidekiq mastodon:media:remove_silenced mastodon:media:remove_remote mastodon:media:redownload_avatars mastodon:feeds:build * Fix code style issue	2018-05-30 21:09:30 +02:00
Eugen Rochko	3623aea6c9	Redirect / to home on mobile layout, to getting started on desktop (#7677)	2018-05-30 18:42:06 +02:00
Eugen Rochko	1a7a74ff76	Improve getting started column (#7676) ... * Adjust footer of getting started column - Improved style - Moved hotkeys, about this instance and logout to footer - Removed FAQ, User Guide, Apps links - Use hamburger icon for the column * Add edit profile action button to profile and more to dropdown * Add "Trending now" to getting started column * Add preferences/security links on mobile layout	2018-05-30 18:41:47 +02:00
Eugen Rochko	a7d726c383	Improve counter caches on Status and Account (#7644) ... Do not touch statuses_count on accounts table when mass-destroying statuses to reduce load when removing accounts, same for reblogs_count and favourites_count Do not count statuses with direct visibility in statuses_count Fix #828	2018-05-30 02:50:23 +02:00
Eugen Rochko	461542784b	Reduce wasted work in RemoveStatusService due to inactive followers (#7672)	2018-05-29 22:55:33 +02:00
Thibaut Girka	e7b3a4263e	[Glitch] Fix low-contrasted cancel button of reply indicator ... Port 86efccce2a to glitch-soc	2018-05-29 21:25:47 +02:00
Thibaut Girka	08dbe29e29	[Glitch] Improve load gap styling in web UI ... Port 45c9f16f71 to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	cc589d6ec0	[Glitch] Use randomized setTimeout when fallback-polling and re-add since_id ... Port dafd7afc5e to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	fbc25bdd2d	[Glitch] Do not crash in getStatusIds when there is a gap in the timeline ... Port b1938d7853 to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	5cc4d34250	[Glitch] Fix gap insertion for timeline disconnection ... Port 66359ec522 to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	15bef77add	[Glitch] Fix ID duplication in timelines ... Port 306267dbd2 to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	4b38ac3bed	[Glitch] Fix comparing id ... Port 0ba49eca8b to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	6020a21130	[Glitch] Fix LoadMore on account media gallery ... Port 3523aa440b to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	5d16fd3f28	[Glitch] Add missing null handling in notification reducer ... Port 2f3ac14a43 to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	4eba8c50c3	[Glitch] Allow clients to fetch notifications made while they were offline ... Port cbf97c03bb to glitch-soc	2018-05-29 21:25:28 +02:00
Thibaut Girka	0ad3eedd4c	[Glitch] Allow clients to fetch statuses made while they were offline ... Port 9a1a55ce52 to glitch-soc	2018-05-29 21:25:28 +02:00
unarist	7706ed038f	Fix context building in the reducer (#7671) ... This fixes below bugs: * addReply() had used native compare operator for string ids => descendants may appears at wrong position * CONTEXT_FETCH_SUCCESS had added the focused status as the reply of the *first* status in ancestors, not last status. => descendants may also appears wrong position as well as correct position * TIMELINE_UPDATE had added the status to replies of *itself* instead of replied status => browser will hangs if you open the status due to a circular reference	2018-05-29 17:42:29 +02:00
Thibaut Girka	532fb8e215	Fix error when unmuting a domain without listing muted domains first	2018-05-29 16:26:39 +02:00
ThibG	0345cd5a0f	Fix error when unmuting a domain without listing muted domains first (#7670)	2018-05-29 16:25:05 +02:00
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-29 13:52:26 +02:00
abcang	90908fc24b	Fix N+1 on AtomSerializer (#7669)	2018-05-29 13:34:02 +02:00
Eugen Rochko	8bb74e50be	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	2018-05-29 02:01:24 +02:00
Eugen Rochko	90b64c0069	Always display tab navigation on local/federated timeline even when empty (#7663) ... Fix #7659	2018-05-29 02:01:04 +02:00
Eugen Rochko	e599d7caf2	Rescue Mastodon::DimensionsValidationError in Remoteable (#7662) ... Fix #7660	2018-05-29 08:39:02 +09:00
Akihiko Odaki	d95642f6d9	Cache attachments on external host with service worker (#7493)	2018-05-29 00:43:47 +02:00
takayamaki	03f4c214b4	fix: Don't validate MX record in development (#7654)	2018-05-28 19:14:24 +02:00
Lynx Kotoura	c0355878ba	Fix embed, error and onboarding modals in light theme (#7656)	2018-05-28 19:13:20 +02:00
Eugen Rochko	04a2cf8bcc	Fix incomplete flex style on trends items (#7655)	2018-05-28 19:12:53 +02:00
tateisu	b87a1229c7	optimize direct timeline (#7614) ... * optimize direct timeline * fix typo in class name * change filter condition for direct timeline * fix codestyle issue * revoke index_accounts_not_silenced because direct timeline does not use it. * revoke index_accounts_not_silenced because direct timeline does not use it. * fix rspec test condition. * fix rspec test condition. * fix rspec test condition. * revoke adding column and partial index * (direct timeline) move merging logic to model * fix pagination parameter * add method arguments that switches return array of status or cache_ids * fix order by * returns ActiveRecord.Relation in default behavor * fix codestyle issue	2018-05-28 11:04:06 +02:00
Eugen Rochko	ab36e0ef72	Record trending tags from ActivityPub, too (#7647)	2018-05-28 12:21:04 +09:00
Eugen Rochko	dfbadd6837	Replace recursion in status mapStateToProps (#7645)	2018-05-28 02:42:06 +02:00
Eugen Rochko	9bd23dc4e5	Track trending tags (#7638) ... * Track trending tags - Half-life of 1 day - Historical usage in daily buckets (last 7 days stored) - GET /api/v1/trends Fix #271 * Add trends to web UI * Don't render compose form on search route, adjust search results header * Disqualify tag from trends if it's in disallowed hashtags setting * Count distinct accounts using tag, ignore silenced accounts	2018-05-27 21:45:30 +02:00
Thibaut Girka	8b98afa781	[Glitch] Replace onScrollToBottom with onLoadMore ... Port b0664a5e6c to glitch-soc	2018-05-27 20:40:58 +02:00
Thibaut Girka	a81ed7b205	Do not needlessly refresh pinned toots ... Port missing part of 6ae70a92c9 to glitch-soc	2018-05-27 20:40:58 +02:00
Thibaut Girka	60addb14ce	[Glitch] Change icon for domain blocks ... Port fa04945365 to glitch-soc	2018-05-27 20:40:58 +02:00
Thibaut Girka	b7508940b7	[Glitch] Add option to show only local toots in timeline preview ... Port missing changes from 4e4f1b0dcb to glitch-soc	2018-05-27 20:39:25 +02:00
Thibaut Girka	1fa3586db5	[Glitch] Use streaming API for standalone timelines on /about and /tag pages ... Port 0128b86d30 to glitch-soc	2018-05-27 20:39:25 +02:00
Thibaut Girka	d959d04133	Change direct message warning to match upstream	2018-05-27 15:46:00 +02:00
Thibaut Girka	659b8a12ec	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes	2018-05-27 13:20:15 +02:00
Thibaut Girka	c2e528916c	Implement client-size image resizing from upstream	2018-05-27 11:02:54 +02:00
Thibaut Girka	d253449ff0	Port upstream's result section headers (fixes #366)	2018-05-27 11:02:44 +02:00
Eugen Rochko	63c7b91572	Validate that e-mail resolves with MX and it's not blacklisted (#7631) ... Original patch by @j-a4	2018-05-27 11:58:08 +09:00
Eugen Rochko	182bdbc5f4	Don't use Object.assign with Notification, only display actions for mentions (#7632) ... Fix #7627	2018-05-27 11:55:19 +09:00
bsky	422f92f3f8	Fix lock icon position in account card (#7630)	2018-05-26 15:29:32 +02:00
Thibaut Girka	18d9a7fd71	Fix caret position after inserting suggestions (fixes #281)	2018-05-26 12:17:03 +02:00
Thibaut Girka	d8793e1bee	Remove unneeded code now that attachment URL isn't appended to toots	2018-05-26 12:17:03 +02:00
Lynx Kotoura	07054ee6f7	Add right margin of notification message (#7628)	2018-05-26 10:53:53 +02:00
Lynx Kotoura	a0b4754231	Fix color mistakes in mastodon-light theme (#7626) ... * Fix colors of mastodon-light theme Fix colors of modals and focused toots in light theme Fix colors of compose-form items and more Fix colors of status__content__spoiler-link:hover and $valid-value-color Change success green color in light theme * Fix some sass codes * Add !default for explicit color valiables in default theme for overwriting colors easier in the other themes	2018-05-26 10:53:44 +02:00
Yamagishi Kazutoshi	62cb3b199f	Weblate translations (2018-05-26) (#7624) ... * Translated using Weblate (Esperanto) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Occitan) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Catalan) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Occitan) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Italian) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Italian) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 98.4% (65 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 84.0% (522 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Esperanto) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Japanese) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (French) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Italian) Currently translated at 84.0% (522 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Catalan) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Persian) Currently translated at 99.6% (298 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 99.5% (618 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Occitan) Currently translated at 98.0% (609 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Dutch) Currently translated at 99.8% (620 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Slovak) Currently translated at 95.0% (590 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 98.4% (65 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Galician) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (French) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.3% (617 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.9% (62 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ Ορθογραφικό λάθος * Translated using Weblate (Greek) Currently translated at 44.4% (276 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.1% (616 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Swedish) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 99.3% (617 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Arabic) Currently translated at 90.8% (564 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 95.0% (590 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (German) Currently translated at 99.0% (615 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (619 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 93.9% (62 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (75 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Arabic) Currently translated at 90.8% (564 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (299 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 44.6% (277 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 95.1% (591 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (621 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 95.1% (591 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.5% (618 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Basque) Currently translated at 89.6% (268 of 299 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 40.9% (27 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 1.2% (8 of 621 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * i18n-tasks normalize && yarn manage:translations	2018-05-26 04:45:58 +02:00
Eugen Rochko	ebf2fef029	Catch ActionController::UnknownFormat and return HTTP 406 (#7621) ... An error like that should not appear in production error log.	2018-05-26 01:09:30 +02:00
ThibG	a5c25242af	Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav ... [Glitch] Use .star-icon instead of hardcoding color in detailed statuses	2018-05-25 22:03:31 +02:00
Thibaut Girka	11cc2e099a	Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss	2018-05-25 18:59:02 +02:00
Akihiko Odaki	023fe5181b	Introduce flat layout to contexts reducer (#7150) ... This allows to filter out replies in threads even if contexts of those replies are not fetched.	2018-05-25 18:46:28 +02:00
Yamagishi Kazutoshi	8182b61518	Enable media timeline (#7598)	2018-05-25 18:36:46 +02:00