about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-18Admin reports with accounts (#2092)Matt Jankowski
* Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id
2017-04-18Disable toot button when above 500 characters (#2088)Tomohiro Suwa
* Disable toot button when above 500 characters * Consider multibyte characters * Consider spoiler_text
2017-04-18fix admin input display (#1633)spf
2017-04-18Moving aria-label to div.column (#1769)JP DeVries
* Use landmark regions on columns Closes mastodon#1720 * Moving aria-label to div.column
2017-04-18Simplify renders in views (#2084)Matt Jankowski
* Simplify render in mailer views * Simplify render in about/more view * Simplify render in accounts follow views * Simplify render in recovery code views * Simplify render in stream entry embed * Simplify render in stream entries status partial * Simplify render in authorize follow new view
2017-04-18Update storybook file autoload (#2057)usagi-f
2017-04-18Add "Mastodon" to user agent (#2073)ik-fib
Remove non-const version string Freeze option is unnecessary
2017-04-18Translate onboarding dialog to japanese (#2062)Keiji, Yoshimi
* translate onboarding modal to japanese * fixed translation by feedback
2017-04-18Fix streaming server worker count (#2082)kuro5hin
* Make sure we start at least one streaming worker, even if there's only one CPU and we're in production mode. * Oops, let's make sure we're counting cpus right too.
2017-04-18Avoid dynamic methods due to processing speed (#2080)839
2017-04-18Fix header icons in navigation bar (#2081)Andrey Blinov
2017-04-18French translation update (#2063)Olivier Humbert
fixes
2017-04-18Add Occitan (oc) translation (#2077)Koala Yeung
* Added oc.yml * Added `config/locales/oc.yml`. Translated in General Occitan (Quent-in). * Added oc.jsx (Occitan translation) * Written in General Occitan (lengadocian) * Added `app/assets/javascripts/components/locales/oc.js` * Added doorkeeper.oc.yml * Added `config/locales/doorkeeper.oc.yml` (Quent-in) * Added simple_form.oc.yml * Added `config/locales/simple_form.oc.yml` (Quent-in). * Merge en.yml changes into oc.yml Added new strings for translations * Fix typo in oc.yml * Update javascript locale support (oc) * Update ruby locale list (oc) * Fix oc.yml * Remove obsoleted translations * Moved old translation of `reports` to `admin.reports`
2017-04-18Update Russian translation (#1967)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
2017-04-18Add hasMore field to account timeline (#2066)geta6
2017-04-18Merge branch 'patf-pause-gif'Eugen Rochko
2017-04-18Adjust visuals of non-autoplaying GIFVEugen Rochko
2017-04-18Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gifEugen Rochko
2017-04-18Remove unused methods (#1730)Matt Jankowski
* Remove unused method #set_counters_maps from api controller * Remove unused method #set_account_counters_maps from api controller * Remove unused method Account#followers_domains * Remove unused User.prolific scope * Add mastodon:users:admins task to list all admin emails * Use interpolated query style in Account.triadic_closures * Coverage for Account.triadic_closures
2017-04-18Merge branch 'pixiv-fix/cache_blocking'Eugen Rochko
2017-04-18Rename cache key to exclude_account_ids_for:id, adjust formattingEugen Rochko
2017-04-18Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into ↵Eugen Rochko
pixiv-fix/cache_blocking
2017-04-18Add forgotten AtomSerializer spec (#2047)Eugen
2017-04-18Ignore /vendor/bundle (#1880)Marcin Cieślak
2017-04-18Add FR locales to the onboarding modal (#1976)Damien Erambert
* Add FR locale for the onboarding modal component * Slightly increase the max-width and max-height of the onboarding modal This is done so it doesn't break with locales whose strings would be too long * Update FR locales for onboarding upon PR comments
2017-04-18Add simplified Chinese js translation (#2044)Mingye Wang
This single-file commit, heavily based on the zh-hk version as of ec9999c, fixes the missing js locale. Intentional, significant departures from current zh-cn yml localizations have been marked with rationales given.
2017-04-18Instance helper to replace site title helper (#2038)Matt Jankowski
* Move site title helper to instance helper (name change only) * Remove newline in <title> tag * Add site_hostname helper method to wrap up local_domain value * Use site_hostname helper in places that need local_domain value
2017-04-18Updated, improved and fixed Dutch language strings (#2030)jeroenpraat
* Fixed some words * Improved and more consistent * Fixes and a bit less 'je' * Improved and more consistent * Another round of improvements and consistency * More improvements and less 'je' * Update * Updated with admin strings * More improvements and additions - not complete yet, but most is there * This is what we call in Dutch 'the English disease' :-) * fix comma * admin.reportsi * not needed * hopefully now fixed
2017-04-17Use .presence instead of ternary on site description for og: content (#2033)Matt Jankowski
2017-04-17optimized logo (#2020)Sam Hewitt
- adjusted elements to fit the pixel grid for better scaling - optimized the PNG asset and the SVG asset
2017-04-17README tidy up (#2026)Matt Jankowski
* Remove docker guide and put it in docs repo * Move tasks to docs repo * Move requirements to contributing doc * Move advice about tagged releases to docs repo * Move local domain and host config to docs repo * Link to related tech
2017-04-17Fix import pt_br locale in mastodon.jsx (#2011)Andrey Blinov
2017-04-17Return early from submit if no text. (#1962)Zac Anger
2017-04-17French i18n-tasks missing fr (#2018)spf
2017-04-17Remove i18n_spec file (#2014)Matt Jankowski
These were being skipped with `xit`, but we also just added the `unused` task to the CI server, and it will be caught there. That seems good enough for this, instead of requiring a full keys check on every local spec suite run.
2017-04-17Media controller specs (#2022)Matt Jankowski
* Add spec for media controller * Add MediaAttachment.attached scope * Simplify methods in media controller
2017-04-17Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)Eugen
Also improve efficiency of the mastodon:maintenance:add_static_avatars task
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