about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-10-14replace newlines in desktop notif with spaces instead of removing them (#5361)Ondřej Hruška
2017-10-14Updated Catalan strings (#5323)spla
* 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
2017-10-14Fix #5351 - Redirection with page params after copy emoji (#5387)KY
* Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link
2017-10-14Close connection when succeeded posting (#5390)abcang
* Close connection when succeeded posting * Update webmock
2017-10-14Update French translation (#5384)Yannick A
Update French translation
2017-10-14l10n: update Persian translation for 2.0 (#5391)Masoud Abkenar
2017-10-14Update German translation (#5389)Jakob Kramer
2017-10-14Correct some misspellings (#5381)Mathias B
* Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'
2017-10-13Dutch strings: small change (#5375)Jeroen
* Dutch strings: small change * And this too.
2017-10-13Optimize Status#permitted_for 500x (account timeline) (#5373)unarist
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.
2017-10-13Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager ↵Eugen Rochko
(#5371) This error occurred at least in development environment
2017-10-13Fix UserTrackingConcern firing on every request, optimize some queries (#5368)Eugen Rochko
- 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
2017-10-13Do not try to guess why home timeline is empty in web UI (#5370)Eugen Rochko
* Do not try to guess why home timeline is empty in web UI * Fix style issue
2017-10-13When unfollowing, remove from home in web UI immediately (#5369)Eugen Rochko
Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!
2017-10-13Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)ThibG
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.
2017-10-13Improve spec of Feed and UserTrackingConcern (#5367)Eugen Rochko
2017-10-13Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)Yamagishi Kazutoshi
2017-10-13Retoot count increases without reason (#5363)Lex Alexander
* 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.
2017-10-12Reduce discrepancies between server and client-side character count (#5360)ThibG
2017-10-13l10n: PT-BR translation updated (#5362)Anna e só
* PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed
2017-10-12Updating more Dutch strings for 2.0 (#5359)Jeroen
2017-10-12Fix some consistance errors in gender neutral formulations. Add some missing ↵Alda Marteau-Hardi
ones. (#5350)
2017-10-12Update oc.json (#5343)JeanGauthier
2017-10-12Update fr.yml (#5330)JohnD28
* 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.
2017-10-12+ me for Dutch (#5349)Jeroen
I didn't received the memo, but I just follow the flow.
2017-10-12Fix some failure cases on FetchLinkCardService (#5347)unarist
* 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`
2017-10-12i18n: Update Polish translation (#5346)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-12Moderation notes (#5344)JeanGauthier
2017-10-12Update ja.yml (#5342)nullkal
* Update ja.yml * Update simple_form.ja.yml
2017-10-12Change Android icon padding again to half of previous (#5339)Eugen Rochko
2017-10-12Fixes and updates for the French translation (#5340)Sylvhem
* 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.
2017-10-11Updating Dutch strings for 2.0 (#5334)Jeroen
2017-10-11Add myself as codeowner of the translation files. (#5333)Alda Marteau-Hardi
2017-10-11Use gender neutral language as in the rest of the french translation (#5331)Alda Marteau-Hardi
2017-10-11Fix #5329 (#5332)aschmitz
This fixes #5329, which occurred when using MigrationHelpers on a table that Postgres estimated to be non-empty when it was actually empty.
2017-10-11Fix styles of error pages (#5335)Lynx Kotoura
Signed-off-by: Lynx Kotoura <admin@sanin.link> Signed-off-by: Lynx Kotoura <admin@sanin.link>
2017-10-11fix presented og:url is incorrect (#5320)takayamaki
2017-10-11In thread view, only scroll first update, scroll to replied-to post (#5322)Eugen Rochko
2017-10-11Only preload JS in /web pages (#5325)Nolan Lawson
2017-10-11Add padding to Android icon, change Apple and MS icons (#5321)Eugen Rochko
2017-10-11Fully disable hotkeys when input element is focused (#5324)Eugen Rochko
Because alt+n is a way to enter some kinda letter on some keyboard
2017-10-11Update french translation : mastodon/locales/fr.json (#5318)JohnD28
* Update fr.json * Update fr.json * Update fr.json
2017-10-11Update doorkeeper.fr.yml (#5317)JohnD28
2017-10-11Update ar.json (#5316)ButterflyOfFire
Pushing new arabic translated strings for Mastodon web client.
2017-10-11Fix an error when ancestors get loaded before the status itself (#5312)unarist
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.
2017-10-11Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310)Eugen Rochko
2017-10-11Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)Eugen Rochko
AZERTY layouts require pressing shift to press a number at all, so it triggers a column switch even when simply typing numbers in textarea
2017-10-11sign_in and sign_up views present og meta infos (#5308)takayamaki
2017-10-10Bump version to 2.0.0rc2Eugen Rochko
2017-10-10Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-23 19:04:59 +0000