]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoRefactor initial state: "me" (#5563)
Nolan Lawson [Tue, 31 Oct 2017 02:27:48 +0000 (19:27 -0700)]
Refactor initial state: "me" (#5563)

* Refactor initial state: "me"

* remove "me" from reducers/meta.js

8 years agoUpdating Chinese (Simplified) translations (#5508)
SerCom_KC [Mon, 30 Oct 2017 03:34:58 +0000 (11:34 +0800)]
Updating Chinese (Simplified) translations (#5508)

* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines

* i18n: (zh-CN) fix punctuation

* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677

* i18n: (zh-CN) Update missing translations

* i18n: (zh-CN) Fixing errors

* i18n: (zh-CN) Fix indent error

* i18n: (zh-CN) Fix language tag

* i18n: (zh-CN) Remove quotes

* i18n: (zh-CN) Update translation (#5485)

* i18n: (zh-CN) Remove whitespaces, x -> ×

* i18n: (zh-CN) Rewording on time distance

* i18n: (zh-CN) Overall improvements

* i18n: (zh-CN) i18n-tasks normalization

* i18n: (zh-CN) Add missing translation

8 years agoUpdate remote ActivityPub users when fetching their toots (#5545)
ThibG [Sun, 29 Oct 2017 15:24:16 +0000 (16:24 +0100)]
Update remote ActivityPub users when fetching their toots (#5545)

8 years agoAvoid modifying emoji data inline (#5548)
Nolan Lawson [Sun, 29 Oct 2017 15:23:38 +0000 (08:23 -0700)]
Avoid modifying emoji data inline (#5548)

8 years agoAdd margin to account for Edge disappearing scrollbar (#5522)
Nolan Lawson [Sun, 29 Oct 2017 15:11:32 +0000 (08:11 -0700)]
Add margin to account for Edge disappearing scrollbar (#5522)

* Add margin to account for Edge disappearing scrollbar

* Fix 16px margin for DMs and horizontal line

8 years agoReactor unfollow_modal, boost_modal, delete_modal (#5505)
Nolan Lawson [Sun, 29 Oct 2017 15:10:15 +0000 (08:10 -0700)]
Reactor unfollow_modal, boost_modal, delete_modal (#5505)

8 years agoFix a grammatical error in the notifications. (#5555)
Alda Marteau-Hardi [Sat, 28 Oct 2017 17:08:37 +0000 (19:08 +0200)]
Fix a grammatical error in the notifications. (#5555)

8 years agoi18n: Update Polish translation (#5547)
Marcin Mikołajczak [Sat, 28 Oct 2017 03:43:20 +0000 (05:43 +0200)]
i18n: Update Polish translation (#5547)

8 years agoSeparate Follow/Unfollow and back buttons (#5496)
Herbert Kagumba [Fri, 27 Oct 2017 17:14:11 +0000 (20:14 +0300)]
Separate Follow/Unfollow and back buttons (#5496)

8 years agoInstantiate service classes for each call (fixes #5540) (#5543)
ThibG [Fri, 27 Oct 2017 17:08:30 +0000 (19:08 +0200)]
Instantiate service classes for each call (fixes #5540) (#5543)

8 years agoAvoid unnecessary Motion components in icon_button.js (#5544)
Nolan Lawson [Fri, 27 Oct 2017 17:08:07 +0000 (10:08 -0700)]
Avoid unnecessary Motion components in icon_button.js (#5544)

8 years agoDirectly use <Motion/> if not reducing motion (#5546)
Nolan Lawson [Fri, 27 Oct 2017 17:06:54 +0000 (10:06 -0700)]
Directly use <Motion/> if not reducing motion (#5546)

8 years agoAdd artist, title, and date metadata to boop.{mp3,ogg} (#5531)
David Yip [Fri, 27 Oct 2017 15:05:04 +0000 (10:05 -0500)]
Add artist, title, and date metadata to boop.{mp3,ogg} (#5531)

For boop.mp3, this commit adds both ID3v1 and ID3v2 tags.  For boop.ogg,
we use Vorbis metadata.

In the case of boop.mp3, this also adds a cover image. Interestingly, it
didn't seem to affect the size of boop.mp3 much, despite being ~8k.
boop.ogg seemed to be much more affected and so no cover image was added
to that version.

8 years agoRefactor initial state: reduce_motion and auto_play_gif (#5501)
Nolan Lawson [Fri, 27 Oct 2017 15:04:44 +0000 (08:04 -0700)]
Refactor initial state: reduce_motion and auto_play_gif (#5501)

8 years agoUse contenthash for ExtractTextWebpackPlugin (#5462)
Akihiko Odaki [Fri, 27 Oct 2017 14:54:20 +0000 (23:54 +0900)]
Use contenthash for ExtractTextWebpackPlugin (#5462)

[hash] is not documented.

8 years agoFeature: Unlisted custom emojis (#5485)
nullkal [Fri, 27 Oct 2017 14:11:30 +0000 (23:11 +0900)]
Feature: Unlisted custom emojis (#5485)

8 years agoAllow ActivityPub Note's tag and attachment to be single objects (#5534)
puckipedia [Fri, 27 Oct 2017 14:10:36 +0000 (16:10 +0200)]
Allow ActivityPub Note's tag and attachment to be single objects (#5534)

8 years agoOptimize FixReblogsInFeeds migration (#5538)
unarist [Fri, 27 Oct 2017 14:10:22 +0000 (23:10 +0900)]
Optimize FixReblogsInFeeds migration (#5538)

We have changed how we store reblogs in the redis for bigint IDs. This process is done by 1) scan all entries in users feed, and 2) re-store reblogs by 3 write commands.

However, this operation is really slow for large instances. e.g. 1hrs on friends.nico (w/ 50k users). So I have tried below tweaks.

* It checked non-reblogs by `entry[0] == entry[1]`, but this condition won't work because `entry[0]` is String while `entry[1]` is Float. Changing `entry[0].to_i == entry[1]` seems work.
  -> about 4-20x faster (feed with less reblogs will be faster)
* Write operations can be batched by pipeline
  -> about 6x faster
* Wrap operation by Lua script and execute by EVALSHA command. This really reduces packets between Ruby and Redis.
  -> about 3x faster

I've taken Lua script way, though doing other optimizations may be enough.

8 years agoFix copying emojos: redirect to the page you were on (#5509)
erin [Thu, 26 Oct 2017 14:44:24 +0000 (09:44 -0500)]
Fix copying emojos: redirect to the page you were on (#5509)

8 years agoFix column design broken with very long title (#5493)
りんすき [Thu, 26 Oct 2017 13:52:48 +0000 (22:52 +0900)]
Fix column design broken with very long title (#5493)

* Fix #5314

* fix not beautiful code

* fix broken design with mobile view

* remove no longer needed code

8 years agoFix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)
unarist [Thu, 26 Oct 2017 13:48:35 +0000 (22:48 +0900)]
Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)

Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size.

8 years agoRemove translateZ(0) on modal overlay (#5478)
Nolan Lawson [Thu, 26 Oct 2017 13:46:50 +0000 (06:46 -0700)]
Remove translateZ(0) on modal overlay (#5478)

8 years agoUpdate Russian translation (#5517)
Ratmir Karabut [Wed, 25 Oct 2017 15:21:58 +0000 (18:21 +0300)]
Update Russian translation (#5517)

* 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

* Update Russian translation

* Update Russian translation (pin)

* Update Russian translation (account deletion)

* Fix extra line

* Update Russian translation (sessions)

* Update Russian translation

* Update Russian translation

* Fix merge conflicts (revert)

* Update Russian translation

* Update Russian translation (fix)

* Update Russian translation (fix quotes)

* Update Russian translation (fix quotes)

* Update Russian translation (fix)

* Update Russian translation

* Add quotes

* bundle exec i18n-tasks normalize

8 years agol10n: PT-BR translation updated (#5530)
Anna e só [Wed, 25 Oct 2017 14:11:03 +0000 (12:11 -0200)]
l10n: PT-BR translation updated (#5530)

8 years agoComplete Esperanto translation (#5520)
Olivier Nicole [Wed, 25 Oct 2017 13:38:37 +0000 (15:38 +0200)]
Complete Esperanto translation (#5520)

8 years agoi18n: Update Polish Translation (#5494)
Marcin Mikołajczak [Sat, 21 Oct 2017 23:34:40 +0000 (01:34 +0200)]
i18n: Update Polish Translation (#5494)

8 years agoRemove unnecessary translateZ(0) when doing scale() (#5473)
Nolan Lawson [Thu, 19 Oct 2017 16:27:55 +0000 (09:27 -0700)]
Remove unnecessary translateZ(0) when doing scale() (#5473)

8 years agoremove-duplicated-jest-config (#5465)
masarakki [Thu, 19 Oct 2017 11:51:38 +0000 (20:51 +0900)]
remove-duplicated-jest-config (#5465)

8 years agoSuppress type error(not a function) on calling fastSeek (#5452)
Sho Kusano [Wed, 18 Oct 2017 15:13:51 +0000 (00:13 +0900)]
Suppress type error(not a function) on calling fastSeek (#5452)

8 years agoBump version to 2.0.0 🐘
Eugen Rochko [Wed, 18 Oct 2017 11:53:56 +0000 (13:53 +0200)]
Bump version to 2.0.0 🐘

8 years agoFix pt-BR translation strings related to advanced search. (#5449)
Renato "Lond" Cerqueira [Wed, 18 Oct 2017 11:53:17 +0000 (09:53 -0200)]
Fix pt-BR translation strings related to advanced search. (#5449)

8 years agoRevert #5438 for FR (#5450)
Technowix [Wed, 18 Oct 2017 11:51:30 +0000 (13:51 +0200)]
Revert #5438 for FR (#5450)

As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.

8 years agoSome typos and supplementation in sentence structures (#5441)
Håkan Eriksson [Wed, 18 Oct 2017 11:50:52 +0000 (13:50 +0200)]
Some typos and supplementation in sentence structures (#5441)

* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete

* Swedish - Typos and supplementation in sentence structure

* Update simple_form.sv.yml

* Update sv.yml

* Update sv.yml

Rearranged the alphabetical order.

8 years agoRun `i18n-tasks checked-normalized` in Travis CI (#5443)
Yamagishi Kazutoshi [Wed, 18 Oct 2017 09:57:02 +0000 (18:57 +0900)]
Run `i18n-tasks checked-normalized` in Travis CI (#5443)

8 years agoEnable coverage for Jest (#5442)
Yamagishi Kazutoshi [Wed, 18 Oct 2017 09:39:36 +0000 (18:39 +0900)]
Enable coverage for Jest (#5442)

8 years agofr.json typo (realtive time) (#5447)
JohnD28 [Wed, 18 Oct 2017 07:47:14 +0000 (09:47 +0200)]
fr.json typo (realtive time) (#5447)

Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie

8 years agoBump version to 2.0.0rc4
Eugen Rochko [Tue, 17 Oct 2017 21:16:35 +0000 (23:16 +0200)]
Bump version to 2.0.0rc4

8 years agoDutch: A few strings I found last minute (#5440)
Jeroen [Tue, 17 Oct 2017 21:15:40 +0000 (23:15 +0200)]
Dutch: A few strings I found last minute (#5440)

* Dutch: A few strings I found last minute

* Update simple_form.nl.yml

8 years agoMake theme directory and Rename application.scss (#5336)
YaQ [Tue, 17 Oct 2017 20:20:07 +0000 (05:20 +0900)]
Make theme directory and Rename application.scss (#5336)

* Rename application.scss

* Move to 'default' directory

* Follow review

Move directory, and Rename "mastodon".

* Revert rename

* undo removal of newline

8 years agoWhen unreblog arrives over streaming API, just delete in UI (#5439)
Eugen Rochko [Tue, 17 Oct 2017 20:17:02 +0000 (22:17 +0200)]
When unreblog arrives over streaming API, just delete in UI (#5439)

8 years agoi18n better wording (OC/CA/FR) + string added in FR (#5438)
JeanGauthier [Tue, 17 Oct 2017 19:49:39 +0000 (21:49 +0200)]
i18n better wording (OC/CA/FR) + string added in FR (#5438)

* Update oc.json

* Update fr.json

* Update ca.json

* Update fr.json

* Update simple_form.fr.yml

* Update ca.json

* Update fr.json

* Update oc.json

* Update oc.json

* Update fr.json

8 years agoFix scrolling of dropdown when offscreen (#5434)
Nolan Lawson [Tue, 17 Oct 2017 18:38:16 +0000 (11:38 -0700)]
Fix scrolling of dropdown when offscreen (#5434)

8 years agoFix unwanted content warning gap in CSS (#5436)
Eugen Rochko [Tue, 17 Oct 2017 18:07:44 +0000 (20:07 +0200)]
Fix unwanted content warning gap in CSS (#5436)

Fix #5356

8 years agoWhen status is fetched instead of delivered, do not stream it (#5437)
Eugen Rochko [Tue, 17 Oct 2017 18:05:21 +0000 (20:05 +0200)]
When status is fetched instead of delivered, do not stream it (#5437)

8 years agoDon't capture scheme-less URLs in the status (#5435)
unarist [Tue, 17 Oct 2017 16:32:25 +0000 (01:32 +0900)]
Don't capture scheme-less URLs in the status (#5435)

Specifically, this fixes status length calculation to be same as JS side.

BTW, since this pattern used in not only preview card fetching, we
should extract it (with twitter-regex?) and write tests I think.

8 years agoi18n update (#5427) in OC/CA/FR/ES (#5431)
JeanGauthier [Tue, 17 Oct 2017 11:03:28 +0000 (13:03 +0200)]
i18n update (#5427) in OC/CA/FR/ES (#5431)

* Update oc.json

* Update ca.json

* Update fr.json

* Update es.json

8 years agoFix React warning about tabIndex on status with CW (#5432)
unarist [Tue, 17 Oct 2017 11:03:12 +0000 (20:03 +0900)]
Fix React warning about tabIndex on status with CW (#5432)

8 years agoUpdate German translation (#5425)
Jakob Kramer [Tue, 17 Oct 2017 10:02:47 +0000 (12:02 +0200)]
Update German translation (#5425)

8 years agoAdd Japanese translations (#5427)
Yamagishi Kazutoshi [Tue, 17 Oct 2017 09:47:05 +0000 (18:47 +0900)]
Add Japanese translations (#5427)

* yarn manage:translations

* Add Japanese translation for #5410

* Add Japanese translation for #5393

8 years agoNormalize locale files (#5429)
Yamagishi Kazutoshi [Tue, 17 Oct 2017 09:45:59 +0000 (18:45 +0900)]
Normalize locale files (#5429)

8 years agouse-DB_NAME-in-development (#5430)
masarakki [Tue, 17 Oct 2017 09:45:37 +0000 (18:45 +0900)]
use-DB_NAME-in-development (#5430)

8 years agoClean up reblog tracking keys, related improvements (#5428)
aschmitz [Tue, 17 Oct 2017 09:45:06 +0000 (04:45 -0500)]
Clean up reblog tracking keys, related improvements (#5428)

* Clean up reblog-tracking sets from FeedManager

Builds on #5419, with a few minor optimizations and cleanup of sets
after they are no longer needed.

* Update tests, fix multiply-reblogged case

Previously, we would have lost the fact that a given status was
reblogged if the displayed reblog of it was removed, now we don't.

Also added tests to make sure FeedManager#trim cleans up our reblog
tracking keys, fixed up FeedCleanupScheduler to use the right loop,
and fixed the test for it.

8 years agoSwedish translation (#5406)
Håkan Eriksson [Tue, 17 Oct 2017 04:41:36 +0000 (06:41 +0200)]
Swedish translation (#5406)

* Swedish file added

* Swedish file added

* Swedish file updated

* Swedish languagefile added

* Add Swedish translation

* Add Swedish translation

* Started the Swedish translation

* Added Swedish lang settings

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Updating Swedish language

* Swedish language completed and added

* Swedish language Simple_form added

* Swedish language Divise added

* Swedish language doorkeeper added

* Swedish language - now all file complete

8 years agoSmall update Dutch (nl) strings (#5424)
Jeroen [Mon, 16 Oct 2017 23:00:23 +0000 (01:00 +0200)]
Small update Dutch (nl) strings (#5424)

* Update Dutch strings

* Update Dutch

8 years agoFix reduced motion breaking public galleries (#5423)
Nolan Lawson [Mon, 16 Oct 2017 19:08:01 +0000 (12:08 -0700)]
Fix reduced motion breaking public galleries (#5423)

8 years agoKeep references to all reblogs of a status on home feed (#5419)
Eugen Rochko [Mon, 16 Oct 2017 18:44:31 +0000 (20:44 +0200)]
Keep references to all reblogs of a status on home feed (#5419)

* Keep references to all reblogs of a status on home feed

When inserting reblog: Add to set of reblogs of this status on
the feed, if original status was present in the feed, add it to
that set as well.

When removing a reblog: Remove it from that set. Take random
remaining item from the set. If one exists, re-insert it into feed,
otherwise do not re-insert anything.

Fix #4210

* When original is removed, toss out reblog references

8 years agoFix typo in a db:rollback script (#5422)
Daigo 3 Dango [Mon, 16 Oct 2017 18:29:49 +0000 (08:29 -1000)]
Fix typo in a db:rollback script (#5422)

Reported at
https://don.inux39.me/@inux39/1406082
https://don.inux39.me/@inux39/1406134

8 years agoBump version to 2.0.0rc3
Eugen Rochko [Mon, 16 Oct 2017 14:29:00 +0000 (16:29 +0200)]
Bump version to 2.0.0rc3

8 years agoEnsure that feed renegeration restores non-zero items (#5409)
Eugen Rochko [Mon, 16 Oct 2017 14:08:51 +0000 (16:08 +0200)]
Ensure that feed renegeration restores non-zero items (#5409)

Fix #5398

Ordering the home timeline query by account_id meant that the first
100 items belonged to a single account. There was also no reason to
reverse-iterate over the statuses. Assuming the user accesses the
feed halfway-through, it's better to have recent statuses already
available at the top. Therefore working from newer->older is ideal.

If the algorithm ends up filtering all items out during last-mile
filtering, repeat again a page further. The algorithm terminates
when either at least one item has been added, or if the database
query returns nothing (end of data reached)

8 years agoFilter out duplicate IDs in timelines reducer (#5417)
Eugen Rochko [Mon, 16 Oct 2017 13:59:30 +0000 (15:59 +0200)]
Filter out duplicate IDs in timelines reducer (#5417)

Possibly the cause of #5379, #5377

8 years agoFix un-reblogged status being at wrong position in the home timeline (#5418)
unarist [Mon, 16 Oct 2017 13:58:23 +0000 (22:58 +0900)]
Fix un-reblogged status being at wrong position in the home timeline (#5418)

We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed.

However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses.

So this reverts that change...reblogged status inserted at corresponding position to its id.

8 years agoAdd up-to-date korean translation on client (#5402)
voidSatisfaction [Mon, 16 Oct 2017 12:39:28 +0000 (21:39 +0900)]
Add up-to-date korean translation on client  (#5402)

* chore: add Korean translation for client

* fix: change unlisted and embed Korean words

8 years agoFix #5082 - disable retweet link for followers only toot (#5397)
KY [Mon, 16 Oct 2017 12:10:12 +0000 (20:10 +0800)]
Fix #5082 - disable retweet link for followers only toot (#5397)

* Fix #5082 - disable retweet link for followers only toot

* Hide reblog count when it is a direct message

8 years agoi18n: Update Polish translation (#5416)
Marcin Mikołajczak [Mon, 16 Oct 2017 12:09:51 +0000 (14:09 +0200)]
i18n: Update Polish translation (#5416)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoi18n ultim hour «More» dropdown title + reduce motion (#5415)
JeanGauthier [Mon, 16 Oct 2017 12:09:26 +0000 (14:09 +0200)]
i18n ultim hour «More» dropdown title + reduce motion (#5415)

* Correction fem. form

* More dropdown title

* More dropdown title

* More dropdown title

* Add option to reduce motion (#5393)

8 years agoEnable ESLint rules import/* (#5414)
Yamagishi Kazutoshi [Mon, 16 Oct 2017 09:12:09 +0000 (18:12 +0900)]
Enable ESLint rules import/* (#5414)

* Enable ESLint rules import/*

* fix

8 years agoAdd option to reduce motion (#5393)
Nolan Lawson [Mon, 16 Oct 2017 07:36:15 +0000 (00:36 -0700)]
Add option to reduce motion (#5393)

* Add option to reduce motion

* Use HOC to wrap all Motion calls

* fix case-sensitive issue

* Avoid updating too frequently

* Get rid of unnecessary change to _simple_status.html.haml

8 years agoFix offline-plugin warning in dev mode (#5411)
Nolan Lawson [Mon, 16 Oct 2017 07:33:50 +0000 (00:33 -0700)]
Fix offline-plugin warning in dev mode (#5411)

8 years agoReplace JavaScript Testing Framework from Mocha to Jest (#5412)
Yamagishi Kazutoshi [Mon, 16 Oct 2017 07:33:08 +0000 (16:33 +0900)]
Replace JavaScript Testing Framework from Mocha to Jest (#5412)

8 years agoi18n "More" dropdown title (#5410)
Nolan Lawson [Mon, 16 Oct 2017 07:31:47 +0000 (00:31 -0700)]
i18n "More" dropdown title (#5410)

8 years agoRefactor and simplify icon_button.js (#5413)
Nolan Lawson [Mon, 16 Oct 2017 07:30:09 +0000 (00:30 -0700)]
Refactor and simplify icon_button.js (#5413)

8 years agoClear timer when unmounting RelativeTimestamp components (#5408)
Eugen Rochko [Mon, 16 Oct 2017 01:03:36 +0000 (03:03 +0200)]
Clear timer when unmounting RelativeTimestamp components (#5408)

Possibly the cause of #5379, #5377

8 years agoAdd up-to-date korean translation on serverside (#5400)
voidSatisfaction [Sun, 15 Oct 2017 21:08:30 +0000 (06:08 +0900)]
Add up-to-date korean translation on serverside (#5400)

* chore: add korean translation on ko.yml

* feat: add simple form korean translation up-to-date

8 years agol10n Occitan: finishing touches (#5404)
JeanGauthier [Sun, 15 Oct 2017 21:07:32 +0000 (23:07 +0200)]
l10n Occitan: finishing touches (#5404)

* Update oc.json

* Update oc.yml

8 years agoUpdate French translation (#5401)
Yannick A [Sun, 15 Oct 2017 12:21:05 +0000 (14:21 +0200)]
Update French translation (#5401)

8 years agoAdjust public hashtag pages (#5357)
Lynx Kotoura [Sat, 14 Oct 2017 12:48:12 +0000 (21:48 +0900)]
Adjust public hashtag pages (#5357)

8 years agoUse atomUri in Undo activity of Announce (#5376)
unarist [Sat, 14 Oct 2017 12:42:09 +0000 (21:42 +0900)]
Use atomUri in Undo activity of Announce (#5376)

This allows deletion of reblogs which delivered before with OStatus URI.

8 years agoreplace newlines in desktop notif with spaces instead of removing them (#5361)
Ondřej Hruška [Sat, 14 Oct 2017 12:41:12 +0000 (14:41 +0200)]
replace newlines in desktop notif with spaces instead of removing them (#5361)

8 years agoUpdated Catalan strings (#5323)
spla [Sat, 14 Oct 2017 12:40:35 +0000 (14:40 +0200)]
Updated Catalan strings (#5323)

* 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

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted

* Updated Catalan strings

* Updated Catalan strings

8 years agoFix #5351 - Redirection with page params after copy emoji (#5387)
KY [Sat, 14 Oct 2017 12:40:10 +0000 (20:40 +0800)]
Fix #5351 - Redirection with page params after copy emoji (#5387)

* Fix #5351 - Redirection with page params after copy emoji

* Add page params to copy emoji link

8 years agoClose connection when succeeded posting (#5390)
abcang [Sat, 14 Oct 2017 12:38:57 +0000 (21:38 +0900)]
Close connection when succeeded posting (#5390)

* Close connection when succeeded posting

* Update webmock

8 years agoUpdate French translation (#5384)
Yannick A [Sat, 14 Oct 2017 12:30:19 +0000 (14:30 +0200)]
Update French translation (#5384)

Update French translation

8 years agol10n: update Persian translation for 2.0 (#5391)
Masoud Abkenar [Sat, 14 Oct 2017 12:28:19 +0000 (14:28 +0200)]
l10n: update Persian translation for 2.0 (#5391)

8 years agoUpdate German translation (#5389)
Jakob Kramer [Sat, 14 Oct 2017 10:00:23 +0000 (12:00 +0200)]
Update German translation (#5389)

8 years agoCorrect some misspellings (#5381)
Mathias B [Sat, 14 Oct 2017 01:34:59 +0000 (03:34 +0200)]
Correct some misspellings (#5381)

* Correct some misspellings

Remove some english language and put the proper french words in place.

* Forgot some shit

Buurps'

8 years agoDutch strings: small change (#5375)
Jeroen [Fri, 13 Oct 2017 16:03:56 +0000 (18:03 +0200)]
Dutch strings: small change (#5375)

* Dutch strings: small change

* And this too.

8 years agoOptimize Status#permitted_for 500x (account timeline) (#5373)
unarist [Fri, 13 Oct 2017 14:53:44 +0000 (23:53 +0900)]
Optimize Status#permitted_for 500x (account timeline) (#5373)

The main change of this PR is removing `order by visibility` hack.

This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses.

I have also changed JOIN to IN + subquery, which slightly faster in most cases.

8 years agoFix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)
Eugen Rochko [Fri, 13 Oct 2017 14:44:43 +0000 (16:44 +0200)]
Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)

This error occurred at least in development environment

8 years agoFix UserTrackingConcern firing on every request, optimize some queries (#5368)
Eugen Rochko [Fri, 13 Oct 2017 14:44:29 +0000 (16:44 +0200)]
Fix UserTrackingConcern firing on every request, optimize some queries (#5368)

- For some reason, :if option on before_action did not work. It got
  executed every time, returned false, and the action run anyway,
  which led to the current_sign_in_at and sign_in_count being
  updated on every request
- Return "do not filter" early in FeedManager#filter_from_home? if
  the status is authored by receiver. Usually this method is not
  called for own statuses at all, but it is called when Feed#get
  uses the database
- Return early if #reload_stale_associations! has nothing to load
  to save a database query with WHERE 1=0

8 years agoDo not try to guess why home timeline is empty in web UI (#5370)
Eugen Rochko [Fri, 13 Oct 2017 14:44:16 +0000 (16:44 +0200)]
Do not try to guess why home timeline is empty in web UI (#5370)

* Do not try to guess why home timeline is empty in web UI

* Fix style issue

8 years agoWhen unfollowing, remove from home in web UI immediately (#5369)
Eugen Rochko [Fri, 13 Oct 2017 14:44:02 +0000 (16:44 +0200)]
When unfollowing, remove from home in web UI immediately (#5369)

Do NOT send "delete" through streaming API when unmerging from
home timeline. "delete" implies that the original status was
deleted, which is not true!

8 years agoFix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)
ThibG [Fri, 13 Oct 2017 10:58:13 +0000 (12:58 +0200)]
Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)

Remote ActivityPub users that have never been known as OStatus users
(whether or not they support it) will not have a “remote_url” attribute
set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN,
the current check did rely on “remote_url” to verify the user's domain.

8 years agoImprove spec of Feed and UserTrackingConcern (#5367)
Eugen Rochko [Fri, 13 Oct 2017 09:00:11 +0000 (11:00 +0200)]
Improve spec of Feed and UserTrackingConcern (#5367)

8 years agoSet InstancePresenter to `Auth::RegistrationsController#create` (#5366)
Yamagishi Kazutoshi [Fri, 13 Oct 2017 07:35:07 +0000 (16:35 +0900)]
Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)

8 years agoRetoot count increases without reason (#5363)
Lex Alexander [Fri, 13 Oct 2017 00:52:09 +0000 (14:52 -1000)]
Retoot count increases without reason (#5363)

* Retoot count increases without reason

-The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice.
-This calls it when the transaction is finished by using after_create_commit.
-Fixes #4916.

* Added test case for after_create_commit callback for checking reblog count.

* Rewrote test to keep original, but added one for only the after_create_commit callback.

8 years agoReduce discrepancies between server and client-side character count (#5360)
ThibG [Thu, 12 Oct 2017 21:26:34 +0000 (23:26 +0200)]
Reduce discrepancies between server and client-side character count (#5360)

8 years agol10n: PT-BR translation updated (#5362)
Anna e só [Thu, 12 Oct 2017 21:16:43 +0000 (18:16 -0300)]
l10n: PT-BR translation updated (#5362)

* PT-BR translation updated

* Testing

* Indentation error fixed

* More indentation errors fixed

8 years agoUpdating more Dutch strings for 2.0 (#5359)
Jeroen [Thu, 12 Oct 2017 19:33:37 +0000 (21:33 +0200)]
Updating more Dutch strings for 2.0 (#5359)

8 years agoFix some consistance errors in gender neutral formulations. Add some missing ones...
Alda Marteau-Hardi [Thu, 12 Oct 2017 14:31:14 +0000 (16:31 +0200)]
Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)

8 years agoUpdate oc.json (#5343)
JeanGauthier [Thu, 12 Oct 2017 13:40:45 +0000 (15:40 +0200)]
Update oc.json (#5343)