about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-17Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) ↵Eugen
(#1989)
2017-04-17Improve handling of HTTP_ACCEPT for webfinger (#2008)Matt Jankowski
This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983
2017-04-17Fix nil query_username (#2013)Tomohiro Suwa
2017-04-17Required foreign keys (#2003)alpaca-tc
* Add `required: true` option to foreign column * Fixes NoMethodError ``` > Favourite.new.valid? NoMethodError: undefined method `reblog?' for nil:NilClass ```
2017-04-17Update Japanese translation (#1993)IWAI, Masaharu
Sync text for toot form
2017-04-17Update fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987)Christophe Gesché
Un utiliser mal expérimenté pourrait comprendre "retirer les erreurs". Ici il s'agit d'une suppression pure et simple, pas une épuration/nettoyage. clear would be translated "remove" instead of "cleaning" Cleaning can be unterstood "keep but clean"
2017-04-17Make contents of boost confirmation dialog scroll (#1710)tom
This is necessary for boosting long posts on small screens - see this post for video: https://slime.global/@masklayer/102308
2017-04-17Open sidekiq and pghero admin pages in new browser tabs (#1596)Brad Urani
* Open sidekiq and pghero admin pages in new tabs * Add missing comma
2017-04-17Add gif auto-play/pause preferencePatrick Figel
This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652
2017-04-17Add documentation of SMTP_DOMAIN (#1738)Ian Kelling
Without setting it, exim will reject the mail with a message like: rejected EHLO from [10.20.0.1]: syntactically invalid argument(s): {}
2017-04-17Allow using an SMTP server without authentication (#1597)Miguel Jacq
* Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' * Add note in .env.production.sample about SMTP settings for servers where no auth is required * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none
2017-04-17NFS for shared folder requires a private_network (#1263)happycoloredbanana
2017-04-17Add mask-icon.svg (#1572) (#1585)Dale Price
* Add mask-icon (#1572) * use updated svg logo for mask-icon
2017-04-17Added missing `rake secret` command (#1894)Expenses
2017-04-17Add Brazilian Portuguese and fix European Portuguese (#1966)Hugo Gameiro
* update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes * add pt_br to index.jsx * add pt-BR to import index.jsx * add pt-BR to mastodon.jsx * add pt-BR to settings_helper.rb * add pt-BR to application.rb * order alphabetically pt.jsx * create pt-BR.jsx * Create devise.pt-BR.yml * language improvements to devise.pt.yml * created doorkeeper.pt-BR.yml * fixes to doorkeeper.pt.yml * create pt-BR.yml * improvements to pt.yml * Create simple_form.pt-BR.yml * Improvements to simple_form.pt.yml * improvements to pt.yml
2017-04-17Create hr.jsx (#1945)May Kittens Devour Your Soul
* Create hr.jsx Start of Croatian translation * Update settings_helper.rb * Update application.rb * Update application.rb * Update index.jsx
2017-04-17Optimize user setting page for mobile browser (#1924)Yuki Nakagawa
* Remove overflow because it blocks scrolling on mobile safari. * Add “-webkit-overflow-scrolling: touch;” to enable smooth scroll on mobile safari and other webkit browsers. * Use radio buttons in user setting page. Because select tags with long text are not fit in the width of mobile devices. * Add flex property to fit labels to devise width. * Change font size of select. It causes auto zooming on mobile safari.
2017-04-17Rubocop instructions (#1973)Matt Jankowski
* Rubocop link for Sublime Text * Fix rubocop links * Link to gh issues page from contributing doc
2017-04-17Add human locales for zh-tw (#1984)Yamagishi Kazutoshi
2017-04-17Add function color remaining text (#1980)usagi-f
2017-04-17Improved Japanese translation in ja.yml (#1981)Toshiyuki Takahashi
2017-04-17Fix tiny typo, and added link to terms and conditions in confirmation email ↵anon
for Japanese. (#1975) (#1975)
2017-04-17Fix tiny typo (#1956)Ingo Blechschmidt
2017-04-17Assign user locale on signup (#1982)saturday06
2017-04-17Improve streaming server with cluster (#1970)geta6
2017-04-17reduce unneed query when post without attachements. (#1907)Keiji, Yoshimi
* reduce unneed query when post without attachements. This commit reduce following query: ``` MediaAttachment Load (0.9ms) SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status _id" IS NULL AND 1=0 ORDER BY id asc ``` * fixed for more simple changes.
2017-04-17Fix minor typo in Japanese translation "保村" -> "保存" (#1968)Yamagishi Kazutoshi
2017-04-17Improved Japanese translation in devise.ja.yml (#1969)Toshiyuki Takahashi
2017-04-16Do not display "reset password" in admin UI for remote accounts (#1960)Eugen
2017-04-16Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)Eugen
2017-04-16Fix bug mentioned in #1565 (#1954)Eugen
2017-04-16Remove unused registrations: key from PT yml locale (#1952)Matt Jankowski
2017-04-16Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876)Eugen
* Fix #1870 - Strip control characters out of strings in AtomSerializer * Adjust according to comment by @alpaca-tc
2017-04-16Add language detection (#1772)Eugen
* Add language detection via WhatLanguage and (de)serialization of it through Atom * Fix default language in ProcessFeedService * Re-add newline before 'react-rails' Gem to fix groupings Fixes Code Climate issue
2017-04-16Onboarding modal (#1883)Eugen
* Basic onboarding modal that's shown to users once * Lay out pages 2 through 5, add images, style modals (#1509) * Lay out pages 2 through 5 Added images and laid out pages 2 through 5 in the jsx file. SCSS will come, still working on just seeing if this works at all. * Fix jsx errors, add images to modal pages, style modal pages * Add animations to onboarding pager changes, improve wording and styling * Finishing touches on the onboarding * Add missing propTypes * Update wording
2017-04-16Update node.js and imagemagick (#1951)Wonderfall
* update Dockerfile: latest nodejs LTS * also update imagemagick
2017-04-16I18n health warnings (#1949)Matt Jankowski
* Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit 350ef2685fadc069e619bb6d1066190de195d942. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis
2017-04-16Fix #1670 - Update OStatus2 gem (#1936)Eugen
2017-04-16Disable CodeClimate duplication checks (#1943)Eugen
2017-04-16Fix translation of 'reblogged' in eo.yml (#1942)oliverkeeble
2017-04-16Add missing keys to PT locale (#1941)Eduardo Elias
2017-04-16Check @recipient.user at the first (#1939)alpaca-tc
2017-04-16Fix #1813 - Alleviate extra requests when processing mentions (#1938)Eugen
The <link rel="mentioned" /> tag refers to accounts by href. So we were matching the DB by the url attribute, and falling back to HTTP look-up. However, GS and Mastodon use profile URLs as URIs, too, and the match for that was missing. This could potentially alleviate some extra network requests
2017-04-17Merge branch 'master' into fix/cache_blockingEffy Elden
2017-04-16Adds note for instance admins. (#1925)Ash Furrow
* Adds note for instance admins. * Addresses feedback from #1925.
2017-04-16Add README note about tagged releases (#1927)Eugen
2017-04-16Clean up check that account needs a webfinger update (#1932)Matt Jankowski
2017-04-16Remove trailing whitespace in terms.no.html (#1933)Matt Jankowski
2017-04-16Simplify the og:image and og:description code in stream_entries/show (#1934)Matt Jankowski
2017-04-16Use local vars in partials (#1935)Matt Jankowski
* Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial