9c246cac5c
Apply babel to react-intl to remove prop-types ( #3914 )
2017-06-23 18:21:33 +02:00
12d1565d23
Merge branch 'sorin-davidoi-swipe-gestures'
2017-06-23 17:52:56 +02:00
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
794afdca8d
Add index statuses on account_id and id ( #3895 )
2017-06-23 17:46:00 +02:00
61634505c1
Upgrade to Webpack 3 with module concatenation ( #3912 )
2017-06-23 17:44:55 +02:00
81a2d672a7
Bump version to 1.4.6
2017-06-23 17:02:14 +02:00
8fb81e1372
Add important test for full-width hashtags ( #3911 )
2017-06-23 17:01:53 +02:00
539dbaa049
Remove unused variables ( #3906 )
2017-06-23 16:05:04 +02:00
bc21ffd237
Add prefix to setting toggle ID ( #3907 )
2017-06-23 13:55:05 +02:00
9366672d53
fix: Apply :hover, :focus and :active only when multiple columns
2017-06-23 13:48:46 +02:00
501a3cf944
feat: Swipeable media
2017-06-23 13:48:46 +02:00
598bb06687
feat: Swipeable columns
2017-06-23 13:48:46 +02:00
ae78ac379b
chore(yarn): Install react-swipeable
2017-06-23 13:40:58 +02:00
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
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
0468e7ccb7
fixed vagrantfile ( #3897 )
2017-06-22 18:35:27 +02:00
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
b0debe35d6
Update of doorkeeper.oc.yml ( #3896 )
...
Just some adjustements
2017-06-22 13:39:13 +02:00
1668881b80
Fix travis builds
...
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
2017-06-22 13:24:00 +02:00
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
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
65b46159ec
Revert #3851 ( #3878 )
2017-06-21 01:37:15 +02:00
cbc0fea992
Revert "Don't attach IntersectionObserver for wrapped statuses" ( #3877 )
...
* Revert "Bump version to 1.4.4"
This reverts commit bd6bee29defixes #3869 ) (#3870 )"
This reverts commit ee7952c349#3828 )"
This reverts commit 8f202bc639#3842 )"
This reverts commit 77dcf442e7#3868 )"
This reverts commit 1d2eba7a84#3862 )"
This reverts commit baa248a801#3677 )"
This reverts commit 9bc32eb267#3853 )"
This reverts commit 59849b392d#3759 )"
This reverts commit 47dceaded6#3867 )"
This reverts commit 55376105f5#3864 )"
This reverts commit 3c355ed26b#3863 )"
This reverts commit 79c04b0a2c
2017-06-21 01:33:14 +02:00
bd6bee29de
Bump version to 1.4.4
2017-06-20 21:32:37 +02:00
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
8f202bc639
Fix streaming server. Redis connection subscribe for each channel. ( #3828 )
2017-06-20 20:41:41 +02:00
77dcf442e7
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
1d2eba7a84
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
baa248a801
Update fabricator for MediaAttachment to attach a file according to type ( #3862 )
...
This fixes a random spec failures since commit
c8020b2105
2017-06-20 20:40:45 +02:00
9bc32eb267
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
59849b392d
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
47dceaded6
Replace TextIconButton for SensitiveButton to IconButton ( #3759 )
...
* Replace TextIconButton for SensitiveButton to IconButton
* line-height
2017-06-20 19:43:09 +02:00
55376105f5
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
3c355ed26b
i18n: Fixed typo in Polish translation ( #3864 )
2017-06-20 18:34:27 +02:00
79c04b0a2c
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
9e5c733a66
Clicking on the CW text should expand the status ( #3855 )
2017-06-20 01:34:10 +02:00
8db07d1187
Set cursor:pointer only when necessary ( #3857 )
2017-06-19 18:27:07 +02:00
8b65b64428
Add Japanese translation "Action taken by" ( #3850 )
2017-06-19 15:12:41 +02:00
d947978192
setting-for-account-deletable ( #3852 )
2017-06-19 15:12:31 +02:00
0a2e331bd5
Re-add disableHostCheck (regression #3729 ) ( #3854 )
...
ref #2790
2017-06-19 14:01:31 +02:00
0483235216
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
481f277e58
Cover Block more ( #3837 )
2017-06-19 11:31:37 +02:00
ac1f0e49f0
Cover DomainBlock more ( #3838 )
2017-06-19 11:31:27 +02:00
2d31077bdf
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
c8020b2105
Cover Export more ( #3840 )
2017-06-19 11:30:27 +02:00
36049c0096
Unobserve status on unmount ( #3851 )
2017-06-19 11:29:57 +02:00
7a96f422db
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
fa14f245f8
Fixes streaming callbacks of HashtagTimeline ( #3849 )
2017-06-19 10:28:35 +02:00
8bed91d94c
Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )
...
Rename Activitypub to ActivityPub
2017-06-19 01:51:04 +02:00
4845069692
Debounce autosuggestions ( #3836 )
...
* Debounce autosuggestions
* Remove duplicate import
2017-06-19 01:50:56 +02:00
Nolan Lawson