1257 Commits (e1e0d5d75922c0e6738d97963f0df5ed4327d253)

Author	SHA1	Message	Date
Alexander Strizhakov	ad907254fb	changelog entry	4 years ago
rinpatch	f930e83fa2	Merge branch 'fix/remove_auto_nsfw' into 'develop' ... Remove sensitive setting #nsfw See merge request pleroma/pleroma!3223	4 years ago
Haelwenn (lanodan) Monnier	a22c53810b	Remove deprecated /api/qvitter/statuses/notifications/read	4 years ago
Ivan Tashkinov	946e0aab49	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn	7f413139fb	Merge branch 'openapi/admin/user' into 'develop' ... Add OpenAPI spec for AdminAPI.UserController See merge request pleroma/pleroma!3355	4 years ago
Ivan Tashkinov	92526e0230	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
lain	10f402af6d	Changelog: Re-add application support	4 years ago
lain	c5352e90be	Changelog, mix: merge in stable	4 years ago
Egor Kislitsyn	3aae5231b2	Add OpenAPI spec for AdminAPI.UserController	4 years ago
lain	7d790bb27b	Changelog: Remove application support line.	4 years ago
Ivan Tashkinov	882dd46843	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
lain	9f71b63c2d	Update changelog	4 years ago
Mark Felder	808e15b264	Document user agent leak fix	4 years ago
feld	8a563efdd8	Update CHANGELOG.md	4 years ago
lain	6a71aa535b	Merge branch 'admin-api-versioning' into 'develop' ... Pleroma APIs versioning Closes #2509 See merge request pleroma/pleroma!3335	4 years ago
lain	e6a14e1cd1	Merge branch 'feat/client_app_details' into 'develop' ... Support application field See merge request pleroma/pleroma!3311	4 years ago
Haelwenn (lanodan) Monnier	3bc7d12271	Remove sensitive-property setting #nsfw, create HashtagPolicy	4 years ago
Ivan Tashkinov	8f88a90ca3	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex	4 years ago
eugenijm	c1d63bbd9a	Reroute /api/pleroma to /api/v1/pleroma	4 years ago
Mark Felder	e31274f51d	Revert changelog entry that leaked from another branch.	4 years ago
Mark Felder	1cb417bce6	Document HeifToJpeg and its requirement of libheif's heic-convert tool	4 years ago
Alexander Strizhakov	1e6c27181e	expires_in in scheduled status params	4 years ago
rinpatch	6d66fadea7	Remove `:auth, :enforce_oauth_admin_scope_usage` ... `admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.	4 years ago
Haelwenn	e7b1f0f5f4	Merge branch 'feat/chat-list-pagination' into 'develop' ... Chats: Introduce /api/v2/pleroma/chats which implements pagination Closes #2140 See merge request pleroma/pleroma!3325	4 years ago
rinpatch	158f9f18ee	Merge branch 'remove-conversation-api' into 'develop' ... Add API endpoint to remove a conversation Closes #2488 See merge request pleroma/pleroma!3321	4 years ago
rinpatch	d7ad288c84	Chats: Introduce /api/v2/pleroma/chats which implements pagination ... Also removes incorrect claim that /api/v1/pleroma/chats supports pagination and deprecates it. Closes #2140	4 years ago
Egor Kislitsyn	cf6d3db58f	Add API endpoint to remove a conversation	4 years ago
Shpuld Shpuldson	0c73935de1	update changelog to mention change of avatar	4 years ago
Ivan Tashkinov	349b8b0f4f	[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).	4 years ago
Mark Felder	4b979538bc	Document the application metadata is now retained as part of the post.	4 years ago
Ivan Tashkinov	5992382cf8	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/mix/tasks/pleroma/database.ex # lib/pleroma/web/templates/feed/feed/_activity.rss.eex	4 years ago
Mark Felder	6e90b79d63	Lint	4 years ago
feld	593c0851d9	Merge branch 'develop' into 'new-user-emails'	4 years ago
Haelwenn	a5bee1bf35	Merge branch 'feat/mrf-noemptypolicy' into 'develop' ... MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. See merge request pleroma/pleroma!3309	4 years ago
Mark Felder	55a13fc360	MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. ... Helps prevent accidental button mashes from submitting incomplete posts	4 years ago
feld	85cb122986	Merge branch 'develop' into 'docs/improve-mailer-settings-desc' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	4dbb08a19f	Improved Mailer descriptions	4 years ago
Mark Felder	2a863987bc	Added: New user registration mail	4 years ago
Mark Felder	d047372291	Merge branch 'develop' into fix/reports-from-admins	4 years ago
Haelwenn	ea5469961a	Merge branch 'bugfix/notice-external-redirect' into 'develop' ... Redirect non-local activities when /notice/:id is used See merge request pleroma/pleroma!3300	4 years ago
Haelwenn (lanodan) Monnier	ecff027418	Redirect non-local activities when /notice/:id is used ... Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496	4 years ago
Mark Felder	000d3365c3	Document admin actors not getting report notifications	4 years ago
feld	008499f65a	Merge branch 'develop' into 'fix/2412-filters' ... # Conflicts: # CHANGELOG.md	4 years ago
feld	c3dd860a02	Merge branch 'fix/2449-scheduled-poll-bug' into 'develop' ... Fix for scheduled post with poll Closes #2449 See merge request pleroma/pleroma!3294	4 years ago
feld	8d2ea95402	Merge branch 'feature/2438-users-posts-total-count' into 'develop' ... Feature/2438 users/instances posts total count Closes #2438 See merge request pleroma/pleroma!3270	4 years ago
Ivan Tashkinov	4e14945670	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/activity_pub/activity_pub.ex	4 years ago
feld	fd2477dfba	Merge branch 'a1batross-develop-patch-62810' into 'develop' ... mix: instance: ensure all needed folders are created before generating config See merge request pleroma/pleroma!3284	4 years ago
feld	f1f773f2c7	Merge branch 'email-stub-in-verify-credentials' into 'develop' ... Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike) See merge request pleroma/pleroma!3286	4 years ago
Mark Felder	d0b4a49f16	Merge branch 'develop' into a1batross-develop-patch-62810	4 years ago
Mark Felder	c118bdb8f0	Merge branch 'develop' into a1batross-develop-patch-62810	4 years ago
Mark Felder	d0c2159b77	Mix pleroma.instance creates parent directories now	4 years ago
feld	d37d4106c6	Merge branch 'fix/majic-nits' into 'develop' ... Majic: don't fix extensions See merge request pleroma/pleroma!3287	4 years ago
Mark Felder	92efdf9adc	Document OAuth 2.0 provider fqn field addition	4 years ago
Mark Felder	f852e8d2d2	Document we are disabling the extension fixup in Majic	4 years ago
feld	d289ad8579	Merge branch 'develop' into 'fix/2411-mutes-api' ... # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md	4 years ago
feld	6a2d3fb9a3	Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop' ... fix and delete purge activities duplicates Closes #2473 See merge request pleroma/pleroma!3285	4 years ago
Mark Felder	22486fb4af	Improve changelog description	4 years ago
feld	cd5ff7a943	Merge branch 'develop' into 'feature/2164-unify-api-arguments' ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	0dc68c157f	fix for scheduled post with poll	4 years ago
Alexander Strizhakov	fdf1dfed56	only_remote -> remote renaming	4 years ago
Alexander Strizhakov	77f0a0af7d	more tests and update for docs and changelog	4 years ago
Alexander Strizhakov	e21af1cfe4	only_media & only_remote docs and changelog	4 years ago
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	c369d2b930	support for with_relationships parameter ... in /api/v1/mutes and /api/v1/accounts/:id endpoints	4 years ago
Alexander Strizhakov	dd1be13f75	changelog entry	4 years ago
Egor Kislitsyn	13a2ae8ce0	Update CHANGELOG	4 years ago
Alexander Strizhakov	d4158e8bf0	added total ... to the instance adminAPI endpoint	4 years ago
Alexander Strizhakov	6806c03e85	added total ... to the user statuses adminAPI endpoint	4 years ago
feld	d7af0294e6	Merge branch 'service-worker-allowed-header' into 'develop' ... Ability to set custom HTTP headers per each frontend See merge request pleroma/pleroma!3247	4 years ago
lain	229acae6c3	Merge branch 'develop' into '2435-list-multiple-users' ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	875fbaae35	support for expires_in/expires_at in filters	4 years ago
Haelwenn	250e202098	Merge branch 'fix/missing-own_votes' into 'develop' ... Include own_votes in the poll data See merge request pleroma/pleroma!3274	4 years ago
Mark Felder	01fc7d809d	Clarify the state of mediaproxy cache invalidation for Apache	4 years ago
Mark Felder	0b19534475	Merge branch 'develop' into docs/apache-config	4 years ago
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Mark Felder	5e8da27e14	Provide pleroma.user mix task for both activate and deactivate	4 years ago
Mark Felder	fe63b48c8f	Document removal of toggle_activated	4 years ago
Mark Felder	537ba1c5e0	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	6bfd497f4a	Include own_votes in the poll data	4 years ago
Ivan Tashkinov	218c519606	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # test/pleroma/web/mastodon_api/views/status_view_test.exs	4 years ago
Mark Felder	80ccdb56f6	Make tag urls absolute	4 years ago
Mark Felder	c29cf65ec7	Document improved Apache support	4 years ago
eugenijm	7fcaa188a0	Allow to define custom HTTP headers per each frontend	4 years ago
eugenijm	133644dfa2	Ability to set the Service-Worker-Allowed header	4 years ago
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Alexander Strizhakov	5ade430e46	changed naming in changelog	4 years ago
Mark Felder	1537a4f0ad	Document ConcurrentLimiter for RichMedia and MediaProxy	4 years ago
feld	2926713fe5	Merge branch 'deprecate-public_endpoint' into 'develop' ... Deprecate Uploaders.S3, :public_endpoint See merge request pleroma/pleroma!3251	4 years ago
Egor Kislitsyn	695dabb5da	Add Reblog fix to CHANGELOG	4 years ago
rinpatch	79bc4bcc3c	Merge branch 'stable' into mergeback/2.2.2	4 years ago
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	ab32ede102	Document new is_approved attribute	4 years ago
feld	0ad6ea2057	Merge branch 'refactor/confirmation_pending_user_field' into 'develop' ... Change user.confirmation_pending field to user.is_confirmed See merge request pleroma/pleroma!3081	4 years ago
Mark Felder	a9f9fb002c	Document new is_confirmed attribute	4 years ago
Mark Felder	096e61fe93	Keep *Breaking* at the top	4 years ago
Lain Soykaf	71166b30a4	Changelog: Add list fix.	4 years ago
rinpatch	605f389038	CHANGELOG.md: Finalize 2.2.2 changelog	4 years ago
lain	3dc04b9aca	Merge branch 'fix/missing_emoji_steal_dir' into 'develop' ... Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218	4 years ago
rinpatch	cbb1174cbd	CHANGELOG.md: Remove wrong entries from Unreleased(patch) ... Webpush changes are under 2.3.0 milestone and therefore should be under Unreleased section The emoji reaction change was introduced in 2.2.1	4 years ago
Ivan Tashkinov	48b399cedb	[#3213] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).	4 years ago
Mark Felder	7516660753	Remove toggle_activation	4 years ago
Mark Felder	2b93351bd7	Document deprecation	4 years ago
lain	80167e62dd	Merge branch 'fix/missing_emoji_steal_dir' into 'develop' ... Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218	4 years ago
Alex Gleason	b7b05a0748	Oopsie whoopsie fix changelog	4 years ago
Alex Gleason	1438fd9583	Merge remote-tracking branch 'upstream/develop' into block-behavior	4 years ago
lain	f0e6cff583	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases	4 years ago
Mark Felder	83d97ab98e	Document reports ordering change	4 years ago
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" ... This reverts merge request !2824	4 years ago
Haelwenn	b122b6ffa3	Merge branch 'features/hashtag-column' into 'develop' ... Insert text representation of hashtags into object["hashtags"] See merge request pleroma/pleroma!2824	4 years ago
Alexander Strizhakov	546da68a11	changelog entry	4 years ago
Mark Felder	5b838accc0	Update Linkify to 0.4.1 ... Fixes false positive detection of IPv4 addresses	4 years ago
lain	ae934659d1	Align changelog	4 years ago
lain	5ada38499b	Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1	4 years ago
lain	322463e1bd	Update changelog	4 years ago
lain	463eec992a	Apply 1 suggestion(s) to 1 file(s)	4 years ago
lain	b988e9cc8b	Mix: Update version.	4 years ago
lain	a8ca282b4a	Update changelog	4 years ago
lain	d788b41c2e	Report fixes.	4 years ago
lain	0f527c9e02	Mix: Update linkify to 0.4.1	4 years ago
lain	66c75b0192	Update changelog	4 years ago
Mark Felder	42a386eb9f	Document fixing the pleroma.user delete_activities mix task	4 years ago
Mark Felder	93852f1b42	Document S3 and Elixir 1.11 compat fix	4 years ago
Haelwenn (lanodan) Monnier	aa848cbd75	pleroma.instance: Fix Exiftool module name	4 years ago
Haelwenn (lanodan) Monnier	acb03d591b	Insert text representation of hashtags into object["hashtags"] ... Includes a new mix task: pleroma.database fill_old_hashtags	4 years ago
Alex Gleason	80891e83d8	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Alexander Strizhakov	c37f78d1c8	changelog	4 years ago
Alexander Strizhakov	cebe3c7def	Fix for dropping posts/notifs in WS when mix task is executed ... - start oban in mix tasks with empty queues, plugins and crontab - fix for update_users_following_followers_counts - fix for removed logo.png - typo in resend confirmation emails mix task docs - fix for uploads mix task (start Majic.Pool) - fix for creating user mix task (start :fast_html app)	4 years ago
Mark Felder	dfde4af0fd	Fixed Rich Media Previews	4 years ago
lain	477c6c8e55	Merge branch 'auth-improvements' into 'develop' ... Cookie auth rework / Auth subsystem refactoring and tweaks Closes pleroma/secteam/pleroma#3 See merge request pleroma/pleroma!3112	4 years ago
lain	1436a2fa2d	Merge branch 'stream-follow-updates' into 'develop' ... Stream follow updates Closes #2299 See merge request pleroma/pleroma!3183	4 years ago
Egor Kislitsyn	97068196a9	Update CHANGELOG	4 years ago
Ivan Tashkinov	36ce45a28c	[#3112] Changelog entry.	4 years ago
Ivan Tashkinov	c8e7ace812	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements ... # Conflicts: # CHANGELOG.md	4 years ago
lain	ed76323776	Merge branch 'feature/configdb-mix-tasks' into 'develop' ... Add mix tasks to give additional ConfigDB recovery and debugging options See merge request pleroma/pleroma!3174	4 years ago
Ivan Tashkinov	a010c5b16a	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Mark Felder	24673b6ca3	Add entry announcing new ConfigDB mix tasks	4 years ago
lain	9feb678ec8	Docs, Changelog: Add info about regional indicators	4 years ago
lain	a0aece3223	Changelog: Update changelog	4 years ago
Ivan Tashkinov	f1b07a2b2b	OAuth form user remembering feature. Local MastoFE login / logout fixes.	4 years ago
lain	f9a4cf2097	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	4 years ago
Alex Gleason	4999efad3f	Update CHANGELOG.md: registration workflow	4 years ago
Alex Gleason	30ed7b502f	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
feld	ecd1ef8cb5	Merge branch 'fix/2302-report-duplicates' into 'develop' ... Fix for forwarded reports Closes #2303 and #2302 See merge request pleroma/pleroma!3146	4 years ago
lain	cc52f03566	Changelog: Add info about search changes	4 years ago
Ivan Tashkinov	b27d8f7437	Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix ... # Conflicts: # CHANGELOG.md	4 years ago
lain	5e04f4156c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	4 years ago
Ivan Tashkinov	e164c37139	[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.	4 years ago
Haelwenn	c8d11c3064	Merge branch '2317-old-reset-tokens' into 'develop' ... Resolve "Don't allow old password reset tokens" Closes #2317 See merge request pleroma/pleroma!3160	4 years ago
rinpatch	1eda5ab267	CHANGELOG.md: Move rum fix entry to patch section ... Also includes minor cosmetical fixes.	4 years ago
lain	3b86ad0744	Changelog: Document breaking change.	4 years ago
lain	1bad91cba2	Changelog: Add info about the websearch option	4 years ago
lain	2ee0fc194a	Changelog: Add info about search fixes.	4 years ago
lain	21eaaf491c	Changelog: Add info about reset tokens	4 years ago
Alexander Strizhakov	44f3795b8e	changelog entries for fixes	4 years ago
minibikini	6669ac5bf7	Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	1d03ba4ffb	Fixed emoji reactions not being filtered from blocked and muted accounts	4 years ago
feld	a1056aace1	Merge branch 'fix/mix-task-user-delete_activities' into 'develop' ... Fix mix pleroma.user delete_activities task See merge request pleroma/pleroma!3156	4 years ago
lain	aae669d05e	Merge branch 'fix/webpush-and-emojireact' into 'develop' ... Push notifications: add pleroma:emoji_reaction, improve tests Closes #2185 See merge request pleroma/pleroma!3141	4 years ago
lain	1b63aa0b4f	Apply 1 suggestion(s) to 1 file(s)	4 years ago
lain	d7b63272b8	Changelog: Move api info to api heading.	4 years ago
Mark Felder	5d0bc5e028	Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription	4 years ago
Mark Felder	56d95203b5	Document fixing the pleroma.user delete_activities mix task	4 years ago
Egor Kislitsyn	f69fe36ebf	Merge branch 'develop' into frontend-admin-api	4 years ago
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
rinpatch	11d8fefa7b	CHANGELOG.md: Use a period after every bullet point for unreleased sections ... It has been the de-facto style for a while now, however it is not enforced, so there were some entries that didn't use it.	4 years ago
rinpatch	ba214f3f16	CHANGELOG.md: Add back an entry for S3 fix	4 years ago
rinpatch	77c239f309	Import stable commits into develop after releasing 2.2.0 ... Updates the frontend bundle and syncs the changelog.	4 years ago
Mark Felder	5cbaa76fd6	Document S3 and Elixir 1.11 compat fix	4 years ago
Alex Gleason	9546c1444c	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Haelwenn	28da36975d	Merge branch 'bugfix/instance-gen_exiftool' into 'develop' ... pleroma.instance: Fix Exiftool module name See merge request pleroma/pleroma!3143	4 years ago
Haelwenn (lanodan) Monnier	e2f573d68b	pleroma.instance: Fix Exiftool module name	4 years ago
lain	0d149502fe	Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' ... fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912	4 years ago
Ilja	70e4b86250	Make notifs view work for reports ... * These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)	4 years ago
rinpatch	99edfba3da	Polish the changelog a bit and specify release date	4 years ago
lain	b0e4e0cf2a	Changelog: Add info about title injection	4 years ago
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	4 years ago
Egor Kislitsyn	af3f00292c	Fix formatting	4 years ago
lain	88f6b61a5e	Merge branch '2260-wrong-report-link' into 'develop' ... Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121	4 years ago
rinpatch	6166ecdbc8	CHANGELOG.md: Add an entry for the spoofing fix	4 years ago
Haelwenn	4d693b5e54	Merge branch '2236-no-name' into 'develop' ... Resolve "Account cannot be fetched by some instances" Closes #2236 See merge request pleroma/pleroma!3101	4 years ago
feld	48f7e12e6c	Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop' ... OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053	4 years ago
feld	86b4149a13	Merge branch '1668-prometheus-access-restrictions' into 'develop' ... [#1668] App metrics endpoint (Prometheus) access restrictions Closes #1668 See merge request pleroma/pleroma!3093	4 years ago
lain	5ddf0be208	Changelog: Add info about admin email user link changes.	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
lain	bae48c98e3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	4 years ago
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	4 years ago
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	4 years ago
lain	eb1e1e7494	Changelog: Add info about federation status endpoint	4 years ago
rinpatch	7058cac1c2	Merge branch '2257-self-chat' into 'develop' ... Resolve "Can't message yourself in a chat (but can start it)" Closes #2257 See merge request pleroma/pleroma!3099	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	4 years ago
lain	c7bcbfbc1d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
lain	f09bb814a9	Changelog: Add info about poll view changes	4 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	4 years ago
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	4 years ago
feld	38b481d112	Merge branch 'feature/account-export' into 'develop' ... Add account export Closes #847 See merge request pleroma/pleroma!2918	4 years ago
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Alibek Omarov	5591dc0248	Add entry in changelog	4 years ago