]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoFix og:url. (#3031)
Shunsuke Michii [Sat, 13 May 2017 13:56:42 +0000 (22:56 +0900)]
Fix og:url. (#3031)

8 years agoFixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)
alpaca-tc [Sat, 13 May 2017 13:56:12 +0000 (22:56 +0900)]
Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)

8 years agoFix broken storybook (#3030)
Yamagishi Kazutoshi [Sat, 13 May 2017 13:55:56 +0000 (22:55 +0900)]
Fix broken storybook (#3030)

8 years agoRevert HTML CW changes (#3020)
beatrix [Sat, 13 May 2017 02:03:43 +0000 (22:03 -0400)]
Revert HTML CW changes (#3020)

* selectively Revert "Fix regressions from #2683 (#2970)"

This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b.

* Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)"

This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.

8 years agoMake direct statuses stand out more (#3025)
Eugen Rochko [Fri, 12 May 2017 23:38:51 +0000 (01:38 +0200)]
Make direct statuses stand out more (#3025)

Resolves #2515

8 years agoFinalizing Dutch strings (#3028)
jeroenpraat [Fri, 12 May 2017 22:13:08 +0000 (00:13 +0200)]
Finalizing Dutch strings (#3028)

for this file.

8 years agoRebuild node-sass (#3002)
Daigo 3 Dango [Fri, 12 May 2017 20:04:41 +0000 (10:04 -1000)]
Rebuild node-sass (#3002)

Got an error in asset precompile on Heroku:
Module build failed: Error: ENOENT: no such file or directory, scandir '/tmp/.../node_modules/node-sass/vendor'

ref: https://github.com/rails/webpacker#troubleshooting

8 years agofix #3008 : props was not defined (#3022)
Wonderfall [Fri, 12 May 2017 18:58:41 +0000 (20:58 +0200)]
fix #3008 : props was not defined (#3022)

8 years agoSpec coverage and refactor for pubsub/delivery worker (#3021)
Matt Jankowski [Fri, 12 May 2017 18:35:36 +0000 (14:35 -0400)]
Spec coverage and refactor for pubsub/delivery worker (#3021)

* Framework for delivery worker spec

* Refactor of pubsub delivery worker

8 years agoFix color contrast some more in privacy warning (#3018)
Shel Raphen [Fri, 12 May 2017 18:19:39 +0000 (14:19 -0400)]
Fix color contrast some more in privacy warning (#3018)

* Fix color contrast some more in privacy warning

Latest master appears to have changed the <strong> to this unreadable grey color. If you want that to be white then it should be pure white. If someone would rather revert this to that strong dark blue color it was before that would be good too.

* Make domain dark blue again

* add missing ;

woops

8 years agoAllow SCSS variables to be overridden (#2987)
Koala Yeung [Fri, 12 May 2017 17:22:50 +0000 (01:22 +0800)]
Allow SCSS variables to be overridden (#2987)

* Allow SCSS variables to be overridden with
  `app/javascript/pack/variables*.scss`

* Allow these SCSS variables to be overriden:
  * `$base-shadow-color`
  * `$base-overlay-background`
  * `$base-border-color`
  * `$simple-background-color`
  * `$primary-text-color`
  * `$valid-value-color
  * `$error-value-color`

8 years agoRemove reference to non-existent table in schema rb (#3019)
Matt Jankowski [Fri, 12 May 2017 17:22:33 +0000 (13:22 -0400)]
Remove reference to non-existent table in schema rb (#3019)

8 years agoAdd conversation model, <ostatus:conversation /> (#3016)
Eugen Rochko [Fri, 12 May 2017 17:09:21 +0000 (19:09 +0200)]
Add conversation model, <ostatus:conversation /> (#3016)

* Add <ostatus:conversation /> tag to Atom input/output

Only uses ref attribute (not href) because href would be
the alternate link that's always included also.

Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.

* Fix conversation migration

* More spec coverage for status before_create

* Prevent n+1 query when generating Atom with the new conversations

* Improve code style

* Remove redundant local variable

8 years agoPrepend reblogs' wrapper content with "RT @original_author", (#3013)
Eugen Rochko [Fri, 12 May 2017 15:46:44 +0000 (17:46 +0200)]
Prepend reblogs' wrapper content with "RT @original_author", (#3013)

so that when a reblog parse fails on another instance, it doesn't
look like a misattributed/stolen text

8 years agoIncrease color contrast on privacy warning (#3015)
Shel Raphen [Fri, 12 May 2017 15:46:36 +0000 (11:46 -0400)]
Increase color contrast on privacy warning (#3015)

The current text contrast on the privacy warning is a WCAG violation. I didn't notice this because my instance has a custom theme which is better. On default theme I am barely able to read the text with my impaired vision. This patch brings the contrast to Normal Text WCAG AA compliance, and Large Text WCAG AAA compliance.

8 years agoFix sidekiq "port" being wrong (#3014)
Eugen Rochko [Fri, 12 May 2017 15:46:14 +0000 (17:46 +0200)]
Fix sidekiq "port" being wrong (#3014)

Sidekiq doesn't need a port, however that env var is used for generating URLs
in development, so when foreman sets it wrong, you get bad URLs from the
streaming API during development

8 years agoFix not rejecting remote URIs when parsing out local IDs (#3012)
Eugen Rochko [Fri, 12 May 2017 14:47:55 +0000 (16:47 +0200)]
Fix not rejecting remote URIs when parsing out local IDs (#3012)

8 years agoAdd back stdout logging to development environment after rails_12factor was removed...
Eugen Rochko [Fri, 12 May 2017 14:47:49 +0000 (16:47 +0200)]
Add back stdout logging to development environment after rails_12factor was removed (#3011)

8 years agoFix locales again (#3010)
Eugen Rochko [Fri, 12 May 2017 12:46:21 +0000 (14:46 +0200)]
Fix locales again (#3010)

* Normalize locales

* Restore "mention" locale key

8 years agoUse ES Class Fields & Static Properties (#3008)
Yamagishi Kazutoshi [Fri, 12 May 2017 12:44:10 +0000 (21:44 +0900)]
Use ES Class Fields & Static Properties (#3008)

Use ES Class Fields & Static Properties (currently stage 2) for improve class outlook.

Added babel-plugin-transform-class-properties as a Babel plugin.

8 years agoRemove unnecessary message in video player (#3007)
Yamagishi Kazutoshi [Fri, 12 May 2017 12:43:06 +0000 (21:43 +0900)]
Remove unnecessary message in video player (#3007)

Remove unnecessary messages added in #1879.
It is duplicated with other keys, causing the correct message not to be displayed.

8 years agoUse cid3 on Heroku (#3001)
Daigo 3 Dango [Fri, 12 May 2017 12:33:54 +0000 (02:33 -1000)]
Use cid3 on Heroku (#3001)

Use https://github.com/heroku/heroku-buildpack-apt to
install protobuf-compiler and libprotobuf-dev which are needed by cid3

8 years agoAdd yarn log files to gitignore (#3003)
AA4ch1 [Fri, 12 May 2017 12:32:47 +0000 (21:32 +0900)]
Add yarn log files to gitignore (#3003)

* Add yarn-error.log to gitignore

* Add yarn-debug.log to gitignore

8 years agoUpdate ar.json (#3004)
ButterflyOfFire [Fri, 12 May 2017 12:32:35 +0000 (13:32 +0100)]
Update ar.json (#3004)

Updating some arabic translations.

8 years agoUpdate doorkeeper.ar.yml (#3006)
ButterflyOfFire [Fri, 12 May 2017 12:32:13 +0000 (13:32 +0100)]
Update doorkeeper.ar.yml (#3006)

* Update doorkeeper.ar.yml

- Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version.
- Translating max strings
- Reviewing some translations
- Other strings to be translated later (complicated somehow)

* Update doorkeeper.ar.yml

Updating translations from lines : 88 to 91

8 years agoRemove dependencies that are no longer needed now (#2999)
Yamagishi Kazutoshi [Fri, 12 May 2017 02:04:41 +0000 (11:04 +0900)]
Remove dependencies that are no longer needed now (#2999)

There are some dependencies that are no longer needed anymore.
As a result, it took more time to install the package than necessary.

I want to delete them and shorten the installation time.

8 years agoFix #1426 - Trim long usernames in public follower/following lists (#2993)
Eugen Rochko [Thu, 11 May 2017 21:14:00 +0000 (23:14 +0200)]
Fix #1426 - Trim long usernames in public follower/following lists (#2993)

Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments
Don't strip "rel" attribute from <a> tags when sanitizing (microformats)

8 years agoCoverage for domain block worker (#2997)
Matt Jankowski [Thu, 11 May 2017 20:25:15 +0000 (16:25 -0400)]
Coverage for domain block worker (#2997)

8 years agoFix #2205 - Delete associated notifications when a status is deleted (#2994)
Eugen Rochko [Thu, 11 May 2017 19:54:47 +0000 (21:54 +0200)]
Fix #2205 - Delete associated notifications when a status is deleted (#2994)

8 years agoFix #2027 - Accept own ID for remote follow with and without preceding @ (#2991)
Eugen Rochko [Thu, 11 May 2017 19:54:30 +0000 (21:54 +0200)]
Fix #2027 - Accept own ID for remote follow with and without preceding @ (#2991)

* Fix #2027 - Accept own ID for remote follow with and without preceding @
Fix #2177 - Omit leading "acct:" in remote follow redirect template expansion

* Fix test

8 years agoStop require of i18n-tasks (#2992)
Yamagishi Kazutoshi [Thu, 11 May 2017 13:11:59 +0000 (22:11 +0900)]
Stop require of i18n-tasks (#2992)

8 years agoWhen avatar/header are missing, do not include the missing file into Atom (#2988)
Eugen Rochko [Thu, 11 May 2017 12:32:03 +0000 (14:32 +0200)]
When avatar/header are missing, do not include the missing file into Atom (#2988)

Receiving instances will then use their own missing image

Also, add <content /> to deleted statuses, since there was a reported
problem with the deletes and GNU social

8 years agoFocus tab of Mastodon when clicking notification (#2989)
Yamagishi Kazutoshi [Thu, 11 May 2017 11:34:05 +0000 (20:34 +0900)]
Focus tab of Mastodon when clicking notification (#2989)

8 years agoAdd pessimistic constraints to gem versions (#2980)
Jack Jennings [Thu, 11 May 2017 09:27:01 +0000 (02:27 -0700)]
Add pessimistic constraints to gem versions (#2980)

8 years agoAdd dynamic polyfills for older browsers (#2985)
Nolan Lawson [Thu, 11 May 2017 09:26:06 +0000 (02:26 -0700)]
Add dynamic polyfills for older browsers (#2985)

Fixes #2941

8 years agoAdd specs for current Status#permitted? implementation (#2982)
Jack Jennings [Thu, 11 May 2017 09:25:10 +0000 (02:25 -0700)]
Add specs for current Status#permitted? implementation (#2982)

8 years ago[bug] wrong config setting for dababase. (#2984)
Ayumu AIZAWA [Thu, 11 May 2017 09:23:24 +0000 (18:23 +0900)]
[bug] wrong config setting for dababase. (#2984)

8 years agoFixed mention regex to support unicode (#2420)
Go Shoemake [Thu, 11 May 2017 01:47:38 +0000 (18:47 -0700)]
Fixed mention regex to support unicode (#2420)

8 years agoUpdate screenshot in readme (#2978)
Eugen Rochko [Thu, 11 May 2017 00:57:30 +0000 (02:57 +0200)]
Update screenshot in readme (#2978)

8 years agoRefine unescapeHTML (#2977)
Yamagishi Kazutoshi [Thu, 11 May 2017 00:22:40 +0000 (09:22 +0900)]
Refine unescapeHTML (#2977)

8 years agoRemove unnecessary .keep files (#2976)
Yamagishi Kazutoshi [Wed, 10 May 2017 23:45:42 +0000 (08:45 +0900)]
Remove unnecessary .keep files (#2976)

Follow up #2902

8 years agoFix regressions from #2683 (#2970)
Eugen Rochko [Wed, 10 May 2017 22:28:10 +0000 (00:28 +0200)]
Fix regressions from #2683 (#2970)

* Fix regressions from #2683

Properly format spoiler text HTML, while keeping old logic for blankness intact
Process hashtags and mentions in spoiler text
Format spoiler text for Atom
Change "show more" toggle into a button instead of anchor
Fix style regression on dropdowns for detailed statuses

* Fix lint issue

* Convert spoiler text to plaintext in desktop notifications

8 years agoVery small fix/update NL strings (#2971)
jeroenpraat [Wed, 10 May 2017 22:20:13 +0000 (00:20 +0200)]
Very small fix/update NL strings (#2971)

* Very small fix/update NL strings

* Oops

8 years agoPubsub confirmation worker spec (#2974)
Matt Jankowski [Wed, 10 May 2017 22:19:37 +0000 (18:19 -0400)]
Pubsub confirmation worker spec (#2974)

* Add specs for valid challenge response from pubsub confirmation worker

* Refactor the pubsub confirmation worker

8 years agoFix #2955 - Send HEAD request ahead of GET when fetching URL previews (#2972)
Eugen Rochko [Wed, 10 May 2017 21:30:07 +0000 (23:30 +0200)]
Fix #2955 - Send HEAD request ahead of GET when fetching URL previews (#2972)

8 years agoAdd `account_id DESC` to optimize PrecomputeFeedService (#2967)
alpaca-tc [Wed, 10 May 2017 18:33:32 +0000 (03:33 +0900)]
Add `account_id DESC` to optimize PrecomputeFeedService (#2967)

8 years agofix a regression introduced by e2491680e696d2c285a798ec4c66b26d2748df66 (#2966)
beatrix [Wed, 10 May 2017 18:32:59 +0000 (14:32 -0400)]
fix a regression introduced by e2491680e696d2c285a798ec4c66b26d2748df66 (#2966)

that caused user pages to break when showing toots with CWs

8 years agoalign buttons with column headers (#2964)
Wonderfall [Wed, 10 May 2017 18:32:26 +0000 (20:32 +0200)]
align buttons with column headers (#2964)

8 years agoSpec feed insert worker (#2965)
Matt Jankowski [Wed, 10 May 2017 18:32:05 +0000 (14:32 -0400)]
Spec feed insert worker (#2965)

* Spec for feed insert worker when missing records

* more specs!

* Refactor feed insert worker

8 years agoAdd boop sounds in Vorbis format (#2963)
Yamagishi Kazutoshi [Wed, 10 May 2017 14:58:54 +0000 (23:58 +0900)]
Add boop sounds in Vorbis format (#2963)

Vorbis is audio format of Open Source.
Can play audio in a free environment where you can not play mp3.

8 years agoDisable sidekiq logging in test mode (#2962)
Matt Jankowski [Wed, 10 May 2017 14:16:42 +0000 (10:16 -0400)]
Disable sidekiq logging in test mode (#2962)

8 years agoSpec coverage and refactor of digest mailer worker (#2961)
Matt Jankowski [Wed, 10 May 2017 13:45:43 +0000 (09:45 -0400)]
Spec coverage and refactor of digest mailer worker (#2961)

8 years agoFix Occitan's locale data plural function (#2957)
Koala Yeung [Wed, 10 May 2017 12:44:48 +0000 (20:44 +0800)]
Fix Occitan's locale data plural function (#2957)

* Fix the pluralRuleFunction of the locale data.
* Added more descriptions about how to write it.

8 years agoFix compose_form.js for #2904 (#2960)
AA4ch1 [Wed, 10 May 2017 12:41:39 +0000 (21:41 +0900)]
Fix compose_form.js for #2904 (#2960)

8 years agoUpdate cld3 to 3.1.1 (#2958)
Akihiko Odaki [Wed, 10 May 2017 12:39:28 +0000 (21:39 +0900)]
Update cld3 to 3.1.1 (#2958)

According to the release message:
> Fix for macOS and minor improvements

8 years agoHandle hashtags in spoiler_texts (partial fix for #699) (#2683)
R Tucker [Wed, 10 May 2017 02:47:25 +0000 (22:47 -0400)]
Handle hashtags in spoiler_texts (partial fix for #699) (#2683)

* services: scan spoiler_text for hashtags (#699)

* views: link hashtags from spoiler_texts

This covers linking hashtags from within the spoiler
text on the server-generated pages.

* services: fix string concat going into hashtag RE

Cleaner Ruby syntax, may handle immutable strings better

8 years agoAdd spec for Pubsubhubbub::DistributionWorker. PuSH-deliver public items (#2954)
Eugen Rochko [Wed, 10 May 2017 00:55:43 +0000 (02:55 +0200)]
Add spec for Pubsubhubbub::DistributionWorker. PuSH-deliver public items (#2954)

to all subscribers. IDN-normalize callback URLs for subscriptions on insert.

8 years agoDisabled auto focus on toot form when search results are shown. (#2942)
fusshi- [Wed, 10 May 2017 00:51:43 +0000 (09:51 +0900)]
Disabled auto focus on toot form when search results are shown. (#2942)

8 years agoSpecs for pubsub subscribe service (#2951)
Matt Jankowski [Tue, 9 May 2017 18:48:30 +0000 (14:48 -0400)]
Specs for pubsub subscribe service (#2951)

* Add spec for pubsubhubbub/subscribe

* Refactor pubsubhubbub/subscribe service

8 years agoSpec and refactor for pubsubhubbub/unsubscribe service (#2946)
Matt Jankowski [Tue, 9 May 2017 17:58:18 +0000 (13:58 -0400)]
Spec and refactor for pubsubhubbub/unsubscribe service (#2946)

* Add coverage for pubsub unsubscribe service

* Refactor pubsub unsubscribe service

8 years agoUse CLD3 (#2949)
Akihiko Odaki [Tue, 9 May 2017 17:58:03 +0000 (02:58 +0900)]
Use CLD3 (#2949)

Compact Language Detector v3 (CLD3) is the successor of CLD2, which was
used in the previous implementation. CLD3 includes improvements since CLD2,
and supports newer compilers. On the other hand, it has additional
requirements and cld3-ruby, the FFI of CLD3 for Ruby, is still new and may
be still inmature.

Though CLD3 is named after CLD2, it is implemented with a neural network
model, different from the old implementation, which is based on a Naïve
Bayesian classifier.

CLD3 supports newer compilers, such as GCC 6. CLD2 is not compatible with
GCC 6 because it assigns negative values to varibales typed unsigned.
(see internal/cld_generated_cjk_uni_prop_80.cc) The support for GCC 6 and
newer compilers are essential today, when some server operating system
such as Ubuntu Server 16.10 has GCC 6 by default.

On the one hand, CLD3 requires C++11 support. Environments with old
compilers such as Ubuntu Server 14.04 needs to update the system or install
a newer compiler.

CLD3 needs protocol buffers as a new dependency. However,it is not
considered problematic because major server operating systems, CentOS and
Ubuntu Server provide them.

The FFI cld3-ruby was written by me (Akihiko Odaki) for use in Mastodon.
It is still new and may be inmature, but confirmed to pass existing tests.

8 years agoUse RegExp for require.context to filter custom stylesheets (#2950)
Akihiko Odaki [Tue, 9 May 2017 17:51:45 +0000 (02:51 +0900)]
Use RegExp for require.context to filter custom stylesheets (#2950)

ExtractTextWebpackPlugin extracts the content of loaded files, which means
it loads files loaded by require.context but not required after that.
However the former implementation is not aware of that.

require.context can have a RegExp to filter files to load. This change
gives a RegExp which matches with SCSSes with 'custom' prefix to
require.context to take advantage of the feature.

8 years agoFixed bug that timeline can not be displayed by InvalidURIError (#2947)
abcang [Tue, 9 May 2017 16:17:41 +0000 (01:17 +0900)]
Fixed bug that timeline can not be displayed by InvalidURIError (#2947)

8 years agoadd content-type in pubsubhubhub request header (#2943)
haoyayoi [Tue, 9 May 2017 14:34:47 +0000 (23:34 +0900)]
add content-type in pubsubhubhub request header (#2943)

* add content-type in pubsubhubhub request header

* fix type

8 years agoFix missing or not gender neutral strings. (#2944)
Alda Marteau-Hardi [Tue, 9 May 2017 14:14:44 +0000 (16:14 +0200)]
Fix missing or not gender neutral strings. (#2944)

8 years agoRemove jquery-ujs (#2939)
Yamagishi Kazutoshi [Tue, 9 May 2017 12:50:43 +0000 (21:50 +0900)]
Remove jquery-ujs (#2939)

* Remove jquery-ujs

* fix for eslint

8 years agoFix duplicated values in nl.json (#2931)
Yamagishi Kazutoshi [Tue, 9 May 2017 12:12:35 +0000 (21:12 +0900)]
Fix duplicated values in nl.json (#2931)

8 years agoUpdate Norwegian translations (#2937)
Koala Yeung [Tue, 9 May 2017 12:01:45 +0000 (20:01 +0800)]
Update Norwegian translations (#2937)

* Update Norwegian translations

* Updated no.json
* Updated activerecord.no.yml
* Updated no.yml
* Updated simple_form.no.yml

* i18n: fix Unicode character error in no.yml

* Javascript escaping code "\uD83D\uDC18" should be "\U0001f418" in
Ruby / yml

* i18n: remove unused keys in Norwegian translation

* Remove unused keys in no.yml and activerecord.no.yml
  by running: `bundle exec i18n-tasks remove-unused no`

* Add missing keys in activerecord.no.yml and no.yml by
  running: `bundle exec i18n-tasks add-missing no`

* i18n: escape the key 'no' in activerecord.no.yml

8 years agoFix snackbar notification stacking order (#2935)
Soshi Kato [Tue, 9 May 2017 12:01:29 +0000 (21:01 +0900)]
Fix snackbar notification stacking order (#2935)

8 years agoRemove rails_12factor (#2901)
alpaca-tc [Tue, 9 May 2017 03:15:54 +0000 (12:15 +0900)]
Remove rails_12factor (#2901)

8 years agoAdd cursor property to toot user avatar. (#2933)
HANATANI Takuma [Tue, 9 May 2017 01:48:15 +0000 (10:48 +0900)]
Add cursor property to toot user avatar. (#2933)

8 years agoServices specs for subscribe and unsubscribe (#2928)
Matt Jankowski [Mon, 8 May 2017 22:45:02 +0000 (18:45 -0400)]
Services specs for subscribe and unsubscribe (#2928)

* Add specs for unsubscribe service

* Fix non existent methods in unsubscribe service

* Clean up status handling in subscribe service

8 years agoSpecs for API push controller, with refactor (#2926)
Matt Jankowski [Mon, 8 May 2017 22:44:30 +0000 (18:44 -0400)]
Specs for API push controller, with refactor (#2926)

* Coverage for api push controller

* Refactor the api/push controller

8 years agoi18n mailer files for Occitan language (#2924)
Quent-in [Mon, 8 May 2017 21:15:03 +0000 (23:15 +0200)]
i18n mailer files for Occitan language (#2924)

* Create reset_password_instructions.oc.html.erb

* Create reset_password_instructions.oc.text.erb

* Create password_change.oc.html.erb

* Create password_change.oc.text.erb

* Create confirmation_instructions.oc.html.erb

* Create confirmation_instructions.oc.text.erb

8 years agoUpdating and extending Dutch strings (#2930)
jeroenpraat [Mon, 8 May 2017 21:11:12 +0000 (23:11 +0200)]
Updating and extending Dutch strings (#2930)

* Update nl

* Update nl

* Update nl

* Create confirmation_instructions.nl.html.erb

* Create confirmation_instructions.nl.text.erb

* Create password_change.nl.html.erb

* Create password_change.nl.text.erb

* Create reset_password_instructions.nl.html.erb

* Create reset_password_instructions.nl.text.erb

8 years agoDelegate Account#user_locale method and allow nil (#2927)
Matt Jankowski [Mon, 8 May 2017 21:10:50 +0000 (17:10 -0400)]
Delegate Account#user_locale method and allow nil (#2927)

8 years agoImprove error message for non-existent user being made an admin (#2929)
Matt Jankowski [Mon, 8 May 2017 21:08:55 +0000 (17:08 -0400)]
Improve error message for non-existent user being made an admin (#2929)

8 years agoMisc gem bumps (#2919)
Matt Jankowski [Mon, 8 May 2017 16:55:42 +0000 (12:55 -0400)]
Misc gem bumps (#2919)

* Update bundler-audit to version 0.5.0

* Update oj to version 3.0.6

* Update http-form_data to version 1.0.2

* Update parallel to version 1.11.2

* Update rails-i18n to version 5.0.4

* Update rack-protection to version 2.0.0

* Update haml to version 5.0.1

* Update scss_lint to version 0.53.0

* Relax requirement on i18n-tasks

* Remove haml and haml_lint gem requirement

8 years agoUpdate fr.json (#2915)
ButterflyOfFire [Mon, 8 May 2017 16:24:55 +0000 (17:24 +0100)]
Update fr.json (#2915)

* Update fr.json

Updating some missing french translations.

* Update fr.json

Fix repetition in line 41.

* Update fr.json

Fix : adding space between {name} and ? question mark.

8 years agoPrevent selection of unacceptable Content-Type files (#2910)
Yamagishi Kazutoshi [Mon, 8 May 2017 14:49:53 +0000 (23:49 +0900)]
Prevent selection of unacceptable Content-Type files (#2910)

* Prevent selection of unacceptable Content-Type files

* replace hard code

* media_attachments accept content-types in initial state

8 years agoUpdate simple_form.ar.yml (#2908)
ButterflyOfFire [Mon, 8 May 2017 13:58:38 +0000 (14:58 +0100)]
Update simple_form.ar.yml (#2908)

* Update simple_form.ar.yml

Added missing strings that were introduced to simple_form.ar.yml and completing translation.

* Create confirmation_instructions.ar.html.erb

* Create confirmation_instructions.ar.text.erb

* Create password_change.ar.html.erb

* Create password_change.ar.text.erb

* Create reset_password_instructions.ar.text.erb

* Create reset_password_instructions.ar.html.erb

8 years agoImprove scss color variables (#2912)
Matt Jankowski [Mon, 8 May 2017 13:57:49 +0000 (09:57 -0400)]
Improve scss color variables (#2912)

- Updates scss variables file to use better-named variables for black/white/etc
- Arranges the "mastodon classic" colors into variables
- Remove all references to `$color-*` naming, replacing with new

This does not in itself introduce "theme" support, but:

- It would probably be easier to start working on theme support after this
  change and others
- Even without the goal of themes, these changes make it more clear how the
  colors are being used.

There is almost definitely some edge case in here where I've guessed the
intent/context of some color usage incorrectly, but it still seems like a net
improvement.

8 years agoAdd Thai langauge (#2903)
Koala Yeung [Mon, 8 May 2017 13:56:00 +0000 (21:56 +0800)]
Add Thai langauge (#2903)

* Updated Thai language

* locale: remove unused translation in Thai

* locale: add Thai to settings menu and application

* locale: fix activerecord.th.yml format

8 years agoFix broken features list in RTL languages (#2909)
Yamagishi Kazutoshi [Mon, 8 May 2017 13:52:51 +0000 (22:52 +0900)]
Fix broken features list in RTL languages (#2909)

Fixes #2905

8 years agoFix small typo in ru.json (#2906)
ster [Mon, 8 May 2017 13:03:17 +0000 (17:03 +0400)]
Fix small typo in ru.json (#2906)

8 years agoRemove unnecessary keep file. (#2902)
HANATANI Takuma [Mon, 8 May 2017 13:01:19 +0000 (22:01 +0900)]
Remove unnecessary keep file. (#2902)

8 years agoRender sidekiq scheduler (#2898)
alpaca-tc [Mon, 8 May 2017 01:52:57 +0000 (10:52 +0900)]
Render sidekiq scheduler (#2898)

8 years agoAdded haml-lint and fix warnings (#2773)
yhirano [Mon, 8 May 2017 01:35:25 +0000 (10:35 +0900)]
Added haml-lint and fix warnings (#2773)

* add haml_lint to Gemfile

* add .haml-lint.yml

* fix warnings of haml_lint

8 years agoImprove example env file for local Postfix relay (#2892)
Jarek Lipski [Mon, 8 May 2017 01:34:11 +0000 (03:34 +0200)]
Improve example env file for local Postfix relay (#2892)

8 years agoImprove allowed language handling (#2897)
Matt Jankowski [Mon, 8 May 2017 01:32:52 +0000 (21:32 -0400)]
Improve allowed language handling (#2897)

* Dont allow empty value in user allowed languages

* Sanitize language input to reject blank values in array

8 years agoFix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)
Eugen Rochko [Sun, 7 May 2017 23:46:36 +0000 (01:46 +0200)]
Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896)

8 years agosmall ui change so that the settings buttons at the top of each column are actually...
Jessica K. Litwin [Sun, 7 May 2017 21:47:55 +0000 (17:47 -0400)]
small ui change so that the settings buttons at the top of each column are actually aligned properly (#2894)

8 years agoUpdate Ukrainian, Russian translations (#2893)
ster [Sun, 7 May 2017 21:47:19 +0000 (01:47 +0400)]
Update Ukrainian, Russian translations (#2893)

* Update Ukrainian translation (rebased off Russian translation)

* Update Ukrainian, Russian translations

8 years agoEnable CodeClimate SCSS Lint checks (#2886)
yhirano [Sun, 7 May 2017 18:47:31 +0000 (03:47 +0900)]
Enable CodeClimate SCSS Lint checks (#2886)

* add scss_lint to Gemfile

* add .scss-lint.yml

* fix warnings of scss-lint

* chmod -x styles/variables.scss

* Enable CodeClimate SCSS Lint checks

8 years agoUpdate Russian translation (#2891)
Ratmir Karabut [Sun, 7 May 2017 18:47:19 +0000 (21:47 +0300)]
Update Russian translation (#2891)

* 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

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

8 years agoAdd final newline to locale files (#2890)
Yamagishi Kazutoshi [Sun, 7 May 2017 17:55:47 +0000 (02:55 +0900)]
Add final newline to locale files (#2890)

8 years agonamespace redis usage (#2869)
beatrix [Sun, 7 May 2017 17:42:32 +0000 (13:42 -0400)]
namespace redis usage (#2869)

* add redis-namespace gem

* namespace redis usage

* refactor redis namespace code to be less intrusive

previously : would be prepended to keys when the
REDIS_NAMESPACE env var was not set

now if it is not set the namespacing functions are
not used at all, which should prevent disruptions
when instances update.

* fix redis namespace variable style in streaming js

* remove trailing space

* final redis namespace style fix

8 years agoUpdate ar.json (#2888)
ButterflyOfFire [Sun, 7 May 2017 17:37:32 +0000 (19:37 +0200)]
Update ar.json (#2888)

* Update ar.json

Adding more translations (updating the missing non translated strings) and some little minimal corrections.

* Update ar.json

Deleting final new line as suggested in the review.

* Update ar.json

* Update ar.json

8 years agoraise-when-oembed-not-found (#2882)
masarakki [Sun, 7 May 2017 17:00:40 +0000 (02:00 +0900)]
raise-when-oembed-not-found (#2882)

8 years agoAdd effective index to subscriptions (#2885)
alpaca-tc [Sun, 7 May 2017 17:00:20 +0000 (02:00 +0900)]
Add effective index to subscriptions (#2885)