Mark Felder
|
9b908697dd
|
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
and this leftover artifact breaks compiling now.
|
2019-06-15 07:04:01 -05:00 |
|
lain
|
a440cf856d
|
Mastodon API: Return the token needed for the chat.
|
2019-06-15 10:59:35 +02:00 |
|
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 |
|
Egor
|
58a094b605
|
Add copyright info to containment.ex
|
2019-06-14 09:26:36 +00:00 |
|
lain
|
eac298083f
|
MastodonAPI: Add a way to update the background image.
|
2019-06-14 11:19:22 +02:00 |
|
Egor Kislitsyn
|
b22b10d3aa
|
Improve rate limiter documentation
Documents how to disable rate limiting
|
2019-06-14 15:02:10 +07:00 |
|
lain
|
315f090f59
|
Prometheus: Remove flaky process collection NIF.
|
2019-06-13 20:30:04 +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 |
|
Mark Felder
|
7363a0ea8a
|
Revert "Only run Floki if title is missing from the map"
This reverts commit 97d2b1a45a.
|
2019-06-12 18:32:28 -05:00 |
|
Mark Felder
|
97d2b1a45a
|
Only run Floki if title is missing from the map
|
2019-06-12 18:27:35 -05:00 |
|
Mark Felder
|
097fdf6a5d
|
Attempt to use <title> from HTML as a fallback
|
2019-06-12 17:56:51 -05:00 |
|
Ivan Tashkinov
|
4b2c29016c
|
[#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
|
2019-06-12 21:30:06 +03:00 |
|
lain
|
966543379d
|
MastodonAPI Controller: Band-Aid double vote problem.
|
2019-06-12 16:36:23 +02:00 |
|
lain
|
f46c628e6b
|
Merge branch 'update_auto_linker' into 'develop'
Update `auto_linker` dependency
See merge request pleroma/pleroma!1272
|
2019-06-12 09:52:29 +00:00 |
|
Egor Kislitsyn
|
817c66bc3e
|
Remove search result order for non-RUM indexes
|
2019-06-12 16:22:56 +07:00 |
|
Egor Kislitsyn
|
bf22ed5fbd
|
Update auto_linker dependency
|
2019-06-12 15:53:33 +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
|
bc8f059367
|
Add rate limiting for search endpoints
|
2019-06-11 14:28:39 +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 |
|
rinpatch
|
3ecfe2a6d4
|
Merge branch 'develop' into feature/releases
|
2019-06-09 13:55:32 +03:00 |
|
rinpatch
|
2a659b35f1
|
Add migrate/rollback to release tasks
|
2019-06-09 13:33:44 +03:00 |
|
rinpatch
|
d7ec0898e5
|
Make mix tasks work in a release
|
2019-06-08 17:40:40 +03:00 |
|
lain
|
1e0fa899b6
|
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259
|
2019-06-08 10:22:15 +00: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
|
cb3258c863
|
Emoji: Use full path to check if a file is a directory.
|
2019-06-07 17:31:21 +02:00 |
|
rinpatch
|
92213fb87c
|
Replace Mix.env with Pleroma.Config.get(:env)
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
|
2019-06-06 23:59:51 +03:00 |
|
kaniini
|
62cdf701f4
|
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
|
2019-06-06 14:54:29 +00:00 |
|
lain
|
cb2bcee842
|
User Search: Boost friends more strongly.
|
2019-06-06 16:18:27 +02:00 |
|
rinpatch
|
9ae8f012a5
|
Switch to manual Supervisor child specifications instead of Supervisor.Spec
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
|
2019-06-06 16:37:44 +03: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
|
e1370ba131
|
Utils: Use update_follow_state_for_all when appropriate.
|
2019-06-05 16:51:28 +02:00 |
|
lain
|
ad19bfc7fe
|
Utils: Split update_follow_state and update_follow_state_for_all.
|
2019-06-05 16:43:35 +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 |
|
rinpatch
|
50afe5ab9e
|
Merge branch 'fix-stuck-follows' into 'develop'
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
|
2019-06-05 11:07:54 +00: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 |
|
Ivan Tashkinov
|
3eefb274f4
|
OAuth consumer: tests fix, comments, Keycloak config notes.
|
2019-06-05 13:02:13 +03:00 |
|
Egor Kislitsyn
|
1cb245c982
|
Fix formatting
|
2019-06-05 16:55:17 +07:00 |
|
Egor Kislitsyn
|
5b04f07a1e
|
Limit search for unauthenticated users to local users only
|
2019-06-05 16:51:04 +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 |
|
lain
|
18c35d84fd
|
NodeInfo: Add explicit addressing to nodeinfo.
|
2019-06-04 17:14:25 +02:00 |
|
Maksim Pechnikov
|
1e7bb69a95
|
update ActivityPub#fetch_activities_query
|
2019-06-04 15:21:18 +03:00 |
|
Maksim Pechnikov
|
d3d1704e84
|
Merge branch 'develop' into issue/941
|
2019-06-04 15:06:58 +03:00 |
|
Maksim Pechnikov
|
0acfcf6c52
|
update ActivityPub#fetch_activities_query
|
2019-06-04 15:04:36 +03:00 |
|
lain
|
a3a7178b60
|
Participations: Filter out participations without activities.
|
2019-06-04 13:58:36 +02:00 |
|
Haelwenn
|
0eb7464c10
|
Merge branch 'emoji-loader-fix' into 'develop'
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
|
2019-06-04 11:26:42 +00:00 |
|
rinpatch
|
17383861ed
|
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
|
2019-06-04 13:38:32 +03:00 |
|
lain
|
e74581a5c4
|
Emoji: Don't die when files are present in the emoji folder.
|
2019-06-04 12:14:43 +02:00 |
|
rinpatch
|
29b022bb59
|
Restrict get_existing_votes to only get Create activities
|
2019-06-04 12:42:10 +03:00 |
|
lain
|
4cab98b7bf
|
Merge remote-tracking branch 'origin/develop' into explicit-addressing
|
2019-06-04 11:23:46 +02:00 |
|
William Pitcock
|
37a4ba0624
|
utils: access inReplyTo as an explicit string when fetching poll results`
|
2019-06-04 08:45:03 +00:00 |
|
Maksim Pechnikov
|
4f2e359687
|
Merge branch 'develop' into issue/941
|
2019-06-04 09:49:08 +03:00 |
|
William Pitcock
|
1c6cf0a348
|
nodeinfo: add pollLimits to metadata
|
2019-06-04 06:19:44 +00: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 |
|
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
|
f13d6c7f78
|
update api to set skip_thread_containment
|
2019-06-03 21:02:57 +03:00 |
|
eugenijm
|
f2c4c99e03
|
Remove repeated scope lists
|
2019-06-03 19:18:21 +03: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 |
|
eugenijm
|
243d8ed94e
|
Use workaround for the heavy checkmark symbol in iOS
|
2019-06-03 18:28:36 +03:00 |
|
Mark Felder
|
f4e2595592
|
Merge branch 'develop' into update-oauth-template
|
2019-06-03 09:12:17 -05:00 |
|
Maksim Pechnikov
|
080e1aa70e
|
add option skip_thread_containment
|
2019-06-03 16:13:37 +03:00 |
|
rinpatch
|
dc91bcc0af
|
Merge branch 'develop' into feature/polls-2-electric-boogalo
|
2019-06-03 13:16:17 +03:00 |
|
lambda
|
314758c25b
|
Merge branch 'align-mastodon-conversations' into 'develop'
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
|
2019-06-03 09:48:37 +00:00 |
|
rinpatch
|
026b245dbc
|
Merge branch 'develop' into feature/polls-2-electric-boogalo
|
2019-06-03 11:14:52 +03:00 |
|
rinpatch
|
5bd41fef8b
|
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
|
2019-06-03 10:58:37 +03:00 |
|
rinpatch
|
1fd8e19d76
|
Remove a TODO comment as the tests for poll view were written
|
2019-06-02 23:46:17 +03:00 |
|
rinpatch
|
2fe3a20638
|
Make error message about author's inability to vote more sensible
|
2019-06-02 23:33:15 +03:00 |
|
rinpatch
|
e3c460353d
|
Refresh the object in CommonAPI.vote instead of MastoAPI controller
|
2019-06-02 23:24:48 +03:00 |
|
William Pitcock
|
561a21986d
|
formatting
|
2019-06-02 10:29:15 +00:00 |
|
William Pitcock
|
4087ccdab8
|
mrf: add subchain policy
|
2019-06-02 10:07:42 +00:00 |
|
William Pitcock
|
edf772d41e
|
mrf: allow a policy chain to be specified when filtering
|
2019-06-02 09:44:42 +00:00 |
|
William Pitcock
|
52e09807d4
|
reverse proxy: clean up some @hackney leftovers
|
2019-06-02 09:09:58 +00:00 |
|
kaniini
|
5402d04e3c
|
Merge branch 'feature/notification-control-part-2' into 'develop'
notification controls, part 2
See merge request pleroma/pleroma!1204
|
2019-06-02 08:25:37 +00:00 |
|
rinpatch
|
6bc9e5c020
|
Mastodon API: Refresh the object before rendering it after voting
|
2019-06-01 21:41:49 +03:00 |
|
rinpatch
|
444406167b
|
Mastodon API: actually check for poll votes
|
2019-06-01 21:41:23 +03:00 |
|
rinpatch
|
65db5e9f52
|
Resolve merge conflicts
|
2019-06-01 16:29:58 +03:00 |
|
rinpatch
|
300d94c628
|
Add poll votes
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
|
2019-06-01 16:17:46 +03:00 |
|
kaniini
|
e706b42f51
|
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
|
2019-06-01 03:39:13 +00:00 |
|
Sergey Suprunenko
|
2bbc2a801f
|
Remove all follower collections but actor's from "cc"
|
2019-06-01 03:26:45 +00:00 |
|
William Pitcock
|
f2efe24cf8
|
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
|
2019-06-01 03:24:08 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5d3ece2861
|
Remove now useless flavours switching
|
2019-06-01 01:44:10 +02:00 |
|
Haelwenn (lanodan) Monnier
|
aa9f52edd2
|
mastodon_api_controller.ex: Remove vanilla from supported_flavours
|
2019-06-01 01:44:10 +02:00 |
|