]>
cat aescling's git repositories - mastodon.git/log
unarist [Sun, 25 Jun 2017 10:52:42 +0000 (19:52 +0900)]
Don't set ASSET_HOST on build:development (#3936)
Setting ASSET_HOST to `http://0.0.0.0:8080` makes urls in manifest.json to
be invalid, e.g. `http://0.0.0.0:8080/packs/application.js`.
Anyway, we don't need set this on build:development because assets would
be delivered from same origin in development (and w/o dev-server).
unarist [Sun, 25 Jun 2017 10:49:53 +0000 (19:49 +0900)]
Fix react-intl/locale-data import issue on production build (#3937)
Webpack seems to fail to import `react-intl/locale-data/*.js` if those
files has been proceed by babel, and this also breaks applying our translation.
Note that this won't be a problem on English locale, because react-intl
includes it as default and works fine without manually added locale-data.
Also this issue seems to only occurs on production build, but I'm not sure
about reason.
unarist [Sat, 24 Jun 2017 21:18:32 +0000 (06:18 +0900)]
Fix elephant in onboarding modal being very small sized on small devices (#3932)
unarist [Sat, 24 Jun 2017 21:18:11 +0000 (06:18 +0900)]
Clean column collapsible (#3931)
* Remove unused column_collapsable.js
* Remove old styles
* Extract `> div` style to independent class
Sorin Davidoi [Sat, 24 Jun 2017 21:17:39 +0000 (23:17 +0200)]
feat(components/onboarding_modal): Swipe between pages (#3934)
unarist [Sat, 24 Jun 2017 12:03:52 +0000 (21:03 +0900)]
Fix webpack config for Windows (#3926)
Yamagishi Kazutoshi [Sat, 24 Jun 2017 10:24:02 +0000 (19:24 +0900)]
Fix #3924 (regression from #3906) (#3925)
unarist [Sat, 24 Jun 2017 00:43:26 +0000 (09:43 +0900)]
Use debounce for dispatch scrollTopNotification and expandNotifications (#3700)
Daniel Hunsaker [Fri, 23 Jun 2017 21:13:27 +0000 (15:13 -0600)]
Fix a typo and give CW'd statuses the right cursor (#3918)
Eugen Rochko [Fri, 23 Jun 2017 17:40:51 +0000 (19:40 +0200)]
Fix webpack-dev-server until it's fixed upstream (#3916)
Yamagishi Kazutoshi [Fri, 23 Jun 2017 17:36:54 +0000 (02:36 +0900)]
Use Class and Property Decorators (#3730)
ref https://tc39.github.io/proposal-decorators/
Takuya Yoshida [Fri, 23 Jun 2017 17:22:02 +0000 (02:22 +0900)]
Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" (#3913)
* Fix errorMiddleware
* Add "eslint-disable-line no-unused-vars"
Sorin Davidoi [Fri, 23 Jun 2017 16:50:53 +0000 (18:50 +0200)]
Revocable sessions (#3616)
* feat: Revocable sessions
* fix: Tests using sign_in
* feat: Configuration entry for the maximum number of session activations
Nolan Lawson [Fri, 23 Jun 2017 16:21:33 +0000 (09:21 -0700)]
Apply babel to react-intl to remove prop-types (#3914)
Eugen Rochko [Fri, 23 Jun 2017 15:52:56 +0000 (17:52 +0200)]
Merge branch 'sorin-davidoi-swipe-gestures'
Eugen Rochko [Fri, 23 Jun 2017 15:52:39 +0000 (17:52 +0200)]
Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures
Akihiko Odaki (@fn_aki@pawoo.net) [Fri, 23 Jun 2017 15:46:00 +0000 (00:46 +0900)]
Add index statuses on account_id and id (#3895)
Nolan Lawson [Fri, 23 Jun 2017 15:44:55 +0000 (08:44 -0700)]
Upgrade to Webpack 3 with module concatenation (#3912)
Eugen Rochko [Fri, 23 Jun 2017 15:02:14 +0000 (17:02 +0200)]
Bump version to 1.4.6
Eugen Rochko [Fri, 23 Jun 2017 15:01:53 +0000 (17:01 +0200)]
Add important test for full-width hashtags (#3911)
Yamagishi Kazutoshi [Fri, 23 Jun 2017 14:05:04 +0000 (23:05 +0900)]
Remove unused variables (#3906)
Yamagishi Kazutoshi [Fri, 23 Jun 2017 11:55:05 +0000 (20:55 +0900)]
Add prefix to setting toggle ID (#3907)
Sorin Davidoi [Sat, 10 Jun 2017 18:47:07 +0000 (20:47 +0200)]
fix: Apply :hover, :focus and :active only when multiple columns
Sorin Davidoi [Thu, 8 Jun 2017 15:41:43 +0000 (17:41 +0200)]
feat: Swipeable media
Sorin Davidoi [Thu, 8 Jun 2017 15:41:32 +0000 (17:41 +0200)]
feat: Swipeable columns
Sorin Davidoi [Thu, 8 Jun 2017 15:36:01 +0000 (17:36 +0200)]
chore(yarn): Install react-swipeable
Ratmir Karabut [Thu, 22 Jun 2017 21:28:58 +0000 (00:28 +0300)]
Update Russian translation (#3902)
* 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
nightpool [Thu, 22 Jun 2017 21:28:52 +0000 (17:28 -0400)]
Use the stable RVM installer (#3901)
as mentioned by ElvenSpellmaker here: https://github.com/rvm/rvm/issues/4068
Adds a workaround for the issue mentioned by @abcang here: https://github.com/tootsuite/mastodon/pull/3897#issuecomment-
310436668 and makes sure that we're using the stable installer to install the stable version.
Charlotte Fields [Thu, 22 Jun 2017 16:35:27 +0000 (02:35 +1000)]
fixed vagrantfile (#3897)
Akihiko Odaki (@fn_aki@pawoo.net) [Thu, 22 Jun 2017 16:34:27 +0000 (01:34 +0900)]
Some minor change and spec for Account (#3813)
* Introduce domains method to Account relation
Account had followers_domains method, which was excessively specific.
Let relation of Account have domains method instead.
* Move follow_mapping in Account to AccountInteractions
* Introduce shared examples for AccountAvatar inclusion
* Cover Account more
Quent-in [Thu, 22 Jun 2017 11:39:13 +0000 (13:39 +0200)]
Update of doorkeeper.oc.yml (#3896)
Just some adjustements
Eugen Rochko [Thu, 22 Jun 2017 11:24:00 +0000 (13:24 +0200)]
Fix travis builds
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-
310320597
Eugen Rochko [Thu, 22 Jun 2017 00:38:50 +0000 (02:38 +0200)]
Fix regression from #3842 (#3892)
* Fix regression from #3842
Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)
Resolves #3887 (alternative)
* Adjust test
unarist [Wed, 21 Jun 2017 04:47:36 +0000 (13:47 +0900)]
Don't attach IntersectionObserver for wrapped statuses (#3883)
(This patch has been merged as bugfix and reverted, but still valuable as
improvement)
Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. but wrapped Status don't need to manage
intersection and visibility by itself, because it's a part of wrapper Status.
Eugen Rochko [Tue, 20 Jun 2017 23:37:15 +0000 (01:37 +0200)]
Revert #3851 (#3878)
Eugen Rochko [Tue, 20 Jun 2017 23:33:14 +0000 (01:33 +0200)]
Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877)
* Revert "Bump version to 1.4.4"
This reverts commit
1585b0c6cce6cebda3fdc8ba944aa2247e76d1be .
* Revert "Fix conversations (fixes #3869) (#3870)"
This reverts commit
15b43f555dcb06742c677d84c25d05774ef1bde2 .
* Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)"
This reverts commit
d8ec83280637e53ded67d4938a198cbeb9e8db05 .
* Revert "Filter direct statuses in Status.as_home_timeline (#3842)"
This reverts commit
bab5a18232a163b0c3c6a245f7f95d50d7022b36 .
* Revert "Fix RemoteFollow behavior (#3868)"
This reverts commit
a20cf3b64e93d764f1dfe88ecdb39f3fd4eefe03 .
* Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)"
This reverts commit
356df7ae6b6edfc600fbc532f32fbc46314e00a0 .
* Revert "Upgrade React Router (#3677)"
This reverts commit
8f03fdce7fa16fcaa829a40f395cefc85eb957d5 .
* Revert "Do not call setState from unmounted component (#3853)"
This reverts commit
1fc6cb499742c1a872ad717a689c58a80aeb714d .
* Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)"
This reverts commit
eb832e88f44d661a504a091defc051e052eb1252 .
* Revert "Fix RTL detection on Ruby side (#3867)"
This reverts commit
b16b69350eb4ded2e1011931433b51dac5e34b53 .
* Revert "i18n: Fixed typo in Polish translation (#3864)"
This reverts commit
da6fa029f66d50f38f2b6c85687994793f7766aa .
* Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)"
This reverts commit
94ad0706f514e25c58c0a8f3201f96c1d1ccbbd8 .
Eugen Rochko [Tue, 20 Jun 2017 19:32:37 +0000 (21:32 +0200)]
Bump version to 1.4.4
ThibG [Tue, 20 Jun 2017 18:44:32 +0000 (20:44 +0200)]
Fix conversations (fixes #3869) (#3870)
* Actually create conversations given explicit URIs
* Try to get the parent toot in before validation, to avoid creating a new conversation
猫吸血鬼ディフリス / 猫ロキP [Tue, 20 Jun 2017 18:41:41 +0000 (03:41 +0900)]
Fix streaming server. Redis connection subscribe for each channel. (#3828)
Akihiko Odaki (@fn_aki@pawoo.net) [Tue, 20 Jun 2017 18:41:23 +0000 (03:41 +0900)]
Filter direct statuses in Status.as_home_timeline (#3842)
The classes using Status.as_home_timeline, namely Feed and
PrecomputeFeedService are expected to filter direct statuses as
FanOutWriteService does, but their filtering were incomplete or missing.
This commit solves the problem by filtering direct statuses in
as_home_timeline as the other similar methods such as as_public_timeline
does.
unarist [Tue, 20 Jun 2017 18:40:56 +0000 (03:40 +0900)]
Fix RemoteFollow behavior (#3868)
* Invalid acct is an error. not "2 errors".
* Empty input should be different error from invalid acct
Akihiko Odaki (@fn_aki@pawoo.net) [Tue, 20 Jun 2017 18:40:45 +0000 (03:40 +0900)]
Update fabricator for MediaAttachment to attach a file according to type (#3862)
This fixes a random spec failures since commit
d55f207274648369cba30ff001aa3e354fa30dca .
Sorin Davidoi [Tue, 20 Jun 2017 18:40:03 +0000 (20:40 +0200)]
Upgrade React Router (#3677)
* chore(yarn): Remove react-router
* chore(yarn): Remove react-router-scroll
* chore(yarn): Remove history
* chore(yarn): Add react-router-dom
* chore: Remove usages of react-router-scroll
* refactor: Upgrade to react-router-web
* refactor: Use fork of react-router-scroll
This reverts commit
2ddea9a6c8d39fc64b7d0b587f3fbda7a45a7fa2 .
* fix: Issues mentions in the PR feedback
alpaca-tc [Tue, 20 Jun 2017 18:37:09 +0000 (03:37 +0900)]
Do not call setState from unmounted component (#3853)
Stop an executing task if the component already unmounted.
Yamagishi Kazutoshi [Tue, 20 Jun 2017 17:43:09 +0000 (02:43 +0900)]
Replace TextIconButton for SensitiveButton to IconButton (#3759)
* Replace TextIconButton for SensitiveButton to IconButton
* line-height
unarist [Tue, 20 Jun 2017 16:45:09 +0000 (01:45 +0900)]
Fix RTL detection on Ruby side (#3867)
This fixes below bugs:
* pipe characters being counted as RTL character
* only first word being checked
m4sk1n [Tue, 20 Jun 2017 16:34:27 +0000 (18:34 +0200)]
i18n: Fixed typo in Polish translation (#3864)
unarist [Tue, 20 Jun 2017 02:12:51 +0000 (11:12 +0900)]
Don't attach IntersectionObserver for wrapped statuses (#3863)
This fixes a bug that sometimes boosted statuses being hidden on scrolling.
Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. This will call intersection handler twice,
so this may results race condition...probably.
unarist [Mon, 19 Jun 2017 23:34:10 +0000 (08:34 +0900)]
Clicking on the CW text should expand the status (#3855)
unarist [Mon, 19 Jun 2017 16:27:07 +0000 (01:27 +0900)]
Set cursor:pointer only when necessary (#3857)
のら [Mon, 19 Jun 2017 13:12:41 +0000 (22:12 +0900)]
Add Japanese translation "Action taken by" (#3850)
masarakki [Mon, 19 Jun 2017 13:12:31 +0000 (22:12 +0900)]
setting-for-account-deletable (#3852)
Yamagishi Kazutoshi [Mon, 19 Jun 2017 12:01:31 +0000 (21:01 +0900)]
Re-add disableHostCheck (regression #3729) (#3854)
ref #2790
Daigo 3 Dango [Mon, 19 Jun 2017 09:32:28 +0000 (23:32 -1000)]
Link to /about from public page on a single user instance (#3814)
There was no link for visitors to follow to see the about page.
Akihiko Odaki (@fn_aki@pawoo.net) [Mon, 19 Jun 2017 09:31:37 +0000 (18:31 +0900)]
Cover Block more (#3837)
Akihiko Odaki (@fn_aki@pawoo.net) [Mon, 19 Jun 2017 09:31:27 +0000 (18:31 +0900)]
Cover DomainBlock more (#3838)
Gô Shoemake [Mon, 19 Jun 2017 09:31:14 +0000 (02:31 -0700)]
Fix character/grapheme count stuff (#3839)
* Bring Toot button in line with counter
Both should use stringz I guess
* Use grapheme_length for character count
Akihiko Odaki (@fn_aki@pawoo.net) [Mon, 19 Jun 2017 09:30:27 +0000 (18:30 +0900)]
Cover Export more (#3840)
alpaca-tc [Mon, 19 Jun 2017 09:29:57 +0000 (18:29 +0900)]
Unobserve status on unmount (#3851)
spla [Mon, 19 Jun 2017 08:29:18 +0000 (10:29 +0200)]
Added new Catalan strings (#3843)
* 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
alpaca-tc [Mon, 19 Jun 2017 08:28:35 +0000 (17:28 +0900)]
Fixes streaming callbacks of HashtagTimeline (#3849)
Eugen Rochko [Sun, 18 Jun 2017 23:51:04 +0000 (01:51 +0200)]
Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
Rename Activitypub to ActivityPub
Eugen Rochko [Sun, 18 Jun 2017 23:50:56 +0000 (01:50 +0200)]
Debounce autosuggestions (#3836)
* Debounce autosuggestions
* Remove duplicate import
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 18 Jun 2017 23:38:50 +0000 (08:38 +0900)]
Cover Favourite more (#3841)
Akihiko Odaki (@fn_aki@pawoo.net) [Sun, 18 Jun 2017 00:59:49 +0000 (09:59 +0900)]
Spec AccountDomainBlock (#3816)
Nolan Lawson [Sun, 18 Jun 2017 00:59:29 +0000 (17:59 -0700)]
Fix jittery scrolling for Chromium browsers (#3776) (#3832)
Nolan Lawson [Sun, 18 Jun 2017 00:57:41 +0000 (17:57 -0700)]
handle resize in a debounce() (#3834)
Yamagishi Kazutoshi [Sun, 18 Jun 2017 00:57:09 +0000 (09:57 +0900)]
Upgrade Webpacker to version 2.0 (#3729)
nightpool [Sat, 17 Jun 2017 18:26:05 +0000 (14:26 -0400)]
Whitelist allowed classes for federated statuses (#3810)
* Whitelist allowed classes for federated statuses
Allowed classes are currently:
- Any microformats class (h/p/u/dt/e-*)
- the classes mention, hashtag, ellipses and invisible.
this last one is somewhat suspect, but Mastodon currently uses it to render hidden link text.
resolved #3790
* Fix code style
Quent-in [Sat, 17 Jun 2017 18:21:25 +0000 (20:21 +0200)]
l10n update for account deletion (#3820)
* l10n update for acount deletion
* l10n little change
* l10n little changes
Less passive voice, more natural.
* Update oc.yml
Correction, " added
Akihiko Odaki (@fn_aki@pawoo.net) [Fri, 16 Jun 2017 23:15:00 +0000 (08:15 +0900)]
Spec UserMailer (#3757)
unarist [Fri, 16 Jun 2017 23:14:42 +0000 (08:14 +0900)]
Use cross-env for npm run on Windows (#3789)
abcang [Fri, 16 Jun 2017 20:38:26 +0000 (05:38 +0900)]
Fix ogp url (#3802)
Yamagishi Kazutoshi [Thu, 15 Jun 2017 23:46:12 +0000 (08:46 +0900)]
Upgrade react-immutable-pure-component to version 1.0.0 (#3786)
Yamagishi Kazutoshi [Thu, 15 Jun 2017 12:10:41 +0000 (21:10 +0900)]
Add alt attribute to ImageLoader (#3765)
ThibG [Thu, 15 Jun 2017 09:04:23 +0000 (11:04 +0200)]
Fix #3633 by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService (#3642)
Eugen Rochko [Thu, 15 Jun 2017 01:03:42 +0000 (03:03 +0200)]
Bump version to 1.4.3
m4sk1n [Thu, 15 Jun 2017 00:00:23 +0000 (02:00 +0200)]
updated Polish translation (#3751)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Eugen Rochko [Thu, 15 Jun 2017 00:00:08 +0000 (02:00 +0200)]
Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)
Eugen Rochko [Wed, 14 Jun 2017 21:07:06 +0000 (23:07 +0200)]
Fix regression from #3748 - properly set defaultColumns (#3750)
unarist [Wed, 14 Jun 2017 20:00:08 +0000 (05:00 +0900)]
Add Japanese translation for Account deletion (#3747)
unarist [Wed, 14 Jun 2017 19:59:52 +0000 (04:59 +0900)]
Fix merge default columns (#3748)
mergeDeep also merges columns, but it should be replaced simply.
So in the new function, first apply mergeDeep except columns, and set default columns if columns unset.
Eugen Rochko [Wed, 14 Jun 2017 18:30:12 +0000 (20:30 +0200)]
Fix account delete form not accepting password, update suspended (#3745)
account before removing content for quicker feedback to end-users
m4sk1n [Wed, 14 Jun 2017 18:08:00 +0000 (20:08 +0200)]
i18n: updated Polish translation (#3744)
Eugen Rochko [Wed, 14 Jun 2017 16:59:02 +0000 (18:59 +0200)]
Save settings when they are changed (#3743)
Eugen Rochko [Wed, 14 Jun 2017 16:01:35 +0000 (18:01 +0200)]
Batched remove status service (#3735)
* Make Pubsubhubbub::DistributionWorker handle both single stream entry
arguments, as well as arrays of stream entries
* Add BatchedRemoveStatusService, make SuspendAccountService use it
* Improve method names
* Add test
* Add more tests
* Use PuSH payloads of 100 to have a clear mapping of
1000 input statuses -> 10 PuSH payloads
It was nice while it lasted
Eugen Rochko [Wed, 14 Jun 2017 16:01:27 +0000 (18:01 +0200)]
Account deletion (#3728)
* Add form for account deletion
* If avatar or header are gone from source, remove them
* Add option to have SuspendAccountService remove user record, add tests
* Exclude suspended accounts from search
Yamagishi Kazutoshi [Wed, 14 Jun 2017 14:16:00 +0000 (23:16 +0900)]
Update React to version v15.6 (#3736)
Yamagishi Kazutoshi [Wed, 14 Jun 2017 11:42:00 +0000 (20:42 +0900)]
Enable useBuiltIns option of transform-object-rest-spread (#3737)
Eugen Rochko [Wed, 14 Jun 2017 11:37:03 +0000 (13:37 +0200)]
Fix #2619 - When redis feed is empty, fall back to database (#3721)
* Fix #2619 - When redis feed is empty, fall back to database
* Use redis value to return feed from database only while RegenerationWorker
hasn't finished running
* Fix specs
* Replace usage of reject!
Sorin Davidoi [Tue, 13 Jun 2017 18:46:21 +0000 (20:46 +0200)]
fix(status): Content jump due to height changes (#3734)
Eugen Rochko [Tue, 13 Jun 2017 01:55:36 +0000 (03:55 +0200)]
Exclude packs/custom.js from webpack compilation to prevent breakage (#3719)
due to the change in #3373
Eugen Rochko [Tue, 13 Jun 2017 01:55:28 +0000 (03:55 +0200)]
Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)
Eugen Rochko [Mon, 12 Jun 2017 22:51:48 +0000 (00:51 +0200)]
Fix #3675 - Adjust quality settings of converted GIFs to reduce filesize (#3723)
Eugen Rochko [Mon, 12 Jun 2017 22:39:31 +0000 (00:39 +0200)]
Fix unclickable onboardin modal regression (#3724)
m4sk1n [Mon, 12 Jun 2017 21:55:32 +0000 (23:55 +0200)]
i18n: minor fix in Polish translation (#3726)
* i18n: minor fix in Polish translation
* i18n
Eugen Rochko [Mon, 12 Jun 2017 18:02:17 +0000 (20:02 +0200)]
Unread indicator was invisible behind column header, adjusted (#3720)
* Unread indicator was invisible behind column header, adjusted
* Unread indicator now a CSS pseudo-element
* Adjust flex
Ratmir Karabut [Mon, 12 Jun 2017 10:53:20 +0000 (13:53 +0300)]
Update Russian translation (pin) (#3712)
* Update Russian translation (pin)
Yamagishi Kazutoshi [Mon, 12 Jun 2017 10:41:19 +0000 (19:41 +0900)]
Regenerate defaultMessages.json (#3709)
follow up #3564
Yamagishi Kazutoshi [Mon, 12 Jun 2017 10:26:23 +0000 (19:26 +0900)]
Re-add clear notifications button (#3708)
* Re-add clear notifications button
* remove connect() in column_settings
* one line
* remove unused props