tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 09:34:16 -05:00

Author	SHA1	Message	Date
David Yip	2058922cc9	Merge branch 'merge-upstream' into gs-master	2018-05-04 12:04:55 -05:00
Marcin Mikołajczak	a7a61889d7	“Enable” high contrast theme Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-04 17:50:11 +02:00
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
Alda Marteau-Hardi	b65eb00c53	Prevent admins and moderators eavesdropping in private and direct toots (#7067 ) Fix #6986	2018-04-07 21:33:01 +02:00
Eugen Rochko	b5726def55	Forward deletes on the same path as reply forwarding (#7058 ) * Forward deletes on the same path as reply forwarding * Remove trailing whitespace	2018-04-07 18:54:46 +02:00
Harmon	98146281e1	Remove duplicate frequently used emojis (#7064 )	2018-04-07 14:53:11 +02:00
Isatis	b08ab329f4	retrieve custom emoji list via API instead of before page load (#7047 )	2018-04-04 22:25:34 +02:00
Eugen Rochko	f1867a7388	Adjust privacy policy (#6666 ) * Adjust privacy policy to be more specific to Mastodon Fix #6613 * Change data retention of IP addresses from 5 years to 1 year * Add even more information * Remove all (now invalid) translations of the privacy policy * Add information about archive takeout, remove pointless consent section * Emphasis on DM privacy * Improve wording * Add line about data use for moderation purposes	2018-04-04 21:47:39 +02:00
David Yip	3ab6a8b8be	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	2018-04-04 13:56:58 -05:00
David Yip	bda1782cd8	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-04-04 13:55:42 -05:00
beatrix	77b650b69c	Merge pull request #412 from ThibG/glitch-soc/cleanup Remove duplicate message entries (minor code cleanup)	2018-04-04 11:36:54 -04:00
Thibaut Girka	d0e792e231	Update accounts SCSS for public pages	2018-04-04 15:40:59 +02:00
Thibaut Girka	75f2e9fd97	Remove duplicate message entries	2018-04-04 12:19:00 +02:00
Emelia Smith	7a81082704	Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944 )" (#7035 ) Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon. This reverts commit `5021c4e9ca`.	2018-04-04 11:58:15 +02:00
Eugen Rochko	07176fed37	Add contact account to landing page ("Administered by") (#6984 )	2018-04-04 01:11:26 +02:00
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-03 19:17:20 +00:00
Nolan Lawson	6ff3b3e4db	Fix nil account issue in ProcessAccountService (#7019 )	2018-04-03 13:08:11 +02:00
Emelia Smith	2e59751823	Improve require_admin! and require_staff! filters (#7018 ) Previously these returns 302 redirects instead of 403s, which meant posting links to admin pages in slack caused them to unfurl, rather than stay as a link. Additionally, require_admin! doesn't appear to be actively used, on require_staff!	2018-04-03 13:07:32 +02:00
mayaeh	1c293086a1	i18n: Add Japanese translations for #7000 (#7022 ) * run yarn manage:translations. * run i18n-tasks add-missing ja. * Update Japanese translations.	2018-04-03 18:21:33 +09:00
Emelia Smith	e85cffb236	Feature: Report improvements (#6967 ) (#7000 ) * Implement Assignment of Reports (#6967) * Change translation of admin.report.comment.label to "Report Comment" for clarity As we'll soon add the ability for reports to have comments on them, this clarification makes sense. * Implement notes for Reports This enables moderators to leave comments about a report whilst they work on it * Fix display of report moderation notes * Allow reports to be reopened / marked as unresolved * Redirect to reports listing upon resolution of report * Implement "resolve with note" functionality * Add inverse relationship for report notes * Remove additional database querying when loading report notes * Fix tests for reports * Fix localisations for report notes / reports	2018-04-02 22:04:14 +02:00
Thibaut Girka	ca9f022a80	[Glitch] Fix: Prevent submission using same logic as submit button disabling. Port `6a895e1ab3` to glitch-soc	2018-04-02 20:04:18 +02:00
unarist	2c51bc0ca5	Add missing rejection handling for Promises (#7008 ) * Add eslint-plugin-promise to detect uncaught rejections * Move alert generation for errors to actions/alert * Add missing rejection handling for Promises * Use catch() instead of onReject on then() Then it will catches rejection from onFulfilled. This detection can be disabled by `allowThen` option, though.	2018-04-02 14:51:02 +02:00
Emelia Smith	e7a1716701	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 )	2018-04-02 13:45:07 +02:00
Emelia Smith	4fd71accd4	Fix issues with sending direct messages from user profile (#6999 ) * Clear compose textarea when starting a new direct message Previous behaviour resulted in potentially misdirected direct messages. * Hide search when starting to compose a direct message	2018-04-02 13:44:19 +02:00
Yamagishi Kazutoshi	3f51c6efaa	Weblate translations (2018-04-02) (#7007 ) * 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/ * bundle exec i18n-tasks normalize && yarn manage:translations * revert	2018-04-02 13:43:30 +02:00
Evgeny Petrov	b04f73ce66	Russian language updated (#7005 ) * Russian language updated * Small fixes for RU language * bundle exec i18n-tasks normalize	2018-04-02 19:49:06 +09:00
luzi82	24611d8deb	i18n: update zh-HK translation (#7004 ) * i18n: update zh-HK translation * i18n: update zh-HK translation * i18n-tasks normalize	2018-04-02 19:11:37 +09:00
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	2018-04-01 20:24:50 -05:00
Eugen Rochko	f890d2a766	Support all ActivityPub actor types (#6997 ) Fix #6973	2018-04-02 02:10:53 +02:00
Eugen Rochko	33513753b9	Fix unpermitted parameters warning when generating pagination URLs (#6995 )	2018-04-02 02:09:50 +02:00
David Underwood	123a343d11	[WIP] Enable custom emoji on account pages and in the sidebar (#6124 ) Federate custom emojis with accounts	2018-04-01 23:55:42 +02:00
Emelia Smith	6a895e1ab3	Fix: Prevent submission using same logic as submit button disabling. (#6993 ) This prevents submission through ctrl/cmd+enter when the submit button is disabled.	2018-04-01 22:19:43 +02:00
Marcin Mikołajczak	929f58f180	i18n: Update Polish translation (#6985 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-01 10:31:38 +02:00
mayaeh	b7d633c1bb	i18n: Add Japanese translations for domain blocks (#6979 ) * run yarn manage:translations * Update Japanese translations for domain blocks.	2018-03-31 21:09:39 +09:00
unarist	fb3dc00dda	Ignore AbortError when cancelled sharing (#6978 ) `navigator.share()` rejects Promise if user cancelled sharing, and it may print it as an error on JavaScript console. This patch ignores it and prints other errors on the console.	2018-03-31 13:16:38 +02:00
Jenkins	f0bb3ff533	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-30 19:17:17 +00:00
beatrix	01bad04efd	Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js Add “public” pack to admin controller, as it is included in upstream …	2018-03-30 14:50:19 -04:00
beatrix	3304cb681d	Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui Port #6628 to glitch-soc flavour	2018-03-30 14:50:02 -04:00
David Yip	257146c960	Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes Backport dropdown menu fixes from Mastodon	2018-03-30 11:29:26 -05:00
Thibaut Girka	b305e7452a	Add “public” pack to admin controller, as it is included in upstream admin layout Fixes CW unfolding in moderation	2018-03-30 18:16:47 +02:00
ThibG	e573bb0990	Fix compatibility with PeerTube (#6968 ) * Support fetching objects of convertible types by URL (fixes #6924) * Ignore invalid hashtags	2018-03-30 15:44:54 +02:00
Thibaut Girka	167a2ecde0	Fix migration page style	2018-03-30 15:26:12 +02:00
Thibaut Girka	48bcf4d6e8	[Glitch] Remove pointer events on the entire UI when a dropdown menu is open Port `913a38111f` to glitch-soc	2018-03-30 12:45:23 +02:00
ThibG	a6c129ddbd	Add some UI for user-defined domain blocks (#6628 ) * Keep list of blocked domains Might be overkill, but I'm trying to follow the same logic as for blocked users * Add basic domain block UI * Add the domain blocks UI to Getting Started * Fix undefined URL in `fetchDomainBlocks` * Update all known users' domain_blocking relationship instead of just one's	2018-03-30 12:38:00 +02:00
Thibaut Girka	2871a82fcc	[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport Port `f6a8d835d3` to glitch-soc	2018-03-30 12:31:29 +02:00
Thibaut Girka	218cc261d1	Add the domain blocks UI to Getting Started Misc	2018-03-30 10:07:33 +02:00
Thibaut Girka	afa813d71f	Add basic domain block UI	2018-03-30 10:07:33 +02:00
Thibaut Girka	482ad7d7c4	Keep list of blocked domains Might be overkill, but I'm trying to follow the same logic as for blocked users	2018-03-30 10:07:33 +02:00
Thibaut Girka	79da0ad7a2	Update all known users' domain_blocking relationship instead of just one's	2018-03-30 10:07:33 +02:00
Thibaut Girka	937ace10d9	Fix undefined URL in `fetchDomainBlocks`	2018-03-30 10:07:33 +02:00
takayamaki	947eedcab2	update ja locale (#6965 ) related https://github.com/tootsuite/mastodon/pull/6956	2018-03-30 10:04:04 +09:00
Emelia Smith	d1f34151ae	Feature: Direct message from menu (#6956 ) * Implement ability to send direct messages from the user menu * Implement message warning users that direct messages are visible to all mentioned users * Update locales	2018-03-29 19:08:34 +02:00
Thibaut Girka	b5948044b3	[Glitch] Display unfollow button even if account moved Backport `3987bd18a4` to glitch-soc	2018-03-29 14:59:20 +02:00
Thibaut Girka	a59c146bf8	[Glitch] Profile redirect notes Port WebUI changes from `58cede4808`	2018-03-29 14:59:20 +02:00
unarist	f1f846045f	Fix ReferenceError when Cache API is missing (#6953 ) Cache API is not supported on Safari 11.0 / iOS 11. Since those caching is optional, this patch simply ignores it.	2018-03-29 14:57:02 +02:00
unarist	41452e8302	Fix TypeError on follow notification (#6950 ) `notification.status` may not be present, e.g. follow notification.	2018-03-29 12:59:12 +02:00
ThibG	9ed5eebd7c	Do not ignore unknown media attachments, only skip them (#6948 ) That way, they are displayed in a list below the corresponding toot.	2018-03-29 00:52:24 +02:00
David Yip	4e45954280	Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents Render toots with empty contents	2018-03-28 16:39:12 -05:00
Thibaut Girka	7db431eac6	Fix attachment lists	2018-03-28 22:19:36 +02:00
Thibaut Girka	53eab4470d	Render toots with empty contents This is necessary to display toots with media but otherwise no contents, as glitch-soc displays the media as a child of StatusContent, unlike Mastodon.	2018-03-28 21:13:45 +02:00
Yuto Tokunaga	5021c4e9ca	Add double-tap zoom functionary to `ZoomableImage` (#6944 ) add <div.zoomable-image__margin/> to keep margin of the image on zooming move setting `scrollLeft` and `scrollTop` of container from callback of `setState` to `componentDidUpdate` add 'hammerjs' package for touch gesture detection rewrite `ZoomableImage` using 'hammerjs'	2018-03-28 20:40:51 +02:00
David Yip	1ed9500b52	Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter Remove ignored 'u' parameter on regexp (#392)	2018-03-27 13:06:28 -05:00
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
Rey Tucker	21b586436e	Remove ignored 'u' parameter on regexp (#392 )	2018-03-27 11:30:49 -04:00
David Yip	f61aa8e0f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb	2018-03-27 10:26:47 -05:00
unarist	3523aa440b	Fix LoadMore on account media gallery (#6933 ) max_id in the fetch request should be a status id, but media attachment id was used.	2018-03-27 16:53:52 +02:00
Thibaut Girka	88790b91de	[Glitch] Display AttachmentList in notifications Port `77406d3a09` to glitch-soc	2018-03-27 16:09:33 +02:00
Thibaut Girka	3bc5452449	[Glitch] Display AttachmentList in timelines in compact style when media missing Port `86a9de6753` to glitch-soc	2018-03-27 16:09:27 +02:00
unarist	f5ed5f3860	Clone response before put it to the cache (#6932 ) `Response.prototype.clone()` must be called before the response used. This fixes an error from ServiceWorker and failing to load image when the image is not cached.	2018-03-27 15:18:35 +02:00
unarist	2f3ac14a43	Add missing null handling in notification reducer (#6930 ) This patch adds null item (i.e. gap) handling on below functions to avoid TypeError. * `filterNotifications` called on user mute/block * `deleteByStatus` called on status deletion	2018-03-27 13:05:59 +02:00
Akihiko Odaki	ca42f9b0eb	Cache media (#6902 )	2018-03-27 12:32:30 +02:00
Yuto Tokunaga	31e7b73084	fix #6846 (#6914 )	2018-03-27 12:30:28 +02:00
Eugen Rochko	2a90da1837	Fix UniqueUsernameValidator comparison (#6926 ) Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3	2018-03-27 04:33:57 +02:00
Akihiko Odaki	40e5d2303b	Validate HTTP response length while receiving (#6891 ) to_s method of HTTP::Response keeps blocking while it receives the whole content, no matter how it is big. This means it may waste time to receive unacceptably large files. It may also consume memory and disk in the process. This solves the inefficency by checking response length while receiving.	2018-03-26 14:02:10 +02:00
Stephen Burgess	18965cb0e6	feat(ShowMore): Add classname to show more/show less button (#6904 )	2018-03-26 13:59:44 +02:00
Yuto Tokunaga	f691afaae9	Refactor scss (#6913 ) * Refactoring scss introduce scss variables for the media modal fix css block structure corresponding to react components fix flex layouts remove background image of the loaded image on the media modal * Fix typo	2018-03-26 13:59:21 +02:00
unarist	605a92b460	Fix moved account handling in IndexedDB feature (#6915 ) * Fix stack overflow on importFetchedAccounts When the account has moved property, it should process destination account instead of source account itself. * Set account id instead of account object for moved property This restores "foo has moved to" indication on account view, and fixes `reblog` index on `accounts` object store.	2018-03-26 12:48:01 +02:00
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
Marcin Mikołajczak	85a395fab6	i18n: Update Polish translation (#6903 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-25 23:33:07 +09:00
Akihiko Odaki	cbf97c03bb	Allow clients to fetch notifications made while they were offline (#6886 )	2018-03-24 22:07:23 +01:00
Akihiko Odaki	9a1a55ce52	Allow clients to fetch statuses made while they were offline (#6876 )	2018-03-24 15:25:15 +01:00
Akihiko Odaki	59657e24b9	Rename variables to have semantic meanings in notifications reducer (#6890 )	2018-03-24 13:36:44 +01:00
Akihiko Odaki	fe398a098e	Store objects to IndexedDB (#6826 )	2018-03-24 13:06:27 +01:00
Akihiko Odaki	ff7941e652	Show media modal on public pages (#6801 )	2018-03-24 12:52:26 +01:00
Marcin Mikołajczak	1c15329cce	Change “Toots with replies” to “Toots and replies” (#6875 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-24 12:51:51 +01:00
Akihiko Odaki	b2a4ffd3a9	Change columns in notifications nonnullable (#6764 )	2018-03-24 12:51:28 +01:00
Akihiko Odaki	fa310695fa	Note if the user is already following the target when authorizing follow (#6325 )	2018-03-24 12:50:41 +01:00
Jeroen	580835ab69	Invites: Add '1 week' as expire option (#6872 ) * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml	2018-03-24 12:50:14 +01:00
Akihiko Odaki	54b273bf99	Close http connection in perform method of Request class (#6889 ) HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.	2018-03-24 12:49:54 +01:00
Akihiko Odaki	4e71b104e6	Internationalize unexpected error message (#6887 )	2018-03-24 10:54:19 +01:00
Yamagishi Kazutoshi	65c10c0bc8	Weblate translations (2018-03-23) (#6874 ) * 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/ * bundle exec i18n-tasks normalize && yarn manage:translations	2018-03-24 01:04:02 +01:00
David Yip	1772034ef2	Merge pull request #398 from ashkitten/compressed-notifs make expanded notifications show like default	2018-03-23 11:57:12 -05:00
Jenkins	03b2f701e7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-23 10:17:18 +00:00
Quentí	ecdc5957a3	[i18n] Occitan update (#6869 ) * Update oc.yml * Update simple_form.oc.yml * Update oc.json * Update oc.yml * bundle exec i18n-tasks normalize	2018-03-23 18:52:25 +09:00
Ash Levy	58eeb92755	expanded notifications show like default	2018-03-22 10:20:36 -04:00
Eugen Rochko	9fe1619db9	Do not re-query mentions from serializers (#6858 ) Fix performance regression from #6836	2018-03-22 11:31:17 +01:00
Eugen Rochko	da70aca28e	Restore username validation to disallow dots, for now (#6863 ) Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.	2018-03-22 11:30:22 +01:00
ThibG	6f531d140b	Fix MENTION_RE to not match nil usernames (#6862 )	2018-03-22 10:45:48 +01:00
Eugen Rochko	f66a786029	Hide floating action button on thread views (#6859 )	2018-03-22 09:33:14 +01:00
Jenkins	6290cd7969	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-21 17:17:20 +00:00
Eugen Rochko	93897134ca	Permit dots in usernames with conditions (#6844 ) * Permit dots in usernames with conditions - Dot cannot be the start or end of username - a.lice and al.ice are considered the same during sign-up * Fix regex mixin flags	2018-03-21 10:26:53 +01:00
Eugen Rochko	9381a7d9d5	Use username/domain to match existing accounts in ActivityPub (#6842 ) See also: #6837, #6667	2018-03-20 14:57:46 +01:00
Thibaut Girka	12b0ea0667	[Glitch] Cancel outdated pending compose suggestions Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour	2018-03-20 14:20:17 +01:00
ThibG	a5c6c748e0	Cancel outdated pending compose suggestions (#6838 )	2018-03-20 12:40:12 +01:00
Rey Tucker	36b5703796	request: in the event of failure, try other IPs (#6761 ) (#6813 ) * request: in the event of failure, try other IPs (#6761) In the case where a name has multiple A/AAAA records, we should try subsequent records instead of immediately failing when we have a failure on the first IP address. This significantly improves delivery success when there are network connectivity problems affecting only IPv4 or IPv6. * fix method call style * request_spec: adjust test case to use Addrinfo * request: Request/open: move private addr check to within begin/rescue * request_spec: add case to test failover, fix exception check * Double Addrinfo.foreach so that it correctly yields instances	2018-03-20 09:06:08 +01:00
David Yip	0fa0836e63	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-03-19 15:41:59 -05:00
David Yip	c074b226b6	Merge pull request #394 from ashkitten/compressed-notifs fix compressed notifications again (#393)	2018-03-19 15:41:09 -05:00
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-19 20:17:18 +00:00
ThibG	ff6b8a6443	Serialize mentions in the order they are added (#6836 ) Up until now, the order seemed to be in the opposite order, which caused the WebUI to populate mentions in reversed order when replying to toots local to one's instance.	2018-03-19 20:19:35 +01:00
ThibG	6b76a6212d	Display content warning in mail notification emails (#6832 )	2018-03-19 20:12:20 +01:00
Alexander	0306e3e9be	bugfixes and gem update (#6831 ) * update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning	2018-03-19 20:08:56 +01:00
ThibG	357f9298bd	Fix e-mail changed notification (fixes #6778 ) (#6835 ) In Devise::Mailer#email_changed, the new email might be in the email attr. See: https://github.com/plataformatec/devise/blob/master/app/views/devise/mailer/email_changed.html.erb	2018-03-19 20:07:47 +01:00
Renato "Lond" Cerqueira	f7c46fc113	Weblate translations 20180319 (#6827 ) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Spanish) Currently translated at 99.6% (579 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * 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 (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 (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Indonesian) Currently translated at 94.6% (71 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 75.5% (439 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 76.2% (443 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Russian) Currently translated at 95.8% (557 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * 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 (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 91.7% (533 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Spanish) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * 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 (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 (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Swedish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Finnish) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 76.7% (446 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 93.2% (542 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-19 15:12:06 +01:00
Ash Lea	5b00b8f0da	fix .status__info__icons layout	2018-03-19 07:13:18 -04:00
David Yip	ab04be2f84	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: config/i18n-tasks.yml	2018-03-18 20:21:17 -05:00
David Yip	6a6f680d98	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-03-18 20:20:08 -05:00
David Yip	a387f99659	Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots Port WebUI toots/with reply/media tabs and pinned toots to glitch	2018-03-18 20:17:15 -05:00
Eugen Rochko	f02411da40	Ignore media validation when attaching to status during processing (#6822 ) Fix #6821	2018-03-19 01:51:19 +01:00
Eugen Rochko	a568e3ca8e	Revert #6479 , hide sensitive text/images from OpenGraph previews (#6818 ) Display summary of attachments in description, and mark up content warning if present, e.g.: Attached: 3 images · Content warning: Dota 2 When text is not supposed to be hidden, it looks more like: Attached: 3 images Here is the text of the toot With #6817, multilinguagility should be assured...	2018-03-18 20:33:07 +01:00
Eugen Rochko	3b440bd5af	Fix elephant graphic being draggable and selectable (#6819 )	2018-03-18 20:32:44 +01:00
Ash Levy	c68c1466ac	fix compressed notifications again (#393 )	2018-03-18 13:42:28 -04:00
Jenkins	f2a9a13b32	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-18 16:17:15 +00:00
Eugen Rochko	39f27b6cf3	If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817 ) Fix #6784	2018-03-18 16:57:04 +01:00
Akihiko Odaki	721234230c	Synchronize HTML page cache with sessions (#6815 )	2018-03-18 15:14:38 +01:00
Jenkins	9341b982b6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-17 17:17:21 +00:00
nightpool	566ace2d64	Add entropy to download filenames (#6811 ) pretty quick fix, and with the 1 week expiration i don't think we need to be too worried about the existing files closes #6798	2018-03-17 17:39:28 +01:00
Daniel Hunsaker	4a0a19fe54	Handle Mastodon::HostValidationError when pulling remoteable assets (#6782 ) This will prevent, for example, `rake mastodon:redownload_avatars` from crashing when an instance is no longer responding to connection attempts, instead silently continuing as expected.	2018-03-17 13:27:50 +01:00
trwnh	ca7e6a6d2e	Properly center .nothing-here (#6787 ) (#6788 ) Apply "margin: 0 auto;" at line 443 to fix issue #6787	2018-03-17 12:35:35 +01:00
Akihiko Odaki	f0cd957c7a	Cache HTML page with Service Worker (#6802 ) This is the first step to make Mastodon work offline. It is also required by Chromium to trigger Web Manifest automated install prompt.	2018-03-17 12:35:13 +01:00
David Yip	fe17446af0	Merge pull request #391 from ashkitten/compressed-notifs fix non-notification boosts for compressed notifications	2018-03-16 18:15:59 -05:00
Ash Levy	33d5fe889a	fix non-notification boosts	2018-03-16 18:36:35 -04:00
Thibaut Girka	6f0e50f9a0	[Glitch] Federate pinned statuses over ActivityPub Port `9110db41c5` to glitch	2018-03-16 23:16:20 +01:00
Thibaut Girka	cd73af3bd0	[Glitch] Improve style of web UI account tabs Port of `38b9af76a2` to glitch	2018-03-16 23:16:20 +01:00
Thibaut Girka	f00af46d70	[Glitch] Add "Toots/Toots with replies/Media" tab below profile header Port `5131012505` to glitch	2018-03-16 23:16:20 +01:00
David Yip	50f56ba375	Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes Port reports ui changes to glitch-soc flavour	2018-03-16 17:13:09 -05:00
David Yip	a3c86d8cb9	Merge pull request #386 from ashkitten/compressed-notifs compress boost/fave notifications more	2018-03-16 16:35:15 -05:00
Thibaut Girka	9c40a5f3c8	Fix toot text color in the report modal	2018-03-16 15:27:13 +01:00
Thibaut Girka	19f7bd1582	Show media on report UI Ports `219aac7800` to glitch-soc	2018-03-16 15:27:13 +01:00
Thibaut Girka	22870985da	Add close modal icon to report dialog (#6591 ) Port `379cdfaac5` to glitch-soc flavour	2018-03-16 15:27:13 +01:00
Thibaut Girka	9cf574d0d2	Port federated reports UI to glitchsoc Port `41a01bec23` to glitch-soc	2018-03-16 15:27:13 +01:00
Jenkins	d75a6054a0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-13 18:17:20 +00:00
Ash Levy	9317f6853e	compress boost/fave notifications more	2018-03-13 13:54:57 -04:00
Marcin Mikołajczak	fd385e256d	i18n: Update Polish translation (#6780 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-14 02:17:48 +09:00
Renato "Lond" Cerqueira	03119c857b	Weblate translations (2018-03-13) (#6777 ) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Spanish) Currently translated at 99.6% (579 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * 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 (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 (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Indonesian) Currently translated at 94.6% (71 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 75.5% (439 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 76.2% (443 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Russian) Currently translated at 95.8% (557 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-13 16:16:51 +01:00
Eugen Rochko	eb2425b53b	Hide loading bar on status interactions (#6774 )	2018-03-13 14:30:01 +01:00
Eugen Rochko	f0ae6b4cc5	Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler	2018-03-13 09:18:11 +01:00
Eugen Rochko	9e3a6d6784	Log BackupWorker backtrace, delete Backup if retries exhausted (#6769 )	2018-03-13 08:15:24 +01:00
Eugen Rochko	8bf3e750ab	Fix #6757 : Adjust RTL styles for landing page (#6768 )	2018-03-13 08:14:08 +01:00
Akihiko Odaki	18241ccbe1	Change the title of sensitive button by state (#6771 ) Icon showing the state may be confusing. (does the slahed eye icon mean the state that it is sensitive, or to mark it as sensitive?) Moreover, it may not help for blind people. The title will give the precise representation of the current state.	2018-03-13 08:10:12 +01:00
Akihiko Odaki	0dccb398bd	Change the title of spoiler button by state The title will give the precise representation of the current state. It would be helpful for blind people.	2018-03-13 15:58:55 +09:00
Eugen Rochko	386365090c	Fix #6762 : Do not overwrite some status attributes in reducer (#6767 )	2018-03-13 07:16:43 +01:00

... 5 6 7 8 9 ...

4768 Commits