pleroma

Commit Graph

Author	SHA1	Message	Date
scarlett	6556be344d	Resolve some test failures.	5 years ago
scarlett	3c86d907d4	add some brakets to the emoji list.	5 years ago
scarlett	0787f0dfbe	Strip HTML in and allow emoji in summaries.	5 years ago
sxsdv1	2d7da5f437	Don't crash on AP request for tombstone Because tombstone objects has no addressing the is_public?-predicate would cause an error that propagated as a 500 error in the api	5 years ago
cascode	a81307251c	Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name	5 years ago
rinpatch	ba17518a0a	Merge branch 'feature/rich-media-cachex' into 'develop' rich media: use cachex to avoid flooding remote servers See merge request pleroma/pleroma!629	5 years ago
William Pitcock	487c00d36d	rich media: disable cachex in test mode	5 years ago
kaniini	bf5aaefbb5	Merge branch 'fix/html-cache-content-collision' into 'develop' Different caches based on the module. Remove scrubber version since it is not relevant anymore See merge request pleroma/pleroma!628	5 years ago
William Pitcock	0964c207eb	rich media: use cachex to avoid flooding remote servers	5 years ago
Rin Toshaka	1e2d58982e	oopsies	5 years ago
Rin Toshaka	846082e54f	Different caches based on the module. Remove scrubber version since it is not relevant anymore	5 years ago
spctrl	4aa977d3b3	fix 486: Add option --assume-yes to allow it to work non-interactive	5 years ago
kaniini	4258dd8633	Merge branch 'feature/rich-media' into 'develop' URL previews in posts Closes #402 See merge request pleroma/pleroma!617	5 years ago
kaniini	ffea81b84f	Merge branch 'activitypub-c2s-delete-activity' into 'develop' Activitypub c2s delete activity See merge request pleroma/pleroma!618	5 years ago
cascode	4c5ee4c62b	formatted	5 years ago
cascode	ab6ebbae67	added test for #499	5 years ago
cascode	5b23dfa1c5	handle null	5 years ago
kaniini	d9d62a110c	Merge branch 'mr/retry-queue-remove-fold' into 'develop' rewrites List.foldl to Enum.each in RetryQueue See merge request pleroma/pleroma!621	5 years ago
kaniini	ccdc916f95	Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop' Remove media proxy examples in config/config.exs See merge request pleroma/pleroma!624	5 years ago
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
Michael Loftis	943211b035	rewrites List.foldl to Enum.each	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
Maxim Filippov	48e81d3d40	Add RichMediaController and tests	5 years ago
lain	8910e103ce	Add handler for Phoenix-style socket.	5 years ago
sxsdv1	4e1cc2bab6	Implement delete activity	5 years ago
sxsdv1	551c3d9391	Split create activity specifics from update_outbox	5 years ago
Maxim Filippov	917d48d09b	Better variable name	5 years ago
Maxim Filippov	2aab4e03c3	Add OGP parser	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

1 2 3 4 5 ...

3313 Commits (bfe2a11a6b64b868d18727359b83edc51ce5bb80) All Branches Search

3313 Commits (bfe2a11a6b64b868d18727359b83edc51ce5bb80)

All Branches