4934 Commits

Author	SHA1	Message	Date
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
Lynx Kotoura	7ea91dcbb3	More polished light theme (#7620) ... * Revert "Remove pointer to light theme until it is more polished (#7594)" This reverts commit f8cf85db3b. * True up the hierarchical structure of mastodon-light theme * Fix mastodon-light theme	2018-05-25 18:36:26 +02:00
Lynx Kotoura	6042403621	Fix color of /about/more link anchors (#7618)	2018-05-25 16:48:17 +02:00
ThibG	cdbdf7f98b	Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)	2018-05-25 14:26:45 +02:00
Thibaut Girka	c1d0f96bb4	Add missing comma in InitalStateSerializer (fixes #516)	2018-05-25 14:06:48 +02:00
Thibaut Girka	4c91215e1f	[Glitch] Use .star-icon instead of hardcoding color in detailed statuses ... Port 2587fcdd27 to glitch-soc	2018-05-25 11:16:11 +02:00
ThibG	2587fcdd27	Use .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613)	2018-05-25 10:03:22 +09:00
ThibG	88ec5193cb	Merge pull request #510 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-05-23 19:19:28 +02:00
ThibG	7719fe0df2	Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search ... [Glitch] Fetch relationships for search results in UI	2018-05-23 18:54:51 +02:00
Thibaut Girka	0553496b76	Change notification cleaning checkbox color (fixes #511)	2018-05-23 18:29:15 +02:00
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-23 16:05:19 +02:00
ThibG	d8864b9e9d	Fix caret position after selected suggestion and media upload (#7595) ... * Fix media upload reseting caret position to last inserted emoji * Fix caret position after inserting suggestions (fixes #6089)	2018-05-23 15:20:15 +02:00
Eugen Rochko	4d81809f36	Yeah, it was supposed to be #create?	2018-05-22 20:05:24 +02:00
ThibG	39d70f375f	Remove unneeded code now that attachment URL isn't appended to toots (#7593)	2018-05-22 19:32:02 +02:00
Eugen Rochko	1a564df586	Do not encode HTML entities in initial Web Push payload body (#7592)	2018-05-22 18:12:45 +02:00
SerCom_KC	4c9d5a500d	[WIP] i18n: Update Simplified Chinese translations (#7576) ... * i18n: (zh-CN) #7027 * Rewording This placeholder is also seen on single user page at Moderation > Accounts, where "this report" doesn't make sense. * i18n: (zh-CN) #6425 * i18n: (zh-CN) #6497 * i18n: (zh-CN) #6246 * i18n: (zh-CN) Improvements	2018-05-22 15:26:42 +02:00
Eugen Rochko	36e47a31e3	Enforce order on authorized applications page (#7587) ... Fix #7586	2018-05-22 14:44:53 +02:00
Yamagishi Kazutoshi	4eeda67727	Hide section headline for timelines in production (#7590) ... * Hide section headline for timelines in production * comment out	2018-05-22 14:44:32 +02:00
Yamagishi Kazutoshi	06252ec71e	Change column params on pinned timeline (#7581)	2018-05-22 13:26:06 +02:00
bsky	92b09d90c8	Remove outline (#7582)	2018-05-22 13:24:54 +02:00
Thibaut Girka	247f55f673	[Glitch] Fetch relationships for search results in UI ... Port webui changes from cba2897108 to glitch-soc	2018-05-22 13:05:40 +02:00
David Yip	6dd676e006	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: config/locales/pl.yml The conflict in config/locales/pl.yml concerns the themes key, which is not used in glitchsoc. Resolution: remove the themes key-related changes, i.e. accept-ours.	2018-05-21 16:30:24 -05:00
Marcin Mikołajczak	810f92e697	🌍: 🇵🇱⬆️ (#7580) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-21 23:12:35 +02:00
Jenkins	f93806ea55	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-21 18:17:23 +00:00
Thibaut Girka	d0b2f71501	Fix width only being set for standalone media	2018-05-21 18:25:41 +02:00
Thibaut Girka	3ad3cee44c	[Glitch] Use real container width in MediaGallery srcSet ... Port 22e067bf5c to glitch-soc	2018-05-21 17:55:07 +02:00
Thibaut Girka	463078dcc4	[Glitch] Do not override the default push notification settings ... Port 1951ff41b3 to glitch-soc	2018-05-21 17:52:26 +02:00
Eugen Rochko	5ea643b279	Save onlyMedia prop when pinning column (#7575)	2018-05-21 17:49:10 +02:00
Eugen Rochko	40ef46dbef	Display only domain of report account if remote under comment (#7574)	2018-05-21 17:33:20 +02:00
Thibaut Girka	a4c9bda771	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.	2018-05-21 16:40:02 +02:00
Yamagishi Kazutoshi	46061dc041	Add exact attribute to WrappedRoute for community timeline (#7572) ... * Add extra attribute to WrappedRoute for community timeline * fix	2018-05-21 16:26:00 +02:00
Eugen Rochko	22e067bf5c	Use real container width in MediaGallery srcSet (#7571) ... Fix #7568	2018-05-21 16:04:01 +02:00
Eugen Rochko	32d4372381	Use #any? instead of #exists? when checking media attachments (#7570) ... If media_attachments are not loaded, SQL query is the same, but the #exists? method performs SQL query even if preloaded	2018-05-21 16:01:16 +02:00
Eugen Rochko	e583f110c3	Unescape HTML entities in rich web push notifications in web UI (#7569)	2018-05-21 16:00:56 +02:00
Thibaut Girka	c53aacdfa0	Recover glitch-soc specific styles that were removed by accident	2018-05-21 15:56:47 +02:00
SerCom_KC	41b2cfe5b8	i18n: Update Simplified Chinese translations (#7565) ... * i18n: (zh-CN) #7532 * i18n: (zh-CN) #6984 * i18n: (zh-CN) #7391, #7507 * i18n: (zh-CN) #6998 * i18n: (zh-CN) #7074 * i18n: (zh-CN) #7000, #7032, #7131 (#7032, #7040) * i18n: (zh-CN) #7130, #7188 * i18n: (zh-CN) #6486 * i18n: (zh-CN) #6292 * i18n: (zh-CN) #7347 * i18n: (zh-CN) #6661 * i18n: (zh-CN) #6425 * i18n: (zh-CN) #6597 * i18n: (zh-CN) #6695 * i18n: (zh-CN) #6325 * i18n: (zh-CN) #6460, #7375 * i18n: (zh-CN) #6872 * i18n: (zh-CN) #6818 * i18n: (zh-CN) #7452 * i18n: (zh-CN) #7176 * i18n: (zh-CN) #6460 * i18n: (zh-CN) #7213 * i18n: (zh-CN) #7376 * i18n: (zh-CN) #6556 * i18n: (zh-CN) #6645 * i18n: (zh-CN) #6448 * i18n: (zh-CN) #5303 * i18n: (zh-CN) #7445 * i18n: (zh-CN) Normalization and improvements * i18n: (zh-CN) #7391 * i18n: (zh-CN) #6627 * i18n: (zh-CN) #6956, #7546 * i18n: (zh-CN) #6636 * i18n: (zh-CN) #6610, #6875 * i18n: (zh-CN) #6887 * i18n: (zh-CN) #4514 * i18n: (zh-CN) #6628 * i18n: (zh-CN) #6771 * i18n: (zh-CN) #6772 * i18n: (zh-CN) #7178 * i18n: (zh-CN) #7521 * i18n: (zh-CN) #6570 * i18n: (zh-CN) #6593 * i18n: (zh-CN) #6423 * i18n: (zh-CN) #6157 * i18n: (zh-CN) #7089 * i18n: (zh-CN) #6733 * i18n: (zh-CN) #7072 * i18n: (zh-CN) #6520 * i18n: (zh-CN) Improvment * i18n: (zh-CN) #6631	2018-05-21 13:40:48 +02:00
Sylvhem	ea969000a5	Add a light theme (#7027) ... * Add a light theme to Mastodon This add a second default theme to Mastodon. This new theme is supposed to be a light version of the dark original one. * Update locales Update the English and French locales. * Change capitalization of hexadecimal triplets Change capitalization of hexadecimal color codes to match Code Climate's recomandation. * Add variable Add a new variable to use instead of hardcoding a color. Change made to match Code Climate's recomandation. * Use Mastodon branding palette Replace the colors previously used by the ones found in Mastodon branding palette. The resulting theme is lighter than the previous version. * Make the overlay background white Make the overly background used on on sensitive medias white instead of black * Change the color used on the envelop icon Change the color used on the envelop icon for a darker one. The same color is now used on both the envelop icon and the padlock icon. * Add contrast Add contrast to various places inside the main interface and the profile pages. * Change the text color used in the compose form Change the text color used in the compose form for a darker one. * Make the code easier to read Add some blank lines to make the code easier to parse for a human eye. * Change columns' background default colors Change columns' background default colors, making the composition column the darker one. * Change the color of the log in button Change the log in button's text color to make it more readable. * Fix the color of the boost buttons on the landing page The disabled boost buttons on the landing page are now of the same color that the other disabled buttons. * Change the colors used in the dropdown menu Make the dropdown menu light instead of dark.	2018-05-21 13:40:31 +02:00
Yamagishi Kazutoshi	7403e5d306	Add media timeline (#6631)	2018-05-21 12:43:38 +02:00
Eugen Rochko	05f8c375a2	Remove small pagination limit from context API (#7564) ... Fix #7557	2018-05-21 12:43:05 +02:00
Eugen Rochko	9ada532809	Convert rich push notifications to plaintext in webapp (#7563) ... * Convert rich push notifications to plaintext in webapp * Fix code style issues	2018-05-21 03:35:37 +02:00
Quentí	6eb2bc4348	[i18n] Update for Occitan (#7558) ... * Update oc.json * Update oc.yml * Update simple_form.oc.yml	2018-05-20 20:26:32 +02:00
Eugen Rochko	779eb07d75	Improve default background of public profile header (#7556) ... Looks better when no header image is set	2018-05-20 13:09:28 +02:00
Thibaut Girka	d250e072a2	In footer, replace text "Mastodon" with logo ... Port SCSS changes from 93c66f0c03 to glitch-soc	2018-05-20 11:29:06 +02:00
Thibaut Girka	9ed8051961	Add preference to hide following/followers lists ... Port SCSS from 1e02dc8715	2018-05-20 11:28:58 +02:00
Thibaut Girka	50540446f5	[Glitch] Improvements to toots display in admin view ... Port SCSS changes from 0f2fbf7d05 (I'm sorry for the animated rainbows)	2018-05-20 11:28:58 +02:00
David Yip	2f9bd86f6e	Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed ... Widen clickable area of toots	2018-05-20 03:03:39 -05:00
Marcin Mikołajczak	07672e0609	🌍: 🇵🇱⬆️ (#7554) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-20 00:55:56 +02:00
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	2018-05-19 22:41:10 +02:00
Yamagishi Kazutoshi	6aa5ea1b5d	Weblate translations (2018-05-20) (#7552) ... * Translated using Weblate (French) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (Italian) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (French) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (628 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Galician) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * 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% (295 of 295 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% (625 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 83.7% (525 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Japanese) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (628 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 99.5% (624 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (295 of 295 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% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (French) Currently translated at 99.6% (625 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * 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 (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 (Japanese) Currently translated at 99.8% (627 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (66 of 66 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.6% (626 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (66 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (628 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (French) Currently translated at 99.6% (626 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Swedish) Currently translated at 99.5% (625 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * 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 (Swedish) Currently translated at 95.4% (63 of 66 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Japanese) Currently translated at 99.8% (627 of 628 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * 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% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/ * 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 (Persian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/ * i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations	2018-05-19 21:42:21 +02:00
Eugen Rochko	8378b72eba	Ensure push subscription is immediately removed when application is revoked (#7548) ... * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too	2018-05-19 21:05:08 +02:00
Ash Furrow	50db106252	Disables autocorrect/autocapitalize on remote username field. (#7549)	2018-05-19 19:36:23 +02:00
Akihiko Odaki	4e1400cecb	Cache media only when storage can be freed (#7547)	2018-05-19 19:22:11 +02:00
Eugen Rochko	1bbe12254d	Improve direct message warning again (#7546)	2018-05-19 18:37:33 +02:00
Eugen Rochko	93c66f0c03	In footer, replace text "Mastodon" with logo (#7545)	2018-05-19 16:10:55 +02:00
takayamaki	587da93152	checking http status code with range (#7544)	2018-05-19 14:47:44 +02:00
Eugen Rochko	4b94e9c65e	Improve payload format of Web Push API now that it's open (#7521) ... > Good lord what is happening in there Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload: ```json { "access_token": "...", "preferred_locale": "en", "notification_id": "12345", "notification_type": "follow", "title": "So and so followed you", "body": "This is my bio", "icon": "https://example.com/avatar.png" } ``` The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.	2018-05-19 14:46:47 +02:00
Akihiko Odaki	1951ff41b3	Do not override the default push notification settings (#6037)	2018-05-19 14:45:58 +02:00
bsky	138512d204	Remove outline (#7543)	2018-05-19 12:16:52 +02:00
Eugen Rochko	7871d29aff	Skip pagination logic for pinned account timelines in reducer (#7540) ... Fix #7516	2018-05-19 02:51:29 +02:00
Eugen Rochko	97f02f2c08	Do not raise delivery failure on 4xx errors, increase stoplight threshold (#7541) ... * Do not raise delivery failure on 4xx errors, increase stoplight threshold Stoplight failure threshold from 3 to 10 Status code 429 will raise a failure/get retried * Oops	2018-05-19 00:23:19 +02:00
Thibaut Girka	9d6788b30b	Prevent click on video from opening detailed toot	2018-05-18 17:49:51 +02:00
Thibaut Girka	2154bd1b5a	Widen clickable area of toots	2018-05-18 17:33:58 +02:00
ThibG	625c4f36ef	Merge pull request #490 from glitch-soc/merge-upstream ... Merge with tootsuite @ 57b503d4ef	2018-05-18 17:20:32 +02:00
Eugen Rochko	9422b3e0d8	Fix double-encoding of display name in title and e-mails (#7534)	2018-05-18 15:56:57 +02:00
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	2018-05-18 08:47:10 -05:00
David Yip	023dfa119e	Merge pull request #487 from ThibG/glitch-soc/cleanup ... Remove service worker code that has never been used	2018-05-18 08:37:31 -05:00
Akihiko Odaki	2beeea1e7d	Change Japanese translation for privacy.private.short (#7535) ... The old translation means "hidden," but it is vague in terms that it does not specify the scope status is hidden. The new translation is a literal translation of "Followers-only," without such ambiguity.	2018-05-18 22:30:45 +09:00
David Yip	81e3ec4d61	Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji ... [Glitch] Enable custom emojis in profiles	2018-05-18 07:55:00 -05:00
David Yip	5d823ee00a	Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes ... Port public UI changes from upstream	2018-05-18 07:53:53 -05:00
Eugen Rochko	57b503d4ef	Resolve unknown status from Add activity, skip Remove if unknown (#7526) ... Fix #7518	2018-05-18 11:33:56 +02:00
Eugen Rochko	dafd7afc5e	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	2018-05-18 02:32:35 +02:00
Eugen Rochko	1e02dc8715	Add preference to hide following/followers lists (#7532) ... * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue	2018-05-18 02:26:51 +02:00
Jenkins	4c0770d6c8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-18 00:17:23 +00:00
MIYAGI Hikaru	919eef3098	User agent for WebFinger (#7531) ... * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...	2018-05-18 01:47:22 +02:00
Thibaut Girka	07baa1ddb5	[Glitch] Open video modal on public UI ... Port d9b2f84c92 to glitch-soc	2018-05-17 18:37:00 +02:00
Thibaut Girka	94db024e4c	[Glitch] Combine similar components into one on public UI ... Port f9afd06221 to glitch-soc	2018-05-17 18:37:00 +02:00
Thibaut Girka	dd1d98f9cf	[Glitch] Show card modal on public pages ... Port 16fee0335f to glitch-soc	2018-05-17 18:37:00 +02:00
Thibaut Girka	52b2f18b15	[Glitch] Enable custom emojis in profiles ... Port 61a9018607 to glitch-soc	2018-05-17 15:57:16 +02:00
Thibaut Girka	ca49ad86c6	Remove service worker code that has never been used	2018-05-17 15:39:37 +02:00
Jenkins	2636a23092	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-17 11:17:21 +00:00
Eugen Rochko	7293b9fc61	Ensure unfilled fields are shown when errors are shown (#7523) ... Fix #7486	2018-05-17 13:00:56 +02:00
Eugen Rochko	dfb6907e08	HTTP signatures spec no longer requires algorithms field (#7525) ... Fix #7520	2018-05-17 04:03:28 +02:00
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	2018-05-16 21:52:38 +02:00
ThibG	80aad16e10	Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu ... [Glitch] Feature: Direct message from menu	2018-05-16 20:17:08 +02:00
ThibG	9712d59dda	Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color ... Fix mastodon-light background color of the composer textarea when posting	2018-05-16 20:16:59 +02:00
Thibaut Girka	784712791d	[Glitch] Reword the direct message warning ... Port 53c2164e9c to glitch-soc	2018-05-16 19:45:30 +02:00
Thibaut Girka	97c69de416	[Glitch] Feature: Direct message from Statuses ... Port 904a2479dd to glitch-soc	2018-05-16 19:45:30 +02:00
Thibaut Girka	fb6de5310d	[Glitch] Fix issues with sending direct messages from user profile ... Port 4fd71accd4 to glitch-soc	2018-05-16 19:45:30 +02:00
Thibaut Girka	a5fac975f3	[Glitch] Feature: Direct message from menu ... Port d1f34151ae to glitch-soc	2018-05-16 19:45:30 +02:00
Thibaut Girka	eb9c9855ce	Fix mastodon-light background color of the composer textarea when posting	2018-05-16 19:37:44 +02:00
Evgeny Petrov	5e87c79d25	Russian language for 2.4.0 (#7512) ... * Russian language for 2.4.0 * Russian language for 2.4.0 * bundle exec i18n-tasks normalize * RU: Updated some strings after new commits appeared	2018-05-16 16:25:11 +02:00
Eugen Rochko	2b97451168	Fix images resized in browser getting cropped (#7514) ... Fix #7487	2018-05-16 16:24:16 +02:00
Technowix	4ea376121a	French translation tweaks (#7513) ... - Use more neutral terminology for readability. - Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product". - Some fixes for accounts.	2018-05-16 23:21:48 +09:00
Quentí	f60c1d3989	[l10n] Occitan update (#7505) ... * Update oc.json * Update doorkeeper.oc.yml * Update oc.yml * Update simple_form.oc.yml * Update oc.json Accept is the opp. of reject, I think it's better like this. * bundle exec i18n-tasks normalize	2018-05-16 23:18:32 +09:00
Sylvhem	53c2164e9c	Reword the direct message warning (#7420) ... * Change direct message warning Reword the direct message warning to set proper privacy expectations. * Update the French translation Update the French translation to reflect the changes made to the direct message warning. * Wording update Update the message's wording according to the feedback.	2018-05-16 14:47:11 +02:00
Akihiko Odaki	77cd6b5096	Do not use permitted_for scope when querying pinned statuses (#7510) ... permitted_for scope is slow when combined with pinned status scope. Fortunately permitted_for scope can safely be removed because a pinned status is always public.	2018-05-16 12:30:14 +02:00
Akihiko Odaki	55fd55714a	Raise Mastodon::RaceConditionError if Redis lock failed (#7511) ... An explicit error allows user agents to know the error and Sidekiq to retry.	2018-05-16 12:29:45 +02:00
Akihiko Odaki	65d6b253fb	Let navigator follow redirect instead that handling redirect in fetch (#7500) ... * Let navigator follow redirect instead that handling redirect in fetch * Do not use cache when fetched resource is to redirect	2018-05-16 04:59:44 +02:00
Akihiko Odaki	17c1a62ec8	Consider only-if-cached in FetchEvent valid on non-Mozilla-Firefox browser (#7506)	2018-05-15 21:42:31 +02:00
Akihiko Odaki	4511a10e66	Test if navigator.storage.estimate exists before using it (#7504)	2018-05-15 20:15:08 +02:00
Akihiko Odaki	918cfd3be6	Ignore only-if-cached cache mode on Mozilla Firefox prior to version 60 (#7503)	2018-05-15 20:14:30 +02:00
Marcin Mikołajczak	ff84c18e3d	🌍: 🇵🇱⬆️ (#7494) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-16 01:20:40 +09:00
unarist	d47091eb97	Fix custom emoji handling in UpdateRemoteProfileService (OStatus) (#7501) ... This patch fixes NoMethodError and others in RemoteProfileUpdateWorker.	2018-05-15 16:03:34 +02:00
Renato "Lond" Cerqueira	1f74c1dbcb	Weblate translations 20180515 (#7496) ... * Translated using Weblate (Catalan) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * 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 (Arabic) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Korean) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Dutch) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (French) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Korean) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Slovak) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Translated using Weblate (Esperanto) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (295 of 295 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.3% (623 of 627 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 98.4% (63 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Arabic) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (294 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Italian) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Galician) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 7.8% (5 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 12.5% (8 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovenian) Currently translated at 11.9% (75 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovenian) Currently translated at 14.1% (89 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Japanese) Currently translated at 99.5% (624 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (625 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Remove translations causing issues in arabic Related to #6673	2018-05-15 14:25:07 +02:00
Akihiko Odaki	3705cd8322	Clone response before using when caching web page (#7498)	2018-05-15 14:24:50 +02:00
Thibaut Girka	dfa60cb0a8	Fix modals testing for props.noEsc (fixes #482)	2018-05-15 10:39:12 +02:00
Wiktor	7fe2993b87	Fix account URI when updating ActivityPub account (#7488) ... Updates account `uri` field on each call to `update_account` instead of only once during `create_account` to mirror the same behavior in OStatus `ResolveAccountService` class [0]. ActivityPub accounts are identified using `@username` and `@domain` pair instead of URI since #6842. This fixes #7479: a bug when the account identified by `@username` and `@domain` changes its URI. [0]: 03b69ebc45/app/services/resolve_account_service.rb (L121)	2018-05-14 22:56:45 +02:00
David Yip	939ea456d2	Merge pull request #476 from ThibG/fixes/update-scss ... Change local settings SCSS to be more consistent with modals	2018-05-14 15:04:28 -05:00
Thibaut Girka	971218d1dc	Change local settings SCSS to be more consistent with modals	2018-05-14 21:39:04 +02:00
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
Akihiko Odaki	03b69ebc45	Disallow async function in service worker (#7482) ... offline-plugin depends on webpack.optimize.UglifyJsPlugin, which is an alias of uglifyjs-webpack-plugin v0.4.6. uglifyjs-webpack-plugin v0.4.6 uses uglify-js 2.8.29, which is not compatible with async function.	2018-05-14 19:58:11 +02:00
Yamagishi Kazutoshi	2226d987f9	Add Slovene language (#7475)	2018-05-14 12:52:25 +02:00
abcang	3793e598d0	Call media.present? because media may be nil (#7474)	2018-05-14 12:51:53 +02:00
beatrix	4665965543	Merge pull request #469 from ThibG/glitch-soc/features/glitch-light-theme ... Port Sylvhem's mastodon-light to glitch flavour	2018-05-13 18:57:58 -04:00
Eugen Rochko	416f644505	Fix 404 for GET /api/v1/push/subscription (#7472) ... My bad...	2018-05-13 21:45:18 +02:00
Eugen Rochko	97e43ec5f0	Add GET /api/v1/push/subscription REST API (#7471) ... * Add Api::V1::Push::SubscriptionsController#show * Add to routes	2018-05-13 21:07:31 +02:00
Eugen Rochko	f31e58af9e	Fix nil error in StatusFilter (#7470) ... Fix #7462	2018-05-13 20:26:30 +02:00
Akihiko Odaki	f1ed855f96	Test if navigator.storage is present before using it (#7460)	2018-05-13 13:48:32 +02:00
Yamagishi Kazutoshi	d9b2f84c92	Open video modal on public UI (#7469)	2018-05-13 13:48:14 +02:00
ThibG	685cf5599f	Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape ... Fix glitch-style bio fields incorrect HTML escaping in public profiles	2018-05-12 17:53:01 +02:00
Thibaut Girka	cc8d81519e	Fix glitch-style bio fields incorrect HTML escaping in public profiles	2018-05-12 17:45:30 +02:00
ThibG	0f2fbf7d05	Improvements to toots display in admin view (#7452) ... * Distinguish boosts from original statuses in the admin panel (fixes #7449) * Show the “show more” button in admin view to make CWs clearer (fixes #7451) * Make content warnings swag	2018-05-12 17:44:15 +02:00
ThibG	7467361d70	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459) ... When an ActivityPub Announce is processed and the boosted toot is not known, fetch it on behalf of one of the booster's followers. This is to allow fetching self-boosts of previously-unknown private toots. If fetching on behalf of a user fails, try fetching it anonymously: the selected follower of a boosting user may be banned by the boosted toot's author.	2018-05-12 16:48:32 +02:00
Yamagishi Kazutoshi	f9afd06221	Combine similar components into one on public UI (#7458)	2018-05-12 15:30:06 +02:00
ThibG	bd4decb7db	Merge pull request #479 from ThibG/glitch-soc/fixes/modal-root-keyup ... Fix root modal's keyup handling (Fixes #478)	2018-05-11 23:04:12 +02:00
Thibaut Girka	769a48495c	Fix root modal's keyup handling (Fixes #478)	2018-05-11 22:42:32 +02:00
ThibG	da8897aaef	Merge pull request #477 from ThibG/glitch-soc/merge ... Merge upstream changes	2018-05-11 20:34:19 +02:00
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	2018-05-11 18:12:42 +02:00
ThibG	e7ed61917b	Merge pull request #475 from ThibG/fixes/update-scss ... Update SCSS from upstream	2018-05-11 16:51:14 +02:00
Thibaut Girka	6284039832	[Glitch] Fix contact info styling on landing page	2018-05-11 16:05:47 +02:00
Thibaut Girka	f2e5ed6841	Update SCSS for tables	2018-05-11 14:48:19 +02:00
Thibaut Girka	8860f14ef0	Update SCSS for statuses public view	2018-05-11 14:43:26 +02:00
Thibaut Girka	4a1040c4cb	[Glitch] Adjust RTL styles for landing page ... Port 8bf3e750ab to glitch-soc	2018-05-11 14:34:23 +02:00
Thibaut Girka	e8644f3a4b	Update forms SCSS from upstream	2018-05-11 14:31:18 +02:00
Thibaut Girka	4cd65fe074	Update SCSS to match “Show card modal on public pages”	2018-05-11 14:20:46 +02:00
Thibaut Girka	1a4d735b1d	Update SCSS for about/landing page	2018-05-11 14:18:52 +02:00
Thibaut Girka	db73c0bc5d	Update admin page SCSS from upstream	2018-05-11 14:13:59 +02:00
ThibG	352bae8c3e	Update session activation time (fixes #5605) (#7408)	2018-05-11 13:20:58 +02:00
ThibG	b241cb2704	Change wording of the “undo” media upload button (fixes #6857) (#7417)	2018-05-11 13:20:31 +02:00
ThibG	be7eeb7856	Catch Paperclip processing failures (fixes #6378) (#7439)	2018-05-11 13:14:50 +02:00
Shuhei Kitagawa	50491e0d92	Add tests for invites controller (#7441) ... * Add tests for invites controller * Small refactoring and fix for invites controller	2018-05-11 13:14:33 +02:00
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445) ... - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	2018-05-11 11:49:12 +02:00
Yamagishi Kazutoshi	9a794067f7	Weblate translations (2018-05-10) (#7438) ... * Translated using Weblate (Arabic) Currently translated at 83.6% (523 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.5% (622 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (French) Currently translated at 99.6% (623 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Korean) Currently translated at 99.8% (624 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Catalan) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/ * Translated using Weblate (Finnish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 99.6% (293 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 96.7% (60 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 97.9% (612 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 90.8% (568 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ in overeestemming met andere vertalingen * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.2% (620 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.6% (623 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 98.3% (61 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 99.2% (620 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.2% (620 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 99.8% (624 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Russian) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/ * Translated using Weblate (Russian) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/ I’m not sure this is the best translation for custom fields, something like «Характеристика» might work better; hopefully someone will review this for second opinions * Translated using Weblate (Persian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 99.6% (623 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 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% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Russian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.3% (621 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (64 of 64 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.2% (621 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Japanese) Currently translated at 92.1% (59 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Corsican) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 99.8% (624 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/co/ * Translated using Weblate (French) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Arabic) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 90.8% (569 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 95.2% (596 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Japanese) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Finnish) Currently translated at 99.6% (293 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Persian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (German) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Added translation using Weblate (Slovenian) * Translated using Weblate (Slovenian) Currently translated at 5.7% (36 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Added translation using Weblate (Slovenian) * Translated using Weblate (Slovenian) Currently translated at 1.3% (4 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (French) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.8% (187 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.8% (187 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.0% (188 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.0% (188 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.1% (189 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.3% (190 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.5% (191 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.5% (191 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.6% (192 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 33.7% (211 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-05-10 14:48:26 +02:00
Yamagishi Kazutoshi	bd5f57cbc3	Strip tags from og:description on public tag page (#7437)	2018-05-10 14:38:40 +02:00
Yamagishi Kazutoshi	0a7e8320b2	Add alternate for RSS (#7436)	2018-05-10 14:38:19 +02:00
Yamagishi Kazutoshi	6588f6a0a9	Disable inflate gzip on head method (#7432)	2018-05-10 14:36:12 +02:00
Thibaut Girka	f6ec8c4821	[Glitch] Use plaintext value for field value tooltips in web UI ... Port d185f3ddaf to glitch-soc This doesn't change anything for glitch-style fields, but those will go away eventually	2018-05-10 14:11:23 +02:00
Thibaut Girka	5d8052e715	Add bot badge to account headers in the WebUI	2018-05-10 00:05:08 +02:00
Thibaut Girka	2f01935cba	Adapt account fields rendering code in the WebUI to match upstream	2018-05-10 00:03:34 +02:00
Thibaut Girka	30bb530c70	Update glitch-soc style to match new bio fields markup	2018-05-10 00:03:34 +02:00
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi	edf882320a	Support gzip encoding on Request (#7425)	2018-05-09 16:59:39 +02:00
Yamagishi Kazutoshi	16fee0335f	Show card modal on public pages (#7428)	2018-05-09 16:22:52 +02:00
Yamagishi Kazutoshi	6832110af4	Correct rotate of image using EXIF (#7422)	2018-05-09 08:41:07 +02:00
Yamagishi Kazutoshi	d2ee48977c	Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424)	2018-05-09 08:39:08 +02:00
David Yip	143878d9da	Merge remote-tracking branch 'glitchsoc/master' into gs-master	2018-05-08 09:43:33 -05:00
Yamagishi Kazutoshi	e0b1e17bd0	Show media modal on public timeline (#7413)	2018-05-08 13:33:09 +02:00
Surinna Curtis	01dfd6dbc8	Take the first recognized actor_type. (#7410)	2018-05-08 13:30:04 +02:00
ThibG	b1938d7853	Do not crash in getStatusIds when there is a gap in the timeline (fixes #7400) (#7415) ... Fixes a crash occurring when the “gap” disconnection indicator is to be displayed in a filtered timeline.	2018-05-08 13:28:55 +02:00
Spencer Alves	f2ff167c1a	Add an extra icon to indicate that a status is part of a conversation	2018-05-07 22:10:34 -07:00
ThibG	993e68a7dd	Fix hashtags not being federated on mentions (fixes #6900) (#7406)	2018-05-08 03:36:59 +02:00
Thibaut Girka	8f3402b1f0	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
beatrix	919e2098cb	Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements ... Various improvements to the reports modal	2018-05-07 09:45:13 -04:00
Thibaut Girka	658ac4396c	Hide media in report modal regardless of whether they are marked sensitive ... The rationale behind this is that if the user wants to report violent media, they might not want to see it repeatedly. The “sensitive” property is still kept, displaying different messages for hidden media depending on whether they are marked as sensitive.	2018-05-07 15:00:55 +02:00
Thibaut Girka	6b94237810	[Glitch] Allow report modal to be up to 80% of viewport height ... Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc	2018-05-07 14:59:22 +02:00
Thibaut Girka	7972464e71	[Glitch] Also display replies in report modal ... Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc	2018-05-07 14:55:16 +02:00
Eugen Rochko	6208ea5a53	If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398) ... * If an OStatus message contains nsfw hashtag, mark it as sensitive Undo parts of #7048 * Put nsfw hashtag on OStatus messages if they have any media * Fix code style issues	2018-05-07 14:49:13 +02:00
Thibaut Girka	ffdb85f859	Fix color of disabled boost buttons (fixes #466)	2018-05-07 13:37:29 +02:00
Eugen Rochko	42cd363542	Bot nameplates (#7391) ... * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	2018-05-07 09:31:07 +02:00
Eugen Rochko	0f0cc3f2eb	Support explicitly supplying language code for status via REST API (#7389)	2018-05-07 09:30:53 +02:00
Eugen Rochko	d185f3ddaf	Use plaintext value for field value tooltips in web UI (#7388) ... Fix #7383	2018-05-07 09:30:38 +02:00
abcang	db012b57c2	Fix distribute_add_activity and distribute_remove_activity (#7393)	2018-05-07 09:30:18 +02:00
Eugen Rochko	95595ccd21	Add Corsican localization (#7390) ... * Added Corsican localization * Declaring Corsican localization * Fixed activerecord locale * Added a missing translation and switched to French-style apostrophes * Fixed a (predictable) mistake made while bulk-replacing apostrophes * More fixing * i18n-tasks normalize	2018-05-07 01:34:19 +02:00
David Yip	2e25da4da0	Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes ... Glitch soc/rollback scroll changes	2018-05-06 17:39:07 -05:00
ThibG	e06fbc4fcf	Fixes/rollback scroll changes (#7387) ... * Revert "Do not re-position scroll when loading more (inserting items from below) (#7344)" This reverts commit 8c601b54cc. * Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)" This reverts commit 58852695c8.	2018-05-06 22:26:39 +02:00
Thibaut Girka	de7feea30e	Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" ... This reverts commit 553cc28240.	2018-05-06 21:50:33 +02:00
Thibaut Girka	4133f70902	Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" ... This reverts commit 32974a58dc.	2018-05-06 21:50:26 +02:00
Thibaut Girka	1adca9b040	Fix glitch high-contrast skin text colors ... Port from 3c5006ec7f	2018-05-06 21:00:35 +02:00
ThibG	5c7bed6bbc	Various improvements to the report UI (#7342) ... * Also display replies in report modal * Allow report modal to be up to 80% of viewport height * Use narrow no-break space where needed in the French translation	2018-05-06 20:38:17 +02:00
beatrix	331190e5fb	Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility ... Improve accessibility of toot dropdown menu	2018-05-06 12:12:20 -04:00
beatrix	92f192e9b1	Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement ... [Glitch] Place emoji picker top if it is closer to the bottom of the viewport	2018-05-06 11:33:09 -04:00
beatrix	4480cd745f	Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over ... Prevent timeline from moving when cursor is hovering over it	2018-05-06 11:32:56 -04:00
beatrix	06770656eb	Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables ... Add text color variables + minor SCSS fixes + high contrast skin	2018-05-06 11:32:42 -04:00
beatrix	e56639258a	Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes ... Escape regex metachars in keyword mutes	2018-05-06 11:32:22 -04:00
beatrix	35a1a3171f	Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items ... Support upstream bio items / custom account fields	2018-05-06 11:32:05 -04:00
Yamagishi Kazutoshi	e571de29bf	Weblate translations (2018-05-06) (#7381) ... * Translated using Weblate (Dutch) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Greek) Currently translated at 28.2% (177 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Occitan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 98.2% (615 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Occitan) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 97.9% (613 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 28.5% (179 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 28.5% (179 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.0% (182 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.0% (182 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.2% (183 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.7% (186 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.7% (186 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.2% (597 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 97.6% (612 of 627 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.3% (623 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Polish) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 83.7% (525 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Italian) Currently translated at 54.7% (343 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 78.9% (495 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Japanese) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations	2018-05-06 20:19:56 +09:00
Eugen Rochko	61a9018607	Enable custom emojis in profiles (notes, field values, display names) (#7374) ... Follow-up to #6124	2018-05-06 11:48:51 +02:00
Thibaut Girka	65349bc155	Fix color of status icons in glitch-soc high contrast skin	2018-05-06 11:31:05 +02:00
ThibG	af4fb72993	Merge pull request #457 from m4sk1n/glitch-light ... Add a light theme by @Sylvhem	2018-05-06 11:21:26 +02:00
Shuhei Kitagawa	bd10a7e480	Add resend confirmation for admin (#7378) ... * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations	2018-05-06 10:59:03 +02:00
Eugen Rochko	39efc6d533	Add hint about 7 day cooldown for archive takeout (#7375)	2018-05-06 10:53:10 +02:00
Eugen Rochko	b611dbac79	Add contact e-mail hint to 2FA login form (#7376)	2018-05-06 10:52:36 +02:00
Eugen Rochko	2f63d52b92	Fallback to old on-the-fly URI for follows/blocks if no stored URI (#7371) ... Fix #7367	2018-05-05 23:07:51 +02:00
Eugen Rochko	c7d1a2e400	Improve admin UI for accounts (#7360) ... * Improve design of account statuses admin UI (consistent with reports) * Make account moderation notes look consistent with report notes * i18n-tasks remove-unused * Fix code style issues * Fix tests	2018-05-05 23:06:29 +02:00
Eugen Rochko	660db468c0	Do not count search route as compose being mounted in web UI (#7372) ... Fix #7144	2018-05-05 23:05:43 +02:00
Thibaut Girka	2d065ceaf6	minor fix	2018-05-05 22:38:15 +02:00
Thibaut Girka	f7a076eded	[Glitch] Add high-contrast theme	2018-05-05 22:33:02 +02:00
Thibaut Girka	caebf69e77	Move attachment-lists out of lists.scss	2018-05-05 22:33:02 +02:00
Thibaut Girka	bd3b9bf7b9	[Glitch] Fix text color in "show more" link inside boost confirmation modal ... Port ba917e15f6 to glitch-soc	2018-05-05 22:33:02 +02:00
Thibaut Girka	983328376b	Fix link colors in report modal	2018-05-05 22:33:02 +02:00
Thibaut Girka	b3a236637e	[Glitch] Add color variables of texts for better accesibility ... Port 74dae9458d and related to glitch-soc	2018-05-05 22:33:02 +02:00
Eugen Rochko	8da4bf0f90	4 profile fields max, store only 255 characters per name/value (#7348) ... Fix #7303	2018-05-05 21:11:19 +02:00
Eugen Rochko	c947e2e4c5	Fix handling of malformed ActivityPub payloads when URIs are nil (#7370) ... * Fix handling of malformed ActivityPub payloads when URIs are nil * Gracefully handle JSON-LD canonicalization failures	2018-05-05 18:22:34 +02:00
Thibaut Girka	390cfdef2e	[Glitch] Update SCSS of admin and setting pages ... Port the SCSS changes from cb74c0cfe4 to glitch-soc	2018-05-05 17:58:01 +02:00