]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoMinor fix in Travis config with bundler call (#2806)
Koala Yeung [Fri, 5 May 2017 16:52:15 +0000 (00:52 +0800)]
Minor fix in Travis config with bundler call (#2806)

* Travis: Fix bundler_args

`bundler_args` is not functional if using custom install script
in `.travis.yml`. Directly attach the argument to the install script.

* Travis: Run i18n-tasks through bundle exec

Parallel to similar scripts in the same travis config.
More resiliant to changes in configuration.

* Travis: bundler vendor directory

Travis + rvm seems to ignore `.bundle/config` and hence use rvm
global vendor directory by default. Adding `--path` will fix this
and hence make `cache.bundler = true` really functional.

* Travis: disable bundler cache

No significant change in build time. Huge cache. Best disabled.

8 years agoUpdate Locale zh-HK (#2818)
Koala Yeung [Fri, 5 May 2017 16:48:54 +0000 (00:48 +0800)]
Update Locale zh-HK (#2818)

* locale: Add missing translation in zh-HK.yml

* locale: fix consistancy in zh-HK.yml translation

* locale: Improve zh-HK yml translations

* Use "PuSH" in all "PubSubHubBub" occurances.
* Simplify text on front page.
* Improve doorkeeper authorization table translations.
* Simplify setting form text for better layout.
* Improve "Business Email" translation.

* locale: Update zh-HK.json

* Fix untranslated text.
* Improve translations.

8 years agoRun manage:translations (#2816)
Yamagishi Kazutoshi [Fri, 5 May 2017 16:46:51 +0000 (01:46 +0900)]
Run manage:translations (#2816)

8 years agoAdd specs (and refactor) of FetchRemoteResourceService and SearchService (#2812)
Matt Jankowski [Fri, 5 May 2017 15:26:04 +0000 (11:26 -0400)]
Add specs (and refactor) of FetchRemoteResourceService and SearchService (#2812)

* Coverage for fetch remote resource service

* Refactor fetch remote resource service

* Coverage for search service

* Refactor search service

8 years agoAdd Japanese translate to home column when inactive (#2813)
Yamagishi Kazutoshi [Fri, 5 May 2017 15:25:42 +0000 (00:25 +0900)]
Add Japanese translate to home column when inactive (#2813)

8 years agoUpdate ar.json (#2815)
ButterflyOfFire [Fri, 5 May 2017 15:25:17 +0000 (17:25 +0200)]
Update ar.json (#2815)

Adding more arabic translated strings.

8 years agoCorrect typo in german locale (#2805)
Milan* [Fri, 5 May 2017 13:59:16 +0000 (15:59 +0200)]
Correct typo in german locale (#2805)

8 years agoAdd additional documentation and warnings to the WEB_DOMAIN setting. (#2386)
ThibG [Fri, 5 May 2017 02:56:28 +0000 (04:56 +0200)]
Add additional documentation and warnings to the WEB_DOMAIN setting. (#2386)

* Add additional documentation and warnings to the WEB_DOMAIN setting.

This feature is largely undocumented, and quite a number of users have
shot them in the feet already despite the warning. Added a bit of documentation
and expanded the warning until we have a mechanism for dealing with conflicting
user URIs.

* Change WEB_DOMAIN comments to point to the extensive online documentation

8 years agoMore robust PuSH subscription refreshes (#2799)
Eugen Rochko [Fri, 5 May 2017 00:23:01 +0000 (02:23 +0200)]
More robust PuSH subscription refreshes (#2799)

* Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron

Fix an issue where / in domain would raise exception in TagManager#normalize_domain

PuSH subscriptions refresh done in a round-robin way to avoid hammering a single
server's hub in sequence. Correct handling of failures/retries through Sidekiq (see
also #2613). Optimize Account#with_followers scope. Also, since subscriptions
are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire
refreshing operation halfway through

Fix #2702 - Correct user agent header on outgoing http requests

* Add test for SubscribeService

* Extract #expiring_accounts into method

* Make mastodon:push:refresh no-op

* Queues are now defined in sidekiq.yml

* Queues are now in sidekiq.yml

8 years agoui: check spoiler_text against regex filter (#1635) (#2665)
R Tucker [Thu, 4 May 2017 21:48:48 +0000 (17:48 -0400)]
ui: check spoiler_text against regex filter (#1635) (#2665)

* ui: check spoiler_text against regex filter (#1635)

When filtering by regex, also check the spoiler_text if
present.

* ui: concatenate spoiler and content in reducer

Simplifies aa5b03c, clarifies intent of the field

8 years agoRemove the react-rails gem (#2801)
Matt Jankowski [Thu, 4 May 2017 21:45:18 +0000 (17:45 -0400)]
Remove the react-rails gem (#2801)

* Remove react-rails gem

* Fix broken view spec

8 years agoDelete records in smaller transaction (#2802)
alpaca-tc [Thu, 4 May 2017 21:44:39 +0000 (06:44 +0900)]
Delete records in smaller transaction (#2802)

8 years agoWhen streaming API is disconnected, poll home/notifications (#2776)
Eugen Rochko [Thu, 4 May 2017 21:41:34 +0000 (23:41 +0200)]
When streaming API is disconnected, poll home/notifications (#2776)

* When streaming API is disconnected, poll home/notifications
Display slightly different empty home timeline message if user is following others
Cull notifications to 20 items when over 40 get added in real-time
Run manage:translations

* Optimize <HomeTimeline /> a little

8 years agoRemove redis clear from before in spec (#2795)
Matt Jankowski [Thu, 4 May 2017 18:53:39 +0000 (14:53 -0400)]
Remove redis clear from before in spec (#2795)

8 years agoFix language selector on preferences page (#2794)
AA4ch1 [Thu, 4 May 2017 18:39:25 +0000 (03:39 +0900)]
Fix language selector on preferences page (#2794)

8 years agoImprove style for form in site settings (#2796)
Yamagishi Kazutoshi [Thu, 4 May 2017 18:37:57 +0000 (03:37 +0900)]
Improve style for form in site settings (#2796)

8 years agoPersian translation update (#2788)
Masoud Abkenar [Thu, 4 May 2017 16:32:05 +0000 (18:32 +0200)]
Persian translation update (#2788)

* Persian translation update

* fix newline typo

8 years agoabout page : use slightly more space (#2791)
Wonderfall [Thu, 4 May 2017 16:16:00 +0000 (18:16 +0200)]
about page : use slightly more space (#2791)

8 years agoReplace best_in_place editor on admin settings page (#2789)
Matt Jankowski [Thu, 4 May 2017 16:12:44 +0000 (12:12 -0400)]
Replace best_in_place editor on admin settings page (#2789)

* Remove best_in_place

* Replace best_in_place usage with rails helpers

* Move admin/settings#index to #edit action

* Remove click_to__edit from i18n

8 years agoEnable disableHostCheck option of webpack-dev-server (#2790)
abcang [Thu, 4 May 2017 15:49:05 +0000 (00:49 +0900)]
Enable disableHostCheck option of webpack-dev-server (#2790)

8 years agoSwitch docker-compose to version 3. (#2747)
Valentin Ouvrard [Thu, 4 May 2017 13:56:05 +0000 (00:56 +1100)]
Switch docker-compose to version 3. (#2747)

* Switch docker-compose to version 3.

It allow possibility to Deploy Mastodon in a Swarm cluster directly from the compose file.

* switch to compose v3 without depend.

8 years agoUse ws protocol in streaming API base URL (#2606)
Akihiko Odaki [Thu, 4 May 2017 13:55:13 +0000 (22:55 +0900)]
Use ws protocol in streaming API base URL (#2606)

8 years agofix DB_URL (#2778)
abcang [Thu, 4 May 2017 13:53:44 +0000 (22:53 +0900)]
fix DB_URL (#2778)

8 years agoDecode IDNA in PreviewCard (#2781)
Yamagishi Kazutoshi [Thu, 4 May 2017 13:52:08 +0000 (22:52 +0900)]
Decode IDNA in PreviewCard (#2781)

8 years agoFixes #1830 adds link to development guide (#2783)
Brian Mock [Thu, 4 May 2017 13:50:36 +0000 (09:50 -0400)]
Fixes #1830 adds link to development guide (#2783)

8 years agoShow emoji shortname by a tooltip (#2784)
unarist [Thu, 4 May 2017 13:50:09 +0000 (22:50 +0900)]
Show emoji shortname by a tooltip (#2784)

8 years agochanged to run foreman with vagrant (#2742)
abcang [Thu, 4 May 2017 02:39:50 +0000 (11:39 +0900)]
changed to run foreman with vagrant (#2742)

* changed to run foreman with vagrant

* change port specification method and database setting

* delete changes of environment variable related code

* hard coated the port

8 years agoMake vagrant HTTP port configurable (#2510)
Colin Mitchell [Thu, 4 May 2017 02:36:36 +0000 (22:36 -0400)]
Make vagrant HTTP port configurable (#2510)

8 years agoLikely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734)
Eugen Rochko [Thu, 4 May 2017 02:34:57 +0000 (04:34 +0200)]
Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734)

* Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses

If a delete arrives before the original status, cache that information
for 6h, and if the original status arrives in that window, ignore it

* Add test case

8 years agoFix #2725 (#2774)
Eugen Rochko [Wed, 3 May 2017 23:42:03 +0000 (01:42 +0200)]
Fix #2725 (#2774)

8 years agoLanguage: update pt-BR (#2775)
Eduardo Elias [Wed, 3 May 2017 23:28:10 +0000 (00:28 +0100)]
Language: update pt-BR (#2775)

8 years agoLocalize 'throttled' (#2755)
alpaca-tc [Wed, 3 May 2017 21:36:19 +0000 (06:36 +0900)]
Localize 'throttled' (#2755)

8 years agoUpdate fr.json (#2757)
goofy-bz [Wed, 3 May 2017 21:36:01 +0000 (23:36 +0200)]
Update fr.json (#2757)

ajout espace insécable derrière pouet - pour voir

8 years agoi18n: updated Polish translation (#2768)
m4sk1n [Wed, 3 May 2017 21:19:11 +0000 (23:19 +0200)]
i18n: updated Polish translation (#2768)

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
8 years agoClean up redis configuration. Allow using REDIS_URL to set advanced (#2732)
Eugen Rochko [Wed, 3 May 2017 21:18:13 +0000 (23:18 +0200)]
Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732)

connection options instead of setting REDIS_HOST etc individually

Close #1986

8 years agoupdate gems (#2754)
yhirano [Wed, 3 May 2017 19:28:29 +0000 (04:28 +0900)]
update gems (#2754)

8 years agoAdditional specs for URI handling (#2759)
ThibG [Wed, 3 May 2017 18:40:14 +0000 (20:40 +0200)]
Additional specs for URI handling (#2759)

8 years agoCorrect Account model for rubocop (#2587)
Tomohiro Suwa [Wed, 3 May 2017 17:13:04 +0000 (02:13 +0900)]
Correct Account model for rubocop (#2587)

* Correct Account model for rubocop

* Undo these changes

8 years agoRemove screenshot image (#2736)
Matt Jankowski [Wed, 3 May 2017 15:03:10 +0000 (11:03 -0400)]
Remove screenshot image (#2736)

8 years agoFix #2706 - Always respond with 200 to PuSH payloads (#2733)
Eugen Rochko [Wed, 3 May 2017 15:02:18 +0000 (17:02 +0200)]
Fix #2706 - Always respond with 200 to PuSH payloads (#2733)

Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified
Fix #2629 - Correctly handle confirm_domain? for local accounts
Unify rules for extracting author acct from XML, prefer <email>, fall back
to <name> + <uri> (see also #2017, #2172)

8 years agoVagrantfile: node 6 (#2752)
kawax [Wed, 3 May 2017 14:59:51 +0000 (23:59 +0900)]
Vagrantfile: node 6 (#2752)

8 years agoLanguage improvements, replace whatlanguage with CLD (#2753)
Matt Jankowski [Wed, 3 May 2017 14:59:31 +0000 (10:59 -0400)]
Language improvements, replace whatlanguage with CLD (#2753)

* add failing en specs

* add cld2 gem

* Replace WhatLanguage with CLD

8 years agoUpdate of simple_forum_oc (#2745)
Quent-in [Wed, 3 May 2017 12:23:17 +0000 (14:23 +0200)]
Update of simple_forum_oc (#2745)

* Update of simple_forum_oc

* Update simple_form.oc.yml

8 years agoi18n: Update zh-CN [ Chinese (China) ] translations. (#2699)
ヨイツの賢狼ホロ | 3rd style [Wed, 3 May 2017 12:03:16 +0000 (20:03 +0800)]
i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)

* Update zh-CN translations.

* Update doorkeeper.zh-CN.yml

* Follow @Artoria2e5 's change advices.

* forget mail for text format ......

* fix some changes

* mail's html version ......

* https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283

* a space.....

* delete some unused keys

8 years agoAdd styles for small devices to .onboarding-modal (#2748)
unarist [Wed, 3 May 2017 12:02:15 +0000 (21:02 +0900)]
Add styles for small devices to .onboarding-modal (#2748)

8 years agoAdded support parallel_tests (#2740)
Keiji Matsuzaki [Wed, 3 May 2017 10:20:38 +0000 (19:20 +0900)]
Added support parallel_tests (#2740)

- Added new gem the `parallel_tests`.
- Updated .travis.yml.
  - Improved scripts and environment variable.

8 years agoAdd Thai Language (#2598)
jirayudech [Wed, 3 May 2017 10:18:00 +0000 (17:18 +0700)]
Add Thai Language (#2598)

* Create th.yml

* Update th.yml

* Update thai translation

* update thai translation.

* Update Thai translation

* Update thai translation

* Update thai thanslation

* Update thai translation

* Update th.yml

* Update th.yml

8 years agoremove capistrano/faster_assets from Capfile (#2737)
esetomo [Wed, 3 May 2017 10:14:52 +0000 (19:14 +0900)]
remove capistrano/faster_assets from Capfile (#2737)

8 years agoShow boosted user's avatar (#2518)
kawax [Wed, 3 May 2017 09:43:37 +0000 (18:43 +0900)]
Show boosted user's avatar (#2518)

* Show boosted user's avatar

* add .status__avatar-boost

* margin

* apply to notifications too.

* account__avatar-boost

* Add inline prop to Avatar component

* Add AvatarOverlay component

* rename mixins.scss

* move files for latest master

* fixed for webpack

8 years agoi18n: updated Polish translation (#2729)
m4sk1n [Wed, 3 May 2017 09:40:09 +0000 (11:40 +0200)]
i18n: updated Polish translation (#2729)

* i18n: updated Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
* i18n: Updated Polish translation

* i18n: updated Polish translation

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
8 years agoUpdate simple_form.ja.yml (#2746)
Masafumi Otsune [Wed, 3 May 2017 09:39:30 +0000 (18:39 +0900)]
Update simple_form.ja.yml (#2746)

"サーバー" in Japanese is "Server", so I modified it to instance according to English.

8 years agoFix width of .confirmation-modal on narrow screens (#2743)
unarist [Wed, 3 May 2017 09:39:14 +0000 (18:39 +0900)]
Fix width of .confirmation-modal on narrow screens (#2743)

8 years agoAdd Japanese translation for allowed languages (#2738)
Yamagishi Kazutoshi [Wed, 3 May 2017 09:37:44 +0000 (18:37 +0900)]
Add Japanese translation for allowed languages (#2738)

* Add Japanese translation for allowed languages

* Remove duplicate expression words

8 years agoUse URI.join for generate asset URL (#2741)
Yamagishi Kazutoshi [Wed, 3 May 2017 09:31:21 +0000 (18:31 +0900)]
Use URI.join for generate asset URL (#2741)

* Use URI.join for generate asset URL

* to String

8 years agoUse puma config for Procfile.dev (#2735)
Matt Jankowski [Wed, 3 May 2017 00:28:47 +0000 (20:28 -0400)]
Use puma config for Procfile.dev (#2735)

8 years agoReplace sprockets/browserify with Webpack (#2617)
Eugen Rochko [Wed, 3 May 2017 00:04:16 +0000 (02:04 +0200)]
Replace sprockets/browserify with Webpack (#2617)

* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add Procfile.dev for running rails, webpack and streaming API at the same time

8 years agoAllow to set CA file for SMTP (#2713)
Akihiko Odaki [Tue, 2 May 2017 23:03:12 +0000 (08:03 +0900)]
Allow to set CA file for SMTP (#2713)

8 years agoAuth sign out (#2511)
Matt Jankowski [Tue, 2 May 2017 21:37:58 +0000 (17:37 -0400)]
Auth sign out (#2511)

* Add a spec for signing out

* Add spec showing that suspended user gets a 403 forbidden on sign out

* Allow suspended account users to sign out

8 years agoAdd rspec to further specify FollowRemoteAccountService (#2414)
ThibG [Tue, 2 May 2017 21:37:26 +0000 (23:37 +0200)]
Add rspec to further specify FollowRemoteAccountService (#2414)

8 years agoi18n: updated Polish translation (#2727)
m4sk1n [Tue, 2 May 2017 21:04:41 +0000 (23:04 +0200)]
i18n: updated Polish translation (#2727)

Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
8 years agoAdd option to disable two factor auth in admin accounts panel. (#2584)
Kaylee [Tue, 2 May 2017 19:07:12 +0000 (20:07 +0100)]
Add option to disable two factor auth in admin accounts panel. (#2584)

* Add option to disable two factor auth in admin accounts panel.
Closes #2578

* Add @mjankowski's suggestions.
* Moves destroy actions behind User#disable_two_factor!
* Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!

8 years agoAdd admin area view partials for each record type (#2700)
Matt Jankowski [Tue, 2 May 2017 18:56:28 +0000 (14:56 -0400)]
Add admin area view partials for each record type (#2700)

8 years agoCreation of activerecord for OC (#2721)
Quent-in [Tue, 2 May 2017 18:55:14 +0000 (20:55 +0200)]
Creation of activerecord for OC (#2721)

* Creation of activerecord for OC

* Update activerecord.oc.yml

8 years agoNorwegian translation for email notifications (#2673)
Audun Larsen [Tue, 2 May 2017 18:18:43 +0000 (20:18 +0200)]
Norwegian translation for email notifications (#2673)

* Create confirmation_instructions.no.html.erb

* Create confirmation_instructions.no.text.erb

* Create password_change.no.html.erb

* Create password_change.no.text.erb

* Create reset_password_instructions.no.html.erb

* Create reset_password_instructions.no.text.erb

* Translates html welcome email

* Translates welcome email

* Translates html password changed email

* Translates password changed email

* Translates html reset password email

* Translates reset password email

* Fixes typo in translation

* Fixes typo in translation

8 years agoDarkens colour on stream entries meta. (#2616)
Ash Furrow [Tue, 2 May 2017 18:10:55 +0000 (20:10 +0200)]
Darkens colour on stream entries meta. (#2616)

8 years agoi18n: Updated Polish translation (#2686)
m4sk1n [Tue, 2 May 2017 18:08:44 +0000 (20:08 +0200)]
i18n: Updated Polish translation (#2686)

#807

8 years agoReset textarea height when press submit key (#2681)
Yamagishi Kazutoshi [Tue, 2 May 2017 18:08:21 +0000 (03:08 +0900)]
Reset textarea height when press submit key (#2681)

* Reset textarea height when press submit key

* dry

* DON'T NEED props

8 years agoLanguage: update pt-BR (#2687)
Eduardo Elias [Tue, 2 May 2017 18:05:21 +0000 (19:05 +0100)]
Language: update pt-BR (#2687)

8 years agoFix to completely hide NSFW-tagged images (#2724)
hakoai [Tue, 2 May 2017 18:03:00 +0000 (03:03 +0900)]
Fix to completely hide NSFW-tagged images (#2724)

8 years agoFix subscription expiration condition (#2715)
Yamagishi Kazutoshi [Tue, 2 May 2017 16:21:22 +0000 (01:21 +0900)]
Fix subscription expiration condition (#2715)

* Fix subscription expiration condition

* dry and add spec

8 years agoMake it possible to check Subscription that has expired (#2712)
Yamagishi Kazutoshi [Tue, 2 May 2017 13:52:30 +0000 (22:52 +0900)]
Make it possible to check Subscription that has expired (#2712)

8 years agoAdd Hebrew interface translation. (#2573)
Ira [Tue, 2 May 2017 12:54:35 +0000 (15:54 +0300)]
Add Hebrew interface translation. (#2573)

* follow the instructions for registering the language as stated on the Tootsuite's docs.

* Added translation strings from latest master

Adding &rlm; characters to many strings that are misdirected in the interface.

A tiny grammar fix

Updates of Hebrew strings to v1.3.1

Hebrew translation of the mailer templates.

Fix strings and a missing comma.

Just discovered two string keys were updated. this should lay Travis' mind to rest at last.

Remove mentions before counting characters to decide RTL ratio

Fixes for PR #2573

updated strings for latest master

Undo RTL counting, moved out to another branch for future consideration...

8 years agogrammar fixes (#2695)
Drew Gates [Tue, 2 May 2017 00:21:19 +0000 (20:21 -0400)]
grammar fixes (#2695)

“such as” should be used instead of “like” under imports->preface.

Reworded imports->preface and recovery_instructions for better flow.

8 years agofix(boost-icon): Align center for Firefox (#2690)
Stephen Burgess [Tue, 2 May 2017 00:15:14 +0000 (20:15 -0400)]
fix(boost-icon): Align center for Firefox (#2690)

8 years agoannotate models (#2697)
yhirano [Tue, 2 May 2017 00:14:47 +0000 (09:14 +0900)]
annotate models (#2697)

* add annotate to Gemfile

* rails g annotate:install

* configure annotate_models

* add schema info to models

* fix rubocop to add frozen_string_literal

8 years agoCoverage for remote follows (#2694)
Matt Jankowski [Mon, 1 May 2017 22:44:23 +0000 (18:44 -0400)]
Coverage for remote follows (#2694)

* Add coverage for create with empty acct value

* Add coverage for create with webfinger failure

* Add coverage for create with webfinger providing bad values

* Add coverage for create when webfinger is good

* Add coverage for session[:remote_follow] having data

* Simplify how remote follow pulls acct from session

* Remote follow behaves more like model

* Move the discovery portions of remote follow out of controller

* Check for suspended accounts

8 years agoError responses cleanup (#2692)
Matt Jankowski [Mon, 1 May 2017 20:24:36 +0000 (16:24 -0400)]
Error responses cleanup (#2692)

* Use respond_with_error for forbidden errors

* Wrap up common error code into single method

8 years agoItalian translation (#2654)
Giuseppe Pignataro [Mon, 1 May 2017 16:14:51 +0000 (18:14 +0200)]
Italian translation (#2654)

* Added Italian Translation of the following files:
Changes to be committed:
new file:   app/views/user_mailer/confirmation_instructions.it.html.erb
new file:   app/views/user_mailer/confirmation_instructions.it.text.erb
new file:   app/views/user_mailer/password_change.it.html.erb
new file:   app/views/user_mailer/password_change.it.text.erb
new file:   app/views/user_mailer/reset_password_instructions.it.html.erb
new file:   app/views/user_mailer/reset_password_instructions.it.text.erb

* Added italian translation
Changes to be committed:
new file:   config/locales/activerecord.it.yml

8 years agofix(scrolling): Center for large screen w/o breaking horiz scroll (#2682)
Stephen Burgess [Mon, 1 May 2017 16:14:26 +0000 (12:14 -0400)]
fix(scrolling): Center for large screen w/o breaking horiz scroll (#2682)

8 years agofix(dropdowns): Allow for dropdowns to fill full column (#2684)
Stephen Burgess [Mon, 1 May 2017 16:13:10 +0000 (12:13 -0400)]
fix(dropdowns): Allow for dropdowns to fill full column (#2684)

* fix(dropdowns): Allow for dropdowns to fill full column

When the text inside a dropdown is longer than it is for English, the text is truncated which can result in a less-than-usable experience for languages such as German with longer words. This commit addresses the following:

* Allow the dropdown to expand to the entire width of the column based on the length of the text in the dropdown
* Align active dropdown arrow in relation to the trigger rather than the dropdown
* Show the right hand side of the dropdown which was previously hidden (could not see border radius)
* Ensure the three places dropdowns of status, account, and emoji appear well in Chrome, Firefox, Safari

* fix(emoji-dropdown): Restore emoji dropdown caret

8 years agoFilter on allowed user language preferences (#2361)
Matt Jankowski [Mon, 1 May 2017 15:42:13 +0000 (11:42 -0400)]
Filter on allowed user language preferences (#2361)

* Naive approached to timeline filtering

* Convert allowed_languages into a db column

* Allow users to choose languages to see statuses in

* Style list items as two columns

* Add a hint to explain language filtering preference

8 years agoFix Rubocop offences (#2630)
yhirano [Mon, 1 May 2017 14:31:02 +0000 (23:31 +0900)]
Fix Rubocop offences (#2630)

* disable Bundler/OrderedGems

* fix rubocop Lint/UselessAssignment

* fix rubocop Style/BlockDelimiters

* fix rubocop Style/AlignHash

* fix rubocop Style/AlignParameters, Style/EachWithObject

* fix rubocop Style/SpaceInLambdaLiteral

8 years agoDetect extension for preview card (#2679)
Yamagishi Kazutoshi [Mon, 1 May 2017 14:20:57 +0000 (23:20 +0900)]
Detect extension for preview card (#2679)

* Detect extension for preview card

* next

8 years agoReports spec for media attachments, clean up method (#2660)
Matt Jankowski [Sun, 30 Apr 2017 16:15:49 +0000 (12:15 -0400)]
Reports spec for media attachments, clean up method (#2660)

* Add coverage for Report#media_attachments

* Direct query on media attachment

8 years agoAdd postgres/redis folder to .dockerignore (#2659)
mecab [Sun, 30 Apr 2017 16:15:27 +0000 (01:15 +0900)]
Add postgres/redis folder to .dockerignore (#2659)

8 years agoUpdating Indonesian locale (#2644)
Alvina Putri [Sun, 30 Apr 2017 15:35:15 +0000 (22:35 +0700)]
Updating Indonesian locale (#2644)

* update id.jsx file

* update id.yml for new strings and improvements

* add activerecord.id.yml

* improve translation that out of context

* fix another ooc string

* fix main key

8 years agoAdditional key checks for browser compatibility (#2539)
Noëlle Anthony [Sun, 30 Apr 2017 13:12:14 +0000 (09:12 -0400)]
Additional key checks for browser compatibility (#2539)

Not all browsers recognize e.key === 'Escape'; some use 'Esc' and some only respond to the keyCode.

8 years agoCenter web app on larger windows sizes (#2021)
Hugo Gameiro [Sun, 30 Apr 2017 13:01:09 +0000 (14:01 +0100)]
Center web app on larger windows sizes (#2021)

* center web app for larger screen sizes

* move center app to components.scss

* center app on larger window sizes

* center .columns-area

8 years agoFix character_counter.jsx (#2653)
AA4ch1 [Sun, 30 Apr 2017 12:58:33 +0000 (21:58 +0900)]
Fix character_counter.jsx (#2653)

This commit fixes #2576

8 years agoNorwegian locale: Translates missing 2FA strings (#2655)
Audun Larsen [Sun, 30 Apr 2017 12:56:07 +0000 (14:56 +0200)]
Norwegian locale: Translates missing 2FA strings (#2655)

* Adds missing strings to Norwegian locale

* Translates missing strings.

* Changes "tofaktorautentisering" to "to-faktor autentisering"

According to the Norwegian National Security Authority this is the correct way to spell it.
https://www.nsm.stat.no/blogg/veiledning-i-to-faktor-autentisering/

8 years agoMinor fixes in the French translation (#2607)
Sylvhem [Sun, 30 Apr 2017 12:51:32 +0000 (14:51 +0200)]
Minor fixes in the French translation (#2607)

* Changement de « muets » en « silencés »

Utiliser le mot « muet » donne la fausse impression que ces comptes ne diffusent juste rien. Utiliser le mot « silencé » met l’accent sur le fait que ceci résulte d’une action de l’utilisateur·rice.

By using tho word "muet" (mute), we give the false impression that this accounts don't publish anything. Using the "silencé" (muted) put emphasis on the fact that this is the result of one of the user's action.

* Remplacement de « ' » par « ’ »

En français, l’apostrophe utilisée est une apostrophe courbe « ’ » (U+2019) et non pas une apostrophe droite « ' » (U+0027). La plupart des chaînes utilisaient une apostrophe droite. Ce commit harmonise le type d’apostrophe utilisé en remplaçant toutes les apostrophes droites par des apostrophes courbes.

In French, the apostrophe used is the curly one (U+2019) and not the vertical one (U+0027). Almost all the strings used a vertical apostrophe. This commit harmonize the kind of apostrophe used in the French localization by replacing all the vertical apostrophes by curly apostrophes.

* Remplacement de « ... » par « … »

Certaines chaînes utilisaient trois points d’affilié afin de représenter les points de suspension au lieu d’utiliser le caractère dédié « … » (U+2026). Ce commit harmonise la façon de représenter des points en remplaçant toutes les séries de trois points par le caractère dédié.

Some chains used a series of three dots to show the ellipsis instead of using the dedicated character "…" (U+2026). This commit harmonize how the ellipsis is shown in the French localization by replacing all the series of three dots by the dedicated character.

* Ajout d’un point final

Il manque un point à la fin de la dernière phrase de la chaîne « compose_form.privacy_disclaimer ». Ce commit le rajoute.

The last sentence of the "compose_form.privacy_disclaimer" string is missing a final dot. This commit will add it.

* Retrait d’un « s » final à « Mastodon »

Suite à la remarque de @wxcafe, retrait du « s » final à « Mastodon ».

Following @wxcafe comment, this commit remove the final "s" in the word "Mastodon".

8 years agoUpdate ar.jsx (#2647)
ButterflyOfFire [Sun, 30 Apr 2017 12:51:12 +0000 (14:51 +0200)]
Update ar.jsx (#2647)

* Update ar.jsx

Updating some (ar) translation.

* Update ar.yml

Pushing some missing translation strings on ar.yml

8 years agoMinor changes to Norwegian locale (#2652)
Audun Larsen [Sun, 30 Apr 2017 12:50:49 +0000 (14:50 +0200)]
Minor changes to Norwegian locale (#2652)

8 years agoRevert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)
Akihiko Odaki [Sun, 30 Apr 2017 12:49:24 +0000 (21:49 +0900)]
Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)

This reverts commit 5135d609b774b177d3d3894b176a822d86b73d3c.

8 years agoAdd target=_blank to user note (#2622)
Yamagishi Kazutoshi [Sat, 29 Apr 2017 22:28:41 +0000 (07:28 +0900)]
Add target=_blank to user note (#2622)

* Add target=_blank to user note

Open new window when click link from user profile in remote instance.

* fix rubocop

8 years agoExtract user tracking into concern (#2600)
Matt Jankowski [Sat, 29 Apr 2017 22:28:16 +0000 (18:28 -0400)]
Extract user tracking into concern (#2600)

8 years agoallow localhost to bypass the ratelimit (#2554)
Tristan Mahé [Sat, 29 Apr 2017 22:27:49 +0000 (15:27 -0700)]
allow localhost to bypass the ratelimit (#2554)

8 years agoUse PostgreSQL inheritance for blocks and mutes (#2520)
Akihiko Odaki [Sat, 29 Apr 2017 22:27:31 +0000 (07:27 +0900)]
Use PostgreSQL inheritance for blocks and mutes (#2520)

8 years agoMore coverage yes more even more (#2627)
Matt Jankowski [Sat, 29 Apr 2017 22:25:38 +0000 (18:25 -0400)]
More coverage yes more even more (#2627)

* Add coverage for admin/confirmations controller

* Coverage for statuses controller show action

* Add coverage for admin/domain_blocks controller

* Add coverage for settings/profiles#update

8 years agoDowngrade rubocop 0.48.1 => 0.46.0 (#2628)
yhirano [Sat, 29 Apr 2017 22:23:45 +0000 (07:23 +0900)]
Downgrade rubocop 0.48.1 => 0.46.0 (#2628)

* downgrade rubocop 0.48.1 => 0.46.0

* exclude vendor/**/* from rubocop target files

* add frozen_string_literal comment line

* fix percent literal delimited by ( and )

* fix alignment

* remove comment disabling unknown cop