pleroma

Commit Graph

Author	SHA1	Message	Date
href	53f56039e5	Remove media proxy examples in config/config.exs 1. this was overriding the real defaults 2. it's documented in `config/config.md`	5 years ago
kaniini	eaaf701319	Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' user: check that the follow request actually has an active account associated with it See merge request pleroma/pleroma!623	5 years ago
rinpatch	b73a1a33de	Merge branch 'captcha' into 'develop' Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585	5 years ago
rinpatch	9ef664ffce	Merge branch 'fix-chat' into 'develop' Add handler for Phoenix-style socket. See merge request pleroma/pleroma!619	5 years ago
William Pitcock	eb1a18d22f	user: check that the follow request actually has an active account associated with it because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly filter the follow requests for these failures.	5 years ago
rinpatch	d1983ed028	Merge branch 'fix/reserve-media-username' into 'develop' Reserve /media See merge request pleroma/pleroma!620	5 years ago
Rin Toshaka	5142b50f39	reserve /media	5 years ago
lain	8910e103ce	Add handler for Phoenix-style socket.	5 years ago
kaniini	32bed66471	Merge branch 'pool-usage' into 'develop' Update of hackney and tesla, removal of superflous default options. See merge request pleroma/pleroma!614	5 years ago
rinpatch	34fa709015	Merge branch 'configurable-federator' into 'develop' Make Federator options configurable. See merge request pleroma/pleroma!615	5 years ago
lambda	b9ac7067eb	Merge branch '2019-1-1-update-frontend' into 'develop' update frontend See merge request pleroma/pleroma!616	5 years ago
lain	1dd0e0ed4c	update frontend	5 years ago
lain	1a0391c8a4	Add documentation.	5 years ago
lambda	32541172cd	Merge branch 'cleanup/admin-api-useless-if' into 'develop' Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete See merge request pleroma/pleroma!612	5 years ago
lain	400337b0a7	Make Federator options configurable.	5 years ago
lain	096a927805	Merge remote-tracking branch 'origin/develop' into pool-usage	5 years ago
lain	91afbbe4ea	Update Tesla and Hackney.	5 years ago
lain	d4799e0dc2	Remove default pool, it's used automatically anyway.	5 years ago
Haelwenn (lanodan) Monnier	1e6c102bfc	Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete	5 years ago
kaniini	90e157ef80	Merge branch 'features/admin-api-user-views' into 'develop' User/Account views: Add rights.admin Closes #472 See merge request pleroma/pleroma!589	5 years ago
kaniini	1b1e928667	Merge branch 'docs/admin-api' into 'develop' Add docs/Admin-API.md See merge request pleroma/pleroma!611	5 years ago
kaniini	ede3fd7459	Merge branch 'maintenance/copyright-2019' into 'develop' update copyright years to 2019 See merge request pleroma/pleroma!613	5 years ago
William Pitcock	980b5288ed	update copyright years to 2019	5 years ago
Haelwenn (lanodan) Monnier	286632dfa2	Add docs/Admin-API.md [ci skip]	5 years ago
lambda	33e3a7ba7d	Merge branch 'fix/scrubber-cache' into 'develop' [#481] Store scrubbed posts in Cachex Closes #481 See merge request pleroma/pleroma!610	5 years ago
Rin Toshaka	9f5881cbb1	Fix a typo in user_test.ex	5 years ago
Rin Toshaka	6ed9b31a5f	Eh?	5 years ago
Rin Toshaka	7e09c2bd7d	Move scrubber cache-related functions to Pleroma.HTML	5 years ago
kaniini	8e7da98b18	Merge branch 'mr/retry-queue' into 'develop' Improves RetryQueue behavior See merge request pleroma/pleroma!609	5 years ago
rinpatch	05743e2000	Get default scrubbers from config instead of hardcoded	5 years ago
rinpatch	91d5a7e81c	Fix test failure	5 years ago
Rin Toshaka	dec23500d8	Resolve merge conflict	5 years ago
Rin Toshaka	ab3089d6a7	Fix comment in object.ex	5 years ago
kaniini	dfde2622d0	Merge branch 'activitypub-c2s' into 'develop' Activitypub c2s See merge request pleroma/pleroma!608	5 years ago
Rin Toshaka	c50353e6ae	shame on me for not testing after revert	5 years ago
Rin Toshaka	3f9da55adc	Fix formating. Aparently my pre-commit hook broke.	5 years ago
Rin Toshaka	62af23bd26	Revert some changes in html.ex	5 years ago
Rin Toshaka	c119ea3a57	Friendship ended with Postgresql now Cachex is my best friend	5 years ago
Rin Toshaka	535fddd286	Friendship ended with Postgresql now Cachex is my best friend	5 years ago
Rin Toshaka	d9f40b05b3	Added get_stripped_html_for_object. Renamed a few things	5 years ago
Michael Loftis	cb286fdeba	Improves RetryQueue behavior reduces to one single timer firing once a second switches to a parallel worker model	5 years ago
Rin Toshaka	bce152aba0	Tidy up the code. Rename key to signature	5 years ago
Rin Toshaka	66d1c31461	Fix some stupid typos	5 years ago
sxsdv1	f40562b4e1	Respond with full activity to outbox post	5 years ago
sxsdv1	1e781715c8	Limit activity types accepted to outbox to only 'Create'	5 years ago
sxsdv1	569bad8210	Create activity when client posts to outbox	5 years ago
sxsdv1	26dc2dddab	Implement ActivityPub inbox view More or less verbatim copied from the outbox template with only changes to the activities fetched and url reported	5 years ago
Rin Toshaka	a32e23905a	Use Object.change instead of Ecto.Changeset.change	5 years ago
sxsdv1	aa082ca7b6	Wire up stub routes for client calls of activitypub inbox/outbox Code style: remove wrapping function of outbox	5 years ago
Rin Toshaka	9a0163db53	use Kernel.put_in instead of Map.merge	5 years ago

1 2 3 4 5 ...

3172 Commits (53f56039e5486e429f3f0675936fc0f28225c272) All Branches Search

3172 Commits (53f56039e5486e429f3f0675936fc0f28225c272)

All Branches