3042 Commits (7fb850e987c92a6b863cc1f66a6ec7318460f1de)

Author	SHA1	Message	Date
nullkal	3f16caaa50	Eliminate space around emoji (#5474) ... * Eliminate space around emoji * More improve emoji style * Make more compatible with Twemoji * Make scss-lint happy * Make not modify normal emoji's behavior * Decrease status__action-bar's margin-top to 5px * Make the test be passed * Revert "Make the test be passed" This reverts commit 54a8c60e59. * Revert "Make not modify normal emoji's behavior" This reverts commit 6a5bdf0c11.	8 years ago
ThibG	5d5c0f4f43	Twidere mention workaround (#5552) ... * Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.	8 years ago
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	8 years ago
voidSatisfaction	e618edf85a	fix: slang to adequate word (#5453)	8 years ago
nullkal	b6e2e999bd	Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) ... * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy	8 years ago
MIYAGI Hikaru	782224c991	Avoid emojifying on invisible text (#5558)	8 years ago
ThibG	84cfee2488	Do not process undeliverable mentions (#5598) ... * Resolve remote accounts when mentioned even if they are already known This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages). * Do not add mentions in private messages for remote users we cannot deliver to Mastodon does not deliver private and direct toots to OStatus users, as there is no guarantee the remote software understands the toot's privacy. However, users currently do not get any feedback on it (Mastodon won't attempt delivery, but the toot will be displayed exactly the same way to the user). This change introduces *some* feedback by not processing mentions that are not going to be delivered. A long-term solution is still needed to have delivery receipts or at least some better indication of what is going on, but at least an user can see *something* is up.	8 years ago
ThibG	7bea1530f4	Resolve remote accounts when mentioned even if they are already known (#5539) ... This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages).	8 years ago
nullkal	864c4d869f	Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611) ... * Make fullscreen video in detailed status plays in fullscreen (Fix #5160) * Directly assign the initial state	8 years ago
kedama	d8cd9000d9	Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613) ... Make the same behavior as /api/v1/custom_emojis.	8 years ago
MIYAGI Hikaru	8abe9e9058	don't display any descendants of .invisible (#5567) ... * don't display any descendants of .invisible * reduce the scope of selector * remove some rules for image * lint	8 years ago
Quenty31	da3adc0a73	l10n Occitan (#5586) ... * Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json	8 years ago
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577)	8 years ago
Sorin Davidoi	5521e94e24	refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580)	8 years ago
Yamagishi Kazutoshi	763a2f8511	Replace react-router-scroll to react-router-scroll-4 (#5568)	8 years ago
Nolan Lawson	60f962eedc	Refactor initial state: auto_play_gif (#5576)	8 years ago
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	8 years ago
Nolan Lawson	b254e6ca5f	Refactor initial state: "me" (#5563) ... * Refactor initial state: "me" * remove "me" from reducers/meta.js	8 years ago
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	8 years ago
ThibG	d37a56c07c	Update remote ActivityPub users when fetching their toots (#5545)	8 years ago
Nolan Lawson	2cea4592a3	Avoid modifying emoji data inline (#5548)	8 years ago
Nolan Lawson	512feab222	Add margin to account for Edge disappearing scrollbar (#5522) ... * Add margin to account for Edge disappearing scrollbar * Fix 16px margin for DMs and horizontal line	8 years ago
Nolan Lawson	5e111ce16d	Reactor unfollow_modal, boost_modal, delete_modal (#5505)	8 years ago
Herbert Kagumba	3e9236b343	Separate Follow/Unfollow and back buttons (#5496)	8 years ago
ThibG	89c77fe225	Instantiate service classes for each call (fixes #5540) (#5543)	8 years ago
Nolan Lawson	e843f62f47	Avoid unnecessary Motion components in icon_button.js (#5544)	8 years ago
Nolan Lawson	ec487166db	Directly use <Motion/> if not reducing motion (#5546)	8 years ago
Nolan Lawson	3de22a82bf	Refactor initial state: reduce_motion and auto_play_gif (#5501)	8 years ago
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	8 years ago
puckipedia	0cb329f63a	Allow ActivityPub Note's tag and attachment to be single objects (#5534)	8 years ago
erin	22da775a85	Fix copying emojos: redirect to the page you were on (#5509)	8 years ago
りんすき	d556be2968	Fix column design broken with very long title (#5493) ... * Fix #5314 * fix not beautiful code * fix broken design with mobile view * remove no longer needed code	8 years ago
Nolan Lawson	02f7f3619a	Remove translateZ(0) on modal overlay (#5478)	8 years ago
Ratmir Karabut	20fee786b1	Update Russian translation (#5517) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation * Update Russian translation * Fix merge conflicts (revert) * Update Russian translation * Update Russian translation (fix) * Update Russian translation (fix quotes) * Update Russian translation (fix quotes) * Update Russian translation (fix) * Update Russian translation * Add quotes * bundle exec i18n-tasks normalize	8 years ago
Olivier Nicole	1ba3725473	Complete Esperanto translation (#5520)	8 years ago
Marcin Mikołajczak	fdb0848e08	i18n: Update Polish Translation (#5494)	8 years ago
Nolan Lawson	8392ddbf87	Remove unnecessary translateZ(0) when doing scale() (#5473)	8 years ago
Sho Kusano	09d81defcd	Suppress type error(not a function) on calling fastSeek (#5452)	8 years ago
Renato "Lond" Cerqueira	26b2a6a71e	Fix pt-BR translation strings related to advanced search. (#5449)	8 years ago
Technowix	edf9a5e4fc	Revert #5438 for FR (#5450) ... As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.	8 years ago
Håkan Eriksson	c710069c12	Some typos and supplementation in sentence structures (#5441) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.	8 years ago
JohnD28	e7099d8d9e	fr.json typo (realtive time) (#5447) ... Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie	8 years ago
YaQ	6e54719474	Make theme directory and Rename application.scss (#5336) ... * Rename application.scss * Move to 'default' directory * Follow review Move directory, and Rename "mastodon". * Revert rename * undo removal of newline	8 years ago
Eugen Rochko	f3003417c5	When unreblog arrives over streaming API, just delete in UI (#5439)	8 years ago
JeanGauthier	33ea042dec	i18n better wording (OC/CA/FR) + string added in FR (#5438) ... * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json	8 years ago
Nolan Lawson	8b22a63ab0	Fix scrolling of dropdown when offscreen (#5434)	8 years ago
Eugen Rochko	05686cc99d	Fix unwanted content warning gap in CSS (#5436) ... Fix #5356	8 years ago
Eugen Rochko	484208ce12	When status is fetched instead of delivered, do not stream it (#5437)	8 years ago
unarist	3bc8924940	Don't capture scheme-less URLs in the status (#5435) ... Specifically, this fixes status length calculation to be same as JS side. BTW, since this pattern used in not only preview card fetching, we should extract it (with twitter-regex?) and write tests I think.	8 years ago
JeanGauthier	a02de9e012	i18n update (#5427) in OC/CA/FR/ES (#5431) ... * Update oc.json * Update ca.json * Update fr.json * Update es.json	8 years ago
unarist	2d395324e1	Fix React warning about tabIndex on status with CW (#5432)	8 years ago
Jakob Kramer	e6c9756fa9	Update German translation (#5425)	8 years ago
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427) ... * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	8 years ago
aschmitz	554c2fd8af	Clean up reblog tracking keys, related improvements (#5428) ... * Clean up reblog-tracking sets from FeedManager Builds on #5419, with a few minor optimizations and cleanup of sets after they are no longer needed. * Update tests, fix multiply-reblogged case Previously, we would have lost the fact that a given status was reblogged if the displayed reblog of it was removed, now we don't. Also added tests to make sure FeedManager#trim cleans up our reblog tracking keys, fixed up FeedCleanupScheduler to use the right loop, and fixed the test for it.	8 years ago
Håkan Eriksson	a2b600428c	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	8 years ago
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424) ... * Update Dutch strings * Update Dutch	8 years ago
Nolan Lawson	8980aa804f	Fix reduced motion breaking public galleries (#5423)	8 years ago
Eugen Rochko	34118169ac	Keep references to all reblogs of a status on home feed (#5419) ... * Keep references to all reblogs of a status on home feed When inserting reblog: Add to set of reblogs of this status on the feed, if original status was present in the feed, add it to that set as well. When removing a reblog: Remove it from that set. Take random remaining item from the set. If one exists, re-insert it into feed, otherwise do not re-insert anything. Fix #4210 * When original is removed, toss out reblog references	8 years ago
Eugen Rochko	7cc71748ce	Ensure that feed renegeration restores non-zero items (#5409) ... Fix #5398 Ordering the home timeline query by account_id meant that the first 100 items belonged to a single account. There was also no reason to reverse-iterate over the statuses. Assuming the user accesses the feed halfway-through, it's better to have recent statuses already available at the top. Therefore working from newer->older is ideal. If the algorithm ends up filtering all items out during last-mile filtering, repeat again a page further. The algorithm terminates when either at least one item has been added, or if the database query returns nothing (end of data reached)	8 years ago
Eugen Rochko	aec70b44fc	Filter out duplicate IDs in timelines reducer (#5417) ... Possibly the cause of #5379, #5377	8 years ago
unarist	6f490b4bfe	Fix un-reblogged status being at wrong position in the home timeline (#5418) ... We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed. However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses. So this reverts that change...reblogged status inserted at corresponding position to its id.	8 years ago
voidSatisfaction	03975dbde4	Add up-to-date korean translation on client (#5402) ... * chore: add Korean translation for client * fix: change unlisted and embed Korean words	8 years ago
KY	f72936b4e6	Fix #5082 - disable retweet link for followers only toot (#5397) ... * Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message	8 years ago
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
JeanGauthier	1e7b3bf625	i18n ultim hour «More» dropdown title + reduce motion (#5415) ... * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)	8 years ago
Yamagishi Kazutoshi	bf0ee1a25c	Enable ESLint rules import/* (#5414) ... * Enable ESLint rules import/* * fix	8 years ago
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	8 years ago
Nolan Lawson	981e20b03a	Fix offline-plugin warning in dev mode (#5411)	8 years ago
Yamagishi Kazutoshi	d5b767c374	Replace JavaScript Testing Framework from Mocha to Jest (#5412)	8 years ago
Nolan Lawson	93b54b8d4b	i18n "More" dropdown title (#5410)	8 years ago
Nolan Lawson	e7ab9bf8b4	Refactor and simplify icon_button.js (#5413)	8 years ago
Eugen Rochko	894da3dcca	Clear timer when unmounting RelativeTimestamp components (#5408) ... Possibly the cause of #5379, #5377	8 years ago
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404) ... * Update oc.json * Update oc.yml	8 years ago
Yannick A	7fe1428cc4	Update French translation (#5401)	8 years ago
Lynx Kotoura	b3b4b5a2eb	Adjust public hashtag pages (#5357)	8 years ago
unarist	8125fdc19f	Use atomUri in Undo activity of Announce (#5376) ... This allows deletion of reblogs which delivered before with OStatus URI.	8 years ago
Ondřej Hruška	ae716a12e1	replace newlines in desktop notif with spaces instead of removing them (#5361)	8 years ago
spla	f63a40e7c2	Updated Catalan strings (#5323) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings	8 years ago
KY	1bdd694a0a	Fix #5351 - Redirection with page params after copy emoji (#5387) ... * Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link	8 years ago
abcang	2eab41cd1a	Close connection when succeeded posting (#5390) ... * Close connection when succeeded posting * Update webmock	8 years ago
Yannick A	c6f76db2e1	Update French translation (#5384) ... Update French translation	8 years ago
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391)	8 years ago
Jakob Kramer	eb96aa86a4	Update German translation (#5389)	8 years ago
Jeroen	c35132a738	Dutch strings: small change (#5375) ... * Dutch strings: small change * And this too.	8 years ago
unarist	a1c54220e8	Optimize Status#permitted_for 500x (account timeline) (#5373) ... The main change of this PR is removing `order by visibility` hack. This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses. I have also changed JOIN to IN + subquery, which slightly faster in most cases.	8 years ago
Eugen Rochko	df7dbc41ae	Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371) ... This error occurred at least in development environment	8 years ago
Eugen Rochko	b8db386e05	Fix UserTrackingConcern firing on every request, optimize some queries (#5368) ... - For some reason, :if option on before_action did not work. It got executed every time, returned false, and the action run anyway, which led to the current_sign_in_at and sign_in_count being updated on every request - Return "do not filter" early in FeedManager#filter_from_home? if the status is authored by receiver. Usually this method is not called for own statuses at all, but it is called when Feed#get uses the database - Return early if #reload_stale_associations! has nothing to load to save a database query with WHERE 1=0	8 years ago
Eugen Rochko	48f7a58799	Do not try to guess why home timeline is empty in web UI (#5370) ... * Do not try to guess why home timeline is empty in web UI * Fix style issue	8 years ago
Eugen Rochko	388d093beb	When unfollowing, remove from home in web UI immediately (#5369) ... Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!	8 years ago
ThibG	95fe20b78a	Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372) ... Remote ActivityPub users that have never been known as OStatus users (whether or not they support it) will not have a “remote_url” attribute set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN, the current check did rely on “remote_url” to verify the user's domain.	8 years ago
Yamagishi Kazutoshi	dc91fd482a	Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)	8 years ago
Lex Alexander	b8bae96647	Retoot count increases without reason (#5363) ... * Retoot count increases without reason -The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice. -This calls it when the transaction is finished by using after_create_commit. -Fixes #4916. * Added test case for after_create_commit callback for checking reblog count. * Rewrote test to keep original, but added one for only the after_create_commit callback.	8 years ago
ThibG	d37305c628	Reduce discrepancies between server and client-side character count (#5360)	8 years ago
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	8 years ago
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	8 years ago
JeanGauthier	cb7ba23cd8	Update oc.json (#5343)	8 years ago
unarist	35ec1c91e3	Fix some failure cases on FetchLinkCardService (#5347) ... * If OEmbed response doesn't have a required property `type`, ignore it. e.g. `NoMethodError: undefined method 'type' for ...` * If we failed to detect encoding, fallback to default behavior of Nokogiri. e.g. `KeyError: key not found: :encoding`	8 years ago
Sylvhem	3ebe03b729	Fixes and updates for the French translation (#5340) ... * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	8 years ago
Jeroen	6bc07d3de3	Updating Dutch strings for 2.0 (#5334)	8 years ago
Alda Marteau-Hardi	0352c40e99	Use gender neutral language as in the rest of the french translation (#5331)	8 years ago