5970 Commits (4a181982c34c774c9ed4b76ce1d95f6c33fce9d5)

Author	SHA1	Message	Date
Mark Felder	5fcab23aa3	Improve error message for ConfigDB	4 years ago
Ivan Tashkinov	60b4654038	Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube). ... Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.	4 years ago
Alexander Strizhakov	35cad9793d	cache headers for emoji and images	4 years ago
Egor Kislitsyn	793fc77b16	Add active user count	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
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	2cb5c16723	Credo	4 years ago
Mark Felder	0b19534475	Merge branch 'develop' into docs/apache-config	4 years ago
Ivan Tashkinov	e7864a32d7	[#3213] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.	4 years ago
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Alexander Strizhakov	3f3d64acbf	little refactor and tests ... for voted & own_votes fields in polls	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	e5b32aab92	rename function	4 years ago
Mark Felder	003402df40	Add ability to invalidate cache entries for Apache	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	c041e9c630	[#3213] HashtagsTableMigrator: failures handling fix, retry function. ... Changed default hashtags filtering strategy to non-aggregate approach.	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	6d48144a9d	use proper naming ... for MediaProxyWarmingPolicy in ConcurrentLimiter	4 years ago
feld	958a7f6ed0	Merge branch 'fix/reblog-api' into 'develop' ... Fix Reblog API Closes #2423 See merge request pleroma/pleroma!3261	4 years ago
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	4 years ago
Egor Kislitsyn	1b79dce7bc	Fix Reblog API ... Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.	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	2c0fe2ea9e	Remove toggle_confirmation; require explicit state change ... Also cosmetic changes to make the code clearer	4 years ago
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	4 years ago
Mark Felder	ebd7d1365b	Make setting user activation status explicit	4 years ago
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	4 years ago
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	4 years ago
Lain Soykaf	39f3683a06	Pbkdf2: Use it everywhere.	4 years ago
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Ivan Tashkinov	3e4d84729a	[#3213] Prototype of data migrations functionality / HashtagsTableMigrator.	4 years ago
lain	9106048c61	Password: Replace Pbkdf2 with Password.	4 years ago
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	4 years ago
feld	5453038ce9	Merge branch 'fix/backup-url-on-s3' into 'develop' ... Standardize base url for uploads See merge request pleroma/pleroma!3246	4 years ago
lain	7a1cb752dd	Pagination: Don't be dos'd by random parameters.	4 years ago
Mark Felder	ef59d99833	Simplify. We will always have a result from Upload.base_url/0, so just add it to the list	4 years ago
Mark Felder	1040881047	Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains	4 years ago
lain	e1a547d7d3	ChatMessages: Fix pagination headers. ... They used to contain the path parameter `id` as query param, which would break the link.	4 years ago
Mark Felder	9887cdf9be	Formatting	4 years ago
feld	fa63f1b55b	Apply 4 suggestion(s) to 2 file(s)	4 years ago
Mark Felder	86dcfb4eb9	More places we should be using Upload.base_url	4 years ago
Mark Felder	ad79983614	Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase	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	3342f6a7ef	Backups: render ID in API	4 years ago
lain	ac1298fce8	Merge branch 'cleanup/unused-proxy-opts' into 'develop' ... Cleanup Pleroma.Upload proxy opts See merge request pleroma/pleroma!3236	4 years ago
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	4 years ago
Alex Gleason	20af025c65	AdminAPI: return user email	4 years ago
Mark Felder	d69c78ceb9	Remove configurability of upload proxy opts, simplify	4 years ago
Mark Felder	64116f63d9	URI.encode custom emojis	4 years ago
lain	20a269ed69	Merge branch 'fix/pagination-regression' into 'develop' ... Do not try to guess which pagination we need by the existence of an :offset param. Closes #2399 See merge request pleroma/pleroma!3230	4 years ago
lain	f0e6cff583	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases	4 years ago
lain	bea69853a2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff	4 years ago
lain	d44850d7a5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor	4 years ago
lain	8e5904daa5	SideEffects.DeleteTest: asyncify. ... Replace Mock with Mox, mock out Logger.	4 years ago
Mark Felder	83f27282ba	Do not try to guess which pagination we need by the existence of an :offset param. ... Require explicit request to get offset pagination.	4 years ago
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	4 years ago
Alex Gleason	0ec7e9b8e9	AdminAPI: return id for moderation log entries	4 years ago
feld	afe9c152ab	Merge branch 'fix/reports-ordering' into 'develop' ... Do not reverse order of reports. We want newest ones sorted to the top. Closes #2364 See merge request pleroma/pleroma!3225	4 years ago
Alex Gleason	0d6b9ce8ca	Apply 2 suggestion(s) to 1 file(s)	4 years ago
feld	2aa60e7592	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Ivan Tashkinov	303055456f	Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.	4 years ago
Alex Gleason	11d40e92b7	Render AKAs in Actor endpoints	4 years ago
Alex Gleason	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	4 years ago
Mark Felder	2597b028f7	Make pagination type conditional	4 years ago
Mark Felder	085d4e6cfc	Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset	4 years ago
Mark Felder	4c5f75f4e9	Support pagination in AdminAPI for user statuses	4 years ago
Mark Felder	744b34709d	Do not reverse order of reports. We want newest ones sorted to the top.	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
Haelwenn (lanodan) Monnier	18b536c176	Pleroma.Object/1: take %Object{} as argument instead	4 years ago
Ivan Tashkinov	14fae94c0e	[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.	4 years ago
Alexander Strizhakov	2e859794ee	non condition dir creation	4 years ago
Alexander Strizhakov	7bfb041658	insreasing test coverage for StealEmojiPolicy	4 years ago
Alexander Strizhakov	aafd7b44ce	check dir existence in policy	4 years ago
Ivan Tashkinov	4134abef63	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Ivan Tashkinov	cbb19d0e18	[#3213] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.	4 years ago
lain	e4f1d8f48c	Merge branch 'cachex-test' into 'develop' ... Test framework overhaul (speed, reliability) See merge request pleroma/pleroma!3209	4 years ago
Haelwenn (lanodan) Monnier	87b13c5430	Create Object.hashtags/1 wrapper	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
Ivan Tashkinov	ee221277b0	Encapsulation of tags / hashtags fetching from objects.	4 years ago
lain	ab633e51ab	Linting	4 years ago
lain	5db1e6c8d3	Pipeline test: Switch from Mock to Mox. ... Speeds up the test and makes it possible to run async.	4 years ago
lain	c9d73af74d	Cachex: Unify arity of callback function	4 years ago
Kaizhe Huang	fb02241580	Fix trailing whitespaces in lib/pleroma/web/web_finger.ex	4 years ago
lain	95a9bdfc37	Tests: Use NullCache for async tests. ... Caching can't work in async tests, so for them it is mocked to a null cache that is always empty. Synchronous tests are stubbed with the real Cachex, which is emptied after every test.	4 years ago
lain	713612c377	Cachex: Make caching provider switchable at runtime. ... Defaults to Cachex.	4 years ago
FiveYellowMice	83cd7f2b5f	WebFinger: add subscribe_address in return data of JSON responses	4 years ago
Alex Gleason	80891e83d8	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
lain	8b8c317c0f	Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop' ... Fix mastoapi ws posts dropping Closes #2336 See merge request pleroma/pleroma!3198	4 years ago
lain	6bb4f4e172	Merge branch 'support/2255_posix_errors' into 'develop' ... [#2255] added error messages for posix error code See merge request pleroma/pleroma!3138	4 years ago
Mark Felder	6dac2ac71a	Minor refactoring of the logic for hiding followers/following counts. ... Field is not nullable anymore, and this is more readable.	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
Alex Gleason	642729b49f	Fix AudioVideoValidator markdown	4 years ago
Alex Gleason	f8c93246d6	Refactor Earmark code, fix tests	4 years ago
Alex Gleason	e9e17e5df3	Upgrade Earmark to v1.4.10	4 years ago
Ivan Tashkinov	7fff9c1bee	Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).	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
Ivan Tashkinov	a010c5b16a	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Ivan Tashkinov	e9859b68fc	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	4 years ago
feld	6adad96c79	Merge branch 'issue/2256' into 'develop' ... [#2256] added subject actor to moderation log See merge request pleroma/pleroma!3164	4 years ago
Egor Kislitsyn	c9afb350e7	Document follow relationship updates and cleanup	4 years ago
Egor Kislitsyn	35ba48494f	Stream follow updates	4 years ago
Ivan Tashkinov	d50a3345ae	[#3112] Allowed revoking same-user token from any apps. Added tests.	4 years ago
Ivan Tashkinov	50e47a215f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Ivan Tashkinov	f1b07a2b2b	OAuth form user remembering feature. Local MastoFE login / logout fixes.	4 years ago
Alexander Strizhakov	6aadb1cb40	digest algorithm is taken from header	4 years ago
Ivan Tashkinov	12a5981cc3	Session token setting on token exchange. Auth-related refactoring.	4 years ago
Ivan Tashkinov	489b12cde4	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Ivan Tashkinov	ccc2cf0e87	Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.	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
feld	79a509ee61	Merge branch '2301-users-search-discoverability-fix' into 'develop' ... [#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162	4 years ago
feld	cd1b4155d5	Merge branch 'oban-jobs-to-simple-tasks' into 'develop' ... Moving some background jobs into simple tasks Closes #1790 See merge request pleroma/pleroma!3129	4 years ago
Maksim Pechnikov	66f411fba0	added subject actor to moderation log	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
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
lain	11e0d5f9ac	Password Resets: Don't accept tokens above a certain age. ... By default, one day	4 years ago
Alexander Strizhakov	8a8c154b4e	test fixes	4 years ago
Alexander Strizhakov	be0b874e1d	fix for mastodon forwarded reports	4 years ago
Alexander Strizhakov	e2bf6b1f7e	fix for forwarded reports	4 years ago
minibikini	6669ac5bf7	Merge branch 'develop' into 'hide-muted-reactions' ... # Conflicts: # CHANGELOG.md	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	6b32e1de23	Merge branch 'frontend-admin-api' into 'develop' ... Add an API to manage frontends Closes #2238 See merge request pleroma/pleroma!3108	4 years ago
Maksim Pechnikov	9c5d1cb9ed	fix tests	4 years ago
Maksim	25eb222bed	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Mark Felder	ccddedb504	Credo	4 years ago
Mark Felder	499faa82f6	Synchronize reaction notification text with PleromaFE's style	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	67a6abd071	Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions	4 years ago
Mark Felder	83ec2f1384	Allow subscribing for pleroma:emoji_reaction push notifications	4 years ago
Mark Felder	3ce11b830e	Add capability for emoji reaction push notifications	4 years ago
lain	bb9650f3c2	FrontendController: Return error on installation error.	4 years ago
feld	d33b9e7b33	Merge branch 'remove/fedsockets' into 'develop' ... Remove FedSockets See merge request pleroma/pleroma!3155	4 years ago
Egor Kislitsyn	f69fe36ebf	Merge branch 'develop' into frontend-admin-api	4 years ago
Egor Kislitsyn	79d2d3f609	Merge branch 'develop' into hide-muted-reactions	4 years ago
rinpatch	2c55f7d7cb	Remove FedSockets ... Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.	4 years ago
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
lain	81293e5aad	ActivityPubController: Don't return local only objects	4 years ago
Mark Felder	b1466661eb	Use absolute URLs to thumbnail and background in /api/v1/instance	4 years ago
Maksim Pechnikov	e4b202d905	added test	4 years ago
Egor Kislitsyn	fb41bd1a85	Hide reactions from muted and blocked users	4 years ago
Alex Gleason	9546c1444c	Merge remote-tracking branch 'upstream/develop' into registration-workflow	4 years ago
Maksim Pechnikov	36ec604521	added test	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
Maksim Pechnikov	1830b6aae5	added error messages for posix error code	4 years ago
Haelwenn	99bc175f02	Merge branch 'title-injection-change' into 'develop' ... Title injection change See merge request pleroma/pleroma!3132	4 years ago
Mark Felder	2156de2fee	Ingest blurhash field during transmogrification	4 years ago
Mark Felder	2254e5e595	Render blurhashes in Mastodon API	4 years ago
Mark Felder	6fd72e9e85	Ingest blurhash for attachments if they were federated	4 years ago
Egor Kislitsyn	d26a449396	Change endpoint path	4 years ago
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	4 years ago
lain	631def2df2	RedirectController: Don't replace title, but inject into the meta	4 years ago
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	4 years ago
Alexander Strizhakov	8da9f919f8	little changes for MRF config descriptions ... - log level reduction, if policy doesn't implement config_description method - docs in dev.md	4 years ago
Egor Kislitsyn	af3f00292c	Fix formatting	4 years ago
Egor Kislitsyn	0118ccb53c	Add `local` visibility	4 years ago
feld	3cd7ea693f	Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop' ... Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128	4 years ago
Alexander Strizhakov	8d218ebaf5	Moving some background jobs into simple tasks ... - fetching activity data - attachment prefetching - using limiter to prevent overload	4 years ago
Alexander Strizhakov	f97f24b067	making credo happy and test fix	4 years ago
Alexander Strizhakov	efc27f6464	fix for adminFE ... - revert UserAllowPolicy description - MRF descriptions order	4 years ago
Alexander Strizhakov	485697d96c	config descriptions for custom MRF policies	4 years ago
lain	d77fd6b3d0	Merge branch 'fix/html-title-load' into 'develop' ... Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125	4 years ago
Alexander Strizhakov	0c68b9ac13	escaping summary and other fields in xml templates	4 years ago
Sean King	e4a21084f0	Fix title on load of Pleroma HTML	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	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
Ivan Tashkinov	73e66fd31f	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	4 years ago
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	4 years ago
Egor Kislitsyn	ca95cbe0b4	Add `with_muted` param to ChatController.index/2	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	92d252f364	Poll Schema: Update and fix.	4 years ago
lain	1cfc3278c0	Poll View: Always return `voters_count`.	4 years ago
lain	c37118e6f2	Conversations: A few refactors	4 years ago
lain	91f6c32430	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4	4 years ago
Mark Felder	7efc074ead	Permit fetching individual reports with notes preloaded	4 years ago
Egor Kislitsyn	be52819a11	Hide chats from muted users	4 years ago
lain	24ce324973	Merge branch 'bugfix/poll_replies_count' into 'develop' ... side_effects: Don’t increase_replies_count when it’s an Answer Closes #2274 See merge request pleroma/pleroma!3114	4 years ago
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	4 years ago
Haelwenn (lanodan) Monnier	4caad4e910	side_effects: Don’t increase_replies_count when it’s an Answer	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
Ivan Tashkinov	04f6b48ac1	Auth subsystem refactoring and tweaks. ... Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.	4 years ago
eugenijm	8e41baff40	Add idempotency_key to the chat_message entity.	4 years ago
Egor Kislitsyn	d1698267a2	Fix credo warning	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Alibek Omarov	d63ec02f31	ConversationView: fix formatting	4 years ago
Alibek Omarov	9b93eef715	ConversationView: fix last_status.account being empty, fix current user being included in group conversations	4 years ago
Alibek Omarov	241bd061fc	ConversationView: add current user to conversations, according to Mastodon behaviour	4 years ago
minibikini	1cc8e94506	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn	131f3219e6	Merge branch 'issue/2069' into 'develop' ... [#2069] unread_conversation_count See merge request pleroma/pleroma!2939	4 years ago
feld	1cce1bd729	Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' ... [#2137] admin/users filters See merge request pleroma/pleroma!3016	4 years ago
Egor Kislitsyn	d83c2bd330	Add support for install via `file` and `build_url` params	4 years ago
Egor Kislitsyn	fa902867c0	Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination	4 years ago
Egor Kislitsyn	8542d2efee	Merge remote-tracking branch 'origin/develop' into feature/local-only-scope	4 years ago
Ivan Tashkinov	9f5f7dc9f9	Fixed User.is_discoverable attribute rendering in Admin API User view.	4 years ago
Ivan Tashkinov	da4a1e57b1	@doc fix.	4 years ago
Ivan Tashkinov	ba50dc05a8	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	d2b140a525	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261	4 years ago
Egor Kislitsyn	4a2d7a7a5d	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Haelwenn	d8d4bd15d0	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
Maksim Pechnikov	d28f72a55a	FrontStatic plug: excluded invalid url	4 years ago
minibikini	1bfd8528bb	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	291189357b	Merge branch 'develop' into feature/account-export	4 years ago
Mark Felder	9e54ef086b	Merge branch 'develop' into feature/account-export	4 years ago
feld	5aff479951	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
Egor Kislitsyn	03e306785b	Add an API endpoint to install a new frontend	4 years ago
lain	de6d49c8ce	ActivityPub: Add back debug call + explanation.	4 years ago
lain	9542c5d0f4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	4 years ago
Haelwenn	073ad7e6d9	Merge branch 'docs/ap_c2s' into 'develop' ... AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056	4 years ago
rinpatch	df61071422	Merge branch '2242-nsfw-case' into 'develop' ... Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive" Closes #2242 See merge request pleroma/pleroma!3094	4 years ago
lain	60e379ce0b	User: Correctly handle whitespace names.	4 years ago
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	4 years ago
Ivan Tashkinov	8a68673eed	[#3059] Formatting fix.	4 years ago
Ivan Tashkinov	8a55de1d78	[#3059] Fixed Phoenix 1.5 telemetry processing.	4 years ago
lain	8d251096fe	SideEffects: Correctly handle chat messages sent to yourself	4 years ago
Maksim Pechnikov	ef627b9391	fix module name	4 years ago
Maksim Pechnikov	44e5a57d1a	admin api: added user filters by `actor_types`	4 years ago
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	4 years ago
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	4 years ago
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	4 years ago
Haelwenn	2ca98f2d94	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Egor Kislitsyn	034ac43f3a	Fix credo warnings	4 years ago
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	ad605e3e16	Rename `Pleroma.Backup` to `Pleroma.User.Backup`	4 years ago
lain	e97b254c6b	Transmogrifier: Refactor and unify incoming tag handling	4 years ago
lain	39fd4d7639	Transmogrifier: Downcase incoming Hashtags ... Also, set sensitive to true if we have an nsfw hashtag present.	4 years ago
Egor Kislitsyn	98f32cf820	Fix tests	4 years ago
Egor Kislitsyn	76c4e80e5a	Merge branch 'develop' into mutes-blocks-pagination	4 years ago
Egor Kislitsyn	18a91d85e5	Merge branch 'develop' into feature/local-only-scope	4 years ago
Haelwenn	0495a07dc7	Merge branch '2239-mute-fixes' into 'develop' ... ActivityPub: Show own replies to muted users. Closes #2239 See merge request pleroma/pleroma!3084	4 years ago
Ivan Tashkinov	524fb0e4c2	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint. ... Added tests and documentation.	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Ivan Tashkinov	d54233760f	[#3053] Post-merge fix.	4 years ago
Ivan Tashkinov	049ece1ef3	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex	4 years ago
Haelwenn (lanodan) Monnier	aafdc975bd	federation_status: Add ApiSpec	4 years ago
Haelwenn (lanodan) Monnier	3b5a7a6b14	federation_status: New endpoint showing unreachable instances	4 years ago