]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoOnly load Intl data for current language (#3130)
Nolan Lawson [Mon, 22 May 2017 13:06:06 +0000 (06:06 -0700)]
Only load Intl data for current language (#3130)

* Only load Intl data for current language

* Extract common chunk only from application.js and public.js

* Generate locale packs, avoid caching on window object

8 years agoChange "Account.any?" to "Account.exists?" (#3217)
Yamagishi Kazutoshi [Mon, 22 May 2017 13:02:30 +0000 (22:02 +0900)]
Change "Account.any?" to "Account.exists?" (#3217)

8 years agoUpdated Polish translation (#3204)
m4sk1n [Mon, 22 May 2017 13:01:53 +0000 (15:01 +0200)]
Updated Polish translation (#3204)

* i18n: updated Polish translation

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

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

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

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Update simple_form.pl.yml

* Update simple_form.pl.yml

8 years agoKeep children of the column-collapsable until the transition is completed (#3218)
unarist [Mon, 22 May 2017 13:01:27 +0000 (22:01 +0900)]
Keep children of the column-collapsable until the transition is completed (#3218)

8 years agoSet config.cache_store in environments file. (#3219)
Clworld [Mon, 22 May 2017 13:01:02 +0000 (22:01 +0900)]
Set config.cache_store in environments file. (#3219)

* Set config.cache_store in application.rb

* Set config.cache_store in environments.

* fix code format.

8 years agoFix "Edit profile" on the account action bar (#3222)
unarist [Mon, 22 May 2017 12:57:50 +0000 (21:57 +0900)]
Fix "Edit profile" on the account action bar (#3222)

8 years agosingle_user_mode? always returns boolean (#3215)
Akihiko Odaki [Mon, 22 May 2017 04:00:07 +0000 (13:00 +0900)]
single_user_mode? always returns boolean (#3215)

This change also adds a specification for the method.

8 years agoAdd translations for counter of profile (#3214)
Yamagishi Kazutoshi [Mon, 22 May 2017 02:45:55 +0000 (11:45 +0900)]
Add translations for counter of profile (#3214)

ref #3101

8 years agoPersian translation update (#3206)
Masoud Abkenar [Sun, 21 May 2017 22:20:13 +0000 (00:20 +0200)]
Persian translation update (#3206)

* Persian translation update

* Persian translation update: new files

* Persian translation update

* activerecord.fa.yml language code

* Persian translation update

* fix indent

8 years agoFix forgotten to include language attribute in statuses JSON (#3209)
Eugen Rochko [Sun, 21 May 2017 19:38:09 +0000 (21:38 +0200)]
Fix forgotten to include language attribute in statuses JSON (#3209)

8 years agoAllow access token in URI (#3208)
happycoloredbanana [Sun, 21 May 2017 19:13:11 +0000 (22:13 +0300)]
Allow access token in URI (#3208)

8 years agoUpdate Ukrainian translation (#3203)
ster [Sun, 21 May 2017 16:52:50 +0000 (20:52 +0400)]
Update Ukrainian translation (#3203)

8 years agoFix mutes_controller error and incorrect statuses_controller report (#3202)
Akihiko Odaki [Sun, 21 May 2017 11:32:13 +0000 (20:32 +0900)]
Fix mutes_controller error and incorrect statuses_controller report (#3202)

This commit fixes a regression in commit
f55480756337dd4df7513e89673e81e003f1201a.

8 years agoUpdate .gitignore (#3197)
Hayato IZUMI [Sun, 21 May 2017 09:24:59 +0000 (18:24 +0900)]
Update .gitignore (#3197)

* Remove duplicate 'node_modules'
* Replace 'public/packs'

8 years agoEnhance for the Chinese translation (#3198)
vidarlee [Sun, 21 May 2017 09:23:59 +0000 (18:23 +0900)]
Enhance for the Chinese translation (#3198)

* Enhance for the Chinese translation

* Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175

8 years agoAdd a Japanese translation for PR #3175 (#3192)
Daigo 3 Dango [Sat, 20 May 2017 23:16:54 +0000 (23:16 +0000)]
Add a Japanese translation for PR #3175 (#3192)

8 years agoBump version to 1.4.0.2 (#3190)
Eugen Rochko [Sat, 20 May 2017 21:30:20 +0000 (23:30 +0200)]
Bump version to 1.4.0.2 (#3190)

8 years agoAdjust REDIS_URL usage in node_redis (#3183)
Eugen Rochko [Sat, 20 May 2017 19:06:09 +0000 (21:06 +0200)]
Adjust REDIS_URL usage in node_redis (#3183)

Resolves #2780

8 years agoSome Dockerfile improvements (#3182)
Wonderfall [Sat, 20 May 2017 18:01:05 +0000 (20:01 +0200)]
Some Dockerfile improvements (#3182)

- improve docker_entrypoint.sh
- serve static files with puma by default
- sort packages list
- use virtual package for build deps
- show how to assign UID/GID

8 years agoReplace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180)
Eugen Rochko [Sat, 20 May 2017 17:42:58 +0000 (19:42 +0200)]
Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180)

sidekiq-scheduler jobs

Resolves #2495

8 years agoImprove language filter preferences look (#3184)
Eugen Rochko [Sat, 20 May 2017 17:42:44 +0000 (19:42 +0200)]
Improve language filter preferences look (#3184)

8 years agoAdds bootsnap. Faster boot time (#3176)
Eugen Rochko [Sat, 20 May 2017 17:42:27 +0000 (19:42 +0200)]
Adds bootsnap. Faster boot time (#3176)

8 years agoAdd MS Edge support to public.js (#3179)
Yamagishi Kazutoshi [Sat, 20 May 2017 16:15:43 +0000 (01:15 +0900)]
Add MS Edge support to public.js (#3179)

8 years agoCatalan translation update (#3177)
spla [Sat, 20 May 2017 15:50:11 +0000 (17:50 +0200)]
Catalan translation update (#3177)

* 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

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

8 years agoFix regressions in api/v1 (#3178)
Akihiko Odaki [Sat, 20 May 2017 15:48:34 +0000 (00:48 +0900)]
Fix regressions in api/v1 (#3178)

The regressions are introduced at commit
f55480756337dd4df7513e89673e81e003f1201a by me (Akihiko Odaki)

8 years agoFilter languages with opt out (#3175)
Matt Jankowski [Sat, 20 May 2017 15:32:44 +0000 (11:32 -0400)]
Filter languages with opt out (#3175)

* Remove allowed_languages and add filtered_languages

* Use filtered_languages instead of allowed_languages

8 years agoImprove eslint rules (#3147)
Yamagishi Kazutoshi [Sat, 20 May 2017 15:31:47 +0000 (00:31 +0900)]
Improve eslint rules (#3147)

* Add semi to ESLint rules

* Add padded-blocks to ESLint rules

* Add comma-dangle to ESLint rules

* add config/webpack and storyboard

* add streaming/

* yarn test:lint -- --fix

8 years agoEnsure unique identifiers in fabricated objects in tests (#3173)
Eugen Rochko [Sat, 20 May 2017 15:09:40 +0000 (17:09 +0200)]
Ensure unique identifiers in fabricated objects in tests (#3173)

8 years agoFix block list 500 (#3174)
Yamagishi Kazutoshi [Sat, 20 May 2017 15:01:14 +0000 (00:01 +0900)]
Fix block list 500 (#3174)

8 years agoMore tests for public timeline method (#3171)
Eugen Rochko [Sat, 20 May 2017 14:56:30 +0000 (16:56 +0200)]
More tests for public timeline method (#3171)

8 years agoRemove unnecessary status__info-time div (#3172)
Nolan Lawson [Sat, 20 May 2017 14:48:49 +0000 (07:48 -0700)]
Remove unnecessary status__info-time div (#3172)

8 years agoUse joins for account properties (#3167)
Akihiko Odaki [Sat, 20 May 2017 13:13:51 +0000 (22:13 +0900)]
Use joins for account properties (#3167)

8 years agoFix #2680 - Run processes in Docker as non-root user (#3159)
Wonderfall [Sat, 20 May 2017 13:12:29 +0000 (15:12 +0200)]
Fix #2680 - Run processes in Docker as non-root user (#3159)

8 years agoPerformance improvements (#3168)
Sorin Davidoi [Sat, 20 May 2017 12:58:13 +0000 (14:58 +0200)]
Performance improvements (#3168)

* refactor(components/status_list): Avoid quering scrollTop if not necessary

* refactor(components/dropdown_menu): Do not render items if not expanded

* refactor: Cherry-pick react-motion imports

* refactor(compose/privacy_dropdown): Do not render options if not open

* refactor(components/column_collapsable): Do not render children if collapsed

8 years agoAdd Japanese translations (domain block & admin page) (#3160)
Yamagishi Kazutoshi [Sat, 20 May 2017 11:39:03 +0000 (20:39 +0900)]
Add Japanese translations (domain block & admin page) (#3160)

https://github.com/tootsuite/mastodon/pull/3100
https://github.com/tootsuite/mastodon/pull/3127

8 years agoUpdate reset_password_instructions.ar.html.erb (#3163)
ButterflyOfFire [Sat, 20 May 2017 11:38:33 +0000 (12:38 +0100)]
Update reset_password_instructions.ar.html.erb (#3163)

Forgot to translate this string :p. Now Done !

8 years agoUpdating the French translations for the web client (#3164)
June Sallou [Sat, 20 May 2017 11:38:26 +0000 (13:38 +0200)]
Updating the French translations for the web client (#3164)

8 years agoguard against empty domain block list in status scope (#3161)
beatrix [Sat, 20 May 2017 11:38:13 +0000 (07:38 -0400)]
guard against empty domain block list in status scope (#3161)

8 years agoAdd account media gallery view to web UI (#3120)
Eugen Rochko [Fri, 19 May 2017 23:28:25 +0000 (01:28 +0200)]
Add account media gallery view to web UI (#3120)

* Add account media gallery view to web UI

* Link media view from account dropdown

* Adjust link

8 years agofeat: Use CSS contain to avoid computations (#3158)
Sorin Davidoi [Fri, 19 May 2017 23:26:46 +0000 (01:26 +0200)]
feat: Use CSS contain to avoid computations (#3158)

8 years agoEnable and fill in JSON response test in API::AccountsController (#3157)
Jack Jennings [Fri, 19 May 2017 22:27:13 +0000 (15:27 -0700)]
Enable and fill in JSON response test in API::AccountsController (#3157)

8 years agoFix JavaScript error (#3153)
PFM [Fri, 19 May 2017 21:33:42 +0000 (06:33 +0900)]
Fix JavaScript error (#3153)

JavaScript error at Safari 10.1(macOS 10.12.4) / iPhone Safari(iOS 10.3.2)

8 years agoAdd coverage for api/v1 controllers (#3155)
Matt Jankowski [Fri, 19 May 2017 21:32:37 +0000 (17:32 -0400)]
Add coverage for api/v1 controllers (#3155)

8 years agoFix federated timeline excluding local toots when any domain blocks are set (#3151)
Eugen Rochko [Fri, 19 May 2017 19:19:41 +0000 (21:19 +0200)]
Fix federated timeline excluding local toots when any domain blocks are set (#3151)

8 years agoAdd buttons to block and unblock domain (#3127)
Eugen Rochko [Fri, 19 May 2017 19:05:32 +0000 (21:05 +0200)]
Add buttons to block and unblock domain (#3127)

* Add buttons to block and unblock domain

* Relationship API now returns "domain_blocking" status for accounts,
rename "block entire domain" to "hide entire domain", fix unblocking domain,
do not block notifications from domain-blocked-but-followed people, do
not send Salmons to domain blocked users

* Add test

* Personal domain blocks shouldn't affect Salmon after all, since in this
direction of communication the control is very thin when it comes to
public stuff. Best stay consistent and not affect federation in this way

* Ignore followers and follow request from domain blocked folks,
ensure account domain blocks are not created for empty domain,
and avoid duplicates in validation

* Purge followers when blocking domain (without soft-blocks, since they
are useless here)

* Add tests, fix local timeline being empty when having any domain blocks

8 years agoAvoid useless renders (#3141)
Sorin Davidoi [Fri, 19 May 2017 18:58:12 +0000 (20:58 +0200)]
Avoid useless renders (#3141)

* feat(eslint): Set react/jsx-no-bind: error

* refactor(notifications/setting_toggle): Do not use bind

* refactor(components/dropdown_menu): Do not use bind

* refactor(components/autosuggest_textarea): Do not use bind

* refactor(compose/privacy_dropdown): Do not use bind

* refactor(compose/upload_form): Do not use bind

* refactor(components/status): Do not use bind

* refactor(components/onboarding_modal): Do not use bind

* refactor: PR feedback

* chore(notifications/setting_toggle): Lint

* refactor: PR feedback

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)