tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,391 Commits 10 Branches 0 Tags
e078919f07c3542f8cc6aedc3c554404f328e907
Commit Graph
3391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nolan LawsonandEugen Rochko e078919f07 Upgrade to Webpack 3 with module concatenation (#3912) 2017-06-23 17:44:55 +02:00
Eugen RochkoandGitHub 7b13e6efc2 Bump version to 1.4.6 2017-06-23 17:02:14 +02:00
Eugen RochkoandGitHub 3f59238207 Add important test for full-width hashtags (#3911) 2017-06-23 17:01:53 +02:00
Yamagishi KazutoshiandEugen Rochko eff9416469 Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
Yamagishi KazutoshiandEugen Rochko 6fbb3841a6 Add prefix to setting toggle ID (#3907) 2017-06-23 13:55:05 +02:00
Ratmir KarabutandEugen Rochko 9ca02a00a6 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
 2017-06-22 23:28:58 +02:00
nightpoolandEugen Rochko 3e8e9c8ae4 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.
 2017-06-22 23:28:52 +02:00
Charlotte FieldsandEugen Rochko 7bc1805827 fixed vagrantfile (#3897) 2017-06-22 18:35:27 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko e27f792c24 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
 2017-06-22 18:34:27 +02:00
Quent-inandEugen Rochko 98fab24bea Update of doorkeeper.oc.yml (#3896) 
Just some adjustements
 2017-06-22 13:39:13 +02:00
Eugen RochkoandGitHub f566c47dda Fix travis builds 
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
 2017-06-22 13:24:00 +02:00
Eugen RochkoandGitHub 0190aac240 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
 2017-06-22 02:38:50 +02:00
unaristandEugen Rochko cc382c5006 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.
 2017-06-21 06:47:36 +02:00
Eugen RochkoandGitHub 946a166791 Revert #3851 (#3878) 2017-06-21 01:37:15 +02:00
Eugen RochkoandGitHub 31cd649041 Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877) 
* Revert "Bump version to 1.4.4"

This reverts commit 1585b0c6cc.

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

This reverts commit 15b43f555d.

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

This reverts commit d8ec832806.

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

This reverts commit bab5a18232.

* Revert "Fix RemoteFollow behavior (#3868)"

This reverts commit a20cf3b64e.

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

This reverts commit 356df7ae6b.

* Revert "Upgrade React Router (#3677)"

This reverts commit 8f03fdce7f.

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

This reverts commit 1fc6cb4997.

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

This reverts commit eb832e88f4.

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

This reverts commit b16b69350e.

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

This reverts commit da6fa029f6.

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

This reverts commit 94ad0706f5.
 2017-06-21 01:33:14 +02:00
Eugen RochkoandGitHub 1585b0c6cc Bump version to 1.4.4 2017-06-20 21:32:37 +02:00
ThibGandEugen Rochko 15b43f555d 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
猫吸血鬼ディフリス / 猫ロキPandEugen Rochko d8ec832806 Fix streaming server. Redis connection subscribe for each channel. (#3828) 2017-06-20 20:41:41 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko bab5a18232 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
unaristandEugen Rochko a20cf3b64e 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)andEugen Rochko 356df7ae6b Update fabricator for MediaAttachment to attach a file according to type (#3862) 
This fixes a random spec failures since commit
d55f207274.
 2017-06-20 20:40:45 +02:00
Sorin DavidoiandEugen Rochko 8f03fdce7f 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-tcandEugen Rochko 1fc6cb4997 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 KazutoshiandEugen Rochko eb832e88f4 Replace TextIconButton for SensitiveButton to IconButton (#3759) 
* Replace TextIconButton for SensitiveButton to IconButton

* line-height
 2017-06-20 19:43:09 +02:00
unaristandEugen Rochko b16b69350e 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
m4sk1nandEugen Rochko da6fa029f6 i18n: Fixed typo in Polish translation (#3864) 2017-06-20 18:34:27 +02:00
unaristandEugen Rochko 94ad0706f5 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
unaristandEugen Rochko bf8c2c4348 Clicking on the CW text should expand the status (#3855) 2017-06-20 01:34:10 +02:00
unaristandEugen Rochko aa58cca040 Set cursor:pointer only when necessary (#3857) 2017-06-19 18:27:07 +02:00
のらandEugen Rochko 5cc7cd8518 Add Japanese translation "Action taken by" (#3850) 2017-06-19 15:12:41 +02:00
masarakkiandEugen Rochko ff142eb64d setting-for-account-deletable (#3852) 2017-06-19 15:12:31 +02:00
Yamagishi KazutoshiandEugen Rochko 500e28442f Re-add disableHostCheck (regression #3729) (#3854) 
ref #2790
 2017-06-19 14:01:31 +02:00
Daigo 3 DangoandEugen Rochko 5bd3715a4c 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)andEugen Rochko 3d13f6ea0c Cover Block more (#3837) 2017-06-19 11:31:37 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko 6eefccdacc Cover DomainBlock more (#3838) 2017-06-19 11:31:27 +02:00
Gô ShoemakeandEugen Rochko 29a22691d2 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)andEugen Rochko d55f207274 Cover Export more (#3840) 2017-06-19 11:30:27 +02:00
alpaca-tcandEugen Rochko cf6fe4f8cb Unobserve status on unmount (#3851) 2017-06-19 11:29:57 +02:00
splaandEugen Rochko 4367443287 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-tcandEugen Rochko 8d2b3ada80 Fixes streaming callbacks of HashtagTimeline (#3849) 2017-06-19 10:28:35 +02:00
Eugen RochkoandGitHub f3be605286 Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847) 
Rename Activitypub to ActivityPub
 2017-06-19 01:51:04 +02:00
Eugen RochkoandGitHub aebebdc5d1 Debounce autosuggestions (#3836) 
* Debounce autosuggestions

* Remove duplicate import
 2017-06-19 01:50:56 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko 05e4728de7 Cover Favourite more (#3841) 2017-06-19 01:38:50 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko b51945f096 Spec AccountDomainBlock (#3816) 2017-06-18 02:59:49 +02:00
Nolan LawsonandEugen Rochko 1f2abd8d67 Fix jittery scrolling for Chromium browsers (#3776) (#3832) 2017-06-18 02:59:29 +02:00
Nolan LawsonandEugen Rochko 1d9f9352a6 handle resize in a debounce() (#3834) 2017-06-18 02:57:41 +02:00
Yamagishi KazutoshiandEugen Rochko 53e42bf91e Upgrade Webpacker to version 2.0 (#3729) 2017-06-18 02:57:09 +02:00
nightpoolandEugen Rochko 94d0e012de 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-inandEugen Rochko 8fd931dc12 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)andEugen Rochko 74d10b9b9d Spec UserMailer (#3757) 2017-06-17 01:15:00 +02:00