Sorin Davidoi
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 Lawson
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)
6f34a6a77f
Add index statuses on account_id and id ( #3895 )
2017-06-23 17:46:00 +02:00
Nolan Lawson
e078919f07
Upgrade to Webpack 3 with module concatenation ( #3912 )
2017-06-23 17:44:55 +02:00
Eugen Rochko
7b13e6efc2
Bump version to 1.4.6
2017-06-23 17:02:14 +02:00
Eugen Rochko
3f59238207
Add important test for full-width hashtags ( #3911 )
2017-06-23 17:01:53 +02:00
Yamagishi Kazutoshi
eff9416469
Remove unused variables ( #3906 )
2017-06-23 16:05:04 +02:00
Yamagishi Kazutoshi
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 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
2017-06-22 23:28:58 +02:00
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.
2017-06-22 23:28:52 +02:00
Charlotte Fields
7bc1805827
fixed vagrantfile ( #3897 )
2017-06-22 18:35:27 +02:00
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
2017-06-22 18:34:27 +02:00
Quent-in
98fab24bea
Update of doorkeeper.oc.yml ( #3896 )
...
Just some adjustements
2017-06-22 13:39:13 +02:00
Eugen Rochko
f566c47dda
Fix travis builds
...
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
2017-06-22 13:24:00 +02:00
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
2017-06-22 02:38:50 +02:00
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.
2017-06-21 06:47:36 +02:00
Eugen Rochko
946a166791
Revert #3851 ( #3878 )
2017-06-21 01:37:15 +02:00
Eugen Rochko
31cd649041
Revert "Don't attach IntersectionObserver for wrapped statuses" ( #3877 )
...
* Revert "Bump version to 1.4.4"
This reverts commit 1585b0c6ccfixes #3869 ) (#3870 )"
This reverts commit 15b43f555d#3828 )"
This reverts commit d8ec832806#3842 )"
This reverts commit bab5a18232#3868 )"
This reverts commit a20cf3b64e#3862 )"
This reverts commit 356df7ae6b#3677 )"
This reverts commit 8f03fdce7f#3853 )"
This reverts commit 1fc6cb4997#3759 )"
This reverts commit eb832e88f4#3867 )"
This reverts commit b16b69350e#3864 )"
This reverts commit da6fa029f6#3863 )"
This reverts commit 94ad0706f5
2017-06-21 01:33:14 +02:00
Eugen Rochko
1585b0c6cc
Bump version to 1.4.4
2017-06-20 21:32:37 +02:00
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
2017-06-20 20:44:32 +02:00
猫吸血鬼ディフリス / 猫ロキP
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)
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
unarist
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)
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 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
2017-06-20 20:40:03 +02:00
alpaca-tc
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 Kazutoshi
eb832e88f4
Replace TextIconButton for SensitiveButton to IconButton ( #3759 )
...
* Replace TextIconButton for SensitiveButton to IconButton
* line-height
2017-06-20 19:43:09 +02:00
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
2017-06-20 18:45:09 +02:00
m4sk1n
da6fa029f6
i18n: Fixed typo in Polish translation ( #3864 )
2017-06-20 18:34:27 +02:00
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.
2017-06-20 04:12:51 +02:00
unarist
bf8c2c4348
Clicking on the CW text should expand the status ( #3855 )
2017-06-20 01:34:10 +02:00
unarist
aa58cca040
Set cursor:pointer only when necessary ( #3857 )
2017-06-19 18:27:07 +02:00
のら
5cc7cd8518
Add Japanese translation "Action taken by" ( #3850 )
2017-06-19 15:12:41 +02:00
masarakki
ff142eb64d
setting-for-account-deletable ( #3852 )
2017-06-19 15:12:31 +02:00
Yamagishi Kazutoshi
500e28442f
Re-add disableHostCheck (regression #3729 ) ( #3854 )
...
ref #2790
2017-06-19 14:01:31 +02:00
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.
2017-06-19 11:32:28 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
3d13f6ea0c
Cover Block more ( #3837 )
2017-06-19 11:31:37 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
6eefccdacc
Cover DomainBlock more ( #3838 )
2017-06-19 11:31:27 +02:00
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
2017-06-19 11:31:14 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)
d55f207274
Cover Export more ( #3840 )
2017-06-19 11:30:27 +02:00
alpaca-tc
cf6fe4f8cb
Unobserve status on unmount ( #3851 )
2017-06-19 11:29:57 +02:00
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
2017-06-19 10:29:18 +02:00
alpaca-tc
8d2b3ada80
Fixes streaming callbacks of HashtagTimeline ( #3849 )
2017-06-19 10:28:35 +02:00
Eugen Rochko
f3be605286
Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )
...
Rename Activitypub to ActivityPub
2017-06-19 01:51:04 +02:00
