970 Commits (aa9a6c3c056fde45b4c13c9c873cef9492b279e9)

Author	SHA1	Message	Date
Maksim Pechnikov	0d5088c2b8	remove `unread_conversation_count` from User	4 years ago
lain	0b621a834a	Chats: Add cascading delete on both referenced users. ... Also remove the now-superfluous join in the chat controller, which was only used to filter out these cases.	4 years ago
lain	82bf27172c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0	4 years ago
Mark Felder	f1b9e3595d	Update AdminFE build in preparation for 2.1.0 release	4 years ago
lain	ea2b5c07e3	Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0	4 years ago
rinpatch	f06444a289	Merge branch 'invisible-index' into 'develop' ... Migrations: Add an index on the `invisible` field on users. See merge request pleroma/pleroma!2895	4 years ago
lain	5ea752dab2	Migrations: Add an index on the `invisible` field on users.	4 years ago
Mark Felder	f510dc30b4	Update AdminFE bundle for 2.1.0 release	4 years ago
feld	14a06e63f6	Merge branch 'fix/activity-expirations-again' into 'develop' ... Fix activity expirations again See merge request pleroma/pleroma!2866	4 years ago
lain	5bcf15d553	Update frontend	4 years ago
lain	aaf7bd89a7	Migrations: Fix Logger requirements.	4 years ago
Mark Felder	b89fc1f227	Add warning to the migration	4 years ago
Alexander Strizhakov	57b455de5a	leave expirations with Create and Note types	4 years ago
lain	0589e9156a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again	4 years ago
Mark Felder	ff4e282aad	Ensure ap_id column in users table cannot be null	4 years ago
Egor Kislitsyn	304ed35743	Set `users.approval_pending` default to `false`	4 years ago
Mark Felder	024b7ce0b7	Merge branch 'develop' into fix/activity-expirations-again	4 years ago
rinpatch	15fa3b6bd8	20200802170532_fix_legacy_tags: chunk the user query	4 years ago
rinpatch	a818587467	20200802170532_fix_legacy_tags: Select only fields the migration needs ... Selecting the full struct will break as soon as a new field is added.	4 years ago
Mark Felder	761cc5b4a2	Don't filter on local	4 years ago
Mark Felder	2e7c5fe2de	Add migration to remove invalid activity expirations	4 years ago
lain	7755f49e28	Merge branch 'migrate-legacy-tags' into 'develop' ... Migrate legacy tags set by AdminFE to match TagPolicy, #2010 See merge request pleroma/pleroma!2836	4 years ago
lain	474aba984f	Merge branch 'unique-app-id' into 'develop' ... Add unique index for apps.client_id, fixes #2022 Closes #2022 See merge request pleroma/pleroma!2844	4 years ago
Mark Felder	079e410d6e	Add a migration to clean up activity_expirations table	4 years ago
Alex Gleason	184742af5e	Unique apps.client_id for new installations, fixes #2022	4 years ago
Alex Gleason	c2c3dd4613	Migrate legacy tags set by AdminFE to match TagPolicy, #2010	4 years ago
Alex Gleason	6f44a0ee84	Add configurable registration_reason limit	4 years ago
Alex Gleason	6747bf2e16	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Alex Gleason	6931dbfa58	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
Maksim Pechnikov	643664d583	added migrate old settings to new	4 years ago
Alex Gleason	c7a0016f9f	Migration to fix malformed Pleroma.Formatter config	4 years ago
Alex Gleason	67389b77af	Add AutolinkerToLinkify migration test	4 years ago
Alex Gleason	7045db5a50	Fix linkify ConfigDB migration	4 years ago
lain	5b1eeb06d8	Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" ... This reverts merge request !2784	4 years ago
lain	696c13ce54	Revert "Merge branch 'linkify' into 'develop'" ... This reverts merge request !2677	4 years ago
Alex Gleason	613e096389	Migrate :auto_linker --> Pleroma.Formatter in ConfigDB	4 years ago
Alex Gleason	02cc42e72c	Squash User approval migrations	4 years ago
Mark Felder	34d1d3e93e	Update FE bundle	4 years ago
Mark Felder	9d30bacace	Merge branch 'develop' into refactor/notification_settings	4 years ago
Alex Gleason	48983e9421	Merge remote-tracking branch 'upstream/develop' into by-approval	4 years ago
feld	2909dc873b	Merge branch '1940-admin-token-oauthless-auth' into 'develop' ... [#1940] Reinstated OAuth-less `admin_token` authentication Closes #1940 See merge request pleroma/pleroma!2760	4 years ago
rinpatch	8d56fb6d22	Migrate in-db config after updating to Oban 2.0	4 years ago
Ivan Tashkinov	cf3f8cb72a	[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).	4 years ago
Alex Gleason	5ddf0415c4	Accept `reason` in POST /api/v1/accounts and store in DB	4 years ago
Mark Felder	80c21100db	Merge branch 'develop' into refactor/notification_settings	4 years ago
Alex Gleason	a62f17da17	Add `approval_pending` field to User	4 years ago
lain	b39eb6ecc5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
lain	328062308a	Update frontend	4 years ago
Haelwenn	5ea6387572	Merge branch 'user-search-nickname-rank-boost' into 'develop' ... Improved search results for localized nickname match See merge request pleroma/pleroma!2733	4 years ago
Ben Is	b6de9b1987	Translated using Weblate (Italian) ... Currently translated at 100.0% (106 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/	4 years ago
Ben Is	11c9654a32	Translated using Weblate (Polish) ... Currently translated at 66.0% (70 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
lain	f4469dc741	Merge branch 'features/favicons' into 'develop' ... Add support for remote favicons See merge request pleroma/pleroma!2261	4 years ago
Dym Sohin	ab773fa5c9	[static-fe] limit according to- and within- existing ruleset	4 years ago
lain	8594181597	Update static-fe.css	4 years ago
Dym Sohin	8eecc708ef	fix wide2x emojis within nicknames	4 years ago
Ivan Tashkinov	123352ffa1	Removed unused trigram index on `users`. Fixed `users_fts_index` usage.	4 years ago
Haelwenn (lanodan) Monnier	013e2c5057	Use instances table instead of Cachex	4 years ago
lain	4c9295adcc	Update frontend	4 years ago
lain	f787eb1acf	Update frontend	4 years ago
lain	30d0df8e2f	Update frontend	4 years ago
lain	208baf157a	ActivityPub: Add new 'capabilities' to user.	4 years ago
lain	74b88c0a8b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information	4 years ago
Alexander Strizhakov	465ddcfd20	migration to delete migrated tesla setting	4 years ago
lain	8289ec67a8	Litepub: Add acceptsChatMessages to schema.	4 years ago
lain	37fdb05058	User, Migration: Change `accepts_chat_messages` to be nullable ... This is to model the ambiguous state of most users.	4 years ago
lain	8ad166e8e3	Migrations: Add `accepts_chat_messages` to users.	4 years ago
Mark Felder	a5d611abc2	Update AdminFE build to utilize new MRF metadata	4 years ago
Mark Felder	d69af7f742	Rename user.settings column ... This is used exclusively by MastoFE/GlitchFE now	4 years ago
Mark Felder	69848d5c97	Rename notification "privacy_option" setting	4 years ago
Mark Felder	fd5e797379	Simplify notification filtering settings further	4 years ago
Mark Felder	b950fb01db	Merge branch 'develop' into refactor/notification_settings	4 years ago
Mark Felder	d9e4623628	Update AdminFE build	4 years ago
Mark Felder	433c01b370	Merge branch 'develop' into refactor/notification_settings	4 years ago
lain	88ccade1cb	Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' ... admin api status count per instance See merge request pleroma/pleroma!2500	4 years ago
Roman Chvanikov	1471b70ef1	Merge develop	4 years ago
Alexander Strizhakov	cb96c82f70	moving to mrf namespace migration fix	4 years ago
Haelwenn	c7d69e9256	Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' ... Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320	4 years ago
lain	b7f297f0bd	Merge branch 'issue/1798' into 'develop' ... [#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655	4 years ago
Maksim Pechnikov	b0a40fc2e4	added verify RUM settings before start app	4 years ago
Ben Is	68c812eb2e	Translated using Weblate (Italian) ... Currently translated at 0.9% (1 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/	4 years ago
Ben Is	4f5af68b3e	Added translation using Weblate (Italian)	4 years ago
rinpatch	4ec2fb967e	Merge branch 'features/users-raw_bio' into 'develop' ... User: Add raw_bio, storing unformatted bio See merge request pleroma/pleroma!2326	4 years ago
Maksim Pechnikov	02a5648feb	fixed migration the settings to DB	4 years ago
Alexander Strizhakov	ed189568f3	moving mrf settings from instance to separate group	4 years ago
eugenijm	b15cfc3d36	Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page	4 years ago
Haelwenn (lanodan) Monnier	e313aa0977	static-fe.css: Restore and move to /priv/static/static-fe	4 years ago
lain	e1bc37d118	MigrationHelper: Move notification backfilling to own module.	4 years ago
Roman Chvanikov	604a83ae3e	merge develop	4 years ago
lain	eabf9317b5	Migrations: Add index on client_id and client_secret for apps. ... Greatly speeds up app lookup.	4 years ago
rinpatch	3687788cf2	Merge branch 'notification-fixes' into 'develop' ... Notification performance fixes See merge request pleroma/pleroma!2595	4 years ago
lain	1a11f0e453	Chats: Change id to flake id.	4 years ago
Haelwenn (lanodan) Monnier	e1b07402ab	User: Add raw_bio, storing unformatted bio ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1643	4 years ago
lain	9189b489ee	Migrations: Move Notification migration code to helper	4 years ago
lain	9fa3f0b156	Notification: Change type of `type` to an enum.	4 years ago
lain	a8ca030d85	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	00748e9650	ChatMessageReferences: Change seen -> unread	4 years ago
lain	7b79871e97	Migrations: Add chat_id, seen index to ChatMessageReferences ... This ensures fast count of unseen messages	4 years ago
lain	1e9efcf7c3	Migrations: Fix migration module name	4 years ago
lain	7f5c5b11a5	Chats: Remove `unread` from the db, calculate from unseen messages.	4 years ago
lain	8edead7c1d	Migration: Remove superfluous imports	4 years ago
lain	6413e06a86	Migrations: Add unique index to ChatMessageReferences.	4 years ago
lain	aa22fce8f4	ChatMessageReference: Introduce and switch in chat controller.	4 years ago
lain	879304dcd9	Merge branch 'replies-domain-block' into 'develop' ... Replies domain block Closes #1650 See merge request pleroma/pleroma!2622	4 years ago
lain	2860c66e88	Merge branch 'feature/embeddable-posts' into 'develop' ... Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	4 years ago
lain	6cd2fa2a4c	Migrations: Add a migration to backfill notification types.	4 years ago
lain	904295d53b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	805ab86933	Notifications: Make notifications save their type.	4 years ago
Fristi	81fb45a71b	Translated using Weblate (Dutch) ... Currently translated at 29.2% (31 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/	4 years ago
Alexander Strizhakov	7e6ec778d9	exclude replies on blocked domains	4 years ago
Egor Kislitsyn	6b84c62d4a	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	4 years ago
lain	af6d01ec93	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Mark Felder	d4b20c96c4	Migrate old notification settings to new variants	4 years ago
Mark Felder	d28b9708d2	Update AdminFE build, re-enables emoji packs	4 years ago
rinpatch	91f73a7592	Merge branch 'notification-fixes' into 'develop' ... Notification performance fixes See merge request pleroma/pleroma!2595	4 years ago
lain	73f222d76a	Migrations: Make user_id index on notifications better for query.	4 years ago
lain	acba7043be	Migrations: Add index on client_id and client_secret for apps. ... Greatly speeds up app lookup.	4 years ago
lain	ee35bb5ac2	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	fabc11bf9a	priv/static: Add a warning discouraging admins from modifying the static files directly	4 years ago
lain	814c3e5171	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn (lanodan) Monnier	c2dd4639d6	MastoFE: update to bundle-2020-05-20	4 years ago
Roman Chvanikov	1be6b3056e	Use indexed split_part/3 to get a hostname rather than ts_ functions	4 years ago
Roman Chvanikov	01bd6a1e54	Merge branch 'develop' into feature/admin-api-status-count-per-instance	4 years ago
lain	9c17109765	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Jędrzej Tomaszewski	4b6190baec	Translated using Weblate (Polish) ... Currently translated at 65.0% (69 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
Fristi	5725e03f55	Added translation using Weblate (Dutch)	4 years ago
lain	21c85a106c	Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop' ... PleromaFE bundle supporting `with_relationships` param See merge request pleroma/pleroma!2530	4 years ago
lain	aeacfb2479	Merge branch 'chore/update-fe-settings-and-docs' into 'develop' ... Synchronize PleromaFE settings See merge request pleroma/pleroma!2532	4 years ago
lain	f012c3a202	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Michał Sidor	0d074751b5	Translated using Weblate (Polish) ... Currently translated at 61.3% (65 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
Michał Sidor	08f5e49395	Translated using Weblate (Polish) ... Currently translated at 55.6% (59 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/	4 years ago
Michał Sidor	c2e57f2981	Added translation using Weblate (Polish)	4 years ago
Mark Felder	3525400eb2	Sync FE static/config.json	4 years ago
Roman Chvanikov	8a383707ae	Merge develop	4 years ago
Ivan Tashkinov	74912dd9ee	PleromaFE bundle supporting `with_relationships` param. ... https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49	4 years ago
Haelwenn (lanodan) Monnier	5f5681282e	Translated using Weblate (French) ... Currently translated at 100.0% (90 of 90 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/	4 years ago
rinpatch	3a63f84c45	pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7	4 years ago
lain	dcb5cda324	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	2ead4e108a	Merge branch 'migration-fix-markers' into 'develop' ... Markers migration: Fix migration for very large list of markers See merge request pleroma/pleroma!2511	4 years ago
rinpatch	952c6b29a1	Gettext: remove english messages and update the pot file ... Having an English file doesn't make any sense, since English is the source language for error messages. Also Weblate complains about it	4 years ago
lain	f6aa0b4a07	Migration: Fix typo	4 years ago
lain	f71376e30e	Migration: Enum.chunk is deprecated.	4 years ago
lain	d8dd945a03	Markers migration: Fix migration for very large list of markers	4 years ago
lain	c272669909	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	2ff79f9aae	insert skeletons migration: fix for non-local locals ... Apparently some instances have local users with local ap_ids that are marked as local: false. Needs more investigation into how that happened. In the meantime, the skeleton migration was patched to just ignore all known ap ids, not just locals. Doesn't seem to slow down the migration too much on patch.cx Closes #1746	4 years ago
rinpatch	0ad89762a1	insert skeletons migration: fix for non-local locals ... Apparently some instances have local users with local ap_ids that are marked as local: false. Needs more investigation into how that happened. In the meantime, the skeleton migration was patched to just ignore all known ap ids, not just locals. Doesn't seem to slow down the migration too much on patch.cx Closes #1746	4 years ago
rinpatch	d73e8b6b12	Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop' ... PleromaFE bundle dropping requirement for embedded account relationships See merge request pleroma/pleroma!2494	4 years ago
Roman Chvanikov	942093683a	Merge branch 'develop' into feature/admin-api-status-count-per-instance	4 years ago
Roman Chvanikov	cbe383ae83	Update stats admin endpoint	4 years ago
Mark Felder	6a291b1834	Restore deleted icons. No idea how this happened.	4 years ago
Roman Chvanikov	0c2b09a9ba	Add migration for counter_cache table update	4 years ago
Ivan Tashkinov	0e1bda55e8	PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications. ... 7a0e554daf	4 years ago
lain	7637ef4203	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	b078e0567d	Merge branch 'develop' into issue/1276-2	4 years ago
lain	fb2d284d28	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	4 years ago
lain	205313e541	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	fb38b7339c	Merge branch 'develop' into issue/1276-2	4 years ago
lain	8bed6ea922	User, Webfinger: Remove OStatus vestiges ... Mainly the `magic_key` field	4 years ago
lain	c40afe5ba0	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Maksim Pechnikov	fe7a0d660e	Merge branch 'develop' into issue/1276-2	4 years ago
rinpatch	e55876409b	Deactivate local users on deletion instead of deleting the record ... Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687	4 years ago
rinpatch	f08c8d9932	pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3	4 years ago
Ivan Tashkinov	f1bba5c787	PleromaFE bundle supporting follow request notifications. ... 5f90b6a384	4 years ago
Haelwenn (lanodan) Monnier	c6ddfa8f95	static-fe.css: Restore and move to /priv/static/static-fe	4 years ago
Mark Felder	06fbb95715	Update AdminFE build in preparation for the 2.0.3 release	4 years ago
Ivan Tashkinov	57b31e79c2	Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).	4 years ago
rinpatch	138e6ece1b	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	4 years ago
Maksim Pechnikov	a92c713d9c	Merge branch 'develop' into issue/1276-2	4 years ago
rinpatch	61889e00fc	Deactivate local users on deletion instead of deleting the record ... Prevents the possibility of re-registration, which allowed to read DMs of the deleted account. Also includes a migration that tries to find any already deleted accounts and insert skeletons for them. Closes pleroma/pleroma#1687	4 years ago
Mark Felder	3ead44a9aa	Update AdminFE build in preparation for the 2.0.3 release	4 years ago
lain	1d6338f2d3	Litepub: Add ChatMessage.	4 years ago
lain	139b9d1338	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
Haelwenn	79445ae5d2	Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403	4 years ago
Haelwenn	d698ecef9b	Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs	4 years ago
Haelwenn (lanodan) Monnier	eb61564005	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo	4 years ago
Mark Felder	24e0db6310	pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4	4 years ago
lain	8c2c325598	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
rinpatch	6936854878	Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398	4 years ago
Haelwenn (lanodan) Monnier	46f051048f	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering	4 years ago
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	4 years ago
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	4 years ago
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	4 years ago
lain	44bfb491ea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	4 years ago
lain	7c060432fc	Revert "Merge branch 'marker-update-fix' into 'develop'" ... This reverts merge request !2380	4 years ago
lain	d8b12ffd59	Marker update migration: Don't try to update virtual field.	4 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	5 years ago
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	5 years ago
Maksim Pechnikov	ad92cef844	fix Oban migration	5 years ago
Haelwenn (lanodan) Monnier	e89078ac2a	User: remove source_data	5 years ago
Haelwenn (lanodan) Monnier	9172d719cc	profile emojis in User.emoji instead of source_data	5 years ago
Haelwenn (lanodan) Monnier	62656ab259	User: Move inbox & shared_inbox to own fields	5 years ago
Haelwenn (lanodan) Monnier	19eedb3d04	User: Move public_key from source_data to own field	5 years ago
rinpatch	d9f36965f6	pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f	5 years ago
Mark Felder	c0a630d42f	Update AdminFE build in preparation for Pleroma 2.0.2	5 years ago
lain	19335be24c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	5 years ago
Ivan Tashkinov	3fa51f7272	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex	5 years ago
lain	fd97b0e634	Chats: Basic implementation.	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago