]>
cat aescling's git repositories - mastodon.git/log
David Yip [Wed, 18 Oct 2017 16:52:04 +0000 (11:52 -0500)]
Merge tag 'v2.0.0' into gs-master
Sho Kusano [Wed, 18 Oct 2017 15:13:51 +0000 (00:13 +0900)]
Suppress type error(not a function) on calling fastSeek (#5452)
Eugen Rochko [Wed, 18 Oct 2017 11:53:56 +0000 (13:53 +0200)]
Bump version to 2.0.0 🐘
Renato "Lond" Cerqueira [Wed, 18 Oct 2017 11:53:17 +0000 (09:53 -0200)]
Fix pt-BR translation strings related to advanced search. (#5449)
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.
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.
Yamagishi Kazutoshi [Wed, 18 Oct 2017 09:57:02 +0000 (18:57 +0900)]
Run `i18n-tasks checked-normalized` in Travis CI (#5443)
Yamagishi Kazutoshi [Wed, 18 Oct 2017 09:39:36 +0000 (18:39 +0900)]
Enable coverage for Jest (#5442)
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
Eugen Rochko [Tue, 17 Oct 2017 21:16:35 +0000 (23:16 +0200)]
Bump version to 2.0.0rc4
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
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
Eugen Rochko [Tue, 17 Oct 2017 20:17:02 +0000 (22:17 +0200)]
When unreblog arrives over streaming API, just delete in UI (#5439)
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
Nolan Lawson [Tue, 17 Oct 2017 18:38:16 +0000 (11:38 -0700)]
Fix scrolling of dropdown when offscreen (#5434)
Eugen Rochko [Tue, 17 Oct 2017 18:07:44 +0000 (20:07 +0200)]
Fix unwanted content warning gap in CSS (#5436)
Fix #5356
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)
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.
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
unarist [Tue, 17 Oct 2017 11:03:12 +0000 (20:03 +0900)]
Fix React warning about tabIndex on status with CW (#5432)
Jakob Kramer [Tue, 17 Oct 2017 10:02:47 +0000 (12:02 +0200)]
Update German translation (#5425)
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
Yamagishi Kazutoshi [Tue, 17 Oct 2017 09:45:59 +0000 (18:45 +0900)]
Normalize locale files (#5429)
masarakki [Tue, 17 Oct 2017 09:45:37 +0000 (18:45 +0900)]
use-DB_NAME-in-development (#5430)
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.
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
Jeroen [Mon, 16 Oct 2017 23:00:23 +0000 (01:00 +0200)]
Small update Dutch (nl) strings (#5424)
* Update Dutch strings
* Update Dutch
Ondřej Hruška [Mon, 16 Oct 2017 21:32:13 +0000 (23:32 +0200)]
Fix dual toot button wrong behavior after compose re-design
beatrix [Mon, 16 Oct 2017 21:05:42 +0000 (17:05 -0400)]
Merge pull request #184 from tootsuite/master
Fix reduced motion breaking public galleries (#5423)
David Yip [Mon, 16 Oct 2017 20:49:22 +0000 (15:49 -0500)]
Merge pull request #182 from glitch-soc/wide-tootbox-panel
Full-width tootbox panel to make room for buttons
David Yip [Mon, 16 Oct 2017 20:46:12 +0000 (15:46 -0500)]
Merge pull request #181 from glitch-soc/upstream-merge-again
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
Ondřej Hruška [Mon, 16 Oct 2017 20:24:44 +0000 (22:24 +0200)]
satisfy eslint and jest
Ondřej Hruška [Mon, 16 Oct 2017 20:12:38 +0000 (22:12 +0200)]
rem a comment
Ondřej Hruška [Mon, 16 Oct 2017 20:10:14 +0000 (22:10 +0200)]
double-decker tootbox
Ondřej Hruška [Mon, 16 Oct 2017 19:13:47 +0000 (21:13 +0200)]
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
Ondřej Hruška [Mon, 16 Oct 2017 19:13:34 +0000 (21:13 +0200)]
fix some lint errors
Nolan Lawson [Mon, 16 Oct 2017 19:08:01 +0000 (12:08 -0700)]
Fix reduced motion breaking public galleries (#5423)
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
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
David Yip [Mon, 16 Oct 2017 14:54:16 +0000 (09:54 -0500)]
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
Eugen Rochko [Mon, 16 Oct 2017 14:29:00 +0000 (16:29 +0200)]
Bump version to 2.0.0rc3
David Yip [Mon, 16 Oct 2017 14:27:01 +0000 (09:27 -0500)]
Merge remote-tracking branch 'upstream/master' into gs-master
David Yip [Mon, 16 Oct 2017 14:23:59 +0000 (09:23 -0500)]
Merge remote-tracking branch 'upstream/master' into gs-master
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)
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
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.
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
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
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>
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)
Yamagishi Kazutoshi [Mon, 16 Oct 2017 09:12:09 +0000 (18:12 +0900)]
Enable ESLint rules import/* (#5414)
* Enable ESLint rules import/*
* fix
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
Nolan Lawson [Mon, 16 Oct 2017 07:33:50 +0000 (00:33 -0700)]
Fix offline-plugin warning in dev mode (#5411)
Yamagishi Kazutoshi [Mon, 16 Oct 2017 07:33:08 +0000 (16:33 +0900)]
Replace JavaScript Testing Framework from Mocha to Jest (#5412)
Nolan Lawson [Mon, 16 Oct 2017 07:31:47 +0000 (00:31 -0700)]
i18n "More" dropdown title (#5410)
Nolan Lawson [Mon, 16 Oct 2017 07:30:09 +0000 (00:30 -0700)]
Refactor and simplify icon_button.js (#5413)
David Yip [Mon, 16 Oct 2017 06:29:02 +0000 (01:29 -0500)]
Merge remote-tracking branch 'origin/master' into gs-master
David Yip [Mon, 16 Oct 2017 05:49:05 +0000 (00:49 -0500)]
Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
Avatar unification, mk.II
Matthew Walsh [Sun, 18 Jun 2017 22:09:03 +0000 (15:09 -0700)]
1.6 changed files for unified avatar styling -- updated to restore unity
David Yip [Mon, 16 Oct 2017 01:04:19 +0000 (20:04 -0500)]
Merge pull request #173 from glitch-soc/zerowidthmoji
use zerowidth spaces with emojis
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
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
JeanGauthier [Sun, 15 Oct 2017 21:07:32 +0000 (23:07 +0200)]
l10n Occitan: finishing touches (#5404)
* Update oc.json
* Update oc.yml
Yannick A [Sun, 15 Oct 2017 12:21:05 +0000 (14:21 +0200)]
Update French translation (#5401)
Lynx Kotoura [Sat, 14 Oct 2017 12:48:12 +0000 (21:48 +0900)]
Adjust public hashtag pages (#5357)
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.
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)
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
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
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
Yannick A [Sat, 14 Oct 2017 12:30:19 +0000 (14:30 +0200)]
Update French translation (#5384)
Update French translation
Masoud Abkenar [Sat, 14 Oct 2017 12:28:19 +0000 (14:28 +0200)]
l10n: update Persian translation for 2.0 (#5391)
Ondřej Hruška [Sat, 14 Oct 2017 10:24:35 +0000 (12:24 +0200)]
Doodle improvements 2 (#176)
* Fix some doodle bugs and added Background color functionality
* added protections against accidental doodle erase, screen size changing
* resolve react warning about 'selected' on <option>
Jakob Kramer [Sat, 14 Oct 2017 10:00:23 +0000 (12:00 +0200)]
Update German translation (#5389)
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'
Ondřej Hruška [Fri, 13 Oct 2017 22:58:38 +0000 (00:58 +0200)]
Doodle palette, options, fill tool (#172)
Ondřej Hruška [Fri, 13 Oct 2017 22:48:53 +0000 (00:48 +0200)]
use zerowidth spaces for emojis
David Yip [Fri, 13 Oct 2017 16:48:53 +0000 (11:48 -0500)]
Merge pull request #168 from glitch-soc/doodles
Initial doodle support
Ondřej Hruška [Fri, 13 Oct 2017 16:13:00 +0000 (18:13 +0200)]
Fixed a bug where the canvas would get transparent bg upon erase
Ondřej Hruška [Fri, 13 Oct 2017 16:01:14 +0000 (18:01 +0200)]
Initial doodle support
Jeroen [Fri, 13 Oct 2017 16:03:56 +0000 (18:03 +0200)]
Dutch strings: small change (#5375)
* Dutch strings: small change
* And this too.
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.
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
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
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
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!
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.
Eugen Rochko [Fri, 13 Oct 2017 09:00:11 +0000 (11:00 +0200)]
Improve spec of Feed and UserTrackingConcern (#5367)
Yamagishi Kazutoshi [Fri, 13 Oct 2017 07:35:07 +0000 (16:35 +0900)]
Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)
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.
ThibG [Thu, 12 Oct 2017 21:26:34 +0000 (23:26 +0200)]
Reduce discrepancies between server and client-side character count (#5360)
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
Jeroen [Thu, 12 Oct 2017 19:33:37 +0000 (21:33 +0200)]
Updating more Dutch strings for 2.0 (#5359)
Ondřej Hruška [Thu, 12 Oct 2017 19:28:17 +0000 (21:28 +0200)]
Fix the notification bug with newlines
David Yip [Thu, 12 Oct 2017 14:36:26 +0000 (09:36 -0500)]
Another tabs-vs-spaces fix, but with ~feeling~
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)
David Yip [Thu, 12 Oct 2017 14:23:06 +0000 (09:23 -0500)]
Fix tabs-vs-spaces issue pointed out by eslint.
JeanGauthier [Thu, 12 Oct 2017 13:40:45 +0000 (15:40 +0200)]
Update oc.json (#5343)
JohnD28 [Thu, 12 Oct 2017 13:25:34 +0000 (15:25 +0200)]
Update fr.yml (#5330)
* Update fr.yml
Update of french translation and reformatting Privacy Policy for better maintenance.
* Update fr.yml
* Update fr.yml
* Update fr.yml
Corrections suivant les remarques d'Alda.
* Update fr.yml
* Update fr.yml
* Update fr.yml
* Update fr.yml
* Update fr.yml
I have replaced my proposals with those accepted here to reduce the conflict.
https://github.com/tootsuite/mastodon/pull/5340
J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.
Comment dois-je faire à l'avenir pour éviter ce genre de situations ?
* Update fr.yml
Conflict reduction.
Jeroen [Thu, 12 Oct 2017 10:07:35 +0000 (12:07 +0200)]
+ me for Dutch (#5349)
I didn't received the memo, but I just follow the flow.
This page took 0.062864 seconds and 3 git commands to generate.