aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-06-04Merge branch 'feature/mrf-subchain' into 'develop'kaniini
MRF: subchain policy See merge request pleroma/pleroma!1233
2019-06-04Merge branch 'fix/mock-errors-in-tests' into 'develop'kaniini
Add missing HTTP Request mocks See merge request pleroma/pleroma!1231
2019-06-04Add missing HTTP Request mocksSergey Suprunenko
2019-06-04Merge branch 'generic-fe-settings' into 'develop'kaniini
Generic settings store for frontend user settings See merge request pleroma/pleroma!1221
2019-06-04Merge branch 'ueberauth_config_extension' into 'develop'kaniini
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification See merge request pleroma/pleroma!1234
2019-06-04Merge branch 'update-oauth-template-css-fix' into 'develop'kaniini
Update oauth template css fix See merge request pleroma/pleroma!1238
2019-06-04Merge branch 'hotfix/add-in_reply_to_index' into 'develop'kaniini
Add index on inReplyTo for objects See merge request pleroma/pleroma!1240
2019-06-04update CHANGELOG for mrf_subchainWilliam Pitcock
2019-06-03fix testsMaksim Pechnikov
2019-06-03Merge branch 'fix/tag-timeline-missing-index' into 'develop'lambda
Add missing tag index on objects Closes #867 See merge request pleroma/pleroma!1241
2019-06-03updated changelogMaksim Pechnikov