5049 Commits (7eecc3b61d6da64e0bfdc5b155cba0dae07b84d5)

Author	SHA1	Message	Date
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	fee0c6a2cb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users	4 years ago
lain	e802b48d55	User: Use ObjectID type to validate also-known-as field	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	95a0ae8a35	AccountControllerTest: Fix test logic	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	0e93775ed0	Add test to validate profile pagination works with keyset	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
Alex Gleason	7b44605cb8	Migration to confirm previously-logged-in users	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
Mark Felder	e4791258d4	Ensure newest report is returned first in the list	4 years ago
Alex Gleason	64f0e96ff6	Automatically confirm logged-in users	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	4c5f75f4e9	Support pagination in AdminAPI for user statuses	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	7bfb041658	insreasing test coverage for StealEmojiPolicy	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
Alexander Strizhakov	538af14d52	possibility to run rollback in test env	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
lain	ab633e51ab	Linting	4 years ago
lain	1a3da01a65	Tests: Stub the pipeline in all tests. ... Restores the old un-moxed behavior.	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	0ef0aed205	Tests: Add a helper method to reduce sleeping times in test. ... This will 'time travel', i.e. change the inserted_at and update_at fields of the object in question. This is used to backdate things were we used sleeping before to ensure time differences.	4 years ago
lain	ba19975838	Linting	4 years ago
lain	9d5ce82221	Test: More async/sync tweaks.	4 years ago
lain	b17c36c45a	Tests: More test fixes.	4 years ago
lain	2f8ec8a9cc	XMLBuidlder test: Make async.	4 years ago
lain	9ba60f70d2	Tests: Make as many tests as possible async. ... In general, tests that match these criteria can be made async: - Doesn't use real Cachex. - Doesn't write to the Config / Application Environment. - Uses Mock. Using Mox is fine. - Uses the streamer.	4 years ago
lain	ee81a94ab2	Caching: Add caching behavior, add null implementation.	4 years ago
Kaizhe Huang	509f82e4d6	Add test for subscribe_address in JSON WebFinger response	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
lain	b4b68b71fc	Tests: Remove unneeded explicit cachex use. ... Only use cachex when we're actually testing it.	4 years ago
lain	c1129ff674	Tests: Reset all cachex caches between synchronous tests ... Don't bother in the async case, it doesn't make sense there.	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
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
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
lain	e73d878b38	Merge branch 'feat/warn-large-pool-size' into 'develop' ... Add a startup error for modified Repo pool_size See merge request pleroma/pleroma!3190	4 years ago
lain	50d16a9e27	ApplicationRequirements: Add test, more text for pool size.	4 years ago
Haelwenn (lanodan) Monnier	1403798820	instance.reachable?: Limit to binary input	4 years ago
Haelwenn (lanodan) Monnier	e1a2e8b17c	instance: Do not fetch unreachable instances ... Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346	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
Mark Felder	e3dd0d45b7	Slip in a test to ensure we can use the atom syntax in mix task arguments	4 years ago
Ivan Tashkinov	e00c667145	[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests. ... Minor fixes.	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
Mark Felder	657002e738	Answer new prompt interactively	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
rinpatch	1d04bd0894	Merge branch 'supported-emojos' into 'develop' ... Update Emoji support to unicode 13.1, support all RGI emoji. See merge request pleroma/pleroma!3186	4 years ago
lain	fa0d0b602f	Emoji: Also accept regional indicators	4 years ago
Haelwenn	05879a3b3e	Merge branch '2339-local-remote-mixup' into 'develop' ... User: Don't allow local users in remote changesets Closes #2339 See merge request pleroma/pleroma!3185	4 years ago
Mark Felder	e379ab8277	Add --force flag for delete and reset commands ... Bunch of reorganization and consolidation	4 years ago
Mark Felder	13947999ad	Use a callback strategy to short circuit the functions and print a nice error	4 years ago
Mark Felder	3e6d9187a7	Add tests for config dumping	4 years ago
Mark Felder	126d236455	We no longer expect mentions to link if they are prefixed with too many @'s	4 years ago
lain	8fb259e739	Emoji: Only accept RGI emoji. ... "recommended for general interchange"	4 years ago
lain	3b3cf63118	Emoji: Add test for ZWJ sequence emoji	4 years ago
Egor Kislitsyn	c9afb350e7	Document follow relationship updates and cleanup	4 years ago
lain	1adee08321	Emoji: Update to Unicode 13.1, switch base file, allow multichar.	4 years ago
lain	5d15486098	SideEffects: fix test	4 years ago
lain	222312900e	User: Don't allow local users in remote changesets	4 years ago
Egor Kislitsyn	35ba48494f	Stream follow updates	4 years ago
rinpatch	fc9ebe5073	Search tests: Use on_exit for restoring `persistent_term` state ... Otherwise if the assertion failed, the code below which resets the state would never be reached	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
Maksim Pechnikov	fb72f2034a	fix spec	4 years ago
Ivan Tashkinov	62993db499	Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements	4 years ago
Ivan Tashkinov	12a5981cc3	Session token setting on token exchange. Auth-related refactoring.	4 years ago
Mark Felder	54df44d380	Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters	4 years ago
Mark Felder	3283d0805f	Use Jason instead of Poison in tests	4 years ago
lain	67b15cc033	Search: Save detected pg version in a persistent term.	4 years ago
lain	f9a4cf2097	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch	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
lain	8532325d65	SearchController Test: Fix test.	4 years ago
lain	9a1e5f5d48	Search: Change search method based on detected pg version	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
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
lain	783fa797bb	SearchController Test: Fix test	4 years ago
lain	81b6f02a5e	Search Test: linting	4 years ago
lain	a60242464e	Search: Add option to search with the websearch function	4 years ago
Ivan Tashkinov	fcad3e716a	[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.	4 years ago
Alexander Strizhakov	46dab37351	little fix	4 years ago
lain	11e0d5f9ac	Password Resets: Don't accept tokens above a certain age. ... By default, one day	4 years ago
Alexander Strizhakov	4aaffe3a10	log capture	4 years ago
Alexander Strizhakov	be0b874e1d	fix for mastodon forwarded reports	4 years ago
Alexander Strizhakov	a840aefda8	formatting	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
Mark Felder	415481a4d9	Add test for POST when push is disabled ... Also group together the tests verifiying failure when disabled	4 years ago
Mark Felder	3eaa5335c9	Revert adding extra alert types here	4 years ago
Mark Felder	d9732fb7d3	Fix incorrect test description	4 years ago
Mark Felder	ff7a4b6aa2	Test that we ignore invalid subscription alert types separately.	4 years ago
Mark Felder	30f140e570	Ensure all supported push notification subscription alert types are tested	4 years ago
Mark Felder	499faa82f6	Synchronize reaction notification text with PleromaFE's style	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	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	d48dbfab2b	Merge remote-tracking branch 'origin/develop' into hide-muted-reactions	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	61f86774d1	Merge branch 'chores/note-handling-move' into 'develop' ... Chores/note handling move See merge request pleroma/pleroma!3122	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
Maksim Pechnikov	e1d25bad0c	fix tests	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
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
rinpatch	6ca709816f	Fix object spoofing vulnerability in attachments ... Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948	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	966663c3f8	Fix tests for other attachment types	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
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	485697d96c	config descriptions for custom MRF policies	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
Alexander Strizhakov	0c68b9ac13	escaping summary and other fields in xml templates	4 years ago
rinpatch	cc45c69fff	Remove release_env ... While taking a final look at instance.gen before releasing I noticed that the release_env task outputs messages in broken english. Upon further inspection it seems to have even more severe issues which, in my opinion, warrant it's at least temporary removal: - We do not explain what it actually does, anywhere. Neither the task docs nor instance.gen, nor installation instructions. - It does not respect FHS on OTP releases (uses /opt/pleroma/config even though we store the config in /etc/pleroma/config.exs). - It doesn't work on OTP releases, which is the main reason it exists. Neither systemd nor openrc service files for OTP include it. - It is not mentioned in install guides other than the ones for Debian and OTP releases.	4 years ago
Haelwenn (lanodan) Monnier	e010bb292b	NoteHandlingTest: Poison → Jason	4 years ago
Haelwenn (lanodan) Monnier	fa1f5d4442	Move TransmogrifierTest for Note to NoteHandlingTest	4 years ago
lain	6d850c46dc	AdminEmail: Use AP id as user url.	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	cb3cd3a761	TopicsTest: Small addition.	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	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	53dd048590	Test the note is returned when fetching a single report	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	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	4 years ago
Egor Kislitsyn	1a98476f48	Remove unused aliases	4 years ago
Alibek Omarov	1042c30fa5	ConversationViewTest: fix test	4 years ago
Alibek Omarov	0552a08dfd	ConversationControllerTest: fix test, 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	630eb0f939	ConversationViewTest: fix test #2	4 years ago
Alibek Omarov	149589c842	ConversationViewTest: fix test	4 years ago
Alibek Omarov	390a12d4c8	ConversationControllerTest: fix test	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	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
Egor Kislitsyn	4f90077767	Fix warning	4 years ago