4616 Commits

Author	SHA1	Message	Date
David Yip	77a92d3260	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: Gemfile.lock	2018-05-04 09:42:31 -05:00
Eugen Rochko	251bbf9728	Show remote reports in admin UI as coming from domain rather than user (#7347) ... Fix #6994	2018-05-04 13:26:25 +02:00
David Yip	c511b0f72a	Merge remote-tracking branch 'glitchsoc/master' into gs-master	2018-05-04 03:47:35 -05:00
David Yip	da70208b45	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-04 03:23:57 -05:00
David Yip	106a5d7b83	Remove unnecessary code from MediaAttachment#set_type_and_extension. ... Well, it seems unnecessary, anyway.	2018-05-04 02:38:04 -05:00
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	2018-05-03 17:23:44 -05:00
ThibG	a24605961a	Fixes/do not override timestamps (#7336) ... * Revert "Fixes/do not override timestamps (#7331)" This reverts commit 581a5c9d29. * Document Snowflake ID corner-case a bit more Snowflake IDs are used for two purposes: making object identifiers harder to guess and ensuring they are in chronological order. For this reason, they are based on the `created_at` attribute of the object. Unfortunately, inserting items with older snowflakes IDs will break the assumption of consumers of the paging APIs that new items will always have a greater identifier than the last seen one. * Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at	2018-05-03 23:02:46 +02:00
ThibG	8c601b54cc	Do not re-position scroll when loading more (inserting items from below) (#7344)	2018-05-03 22:32:05 +02:00
Yamagishi Kazutoshi	7495a3470e	Add el and te (#7332) ... * Add el and te * Add missing locale files	2018-05-03 15:54:10 +02:00
ThibG	581a5c9d29	Fixes/do not override timestamps (#7331) ... * Do not override timestamps for incoming toots * Remove every reference to override_timestamps Statuses are now created with the announced publishing date and are only pushed to timelines if that date is at most 6 hours earlier than the time at which it is processed.	2018-05-03 13:33:08 +02:00
Eugen Rochko	d5fa4fbcd2	Revert "Do not override timestamps for incoming toots" (#7330) ... * Revert "Weblate translations 20180503 (#7325)" This reverts commit dfa6bccb64. * Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)" This reverts commit 58852695c8. * Revert "Add pry-byebug (#7307)" This reverts commit ab773e4d5f. * Revert "Do not override timestamps for incoming toots (#7326)" This reverts commit bd36791832.	2018-05-03 12:32:33 +02:00
Renato "Lond" Cerqueira	dfa6bccb64	Weblate translations 20180503 (#7325) ... * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Slovak) Currently translated at 92.3% (578 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Added translation using Weblate (Greek) * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (75 of 75 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 93.5% (58 of 62 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% (62 of 62 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% (62 of 62 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.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Added translation using Weblate (Greek) * Added translation using Weblate (Malay) * Translated using Weblate (Greek) Currently translated at 0.6% (2 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 1.3% (4 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.0% (6 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.3% (7 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.7% (8 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 3.0% (9 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 4.3% (27 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 4.7% (30 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 4.7% (30 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 5.1% (32 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 5.2% (33 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Swedish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.3% (622 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 23.8% (70 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * 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 (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 94.0% (589 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Added translation using Weblate (Telugu) * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 98.3% (61 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Telugu) Currently translated at 0.3% (2 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/ * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 98.3% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * 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 (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (German) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (German) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Slovak) Currently translated at 95.0% (595 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Greek) Currently translated at 24.1% (71 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 24.1% (71 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * 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 (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 (Italian) Currently translated at 54.6% (342 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * 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 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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/ * 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 (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% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Swedish) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Add back file removed by weblate	2018-05-03 19:12:09 +09:00
ThibG	58852695c8	Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)	2018-05-03 12:09:11 +02:00
ThibG	bd36791832	Do not override timestamps for incoming toots (#7326)	2018-05-03 11:42:52 +02:00
ThibG	ad5d3134e4	Place emoji picker top if it is closer to the bottom of the viewport (fixes #7277) (#7314)	2018-05-03 10:42:18 +02:00
Eugen Rochko	a5293fdf61	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
Eugen Rochko	a3d84e705a	Fix cache_associated no longer working (#7320)	2018-05-03 10:41:41 +02:00
Eugen Rochko	28bd4b9800	Serialize webfinger XML with Ox instead of Nokogiri (#7319) ... 25ms -> 0.5ms	2018-05-02 22:28:46 +02:00
Eugen Rochko	658cbc9425	Improve PostStatusService performance (#7317) ... Offload creation of local notifications to a worker. Remove two redundant SQL queries from ProcessMentionsService, remove n+1 XML/JSON serialization via memoization	2018-05-02 22:10:57 +02:00
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301) ... * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	2018-05-02 18:58:48 +02:00
abcang	71a7cea73f	Keep notification when muting_notifications is true (#7311) ... * Keep notification when muting_notifications is true * Retrun mute object * Fix test	2018-05-02 16:14:51 +02:00
ThibG	d0cdd5cf94	Accept actor object updates from all supported actor types (#7312)	2018-05-02 16:08:16 +02:00
Eugen Rochko	cae933510c	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288) ... Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials	2018-05-02 15:57:37 +02:00
Eugen Rochko	f62539ce5c	Remove most behaviour disparities between blocks and mutes (#7231) ... * Remove most behaviour disparities between blocks and mutes The only differences between block and mute should be: - Mutes can optionally NOT affect notifications - Mutes should not be visible to the muted Fix #7230 Fix #5713 * Do not allow boosting someone you blocked Fix #7248 * Do not allow favouriting someone you blocked * Fix nil error in StatusPolicy	2018-05-02 15:50:20 +02:00
Eugen Rochko	c5dcd7d836	Speed up test suite by not generating RSA keys in test environment (#7296) ... One RSA keypair for all fabricated test accounts is enough	2018-05-02 15:45:24 +02:00
Eugen Rochko	965345316f	Guard against nil URLs in Request class (#7284) ... Fix #7265	2018-05-02 15:44:22 +02:00
Thibaut Girka	70a16d8858	[Glitch] Improve relative timestamps in web UI ... Port 660cb058e1 to glitch-soc flavour	2018-05-02 13:45:40 +02:00
Surinna Curtis	dc786c0cf4	Support Actors/Statuses with multiple types (#7305) ... * Add equals_or_includes_any? helper in JsonLdHelper * Support arrays in JSON-LD type fields for actors/tags/objects. * Spec for resolving accounts with extension types * Style tweaks for codeclimate	2018-05-02 12:40:24 +02:00
Lynx Kotoura	86efccce2a	Fix low-contrasted cancel button of reply indicator (#7300)	2018-05-01 14:02:04 +02:00
David Yip	5f8f481425	Also treat non-whole-word mutes as case-insensitive. #450.	2018-04-30 20:08:22 -05:00
Eugen Rochko	705f1d7bf1	Fix missing updated_at attribute on emoji EntityCache (#7297) ... Just don't try to save space by only selecting few attributes. If anyone is wondering, this is needed because the emoji entity cache is not really only used for entities, it's accessed again to generate Emoji tags in ActivityPub/OStatus, so a lot more properties are used than what is needed in HTML alone...	2018-04-30 22:49:33 +02:00
Yamagishi Kazutoshi	16468bdf1b	[i18n] Occitan update (#7294) ... * Translated new strings + few changes * First update * Almost complet Missing the changes in the privacy policy * Update simple_form.oc.yml * bundle exec i18n-tasks normalize * bundle exec i18n-tasks remove-unused	2018-04-30 13:14:50 +02:00
Eugen Rochko	f62ee1ddb0	Disable API access when login is disabled (#7289)	2018-04-30 09:13:14 +02:00
Eugen Rochko	295e3ef02b	Fix missing domain attribute in EntityCache for emoji (#7290)	2018-04-30 09:12:55 +02:00
Eugen Rochko	54f34d3f2a	Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287) ... Fix #7243	2018-04-30 09:12:36 +02:00
Eugen Rochko	da61352fab	Fix "Show more" URL on paginated threads for remote statuses (#7285) ... * Fix URL of "Show more" link in paginated threads (ancestors side) Increase item limits in threads Fix #7268 * Fix "Show more" link in paginated threads (descendants side)	2018-04-30 01:59:42 +02:00
Thibaut Girka	356d0214c9	Implement tootsuite-style account fields ... glitch-soc-style still in backup, both sharing the same SCSS style	2018-04-29 18:48:45 +02:00
Thibaut Girka	91fb82a4dd	Fix style of account fields form	2018-04-29 18:48:44 +02:00
beatrix	64be38da0c	Merge pull request #448 from m4sk1n/glitch-pl ... 🌍: 🇵🇱⬆️	2018-04-27 10:31:08 -04:00
Marcin Mikołajczak	deb91f5989	🌍: 🇵🇱⬆️ ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-27 14:15:38 +02:00
Eugen Rochko	a872392cd9	Add entity cache (#7271) ... * Add entity cache Use a caching layer for mentions and custom emojis that are dynamically extracted from text. Reduce duplicate text extractions * Fix code style issue	2018-04-27 01:38:10 +02:00
Thibaut Girka	1222e0a381	Use new getDerivedStateFromProps instead of deprecated componentWillReceiveProps ... As we are already using the new getSnapshotBeforeUpdate lifecycle method, we apparently cannot use the deprecated ones at all in this component.	2018-04-27 01:24:55 +02:00
Thibaut Girka	b39f3648a7	Tentative fix for #446	2018-04-27 00:59:36 +02:00
beatrix	f4ed38272b	Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread ... Port the “unfold thread” feature from Mastodon's UI to glitch-soc flavour	2018-04-26 11:34:14 -04:00
beatrix	8f12afb599	Merge pull request #438 from ThibG/glitch-soc/fixes/j-k-hotkeys-pinned ... [Glitch] Fix the hot key (j, k) does not function correctly when ther…	2018-04-26 11:33:48 -04:00
beatrix	1e9fe95e13	Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline ... [Glitch] Do not set emoji as inline-block	2018-04-26 11:33:36 -04:00
beatrix	33691f4920	Merge pull request #440 from ThibG/glitch-soc/fixes/video-fullscreen ... [Glitch] Fix fullscreen video player	2018-04-26 11:33:24 -04:00
Yamagishi Kazutoshi	36b6631c12	Add Basque language support (#7267)	2018-04-26 13:56:45 +02:00
Renato "Lond" Cerqueira	3afdd6a17b	Weblate translations 20180426 (#7266) ... * Translated using Weblate (Swedish) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Slovak) Currently translated at 92.0% (576 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 (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% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Japanese) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.3% (622 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * 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 (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 (Portuguese (Brazil)) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Basque) Currently translated at 32.2% (20 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Arabic) Currently translated at 99.6% (293 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 82.4% (516 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 92.1% (577 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * 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 (Basque) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 92.3% (578 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ https://sustatu.eus/1380226549995 * Translated using Weblate (Catalan) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	2018-04-26 18:58:22 +09:00
Stefan Midjich	fa5b28df8a	Better phrasing in swedish translation (#7263) ... * more sane phrasing in 🇸🇪 translation * another small issue in 🇸🇪 translation * better phrasing in 🇸🇪 translation	2018-04-26 07:36:52 +09:00
MIYAGI Hikaru	f58dcbc981	HTTP proxy support for outgoing request, manage access to hidden service (#7134) ... * Add support for HTTP client proxy * Add access control for darknet Supress error when access to darknet via transparent proxy * Fix the codes pointed out * Lint * Fix an omission + lint * any? -> include? * Change detection method to regexp to avoid test fail	2018-04-25 02:14:49 +02:00
Eugen Rochko	9d4710ed00	Add RSS feeds for end-users (#7259) ... * Add RSS feed for accounts * Add RSS feeds for hashtags * Fix code style issues * Fix code style issues	2018-04-25 02:10:02 +02:00
Una Thompson	62bea7a290	Fix fade being colored wrongly for DMs and upon focus	2018-04-24 11:34:17 -04:00
Renato "Lond" Cerqueira	7681ad8044	Weblate translations (2018-04-24) (#7252) ... * Translated using Weblate (Dutch) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (French) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * 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% (288 of 288 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 (Japanese) Currently translated at 99.6% (287 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (French) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.5% (631 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Korean) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (French) Currently translated at 99.6% (632 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.6% (632 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Japanese) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Translated using Weblate (Galician) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Basque) Currently translated at 0.3% (1 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/eu/ * Translated using Weblate (Basque) Currently translated at 1.6% (1 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ * Translated using Weblate (Basque) Currently translated at 1.3% (1 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 1.6% (1 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Japanese) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * 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 (Japanese) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Slovak) Currently translated at 99.6% (287 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 88.4% (561 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 90.3% (573 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Italian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ * Translated using Weblate (Italian) Currently translated at 3.2% (2 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 32.4% (206 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/it/ * Translated using Weblate (Arabic) Currently translated at 81.3% (516 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Italian) Currently translated at 51.2% (325 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovak) Currently translated at 91.6% (581 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Italian) Currently translated at 51.8% (329 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Normalize translations Ran yarn build:development && i18n-tasks normalize && yarn manage:translations * Remove unused translations Ran i18n-tasks remove-unused	2018-04-24 11:48:11 +02:00
Akihiko Odaki	306267dbd2	Fix ID duplication in timelines (#7251)	2018-04-24 11:47:27 +02:00
Emelia Smith	60b871d56c	Implement the ability for instances to define a list of disallowed hashtags (#7176) ... The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.	2018-04-23 23:52:58 +02:00
Thibaut Girka	240833c023	Fix actions modal on mobile (fixes #441)	2018-04-23 23:18:36 +02:00
Emelia Smith	495303d9b8	Prevent suspended accounts from appearing in AccountSearchService (#7246)	2018-04-23 21:27:18 +02:00
Thibaut Girka	51d276fb98	[Glitch] Fix fullscreen video player ... Port 53b1d88873 to glitch-soc	2018-04-23 20:38:08 +02:00
ThibG	53b1d88873	Fix fullscreen video player (fixes #7244) (#7245)	2018-04-23 20:12:16 +02:00
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148)	2018-04-23 19:27:35 +02:00
Marcin Mikołajczak	3ccca6cece	🌍: Make 🇵🇱 translation more consistent (#7239) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-23 18:49:03 +09:00
Yamagishi Kazutoshi	9613a53cb3	Update dependencies for Ruby (2018-04-23) (#7237) ... * Update annotate to version 2.7.3 * Update aws-sdk-s3 to version 1.9.2 * Update browser to version 2.5.3 * Update capistrano to version 3.10.2 * Update domain_name to version 0.5.20180417 * Update http to version 3.2.0 * Update lograge to version 0.10.0 * Update oj to version 3.5.1 * Update parallel_tests to version 2.21.3 * Update puma to version 3.11.4 * Update rubocop to version 0.55.0 * Update scss_lint to version 0.57.0 * Update simplecov to version 0.16.1 * Update tty-command to version 0.8.0 * Update tty-prompt to version 0.16.0 * Update pkg-config to version 1.3.0 * Update fog-local to version 0.5.0 * Update fog-openstack to version 0.1.25 * Update devise-two-factor to version 3.0.3 * bundle update	2018-04-23 11:29:17 +02:00
Eugen Rochko	7db7d68136	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	2018-04-23 09:16:38 +02:00
Yamagishi Kazutoshi	0758b00bfd	Refactor resizeImage method (#7236) ... - Use URL.createObjectURL (replace from FileReader) - Use HTMLCanvasElement.prototype.toBlob (replace from HTMLCanvasElement.prototype.toDataURL) - Use Promise (replace callback interface)	2018-04-23 09:15:51 +02:00
Eugen Rochko	660cb058e1	Improve relative timestamps in web UI (#7233) ... Use short instead of numeric month, display year when different year E.g.: "Apr 4" instead of "4/4", "Apr 4, 2017" if different year	2018-04-23 00:43:53 +02:00
Eugen Rochko	05fb6f096d	Resize images before upload in web UI to reduce bandwidth (#7223) ... * Resize images before upload in web UI to reduce bandwidth Fix #7218 * Fix issues * Do not resize GIFs in JS	2018-04-23 00:43:36 +02:00
Thibaut Girka	003d114332	[Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. ... Port 23106844a1 to glitch-soc	2018-04-22 23:11:16 +02:00
Thibaut Girka	105ffaef8f	[Glitch] Do not set emoji as inline-block ... Port 597948fb13 to glitch-soc	2018-04-22 22:10:53 +02:00
Eugen Rochko	75c4ab9d12	Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) ... Fix #7011	2018-04-22 22:09:03 +02:00
Thibaut Girka	b383c0688a	[Glitch] Do not overwrite some status attributes in reducer ... Backport 386365090c	2018-04-22 19:19:01 +02:00
Thibaut Girka	64d8d0464d	Add show more/less toggle for entire threads in web UI ... Inspired from b6003afcdb but using component properties instead of redux store for hidden/revealed state.	2018-04-22 19:19:01 +02:00
Thibaut Girka	2888f74c12	Refactor the infamous three-valued boolean into two booleans, trying to simplify the logic	2018-04-22 19:18:15 +02:00
Thibaut Girka	259bc9840b	[Glitch] Fix style of legacy column headers ... Backports daefbd66a6	2018-04-22 19:17:10 +02:00
Thibaut Girka	63d671b18f	[Glitch] Fix button hiding when header title is too long ... Port ffb2b8ef8c to glitch-soc	2018-04-22 19:17:10 +02:00
Thibaut Girka	abf7c5b850	[Glitch] Fix column headers accessibility ... Port 08e4c78e78 to glitch-soc. SCSS fix inspired by 69f13e7bca.	2018-04-22 19:17:10 +02:00
beatrix	06fc278e4c	Merge pull request #432 from ThibG/glitch-soc/features/reblog-private ... Glitchsoc-specific changes to allow boosting own private toots	2018-04-22 12:32:58 -04:00
beatrix	8f1ec48cbe	Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api ... [Glitch] retrieve custom emoji list via API instead of before page load	2018-04-22 12:10:48 -04:00
beatrix	125e8c7f5a	Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior ... Improve ScrollableList behavior	2018-04-22 12:09:52 -04:00
beatrix	cd5728b176	Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video ... Fix video player on toot public views	2018-04-22 12:09:11 -04:00
beatrix	6fb610f865	Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering ... Status filtering fixes from upstream	2018-04-22 12:08:12 -04:00
beatrix	e88ce27855	Merge pull request #435 from ThibG/glitch-soc/features/public-modals ... [Glitch] Show media modal on public pages	2018-04-22 12:07:29 -04:00
Una Thompson	5f9b85a0cf	Add fade and margin to collapsed statuses	2018-04-22 11:34:19 -04:00
Eugen Rochko	4ca2f73b12	Rescue Mastodon::LengthValidationError in Remoteable (#7228) ... Fix #7198 by allowing records with optional attachments to save	2018-04-22 15:42:00 +02:00
Lynx Kotoura	3c5006ec7f	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
ThibG	597948fb13	Do not set emoji as inline-block (fixes #5743) (#7207)	2018-04-22 12:10:37 +02:00
Lynx Kotoura	a4a36d994b	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
Eugen Rochko	bfe26ef67b	Force convert to JPG for preview card thumbnails to avoid animations (#7109) ... * Force convert to JPG for preview card thumbnails to avoid animations Fix #7093 * Conditionally convert to JPG only if original is GIF Coalesce and strip on all formats to ensure no animated APNGs	2018-04-21 21:34:36 +02:00
goofy-bz	1a27f9f46f	one grammar fix (#7212)	2018-04-22 03:07:25 +09:00
unarist	84214b864c	Ignore keyevents during text composition (#7205) ... KeyboardEvent.key may be physical key name (Escape, Tab, etc.) even in text composition and it causes hotkeys or suggestion selection. So we need to check e.which or e.isComposing. Checking e.which also allows us to avoid Esc key on compositionend in Safari.	2018-04-20 18:36:52 +02:00
Yamagishi Kazutoshi	87e3f0a41d	Fix spec for sr-Latn (#7203)	2018-04-20 18:14:31 +02:00
TakesxiSximada	23106844a1	Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. (#7202) ... * Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. * Fix typo * Add custom attribute prefix	2018-04-20 18:14:21 +02:00
Thibaut Girka	e4dff10934	Fix video player on toot public views	2018-04-20 16:08:46 +02:00
Thibaut Girka	7a68079b3f	[Glitch] Show media modal on public pages ... Port ff7941e652 to glitch-soc	2018-04-20 15:58:36 +02:00
mayaeh	ee2e0f694a	Fix #6157: boosting own private toots (#7200) ... * Fix boosting own private toots. * Run yarn manage:translations and update Japanese translations.	2018-04-20 14:58:33 +02:00
unarist	4e35ce8269	Fix Esc hotkey behavior (#7199) ... This fixes following cases which causes hotkey action accidentally: * hitting Esc key to cancel text composition (mostly in CJK) Although events on cancelling composition are still heavily browser / input method dependent, but this implementation would covers current UI Events spec and some exceptions. * hitting Esc key to close autocomplete suggestions This PR changes to use keydown event instead of keyup event as well as other hotkeys.	2018-04-20 14:04:16 +02:00
Eugen Rochko	a9c440637c	Improve report layout (#7188) ... * Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue	2018-04-20 02:28:48 +02:00
Yamagishi Kazutoshi	1663368724	Replace preload link tag to Rails helper (#7192)	2018-04-20 02:06:53 +02:00
Jenkins	ed17e173d6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-19 22:17:23 +00:00
beatrix	ca2cbe8f0f	Fix webkit scrollbars (#7191) ... * Revert "Make scroll bars wider (#7060)" This reverts commit 11715454d0. * for real make webkit scrollbar wider	2018-04-19 23:35:47 +02:00
Thibaut Girka	13fa8ec2c7	[Glitch] Fix status filtering in contexts reducer ... Port 1a37d7e252 to glitch-soc	2018-04-19 16:43:02 +02:00
Thibaut Girka	f84b4d90cb	[Glitch] Do not filter the status collection after muting and blocking ... Port fd87e5a53b to glitch-soc	2018-04-19 16:42:27 +02:00
Emelia Smith	b9c35785e2	Reports: Merge contents and comment columns (#7189)	2018-04-19 15:39:54 +02:00
Thibaut Girka	694337d9bb	Fix auto-collapsed toots making the TL jump (fixes #417)	2018-04-19 11:30:42 +02:00
Thibaut Girka	931a4d1ebf	Clean up dead code	2018-04-19 11:30:42 +02:00
Thibaut Girka	8f8b71a278	Use React's new lifecycles for scrollable lists	2018-04-19 11:29:37 +02:00
Thibaut Girka	3068384dbc	Glitchsoc-specific changes to allow boosting own private toots	2018-04-19 11:24:29 +02:00
Thibaut Girka	779aa707ec	Only compute height dynamically for standalone media ... This prevents changing the status' height and triggering jumps in the TL	2018-04-19 11:16:18 +02:00
Thibaut Girka	52229405ed	[Glitch] Make detailed status' media gallery standalone	2018-04-19 11:16:18 +02:00
Thibaut Girka	dcc1c10937	[Glitch] Center thumbnails on focus point ... Port the display part of the following commits to glitch-soc: * 90f12f2e5a * b170627ceb * 11697d6894 * 56eb5c3f34	2018-04-19 11:16:18 +02:00
Thibaut Girka	f1e25b672a	Use javascript to set MediaGallery height automatically	2018-04-19 11:16:18 +02:00
Thibaut Girka	a95f8271be	Revert some glitch-specific refactoring ... In order to keep my sanity when porting changes between glitch-soc and upstream.	2018-04-19 11:16:18 +02:00
Thibaut Girka	1822ce89f9	[Glitch] retrieve custom emoji list via API instead of before page load ... Port b08ab329f4 to glitch-soc	2018-04-19 11:12:52 +02:00
Jenkins	d55ab8e3e8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-19 01:17:38 +00:00
Eugen Rochko	ba917e15f6	Fix text color in "show more" link inside boost confirmation modal (#7183)	2018-04-19 02:36:31 +02:00
David Yip	d2b28ea51d	Merge remote-tracking branch 'glitchsoc/master' into gs-master	2018-04-18 19:31:53 -05:00
David Yip	78c145d3cb	db: make schema.rb version subsume bookmarks migration.	2018-04-18 19:08:35 -05:00
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	2018-04-18 18:48:12 -05:00
Eugen Rochko	ff87d1bc3e	Rescue SSL errors when processing mentions, remove useless line (#7184)	2018-04-19 00:53:31 +02:00
Marcin Mikołajczak	1957209efd	i18n: Update Polish translation (#7181) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-19 00:14:21 +09:00
Lynx Kotoura	74dae9458d	Add color variables of texts for better accesibility (#7125) ... * Add variables for text colors * Change variables in sass files * Apply text color variables for recently added colors * Fix text colors of emoji mart anchors * Fix text colors of search__input * Fix text colors of text area of compose-form * Fix icon colors of privacy dropdown and modal * Inverted icon colors by classname * Change variables in boost.scss * Change action-button-color * Fix text colors of pre-header	2018-04-18 16:52:15 +02:00
abcang	0ba49eca8b	Fix comparing id (#7180)	2018-04-18 16:50:19 +02:00
Marcin Mikołajczak	7162a28c34	Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-18 13:15:57 +02:00
Kaito Sinclaire	156b916caf	Direct messages column (#4514) ... * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	2018-04-18 13:09:06 +02:00
luzi82	aedfea3554	zh-HK translation (#7177) ... * zh-HK translation * zh-HK fix * zh-HK translation * add missing zh-HK translate * fix translate * i18n-tasks normalize	2018-04-18 14:28:26 +09:00
Neil Moore	fad7b9f5f2	Adds keyboard hotkey for revealing/hiding statuses (#7173) ... Resolves #5550	2018-04-18 03:33:59 +02:00
ThibG	e5dd385431	Allow boosting own private toots (#6157) ... * Adjust policy to allow boosting own private toots * Add ability to reblog private toots from dropdown menu	2018-04-17 23:35:45 +02:00
Sam Schlinkert	11715454d0	Make scroll bars wider (#7060) ... * Set scrollbars to 12 px wide rather than 8px Should overwrite the setting in reset.scss. This is untested at this point. * removes scrollbar height and width specifications from reset.scss and basics.scss	2018-04-17 23:25:54 +02:00
abcang	897199910f	Improve web api protect (#6343)	2018-04-17 15:23:46 +02:00
Emelia Smith	204d72fbe4	Feature: add count of account notes to reports (#7130) ... * Reports: Colocate account details with reports * Reports: Add count of account moderation notes Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.	2018-04-17 14:58:11 +02:00
Jennifer Kruse	ef12a2b74c	Able to deactivate invites if they aren't expired (#7163)	2018-04-17 13:52:08 +02:00
Eugen Rochko	07a7d5959c	Fix missing "Administered by" when timeline preview disabled (#7161)	2018-04-17 13:51:14 +02:00
Eugen Rochko	aab5581c43	Set Referrer-Policy to origin in web UI and public pages of private toots (#7162) ... Fix #7115	2018-04-17 13:51:01 +02:00
Eugen Rochko	bb58fc003b	Fix warning about using SQL in order for Account#partitioned (#7159)	2018-04-17 13:50:48 +02:00
abcang	727917e91e	Fix caret position after inserting emoji (#7167)	2018-04-17 13:50:33 +02:00
ThibG	21837b291e	Merge pull request #430 from ThibG/glitch-soc/features/bookmarks ... Fix the bookmark column pinning fix…	2018-04-17 11:46:31 +02:00
Thibaut Girka	1aac83ef47	Fix the bookmark column pinning fix…	2018-04-17 11:24:07 +02:00
Remi Rampin	3c722fe687	Update French javascript locale file (#7165) ... Match config/locales/fr.yml: "private" was changed to "followers-only" by 501514960a.	2018-04-17 11:37:51 +09:00
ThibG	84d0aa7b26	Merge pull request #429 from ThibG/glitch-soc/features/bookmarks ... Fix pinning the bookmarks column (fixes #428)	2018-04-16 23:24:51 +02:00
Thibaut Girka	54f5170f59	Fix pinning the bookmarks column (fixes #428)	2018-04-16 22:52:45 +02:00
David Yip	f879672554	Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements ... Backport a few MediaGallery/Video changes from upstream (fixes #423)	2018-04-16 14:41:36 -05:00
David Yip	1076204eb4	Merge pull request #425 from ThibG/glitch-soc/fixes/gifv-modal-size ... Fix extended video player (gifv) modal size	2018-04-16 14:41:18 -05:00
ThibG	7e0aed398f	Fix scrolling behavior (#7151) ... * Update React.JS * Use React's new lifecycles for scrollable lists * Clean up dead code * Make CodeClimate happy	2018-04-16 21:04:24 +02:00
ThibG	1c379b7ef4	Remove extra spaces from search API queries and public account headers (fixes #7129) (#7152)	2018-04-16 17:19:04 +02:00
Akihiko Odaki	1a37d7e252	Fix status filtering in contexts reducer (#7149)	2018-04-16 11:34:34 +02:00
Akihiko Odaki	a1049e9380	Redirect to account status page for page of status stream entry (#7104) ... Commit 519119f657 missed a change for stream entry page. Instead of duplicating the change, redirect to account status page. It would also help crawlers (of search engines, for example) to understand a stream entry URL and its corresponding status URL points to the same page.	2018-04-16 10:04:31 +02:00
Yamagishi Kazutoshi	7c43ed04fe	Weblate translations (2018-04-15) (#7141) ... * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * 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% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * 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 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * 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 (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 88.0% (517 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Spanish) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Finnish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 25.8% (152 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Finnish) Currently translated at 25.8% (152 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Finnish) Currently translated at 33.0% (194 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Finnish) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Slovak) Currently translated at 95.5% (561 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Galician) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * yarn manage:translations	2018-04-15 16:56:03 +02:00
YMHuang	9f5ae7c2e8	Add and revise Traditional Chinese (zh-TW) translation for serveral strings (#7002) ... * Translation: add and revise Traditional Chinese translation for serveral strings * Translation: polish zh-TW locale * Translation: polish zh-TW locale	2018-04-15 14:00:32 +02:00
Marcin Mikołajczak	fa04945365	Change icon for domain blocks (#7139) ... * Change icon for domain blocks Both domain blocks and user blocks uses the same icon… * Update index.js	2018-04-15 13:58:47 +02:00
Marcin Mikołajczak	fed0b5ed04	i18n: Update Polish translation (#7131) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-15 14:12:41 +09:00
Thibaut Girka	5cc7c4b920	Fix extended video player (gifv) modal size ... It was currently full-size	2018-04-14 21:47:56 +02:00
Thibaut Girka	5d96c5ac41	[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI ... Port the video-player part of 036dd98abb to glitch-soc. MediaGallery part ignored since it has diverged quite a bit. This fixes #423	2018-04-14 17:35:45 +02:00
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb	2018-04-14 09:12:50 -05:00
Eugen Rochko	78ed4ab75f	Add bio fields (#6645) ... * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	2018-04-14 12:41:08 +02:00
Thibaut Girka	c5dd4ed1d5	[Glitch] Fix media button type ... Port ecdac9017e to glitch-soc	2018-04-14 12:30:55 +02:00
Thibaut Girka	dfe8abb8cd	[Glitch] Handle preference to always display sensitive media ... Port the UI part of 76f3d5d16b to glitch-soc	2018-04-14 12:27:14 +02:00
Jenkins	e3d0d72b29	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-14 09:17:23 +00:00
David Yip	d66192f21c	Merge remote-tracking branch 'glitchsoc/master' into gs-master ... Conflicts: db/schema.rb	2018-04-14 03:50:31 -05:00
imncls	dd4ad6300b	Add missing Japanese translation	2018-04-14 07:53:56 +09:00
David Yip	b7804028c2	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks ... Bookmarks	2018-04-13 16:38:15 -05:00
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock config/application.rb	2018-04-13 16:36:46 -05:00
mayaeh	85ab30abf7	i18n: Add Japanese translations for privacy policy and more (#7049) ... * Update Japanese translations. * Update Japanese translations. * Update Japanese translations. * Update Japanese translations. * Add Japanese translations for #6984, #7040, #7072. Update Japanese translations for privacy policy. * Add Japanese translations for #7032, #7074, #7089. * Proofreading Japanese translations for privacy policy.	2018-04-13 20:11:26 +09:00
Eugen Rochko	778562c223	Ensure SynchronizeFeaturedCollectionWorker is unique and clean up (#7043) ... * Ensure SynchronizeFeaturedCollectionWorker is unique and clean up Fix #7041 * Fix code style issue	2018-04-13 01:27:22 +02:00
Eugen Rochko	9e45b051cf	When notification type filtered, ignore live updates for it (#7101) ... Fix #5625	2018-04-13 01:20:04 +02:00
Renato "Lond" Cerqueira	14d86eb0d0	Allow more than the max pins if account is not local (#7105) ... Sidekiq sometimes throws errors for users that have more pinned items than the allowed by the local instance. It should only validate the number of pins for local accounts.	2018-04-12 20:36:02 +02:00
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' ... Conflicts: app/controllers/statuses_controller.rb	2018-04-12 03:30:57 -05:00
David Yip	eb72c3398c	Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns ... Place composer dropdown menus top if they are closer to the bottom of the viewport	2018-04-12 03:28:22 -05:00
David Yip	0b326950bf	Merge pull request #416 from ThibG/glitch-soc/features/media-modal ... Port various media modal improvements to glitch-soc	2018-04-12 00:20:19 -05:00
Thibaut Girka	acb434b0c9	Add glitch-soc front-end support for bookmarks ... Unlike boosts and like, there is no confirmation dialog as misclicking can be recovered without another user seeing it.	2018-04-11 21:05:34 +02:00
ThibG	12f5f13fab	Place privacy dropdown menu top if it is closer to the bottom of the viewport (#7106)	2018-04-11 20:42:50 +02:00
Thibaut Girka	50eb8f1f61	Add backend support for bookmarks ... Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.	2018-04-11 20:40:29 +02:00
Thibaut Girka	043a699990	Update glitch-soc style to match changes to reports UI ... Port style changes from d9b62e34da	2018-04-11 19:15:42 +02:00
Akihiko Odaki	519119f657	Paginate ancestor statuses in public page (#7102) ... This also limits the statuses returned by API, but pagination is not implemented in Web API yet. I still expect it brings user experience better than making a user wait to fetch all ancestor statuses and flooding the column with them.	2018-04-11 12:35:09 +02:00
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-11 00:50:09 +00:00
Thibaut Girka	e74e5c7eb9	Place composer dropdown menus top if they are closer to the bottom of the viewport	2018-04-10 20:52:31 +02:00
Emelia Smith	d9b62e34da	Feature: Improve reports ui (#7032) ... * Further improvements to Reports UI - Clean up notes display - Clean up add new note form - Simplify controller - Allow reopening a report with a note - Show created at date for reports - Fix report details table formatting * Show history of report using Admin::ActionLog beneath the report * Fix incorrect log message when reopening a report * Implement fetching of all ActionLog items that could be related to the report * Ensure adding a report_note updates the report's updated_at * Limit Report History to actions that happened between the report being created and the report being resolved * Fix linting issues * Improve report history builder Thanks @gargron for the improvements	2018-04-10 20:27:59 +02:00
Eugen Rochko	45c9f16f71	Improve load gap styling in web UI (#7100)	2018-04-10 17:12:10 +02:00
Paul Woolcock	8f800ad691	Change custom emoji search to ILIKE instead of = (#7099)	2018-04-10 15:46:27 +02:00
Emelia Smith	219a4423d8	Feature: Allow staff to change user emails (#7074) ... * Admin: Show unconfirmed email address on account page * Admin: Allow staff to change user email addresses * ActionLog: On change_email, log current email address and new unconfirmed email address	2018-04-10 09:16:06 +02:00
MIYAGI Hikaru	e6e93ecd8a	Fix GIFV encoding params (#7098) ... - Explicitly specify video codec. When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec. - Swap avarage bitrate and max bitrate.	2018-04-10 09:11:55 +02:00
Renato "Lond" Cerqueira	0c52654b52	When creating status, if no sensitive status is given, use default (#7057) ... Clients using the API that do not provide the sensitive flag are always posting with false sensitive option.	2018-04-09 23:02:42 +02:00
Emelia Smith	904a2479dd	Feature: Direct message from Statuses (#7089) ... * Fix: Switching between composing direct message and mention from menus Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that. * Fix: Add missing proptype check for onMention in Status component * Add the ability to send a direct message to a user from the menu on Statuses * Add space between "Embed" and "Mention" on expanded statuses menu	2018-04-09 17:09:11 +02:00
Marcin Mikołajczak	07d90b0414	i18n: Update Polish translation (#7085) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-09 17:28:53 +09:00
Akihiko Odaki	498327b2e3	Exclude status itself from context query (#7083) ... ancestor_statuses and descendant_statuses used to include the root status itself, but the behavior is confusing because the root status is not an ancestor nor descendant.	2018-04-09 09:58:53 +02:00
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	2018-04-08 19:05:02 -05:00
Thibaut Girka	9073687f66	[Glitch] Fix video player height ... Port 31e7b73084 to glitch-soc	2018-04-09 01:08:51 +02:00
Thibaut Girka	101e6564fd	[Glitch] Refactor scss ... Port f691afaae9 to glitch-soc	2018-04-09 01:08:50 +02:00
Thibaut Girka	0fb5ea5d15	Fix video modal	2018-04-09 00:11:10 +02:00
Thibaut Girka	a4fa8c9064	[Glitch] Avoid using JS to set height in MediaModal ... Port fa5c867e0e to glitch-soc	2018-04-08 23:18:24 +02:00
Thibaut Girka	87071d9e81	[Glitch] Improved media modal ... Port 4e929b2d17 to glitch-soc	2018-04-08 23:15:25 +02:00
Thibaut Girka	0b86ec4e7f	[Glitch] Allow to open a modal for embedded photo ... Port bf7757cbbc to glitch-soc	2018-04-08 23:06:33 +02:00
Emelia Smith	0893b16695	Hide search from Compose on mobile devices (#7077) ... * Hide search from Compose on mobile devices We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile. * Don't "showSearch" on mobile if we're not currently searching (isSearchPage)	2018-04-08 18:25:08 +02:00
Emelia Smith	c9cbb8de70	Add search item to tab bar for mobile devices (#7072) ... * Add search item to tab bar for mobile devices * Fix missing prop validation	2018-04-08 14:26:58 +02:00
Levi Bard	cd0eaa349c	Enable updating additional account information from user preferences via rest api (#6789) ... * Enable updating additional account information from user preferences via rest api Resolves #6553 * Pacify rubocop * Decoerce incoming settings in UserSettingsDecorator * Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters * Clean up user preferences update * Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence	2018-04-08 13:43:10 +02:00
ThibG	1364e9e4ae	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) ... * Fix follow/unfollow buttons on public profile - Present non-logged users with web+mastodon:// URLs for remote accounts - Present logged-in users with appropriate links (authorize_follows and remote_unfollows) for remote accounts * Do not cache rendered cards if user is logged in	2018-04-08 13:40:22 +02:00
Akihiko Odaki	1ed1014546	Free stroage if it is exceeding disk quota (#7061)	2018-04-08 13:32:39 +02:00
Thibaut Girka	a896f601fa	Fix video playback in glitch-soc detailed statuses	2018-04-08 12:22:12 +02:00
Eugen Rochko	d4de2239b0	Add a circuit breaker for ActivityPub deliveries (#7053)	2018-04-07 21:36:58 +02:00
Hisham Muhammad	4a9becfca2	i18n: improve "Welcome" translation in Portuguese (#7068) ... * i18n: update gender-neutral language for pt and pt-BR Instead of using "bem-vindo(a)" (a masculine form of "Welcome" with a "(a)" in the end to mean "bem-vinda" for the feminine form), use "boas-vindas", which is a gender-neutral form of "Welcome"). There is already precedent for using "boas-vindas" in the Brazilian Portuguese localization, in `config/locales/pt-BR.yml`. European Portuguese dictionary Priberam also registers it as a valid form: https://www.priberam.pt/dlpo/boas-vindas * i18n: pt-BR minor orthography fix The form "a bordo" does not take an accent. http://oredator.com.br/curso-de-redacao/uncategorized/a-bordo-ou-a-bordo	2018-04-07 21:36:03 +02:00