aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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
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 'chore/ci-speedup' into 'develop'rinpatch
CI: Replace mix test and mix coveralls with just mix coveralls See merge request pleroma/pleroma!1235
2019-06-03CI: Replace mix test and mix coveralls with just mix coverallsrinpatch
`mix coveralls` runs the tests by itself, exits with failure if one of them fails and accepts the same args, so there is no reason to run two of them at the same time.
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-03Add a changelog entry for pollsrinpatch
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-02Add tests for poll viewrinpatch
2019-06-02Refresh the object in CommonAPI.vote instead of MastoAPI controllerrinpatch
2019-06-02Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit ↵Ivan Tashkinov
dependency specification.
2019-06-02formattingWilliam Pitcock
2019-06-02docs: document mrf_subchainWilliam Pitcock
2019-06-02test: add tests for subchain policyWilliam Pitcock
2019-06-02mrf: add subchain policyWilliam Pitcock
2019-06-02mrf: allow a policy chain to be specified when filteringWilliam Pitcock
2019-06-02Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'kaniini
reverse proxy: clean up some @hackney leftovers See merge request pleroma/pleroma!1232
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-01Remove index on object name used for excluding poll votes (replaced by just ↵rinpatch
rewriting Note to Answer)
2019-06-01Fix Credo issuesrinpatch
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-01Merge branch 'bugfix/remove-others-follower-collections' into 'develop'kaniini
Remove all follower collections but actor's from "cc" Closes #858 See merge request pleroma/pleroma!1225