about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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-12Restore variable assignment in MuteService#call.David Yip
291feba6f113588cce4f06206754b31eba60044b made MuteService return the result of Account#mute!; this commit restores that behavior.
2017-10-12Merge tag 'v2.0.0rc2' into gs-masterDavid Yip
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-11Fix our media gallery not having alt text and tooltipsOndřej Hruška
2017-10-11workaround for scrollIntoView bug ???Ondřej Hruška
2017-10-11add duck beaks in hamlOndřej Hruška
2017-10-11Merge remote-tracking branch 'upstream/master'Ondřej Hruška
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-11Removed length check which now happens in reducerkibigo!
2017-10-11Fixed header emojificationkibigo!
2017-10-11Merge upstream 2.0ish #165kibigo!
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
2017-10-10Remove prop types from external libraries (#5304)Nolan Lawson
2017-10-10Update German translation (#5302)Jakob Kramer
2017-10-10Fix custom emoji copy not copying file (#5298)Eugen Rochko
2017-10-10Fix #5295 - Order custom emoji lexicographically (#5297)Eugen Rochko
2017-10-10Fix an error when video playback buffer is empty (#5300)unarist
2017-10-10foreign_key, non-nullable, dependent: destroy in account_moderation_notes ↵nullkal
(#5294) * Add foreign key constraint to column `account` in `account_moderation_notes` * Change account_id and target_account_id to non-nullable in account_moderation_notes * Add dependent: :destroy to account and target_account in account_moderation_notes
2017-10-10Fix wrong dimensions on Android icon (#5296)Eugen Rochko
2017-10-09Material app icon for Chrome (#5291)Eugen Rochko
2017-10-09Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290)Eugen Rochko
2017-10-09Center error layout (#5289)Eugen Rochko
2017-10-09Fix #5274 - Create symlink from public/500.html to public/assets/500.html ↵Eugen Rochko
(#5288)
2017-10-09Remove timestamps on any option (#5282)Jeong Arm
2017-10-09Fix pagination in Api::V1::BlocksController (#5285)Akihiko Odaki
2017-10-09try to tighten up local only toot stuff, like... properly (#163)beatrix
* try to tighten up local only toot stuff, like... properly * try to un-break tests
2017-10-09Fix migration failure due to StrongMigrations on production env (#5283)unarist
2017-10-09Fix dependency of error page generation on database (#5280)Eugen Rochko