]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoUpdated Dutch strings and added Dutch onboarding modal strings (#2243)
jeroenpraat [Fri, 21 Apr 2017 01:29:00 +0000 (03:29 +0200)]
Updated Dutch strings and added Dutch onboarding modal strings (#2243)

* A bit of more explanation

* Update nl.yml

* That's more elegant

* More consistent and adding missing translation

* Update

* Update

* Added Dutch onboarding modal strings

8 years agozh*: minor jsx whitespace fix (#2231)
Mingye Wang [Fri, 21 Apr 2017 01:28:45 +0000 (21:28 -0400)]
zh*: minor jsx whitespace fix (#2231)

8 years agoFix Chinese (China) translation availability (#2230)
Yeechan Lu [Fri, 21 Apr 2017 01:28:38 +0000 (09:28 +0800)]
Fix Chinese (China) translation availability (#2230)

8 years agoInitial overhaul at zh-CN YML translations (#2242)
Mingye Wang [Fri, 21 Apr 2017 01:27:45 +0000 (21:27 -0400)]
Initial overhaul at zh-CN YML translations (#2242)

This commit provides a heavy proofreading of zh-CN translations, and
mainly draws from the zh-HK source when a translation is found too
incoherent. Translating directly from en is used when zh-HK translation
is not available.

This commit also completes the tweet-toot (choo-choo, actually) for
zh-cn introduced in #2044. Some minor copyediting, as well as
additional en translations, has been fed back into zh-hk text.

8 years agoClean up settings/preferences controller (#2237)
Matt Jankowski [Fri, 21 Apr 2017 01:26:52 +0000 (21:26 -0400)]
Clean up settings/preferences controller (#2237)

* Add missing fields group on preferences page

* Clean up settings/preferences controller

* Extract a UserSettingsDecorator

8 years agoFix Textarea height should be reset upon sending toot #2189 (#2236)
Andrey Blinov [Thu, 20 Apr 2017 21:53:54 +0000 (00:53 +0300)]
Fix Textarea height should be reset upon sending toot #2189 (#2236)

8 years agoRepair most egregious mistakes in onboarding modal (#1964)
Shel R [Thu, 20 Apr 2017 16:20:40 +0000 (12:20 -0400)]
Repair most egregious mistakes in onboarding modal (#1964)

* Repair most egregious mistakes

The deployed changes broke the pedagogy and curriculum built into the design of the onboarding modals, which had been reviewed and approved by various other contributors. While the changed layouts of the pages make some of the original decisions impossible to re-implement without substantial work, these changes should at least make the modals not outright terrible.

The empty confusing description of Mastodon was replaced with an actual basic explanation of federation. The language was modified to be friendly and conversational again. Grammatical errors were fixed. The explanations of local and federated timelines were re-ordered to be in the direct that the menus go, top to bottom, and the sentence was re-added which explains that they are what "public timelines" refers to (since this phrasing is used elsewhere in the UI) and suggests the user use them to discover who to follow. A figure of the profile picture that lives above the compose box was padded to page two to serve as a landmark for less technically literate users to easily find the compose box and understand that the next page is moving upwards, so that they can find the search bar.

Ideally, the elephant artwork should be either removed or replaced with something less depressing.  Room should be made to point users at the notifications column's settings icon because "how do I turn off the notification noise" is one of the most asked questions of new users and those icons are not easily noticeable. This last part may be made obsolete if the settings UI is later re-worked.

* Change copy

This commit addresses copy change suggestions made in the PR discussion

* Add periods to ends of sentences missing periods
* Made "Home" "Federated" "Local" and "Notifications" lowercase
* Separate explanation of "connecting" and the word "instance" into two sentences, to make the sentence less dense.

8 years agoFrench translation cleanup (#2223)
Alda Marteau-Hardi [Thu, 20 Apr 2017 15:19:05 +0000 (17:19 +0200)]
French translation cleanup (#2223)

* Alphabetically order translation keys

* Fix some missing gender neutral translations in french

* Add a comment to remind contributors to order translations by key

8 years agoAdmin settings controller refactor, add specs, cleanup (#2225)
Matt Jankowski [Thu, 20 Apr 2017 15:18:09 +0000 (11:18 -0400)]
Admin settings controller refactor, add specs, cleanup (#2225)

* Add render_views for admin/settings spec

* Add coverage for admin/settings#update

* Add coverage for admin/settings typecasting open_registrations setting

* Simplify how admin/settings finds the value for updating

* Rely on activerecord to not update a value that hasnt changed

* Add coverage for non-existent setting

* Use a constant for boolean settings

8 years agoit may be mentions_status_id_index is duplicated of index_mentions_on_status_id index...
Keiji, Yoshimi [Thu, 20 Apr 2017 15:13:06 +0000 (00:13 +0900)]
it may be mentions_status_id_index is duplicated of index_mentions_on_status_id index. (#2224)

8 years ago Make Docker image buildable on ARM (#2065)
Christoph Witzany [Thu, 20 Apr 2017 11:29:38 +0000 (13:29 +0200)]
 Make Docker image buildable on ARM (#2065)

* after yarn upgrade

* after manually removing node-gyp as top level dependency

8 years agoFix PropTypes warning in OnboardingModal (#2191)
Yamagishi Kazutoshi [Thu, 20 Apr 2017 11:22:54 +0000 (20:22 +0900)]
Fix PropTypes warning in OnboardingModal (#2191)

8 years agoUse default locale for html lang in layouts (#2212)
Matt Jankowski [Thu, 20 Apr 2017 11:09:31 +0000 (07:09 -0400)]
Use default locale for html lang in layouts (#2212)

8 years agoLink to profile/feed/salmon from admin/accounts show page (#2186)
Matt Jankowski [Thu, 20 Apr 2017 02:00:02 +0000 (22:00 -0400)]
Link to profile/feed/salmon from admin/accounts show page (#2186)

8 years agoRemoves timestamp from URLs. (#2185)
Ash Furrow [Thu, 20 Apr 2017 01:54:24 +0000 (21:54 -0400)]
Removes timestamp from URLs. (#2185)

8 years agoFix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182)
Eugen [Thu, 20 Apr 2017 01:54:02 +0000 (03:54 +0200)]
Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182)

* Fix #2120 - Use Status#as_tag_timeline on public hashtag page

* Update tags_controller.rb

8 years agoSend nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwi...
Miguel Jacq [Thu, 20 Apr 2017 01:12:14 +0000 (11:12 +1000)]
Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)

8 years agoAdd static gif for upload testing (#2168)
Marcin Cieślak [Wed, 19 Apr 2017 21:47:50 +0000 (23:47 +0200)]
Add static gif for upload testing (#2168)

8 years agoFix #2108 - Fix gif uploads (#2171)
Eugen [Wed, 19 Apr 2017 21:21:00 +0000 (23:21 +0200)]
Fix #2108 - Fix gif uploads (#2171)

* Fix #2108 - Fix gif uploads
Add specs for media attachment gifv conversion

* Add ffmpeg to travis

* Make travis install ffmpeg, not libav

* Switch travis to trusty

8 years agoUpdated note about 'none' SMTP authentication method in .env.production.sample (...
evilny0 [Wed, 19 Apr 2017 21:16:43 +0000 (23:16 +0200)]
Updated note about 'none' SMTP authentication method in .env.production.sample (#2167)

8 years agoAdd some Spanish translatoins (#2170)
Darshak Parikh [Wed, 19 Apr 2017 20:19:41 +0000 (01:49 +0530)]
Add some Spanish translatoins (#2170)

8 years agoExtract error messages to locale file (#2162)
alpaca-tc [Wed, 19 Apr 2017 20:19:32 +0000 (05:19 +0900)]
Extract error messages to locale file (#2162)

8 years agoDutch language strings: a few important fixes (#2163)
jeroenpraat [Wed, 19 Apr 2017 20:19:19 +0000 (22:19 +0200)]
Dutch language strings: a few important fixes (#2163)

8 years agoFixed hungarian translation (#2158)
György Nádudvari [Wed, 19 Apr 2017 17:21:44 +0000 (19:21 +0200)]
Fixed hungarian translation (#2158)

8 years agoFix css for toot button when uploading images (#2161)
Tomohiro Suwa [Wed, 19 Apr 2017 17:21:23 +0000 (02:21 +0900)]
Fix css for toot button when uploading images (#2161)

8 years agofix broken style when follower has long description (#2159)
fsubal [Wed, 19 Apr 2017 17:20:51 +0000 (02:20 +0900)]
fix broken style when follower has long description (#2159)

8 years agoFix double-escaping of display names in <title> (#2155)
Eugen [Wed, 19 Apr 2017 15:46:24 +0000 (17:46 +0200)]
Fix double-escaping of display names in <title> (#2155)

8 years agoFix possibility of unrightful webfinger redirect (#2147)
Eugen [Wed, 19 Apr 2017 15:28:35 +0000 (17:28 +0200)]
Fix possibility of unrightful webfinger redirect (#2147)

* Fix possibility of unrightful webfinger redirect

* Add more tests for FollowRemoteAccountService

8 years agoRemove unused view files in accounts/ (#2153)
Matt Jankowski [Wed, 19 Apr 2017 15:19:23 +0000 (11:19 -0400)]
Remove unused view files in accounts/ (#2153)

8 years agoAdd meta tags for OGP to following & follow page (#2052)
Yamagishi Kazutoshi [Wed, 19 Apr 2017 15:17:32 +0000 (00:17 +0900)]
Add meta tags for OGP to following & follow page (#2052)

* Add meta tags for OGP to following & follow page

* simplify render helper

* Follow up #2133

* og:type is only accounts/show

* revert accounts/{following,followers}

8 years agofix Japanese search result translation (#2149)
matsurai25 [Wed, 19 Apr 2017 14:41:30 +0000 (23:41 +0900)]
fix Japanese search result translation (#2149)

add 'result' mean, '件' only mean count unit.

8 years agoCompleted Italian translation (#2151)
Matteo Aquila [Wed, 19 Apr 2017 14:40:45 +0000 (16:40 +0200)]
Completed Italian translation (#2151)

* Added it.jsx

* Update index.jsx

* Update mastodon.jsx

8 years agofix search text 'zero' (#2150)
matsurai25 [Wed, 19 Apr 2017 14:40:24 +0000 (23:40 +0900)]
fix search text 'zero' (#2150)

8 years agoAutomatically change the size of textarea (#2128)
geta6 [Wed, 19 Apr 2017 13:39:46 +0000 (22:39 +0900)]
Automatically change the size of textarea (#2128)

8 years agoSimplify render in controllers (#2144)
Matt Jankowski [Wed, 19 Apr 2017 13:37:42 +0000 (09:37 -0400)]
Simplify render in controllers (#2144)

8 years agoAttachment list for uncached attachments (#2110)
Eugen [Wed, 19 Apr 2017 13:37:18 +0000 (15:37 +0200)]
Attachment list for uncached attachments (#2110)

* For undownloaded attachments, set type :unknown, display them as a list in the web UI

* Fix case when attachment type is set explicitly

8 years agoReplace User.count -> User.confirmed.count (#2127)
alpaca-tc [Wed, 19 Apr 2017 12:58:27 +0000 (21:58 +0900)]
Replace User.count -> User.confirmed.count (#2127)

8 years agoRemove unnecessary word from Japanese locale (#2143)
Yamagishi Kazutoshi [Wed, 19 Apr 2017 12:54:47 +0000 (21:54 +0900)]
Remove unnecessary word from Japanese locale (#2143)

8 years agoFix html escape characters in the URL (#2138)
abcang [Wed, 19 Apr 2017 12:52:18 +0000 (21:52 +0900)]
Fix html escape characters in the URL (#2138)

* fix character escaping in URL

* add tests

* put a comma after the last item

* add HTML escape test

8 years agoenable to scroll the setting's page sidebar (#1347)
857b [Wed, 19 Apr 2017 12:30:23 +0000 (14:30 +0200)]
enable to scroll the setting's page sidebar (#1347)

* enable to scroll the setting's page sidebar

add scroll:auto and use margin instead of padding for the bottom

* Update admin.scss

* Update admin.scss

* Update admin.scss

8 years agoInstall Yarn dependencies during setup (#1169)
Joël Quenneville [Wed, 19 Apr 2017 12:29:23 +0000 (08:29 -0400)]
Install Yarn dependencies during setup (#1169)

Previously the `bin/setup` script only installed the Ruby dependencies
via Bundler. This is not sufficient to get the test suite to pass. We
also need the JavaScript dependencies.

This commit installs the JavaScript dependencies as part of the
`bin/setup` script via Yarn.

This allows for a successful

    bin/setup && bundle exec rake

on a fresh clone of the repo.

8 years agocapistrano: link robots.txt (#1576)
Alex Dunn [Wed, 19 Apr 2017 12:28:23 +0000 (05:28 -0700)]
capistrano: link robots.txt (#1576)

Related to #1533.

8 years agoDo not show link preview card if toot has a spoiler (#1617)
Isabelle Knott [Wed, 19 Apr 2017 12:28:00 +0000 (08:28 -0400)]
Do not show link preview card if toot has a spoiler (#1617)

* Do not show link preview card if toot has a spoiler

* == to ===

8 years agoMoves from hamburger icon to asterisk. (#2116)
Ash Furrow [Wed, 19 Apr 2017 12:21:14 +0000 (08:21 -0400)]
Moves from hamburger icon to asterisk. (#2116)

8 years agoImprove visibility of mute, block, report menu in Japanese (#2131)
chrolis [Wed, 19 Apr 2017 12:21:00 +0000 (21:21 +0900)]
Improve visibility of mute, block, report menu in Japanese (#2131)

8 years agoMake configuarable s3_permissions for paperclip (#2139)
tmyt [Wed, 19 Apr 2017 12:20:36 +0000 (21:20 +0900)]
Make configuarable s3_permissions for paperclip (#2139)

8 years agoUpdate title text for "reply all" button (#2118)
Misty De Meo [Wed, 19 Apr 2017 12:20:04 +0000 (20:20 +0800)]
Update title text for "reply all" button (#2118)

8 years agoChange to switch signature version for Amazon S3 (#2124)
Yamagishi Kazutoshi [Wed, 19 Apr 2017 12:18:50 +0000 (21:18 +0900)]
Change to switch signature version for Amazon S3 (#2124)

8 years agoRestful refactor of accounts/ routes (#2133)
Matt Jankowski [Wed, 19 Apr 2017 11:52:37 +0000 (07:52 -0400)]
Restful refactor of accounts/ routes (#2133)

* Add routing specs for accounts followers and following actions

* Use more restful route naming for public account follow pages

Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index

Adds routing spec to ensure prior URLs are preserved.

8 years agoUpdate ja.yml (follow for #2118) (#2137)
Kota Ouchi [Wed, 19 Apr 2017 11:44:07 +0000 (20:44 +0900)]
Update ja.yml (follow for #2118) (#2137)

* Update ja.yml (follow for #2118)

* typo fix

8 years agoupdate simple_form.ja.yml (follow for #1991) (#2113)
Isao Sugimoto [Wed, 19 Apr 2017 01:55:19 +0000 (10:55 +0900)]
update simple_form.ja.yml (follow for #1991) (#2113)

8 years agoupdate ja.yml (follow for #2106) (#2109)
Isao Sugimoto [Tue, 18 Apr 2017 22:52:30 +0000 (07:52 +0900)]
update ja.yml (follow for #2106) (#2109)

8 years agoUpdate fr.yml (#2107)
Michel [Tue, 18 Apr 2017 22:52:19 +0000 (00:52 +0200)]
Update fr.yml (#2107)

Just updated some values.
Best regards,
cyweo

8 years agoFix wording on admin instances view, fix typos in language detector spec (#2106)
Eugen [Tue, 18 Apr 2017 21:39:51 +0000 (23:39 +0200)]
Fix wording on admin instances view, fix typos in language detector spec (#2106)

8 years agoRemove unused fonts (#2103)
Eugen [Tue, 18 Apr 2017 21:34:50 +0000 (23:34 +0200)]
Remove unused fonts (#2103)

8 years agoFix #1642, fix #1912 - Dictate content-type file extension (#2078)
Eugen [Tue, 18 Apr 2017 21:15:44 +0000 (23:15 +0200)]
Fix #1642, fix #1912 - Dictate content-type file extension (#2078)

* Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload

* Fix for when file is missing

8 years agoAdd more tests for AtomSerializer (#2096)
Eugen [Tue, 18 Apr 2017 20:30:17 +0000 (22:30 +0200)]
Add more tests for AtomSerializer (#2096)

8 years agomissing translate ja.yml (#2100)
Isao Sugimoto [Tue, 18 Apr 2017 20:29:39 +0000 (05:29 +0900)]
missing translate ja.yml (#2100)

8 years agoAdd rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079)
Eugen [Tue, 18 Apr 2017 20:29:14 +0000 (22:29 +0200)]
Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079)

* Add rate limits for logins and sign-ups by IP (5 in 5 minutes)
Should be enough for normal attempts

* Add rate limit for forgotten password form as well

8 years agoLanguage detection refactor (#2099)
Matt Jankowski [Tue, 18 Apr 2017 20:20:12 +0000 (16:20 -0400)]
Language detection refactor (#2099)

* Extract detect_language to separate class

* Use default locale, not just en

* Add spec to confirm that whatlanguage cant identify empty string

* Allow account locale to override default in language detector

* PostStatusService supplies an account to detect language

8 years agoRemove API authentication for public statuses (after review) (#1919)
happycoloredbanana [Tue, 18 Apr 2017 19:58:57 +0000 (22:58 +0300)]
Remove API authentication for public statuses (after review) (#1919)

8 years agoPolish zh-cn js translation (#2090)
Mingye Wang [Tue, 18 Apr 2017 19:29:31 +0000 (15:29 -0400)]
Polish zh-cn js translation (#2090)

* Polish zh-cn js translation

* fixes for problems pointed out by gumblex in #2044
* more effectively differentiate between following/follower

* Fix missing period (zh-cn js)

Maybe squash this commit?

* Fix duplicate word (zh-cn js)

8 years agoInstances list in admin (#2095)
Matt Jankowski [Tue, 18 Apr 2017 19:09:07 +0000 (15:09 -0400)]
Instances list in admin (#2095)

* Add admin/instances index action

* Add link to instances admin page

* View lists instances

* Instances, grouped by domain, ordered by count

* Use Account.remote scope

* Extract method: Account.by_domain_accounts

8 years agoAdmin reports with accounts (#2092)
Matt Jankowski [Tue, 18 Apr 2017 17:36:18 +0000 (13:36 -0400)]
Admin reports with accounts (#2092)

* 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

8 years agoDisable toot button when above 500 characters (#2088)
Tomohiro Suwa [Tue, 18 Apr 2017 17:35:55 +0000 (02:35 +0900)]
Disable toot button when above 500 characters (#2088)

* Disable toot button when above 500 characters

* Consider multibyte characters

* Consider spoiler_text

8 years agofix admin input display (#1633)
spf [Tue, 18 Apr 2017 15:25:44 +0000 (17:25 +0200)]
fix admin input display (#1633)

8 years agoMoving aria-label to div.column (#1769)
JP DeVries [Tue, 18 Apr 2017 15:21:25 +0000 (17:21 +0200)]
Moving aria-label to div.column (#1769)

* Use landmark regions on columns

Closes mastodon#1720

* Moving aria-label to div.column

8 years agoSimplify renders in views (#2084)
Matt Jankowski [Tue, 18 Apr 2017 15:15:30 +0000 (11:15 -0400)]
Simplify renders in views (#2084)

* 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

8 years agoUpdate storybook file autoload (#2057)
usagi-f [Tue, 18 Apr 2017 14:04:35 +0000 (23:04 +0900)]
Update storybook file autoload (#2057)

8 years agoAdd "Mastodon" to user agent (#2073)
ik-fib [Tue, 18 Apr 2017 14:04:13 +0000 (23:04 +0900)]
Add "Mastodon" to user agent (#2073)

Remove non-const version string

Freeze option is unnecessary

8 years agoTranslate onboarding dialog to japanese (#2062)
Keiji, Yoshimi [Tue, 18 Apr 2017 14:03:27 +0000 (23:03 +0900)]
Translate onboarding dialog to japanese (#2062)

* translate onboarding modal to japanese

* fixed translation by feedback

8 years agoFix streaming server worker count (#2082)
kuro5hin [Tue, 18 Apr 2017 13:58:22 +0000 (09:58 -0400)]
Fix streaming server worker count (#2082)

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

8 years agoAvoid dynamic methods due to processing speed (#2080)
839 [Tue, 18 Apr 2017 13:57:46 +0000 (22:57 +0900)]
Avoid dynamic methods due to processing speed (#2080)

8 years agoFix header icons in navigation bar (#2081)
Andrey Blinov [Tue, 18 Apr 2017 13:57:16 +0000 (16:57 +0300)]
Fix header icons in navigation bar (#2081)

8 years agoFrench translation update (#2063)
Olivier Humbert [Tue, 18 Apr 2017 13:21:47 +0000 (15:21 +0200)]
French translation update (#2063)

fixes

8 years agoAdd Occitan (oc) translation (#2077)
Koala Yeung [Tue, 18 Apr 2017 13:21:16 +0000 (21:21 +0800)]
Add Occitan (oc) translation (#2077)

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

8 years agoUpdate Russian translation (#1967)
Ratmir Karabut [Tue, 18 Apr 2017 13:20:37 +0000 (16:20 +0300)]
Update Russian translation (#1967)

* 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

8 years agoAdd hasMore field to account timeline (#2066)
geta6 [Tue, 18 Apr 2017 11:10:49 +0000 (20:10 +0900)]
Add hasMore field to account timeline (#2066)

8 years agoMerge branch 'patf-pause-gif'
Eugen Rochko [Mon, 17 Apr 2017 23:58:14 +0000 (01:58 +0200)]
Merge branch 'patf-pause-gif'

8 years agoAdjust visuals of non-autoplaying GIFV
Eugen Rochko [Mon, 17 Apr 2017 23:57:50 +0000 (01:57 +0200)]
Adjust visuals of non-autoplaying GIFV

8 years agoMerge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif
Eugen Rochko [Mon, 17 Apr 2017 23:25:50 +0000 (01:25 +0200)]
Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

8 years agoRemove unused methods (#1730)
Matt Jankowski [Mon, 17 Apr 2017 23:21:55 +0000 (19:21 -0400)]
Remove unused methods (#1730)

* 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

8 years agoMerge branch 'pixiv-fix/cache_blocking'
Eugen Rochko [Mon, 17 Apr 2017 23:20:29 +0000 (01:20 +0200)]
Merge branch 'pixiv-fix/cache_blocking'

8 years agoRename cache key to exclude_account_ids_for:id, adjust formatting
Eugen Rochko [Mon, 17 Apr 2017 23:14:02 +0000 (01:14 +0200)]
Rename cache key to exclude_account_ids_for:id, adjust formatting

8 years agoMerge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix...
Eugen Rochko [Mon, 17 Apr 2017 23:09:57 +0000 (01:09 +0200)]
Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking

8 years agoAdd forgotten AtomSerializer spec (#2047)
Eugen [Mon, 17 Apr 2017 23:07:46 +0000 (01:07 +0200)]
Add forgotten AtomSerializer spec (#2047)

8 years agoIgnore /vendor/bundle (#1880)
Marcin Cieślak [Mon, 17 Apr 2017 23:02:50 +0000 (01:02 +0200)]
Ignore /vendor/bundle (#1880)

8 years agoAdd FR locales to the onboarding modal (#1976)
Damien Erambert [Mon, 17 Apr 2017 23:02:02 +0000 (16:02 -0700)]
Add FR locales to the onboarding modal (#1976)

* 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

8 years agoAdd simplified Chinese js translation (#2044)
Mingye Wang [Mon, 17 Apr 2017 23:01:32 +0000 (19:01 -0400)]
Add simplified Chinese js translation (#2044)

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.

8 years agoInstance helper to replace site title helper (#2038)
Matt Jankowski [Mon, 17 Apr 2017 22:16:32 +0000 (18:16 -0400)]
Instance helper to replace site title helper (#2038)

* 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

8 years agoUpdated, improved and fixed Dutch language strings (#2030)
jeroenpraat [Mon, 17 Apr 2017 22:16:03 +0000 (00:16 +0200)]
Updated, improved and fixed Dutch language strings (#2030)

* 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

8 years agoUse .presence instead of ternary on site description for og: content (#2033)
Matt Jankowski [Mon, 17 Apr 2017 21:19:45 +0000 (17:19 -0400)]
Use .presence instead of ternary on site description for og: content (#2033)

8 years agooptimized logo (#2020)
Sam Hewitt [Mon, 17 Apr 2017 19:49:51 +0000 (15:49 -0400)]
optimized logo (#2020)

- adjusted elements to fit the pixel grid for better scaling
- optimized the PNG asset and the SVG asset

8 years agoREADME tidy up (#2026)
Matt Jankowski [Mon, 17 Apr 2017 19:28:31 +0000 (15:28 -0400)]
README tidy up (#2026)

* 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

8 years agoFix import pt_br locale in mastodon.jsx (#2011)
Andrey Blinov [Mon, 17 Apr 2017 19:01:42 +0000 (22:01 +0300)]
Fix import pt_br locale in mastodon.jsx (#2011)

8 years agoReturn early from submit if no text. (#1962)
Zac Anger [Mon, 17 Apr 2017 18:30:38 +0000 (12:30 -0600)]
Return early from submit if no text. (#1962)

8 years agoFrench i18n-tasks missing fr (#2018)
spf [Mon, 17 Apr 2017 18:27:11 +0000 (20:27 +0200)]
French i18n-tasks missing fr (#2018)

8 years agoRemove i18n_spec file (#2014)
Matt Jankowski [Mon, 17 Apr 2017 18:02:29 +0000 (14:02 -0400)]
Remove i18n_spec file (#2014)

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.

8 years agoMedia controller specs (#2022)
Matt Jankowski [Mon, 17 Apr 2017 18:02:00 +0000 (14:02 -0400)]
Media controller specs (#2022)

* Add spec for media controller

* Add MediaAttachment.attached scope

* Simplify methods in media controller

8 years agoFix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)
Eugen [Mon, 17 Apr 2017 17:58:54 +0000 (19:58 +0200)]
Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)

Also improve efficiency of the mastodon:maintenance:add_static_avatars task