pleroma

Commit Graph

Author	SHA1	Message	Date
Maksim Pechnikov	f95b67c933	Merge branch 'develop' into issue/1177	4 years ago
Ivan Tashkinov	7101ba1a21	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	4 years ago
Ivan Tashkinov	256ff09aa8	[#1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	4 years ago
feld	0e50e9e4fa	Merge branch 'support/tests' into 'develop' fixed clear config after test See merge request pleroma/pleroma!1588	4 years ago
lain	01653f618d	Merge branch 'improve-ap-routes-rate-limit' into 'develop' Improve AP routes rate limit See merge request pleroma/pleroma!1590	4 years ago
Egor Kislitsyn	a79ebac592	Improve AP routes rate limit	4 years ago
Maksim Pechnikov	64bfb41c55	fixed unfollow for relay actor	4 years ago
Sachin Joshi	37229af15f	remove old user create and delete routes for admin	4 years ago
Maksim Pechnikov	85bd8a4e31	fixed clear config after test	4 years ago
lain	f740d786a3	Merge branch 'rate-limit-ap-routes' into 'develop' [#1174] Rate limit AP routes See merge request pleroma/pleroma!1586	4 years ago
kaniini	73884441f3	Merge branch 'chore/fix-flakey-aws-test' into 'develop' test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1 See merge request pleroma/pleroma!1587	4 years ago
Ariadne Conill	76bb3572dd	test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1	4 years ago
lain	74f7f308f8	Merge branch 'fix/admin-api-user-deletion' into 'develop' Fix deactivated user deletion See merge request pleroma/pleroma!1546	4 years ago
Egor Kislitsyn	8d899d6197	Add `:ap_routes` rate limit	4 years ago
lain	8340fe8fcc	Merge branch 'digest-template' into 'develop' Improve digest email template See merge request pleroma/pleroma!1565	4 years ago
Egor Kislitsyn	cd2fd225dc	Update CHANGELOG	4 years ago
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' Add custom profile fields See merge request pleroma/pleroma!1488	4 years ago
Maxim Filippov	5171aa5b4d	Refactor check_actor_is_active	4 years ago
lain	10696ce2ee	Merge branch 'fix/reverse-proxy-body-too-large' into 'develop' Reverse Proxy max_body_size is incorrect See merge request pleroma/pleroma!1581	4 years ago
lain	d2c9befc64	Merge branch 'develop' into 'fix/reverse-proxy-body-too-large' # Conflicts: # CHANGELOG.md	4 years ago
lain	e5d2c0c669	Merge branch 'tests/database-digest-tests' into 'develop' Add more tests for Database tasks and DigestEmailWorker See merge request pleroma/pleroma!1577	4 years ago
Sergey Suprunenko	75a5dd41ee	Add more tests for Database tasks and DigestEmailWorker	4 years ago
lain	222ac3bcbe	Merge branch 'support/test_helpers' into 'develop' added test helpers to clear config after tests See merge request pleroma/pleroma!1547	4 years ago
Maksim	a320358703	added test helpers to clear config after tests	4 years ago
lain	49ae3191df	Merge branch 'hotfix/user_unfollow' into 'develop' [#1177] fixed User.unfollow with synchronization external user See merge request pleroma/pleroma!1579	4 years ago
Maksim Pechnikov	e652cef76b	removes duplicates from relay subscription list	4 years ago
kaniini	608773c5ef	Merge branch 'chore/fix-ap-muted-tests' into 'develop' tests: activitypub: fix muted thread tests See merge request pleroma/pleroma!1584	4 years ago
Ariadne Conill	a2fdc32368	tests: activitypub: fix typo	4 years ago
kaniini	475fcb3e6c	Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop' Clear follow requests when blocking a user See merge request pleroma/pleroma!1583	4 years ago
kaniini	18c8c8d176	Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' Hide muted theads from home/public timelines unless `with_muted` is set See merge request pleroma/pleroma!1575	4 years ago
Sadposter	58c1391c4d	use commonAPI in tests	4 years ago
Sadposter	94e336d9d5	clear follow requests when blocking a user	4 years ago
Mark Felder	cb222b72b3	Add changelog entry too	4 years ago
Mark Felder	ef82f868d9	Formatting	4 years ago
Maksim Pechnikov	3315a2a1c3	fixed User.unfollow with synchronization external user	4 years ago
lain	7ab2dbbdb6	Merge branch 'pleroma-conversations' into 'develop' Extended Pleroma Conversations See merge request pleroma/pleroma!1535	4 years ago
Egor Kislitsyn	158231cd20	Add configurable colors and logo for the digest template	4 years ago
Mark Felder	6a3b1a526e	max_body_size -> max_body_length, as it should be	4 years ago
rinpatch	0f24edcd8d	Merge branch 'fix/oauth-cleanup-worker-unconditional-start' into 'develop' Fix OAuth cleanup worker unconditionally starting See merge request pleroma/pleroma!1578	4 years ago
rinpatch	fba3c16d20	Fix OAuth cleanup worker unconditionally starting !1576 removed enabled/disabled check from the worker, in favor of just not starting it in application.ex if disabled. However a line unconditionally starting the worker was removed	4 years ago
kaniini	1c8f58a30e	Merge branch 'features/formatting-sub_sup' into 'develop' html.ex: Allow sub and sup elements by default Closes #1191 See merge request pleroma/pleroma!1572	4 years ago
lain	aefb9cdee8	Merge branch 'feature/parallel-rendering' into 'develop' Parallelize template rendering See merge request pleroma/pleroma!1576	4 years ago
rinpatch	1ad71592ad	Parallelize template rendering	4 years ago
rinpatch	a4a3e3becd	Hide muted theads from home/public timelines unless `with_muted` is set	4 years ago
lain	9fb71ce7f4	Merge branch 'cache-follow-state' into 'develop' Cache follow state Closes #1180 See merge request pleroma/pleroma!1573	4 years ago
Maxim Filippov	ec969eec51	Merge branch 'develop' into 'fix/admin-api-user-deletion' # Conflicts: # CHANGELOG.md	4 years ago
Maxim Filippov	b27fafe161	Fix CHANGELOG entry	4 years ago
Maxim Filippov	2b94ae3b39	Do not check if actor is active when deleting a user	4 years ago
rinpatch	27b747546a	Merge branch 'fix/stats-send-after' into 'develop' Collect stats immediately after init See merge request pleroma/pleroma!1574	4 years ago
rinpatch	e8a8d50138	Collect stats immediately after init	4 years ago

... 3 4 5 6 7 ...

6582 Commits (aab264db82054df470075c65ca25c42bbcc5d7a8) All Branches Search

6582 Commits (aab264db82054df470075c65ca25c42bbcc5d7a8)

All Branches