about summary refs log tree commit diff
path: root/app/javascript/mastodon
AgeCommit message (Collapse)Author
2017-10-27Merge branch 'master' into gs-masterDavid Yip
2017-10-27Feature: Unlisted custom emojis (#5485)nullkal
2017-10-26Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-26Fix 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
2017-10-25Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into ↵David Yip
gs-direct-timeline
2017-10-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-10-26Update Russian translation (#5517)Ratmir Karabut
* 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
2017-10-25Complete Esperanto translation (#5520)Olivier Nicole
2017-10-24option to add title to <Button>, use for toot buttons (#197)Ondřej Hruška
2017-10-22Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-22Changes to match other timelines in 2.0Matthew Walsh
2017-10-22Added a timeline for Direct statusesMatthew Walsh
* Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL
2017-10-22i18n: Update Polish Translation (#5494)Marcin Mikołajczak
2017-10-21Compose buttons bar redesign + generalize dropdown (#194)Ondřej Hruška
* Generalize compose dropdown for re-use * wip stuffs * new tootbox look and removed old doodle button files * use the house icon for ...
2017-10-19Remove unnecessary translateZ(0) when doing scale() (#5473)Nolan Lawson
2017-10-19Make the compose area optionally scrollable.David Yip
On desktop, the compose text box grows to accommodate the content. On mobile, the text box does not grow to accommodate text context, but does grow to accommodate images. It is possible in both cases to overflow the available area, which makes accessing other UI elements (e.g. visibility setttings) difficult. This commit makes the compose area optionally scrollable, which allows those UI elements to remain available even if they go off-screen.
2017-10-18formatting fix for eslintOndřej Hruška
2017-10-18Remove unused filesAttached property.David Yip
2017-10-18Merge tag 'v2.0.0' into gs-masterDavid Yip
2017-10-18Suppress type error(not a function) on calling fastSeek (#5452)Sho Kusano
2017-10-18Fix pt-BR translation strings related to advanced search. (#5449)Renato "Lond" Cerqueira
2017-10-18Revert #5438 for FR (#5450)Technowix
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.
2017-10-18Some typos and supplementation in sentence structures (#5441)Håkan Eriksson
* 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.
2017-10-18fr.json typo (realtive time) (#5447)JohnD28
Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie
2017-10-17When unreblog arrives over streaming API, just delete in UI (#5439)Eugen Rochko
2017-10-17i18n better wording (OC/CA/FR) + string added in FR (#5438)JeanGauthier
* 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
2017-10-17Fix unwanted content warning gap in CSS (#5436)Eugen Rochko
Fix #5356
2017-10-17i18n update (#5427) in OC/CA/FR/ES (#5431)JeanGauthier
* Update oc.json * Update ca.json * Update fr.json * Update es.json
2017-10-17Fix React warning about tabIndex on status with CW (#5432)unarist
2017-10-17Update German translation (#5425)Jakob Kramer
2017-10-17Add Japanese translations (#5427)Yamagishi Kazutoshi
* yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393
2017-10-17Swedish translation (#5406)Håkan Eriksson
* 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
2017-10-17Small update Dutch (nl) strings (#5424)Jeroen
* Update Dutch strings * Update Dutch
2017-10-16Fix dual toot button wrong behavior after compose re-designOndřej Hruška
2017-10-16Merge pull request #184 from tootsuite/masterbeatrix
Fix reduced motion breaking public galleries (#5423)
2017-10-16Merge pull request #182 from glitch-soc/wide-tootbox-panelDavid Yip
Full-width tootbox panel to make room for buttons
2017-10-16satisfy eslint and jestOndřej Hruška
2017-10-16double-decker tootboxOndřej Hruška
2017-10-16fix some lint errorsOndřej Hruška
2017-10-16Fix reduced motion breaking public galleries (#5423)Nolan Lawson
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Filter out duplicate IDs in timelines reducer (#5417)Eugen Rochko
Possibly the cause of #5379, #5377
2017-10-16Add up-to-date korean translation on client (#5402)voidSatisfaction
* chore: add Korean translation for client * fix: change unlisted and embed Korean words
2017-10-16Fix #5082 - disable retweet link for followers only toot (#5397)KY
* Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message
2017-10-16i18n: Update Polish translation (#5416)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16i18n ultim hour «More» dropdown title + reduce motion (#5415)JeanGauthier
* Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)
2017-10-16Enable ESLint rules import/* (#5414)Yamagishi Kazutoshi
* Enable ESLint rules import/* * fix
2017-10-16Add option to reduce motion (#5393)Nolan Lawson
* 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
2017-10-16Fix offline-plugin warning in dev mode (#5411)Nolan Lawson
2017-10-16Replace JavaScript Testing Framework from Mocha to Jest (#5412)Yamagishi Kazutoshi