]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoAdd test coverage to CSS class generation (#2285)
Joël Quenneville [Sun, 23 Apr 2017 04:04:32 +0000 (00:04 -0400)]
Add test coverage to CSS class generation (#2285)

The code that generates CSS is based on a lot of boolean conditions.
The possible combinations of these grows exponentially as we add more
conditions.

Since most of the code is conditional on a single boolean, we tested the
following:

1. All `false`
2. All `true`
3. Each individual flag set to `true`

The methods tested are:

* `StreamEntriesHelper#style_classes`
* `StreamEntriesHelper#microformats_classes`
* `StreamEntriesHelper#microformats_h_class`

8 years agoAdding arabic string localization (rebased) (#1895)
Koala Yeung [Sun, 23 Apr 2017 03:58:47 +0000 (11:58 +0800)]
Adding arabic string localization (rebased) (#1895)

* Create ar.jsx

* Preparing file for translation.

* Create ar.yml

* Preparing file for translation.

* Create simple_form.ar.yml

* Preparing file for translation.

* Create devise.ar.yml

* Preparing file for translation.

* Create doorkeeper.ar.yml

* Preparing file for translation.

* Update index.jsx

Preparing file for translation.

* Update mastodon.jsx

* Preparing file to translation.
* Correction thanks to @Taekiro
  https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922

* Update settings_helper.rb

Preparing file to translation.

* Update application.rb

* Preparing file to translation.

* Update simple_form.ar.yml

* Update doorkeeper.ar.yml

* Update devise.ar.yml

* Update ar.yml

* Fix i18n-tasks unused issue (ar)

Remove unused translation strings

* Update application.rb

* Update ar.jsx

* Fix various issues with Arabic translation

* Fix duplication caused in merge
* Fix syntax error in devise.ar.yml
* Fix import error Duplicated incorrect import in mastodon.jsx
* Fix duplication error in locales/index.jsx

* Update ar.yml

* Update ar.jsx

* Update ar.yml

* Update ar.jsx

* Fix ar translation

8 years agoTooltip for boosting depends on toot visibility (#1394) (#1754)
Ashley [Sun, 23 Apr 2017 03:36:40 +0000 (15:36 +1200)]
Tooltip for boosting depends on toot visibility (#1394) (#1754)

* Made tooltip for boosting depend on visibility

* Removed spaces that were added in merge conflict resolution

* Try again :P

* Added missing bracket

* Changed 'toot' to 'status'

8 years agoRemove unnecessary variable in ColumnLink component (#2341)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 03:21:38 +0000 (12:21 +0900)]
Remove unnecessary variable in ColumnLink component (#2341)

Fix bug in cca41ea544fe7de3e7afdc250992a1c6e48d2a31 .

8 years agoActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce...
Evan Minto [Sun, 23 Apr 2017 03:21:10 +0000 (20:21 -0700)]
ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)

* Clean up collapsible components

* Expose user Outboxes and AS2 representations of statuses

* Save work thus far.

* Fix bad merge.

* Save my work

* Clean up pagination.

* First test working.

* Add tests.

* Add Forbidden error template.

* Revert yarn.lock changes.

* Fix code style deviations and use localized instead of hardcoded English text.

8 years agoUpdate CA certificates in Dockerfile (#2339)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 02:59:56 +0000 (11:59 +0900)]
Update CA certificates in Dockerfile (#2339)

8 years agoAdmin UI for confirming users (#2245)
Ash Furrow [Sun, 23 Apr 2017 02:43:42 +0000 (04:43 +0200)]
Admin UI for confirming users (#2245)

* Shows confirmed status in list.

* Adds ability to confirm users in admin UI.

* Added new english translations.

* Addresses feedback from #2245.

* More feedback.

8 years agoAdd a confirmation modal: (#2279)
Eugen [Sun, 23 Apr 2017 02:39:50 +0000 (04:39 +0200)]
Add a confirmation modal: (#2279)

- Deleting a toot
- Muting, blocking someone
- Clearing notifications

Remove source map generation from development environment, as it is a huge
performance sink hole with little gains

8 years agoAlter Japanese translations for CW and NSFW (#2305)
Akihiko Odaki [Sun, 23 Apr 2017 02:31:40 +0000 (11:31 +0900)]
Alter Japanese translations for CW and NSFW (#2305)

The previous translation for NSFW, "不適切" means "impertinent". This change
suggests "閲覧注意", which means the content requires precaution, instead.

However, "閲覧注意" was also a translation for CW. CW is now translated as
"警告", which simply means "warnings".

8 years agoReplace inline styles with CSS classes (BEM) (#2338)
Stephen Burgess [Sun, 23 Apr 2017 02:26:55 +0000 (21:26 -0500)]
Replace inline styles with CSS classes (BEM) (#2338)

* fix(classnames): Status icon style classnames

Take out inline css and put into classnames for the following components: account, avatar, icon button, status action bar, notification.

* fix(status): Move styles from inline to classes for statuses

Move styles to classnames in components.scss for the following components:

display name
media gallery
status
status content
video player

* fix(classnames): Add classnames to rest of components

Take out inline styles and apply them to classnames in the sass for the following components:

button
column back button
slim column back button
collapsable column
dropdown menu
loading indicator
status list

* fix(classnames): Remove all non-dynamic inline styles

Components affected:

autosuggested
permalink
action bar
header
character counter
compose form
emoji dropdown
privacy dropdown
reply indicator
upload form
account auth
followers
getting started
column settings
mutes
settings
reblogs
status checkbox
report
action bar
status
card
boost modal
media modal
video modal

* fix(permalink): Do not lose classname

* fix(tests): Add space back in display name

* fix(status__wrapper): Remove duplicate css name

Remove incorrect style attribute. Remove style attribute all together. Cursor defaults to "auto" when not specified as 'default'.

* fix(nl): do not lose translations

8 years agoClean up flash display in views (#2336)
Matt Jankowski [Sun, 23 Apr 2017 02:22:34 +0000 (22:22 -0400)]
Clean up flash display in views (#2336)

* Add flashes partial to DRY up admin/auth layouts

* Further consolidate flash messages

8 years agoMove force_ssl check to production config (#2165)
Matt Jankowski [Sun, 23 Apr 2017 02:22:22 +0000 (22:22 -0400)]
Move force_ssl check to production config (#2165)

The force_ssl method from controllers does not add all of the options that the
sitewide configuration in a config block does. For example, HSTS enforcement is
not added by the controller method, but is added by this style.

8 years agoFix character images' sizing to make it robust (#2327)
mecab [Sat, 22 Apr 2017 20:28:54 +0000 (05:28 +0900)]
Fix character images' sizing to make it robust (#2327)

8 years agoTranslation emojis and sorted on alphabet (#2328)
jeroenpraat [Sat, 22 Apr 2017 18:22:46 +0000 (20:22 +0200)]
Translation emojis and sorted on alphabet (#2328)

8 years agofix can toot whitespace (#2218)
ばん [Sat, 22 Apr 2017 17:48:55 +0000 (02:48 +0900)]
fix can toot whitespace (#2218)

8 years agoImprove aria support - Columns and Navigation Drawer Icons (#2299)
Stephen Burgess [Sat, 22 Apr 2017 15:30:35 +0000 (10:30 -0500)]
Improve aria support - Columns and Navigation Drawer Icons (#2299)

* feat(aria): Add aria-labels to underlabelled tab nav items

The drawer tabs which control primary navigation are only labelled by a title which is not available to many screenreaders. Add an aria-label attribute to each link to improve readability with screenreaders. Organize link attributes so link target is first followed by classname.
Issue #1349

* feat(aria): Replace abstract aria role of section with region

Abstract aria roles such as section should not be used in content. Use non-abstract 'region' aria role instead. That role expects an aria-labelledby attribute with an id. Pass an ID to the column header. Remove the aria-label attribute on the ColumnHeader because the same value is output in plaintext as its child.
Issue #1349

* fix(aria): Remove aria-controls attribute until solution is found

Columns do not have wrappers, so these icons can't point to a column wrapper which it controls. Instead these icons function as triggers to show or hide individual columns.
#1349

* fix(typo): Remove type of aria-labelledby instead of aria-label

8 years agoAdd og:url tags (#2298)
Wesley Ellis [Sat, 22 Apr 2017 15:29:46 +0000 (11:29 -0400)]
Add og:url tags (#2298)

* add og:url to stream_item view

* add og:url and text to about/show

* add og:url to profile, followers and follows pages

8 years agoFix TabsBar update (#2300)
Akihiko Odaki [Sat, 22 Apr 2017 15:29:02 +0000 (00:29 +0900)]
Fix TabsBar update (#2300)

This change allows to update TabsBar according to route changes.

8 years agoAdded strings for emoji category localization (#2302)
Ashley [Sat, 22 Apr 2017 15:28:36 +0000 (03:28 +1200)]
Added strings for emoji category localization (#2302)

8 years agoupdate emojione-picker for fixed warnings. (#2324)
Keiji, Yoshimi [Sat, 22 Apr 2017 15:28:02 +0000 (00:28 +0900)]
update emojione-picker for fixed warnings. (#2324)

8 years agomissing a var (#2320)
Quent-in [Sat, 22 Apr 2017 13:12:09 +0000 (15:12 +0200)]
missing a var (#2320)

oc variable is missing on the second liste

8 years agorefactor-cores (#2308)
masarakki [Sat, 22 Apr 2017 13:11:56 +0000 (22:11 +0900)]
refactor-cores (#2308)

8 years agoFix Japanese translation of privacy disclaimer (#2315)
unarist [Sat, 22 Apr 2017 13:10:14 +0000 (22:10 +0900)]
Fix Japanese translation of privacy disclaimer (#2315)

8 years agoAdd author/actor URI to the list of webfinger aliases (#2319)
ThibG [Sat, 22 Apr 2017 13:09:49 +0000 (15:09 +0200)]
Add author/actor URI to the list of webfinger aliases (#2319)

This fixes outbound salmon requests to remote GNU Social instances

8 years agostrip leading & trailing spaces from remote follow acct (#997) (#2321)
codl [Sat, 22 Apr 2017 13:08:30 +0000 (15:08 +0200)]
strip leading & trailing spaces from remote follow acct (#997) (#2321)

8 years ago[WIP] Html lang on statuses (#2297)
Matt Jankowski [Sat, 22 Apr 2017 02:26:25 +0000 (22:26 -0400)]
[WIP] Html lang on statuses (#2297)

* Add html lang attributes around statuses

* Remove urls from language detection

8 years ago2FA controller cleanup (#2296)
Matt Jankowski [Sat, 22 Apr 2017 02:23:17 +0000 (22:23 -0400)]
2FA controller cleanup (#2296)

* Add spec coverage for settings/two_factor_auth area

* extract setup method for qr code

* Move otp required check to before action

* Merge method only used once

* Remove duplicate view

* Consolidate creation of @codes for backup

* Move settings/2fq#recovery_codes to settings/recovery_codes#create

* Rename settings/two_factor_auth#disable to #destroy

* Add coverage for the otp required path on 2fa#show

* Clean up the recovery codes list styles

* Move settings/two_factor_auth to settings/two_factor_authentication

* Reorganize the settings two factor auth area

Updated to use a flow like:

- settings/two_factor_authentication goes to a #show view which has a button
  either enable or disable 2fa on the account
- the disable button turns off the otp requirement for the user
- the enable button cycles the user secret and redirects to a confirmation page
- the confirmation page is a #new view which shows the QR code for user
- that page posts to #create which verifies the code, and creates the recovery
  codes
- that create action shares a view with a recovery codes controller which can be
  used separately to reset codes if needed

8 years agoAllowed the emoji picker 'Search...' string to be localized (#2294)
Ashley [Sat, 22 Apr 2017 01:36:33 +0000 (13:36 +1200)]
Allowed the emoji picker 'Search...' string to be localized (#2294)

8 years agoImprove bio compatibility (#2278)
Eugen [Sat, 22 Apr 2017 01:33:24 +0000 (03:33 +0200)]
Improve bio compatibility (#2278)

* Fix #1057 (close #1819) - Move HTML-formatted bio from <poco:note /> to <summary type="html" />

* Ensure <poco:note /> is plaintext for remote accounts, also, by stripping out HTML

8 years agoAdded API for single notification dismissal (#2251)
Ashley [Sat, 22 Apr 2017 00:30:35 +0000 (12:30 +1200)]
Added API for single notification dismissal (#2251)

* Added API backend for notification dismissal

* Added render statement

* Changed statement

8 years agoDo not set port for puma if it is bound to unix socket (#2289)
Akihiko Odaki [Fri, 21 Apr 2017 23:22:20 +0000 (08:22 +0900)]
Do not set port for puma if it is bound to unix socket (#2289)

Setting port after binding a unix socket puma listen to both of an unix
socket and TCP/IP, which is not a desired behavior.

8 years agoAdd tests for StreamEntriesHelper#rtl? (#2286)
Joël Quenneville [Fri, 21 Apr 2017 22:13:37 +0000 (18:13 -0400)]
Add tests for StreamEntriesHelper#rtl? (#2286)

We used some random Arabic characters to test that the various RTL
conditions got triggered.

8 years agoFix issue with line return in file (#1947)
Naouak [Fri, 21 Apr 2017 18:07:47 +0000 (20:07 +0200)]
Fix issue with line return in file (#1947)

Fix #1940

8 years agoPut space before image (#1735)
Rachel H [Fri, 21 Apr 2017 18:06:25 +0000 (11:06 -0700)]
Put space before image (#1735)

8 years agoRemove deprecated features at React v15.5 (#1905)
Yamagishi Kazutoshi [Fri, 21 Apr 2017 18:05:35 +0000 (03:05 +0900)]
Remove deprecated features at React v15.5 (#1905)

* Remove deprecated features at React v15.5

- [x] React.PropTypes
- [x] react-addons-pure-render-mixin
- [x] react-addons-test-utils

* Uncommented out & Add browserify_rails options

* re-add react-addons-shallow

* Fix syntax error from resolve conflicts

* follow up 59a77923b368d48c590cd9f4a0c6b73ce972d33f

8 years agoLanguage: Missing keys for pt and pt-BR (#2277)
Eduardo Elias [Fri, 21 Apr 2017 17:53:47 +0000 (18:53 +0100)]
Language: Missing keys for pt and pt-BR (#2277)

8 years agoAllow to listen Unix socket (#2085)
Akihiko Odaki [Fri, 21 Apr 2017 17:24:31 +0000 (02:24 +0900)]
Allow to listen Unix socket (#2085)

* Allow puma to listen Unix socket

* streaming: Show the whole listening address instead of the port

Port is not always appropriate (e.g. Unix socket)

* streaming: Close server before exiting

This change especially allows to remove Unix socket before exiting.

8 years agoAdd Japanese translation for display name and bio counter (#2275)
Yamagishi Kazutoshi [Fri, 21 Apr 2017 17:23:20 +0000 (02:23 +0900)]
Add Japanese translation for display name and bio counter (#2275)

* Add Japanese translation for display name and bio counter

* Remove dep key

8 years agoLanguage: Update missing key for pt and pt-BR (#2276)
Eduardo Elias [Fri, 21 Apr 2017 17:23:02 +0000 (18:23 +0100)]
Language: Update missing key for pt and pt-BR (#2276)

8 years agoFix: missing : for language (#2274)
Eduardo Elias [Fri, 21 Apr 2017 17:18:16 +0000 (18:18 +0100)]
Fix: missing : for language (#2274)

8 years agoAdd Indonesian (Bahasa Indonesia / id) translation (#2200)
Koala Yeung [Fri, 21 Apr 2017 17:16:26 +0000 (01:16 +0800)]
Add Indonesian (Bahasa Indonesia / id) translation (#2200)

* add Indonesian (Bahasa Indonesia) translation

add id.jsx
add translations on email views
add devise.id.yml
add doorkeeper.id.yml
add id.yml
add simple_form.id.yml

update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and
application.rb

* add Indonesian (Bahasa Indonesia) translation

add id.jsx
add translations on email views
add devise.id.yml
add doorkeeper.id.yml
add id.yml
add simple_form.id.yml

update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and
application.rb

* fix InvalidLocaleData on a string

* fix InvalidLocaleData on a string

* Fix language keys in Indonesian ruby locale (id)

Use "id" instead of "en" as object keys.

* Removed obsoleted translation (id)

8 years agoAdd Ido (io) translation (#2202)
Koala Yeung [Fri, 21 Apr 2017 17:15:25 +0000 (01:15 +0800)]
Add Ido (io) translation (#2202)

* Add Ido (io) translation

* Fix mastodon.jsx for io reference

There is no react-intl support for io. Removed the references.

8 years agoUse local_time gem for timezone replacement (#2174)
Matt Jankowski [Fri, 21 Apr 2017 16:19:59 +0000 (12:19 -0400)]
Use local_time gem for timezone replacement (#2174)

For the 'time ago' value of stream entry simple statuses and the timestamp value
of detailed statuses - output their UTC value and use the browser timezone to
convert locally.

8 years agoFix mangling of ##tag matches (#2194) (#2247)
Mingye Wang [Fri, 21 Apr 2017 16:18:58 +0000 (12:18 -0400)]
Fix mangling of ##tag matches (#2194) (#2247)

This commit fixes hashtag_html so it correctly handles matches with multiple hash-signs.

Bug located by @over9001, initial fix suggested by @nightpool.

8 years agoHides superluous details on small screens (#2175)
Ash Furrow [Fri, 21 Apr 2017 16:17:55 +0000 (12:17 -0400)]
Hides superluous details on small screens (#2175)

* Hides superluous details on small screans.

* Addressed feedback from #2175.

8 years agoDisplay remaining characters when editing display name and bio (#2219)
Sebastian Morr [Fri, 21 Apr 2017 16:17:21 +0000 (18:17 +0200)]
Display remaining characters when editing display name and bio (#2219)

8 years agoFix #2195 - Set locale to error pages (#2255)
Takayoshi Nishida [Fri, 21 Apr 2017 16:11:20 +0000 (23:11 +0700)]
Fix #2195 - Set locale to error pages (#2255)

* Fix #2195 - Set locale to error pages

* Fix #2195 - Cut duplicate process into one method

8 years agoUse local fonts and stop scrollable elements from repainting (#2266)
Ram Lmn [Fri, 21 Apr 2017 16:09:05 +0000 (21:39 +0530)]
Use local fonts and stop scrollable elements from repainting (#2266)

8 years agoUser settings mutation (#2270)
Matt Jankowski [Fri, 21 Apr 2017 16:07:17 +0000 (12:07 -0400)]
User settings mutation (#2270)

* Add user spec for settings, highlight global default mutation issue

* Fix mutation issue caused by settings/preferences spec

8 years agoAdd crossorigin="anonymous" to about (#2272)
Yamagishi Kazutoshi [Fri, 21 Apr 2017 16:06:43 +0000 (01:06 +0900)]
Add crossorigin="anonymous" to about (#2272)

8 years agoAdd Mastodon version to user agent (#2253)
ik-fib [Fri, 21 Apr 2017 15:26:23 +0000 (00:26 +0900)]
Add Mastodon version to user agent (#2253)

8 years agoRuby time format fixed (#2259)
jeroenpraat [Fri, 21 Apr 2017 14:47:15 +0000 (16:47 +0200)]
Ruby time format fixed (#2259)

8 years agoUpgrade jQuery to v2.x (#2246)
Yamagishi Kazutoshi [Fri, 21 Apr 2017 14:46:32 +0000 (23:46 +0900)]
Upgrade jQuery to v2.x (#2246)

Fix #2199 and minifying assets file.

jQuery v1.x is supports legacy browsers.
But, Mastodon does not support legacy browsers.
I think jQuery v1.x is unnecessary.

8 years agoFix a bug where the hashtag could not be specified with the streaming API (#2258)
178inaba [Fri, 21 Apr 2017 14:45:14 +0000 (23:45 +0900)]
Fix a bug where the hashtag could not be specified with the streaming API (#2258)

8 years agoOpen authorized application in a new window (#2250)
Jérémy Benoist [Fri, 21 Apr 2017 14:44:14 +0000 (16:44 +0200)]
Open authorized application in a new window (#2250)

Like it's already done when you click on an application from a toot, it's opening in a new window.
https://github.com/tootsuite/mastodon/blob/0254ee9795822ec75ff64ace6ec2b91573bc9a52/app/views/stream_entries/_detailed_status.html.haml#L41

8 years agoUse new ESLint filename (.json) (#2248)
Mingye Wang [Fri, 21 Apr 2017 14:43:57 +0000 (10:43 -0400)]
Use new ESLint filename (.json) (#2248)

* Use new ESLint filename (.json)

Codeclimate's ESLint 3 is complaining about the old filename. Let me try changing it.

* point eslint to new rc

(squash this)

8 years agoAdds version to about/more and API (#2181)
Ash Furrow [Fri, 21 Apr 2017 01:30:59 +0000 (21:30 -0400)]
Adds version to about/more and API (#2181)

* Adds version.

* Cleans up code.

* Removes standalone endpoint and adds version to instance endpoint.

* Addresses feedback from #2181.

8 years agoCroatian language updates & fixes (#2203)
May Kittens Devour Your Soul [Fri, 21 Apr 2017 01:30:15 +0000 (03:30 +0200)]
Croatian language updates & fixes (#2203)

* Update hr.jsx

* Update and rename simple.form.hr.yml to simple_form.hr.yml

fixed file name

* Update hr.yml

* Update hr.yml

8 years agoAdjustment of oc.jsx (#2214)
Quent-in [Fri, 21 Apr 2017 01:30:01 +0000 (03:30 +0200)]
Adjustment of oc.jsx (#2214)

8 years agoEnables the Polish translation. (#2235)
Ash Furrow [Fri, 21 Apr 2017 01:29:11 +0000 (21:29 -0400)]
Enables the Polish translation. (#2235)

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