about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-06-23Bump version to 1.4.6Eugen Rochko
2017-06-23Add important test for full-width hashtags (#3911)Eugen Rochko
2017-06-23Remove unused variables (#3906)Yamagishi Kazutoshi
2017-06-23Add prefix to setting toggle ID (#3907)Yamagishi Kazutoshi
2017-06-22Update Russian translation (#3902)Ratmir Karabut
* 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-22Use the stable RVM installer (#3901)nightpool
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-22fixed vagrantfile (#3897)Charlotte Fields
2017-06-22Some minor change and spec for Account (#3813)Akihiko Odaki (@fn_aki@pawoo.net)
* 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-22Update of doorkeeper.oc.yml (#3896)Quent-in
Just some adjustements
2017-06-22Fix travis buildsEugen Rochko
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
2017-06-22Fix regression from #3842 (#3892)Eugen Rochko
* 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-21Don't attach IntersectionObserver for wrapped statuses (#3883)unarist
(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-21Revert #3851 (#3878)Eugen Rochko
2017-06-21Revert "Don't attach IntersectionObserver for wrapped statuses" (#3877)Eugen Rochko
* Revert "Bump version to 1.4.4" This reverts commit 1585b0c6cce6cebda3fdc8ba944aa2247e76d1be. * Revert "Fix conversations (fixes #3869) (#3870)" This reverts commit 15b43f555dcb06742c677d84c25d05774ef1bde2. * Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)" This reverts commit d8ec83280637e53ded67d4938a198cbeb9e8db05. * Revert "Filter direct statuses in Status.as_home_timeline (#3842)" This reverts commit bab5a18232a163b0c3c6a245f7f95d50d7022b36. * Revert "Fix RemoteFollow behavior (#3868)" This reverts commit a20cf3b64e93d764f1dfe88ecdb39f3fd4eefe03. * Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)" This reverts commit 356df7ae6b6edfc600fbc532f32fbc46314e00a0. * Revert "Upgrade React Router (#3677)" This reverts commit 8f03fdce7fa16fcaa829a40f395cefc85eb957d5. * Revert "Do not call setState from unmounted component (#3853)" This reverts commit 1fc6cb499742c1a872ad717a689c58a80aeb714d. * Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)" This reverts commit eb832e88f44d661a504a091defc051e052eb1252. * Revert "Fix RTL detection on Ruby side (#3867)" This reverts commit b16b69350eb4ded2e1011931433b51dac5e34b53. * Revert "i18n: Fixed typo in Polish translation (#3864)" This reverts commit da6fa029f66d50f38f2b6c85687994793f7766aa. * Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)" This reverts commit 94ad0706f514e25c58c0a8f3201f96c1d1ccbbd8.
2017-06-20Bump version to 1.4.4Eugen Rochko
2017-06-20Fix conversations (fixes #3869) (#3870)ThibG
* Actually create conversations given explicit URIs * Try to get the parent toot in before validation, to avoid creating a new conversation
2017-06-20Fix streaming server. Redis connection subscribe for each channel. (#3828)猫吸血鬼ディフリス / 猫ロキP
2017-06-20Filter direct statuses in Status.as_home_timeline (#3842)Akihiko Odaki (@fn_aki@pawoo.net)
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-20Fix RemoteFollow behavior (#3868)unarist
* Invalid acct is an error. not "2 errors". * Empty input should be different error from invalid acct
2017-06-20Update fabricator for MediaAttachment to attach a file according to type (#3862)Akihiko Odaki (@fn_aki@pawoo.net)
This fixes a random spec failures since commit d55f207274648369cba30ff001aa3e354fa30dca.
2017-06-20Upgrade React Router (#3677)Sorin Davidoi
* 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-20Do not call setState from unmounted component (#3853)alpaca-tc
Stop an executing task if the component already unmounted.
2017-06-20Replace TextIconButton for SensitiveButton to IconButton (#3759)Yamagishi Kazutoshi
* Replace TextIconButton for SensitiveButton to IconButton * line-height
2017-06-20Fix RTL detection on Ruby side (#3867)unarist
This fixes below bugs: * pipe characters being counted as RTL character * only first word being checked
2017-06-20i18n: Fixed typo in Polish translation (#3864)m4sk1n
2017-06-20Don't attach IntersectionObserver for wrapped statuses (#3863)unarist
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-20Clicking on the CW text should expand the status (#3855)unarist
2017-06-19Set cursor:pointer only when necessary (#3857)unarist
2017-06-19Add Japanese translation "Action taken by" (#3850)のら
2017-06-19setting-for-account-deletable (#3852)masarakki
2017-06-19Re-add disableHostCheck (regression #3729) (#3854)Yamagishi Kazutoshi
ref #2790
2017-06-19Link to /about from public page on a single user instance (#3814)Daigo 3 Dango
There was no link for visitors to follow to see the about page.
2017-06-19Cover Block more (#3837)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-19Cover DomainBlock more (#3838)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-19Fix character/grapheme count stuff (#3839)Gô Shoemake
* Bring Toot button in line with counter Both should use stringz I guess * Use grapheme_length for character count
2017-06-19Cover Export more (#3840)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-19Unobserve status on unmount (#3851)alpaca-tc
2017-06-19Added new Catalan strings (#3843)spla
* 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-19Fixes streaming callbacks of HashtagTimeline (#3849)alpaca-tc
2017-06-19Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)Eugen Rochko
Rename Activitypub to ActivityPub
2017-06-19Debounce autosuggestions (#3836)Eugen Rochko
* Debounce autosuggestions * Remove duplicate import
2017-06-19Cover Favourite more (#3841)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-18Spec AccountDomainBlock (#3816)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-18Fix jittery scrolling for Chromium browsers (#3776) (#3832)Nolan Lawson
2017-06-18handle resize in a debounce() (#3834)Nolan Lawson
2017-06-18Upgrade Webpacker to version 2.0 (#3729)Yamagishi Kazutoshi
2017-06-17Whitelist allowed classes for federated statuses (#3810)nightpool
* 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-17l10n update for account deletion (#3820)Quent-in
* l10n update for acount deletion * l10n little change * l10n little changes Less passive voice, more natural. * Update oc.yml Correction, " added
2017-06-17Spec UserMailer (#3757)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-17Use cross-env for npm run on Windows (#3789)unarist
generated by cgit-pink (git 2.37.1) at 2024-11-29 19:50:34 +0000