summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
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-04Fix testsRoman Chvanikov
2019-06-04Update changelogRoman Chvanikov
2019-06-04Fix testsRoman Chvanikov
2019-06-04Add task to test emailsRoman Chvanikov
2019-06-03Merge branch 'develop' into feature/digest-emailMark Felder
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
2019-06-03update api to set skip_thread_containmentMaksim Pechnikov
2019-06-03Add missing tag index on objectsrinpatch
The previous activity index is useless because objects are not embedded anymore and instead a joined object is queried.
2019-06-03CommonAPI.Utils: Add tests.lain
2019-06-03Add index on inReplyTo for objectsrinpatch
Fixes the performance of `get_existing_votes`
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 'feature/polls-2-electric-boogalo' into 'develop'rinpatch
Polls 2 Electric Boogalo Closes #657 See merge request pleroma/pleroma!1190
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Merge branch 'fix-dokku' into 'develop'rinpatch
Fix dokku See merge request pleroma/pleroma!1236
2019-06-03CI: Actually push to correct repo.lain
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 01:52:54 +0000