]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoAdds better documentation to LOCAL_DOMAIN and LOCAL_HTTPS (#3149)
Audun Larsen [Fri, 19 May 2017 18:55:15 +0000 (20:55 +0200)]
Adds better documentation to LOCAL_DOMAIN and LOCAL_HTTPS (#3149)

Fixes #2254

8 years agoUnify the method of extracting tags (#3138)
abcang [Fri, 19 May 2017 18:19:14 +0000 (03:19 +0900)]
Unify the method of extracting tags (#3138)

8 years agoAdd spec coverage for regeneration worker (#3143)
Matt Jankowski [Fri, 19 May 2017 14:55:09 +0000 (10:55 -0400)]
Add spec coverage for regeneration worker (#3143)

8 years agoRemove unused style helper (#3145)
Matt Jankowski [Fri, 19 May 2017 14:54:47 +0000 (10:54 -0400)]
Remove unused style helper (#3145)

8 years agoGem updates without rails five one (#3137)
Matt Jankowski [Fri, 19 May 2017 14:22:10 +0000 (10:22 -0400)]
Gem updates without rails five one (#3137)

* Update terminal-table to version 1.8.0

* Update aws-sdk to version 2.9.20

* Update cld3 to version 3.1.2

* Update microformats2 to version 3.1.0

* Update rails-controller-testing to version 1.0.2

* Update oj to version 3.0.8

* Update http-form_data to version 1.0.3

* Update nokogumbo to version 1.4.11

* Update simplecov-html to version 0.10.1

* Update aws-sdk to version 2.9.21

* Update oj to version 3.0.9

* Update sass to version 3.4.24

* Update simple_form to version 3.5.0

8 years agoSpecs for precompute feed service (#3142)
Matt Jankowski [Fri, 19 May 2017 14:21:52 +0000 (10:21 -0400)]
Specs for precompute feed service (#3142)

* Add spec for precompute feed service

* Refactor PrecomputeFeedService

* spec wip

8 years agoRemove react-autosuggest (#3140)
Yamagishi Kazutoshi [Fri, 19 May 2017 13:21:34 +0000 (22:21 +0900)]
Remove react-autosuggest (#3140)

react-autosuggest is added from c49f6290eb9c93720bd5407f4320bb0fd6c96ed9

Dependence removed from b27066e154c8c2da57f23bf659907bacd37ce4da

8 years agoDowngrade eslint-plugin-jsx-a11y to v4.0.0 (#3131)
Yamagishi Kazutoshi [Fri, 19 May 2017 09:44:28 +0000 (18:44 +0900)]
Downgrade eslint-plugin-jsx-a11y to v4.0.0 (#3131)

In Code Climate, eslint-plugin-jsx-a11y v4.0.0 is used.
Therefore, it seems that a warning is displayed.

ref https://github.com/codeclimate/codeclimate-eslint/pull/273

8 years agoEnable caching dependencies in Travis CI (#3132)
Yamagishi Kazutoshi [Fri, 19 May 2017 09:44:00 +0000 (18:44 +0900)]
Enable caching dependencies in Travis CI (#3132)

8 years agoImprove how params from controller are permitted in filter helper (#3129)
Matt Jankowski [Fri, 19 May 2017 09:43:20 +0000 (05:43 -0400)]
Improve how params from controller are permitted in filter helper (#3129)

The `params` variable here was quite overloaded.

It exists via the controller to hold the request params, and was sometimes being
used in this helper as that object, but other times was being used as a local
variable, or to pass to another method, and this was confusing.

This change renames the args for a method away from `params` for more clarity,
and extracts the actual usage of the controller-provided `params` to a
better-named method for clarity.

8 years agoReplace inline styles with stylesheet (#3115)
Yamagishi Kazutoshi [Fri, 19 May 2017 09:42:54 +0000 (18:42 +0900)]
Replace inline styles with stylesheet (#3115)

8 years agoi18n: Hebrew Spam folder check warning added (#3134)
Ira [Fri, 19 May 2017 09:42:02 +0000 (12:42 +0300)]
i18n: Hebrew Spam folder check warning added (#3134)

8 years agoDefine instance method outside #included (#3128)
alpaca-tc [Fri, 19 May 2017 09:41:45 +0000 (18:41 +0900)]
Define instance method outside #included (#3128)

8 years agoConditional validations no longer accept strings for if/unless (#3124)
Matt Jankowski [Fri, 19 May 2017 01:11:23 +0000 (21:11 -0400)]
Conditional validations no longer accept strings for if/unless (#3124)

8 years agoUse stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning ...
Matt Jankowski [Fri, 19 May 2017 01:11:17 +0000 (21:11 -0400)]
Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning (#3123)

8 years agofeat(babel): Strip prop types (#3122)
Sorin Davidoi [Fri, 19 May 2017 00:42:21 +0000 (02:42 +0200)]
feat(babel): Strip prop types (#3122)

* feat(babel): Strip prop types

* chore(babel): Indent

* fix(babel): Move babel-plugin-transform-react-remove-prop-types to dependencies

8 years agoSkip asset pipeline for static file in public/ (#3125)
Matt Jankowski [Fri, 19 May 2017 00:41:56 +0000 (20:41 -0400)]
Skip asset pipeline for static file in public/ (#3125)

8 years agoAccount domain blocks (#2381)
Eugen Rochko [Thu, 18 May 2017 23:14:30 +0000 (01:14 +0200)]
Account domain blocks (#2381)

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

* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute

Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle

* Display "Dismiss notifications" on all statuses in notifications column, not just own

* Add "muted" as a boolean attribute on statuses JSON

For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested

Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column

* Up max class length

* Remove pending test for conversation mute

* Add tests, clean up

* Rename to "mute conversation" and "unmute conversation"

* Raise validation error when trying to mute/unmute status without conversation

* Adding account domain blocks that filter notifications and public timelines

* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home

* Add API for listing and creating account domain blocks

* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them

* Filter domains in streaming API

* Update account_domain_block_spec.rb

8 years agoAfter remote follow worker specs (#3098)
Matt Jankowski [Thu, 18 May 2017 19:10:41 +0000 (15:10 -0400)]
After remote follow worker specs (#3098)

* Add specs for the after remote follow workers

* Refactor the after remote follow workers

8 years agoAdd transform-runtime for smaller Babel helpers (#3116)
Nolan Lawson [Thu, 18 May 2017 17:14:58 +0000 (10:14 -0700)]
Add transform-runtime for smaller Babel helpers (#3116)

8 years agorefactor: Import from react-router/lib (#3117)
Sorin Davidoi [Thu, 18 May 2017 17:14:03 +0000 (19:14 +0200)]
refactor: Import from react-router/lib (#3117)

8 years agoFetch remote image using http.rb (#3114)
Yamagishi Kazutoshi [Thu, 18 May 2017 13:43:10 +0000 (22:43 +0900)]
Fetch remote image using http.rb (#3114)

8 years agoi18l: Hebrew translation updates (#3109)
Ira [Thu, 18 May 2017 11:57:58 +0000 (14:57 +0300)]
i18l: Hebrew translation updates (#3109)

8 years agoupdate (#3113)
Quent-in [Thu, 18 May 2017 10:48:41 +0000 (12:48 +0200)]
update (#3113)

8 years agoUpdate oc.yml (#3112)
Quent-in [Thu, 18 May 2017 10:48:35 +0000 (12:48 +0200)]
Update oc.yml (#3112)

Normally fully complete

8 years agoAdd rel="noopener" to getting started (#3104)
Yamagishi Kazutoshi [Thu, 18 May 2017 01:05:30 +0000 (10:05 +0900)]
Add rel="noopener" to getting started (#3104)

8 years agoFix character counter not updating for bio (#3101)
Eugen Rochko [Wed, 17 May 2017 22:38:18 +0000 (00:38 +0200)]
Fix character counter not updating for bio (#3101)

8 years agoAdd reset button to admin accounts search, improve looks a little (#3100)
Eugen Rochko [Wed, 17 May 2017 22:38:01 +0000 (00:38 +0200)]
Add reset button to admin accounts search, improve looks a little (#3100)

8 years agoFix minor Japanese translations (#3099)
Yamagishi Kazutoshi [Wed, 17 May 2017 15:50:39 +0000 (00:50 +0900)]
Fix minor Japanese translations (#3099)

- add translation "Bon Appetoot!"
- add whitelist what doesn't require translation
- replace exclamation mark full width
- add space after question mark
- remove blank between words
- run yarn manage:translations

8 years agoRefactor Status#ancestors/descendants (#3092)
alpaca-tc [Wed, 17 May 2017 13:38:16 +0000 (22:38 +0900)]
Refactor Status#ancestors/descendants (#3092)

8 years agoRender translated view (#3093)
alpaca-tc [Wed, 17 May 2017 13:36:56 +0000 (22:36 +0900)]
Render translated view (#3093)

8 years agoUse REDIS_DB in streaming (#3094)
Hayato IZUMI [Wed, 17 May 2017 13:36:34 +0000 (22:36 +0900)]
Use REDIS_DB in streaming (#3094)

8 years agoAdd filter to AccountFilter (#2968)
alpaca-tc [Wed, 17 May 2017 01:00:34 +0000 (10:00 +0900)]
Add filter to AccountFilter (#2968)

8 years agoCatch import promise in application.js (#3041)
Stephen Burgess [Wed, 17 May 2017 00:59:43 +0000 (19:59 -0500)]
Catch import promise in application.js (#3041)

* fix(polyfil): Catch error from promise

https://pouchdb.com/2015/05/18/we-have-a-problem-with-promises.html

* fix(catch): Error

Make import promise catch a noop with commented out console.log for a debugging hint.

* fix(eslint): Disable eslint console rule

* fix(application): Use console error

8 years agoAdded a warning to look into the spam folder (#2921)
jeroenpraat [Wed, 17 May 2017 00:55:37 +0000 (02:55 +0200)]
Added a warning to look into the spam folder (#2921)

Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.

8 years agoOne string NL update (#3090)
jeroenpraat [Wed, 17 May 2017 00:54:41 +0000 (02:54 +0200)]
One string NL update (#3090)

8 years agoFix #2549 - Do not hardcode the exclamation in "toot!", wrap it in an extra locale...
Eugen Rochko [Tue, 16 May 2017 22:54:24 +0000 (00:54 +0200)]
Fix #2549 - Do not hardcode the exclamation in "toot!", wrap it in an extra locale key (#3089)

8 years agoFix #2572 - Resolve preview cards for remote statuses as well as local ones (#3088)
Eugen Rochko [Tue, 16 May 2017 22:41:15 +0000 (00:41 +0200)]
Fix #2572 - Resolve preview cards for remote statuses as well as local ones (#3088)

8 years agoAdd catalan language (#3084)
spla [Tue, 16 May 2017 22:25:10 +0000 (00:25 +0200)]
Add catalan language (#3084)

* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

8 years agoMake .column-collapse animation simple (#3086)
unarist [Tue, 16 May 2017 22:24:46 +0000 (07:24 +0900)]
Make .column-collapse animation simple (#3086)

* Always set `overflow: auto` to allow scroll just after opening
* Remove bounce animation which may cause unintended behavior due to max-height
* Use CSS transition instead of react-motion
* Some CSS refactoring including className changing

8 years agofeat(ja): add missing ja translation. (#3083)
Hiroaki Ninomiya [Tue, 16 May 2017 16:14:22 +0000 (01:14 +0900)]
feat(ja): add missing ja translation. (#3083)

ref: https://github.com/tootsuite/mastodon/pull/2584

8 years agoEnable to handle app immediately after closing modal (#3082)
geta6 [Tue, 16 May 2017 10:12:38 +0000 (19:12 +0900)]
Enable to handle app immediately after closing modal (#3082)

8 years agoMake faster ProcessFeedService (#3080)
Shunsuke Michii [Tue, 16 May 2017 10:12:29 +0000 (19:12 +0900)]
Make faster ProcessFeedService (#3080)

* Add index accounts on uri.

* Remove a blank line.

8 years agouse-symbol-in-order (#3081)
masarakki [Tue, 16 May 2017 10:10:09 +0000 (19:10 +0900)]
use-symbol-in-order (#3081)

8 years agoImprove Account#triadic_closures (#3079)
alpaca-tc [Tue, 16 May 2017 10:06:38 +0000 (19:06 +0900)]
Improve Account#triadic_closures (#3079)

8 years agoOrder by symbol value (#3077)
alpaca-tc [Tue, 16 May 2017 01:35:17 +0000 (10:35 +0900)]
Order by symbol value (#3077)

8 years agoOptimize Status#permitted_for 24x (#3069)
alpaca-tc [Tue, 16 May 2017 00:54:17 +0000 (09:54 +0900)]
Optimize Status#permitted_for 24x (#3069)

* Build query with arel node

* Add spec for current Status#permitted_for implementation

* Refactor status.rb

* Order by visibility to optimize query

8 years agochore(landing_strip): hide signup path unless the instance allows registration. ...
Hiroaki Ninomiya [Mon, 15 May 2017 22:41:09 +0000 (07:41 +0900)]
chore(landing_strip): hide signup path unless the instance allows registration. (#3055)

8 years agoImprove ja translation (#3071)
Hiroaki Ninomiya [Mon, 15 May 2017 22:12:07 +0000 (07:12 +0900)]
Improve ja translation (#3071)

* chore(ja): replace with reasonable word.

* chore(ja): add periods.

8 years agoUpdate devise to version 4.3.0 (#3074)
Matt Jankowski [Mon, 15 May 2017 20:36:45 +0000 (16:36 -0400)]
Update devise to version 4.3.0 (#3074)

Supports rails 5.1

8 years agoFix #2646 - Do not override ctrl/cmd+click on Permalinks (#3073)
Eugen Rochko [Mon, 15 May 2017 20:36:38 +0000 (22:36 +0200)]
Fix #2646 - Do not override ctrl/cmd+click on Permalinks (#3073)

8 years agoFix change of status callbacks not setting in_reply_to_account_id and (#3072)
Eugen Rochko [Mon, 15 May 2017 19:20:55 +0000 (21:20 +0200)]
Fix change of status callbacks not setting in_reply_to_account_id and (#3072)

possibly others when expected. Add some tests for it

8 years agoIntroduce common JavaScript file (#2981)
Akihiko Odaki [Mon, 15 May 2017 18:20:10 +0000 (03:20 +0900)]
Introduce common JavaScript file (#2981)

* Create common chunk rather than vendor chunk

vendor chunk is a set of modules provided by external vendors, but now we
can have a chunk as a set of modules shared by multiple entry points,
which could be more efficent than having vendor chunk.

* Start rails-ujs in common.js

This is used by /settings/two_factor_authentication.

8 years agoUpdate Japanese tranlsation of conversations muting (#3070)
Kazuhiro NISHIYAMA [Mon, 15 May 2017 16:05:28 +0000 (01:05 +0900)]
Update Japanese tranlsation of conversations muting (#3070)

8 years agoFeature conversations muting (#3017)
Eugen Rochko [Mon, 15 May 2017 01:04:13 +0000 (03:04 +0200)]
Feature conversations muting (#3017)

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

* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute

Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle

* Display "Dismiss notifications" on all statuses in notifications column, not just own

* Add "muted" as a boolean attribute on statuses JSON

For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested

Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column

* Up max class length

* Remove pending test for conversation mute

* Add tests, clean up

* Rename to "mute conversation" and "unmute conversation"

* Raise validation error when trying to mute/unmute status without conversation

8 years agoFix style regressions (#3062)
Eugen Rochko [Sun, 14 May 2017 23:23:58 +0000 (01:23 +0200)]
Fix style regressions (#3062)

From #2327 - Elephant friend was overlapping with text, oversized in
single column layout

From #2021 - Centered layout goes against design principles, changes
UX for everybody who's already used to the current one

From #2271 - CPU/RAM overusage from keeping columns in DOM (fix #2648,
possibly also #2101)

8 years agoUpdate capistrano lock version to 3.8.1 (#3056)
esetomo [Sun, 14 May 2017 15:38:29 +0000 (00:38 +0900)]
Update capistrano lock version to 3.8.1 (#3056)

8 years agoUpdate rails to version 5.0.3 (#3054)
Matt Jankowski [Sun, 14 May 2017 14:30:14 +0000 (10:30 -0400)]
Update rails to version 5.0.3 (#3054)

* Update rails to version 5.0.3

* Update aws-sdk to version 2.9.17

* Update capistrano to version 3.8.1

* Update climate_control to version 0.2.0

* Update debug_inspector to version 0.0.3

* Update et-orbi to version 1.0.4

* Update oj to version 3.0.7

* Update microformats2 to version 2.9.0

* Update lograge to version 0.5.1

* Clean up usage of Microformats2 object to remove deprecation warnings

* Update microformats2 to version 3.0.1

8 years agoUse babel-preset-env on Streaming Server (#2998)
Yamagishi Kazutoshi [Sun, 14 May 2017 11:47:31 +0000 (20:47 +0900)]
Use babel-preset-env on Streaming Server (#2998)

* Use babel-preset-env on Streaming Server

Change the streaming server to use babel-preset-env as well as asset compilation.
This shortens the load time at first boot.

* remove babel-plugin-lodash

8 years agoRemove Babel plugin for ES Modules (#2975)
Yamagishi Kazutoshi [Sun, 14 May 2017 10:59:40 +0000 (19:59 +0900)]
Remove Babel plugin for ES Modules (#2975)

* Remove Babel plugin for ES Modules

Processing of ES Modules is executed by Webpack.
Don't have to do it on Babel side.

* Add plugin for test

8 years agoFix only typo (#3035)
Paul [Sun, 14 May 2017 10:58:50 +0000 (10:58 +0000)]
Fix only typo (#3035)

8 years agoAdd browserslist config for autoprefixer (#3053)
Yamagishi Kazutoshi [Sun, 14 May 2017 10:57:54 +0000 (19:57 +0900)]
Add browserslist config for autoprefixer (#3053)

We will reduce the weight of the style sheet by specifying the target web browser of autoprefixer.

8 years agoAdd heroku APT buildpack for scalingo. (#3051)
William Pitcock [Sun, 14 May 2017 10:57:13 +0000 (05:57 -0500)]
Add heroku APT buildpack for scalingo. (#3051)

8 years agoDo not cancel PuSH subscriptions after encountering "permanent" error… (#3046)
Eugen Rochko [Sun, 14 May 2017 01:22:48 +0000 (03:22 +0200)]
Do not cancel PuSH subscriptions after encountering "permanent" error… (#3046)

* Do not cancel PuSH subscriptions after encountering "permanent" error response

After talking with MMN about it, turns out some servers/php setups do
return 4xx errors while rebooting, so this anti-feature that was meant
to take load off of the hub is doing more harm than good in terms of
breaking subscriptions

* Update delivery_worker.rb

8 years agotiny js fix for 'show more' button in chrome (#3045)
beatrix [Sat, 13 May 2017 20:07:58 +0000 (16:07 -0400)]
tiny js fix for 'show more' button in chrome (#3045)

8 years agofeat(count): Just yml count syntax to provide different rule for 1 (#2685)
Stephen Burgess [Sat, 13 May 2017 15:13:17 +0000 (10:13 -0500)]
feat(count): Just yml count syntax to provide different rule for 1 (#2685)

Update all translation forms that use this "counter" element.

8 years agoi18n: Hebrew string updates (#3037)
Ira [Sat, 13 May 2017 15:05:02 +0000 (18:05 +0300)]
i18n: Hebrew string updates (#3037)

8 years agoSmall FR localisation enhancements (#3033)
Bastien [Sat, 13 May 2017 13:56:49 +0000 (15:56 +0200)]
Small FR localisation enhancements (#3033)

* Small localisation enhancement.

Be consistent regarding "e-mail" vs "courriel": I suggest
using "courriel" to refer to the electronic message and
"e-mail" when used in "adresse e-mail".  This reflects
the usage I generally observe, but I may be wrong.

* Localisation enhancements.

Omit some commas: "..., ..., ou ..." should be "..., ... ou ..."
since "ou" already articulates the sentence.

Also replace "demande" by "requête" when it makes sense.

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