mastodon

Commit Graph

Author	SHA1	Message	Date
Takuya Yoshida	0c44316b22	Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" (#3913 ) * Fix errorMiddleware * Add "eslint-disable-line no-unused-vars"	8 years ago
Sorin Davidoi	2211e8d1cd	Revocable sessions (#3616 ) * feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations	8 years ago
Nolan Lawson	3783cadf2d	Apply babel to react-intl to remove prop-types (#3914 )	8 years ago
Eugen Rochko	a071047c13	Merge branch 'sorin-davidoi-swipe-gestures'	8 years ago
Eugen Rochko	281f07244b	Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	6f34a6a77f	Add index statuses on account_id and id (#3895 )	8 years ago
Nolan Lawson	e078919f07	Upgrade to Webpack 3 with module concatenation (#3912 )	8 years ago
Eugen Rochko	7b13e6efc2	Bump version to 1.4.6	8 years ago
Eugen Rochko	3f59238207	Add important test for full-width hashtags (#3911 )	8 years ago
Yamagishi Kazutoshi	eff9416469	Remove unused variables (#3906 )	8 years ago
Yamagishi Kazutoshi	6fbb3841a6	Add prefix to setting toggle ID (#3907 )	8 years ago
Sorin Davidoi	d8c4781377	fix: Apply :hover, :focus and :active only when multiple columns	8 years ago
Sorin Davidoi	bc6e958229	feat: Swipeable media	8 years ago
Sorin Davidoi	a6d8d1036a	feat: Swipeable columns	8 years ago
Sorin Davidoi	3d403a013d	chore(yarn): Install react-swipeable	8 years ago
Ratmir Karabut	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	8 years ago
nightpool	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.	8 years ago
Charlotte Fields	7bc1805827	fixed vagrantfile (#3897 )	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	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	8 years ago
Quent-in	98fab24bea	Update of doorkeeper.oc.yml (#3896 ) Just some adjustements	8 years ago
Eugen Rochko	f566c47dda	Fix travis builds https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597	8 years ago
Eugen Rochko	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	8 years ago
unarist	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.	8 years ago
Eugen Rochko	946a166791	Revert #3851 (#3878 )	8 years ago
Eugen Rochko	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`.	8 years ago
Eugen Rochko	1585b0c6cc	Bump version to 1.4.4	8 years ago
ThibG	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	8 years ago
猫吸血鬼ディフリス / 猫ロキP	d8ec832806	Fix streaming server. Redis connection subscribe for each channel. (#3828 )	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	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.	8 years ago
unarist	a20cf3b64e	Fix RemoteFollow behavior (#3868 ) * Invalid acct is an error. not "2 errors". * Empty input should be different error from invalid acct	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	356df7ae6b	Update fabricator for MediaAttachment to attach a file according to type (#3862 ) This fixes a random spec failures since commit `d55f207274`.	8 years ago
Sorin Davidoi	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	8 years ago
alpaca-tc	1fc6cb4997	Do not call setState from unmounted component (#3853 ) Stop an executing task if the component already unmounted.	8 years ago
Yamagishi Kazutoshi	eb832e88f4	Replace TextIconButton for SensitiveButton to IconButton (#3759 ) * Replace TextIconButton for SensitiveButton to IconButton * line-height	8 years ago
unarist	b16b69350e	Fix RTL detection on Ruby side (#3867 ) This fixes below bugs: * pipe characters being counted as RTL character * only first word being checked	8 years ago
m4sk1n	da6fa029f6	i18n: Fixed typo in Polish translation (#3864 )	8 years ago
unarist	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.	8 years ago
unarist	bf8c2c4348	Clicking on the CW text should expand the status (#3855 )	8 years ago
unarist	aa58cca040	Set cursor:pointer only when necessary (#3857 )	8 years ago
のら	5cc7cd8518	Add Japanese translation "Action taken by" (#3850 )	8 years ago
masarakki	ff142eb64d	setting-for-account-deletable (#3852 )	8 years ago
Yamagishi Kazutoshi	500e28442f	Re-add disableHostCheck (regression #3729 ) (#3854 ) ref #2790	8 years ago
Daigo 3 Dango	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.	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	3d13f6ea0c	Cover Block more (#3837 )	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	6eefccdacc	Cover DomainBlock more (#3838 )	8 years ago
Gô Shoemake	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	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	d55f207274	Cover Export more (#3840 )	8 years ago
alpaca-tc	cf6fe4f8cb	Unobserve status on unmount (#3851 )	8 years ago
spla	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	8 years ago
alpaca-tc	8d2b3ada80	Fixes streaming callbacks of HashtagTimeline (#3849 )	8 years ago

1 2 3 4 5 ...

3401 Commits (0c44316b22c3711ad5369dae2f66f0fd5c79799e) All Branches Search

3401 Commits (0c44316b22c3711ad5369dae2f66f0fd5c79799e)

All Branches