summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-03Use workaround for the heavy checkmark symbol in iOSeugenijm
2019-06-03Merge branch 'develop' into update-oauth-templateMark Felder
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-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
2019-06-01Remove all follower collections but actor's from "cc"Sergey Suprunenko
2019-06-01Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'kaniini
Bugfix: remove vanilla flavour See merge request pleroma/pleroma!1228
2019-06-01Merge branch 'add-missing-mock' into 'develop'kaniini
add the missing mock file [Fix the warning] See merge request pleroma/pleroma!1229
2019-06-01visibility: if litepub:directMessage is asserted, always report the object ↵William Pitcock
as "direct" visibility
2019-06-01add the missing mock fileSachin Joshi
2019-06-01Remove now useless flavours switchingHaelwenn (lanodan) Monnier
2019-06-01mastodon_api_controller.ex: Remove vanilla from supported_flavoursHaelwenn (lanodan) Monnier
2019-05-31Merge branch 'dokku' into 'develop'Haelwenn
Dokku CI support - On-Demand review instances See merge request pleroma/pleroma!1216
2019-05-31Merge branch 'doc/mongoose-im-config' into 'develop'feld
Sample Mongoose IM config See merge request pleroma/pleroma!1226
2019-05-31Sample Mongoose IM config.feld
Change domain, ensure paths to PEM files are correct, and this is good to go.
2019-05-31Merge branch 'fix/mastodon-user-search' into 'develop'lambda
Fix/mastodon user search See merge request pleroma/pleroma!1224
2019-05-31Mastodon API search default value for "resolve" is falsefeld
https://docs.joinmastodon.org/api/rest/accounts/ https://docs.joinmastodon.org/api/rest/search/
2019-05-31Merge branch 'hotfix/leaking-lists' into 'develop'lambda
Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222
2019-05-31Mastodon API: Fix lists leaking private postsrinpatch
Our previous list visibility resolver grabbed posts if either follower collection of the user in a list who is followed is in `to` or if follower collection of the user in a list was in `cc`. This not only missed unlisted posts but also lead to leaking private posts when `fix_explicit_addressing` mistakingly started putting follower collections to `cc` (also fixed in this MR). Reported by @kurisu@iscute.moe via a DM
2019-05-31Fix fix_explicit_addressing moving follower collection to cc and add tests ↵rinpatch
for it
2019-05-31Mastodon Conversation API: Don't return own account in 'accounts'.lain
2019-05-31CI: Add auto-deployment via dokku.lain
2019-05-30Merge branch 'fix/install-guide' into 'develop'feld
Formatting See merge request pleroma/pleroma!1219
2019-05-30Formattingfeld
2019-05-30Merge branch 'fix/install-guide' into 'develop'feld
Install docs should clone from master branch See merge request pleroma/pleroma!1218
2019-05-30Install docs should clone from master branchfeld
2019-05-30Merge branch 'fix/ogp-missing-data' into 'develop'feld
Replace missing non-nullable Card attributes with empty strings See merge request pleroma/pleroma!1217
2019-05-30Replace missing non-nullable Card attributes with empty stringsSergey Suprunenko
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-09 22:21:45 +0000