pleroma

Commit Graph

Author	SHA1	Message	Date
Ivan Tashkinov	f7e623c11c	[#1364 ] Resolved merge conflicts with `develop`.	4 years ago
Ivan Tashkinov	0cda80f266	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex	4 years ago
feld	6c3e09fbce	Merge branch 'fix/richmedia-oban-error' into 'develop' Attempt at fixing Oban not receiving :ok from RichMediaHelper job Closes #1684 See merge request pleroma/pleroma!2377	4 years ago
Mark Felder	3bf78f2be7	Fix Oban not receiving :ok from RichMediaHelper job	4 years ago
lain	c02e6ceea5	Merge branch 'revert-60cc7d6c' into 'develop' Revert "Merge branch 'issue/1276' into 'develop'" See merge request pleroma/pleroma!2384	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" This reverts merge request !1877	4 years ago
lain	3677a1e578	Merge branch 'revert-13a7105b' into 'develop' Revert "Merge branch 'marker-update-fix' into 'develop'" See merge request pleroma/pleroma!2383	4 years ago
lain	7c060432fc	Revert "Merge branch 'marker-update-fix' into 'develop'" This reverts merge request !2380	4 years ago
feld	bf3afbc1a1	Merge branch 'logger-configuration' into 'develop' Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365	4 years ago
lain	13a7105b21	Merge branch 'marker-update-fix' into 'develop' Marker update migration: Don't try to update virtual field. See merge request pleroma/pleroma!2380	4 years ago
lain	5fc6ce30ac	Merge branch 'chore/spelling' into 'develop' Fix spelling in log message See merge request pleroma/pleroma!2378	4 years ago
lain	d8b12ffd59	Marker update migration: Don't try to update virtual field.	4 years ago
lain	2eae5793cd	Merge branch 'fix/issue_1679' into 'develop' [#1679] fixed logs See merge request pleroma/pleroma!2379	4 years ago
Ivan Tashkinov	650853fc89	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/notification.ex	4 years ago
Haelwenn	60cc7d6c9a	Merge branch 'issue/1276' into 'develop' [#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877	4 years ago
Maksim Pechnikov	c4e7ed660c	fix logger message	4 years ago
Mark Felder	f3725b8fc4	Fix spelling	4 years ago
rinpatch	e3db1c471e	Merge branch 'openapi/domain-blocks' into 'develop' Add OpenAPI spec for DomainBlockController See merge request pleroma/pleroma!2376	4 years ago
Egor Kislitsyn	4dca712e90	Add OpenAPI spec for DomainBlockController	4 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	4 years ago
rinpatch	ef37774403	Merge branch 'output-of-relationships-in-statuses' into 'develop' Ability to control the output of AccountView.pleroma.relationship in statuses / notifications See merge request pleroma/pleroma!2342	4 years ago
Ivan Tashkinov	5c76afb06c	[#2342 ] Removed description.exs entry for temporary configuration option.	4 years ago
Ivan Tashkinov	99b0bc1989	[#1364 ] Resolved merge conflicts with `develop`. Refactoring.	4 years ago
Ivan Tashkinov	f00ff20768	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users # Conflicts: # lib/pleroma/following_relationship.ex	4 years ago
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	4 years ago
Ivan Tashkinov	dc2637c188	[#2342 ] Removed changelog entry for temporary configuration option.	4 years ago
Alexander Strizhakov	de34c4ee6b	changelog entry	4 years ago
Alexander Strizhakov	a050f3e015	fix for logger configuration through admin-fe	4 years ago
Ivan Tashkinov	c556efb761	[#1364 ] Enabled notifications on followed domain-blocked users' activities.	4 years ago
rinpatch	7ee35eb9a6	Merge branch 'fix/mix-tasks-failing-otp' into 'develop' Fix mix tasks failing on OTP releases Closes #1678 See merge request pleroma/pleroma!2369	4 years ago
rinpatch	2ba754ffe1	Fix mix tasks failing on OTP releases No idea why this was even added. Closes #1678	4 years ago
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	4 years ago
Ivan Tashkinov	88b16fdfb7	[#1364 ] Disabled notifications on activities from blocked domains.	4 years ago
rinpatch	c682563b92	Merge branch 'support/update_oban' into 'develop' [#1555] updated the Oban package See merge request pleroma/pleroma!2346	4 years ago
Maksim Pechnikov	ad92cef844	fix Oban migration	4 years ago
Maksim Pechnikov	c255c2e4f5	Merge branch 'develop' into support/update_oban	4 years ago
feld	aae22ab691	Merge branch 'chore/changelog-organization' into 'develop' Add a section for changelog entries that pertain to the next patch release. See merge request pleroma/pleroma!2366	4 years ago
Mark Felder	6ff8812ea3	Add a section for changelog entries that pertain to the next patch release. This will make it easier to keep changelogs synced between develop and stable branches.	4 years ago
Haelwenn	fc4f92c5de	Merge branch 'fix/support-conversations-pagination' into 'develop' Support pagination in conversations See merge request pleroma/pleroma!2329	4 years ago
Egor Kislitsyn	cf2a0574e7	Merge branch 'develop' into fix/support-conversations-pagination	4 years ago
Haelwenn	ce089615e1	Merge branch 'chore/fix-changelog' into 'develop' Chore/fix changelog See merge request pleroma/pleroma!2364	4 years ago
Haelwenn	4d33e0bd50	Merge branch 'bugfix/apc2s_upload_activity' into 'develop' bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316	4 years ago
Maksim Pechnikov	648cc699e5	Merge branch 'develop' into support/update_oban	4 years ago
Haelwenn	c433ed9dbb	Merge branch 'fix-otp-version-file-in-docker' into 'develop' Create OTP_VERSION file by `mix release` See merge request pleroma/pleroma!2362	4 years ago
kPherox	c2aad36aa8	Rename function	4 years ago
rinpatch	9abf13abe0	CHANGELOG.md: update 2.0.2 release date	4 years ago
rinpatch	adeb82e496	CHANGELOG.md: add 2.0.2 update notes	4 years ago
rinpatch	0b8f9a66ae	CHANGELOG.md: add entries for funkwhale-related changes	4 years ago
rinpatch	7306d2d069	CHANGELOG.md: Add 2.0.2 entry	4 years ago
rinpatch	2a08f44b02	CHANGELOG.md: Add upgrade notes for 2.0.1	4 years ago

1 2 3 4 5 ...

9112 Commits (f7e623c11c4b6f4f323a4317e9489092be73f9cd) All Branches Search

9112 Commits (f7e623c11c4b6f4f323a4317e9489092be73f9cd)

All Branches