4394 Commits (ae716a12e1604a4df54acbc77ff35f591e3168e2)

 

All Branches   

Search

Author	SHA1	Message	Date
Ondřej Hruška	ae716a12e1	replace newlines in desktop notif with spaces instead of removing them (#5361)	7 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	7 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	7 years ago
abcang	2eab41cd1a	Close connection when succeeded posting (#5390) ... * Close connection when succeeded posting * Update webmock	7 years ago
Yannick A	c6f76db2e1	Update French translation (#5384) ... Update French translation	7 years ago
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391)	7 years ago
Jakob Kramer	eb96aa86a4	Update German translation (#5389)	7 years ago
Mathias B	c1a2707ecf	Correct some misspellings (#5381) ... * Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'	7 years ago
Jeroen	c35132a738	Dutch strings: small change (#5375) ... * Dutch strings: small change * And this too.	7 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.	7 years ago
Eugen Rochko	df7dbc41ae	Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371) ... This error occurred at least in development environment	7 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	7 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	7 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!	7 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.	7 years ago
Eugen Rochko	3283868e28	Improve spec of Feed and UserTrackingConcern (#5367)	7 years ago
Yamagishi Kazutoshi	dc91fd482a	Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)	7 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.	7 years ago
ThibG	d37305c628	Reduce discrepancies between server and client-side character count (#5360)	7 years ago
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	7 years ago
Jeroen	f398ad1994	Updating more Dutch strings for 2.0 (#5359)	7 years ago
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	7 years ago
JeanGauthier	cb7ba23cd8	Update oc.json (#5343)	7 years ago
JohnD28	691e9112f3	Update fr.yml (#5330) ... * Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.	7 years ago
Jeroen	385df2c5a0	+ me for Dutch (#5349) ... I didn't received the memo, but I just follow the flow.	7 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`	7 years ago
Marcin Mikołajczak	9d84b6e606	i18n: Update Polish translation (#5346) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
JeanGauthier	bf0f7e8846	Moderation notes (#5344)	7 years ago
nullkal	4817744b87	Update ja.yml (#5342) ... * Update ja.yml * Update simple_form.ja.yml	7 years ago
Eugen Rochko	8e9911962d	Change Android icon padding again to half of previous (#5339)	7 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.	7 years ago
Jeroen	6bc07d3de3	Updating Dutch strings for 2.0 (#5334)	7 years ago
Alda Marteau-Hardi	fbc6375fde	Add myself as codeowner of the translation files. (#5333)	7 years ago
Alda Marteau-Hardi	0352c40e99	Use gender neutral language as in the rest of the french translation (#5331)	7 years ago
aschmitz	e5d8166a12	Fix #5329 (#5332) ... This fixes #5329, which occurred when using MigrationHelpers on a table that Postgres estimated to be non-empty when it was actually empty.	7 years ago
Lynx Kotoura	07ea625cb2	Fix styles of error pages (#5335) ... Signed-off-by: Lynx Kotoura <admin@sanin.link> Signed-off-by: Lynx Kotoura <admin@sanin.link>	7 years ago
takayamaki	27101f1beb	fix presented og:url is incorrect (#5320)	7 years ago
Eugen Rochko	1823cf435a	In thread view, only scroll first update, scroll to replied-to post (#5322)	7 years ago
Nolan Lawson	6a50329a9c	Only preload JS in /web pages (#5325)	7 years ago
Eugen Rochko	b17e571bc2	Add padding to Android icon, change Apple and MS icons (#5321)	7 years ago
Eugen Rochko	476e79b8e3	Fully disable hotkeys when input element is focused (#5324) ... Because alt+n is a way to enter some kinda letter on some keyboard	7 years ago
JohnD28	19d3317a69	Update french translation : mastodon/locales/fr.json (#5318) ... * Update fr.json * Update fr.json * Update fr.json	7 years ago
JohnD28	fe6941e28e	Update doorkeeper.fr.yml (#5317)	7 years ago
ButterflyOfFire	38600b2792	Update ar.json (#5316) ... Pushing new arabic translated strings for Mastodon web client.	7 years ago
unarist	b0407ece42	Fix an error when ancestors get loaded before the status itself (#5312) ... When ancestors get loaded, we scroll to the target status (i.e. skip ancestors). However, ancestors may get loaded before the status itself, then it causes TypeError because `this.node` is undefined yet. Since we don't show anything until the status gets loaded, we don't need to scroll to the target status in this time. If we get the status itslef later, it causes `componentDidUpdate` and scrolling correctly.	7 years ago
Eugen Rochko	9b3d8ee346	Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310)	7 years ago
Eugen Rochko	b3d7ad958f	Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309) ... AZERTY layouts require pressing shift to press a number at all, so it triggers a column switch even when simply typing numbers in textarea	7 years ago
takayamaki	552d22bec9	sign_in and sign_up views present og meta infos (#5308)	7 years ago
Eugen Rochko	7c33da45f0	Bump version to 2.0.0rc2	7 years ago
Eugen Rochko	9815be2a44	Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)	7 years ago