tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,422 Commits 10 Branches 0 Tags
67adbcc60cee7915f8e59256a0eaf6d42a03a559
Commit Graph
3422 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gô Shoemake 67adbcc60c Reblog support for collapsed toots 2017-06-23 18:23:26 -07:00
beatrix-bitrot 453b9c6e7e missing punctuation 2017-06-23 22:01:04 +00:00
beatrix d9b9bb8c5e glitch the getting started image 2017-06-23 21:50:45 +00:00
kibigo!andbeatrix-bitrot 40ecbfd4a9 Very minor styling improvements to toot-collapsing 2017-06-23 21:50:45 +00:00
kibigo!andbeatrix-bitrot 4fe45dda9a Updates height upon collapsing 2017-06-23 21:50:45 +00:00
kibigo!andbeatrix-bitrot 4bd7482a7a Minor collapsing button improvements~ 2017-06-23 21:50:45 +00:00
kibigo!andbeatrix-bitrot 93c52301ad Collapsable toots [1/??] ☕️ 2017-06-23 21:50:45 +00:00
kibigo!andbeatrix-bitrot 0d3ec19e89 ✨ Profile Metadata HACK 😈 2017-06-23 21:45:14 +00:00
Go Shoemakeandbeatrix-bitrot 62a75891ab Fixes drawer so stuff doesn't overflow 2017-06-23 21:45:14 +00:00
Charlotte Fieldsandbeatrix-bitrot b27842dc70 cybre cleanup 2017-06-23 21:45:14 +00:00
Chronisterandbeatrix-bitrot 39b6b37b74 cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
Chronisterandbeatrix-bitrot 65528fc54e All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
Charlotte Fieldsandbeatrix-bitrot 382572c213 adding cybre changes 2017-06-23 21:45:14 +00:00
beatrix-bitrot 9bc593d675 update local modifications for cors and cp 2017-06-23 21:45:14 +00:00
beatrix-bitrot 09f7ad3614 silly readme update to test automated deploys 2017-06-23 21:45:14 +00:00
beatrix-bitrot 7c2ea42cd5 update README.md 2017-06-23 21:45:14 +00:00
beatrixandbeatrix-bitrot ea785d0baf Update README.md 2017-06-23 21:45:14 +00:00
Beatrix Bitrotandbeatrix-bitrot a337c5dbe5 CORS tweaks 2017-06-23 21:45:14 +00:00
Daniel HunsakerandEugen Rochko c0979381a4 Fix a typo and give CW'd statuses the right cursor (#3918) 2017-06-23 23:13:27 +02:00
Eugen RochkoandGitHub 676f577e7e Fix webpack-dev-server until it's fixed upstream (#3916) 2017-06-23 19:40:51 +02:00
Yamagishi KazutoshiandEugen Rochko c1a8e3d1eb Use Class and Property Decorators (#3730) 
ref https://tc39.github.io/proposal-decorators/
 2017-06-23 19:36:54 +02:00
Takuya YoshidaandEugen Rochko 0c44316b22 Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" (#3913) 
* Fix errorMiddleware

* Add "eslint-disable-line no-unused-vars"
 2017-06-23 19:22:02 +02:00
Sorin DavidoiandEugen Rochko 2211e8d1cd Revocable sessions (#3616) 
* feat: Revocable sessions

* fix: Tests using sign_in

* feat: Configuration entry for the maximum number of session activations
 2017-06-23 18:50:53 +02:00
Nolan LawsonandEugen Rochko 3783cadf2d Apply babel to react-intl to remove prop-types (#3914) 2017-06-23 18:21:33 +02:00
Eugen Rochko a071047c13 Merge branch 'sorin-davidoi-swipe-gestures' 2017-06-23 17:52:56 +02:00
Eugen Rochko 281f07244b Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures 2017-06-23 17:52:39 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)andEugen Rochko 6f34a6a77f Add index statuses on account_id and id (#3895) 2017-06-23 17:46:00 +02:00
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
Sorin Davidoi d8c4781377 fix: Apply :hover, :focus and :active only when multiple columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi bc6e958229 feat: Swipeable media 2017-06-23 13:48:46 +02:00
Sorin Davidoi a6d8d1036a feat: Swipeable columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi 3d403a013d chore(yarn): Install react-swipeable 2017-06-23 13:40:58 +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