]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoreduce unneed query when post without attachements. (#1907)
Keiji, Yoshimi [Mon, 17 Apr 2017 02:23:13 +0000 (11:23 +0900)]
reduce unneed query when post without attachements. (#1907)

* 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.

8 years agoFix minor typo in Japanese translation "保村" -> "保存" (#1968)
Yamagishi Kazutoshi [Mon, 17 Apr 2017 02:22:14 +0000 (11:22 +0900)]
Fix minor typo in Japanese translation "保村" -> "保存" (#1968)

8 years agoImproved Japanese translation in devise.ja.yml (#1969)
Toshiyuki Takahashi [Mon, 17 Apr 2017 02:22:09 +0000 (11:22 +0900)]
Improved Japanese translation in devise.ja.yml (#1969)

8 years agoDo not display "reset password" in admin UI for remote accounts (#1960)
Eugen [Sun, 16 Apr 2017 21:15:58 +0000 (23:15 +0200)]
Do not display "reset password" in admin UI for remote accounts (#1960)

8 years agoFix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)
Eugen [Sun, 16 Apr 2017 21:12:19 +0000 (23:12 +0200)]
Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)

8 years agoFix bug mentioned in #1565 (#1954)
Eugen [Sun, 16 Apr 2017 19:02:54 +0000 (21:02 +0200)]
Fix bug mentioned in #1565 (#1954)

8 years agoRemove unused registrations: key from PT yml locale (#1952)
Matt Jankowski [Sun, 16 Apr 2017 18:53:16 +0000 (14:53 -0400)]
Remove unused registrations: key from PT yml locale (#1952)

8 years agoFix #1870 - Strip control characters out of strings in AtomSerializer (#1876)
Eugen [Sun, 16 Apr 2017 18:32:27 +0000 (20:32 +0200)]
Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876)

* Fix #1870 - Strip control characters out of strings in AtomSerializer

* Adjust according to comment by @alpaca-tc

8 years agoAdd language detection (#1772)
Eugen [Sun, 16 Apr 2017 18:32:17 +0000 (20:32 +0200)]
Add language detection (#1772)

* 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

8 years agoOnboarding modal (#1883)
Eugen [Sun, 16 Apr 2017 18:32:00 +0000 (20:32 +0200)]
Onboarding modal (#1883)

* 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

8 years agoUpdate node.js and imagemagick (#1951)
Wonderfall [Sun, 16 Apr 2017 18:28:25 +0000 (20:28 +0200)]
Update node.js and imagemagick (#1951)

* update Dockerfile: latest nodejs LTS

* also update imagemagick

8 years agoI18n health warnings (#1949)
Matt Jankowski [Sun, 16 Apr 2017 17:37:01 +0000 (13:37 -0400)]
I18n health warnings (#1949)

* 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

8 years agoFix #1670 - Update OStatus2 gem (#1936)
Eugen [Sun, 16 Apr 2017 17:32:47 +0000 (19:32 +0200)]
Fix #1670 - Update OStatus2 gem (#1936)

8 years agoDisable CodeClimate duplication checks (#1943)
Eugen [Sun, 16 Apr 2017 16:26:46 +0000 (18:26 +0200)]
Disable CodeClimate duplication checks (#1943)

8 years agoFix translation of 'reblogged' in eo.yml (#1942)
oliverkeeble [Sun, 16 Apr 2017 16:11:07 +0000 (17:11 +0100)]
Fix translation of 'reblogged' in eo.yml (#1942)

8 years agoAdd missing keys to PT locale (#1941)
Eduardo Elias [Sun, 16 Apr 2017 16:04:19 +0000 (17:04 +0100)]
Add missing keys to PT locale (#1941)

8 years agoCheck @recipient.user at the first (#1939)
alpaca-tc [Sun, 16 Apr 2017 16:04:05 +0000 (01:04 +0900)]
Check @recipient.user at the first (#1939)

8 years agoFix #1813 - Alleviate extra requests when processing mentions (#1938)
Eugen [Sun, 16 Apr 2017 16:01:48 +0000 (18:01 +0200)]
Fix #1813 - Alleviate extra requests when processing mentions (#1938)

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

8 years agoAdds note for instance admins. (#1925)
Ash Furrow [Sun, 16 Apr 2017 14:59:53 +0000 (10:59 -0400)]
Adds note for instance admins. (#1925)

* Adds note for instance admins.

* Addresses feedback from #1925.

8 years agoAdd README note about tagged releases (#1927)
Eugen [Sun, 16 Apr 2017 14:42:46 +0000 (16:42 +0200)]
Add README note about tagged releases (#1927)

8 years agoClean up check that account needs a webfinger update (#1932)
Matt Jankowski [Sun, 16 Apr 2017 14:38:29 +0000 (10:38 -0400)]
Clean up check that account needs a webfinger update (#1932)

8 years agoRemove trailing whitespace in terms.no.html (#1933)
Matt Jankowski [Sun, 16 Apr 2017 14:38:13 +0000 (10:38 -0400)]
Remove trailing whitespace in terms.no.html (#1933)

8 years agoSimplify the og:image and og:description code in stream_entries/show (#1934)
Matt Jankowski [Sun, 16 Apr 2017 14:38:02 +0000 (10:38 -0400)]
Simplify the og:image and og:description code in stream_entries/show (#1934)

8 years agoUse local vars in partials (#1935)
Matt Jankowski [Sun, 16 Apr 2017 14:37:49 +0000 (10:37 -0400)]
Use local vars in partials (#1935)

* Use local vars in accounts/header partial

* Use local variable in 2fa recovery codes partial

8 years agofix regex filter (#1845)
abcang [Sun, 16 Apr 2017 14:33:38 +0000 (23:33 +0900)]
fix regex filter (#1845)

* fix regex filter

* fixed br to linebreak and, stlip tags.

* change to send raw content

* changed to unescape in reducer

8 years agoRemove .keep in models (#1892)
tackeyy [Sun, 16 Apr 2017 14:28:52 +0000 (23:28 +0900)]
Remove .keep in models (#1892)

8 years agoAdd presence validation to Import (#1928)
alpaca-tc [Sun, 16 Apr 2017 14:28:26 +0000 (23:28 +0900)]
Add presence validation to Import (#1928)

```
*An* `ActiveRecord::StatementInvalid` *occurred while* `POST </settings/import>` *was processed by* `imports#create`
Exception
----------------
PG::NotNullViolation: ERROR:  null value in column "type" violates not-null constraint
```

8 years agoAdd the licence key in package.json (#1914)
Alda Marteau-Hardi [Sun, 16 Apr 2017 14:08:11 +0000 (16:08 +0200)]
Add the licence key in package.json (#1914)

8 years agoFix translation related to "mute" (#1926)
mshrtkch [Sun, 16 Apr 2017 14:07:58 +0000 (23:07 +0900)]
Fix translation related to "mute" (#1926)

8 years agoAdd missing Japanese translations (#1923)
Kazuhiro NISHIYAMA [Sun, 16 Apr 2017 14:07:45 +0000 (23:07 +0900)]
Add missing Japanese translations (#1923)

And `i18n-tasks add-missing -l ja` changes some quotes.

8 years agoRelax Ruby version requirement (#1901)
Akihiko Odaki [Sun, 16 Apr 2017 12:57:30 +0000 (21:57 +0900)]
Relax Ruby version requirement (#1901)

8 years agoImprove PT locale on simple_form (#1917)
Eduardo Elias [Sun, 16 Apr 2017 12:56:04 +0000 (13:56 +0100)]
Improve PT locale on simple_form (#1917)

* Improve PT locale on simple_form

* Add missing keys to PT locale

8 years agoFixed NoMethodError in UnfollowService (#1918)
alpaca-tc [Sun, 16 Apr 2017 12:55:43 +0000 (21:55 +0900)]
Fixed NoMethodError in UnfollowService (#1918)

8 years agoFix yaml issue in ja locale (#1916)
Matt Jankowski [Sun, 16 Apr 2017 12:55:04 +0000 (08:55 -0400)]
Fix yaml issue in ja locale (#1916)

* Fix yaml parse issue in ja.yml locale

* Fix issue in locales/ja.jsx

8 years agoSyntax error in japanese localisation (#1920)
Naouak [Sun, 16 Apr 2017 12:54:09 +0000 (14:54 +0200)]
Syntax error in japanese localisation (#1920)

assets:precompile was failling because of this missing comma.

8 years agoAdd missing french translation. (#1906)
Erwan Leboucher [Sun, 16 Apr 2017 12:15:03 +0000 (14:15 +0200)]
Add missing french translation. (#1906)

* Add missing french translation.

Causing this error:
[React Intl] Missing message: "navigation_bar.mutes" for locale: "fr",

* Update fr.jsx

8 years agoEnlarge font size to avoid autozooming of iPhone. (#1911)
Yuki Nakagawa [Sun, 16 Apr 2017 12:05:16 +0000 (21:05 +0900)]
Enlarge font size to avoid autozooming of iPhone. (#1911)

8 years agoImprove Japanese translation (#1909)
George Hattori [Sun, 16 Apr 2017 11:44:57 +0000 (20:44 +0900)]
Improve Japanese translation (#1909)

8 years agoAdd binstub for rspec from rspec-core (#1913)
Matt Jankowski [Sun, 16 Apr 2017 11:42:45 +0000 (07:42 -0400)]
Add binstub for rspec from rspec-core (#1913)

8 years agoUpdate Japanese Translate (#1903)
新都心(Neet Shin) [Sun, 16 Apr 2017 11:42:16 +0000 (17:12 +0530)]
Update Japanese Translate (#1903)

* [Update ja.jsx] Add Muted, Video_error and sorted

* [Update ja] Added Recovery code's translation

* [Update ja] Added Two-fact/Recovery's translation

* Update ja.jsx

8 years agoUnite all mandatory rake tasks in mastodon:daily (#1887)
Eugen [Sun, 16 Apr 2017 10:53:58 +0000 (12:53 +0200)]
Unite all mandatory rake tasks in mastodon:daily (#1887)

* Unite all mandatory rake tasks in mastodon:daily
Add mastodon:media:remove_remote task
Make mastodon:maintenance:add_static_avatars more resilient to exceptions

* Fix typo in task description

8 years agolock capistrano to 3.8.0 (#1890)
Alex Dunn [Sun, 16 Apr 2017 10:52:18 +0000 (03:52 -0700)]
lock capistrano to 3.8.0 (#1890)

8 years agoMake file attachment on MediaAttachment optional (#1865)
Eugen [Sun, 16 Apr 2017 10:51:30 +0000 (12:51 +0200)]
Make file attachment on MediaAttachment optional (#1865)

Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true
Clean up old media files when creating a new domain block with reject_media set to true
Return remote_url in media attachments API if local file is not present
Undo domain block action in admin UI
Ability to enable reject_media from admin UI

8 years agoFix up recovery codes design a little (#1866)
Eugen [Sun, 16 Apr 2017 02:32:57 +0000 (04:32 +0200)]
Fix up recovery codes design a little (#1866)

8 years agoRemove unused gem: coffee-rails (#1885)
luigi [Sun, 16 Apr 2017 02:02:29 +0000 (04:02 +0200)]
Remove unused gem: coffee-rails (#1885)

8 years agoLeave out the "Expires" header from S3 uploads (#1886)
Joachim Viide [Sun, 16 Apr 2017 02:01:58 +0000 (05:01 +0300)]
Leave out the "Expires" header from S3 uploads (#1886)

8 years agocapistrano: allow overriding repo_url and branch (#1889)
Alex Dunn [Sun, 16 Apr 2017 02:01:27 +0000 (19:01 -0700)]
capistrano: allow overriding repo_url and branch (#1889)

8 years agoView spec fix (#1888)
Matt Jankowski [Sun, 16 Apr 2017 01:40:33 +0000 (21:40 -0400)]
View spec fix (#1888)

* Add option to disable verify partial doubles

* Add show_landing_strip? helper method

* Use show_landing_strip? helper in accounts and stream entries views

* Fix naming in view specs

8 years agoFix #1852 - Ensure feeds have valid <title> tags (#1875)
Eugen [Sun, 16 Apr 2017 00:40:36 +0000 (02:40 +0200)]
Fix #1852 - Ensure feeds have valid <title> tags (#1875)

8 years agoShow error message if video cannot be loaded (#1879)
Isabelle Knott [Sat, 15 Apr 2017 23:12:47 +0000 (19:12 -0400)]
Show error message if video cannot be loaded (#1879)

8 years agoRemoved Heroku in-process spawning. (#1873)
Ash Furrow [Sat, 15 Apr 2017 21:02:13 +0000 (17:02 -0400)]
Removed Heroku in-process spawning. (#1873)

8 years agoIndicate when a toot is part of a chain with a "reply all" icon (#1869)
Eugen [Sat, 15 Apr 2017 20:48:41 +0000 (22:48 +0200)]
Indicate when a toot is part of a chain with a "reply all" icon (#1869)

8 years agoFix cross-origin integrity (#1871)
Eugen [Sat, 15 Apr 2017 20:48:30 +0000 (22:48 +0200)]
Fix cross-origin integrity (#1871)

See <https://glitch.social/users/bea/updates/434>

8 years agoEnglish localization for mention notification was missing (#1867)
Eugen [Sat, 15 Apr 2017 20:48:17 +0000 (22:48 +0200)]
English localization for mention notification was missing (#1867)

8 years agoCheck for a custom css file to help customization of instances (#1368)
Naouak [Sat, 15 Apr 2017 20:47:48 +0000 (22:47 +0200)]
Check for a custom css file to help customization of instances (#1368)

* User can create a custom.scss to customize their instance without modifying gitted files.

* Add documentation for customization.

* Forgot the helper file

* Fix Style to pass codeclimate

* Requests from maintainer.

8 years agoMake the rake mastodon:users:clear task properly clear out unconfirmed users (#1777)
Eugen [Sat, 15 Apr 2017 19:55:28 +0000 (21:55 +0200)]
Make the rake mastodon:users:clear task properly clear out unconfirmed users (#1777)

Before it cleared out user records only (e-mail, password) without
freeing up the associated username (account record). Furthermore, since
these records have no dependent records (due to no user activity)
they can be deleted quickly with delete_all instead of destroy

8 years agoActiveRecord::NotFound is not defined (#1864)
alpaca-tc [Sat, 15 Apr 2017 19:17:59 +0000 (04:17 +0900)]
ActiveRecord::NotFound is not defined (#1864)

8 years agoFix typo in simple_form.eo.yml (#1848)
oliverkeeble [Sat, 15 Apr 2017 14:46:48 +0000 (15:46 +0100)]
Fix typo in simple_form.eo.yml (#1848)

8 years agoGive SINGLE_USER a chance to register (#1820)
Marcin Cieślak [Sat, 15 Apr 2017 14:46:27 +0000 (16:46 +0200)]
Give SINGLE_USER a chance to register (#1820)

An attempt to open a brand new Mastodon instance configured
as SINGLE_USER_MODE=true will cause an exception.

Enable temporary registration if we have no users in the database

Fixes #1817

8 years agoAdd password reset for users from admin accounts area (#1841)
Matt Jankowski [Sat, 15 Apr 2017 14:44:59 +0000 (10:44 -0400)]
Add password reset for users from admin accounts area (#1841)

8 years agoRemove isRequired from optional prop (#1843)
Henry Smith [Sat, 15 Apr 2017 14:44:28 +0000 (16:44 +0200)]
Remove isRequired from optional prop (#1843)

8 years agoFix function call name typo (#1851)
Henry Smith [Sat, 15 Apr 2017 14:41:22 +0000 (16:41 +0200)]
Fix function call name typo (#1851)

8 years agoAbout page contact email (#1839)
Matt Jankowski [Sat, 15 Apr 2017 11:33:25 +0000 (07:33 -0400)]
About page contact email (#1839)

* Correct site_contact_email typo

* Separate about more page into partials, add specs

8 years agoAdd rails-i18n gem (#1837)
Hiromi Kai [Sat, 15 Apr 2017 11:32:53 +0000 (20:32 +0900)]
Add rails-i18n gem (#1837)

8 years agoSilence Devise deprecation warning about TestHelpers (#1840)
Matt Jankowski [Sat, 15 Apr 2017 11:30:57 +0000 (07:30 -0400)]
Silence Devise deprecation warning about TestHelpers (#1840)

Devise changed their approach -
https://github.com/plataformatec/devise/commit/3f3ec236bb50a2ae8b0eede90d8f7ecd201d7dbb

This change silences a deprecation warning about `TestHelpers`

8 years agoviews/about: use Setting.site_title instead of hardcoding (#1508)
Alex Dunn [Sat, 15 Apr 2017 11:28:09 +0000 (04:28 -0700)]
views/about: use Setting.site_title instead of hardcoding (#1508)

8 years agoAdd eslint-plugin-jsx-a11y (#1651)
Zac Anger [Sat, 15 Apr 2017 11:27:27 +0000 (05:27 -0600)]
Add eslint-plugin-jsx-a11y (#1651)

* Add eslint-plugin-jsx-a11y.

* Fix npm script.

* Adjust npm scripts so test also runs lint.

* Fix existing lint errors.

* Don't break on a11y issues.

* Add role and tabIndex.

* Add vim and Mac files to .gitignore and .dockerignore.

* Handle htmlFor (partially), a that's actually a button.

* Fix missing tabIndex.

* Add cursor:pointer to load-more

* Revert change to load_more.

* Fixes based on review.

* Update yarn.lock.

* Don't try to install fsevents on Linux (hides warning noise).

8 years agoAdd recovery code support for two-factor auth (#1773)
Patrick Figel [Sat, 15 Apr 2017 11:26:03 +0000 (13:26 +0200)]
Add recovery code support for two-factor auth (#1773)

* Add recovery code support for two-factor auth

When users enable two-factor auth, the app now generates ten
single-use recovery codes. Users are encouraged to print the codes
and store them in a safe place.

The two-factor prompt during login now accepts both OTP codes and
recovery codes.

The two-factor settings UI allows users to regenerated lost
recovery codes. Users who have set up two-factor auth prior to
this feature being added can use it to generate recovery codes
for the first time.

Fixes #563 and fixes #987

* Set OTP_SECRET in test enviroment

* add missing .html to view file names

8 years agoAdd some missing Spanish translations (#1818)
luigi [Sat, 15 Apr 2017 11:25:00 +0000 (13:25 +0200)]
Add some missing Spanish translations (#1818)

* Add missing spanish translations on user settings

simple_form.es.yml

* Fix typo: Aute/ción. should be Autenticación

8 years agoUpdate ja.jsx (#1822)
Amakasu Ryoma [Sat, 15 Apr 2017 11:24:33 +0000 (20:24 +0900)]
Update ja.jsx (#1822)

* Add getting_started.apps
* Add search_results.total
* Fix notifications.settings

8 years agoFix Japanese translation of ja.yml (#1835)
Setuu [Sat, 15 Apr 2017 11:18:08 +0000 (20:18 +0900)]
Fix Japanese translation of ja.yml (#1835)

8 years agoAdd a classname to the loading bar (#1826)
Alda Marteau-Hardi [Sat, 15 Apr 2017 11:17:54 +0000 (13:17 +0200)]
Add a classname to the loading bar (#1826)

8 years agofixed privacy mistake of japanese translation of privacy.change (#1832)
Keiji, Yoshimi [Sat, 15 Apr 2017 11:17:20 +0000 (20:17 +0900)]
fixed privacy mistake of japanese translation of privacy.change (#1832)

8 years agoAdd tasks for open/close registration (#1823)
Andrew [Sat, 15 Apr 2017 11:17:07 +0000 (04:17 -0700)]
Add tasks for open/close registration (#1823)

* Add tasks for open/close registration

* Code climate style fix

* Use true instead of string 'true'

8 years agoActiveRecord::Relation does not respond to `#id` (#1834)
alpaca-tc [Sat, 15 Apr 2017 11:16:24 +0000 (20:16 +0900)]
ActiveRecord::Relation does not respond to `#id` (#1834)

8 years agoAccount search service refactor (#1791)
Matt Jankowski [Sat, 15 Apr 2017 01:17:07 +0000 (21:17 -0400)]
Account search service refactor (#1791)

* Begin coverage for account search service

* Coverage for hashtag query

* Coverage for calling local vs remote find based on domain presence

* Spec to check that exact matches are not duped

* Coverage of resolve option

* Coverage for account being provided

* Start to refactor account search service

* Isolate query username and domain methods

* Isolate exact_match method

* Extract methods for local and remote results

* Simplify local vs remote and account isoliation

* Extract methods for local and remote results

* Simplify de-dupe of exact match

* Simplify logic to check for non exact remotes

* Cache some methods

* Remove nil from exact_match from results array

* Return exact matches first

* Use find_remote even with no domain

Account.find_local is just an alias for Account.find_remote(user, nil) - so we
can not bother with the conditional here, and call find_remote directly.

8 years agoRefresh webfinger (#1323)
ThibG [Sat, 15 Apr 2017 01:16:05 +0000 (03:16 +0200)]
Refresh webfinger (#1323)

* Refresh local info for remote accounts when webfinger returns new values

It only refreshes account info if one of the URLs or the public-key changes,
in which cases it refreshes the full info, re-downloading the feeds from that
user.

Some special handling should probably be done when the public key changes,
but I have been unable to find any use for it in Mastodon yet.

* Re-fetch remote users we aren't subscribed to.

This might induce performance issues, we might want to only do that for users
we explicitly attempted to subscribe but failed to.

* Refactor changes

* Do not refresh existing remote account details more than once a day

* Avoid re-fetching webfinger info in tests unless otherwise specified

8 years agoRename admin/accounts_helper to admin/filter_helper (#1816)
Matt Jankowski [Sat, 15 Apr 2017 01:09:55 +0000 (21:09 -0400)]
Rename admin/accounts_helper to admin/filter_helper (#1816)

- Add some spec coverage for both methods
- Add explicit constant call-outs for where the params are from

8 years agojslint: fix jslint warnings (#1704)
Koala Yeung [Sat, 15 Apr 2017 00:57:26 +0000 (08:57 +0800)]
jslint: fix jslint warnings (#1704)

* jslint: remove trailing space

* jslint: fix no-nested-ternary issue

Follow the jslint [no-nested-ternary](http://eslint.org/docs/rules/no-nested-ternary)
rule. Rewritten ternary with if-then.

8 years agoUpdate devise.fr.yml (#1728)
goofy-bz [Sat, 15 Apr 2017 00:55:43 +0000 (02:55 +0200)]
Update devise.fr.yml (#1728)

Very light grammar fix to improve gender-neutral

8 years agoAdd translations for zh-TW (Taiwan) (#1794)
Shouko Yu [Sat, 15 Apr 2017 00:49:43 +0000 (08:49 +0800)]
Add translations for zh-TW (Taiwan) (#1794)

8 years agoUpdate Traditional Chinese, HK (zh-HK) translation (#1759)
Koala Yeung [Sat, 15 Apr 2017 00:48:30 +0000 (08:48 +0800)]
Update Traditional Chinese, HK (zh-HK) translation (#1759)

* Fix missing string in javascript locale (zh-HK)

* Change javascript locale (zh-HK)

* Fix some other strings that were still English.
* Improve `search.status_by`.
* Fix `notification.follow`. ("開始開始你")
* Changes according to user feedback.
  * "Back": "較前顯示" -> "返回"
  * "Home": "家" -> "主頁"

* Update ruby locale (zh-HK)

* Fix missing translation
* Normalize yml
* Update translation strings

8 years agoUpdate nl.yml (#1764)
Fjoerfoks [Sat, 15 Apr 2017 00:45:46 +0000 (02:45 +0200)]
Update nl.yml (#1764)

Some rewording, typos and switching to infinitve

8 years agoUpdate nl.jxs (#1766)
Fjoerfoks [Sat, 15 Apr 2017 00:44:33 +0000 (02:44 +0200)]
Update nl.jxs (#1766)

Some rewording and switching to infinitive localization.

8 years agoUpdate devise.fr.yml (#1792)
Olivier Humbert [Sat, 15 Apr 2017 00:44:10 +0000 (02:44 +0200)]
Update devise.fr.yml (#1792)

* Update devise.fr.yml

Consistencies across the French translation

* Update doorkeeper.fr.yml

8 years agoUpdate Russian translation (#1733)
Ratmir Karabut [Sat, 15 Apr 2017 00:43:51 +0000 (03:43 +0300)]
Update Russian translation (#1733)

* 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

8 years agoUse site title on tags#show page (#1802)
Matt Jankowski [Sat, 15 Apr 2017 00:37:20 +0000 (20:37 -0400)]
Use site title on tags#show page (#1802)

8 years agoadd basic microformats tests (#1803)
Ben Roberts [Sat, 15 Apr 2017 00:37:00 +0000 (20:37 -0400)]
add basic microformats tests (#1803)

as suggested, moving to view tests rather than a controller test
replaces https://github.com/tootsuite/mastodon/pull/1786 which i will
close momentary

8 years agoMore Norwegian translations (#1805)
Thor Harald Johansen [Sat, 15 Apr 2017 00:33:37 +0000 (02:33 +0200)]
More Norwegian translations (#1805)

* Working translation for Norwegian.

* Fixes to Norwegian translation.

* Further adjustments to Norwegian translation.

* Further adjustments to Norwegian translation.

* Yet more improvements to the Norwegian translation.

* More Norwegian translations. Better terminology.

8 years agoSend initial state in a <script type="application/json"> tag (#1806)
Joachim Viide [Sat, 15 Apr 2017 00:32:42 +0000 (03:32 +0300)]
Send initial state in a <script type="application/json"> tag (#1806)

8 years agoMispelling & minor fixes (#1814)
Darío Hereñú [Sat, 15 Apr 2017 00:31:16 +0000 (21:31 -0300)]
Mispelling & minor fixes (#1814)

8 years agoRemove unused will_paginate.page_gap key from i18n (#1815)
Matt Jankowski [Sat, 15 Apr 2017 00:30:55 +0000 (20:30 -0400)]
Remove unused will_paginate.page_gap key from i18n (#1815)

This value was changed recently, and every locale which had it set was using the
same value as the default. This value is still the default in the new location.

8 years ago[css] reduce spacing between text elements on about pages (#1510)
Alex Dunn [Sat, 15 Apr 2017 00:29:32 +0000 (17:29 -0700)]
[css] reduce spacing between text elements on about pages (#1510)

8 years agoPolish translation (needs more love though) (#807)
rysiekpl [Sat, 15 Apr 2017 00:22:46 +0000 (02:22 +0200)]
Polish translation (needs more love though) (#807)

* Polish translation (needs more love though)

* Polish translation bugfix

* bugfix for new colon-containing texts

* another bugfix. yaml is evil

* minor fix

* fixing issues pointed out by reviewers

* Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer

* Etyczny dizajn zbyt sarkastyczny, to będą założenia

8 years agoAdd REDIS_DB env variable to configure Redis database (#1366)
Les Orchard [Sat, 15 Apr 2017 00:21:13 +0000 (20:21 -0400)]
Add REDIS_DB env variable to configure Redis database (#1366)

8 years agoAllow running mastodon on a different domain as the one used for identifying users...
ThibG [Sat, 15 Apr 2017 00:15:46 +0000 (02:15 +0200)]
Allow running mastodon on a different domain as the one used for identifying users (#1267)

* Allow running mastodon on a different domain as the one used for identifying users

* Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing

* Compare to web_domain instead of local_domain when dealing with feeds/API

* Correctly identify mentions to local accounts

Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.

8 years agoUse image too in docker-compose (#1109)
Pierre Ozoux [Sat, 15 Apr 2017 00:07:59 +0000 (01:07 +0100)]
Use image too in docker-compose (#1109)

* Use image too in docker-compose

It is possible with version 2 of compose to use both `build` and `image`

* Update docker-compose.yml

8 years agoCustom Paperclip path. (#778)
Valentin Lorentz [Sat, 15 Apr 2017 00:07:21 +0000 (02:07 +0200)]
Custom Paperclip path. (#778)

* Custom Paperclip path.

* Document PAPERCLIP_ROOT.

* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).

8 years agoupdate Node to 6.x LTS (#1228)
Alex Dunn [Sat, 15 Apr 2017 00:05:41 +0000 (17:05 -0700)]
update Node to 6.x LTS (#1228)

The 4.x branch [entered maintenance](https://github.com/nodejs/LTS#lts-schedule1) on 1 April.

8 years agoAdd list of muted user to UI and Getting Started (#1799)
Patrick Figel [Fri, 14 Apr 2017 23:23:49 +0000 (01:23 +0200)]
Add list of muted user to UI and Getting Started (#1799)

Add the same UI that already exists for blocked users for muted
ones and add it to the "Getting Started" menu.