5290 Commits (f4e2595592ccca6cedd64669baef7bdd2a6547d0)

 

All Branches   

Search

Author	SHA1	Message	Date
Mark Felder	f4e2595592	Merge branch 'develop' into update-oauth-template	5 years ago
rinpatch	9789e000b0	Merge branch 'feature/polls-2-electric-boogalo' into 'develop' ... Polls 2 Electric Boogalo Closes #657 See merge request pleroma/pleroma!1190	5 years ago
rinpatch	dc91bcc0af	Merge branch 'develop' into feature/polls-2-electric-boogalo	5 years ago
rinpatch	d33d248b69	Merge branch 'fix-dokku' into 'develop' ... Fix dokku See merge request pleroma/pleroma!1236	5 years ago
lain	9ded9443a3	CI: Actually push to correct repo.	5 years ago
lambda	314758c25b	Merge branch 'align-mastodon-conversations' into 'develop' ... Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215	5 years ago
rinpatch	e71da4468e	Merge branch 'chore/ci-speedup' into 'develop' ... CI: Replace mix test and mix coveralls with just mix coveralls See merge request pleroma/pleroma!1235	5 years ago
rinpatch	c3bcc4f6a2	CI: Replace mix test and mix coveralls with just mix coveralls ... `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.	5 years ago
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	5 years ago
rinpatch	5bd41fef8b	Change query order in fetch_activities_for_context_query to make poll vote exclusion work	5 years ago
rinpatch	baefb97dc4	Add a changelog entry for polls	5 years ago
rinpatch	1fd8e19d76	Remove a TODO comment as the tests for poll view were written	5 years ago
rinpatch	2fe3a20638	Make error message about author's inability to vote more sensible	5 years ago
rinpatch	c47da0e65d	Add tests for poll view	5 years ago
rinpatch	e3c460353d	Refresh the object in CommonAPI.vote instead of MastoAPI controller	5 years ago
kaniini	1236c5dbf5	Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop' ... reverse proxy: clean up some @hackney leftovers See merge request pleroma/pleroma!1232	5 years ago
William Pitcock	52e09807d4	reverse proxy: clean up some @hackney leftovers	5 years ago
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	5 years ago
rinpatch	67bcc3ccc4	Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer)	5 years ago
rinpatch	cfa588e357	Fix Credo issues	5 years ago
rinpatch	6bc9e5c020	Mastodon API: Refresh the object before rendering it after voting	5 years ago
rinpatch	444406167b	Mastodon API: actually check for poll votes	5 years ago
rinpatch	65db5e9f52	Resolve merge conflicts	5 years ago
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	5 years ago
kaniini	e706b42f51	Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' ... visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230	5 years ago
kaniini	14ef35f402	Merge branch 'bugfix/remove-others-follower-collections' into 'develop' ... Remove all follower collections but actor's from "cc" Closes #858 See merge request pleroma/pleroma!1225	5 years ago
Sergey Suprunenko	2bbc2a801f	Remove all follower collections but actor's from "cc"	5 years ago
kaniini	d46cc7896e	Merge branch 'bugfix/remove-vanilla-flavour' into 'develop' ... Bugfix: remove vanilla flavour See merge request pleroma/pleroma!1228	5 years ago
kaniini	88df629689	Merge branch 'add-missing-mock' into 'develop' ... add the missing mock file [Fix the warning] See merge request pleroma/pleroma!1229	5 years ago
William Pitcock	f2efe24cf8	visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility	5 years ago
Sachin Joshi	d4304a3945	add the missing mock file	5 years ago
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	5 years ago
Haelwenn (lanodan) Monnier	aa9f52edd2	mastodon_api_controller.ex: Remove vanilla from supported_flavours	5 years ago
Haelwenn	f1890d2cac	Merge branch 'dokku' into 'develop' ... Dokku CI support - On-Demand review instances See merge request pleroma/pleroma!1216	5 years ago
feld	f8d4c02431	Merge branch 'doc/mongoose-im-config' into 'develop' ... Sample Mongoose IM config See merge request pleroma/pleroma!1226	5 years ago
feld	abedcca349	Sample Mongoose IM config. ... Change domain, ensure paths to PEM files are correct, and this is good to go.	5 years ago
lambda	3415962d60	Merge branch 'fix/mastodon-user-search' into 'develop' ... Fix/mastodon user search See merge request pleroma/pleroma!1224	5 years ago
feld	6872c5f88f	Mastodon API search default value for "resolve" is false ... https://docs.joinmastodon.org/api/rest/accounts/ https://docs.joinmastodon.org/api/rest/search/	5 years ago
lambda	2993361075	Merge branch 'hotfix/leaking-lists' into 'develop' ... Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222	5 years ago
rinpatch	d9c0650ff9	Mastodon API: Fix lists leaking private posts ... 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	5 years ago
rinpatch	a9eaa55885	Fix fix_explicit_addressing moving follower collection to cc and add tests for it	5 years ago
lain	97fb50d9fa	Mastodon Conversation API: Don't return own account in 'accounts'.	5 years ago
lain	4e45f7bc87	CI: Add auto-deployment via dokku.	5 years ago
feld	3cc00fd2e9	Merge branch 'fix/install-guide' into 'develop' ... Formatting See merge request pleroma/pleroma!1219	5 years ago
feld	88414151b4	Formatting	5 years ago
feld	3c1c478125	Merge branch 'fix/install-guide' into 'develop' ... Install docs should clone from master branch See merge request pleroma/pleroma!1218	5 years ago
feld	75a37a68d4	Install docs should clone from master branch	5 years ago
feld	73a7420c23	Merge branch 'fix/ogp-missing-data' into 'develop' ... Replace missing non-nullable Card attributes with empty strings See merge request pleroma/pleroma!1217	5 years ago
Sergey Suprunenko	1690be991e	Replace missing non-nullable Card attributes with empty strings	5 years ago
lambda	91ac8b075b	Merge branch 'use-pleroma-config' into 'develop' ... Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214	5 years ago