]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoTranslate admin (#1702)
Thomas Citharel [Thu, 13 Apr 2017 19:49:07 +0000 (21:49 +0200)]
Translate admin (#1702)

* Translate the domain_block panel

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Translate PubSubHubbub section

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* translate account section and correct typos

* move reports translation & translate sidebar

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* normalize l18n

8 years agosmtp delivery type fix (#1556)
James Moore [Thu, 13 Apr 2017 17:51:49 +0000 (10:51 -0700)]
smtp delivery type fix (#1556)

* delivery fix

# Conflicts:
# config/environments/production.rb

* added stub in .env file

* reordered and added a comment

8 years agoterms: remove redundant words (#1578)
Alyssa Ross [Thu, 13 Apr 2017 17:50:19 +0000 (18:50 +0100)]
terms: remove redundant words (#1578)

"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.

8 years agoquick typo fix in en.jsx: Rejec -> Reject (#1701)
R Tucker [Thu, 13 Apr 2017 17:37:04 +0000 (13:37 -0400)]
quick typo fix in en.jsx: Rejec -> Reject (#1701)

8 years agoFix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)
Eugen [Thu, 13 Apr 2017 17:36:41 +0000 (19:36 +0200)]
Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699)

Fix username styling regression introduced in #1063
Fix report screen background regression introduced in #1415

8 years agoFix #1609, fix #1628 - Revert #1397 (#1700)
Eugen [Thu, 13 Apr 2017 17:23:36 +0000 (19:23 +0200)]
Fix #1609, fix #1628 - Revert #1397 (#1700)

When transmitting data in a HTML-encoded element like <content type="html" />,
relying on newlines being preserved is not wise, since HTML by itself
does not care for newlines - it cares for <p> and <br>

Additional fix: reset NSFW toggle after sending toot

8 years agoApply `i18n-tasks normalize` to locales (#1696)
Eugen [Thu, 13 Apr 2017 17:18:32 +0000 (19:18 +0200)]
Apply `i18n-tasks normalize` to locales (#1696)

8 years agotranslation: Fix comment out issue in en.jsx (#1698)
INAGAKI Hiroshi [Thu, 13 Apr 2017 15:11:18 +0000 (00:11 +0900)]
translation: Fix comment out issue in en.jsx (#1698)

8 years agoFix minor jslint issue (#1697)
Koala Yeung [Thu, 13 Apr 2017 15:10:48 +0000 (23:10 +0800)]
Fix minor jslint issue (#1697)

* Undefined propType in react component `ColumnSettings`.
  Add proper PropTypes definition.

8 years agoMerge branch 'blackle-videolightbox'
Eugen Rochko [Thu, 13 Apr 2017 15:01:52 +0000 (17:01 +0200)]
Merge branch 'blackle-videolightbox'

8 years agoAdd overlay style to buttons, continue video after expanding it
Eugen Rochko [Thu, 13 Apr 2017 15:01:09 +0000 (17:01 +0200)]
Add overlay style to buttons, continue video after expanding it

8 years agoMerge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videol...
Eugen Rochko [Thu, 13 Apr 2017 14:14:11 +0000 (16:14 +0200)]
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox

8 years agoIgnore postgres/redis folder from docker-compose (#1645)
Lukas Burk [Thu, 13 Apr 2017 14:04:20 +0000 (16:04 +0200)]
Ignore postgres/redis folder from docker-compose (#1645)

8 years agoConvert emoji shortnames when sending status (#1666)
Rachel H [Thu, 13 Apr 2017 14:03:45 +0000 (07:03 -0700)]
Convert emoji shortnames when sending status (#1666)

8 years agoAdd Dutch translation (nl) (#1682)
Koala Yeung [Thu, 13 Apr 2017 14:02:23 +0000 (22:02 +0800)]
Add Dutch translation (nl) (#1682)

* Dutch language files for Ruby code

 * Created RoR translation ymls:
   * config/locales/devise.nl.yml
   * config/locales/doorkeeper.nl.yml
   * config/locales/nl.yml
   * config/locales/simple_form.nl.yml

 * Modified RoR config and helper
   * app/helpers/settings_helper.rb
   * config/application.rb

* Dutch language javascript locale

 * Created javascript locale files:
   * app/assets/javascripts/components/locales/index.jsx
   * app/assets/javascripts/components/locales/nl.jsx

 * Reference the newly created locale files:
   * app/assets/javascripts/components/containers/mastodon.jsx

* Fix syntax error in locale file (nl)

* Fix missing translate in js locale (nl)

* Convert all ruby Dutch locale (nl) file to utf8

Fix yml conversion issues.

* Fix duplicated key in devise.nl.yml

* Fix indentation error in doorkeeper.nl.yml

8 years agoFix issue where 'sensitive content click to show' item takes up whole screen on publi...
Isabelle Knott [Thu, 13 Apr 2017 14:00:56 +0000 (10:00 -0400)]
Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692)

8 years agoOrganize coverage dirs (#1695)
Matt Jankowski [Thu, 13 Apr 2017 14:00:31 +0000 (10:00 -0400)]
Organize coverage dirs (#1695)

* Add `Presenters` group to SimpleCov configuration

* Move validators to app/validators, add to simplecov config

8 years agoDo not show media attachment as og:image if it was marked as NSFW (#1693)
Isabelle Knott [Thu, 13 Apr 2017 13:59:43 +0000 (09:59 -0400)]
Do not show media attachment as og:image if it was marked as NSFW (#1693)

8 years agoFix language export variables (#1689)
Matt Jankowski [Thu, 13 Apr 2017 13:59:12 +0000 (09:59 -0400)]
Fix language export variables (#1689)

* Fix naming of JS locale constants

* Improve the translation instructions re: const names

8 years agoFix csv export coverage in export spec (#1691)
Matt Jankowski [Thu, 13 Apr 2017 13:29:30 +0000 (09:29 -0400)]
Fix csv export coverage in export spec (#1691)

8 years agoAllow video to be expanded into lightbox
blackle [Thu, 13 Apr 2017 13:04:18 +0000 (09:04 -0400)]
Allow video to be expanded into lightbox

8 years ago[l10n] ja: update missing Japanese translations (#1687)
YOSHIOKA Eiichiro [Thu, 13 Apr 2017 12:39:14 +0000 (21:39 +0900)]
[l10n] ja: update missing Japanese translations (#1687)

8 years ago[l10n] ja: update missing Japanese translations (#1684)
Musee U [Thu, 13 Apr 2017 11:40:58 +0000 (04:40 -0700)]
[l10n] ja: update missing Japanese translations (#1684)

8 years agoExclude javascript locale file from dup check (#1677)
Koala Yeung [Thu, 13 Apr 2017 11:40:25 +0000 (19:40 +0800)]
Exclude javascript locale file from dup check (#1677)

* Exclude javascript locale files form Code Climate's duplication
  engine. It is silly to have duplication check with locale files.
  They are supposed to look similar.

* Prevent unnecessary blocking for translation updates (like #1661)

8 years agoAdded Italian language (it) (#1679)
Matteo Aquila [Thu, 13 Apr 2017 11:39:00 +0000 (13:39 +0200)]
Added Italian language (it) (#1679)

8 years agoAdds Croatian language [Hrvatski] (#1000)
May Kittens Devour Your Soul [Thu, 13 Apr 2017 11:38:44 +0000 (13:38 +0200)]
Adds Croatian language [Hrvatski] (#1000)

* Create simple.form.hr.yml

* Create hr.yml

* Update hr.yml

* Update hr.yml

* Create doorkeeper.hr.yml

* Create devise.hr.yml

8 years agofix Portuguese translation (#1661)
Hugo Gameiro [Thu, 13 Apr 2017 11:25:34 +0000 (12:25 +0100)]
fix Portuguese translation (#1661)

* update portuguese translation

added the missing fields and improved the translation

* pt translations fix

* improve last translation commit

* fix damn quotes

8 years agoUpdate Japanese translation files (#1640)
新都心(Neet Shin) [Thu, 13 Apr 2017 11:23:45 +0000 (16:53 +0530)]
Update Japanese translation files (#1640)

* [l10n] ja: Improve Japanese Translations

* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
* Update ja.jsx

* Update doorkeeper.ja.yml

* Update ja.yml

* Update ja.jsx

* Update ja.jsx

8 years agoUpdate Russian translation (#1570)
Ratmir Karabut [Thu, 13 Apr 2017 11:23:23 +0000 (14:23 +0300)]
Update Russian translation (#1570)

* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

8 years agoFix #624 - Add localization for Bulgarian (#645)
Svetlozar Todorov [Thu, 13 Apr 2017 11:16:28 +0000 (14:16 +0300)]
Fix #624 - Add localization for Bulgarian (#645)

* Add translation files and declarations for Bulgarian

* Add a bunch of translations to bg.jsx

* Add rest of translations to bg.jsx

* Add devise translations

* Fix devise translations

8 years agoUse input type `number` for Two-factor code (#1683)
Daijiro Wachi [Thu, 13 Apr 2017 11:13:17 +0000 (13:13 +0200)]
Use input type `number` for Two-factor code (#1683)

8 years agoClean up well-known routes/controllers (#1649)
Matt Jankowski [Thu, 13 Apr 2017 11:09:07 +0000 (07:09 -0400)]
Clean up well-known routes/controllers (#1649)

* Add request spec for host meta route returning xml

* Add routing spec for xrd routes

* Update well-known routes

* Move webfinger and host-meta actions to their own controllers

8 years agoAdmin accounts controller cleanup (#1664)
Matt Jankowski [Thu, 13 Apr 2017 11:04:23 +0000 (07:04 -0400)]
Admin accounts controller cleanup (#1664)

* Remove unused account_params method in admin/accounts controller

* Introduce AccountFilter to find accounts

* Use AccountFilter in admin/accounts controller

* Use more restful routes admin silence and suspension area

* Add admin/silences and admin/suspensions controllers

8 years agoSettings export refactor (#1646)
Matt Jankowski [Thu, 13 Apr 2017 11:02:02 +0000 (07:02 -0400)]
Settings export refactor (#1646)

* Refactor Export to take an account and know about the export types

* Use Export instance in settings/exports#show

8 years agoUpdate javascript English translation files and some defaultValue (#1676)
Koala Yeung [Thu, 13 Apr 2017 10:57:41 +0000 (18:57 +0800)]
Update javascript English translation files and some defaultValue (#1676)

* Reorder javascript English locale file

 * Reorder translation string in order of the locale key.

* Add javascript English locale missing language keys

 * Search all javascript language keys by command:
   `grep -REho '<FormattedMessage .*\/>' ./app/assets/javascripts/.`

 * Add all the missing language keys and their values to `en.jsx`.

* Add javascript English locale missing language keys (2)

* Find all `defineMessages` calls with this command:
  `grep -Rl 'defineMessages({.*' ./app/assets/javascripts/.`

* Open all these files. Find the language key (`id`) in these
  statements.

* Add all the missing language keys and their values to `en.jsx`.

* Remove javascript English locale obsoleted language keys

 * Find all language keys that no longer exists in the source code
  and remove them. The removed keys include:

    * "compose_form.private"
    * "compose_form.unlisted"
    * "getting_started.about_addressing"
    * "getting_started.about_shortcuts"
    * "notification.mention"
    * "search.account"
    * "search.hashtag"
    * "tabs_bar.mentions"
    * "tabs_bar.public"

* Javascript English locale file add note

 * Add notes to contributors about the English translation files.
   Hope that will make translation process smoother.

* Update javascript locale defaultValue in code

 * Update the defaultValue in code according to the relevant
   translation in English locale file.

8 years agoClear spoiler when replying to toot that doesn't also have a spoiler (#1662)
Isabelle Knott [Thu, 13 Apr 2017 01:17:34 +0000 (21:17 -0400)]
Clear spoiler when replying to toot that doesn't also have a spoiler (#1662)

8 years agoRemove pending specs for methods that dont exist (#1658)
Matt Jankowski [Thu, 13 Apr 2017 00:51:13 +0000 (20:51 -0400)]
Remove pending specs for methods that dont exist (#1658)

* Remote spec for non-existent entry_classes helper method

This method no longer exists, and is handled by a local variable in a partial
instead.

* Remove spec for non-existent Account#ping! method

8 years agoSmoother scrolling on older iOS devices (#1654)
tom [Thu, 13 Apr 2017 00:50:56 +0000 (20:50 -0400)]
Smoother scrolling on older iOS devices (#1654)

This may address the scrolling issues mentioned here: https://github.com/tootsuite/mastodon/issues/1622

8 years agoFix tests issue introduced in #1607 (#1639)
Eugen [Thu, 13 Apr 2017 00:17:40 +0000 (02:17 +0200)]
Fix tests issue introduced in #1607 (#1639)

8 years agoAdjustments to the Norwegian translation (#1648)
Thor Harald Johansen [Thu, 13 Apr 2017 00:17:26 +0000 (02:17 +0200)]
Adjustments to the Norwegian translation (#1648)

* Working translation for Norwegian.

* Fixes to Norwegian translation.

* Further adjustments to Norwegian translation.

* Further adjustments to Norwegian translation.

8 years agoUse shift+click instead of alt+click to bypass boost dialog (#1638)
Isabelle Knott [Thu, 13 Apr 2017 00:15:45 +0000 (20:15 -0400)]
Use shift+click instead of alt+click to bypass boost dialog (#1638)

8 years agoFix visuals introduced in #1463 (#1634)
Eugen [Wed, 12 Apr 2017 18:54:49 +0000 (20:54 +0200)]
Fix visuals introduced in #1463 (#1634)

8 years ago[l10n] ja: Improve Japanese Translations (#1631)
lindwurm [Wed, 12 Apr 2017 18:41:50 +0000 (03:41 +0900)]
[l10n] ja: Improve Japanese Translations (#1631)

* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
8 years agoFix missing compose box when viewport width is exactly 1024px (#1632)
Isabelle Knott [Wed, 12 Apr 2017 18:40:03 +0000 (14:40 -0400)]
Fix missing compose box when viewport width is exactly 1024px (#1632)

8 years agoAdded norwegian version of terms of service and privacy policy (#1625)
Knut Erik [Wed, 12 Apr 2017 18:28:56 +0000 (20:28 +0200)]
Added norwegian version of terms of service and privacy policy (#1625)

8 years agofix Japanese translation (#1623)
pinfort [Wed, 12 Apr 2017 18:19:38 +0000 (03:19 +0900)]
fix Japanese translation (#1623)

* add device.ja.yml

* update device.ja.yml

* add file simple_form.ja.yml

* 👍Added doorkeeper.ja.yml

* add ja.yml

* Update doorkeeper.ja.yml

fixed url to uri

* update ja.yml

* fix some translations

* fix japanese grammar of a translate

* fix some translates

* fix ja.yml

* add ja.jsx

* add Japanese user mail views

* Added japanese translate locales

* Added :ja to available_locales

こっちも

* Added "日本語" to HUMAN_LOCALES

* Imported/Added ja to addLocaleData

* update ja.jsx

* fix translations
翻訳の誤りの修正と改善

* freeの訳修正

* いいねをお気に入りに統一

* Revert "いいねをお気に入りに統一"

This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f.
間違ってtranslateブランチにコミットしたため取り消し

* Revert "freeの訳修正"

This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf.

* revertでミスったので戻す

* Revert "ミスったので戻す"

This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing
changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116.

* freeの訳修正

* いいねをお気に入りに統一

* 一回戻す

* 戻しきれてなかった

* 再度変更

* 戻す

* 再度変更

* 再度変更

* Update doorkeeper.ja.yml

Fixed a lot of unnatural translations

* Update ja.yml

資格情報 isn't easy to understanding. so fixed to ログイン情報.

* Update ja.yml

fixed some unnatural translations

* Update simple_form.ja.yml

Fixed wrong translate 「アカウント」 to 「アイコン画像」

* Update simple_form.ja.yml

* Update doorkeeper.ja.yml

* Revert "多くの不自然な翻訳を解消しました。"

* Update ja.jsx

fixed typo

* 文字化け修正

8 years agoFix incorrect notation in simple_form.ja.yml (#1620)
Manato Kameya [Wed, 12 Apr 2017 18:19:27 +0000 (03:19 +0900)]
Fix incorrect notation in simple_form.ja.yml (#1620)

8 years agoUpdate fr.jsx (#1551)
goofy-bz [Wed, 12 Apr 2017 18:11:09 +0000 (20:11 +0200)]
Update fr.jsx (#1551)

fixing to minor typos

8 years agosignificant improvement in microformats markup (#1063)
Ben Roberts [Wed, 12 Apr 2017 18:04:33 +0000 (14:04 -0400)]
significant improvement in microformats markup (#1063)

* significant improvement in microformats markup

This is a huge improvement and I believe will close #965.

Had these microformats reviewed by others in the community to help
ensure they are at least correct, if not complete.

I did not want to change the structure of the page, and so there it does
not fully mark up the entire ancestry chain, or reply chain, only the
direct decendants and direct ancestors are correctly associated, but
this is likely fine as the most important bit is to have access to the
urls for those toots which are now correctly fetchable.

* improve code climate

* trying to pass code climate tests

* code climate

* fix p-summary for content warning posts

* fix error introduced when merging via github

8 years agoUpdate fr.yml (#1600)
CgX [Wed, 12 Apr 2017 17:56:09 +0000 (19:56 +0200)]
Update fr.yml (#1600)

Mistake on %{link} variable

8 years agolocale-fr: fix typo (#1603)
karlyeurl [Wed, 12 Apr 2017 17:54:16 +0000 (19:54 +0200)]
locale-fr: fix typo (#1603)

In this case, the adjective applies to a feminine noun.

8 years agoImprove docker update instructions (#1619)
Eugen [Wed, 12 Apr 2017 17:34:40 +0000 (19:34 +0200)]
Improve docker update instructions (#1619)

8 years agovector (svg) logo with correct inner shape and colors (#1362)
Julien Deswaef [Wed, 12 Apr 2017 17:10:52 +0000 (13:10 -0400)]
vector (svg) logo with correct inner shape and colors (#1362)

* vector (svg) logo with correct inner shape and colors

* minimized svg logo

8 years agoFix target blank on "open_in_web" link (#1612)
David Libeau [Wed, 12 Apr 2017 17:09:58 +0000 (19:09 +0200)]
Fix target blank on "open_in_web" link (#1612)

When you render the "embed" view in an iframe, this link bugs when clicked, due to missing target blank.

8 years agoRequest documentation (#1616)
Shel R [Wed, 12 Apr 2017 16:27:33 +0000 (12:27 -0400)]
Request documentation (#1616)

This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.

8 years agoQuick best practice cleanup of views/helpers (#1546)
Matt Jankowski [Wed, 12 Apr 2017 16:24:18 +0000 (12:24 -0400)]
Quick best practice cleanup of views/helpers (#1546)

* Remove trailing whitespace

* Use query methods instead of explicit .blank? checks

8 years agoWebfinger resource to extract username from resource string (#1607)
Matt Jankowski [Wed, 12 Apr 2017 16:22:38 +0000 (12:22 -0400)]
Webfinger resource to extract username from resource string (#1607)

* Add WebfingerResource class to extract usernames

* Use WebfingerResource in xrd#webfinger

8 years agoFocus textarea when text is inserted (#1320)
Rachel H [Wed, 12 Apr 2017 16:21:07 +0000 (09:21 -0700)]
Focus textarea when text is inserted (#1320)

Place space after uploaded filenames

8 years agoAllow import/export of mutes list (#1541)
Matt Jankowski [Wed, 12 Apr 2017 16:20:44 +0000 (12:20 -0400)]
Allow import/export of mutes list (#1541)

* Allow export of mutes list

* Allow importing of mutes list

* Refactor to use Settings::Exports::BaseController and DRY up exports code

8 years agoAdd unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584)
Henry Smith [Wed, 12 Apr 2017 15:16:59 +0000 (17:16 +0200)]
Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584)

8 years agoAdded missing Spanish translations strings (#1292)
Carlos A. Escobar [Wed, 12 Apr 2017 15:16:40 +0000 (10:16 -0500)]
Added missing Spanish translations strings (#1292)

* Added missing Spanish translations strings

* fix bad translation

* resolve conflict with tootsuite/master

* agreements from spanish community

* Add some missing strings

8 years ago[web] Moving docs link to tootsuite/documentation (#1581)
lindwurm [Wed, 12 Apr 2017 15:13:19 +0000 (00:13 +0900)]
[web] Moving docs link to tootsuite/documentation (#1581)

related: https://github.com/tootsuite/mastodon/commit/1236529e39a7e2534fdd34686a749b5a386c109b and https://github.com/tootsuite/mastodon/commit/fc47c1d00e507f0bee2575c91822d68b72a22bac

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
8 years agoMake Reporting admin section translatable (#1549)
Thomas Citharel [Wed, 12 Apr 2017 15:11:49 +0000 (17:11 +0200)]
Make Reporting admin section translatable (#1549)

* Make Reporting admin section translatable

And translate it into english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Make subject of emails translatable and improve french translation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Make error pages translatable and translate them in english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Translate site setting section

* Insert instance in registration emails and improve them a bit

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
8 years agoWorking translation for Norwegian. (#1611)
Thor Harald Johansen [Wed, 12 Apr 2017 15:07:51 +0000 (17:07 +0200)]
Working translation for Norwegian. (#1611)

8 years agoParams compact deprecation warning (#1580)
Matt Jankowski [Wed, 12 Apr 2017 14:12:56 +0000 (10:12 -0400)]
Params compact deprecation warning (#1580)

* Move filter_link_to class formation to separate method in admin/accounts helper

* Remove deprecated #compact method usage on strong parameters

8 years agoSimplify the way the embed view is created (#1590)
Matt Jankowski [Wed, 12 Apr 2017 14:12:42 +0000 (10:12 -0400)]
Simplify the way the embed view is created (#1590)

* Add coverage for embedded status view

* Refactor embed view to eliminate @external_links variable

8 years agoDefault to json type for webfinger requests (#1583)
Matt Jankowski [Wed, 12 Apr 2017 14:03:37 +0000 (10:03 -0400)]
Default to json type for webfinger requests (#1583)

8 years agoClean up stylesheet organization (#1591)
Matt Jankowski [Wed, 12 Apr 2017 14:01:59 +0000 (10:01 -0400)]
Clean up stylesheet organization (#1591)

8 years agoSilence more scope order warnings (#1604)
Matt Jankowski [Wed, 12 Apr 2017 13:58:08 +0000 (09:58 -0400)]
Silence more scope order warnings (#1604)

8 years agoFix issue with intermittent api/v1/notifications failure (#1606)
Matt Jankowski [Wed, 12 Apr 2017 13:53:55 +0000 (09:53 -0400)]
Fix issue with intermittent api/v1/notifications failure (#1606)

The spec was checking the activity_id of the activities held in notifications
within the controller.

Because the activities are different models, it is possible that they are
created with the same database IDs, and when they are this spec fails because an
activity which should not count as a match is counted as one.

8 years agoFix redirect link on Tuning.md (#1595)
Christopher Su [Wed, 12 Apr 2017 10:40:37 +0000 (03:40 -0700)]
Fix redirect link on Tuning.md (#1595)

8 years agoAdd Traditional Chinese, Hong Kong translation (zh-HK) (#1544)
Koala Yeung [Wed, 12 Apr 2017 06:50:50 +0000 (14:50 +0800)]
Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544)

* Added Chinese Traditional Hong Kong (zh-HK) for Ruby

* Added translations for Ruby.

* Added Chinese Traditional Hong Kong (zh-HK) for JS

* Added translations for javascript code.

* Rearrange language references in mastodon.jsx

* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
  (only manually put English on top because it is default).

* Sort application.rb locale with alphabetical order

With exception that English (default language) goes first.
Improve code readability.

* Resort language selection box alphabetically

Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).

Improve usability.

8 years agoupdate Docker section of README (#1231)
Eric Blade [Tue, 11 Apr 2017 23:14:56 +0000 (19:14 -0400)]
update Docker section of README (#1231)

Re-ordered the steps so it doesn't read "Do this, but first, do this
other step"
Added note about keeping the REDIS and DB settings as they are for
Docker use
Add which variables you will NEED to set to make the Mastodon work
Add how to generate the secrets
Add how to connect to your Mastodon
Add a note to read the Production-guide

8 years agoChange default log level in production from :debug to :info for less I/O (#1579)
Eugen [Tue, 11 Apr 2017 21:28:23 +0000 (23:28 +0200)]
Change default log level in production from :debug to :info for less I/O (#1579)

8 years agoImprove emoji picker look (#1493)
Eugen [Tue, 11 Apr 2017 21:23:34 +0000 (23:23 +0200)]
Improve emoji picker look (#1493)

* Improve emoji picker look

* Add hover animation to emojis in picker

8 years agoFix #1491 - Fix broken notifications, broken Link header parsing for exclude_types...
Eugen [Tue, 11 Apr 2017 20:53:58 +0000 (22:53 +0200)]
Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548)

8 years agoAdd task in order to delete unconfirmed users (older than 2days) (#1571)
d0p1 [Tue, 11 Apr 2017 20:51:17 +0000 (22:51 +0200)]
Add task in order to delete unconfirmed users (older than 2days) (#1571)

* add task in order to delete unconfirmed user

* change 7 days to 2

8 years agoFix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)
Eugen [Tue, 11 Apr 2017 20:49:53 +0000 (22:49 +0200)]
Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563)

8 years agoRefactor exports controller (#1567)
Matt Jankowski [Tue, 11 Apr 2017 20:00:43 +0000 (16:00 -0400)]
Refactor exports controller (#1567)

* Add basic coverage for settings/exports controller

* Remove unused @account variable from settings/exports controller

* Add coverage for download export actions

* Remove deprecated `render :text` in favor of `send_data` for csv downloads

* Add model to handle exports

* Use Export class in settings/exports controller

* Simplify settings/exports controller methods

* Move settings/export to more restful routes

8 years agoFix console error when scrolling a column with no scrollable content (#1574)
Henry Smith [Tue, 11 Apr 2017 19:58:28 +0000 (21:58 +0200)]
Fix console error when scrolling a column with no scrollable content (#1574)

8 years ago[about] Moving docs link to tootsuite/documentation (#1573)
lindwurm [Tue, 11 Apr 2017 19:57:05 +0000 (04:57 +0900)]
[about] Moving docs link to tootsuite/documentation (#1573)

related: https://github.com/tootsuite/mastodon/commit/1236529e39a7e2534fdd34686a749b5a386c109b

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
8 years agoUpdate french locale (#1525)
Thomas Citharel [Tue, 11 Apr 2017 19:54:40 +0000 (21:54 +0200)]
Update french locale (#1525)

* Update devise.fr.yml fixing minor typos

* add missing strings

* Fix a translation and add translation for devise part

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
8 years agoAdd Japanese translation (#1552)
pinfort [Tue, 11 Apr 2017 19:52:09 +0000 (04:52 +0900)]
Add Japanese translation (#1552)

* add device.ja.yml

* update device.ja.yml

* add file simple_form.ja.yml

* 👍Added doorkeeper.ja.yml

* add ja.yml

* Update doorkeeper.ja.yml

fixed url to uri

* update ja.yml

* fix some translations

* fix japanese grammar of a translate

* fix some translates

* fix ja.yml

* add ja.jsx

* add Japanese user mail views

* Added japanese translate locales

* Added :ja to available_locales

こっちも

* Added "日本語" to HUMAN_LOCALES

* Imported/Added ja to addLocaleData

* update ja.jsx

8 years agoRevised finnish translation (#1537)
jukper [Tue, 11 Apr 2017 19:41:40 +0000 (22:41 +0300)]
Revised finnish translation (#1537)

8 years agoUpdate language files (#1516)
Jantso Porali [Tue, 11 Apr 2017 19:41:29 +0000 (21:41 +0200)]
Update language files (#1516)

* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

* fix for Amazon S3/Minio instance setups

If you were using S3 or Minio for your files, this will fix the Import issue :)

* update translation according to issue #1515

See issue #1515

* update translation for issue #1515

see issue #1515

8 years agoImports controller errors (#1553)
Matt Jankowski [Tue, 11 Apr 2017 19:40:14 +0000 (15:40 -0400)]
Imports controller errors (#1553)

* Add spec for settings/imports controller

* Add failing spec for settings/imports#create

* Fix broken imports

* Refactor ImportWorker

8 years agoMerge branch 'master' of github.com:tootsuite/mastodon
Eugen Rochko [Tue, 11 Apr 2017 19:30:48 +0000 (21:30 +0200)]
Merge branch 'master' of github.com:tootsuite/mastodon

8 years agoMerge branch 'blackle-master'
Eugen Rochko [Tue, 11 Apr 2017 19:30:34 +0000 (21:30 +0200)]
Merge branch 'blackle-master'

8 years agoFix look of the modals
Eugen Rochko [Tue, 11 Apr 2017 19:24:17 +0000 (21:24 +0200)]
Fix look of the modals

8 years agoMerge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Eugen Rochko [Tue, 11 Apr 2017 18:43:56 +0000 (20:43 +0200)]
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

8 years agoBetter background-photo.jpeg (#1560)
Komic [Tue, 11 Apr 2017 17:51:13 +0000 (19:51 +0200)]
Better background-photo.jpeg (#1560)

Fixed the nasty banding & recompressed it at about the same level

8 years agoIncrease breakpoint size for bio on account show (#1559)
Matt Jankowski [Tue, 11 Apr 2017 17:35:06 +0000 (13:35 -0400)]
Increase breakpoint size for bio on account show (#1559)

8 years agoRemove unused methods from StreamEntriesHelper (#1365)
Matt Jankowski [Tue, 11 Apr 2017 17:32:02 +0000 (13:32 -0400)]
Remove unused methods from StreamEntriesHelper (#1365)

Removes:

- avatar_for_status_url
- relative_time
- reblogged_by_me_class
- favourited_by_me_class

8 years agoRemove unused AtomBuilderHelper (#1364)
Matt Jankowski [Tue, 11 Apr 2017 17:31:22 +0000 (13:31 -0400)]
Remove unused AtomBuilderHelper (#1364)

This was used in the views/atom/user_stream.xml.ruby file, which no longer is
used.

8 years agoMoving docs to tootsuite/documentation (#1550)
Eugen [Tue, 11 Apr 2017 16:03:02 +0000 (18:03 +0200)]
Moving docs to tootsuite/documentation (#1550)

8 years agoAllow user to disable the boost confirm dialog in preferences
blackle [Tue, 11 Apr 2017 14:10:16 +0000 (10:10 -0400)]
Allow user to disable the boost confirm dialog in preferences

8 years agoAdd (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability...
Valentin Ouvrard [Tue, 11 Apr 2017 14:04:56 +0000 (01:04 +1100)]
Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253)

* enable commented volume in docker-compose.yml

* Disable unworking Nginx root directory && Mitigating the HTTPoxy Vulnerability

* add my instance to the list

* enable GZIP on nginx.conf

* readd root /home/mastodon/live/public;

8 years agofix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match...
Gavin Mogan [Tue, 11 Apr 2017 13:06:07 +0000 (06:06 -0700)]
fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match (#1502)

8 years agoBypass boost confirm modal if alt is pressed
blackle [Tue, 11 Apr 2017 12:34:14 +0000 (08:34 -0400)]
Bypass boost confirm modal if alt is pressed

8 years agoAvoid user enumeration with devise paranoid mode (#1527)
Yann GUERN [Tue, 11 Apr 2017 12:21:15 +0000 (14:21 +0200)]
Avoid user enumeration with devise paranoid mode (#1527)