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

3974 Commits (782f21ca4bb9a9ea8ccf7203fd801cd028f76d54)

Author SHA1 Message Date
kibigo! cd07fb5b27 ESLint improvements for Profile Metadata 2017-06-23 18:43:30 -07:00
Gô Shoemake 26254fc5c4 Reblog support for collapsed toots 2017-06-23 18:23:26 -07:00
unarist 45058b5fde Use debounce for dispatch scrollTopNotification and expandNotifications (#3700) 2017-06-24 02:43:26 +02:00
beatrix-bitrot 5c3d671a72 missing punctuation 2017-06-23 22:01:04 +00:00
beatrix 05b01bbb4c glitch the getting started image 2017-06-23 21:50:45 +00:00
kibigo! be420f4139 Very minor styling improvements to toot-collapsing 2017-06-23 21:50:45 +00:00
kibigo! 32574a7e3c Updates height upon collapsing 2017-06-23 21:50:45 +00:00
kibigo! 58cdc55bd5 Minor collapsing button improvements~ 2017-06-23 21:50:45 +00:00
kibigo! 744917179b Collapsable toots [1/??] ☕️ 2017-06-23 21:50:45 +00:00
kibigo! a36c6a3e54 ✨ Profile Metadata HACK 😈 2017-06-23 21:45:14 +00:00
Go Shoemake b7a2221b17 Fixes drawer so stuff doesn't overflow 2017-06-23 21:45:14 +00:00
Charlotte Fields a7a7613e71 cybre cleanup 2017-06-23 21:45:14 +00:00
Chronister bf32615615 cybrespace to 1.4.2 2017-06-23 21:45:14 +00:00
Chronister 2edadd7fe7 All cybrespace changes through 5/28 2017-06-23 21:45:14 +00:00
Charlotte Fields 23451f1066 adding cybre changes 2017-06-23 21:45:14 +00:00
beatrix-bitrot 4f54d53a84 update local modifications for cors and cp 2017-06-23 21:45:14 +00:00
beatrix-bitrot 8288ed1cfc silly readme update to test automated deploys 2017-06-23 21:45:14 +00:00
beatrix-bitrot 65914d509f update README.md 2017-06-23 21:45:14 +00:00
beatrix 91b9bfbb11 Update README.md 2017-06-23 21:45:14 +00:00
Beatrix Bitrot 6a5afc6fe8 CORS tweaks 2017-06-23 21:45:14 +00:00
Daniel Hunsaker 0c8f23b69f Fix a typo and give CW'd statuses the right cursor (#3918) 2017-06-23 23:13:27 +02:00
Eugen Rochko d7318b6840 Fix webpack-dev-server until it's fixed upstream (#3916) 2017-06-23 19:40:51 +02:00
Yamagishi Kazutoshi e2027fbe42 Use Class and Property Decorators (#3730) 
ref https://tc39.github.io/proposal-decorators/
 2017-06-23 19:36:54 +02:00
Takuya Yoshida e81b5b25aa 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 Davidoi 1280559503 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 Lawson 9c246cac5c Apply babel to react-intl to remove prop-types (#3914) 2017-06-23 18:21:33 +02:00
Eugen Rochko 12d1565d23 Merge branch 'sorin-davidoi-swipe-gestures' 2017-06-23 17:52:56 +02:00
Eugen Rochko 88458a1638 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) 794afdca8d Add index statuses on account_id and id (#3895) 2017-06-23 17:46:00 +02:00
Nolan Lawson 61634505c1 Upgrade to Webpack 3 with module concatenation (#3912) 2017-06-23 17:44:55 +02:00
Eugen Rochko 81a2d672a7 Bump version to 1.4.6 2017-06-23 17:02:14 +02:00
Eugen Rochko 8fb81e1372 Add important test for full-width hashtags (#3911) 2017-06-23 17:01:53 +02:00
Yamagishi Kazutoshi 539dbaa049 Remove unused variables (#3906) 2017-06-23 16:05:04 +02:00
Yamagishi Kazutoshi bc21ffd237 Add prefix to setting toggle ID (#3907) 2017-06-23 13:55:05 +02:00
Sorin Davidoi 9366672d53 fix: Apply :hover, :focus and :active only when multiple columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi 501a3cf944 feat: Swipeable media 2017-06-23 13:48:46 +02:00
Sorin Davidoi 598bb06687 feat: Swipeable columns 2017-06-23 13:48:46 +02:00
Sorin Davidoi ae78ac379b chore(yarn): Install react-swipeable 2017-06-23 13:40:58 +02:00
Ratmir Karabut d9eeb1340d 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
nightpool fd4276a6be 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 Fields 0468e7ccb7 fixed vagrantfile (#3897) 2017-06-22 18:35:27 +02:00
Akihiko Odaki (@fn_aki@pawoo.net) 561ca10d86 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-in b0debe35d6 Update of doorkeeper.oc.yml (#3896) 
Just some adjustements
 2017-06-22 13:39:13 +02:00
Eugen Rochko 1668881b80 Fix travis builds 
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
 2017-06-22 13:24:00 +02:00
Eugen Rochko e7810e4031 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
unarist 66e14b3d3a 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 Rochko 65b46159ec Revert #3851 (#3878) 2017-06-21 01:37:15 +02:00
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