Commit graph

1818 commits

Author SHA1 Message Date
rinpatch
62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
AccountView: Add user background.

See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
Alexander Strizhakov
c2ca1f22a2 it is changed in compile time
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
lain
7f48b90bfb Merge branch 'fix/hashtag-rich-media' into 'develop'
Fix hashtags being picked up by rich media parser

Closes #989

See merge request pleroma/pleroma!1288
2019-06-14 11:52:04 +00:00
Maksim
ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) 2019-06-14 11:39:57 +00:00
rinpatch
d0ebc0edf3 Fix hashtags being picked up by rich media parser
Closes #989
2019-06-14 14:34:42 +03:00
lain
eac298083f MastodonAPI: Add a way to update the background image. 2019-06-14 11:19:22 +02:00
lain
5965efb216 AccountView: Add user background. 2019-06-13 19:08:05 +02:00
lain
6f5a0cc14e Merge branch 'fix/ogp-title' into 'develop'
Rich Media Parser: Attempt to use <title> from HTML as a fallback

Closes #979

See merge request pleroma/pleroma!1277
2019-06-13 13:26:39 +00:00
Egor Kislitsyn
30e54fd7e2 Handle HTTP 404 response 2019-06-13 17:13:35 +07:00
Egor Kislitsyn
afae3ada22 Handle HTTP "410 Gone" response 2019-06-13 16:34:03 +07:00
Egor Kislitsyn
a12f8e13c8 Improve <title> fallback; Add a test 2019-06-13 15:02:46 +07:00
Egor Kislitsyn
6f29865d43 Add option to restrict all users to local content 2019-06-11 21:25:53 +07:00
lain
63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn
ad04d12de6 Replace MastodonAPIController.account_register/2 rate limiter 2019-06-11 16:06:03 +07:00
Egor Kislitsyn
2e5affce61 Add RateLimiter 2019-06-11 14:27:41 +07:00
kaniini
f2d72b1fe4 Merge branch 'preload-changes' into 'develop'
Conversations: Fetch users in one query.

See merge request pleroma/pleroma!1258
2019-06-11 02:37:08 +00:00
Sergey Suprunenko
365268d522 Add more tests for using media_proxy and whitelists 2019-06-10 11:34:11 +00:00
rinpatch
dffc9f060a replace missing mock with a 404 2019-06-07 20:48:25 +03:00
rinpatch
d020f68e87 Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched 2019-06-07 20:40:38 +03:00
lain
970f71e222 Conversations: Fetch users in one query. 2019-06-07 17:51:47 +02:00
lain
cb2bcee842 User Search: Boost friends more strongly. 2019-06-06 16:18:27 +02:00
lain
7e9f7ea0c2 MastodonAPI: Add test for user search. 2019-06-06 16:16:22 +02:00
Egor
f82382de22 [#943] Make the unauthenticated users limitation optional 2019-06-06 12:17:49 +00:00
kaniini
3f6da9c45a Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request

Closes #377

See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
kaniini
a511d2f900 Merge branch 'improve-search' into 'develop'
[#943] Contain search for unauthenticated users

See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
lain
ad19bfc7fe Utils: Split update_follow_state and update_follow_state_for_all. 2019-06-05 16:43:35 +02:00
lain
827a51e777 CommonAPI: Add test for accept_follow_request. 2019-06-05 15:45:16 +02:00
lain
076c9ae40e User: Remove superfluous maybe_follow. 2019-06-05 14:24:31 +02:00
lain
3115b64cfe Transmogrifier: Add tests for incoming follows to locked accounts. 2019-06-05 14:10:46 +02:00
lain
024dfdc39c Typo + Linting. 2019-06-05 12:45:28 +02:00
lain
8b9a0dd4a7 User: Don't error out when following a user that's already followed.
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
Egor Kislitsyn
5b04f07a1e Limit search for unauthenticated users to local users only 2019-06-05 16:51:04 +07:00
Egor Kislitsyn
17a6f81f7b Fix tests with enabled RUM 2019-06-05 16:37:43 +07:00
Egor Kislitsyn
93397fce3d Contain search for unauthenticated users 2019-06-05 16:37:43 +07:00
kaniini
e4babb1c9f Merge branch 'explicit-addressing' into 'develop'
Explicit addressing

See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
Haelwenn
ab4915edcb Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
Participations: Filter out participations without activities.

Closes #956 and #953

See merge request pleroma/pleroma!1246
2019-06-04 15:34:55 +00:00
Maksim Pechnikov
d3d1704e84 Merge branch 'develop' into issue/941 2019-06-04 15:06:58 +03:00
lain
a3a7178b60 Participations: Filter out participations without activities. 2019-06-04 13:58:36 +02:00
rinpatch
bbff7554de Add tests for get_existing_votes 2019-06-04 13:47:53 +03:00
lain
4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing 2019-06-04 11:23:46 +02:00
Maksim Pechnikov
4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini
9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy

See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
Sergey Suprunenko
84cc131b59 Add missing HTTP Request mocks 2019-06-04 05:46:19 +00:00
kaniini
9d2563a3de Merge branch 'generic-fe-settings' into 'develop'
Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
Maksim Pechnikov
64ada7f960 fix tests 2019-06-03 22:51:14 +03:00
Maksim Pechnikov
f13d6c7f78 update api to set skip_thread_containment 2019-06-03 21:02:57 +03:00
lain
804b6a4d8f CommonAPI.Utils: Add tests. 2019-06-03 19:08:38 +02:00
lain
80d4d83aac CommonAPI: Add explicit addressing. 2019-06-03 18:17:08 +02:00
lain
2b664b048e User: Add function to get AP ids from nicknames. 2019-06-03 18:16:11 +02:00
Maksim Pechnikov
080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00