about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-07-25Fix JS errors and add back commit hashOndřej Hruška
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-25feat(status_action_bar): Web share button (#4365)Sorin Davidoi
2017-07-25Fix multiple-gif display in user page (#4364)Lynx Kotoura
Divide media-items to equal width, and hide overlaps.
2017-07-25Allow longer link text on landing page (reduce padding for Mobile) (#4363)Clworld
* Allow longer link text on landing page (reduce padding for Mobile) * remove empty line
2017-07-25Merge queries in Api::V1::FavouritesController (#4359)Akihiko Odaki
2017-07-25Send short account URL to remote instance (regression from #3844) (#4355)Yamagishi Kazutoshi
* Send short account URL to remote instance (regression from #3844) Resolve #4347 * remove format: 'json'
2017-07-25Update Japanese translations for landing page (for Mobile). (#4362)Clworld
2017-07-25i18n: Update Polish translation (#4361)m4sk1n
2017-07-25Small fr.json update (#4354)Komic
* Small fr.json update • Translation for #4342 • Fixed a couple of typos as well as a few weird phrasings * insert final newline
2017-07-25fix(status_list): Guard against missing ref (#4353)Sorin Davidoi
2017-07-25Update and (almost) completing Dutch strings for 1.5 (#4351)Jeroen
* Update and expanding Dutch strings for 1.5 Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway). * Missing file * A few changes cause of changes in another file * Fix * Update Dutch strings for 1.5 * nl * fix don't know how that ended up there * Update nl.yml
2017-07-25Update Capistrano lock version in config/deploy.rb (#4352)Petko Bordjukov
Deployment with Capistrano was failing due to a mismatch between the loaded version of Capistrano and the one specified in the deployment configuration. Bumping the version in config/deploy.rb fixes this issue.
2017-07-25fix(column): Use passive wheel listener (#4348)Sorin Davidoi
* chore(yarn): Install detect-passive-events * fix(column): Use passive listener
2017-07-25fix(components/bundle): Exit early in load function (#4349)Sorin Davidoi
2017-07-25fix(getting_started): No scrollbar if not needed (#4350)Sorin Davidoi
2017-07-24Improve remote profile disclaimer (#4342)Eugen Rochko
* Improve remote profile disclaimer * yarn run manage:translations
2017-07-24Use the "m" version of the logo for favicons (#4345)Eugen Rochko
2017-07-24fix(compose_from): Do not autofocus on mobile (#4344)Sorin Davidoi
2017-07-24Fix oddities with public profile CSS (#4341)Eugen Rochko
* Fix oddities with public profile CSS * Remove trailing whitespace
2017-07-24i18n: @2374d63 (pl) (#4340)m4sk1n
* i18n: @2374d63 (pl) * i18n: fixed typo on Polish translation
2017-07-24Redesign /terms page (#4338)Eugen Rochko
* Redesign /terms page * Fix tests * Remove unused keys
2017-07-24Perfectly center mastodon logo on mobile landing page (#4339)Lynx Kotoura
Setting only padding-left made the logo left-shifted on mobile page. Margin-right was old setting for adjusting clearance between old logo and letter "Mastodon".
2017-07-24Bump to 1.5.0rc1 (#4318)Eugen Rochko
2017-07-24Move clean up of unconfirmed users to sidekiq-scheduler (#4336)Eugen Rochko
* Move clean up of unconfirmed users to sidekiq-scheduler * mastodon:daily is now deprecated
2017-07-24Redesign extended information page (#4322)Eugen Rochko
* Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS
2017-07-24Change defaultMessage for spoiler placeholder (#4329)Yamagishi Kazutoshi
2017-07-24Run i18n-tasks normalize (#4335)Eugen Rochko
2017-07-24Allow domain blocks that only reject media without silencing or suspending ↵sdukhovni
(#4325) * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs
2017-07-24Update Russian translation for #4313 (#4334)Andrew Zyabin
2017-07-24add-dependent-package (#4330)masarakki
2017-07-24Add space to toot paragraph in landing page (#4331)Yamagishi Kazutoshi
2017-07-24Redirect user profile page to short URL when HTML format (#4328)Yamagishi Kazutoshi
2017-07-23i18n: Update Polish translation (#4327)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-07-23Change about_mastodon to about_mastodon_html for all locales (#4326)Yamagishi Kazutoshi
2017-07-23feat: Enable push subscription for mobile devices by default (#4321)Sorin Davidoi
2017-07-23Fix manifest description (regression from #4122) (#4324)Yamagishi Kazutoshi
2017-07-23Update Japanese translations for #4313 and #4315 (#4323)Yamagishi Kazutoshi
* Update Japanese translations for #4313 * Update Japanese translations for #4315
2017-07-23Add background to media modal (#4317)Eugen Rochko
2017-07-23Add loading indicator animation (#4316)Eugen Rochko
2017-07-23Improve noscript message and style (#4315)Eugen Rochko
2017-07-23Change "Content Warning" to "Write your warning here" (#4313)Sylvhem
Change the placeholder used in the content warning field from "Content Warning" to "Write your warning here". This change should made it easier to understand what the field is about. Change le message de substitution utilisé dans le champ d’avertissement de « Avertissement » à « Écrivez ici votre avertissement ». Ce changement devrait rendre plus évidente la fonction du champ.
2017-07-23fix(getting_started): Scroll on mobile (#4312)Sorin Davidoi
2017-07-23i18n: Update Polish translation (#4311)m4sk1n
2017-07-23fix(columns_area): Show correct title for preview columns (#4310)Sorin Davidoi
2017-07-23i10n Update for Occitan (#4301)Quent-in
* Update to translate new strings * Update * Update * Indend added * Update oc.yml
2017-07-23Fix logo URL (#4309)Yamagishi Kazutoshi
2017-07-23Change logo.png to logo.svg for web UI (#4307)Yamagishi Kazutoshi
2017-07-23Update README header with logoEugen Rochko
2017-07-23New logo (#4306)Eugen Rochko
* Add new logo * Remove unused images