aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-06Replace Mix.env with Pleroma.Config.get(:env)rinpatch
Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases.
2019-06-06Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'kaniini
Switch to manual Supervisor child specifications instead of Supervisor.Spec See merge request pleroma/pleroma!1252
2019-06-06Merge branch 'fix-search' into 'develop'rinpatch
Fix search Closes #960 See merge request pleroma/pleroma!1253
2019-06-06User Search: Boost friends more strongly.lain
2019-06-06MastodonAPI: Add test for user search.lain
2019-06-06Switch to manual Supervisor child specifications instead of Supervisor.Specrinpatch
Supervisor.Spec is deprecated and causes warnings on Elixir master, see https://hexdocs.pm/elixir/Supervisor.Spec.html
2019-06-06Merge branch 'improve-search' into 'develop'rinpatch
[#943] Make the unauthenticated users limitation optional See merge request pleroma/pleroma!1251
2019-06-06[#943] Make the unauthenticated users limitation optionalEgor
2019-06-05Merge branch 'bugfix/377-stuck-follow-request' into 'develop'kaniini
Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250
2019-06-05Merge branch 'improve-search' into 'develop'kaniini
[#943] Contain search for unauthenticated users See merge request pleroma/pleroma!1220
2019-06-05Utils: Use update_follow_state_for_all when appropriate.lain
2019-06-05Utils: Split update_follow_state and update_follow_state_for_all.lain
2019-06-05CommonAPI: Add test for accept_follow_request.lain
2019-06-05User: Remove superfluous `maybe_follow`.lain
2019-06-05Transmogrifier: Add tests for incoming follows to locked accounts.lain
2019-06-05Merge branch 'fix-stuck-follows' into 'develop'rinpatch
User: Don't error out when following a user that's already followed. See merge request pleroma/pleroma!1249
2019-06-05Merge branch 'oauth_consumer_support_code' into 'develop'lain
OAuth consumer: tests fix, comments, Keycloak config notes See merge request pleroma/pleroma!1248
2019-06-05Typo + Linting.lain
2019-06-05User: Don't error out when following a user that's already followed.lain
This leads to a few situations where it is impossible to follow a user.
2019-06-05OAuth consumer: tests fix, comments, Keycloak config notes.Ivan Tashkinov
2019-06-05Fix formattingEgor Kislitsyn
2019-06-05Limit search for unauthenticated users to local users onlyEgor Kislitsyn
2019-06-05Create index on `activities.local`Egor Kislitsyn
2019-06-05Fix tests with enabled RUMEgor Kislitsyn
2019-06-05Update benchmark mix taskEgor Kislitsyn
2019-06-05Contain search for unauthenticated usersEgor Kislitsyn
2019-06-05Merge branch 'explicit-addressing' into 'develop'kaniini
Explicit addressing See merge request pleroma/pleroma!1239
2019-06-04Merge branch 'remove-tag-warning' into 'develop'Haelwenn
Mix: Swallow git error messages during version number handling. See merge request pleroma/pleroma!1247
2019-06-04Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'Haelwenn
Participations: Filter out participations without activities. Closes #956 and #953 See merge request pleroma/pleroma!1246
2019-06-04NodeInfo: Add explicit addressing to nodeinfo.lain
2019-06-04Mix: Swallow git error messages during version number handling.lain
Otherwise sometimes a 'fatal' message will be printed, confusing users.
2019-06-04Merge branch 'issue/941' into 'develop'lain
[#941] add option skip_thread_containment See merge request pleroma/pleroma!1237
2019-06-04update ActivityPub#fetch_activities_queryMaksim Pechnikov
2019-06-04Merge branch 'develop' into issue/941Maksim Pechnikov
2019-06-04update ActivityPub#fetch_activities_queryMaksim Pechnikov
2019-06-04Participations: Filter out participations without activities.lain
2019-06-04Merge branch 'emoji-loader-fix' into 'develop'Haelwenn
Emoji: Don't die when files are present in the emoji folder. Closes #957 See merge request pleroma/pleroma!1245
2019-06-04Merge branch 'fix/fetch-votes-restrict-create' into 'develop'lain
Restrict `get_existing_votes` to only get Create activities See merge request pleroma/pleroma!1244
2019-06-04Add tests for get_existing_votesrinpatch
2019-06-04Fix CommonAPI.vote returning tuples inside of the activity array instead of ↵rinpatch
just activities
2019-06-04Emoji: Don't die when files are present in the emoji folder.lain
2019-06-04Restrict `get_existing_votes` to only get Create activitiesrinpatch
2019-06-04fix mergeMaksim Pechnikov
2019-06-04Merge remote-tracking branch 'origin/develop' into explicit-addressinglain
2019-06-04Merge branch 'fix/poll-performance' into 'develop'kaniini
utils: access inReplyTo as an explicit string when fetching poll results` See merge request pleroma/pleroma!1243
2019-06-04Docs: Add Explicit addressing to Readme and changelog.lain
2019-06-04utils: access inReplyTo as an explicit string when fetching poll results`William Pitcock
2019-06-04Merge branch 'develop' into issue/941Maksim Pechnikov
2019-06-04Merge branch 'feature/nodeinfo-polls' into 'develop'kaniini
nodeinfo: add pollLimits to metadata See merge request pleroma/pleroma!1242
2019-06-04nodeinfo: add pollLimits to metadataWilliam Pitcock