lain
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
5 years ago
kaniini
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
5 years ago
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.
5 years ago
lain
a440cf856d
Mastodon API: Return the token needed for the chat.
5 years ago
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
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
5 years ago
Maksim
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
rinpatch
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
5 years ago
Egor
58a094b605
Add copyright info to containment.ex
5 years ago
lain
eac298083f
MastodonAPI: Add a way to update the background image.
5 years ago
Egor Kislitsyn
b22b10d3aa
Improve rate limiter documentation
...
Documents how to disable rate limiting
5 years ago
lain
315f090f59
Prometheus: Remove flaky process collection NIF.
5 years ago
lain
5965efb216
AccountView: Add user background.
5 years ago
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
5 years ago
Egor Kislitsyn
30e54fd7e2
Handle HTTP 404 response
5 years ago
Egor Kislitsyn
afae3ada22
Handle HTTP "410 Gone" response
5 years ago
Egor Kislitsyn
a12f8e13c8
Improve <title> fallback; Add a test
5 years ago
Mark Felder
7363a0ea8a
Revert "Only run Floki if title is missing from the map"
...
This reverts commit 97d2b1a45a
.
5 years ago
Mark Felder
97d2b1a45a
Only run Floki if title is missing from the map
5 years ago
Mark Felder
097fdf6a5d
Attempt to use <title> from HTML as a fallback
5 years ago
Ivan Tashkinov
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
lain
966543379d
MastodonAPI Controller: Band-Aid double vote problem.
5 years ago
lain
f46c628e6b
Merge branch 'update_auto_linker' into 'develop'
...
Update `auto_linker` dependency
See merge request pleroma/pleroma!1272
5 years ago
Egor Kislitsyn
817c66bc3e
Remove search result order for non-RUM indexes
5 years ago
Egor Kislitsyn
bf22ed5fbd
Update `auto_linker` dependency
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
Egor Kislitsyn
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn
bc8f059367
Add rate limiting for search endpoints
5 years ago
Egor Kislitsyn
2e5affce61
Add RateLimiter
5 years ago
kaniini
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
5 years ago
rinpatch
3ecfe2a6d4
Merge branch 'develop' into feature/releases
5 years ago
rinpatch
2a659b35f1
Add migrate/rollback to release tasks
5 years ago
rinpatch
7223c1b643
Use Mix.shell().yes? if available
5 years ago
rinpatch
d7ec0898e5
Make mix tasks work in a release
5 years ago
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
5 years ago
rinpatch
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
lain
970f71e222
Conversations: Fetch users in one query.
5 years ago
lain
cb3258c863
Emoji: Use full path to check if a file is a directory.
5 years ago
kaniini
d5330ed125
Merge branch 'fix/replace-mix-env' into 'develop'
...
Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254
5 years ago
rinpatch
bc597d888c
Mix Tasks: Switch to Application.ensure_all_started instead of
...
Mix.Task.run and ensure serve_endpoints is set to false
In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task.
5 years ago
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.
5 years ago
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
5 years ago
lain
cb2bcee842
User Search: Boost friends more strongly.
5 years ago
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
5 years ago
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
kaniini
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
5 years ago
kaniini
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
5 years ago
lain
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
5 years ago
lain
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
lain
076c9ae40e
User: Remove superfluous `maybe_follow`.
5 years ago
lain
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
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
5 years ago
lain
024dfdc39c
Typo + Linting.
5 years ago
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.
5 years ago
Ivan Tashkinov
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
5 years ago
Egor Kislitsyn
1cb245c982
Fix formatting
5 years ago
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
5 years ago
Egor Kislitsyn
94b9e9d844
Update benchmark mix task
5 years ago
Egor Kislitsyn
93397fce3d
Contain search for unauthenticated users
5 years ago
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
5 years ago
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
5 years ago
lain
18c35d84fd
NodeInfo: Add explicit addressing to nodeinfo.
5 years ago
Maksim Pechnikov
1e7bb69a95
update ActivityPub#fetch_activities_query
5 years ago
Maksim Pechnikov
d3d1704e84
Merge branch 'develop' into issue/941
5 years ago
Maksim Pechnikov
0acfcf6c52
update ActivityPub#fetch_activities_query
5 years ago
lain
a3a7178b60
Participations: Filter out participations without activities.
5 years ago
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
5 years ago
rinpatch
17383861ed
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
5 years ago
lain
e74581a5c4
Emoji: Don't die when files are present in the emoji folder.
5 years ago
rinpatch
29b022bb59
Restrict `get_existing_votes` to only get Create activities
5 years ago
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
William Pitcock
37a4ba0624
utils: access inReplyTo as an explicit string when fetching poll results`
5 years ago
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
William Pitcock
1c6cf0a348
nodeinfo: add pollLimits to metadata
5 years ago
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
5 years ago
eugenijm
f2c4c99e03
Remove repeated scope lists
5 years ago
lain
80d4d83aac
CommonAPI: Add explicit addressing.
5 years ago
lain
2b664b048e
User: Add function to get AP ids from nicknames.
5 years ago
eugenijm
243d8ed94e
Use workaround for the heavy checkmark symbol in iOS
5 years ago
Mark Felder
f4e2595592
Merge branch 'develop' into update-oauth-template
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
5 years ago
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch
5bd41fef8b
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
5 years ago
rinpatch
1fd8e19d76
Remove a TODO comment as the tests for poll view were written
5 years ago
rinpatch
2fe3a20638
Make error message about author's inability to vote more sensible
5 years ago
rinpatch
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
5 years ago
William Pitcock
561a21986d
formatting
5 years ago
William Pitcock
4087ccdab8
mrf: add subchain policy
5 years ago
William Pitcock
edf772d41e
mrf: allow a policy chain to be specified when filtering
5 years ago
William Pitcock
52e09807d4
reverse proxy: clean up some @hackney leftovers
5 years ago
kaniini
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
5 years ago
rinpatch
6bc9e5c020
Mastodon API: Refresh the object before rendering it after voting
5 years ago
rinpatch
444406167b
Mastodon API: actually check for poll votes
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago