aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
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-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-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 '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-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-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-04Merge remote-tracking branch 'origin/develop' into explicit-addressinglain
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-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 'generic-fe-settings' into 'develop'kaniini
Generic settings store for frontend user settings See merge request pleroma/pleroma!1221
2019-06-03update api to set skip_thread_containmentMaksim Pechnikov
2019-06-03Remove repeated scope listseugenijm
2019-06-03CommonAPI: Add explicit addressing.lain
2019-06-03User: Add function to get AP ids from nicknames.lain
2019-06-03Use workaround for the heavy checkmark symbol in iOSeugenijm
2019-06-03Merge branch 'develop' into update-oauth-templateMark Felder
2019-06-03add option skip_thread_containmentMaksim Pechnikov
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Merge branch 'align-mastodon-conversations' into 'develop'lambda
Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Change query order in fetch_activities_for_context_query to make poll vote ↵rinpatch
exclusion work
2019-06-02Remove a TODO comment as the tests for poll view were writtenrinpatch
2019-06-02Make error message about author's inability to vote more sensiblerinpatch
2019-06-02Refresh the object in CommonAPI.vote instead of MastoAPI controllerrinpatch
2019-06-02formattingWilliam Pitcock
2019-06-02mrf: add subchain policyWilliam Pitcock
2019-06-02mrf: allow a policy chain to be specified when filteringWilliam Pitcock
2019-06-02reverse proxy: clean up some @hackney leftoversWilliam Pitcock
2019-06-02Merge branch 'feature/notification-control-part-2' into 'develop'kaniini
notification controls, part 2 See merge request pleroma/pleroma!1204
2019-06-01Mastodon API: Refresh the object before rendering it after votingrinpatch
2019-06-01Mastodon API: actually check for poll votesrinpatch
2019-06-01Resolve merge conflictsrinpatch
2019-06-01Add poll votesrinpatch
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-01Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'kaniini
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230
2019-06-01Remove all follower collections but actor's from "cc"Sergey Suprunenko
2019-06-01visibility: if litepub:directMessage is asserted, always report the object ↵William Pitcock
as "direct" visibility
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 16:14:30 +0000