treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
3,627 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

3627 Commits (d367c3ce416b07bfb14282c0a74b35cce8ed172a)

Author SHA1 Message Date
Eugen Rochko cbc0fea992 Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877) 
* Revert "Bump version to 1.4.4"

This reverts commit bd6bee29de.

* Revert "Fix conversations (fixes #3869) (#3870)"

This reverts commit ee7952c349.

* Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)"

This reverts commit 8f202bc639.

* Revert "Filter direct statuses in Status.as_home_timeline (#3842)"

This reverts commit 77dcf442e7.

* Revert "Fix RemoteFollow behavior (#3868)"

This reverts commit 1d2eba7a84.

* Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)"

This reverts commit baa248a801.

* Revert "Upgrade React Router (#3677)"

This reverts commit 9bc32eb267.

* Revert "Do not call setState from unmounted component (#3853)"

This reverts commit 59849b392d.

* Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)"

This reverts commit 47dceaded6.

* Revert "Fix RTL detection on Ruby side (#3867)"

This reverts commit 55376105f5.

* Revert "i18n: Fixed typo in Polish translation (#3864)"

This reverts commit 3c355ed26b.

* Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)"

This reverts commit 79c04b0a2c.
 2017-06-21 01:33:14 +02:00
Eugen Rochko bd6bee29de Bump version to 1.4.4 2017-06-20 21:32:37 +02:00
ThibG ee7952c349 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
 2017-06-20 20:44:32 +02:00
猫吸血鬼ディフリス / 猫ロキP 8f202bc639 Fix streaming server. Redis connection subscribe for each channel. (#3828) 2017-06-20 20:41:41 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 77dcf442e7 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.
 2017-06-20 20:41:23 +02:00
unarist 1d2eba7a84 Fix RemoteFollow behavior (#3868) 
* Invalid acct is an error. not "2 errors".
* Empty input should be different error from invalid acct
 2017-06-20 20:40:56 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) baa248a801 Update fabricator for MediaAttachment to attach a file according to type (#3862) 
This fixes a random spec failures since commit
c8020b2105.
 2017-06-20 20:40:45 +02:00
Sorin Davidoi 9bc32eb267 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
 2017-06-20 20:40:03 +02:00
alpaca-tc 59849b392d Do not call setState from unmounted component (#3853) 
Stop an executing task if the component already unmounted.
 2017-06-20 20:37:09 +02:00
Yamagishi Kazutoshi 47dceaded6 Replace TextIconButton for SensitiveButton to IconButton (#3759) 
* Replace TextIconButton for SensitiveButton to IconButton

* line-height
 2017-06-20 19:43:09 +02:00
unarist 55376105f5 Fix RTL detection on Ruby side (#3867) 
This fixes below bugs:

* pipe characters being counted as RTL character
* only first word being checked
 2017-06-20 18:45:09 +02:00
m4sk1n 3c355ed26b i18n: Fixed typo in Polish translation (#3864) 2017-06-20 18:34:27 +02:00
unarist 79c04b0a2c 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.
 2017-06-20 04:12:51 +02:00
unarist 9e5c733a66 Clicking on the CW text should expand the status (#3855) 2017-06-20 01:34:10 +02:00
unarist 8db07d1187 Set cursor:pointer only when necessary (#3857) 2017-06-19 18:27:07 +02:00
のら 8b65b64428 Add Japanese translation "Action taken by" (#3850) 2017-06-19 15:12:41 +02:00
masarakki d947978192 setting-for-account-deletable (#3852) 2017-06-19 15:12:31 +02:00
Yamagishi Kazutoshi 0a2e331bd5 Re-add disableHostCheck (regression #3729) (#3854) 
ref #2790
 2017-06-19 14:01:31 +02:00
Daigo 3 Dango 0483235216 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.
 2017-06-19 11:32:28 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 481f277e58 Cover Block more (#3837) 2017-06-19 11:31:37 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) ac1f0e49f0 Cover DomainBlock more (#3838) 2017-06-19 11:31:27 +02:00
Gô Shoemake 2d31077bdf 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
 2017-06-19 11:31:14 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) c8020b2105 Cover Export more (#3840) 2017-06-19 11:30:27 +02:00
alpaca-tc 36049c0096 Unobserve status on unmount (#3851) 2017-06-19 11:29:57 +02:00
spla 7a96f422db 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
 2017-06-19 10:29:18 +02:00
alpaca-tc fa14f245f8 Fixes streaming callbacks of HashtagTimeline (#3849) 2017-06-19 10:28:35 +02:00
Eugen Rochko 8bed91d94c Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847) 
Rename Activitypub to ActivityPub
 2017-06-19 01:51:04 +02:00
Eugen Rochko 4845069692 Debounce autosuggestions (#3836) 
* Debounce autosuggestions

* Remove duplicate import
 2017-06-19 01:50:56 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 5fcbc71c35 Cover Favourite more (#3841) 2017-06-19 01:38:50 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) e990a4a566 Spec AccountDomainBlock (#3816) 2017-06-18 02:59:49 +02:00
Nolan Lawson 424cf0a590 Fix jittery scrolling for Chromium browsers (#3776) (#3832) 2017-06-18 02:59:29 +02:00
Nolan Lawson f973d620ca handle resize in a debounce() (#3834) 2017-06-18 02:57:41 +02:00
Yamagishi Kazutoshi dece663cd0 Upgrade Webpacker to version 2.0 (#3729) 2017-06-18 02:57:09 +02:00
nightpool 0048f7ac72 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
 2017-06-17 20:26:05 +02:00
Quent-in d792a958fb 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
 2017-06-17 20:21:25 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) f391f81f3d Spec UserMailer (#3757) 2017-06-17 01:15:00 +02:00
unarist 05e7d8861c Use cross-env for npm run on Windows (#3789) 2017-06-17 01:14:42 +02:00
abcang 3d49aa4bfb Fix ogp url (#3802) 2017-06-16 22:38:26 +02:00
Yamagishi Kazutoshi 888ef58ee1 Upgrade react-immutable-pure-component to version 1.0.0 (#3786) 2017-06-16 01:46:12 +02:00
Yamagishi Kazutoshi dd7fb41dbb Add alt attribute to ImageLoader (#3765) 2017-06-15 14:10:41 +02:00
ThibG dd67b9e049 Fix #3633 by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService (#3642) 2017-06-15 11:04:23 +02:00
Eugen Rochko 1f042e5b43 Bump version to 1.4.3 2017-06-15 03:03:42 +02:00
m4sk1n a15a1827ab updated Polish translation (#3751) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2017-06-15 02:00:23 +02:00
Eugen Rochko 7181178007 Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752) 2017-06-15 02:00:08 +02:00
Eugen Rochko 86211d3ca6 Fix regression from #3748 - properly set defaultColumns (#3750) 2017-06-14 23:07:06 +02:00
unarist 54addd93c5 Add Japanese translation for Account deletion (#3747) 2017-06-14 22:00:08 +02:00
unarist 167ba4c5f7 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.
 2017-06-14 21:59:52 +02:00
Eugen Rochko c883e96d95 Fix account delete form not accepting password, update suspended (#3745) 
account before removing content for quicker feedback to end-users
 2017-06-14 20:30:12 +02:00
m4sk1n cc22f75a94 i18n: updated Polish translation (#3744) 2017-06-14 20:08:00 +02:00
Eugen Rochko afefb364cb Save settings when they are changed (#3743) 2017-06-14 18:59:02 +02:00