652 Commits (e4323141056afc47c2bef7352aaca90edc467a64)

Author	SHA1	Message	Date
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	5 years ago
Ivan Tashkinov	84f0aec9aa	Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.	5 years ago
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
rinpatch	d6c89068f3	HTML: Compile Scrubbers on boot ... This makes it possible to configure their behavior on OTP releases.	5 years ago
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	5 years ago
Maxim Filippov	4b60d41db9	Add report notes	5 years ago
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	5 years ago
rinpatch	0d24ab04c5	Merge branch 'remove-info-from-users' into 'develop' ... Removed users.info field See merge request pleroma/pleroma!2006	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
lain	f0bdbe3f61	Migrations: Set users.following_count to NOT NULL ... Also set following_count for local users to the correct value and for remote users to 0.	5 years ago
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	5 years ago
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	5 years ago
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	5 years ago
Ivan Tashkinov	4f88b1b435	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
rinpatch	0fe08346db	bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7	5 years ago
Ivan Tashkinov	aad6576130	[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.	5 years ago
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Phil Hagelberg	274cc18e8a	Visually separate header.	5 years ago
Phil Hagelberg	1dc785b74b	Move static-fe CSS to a separate file.	5 years ago
rinpatch	3cc2437598	Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642	5 years ago
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	5 years ago
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	57995fa8cf	fix migrate ... update migrate	5 years ago
Haelwenn	9d8da9ea15	Merge branch 'fix/migration-schema' into 'develop' ... Fix bookmark migration using a query with a schema See merge request pleroma/pleroma!1923	5 years ago
Maksim Pechnikov	fd8099fb68	Merge branch 'develop' into issue/1276	5 years ago
lain	e14cae25aa	Merge branch 'refactor/db-add-defaults' into 'develop' ... Set defaults to fields with NULL values Closes #1358 See merge request pleroma/pleroma!1914	5 years ago
Maksim Pechnikov	1b82eb6d41	move sql (update_markers) from migrate to mix task	5 years ago
Maksim Pechnikov	d719078699	Merge branch 'develop' into issue/1276	5 years ago
Roman Chvanikov	8bb6da7cd6	Remove following column from the migrations	5 years ago
rinpatch	c546da7cfe	Fix bookmark migration using a query with a schema ... This resulted in failures when updating from Pleroma <1.0 because of all the new fields that were added to the user schema.	5 years ago
Egor Kislitsyn	40d5fb6ef8	Add a migration to fix blocked follows	5 years ago
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	5 years ago
rinpatch	3e09b7c5ae	Fix two migrations sharing the same module name ... This makes ecto execute only the latter one.	5 years ago
kPherox	5334190056	Migrate missing follow requests	5 years ago
Roman Chvanikov	435d220700	Move setDefaultsToTables to past to run before notNull migrations	5 years ago
Roman Chvanikov	4b0893631f	Complete defaults	5 years ago
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	5 years ago
Egor Kislitsyn	3c86a0ab24	Fix `SetNotNullForUsers` migration	5 years ago
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	5 years ago
Roman Chvanikov	0be9cb086b	Add migration	5 years ago
kaniini	060adfd762	Merge branch 'improve-user-info-migration' into 'develop' ... User info migration improvements See merge request pleroma/pleroma!1887	5 years ago
kaniini	fbadd36cc0	Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop' ... Add NOT NULL constraints for users table See merge request pleroma/pleroma!1910	5 years ago
kaniini	a9cadf3905	Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop' ... Add NOT NULL constraints for user_invite_tokens table See merge request pleroma/pleroma!1909	5 years ago
kaniini	4a72d39ca6	Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop' ... Add NOT NULL constraints for thread_mutes table See merge request pleroma/pleroma!1908	5 years ago
kaniini	e94144669a	Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop' ... Add NOT NULL constraints for scheduled_activities table See merge request pleroma/pleroma!1907	5 years ago
kaniini	9e084771c6	Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop' ... Add NOT NULL constraints for registrations table See merge request pleroma/pleroma!1906	5 years ago
kaniini	3ac6160299	Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop' ... Add NOT NULL constraints for push_subscriptions table See merge request pleroma/pleroma!1905	5 years ago
kaniini	26daaa9f04	Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop' ... Add NOT NULL constraints for password_reset_tokens table See merge request pleroma/pleroma!1904	5 years ago
kaniini	1fc591fcfc	Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop' ... Add NOT NULL constraints for objects table See merge request pleroma/pleroma!1903	5 years ago
kaniini	8b204b4d71	Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop' ... Add NOT NULL constraints for oauth_authorizations table See merge request pleroma/pleroma!1902	5 years ago
kaniini	fe97493d91	Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop' ... Add NOT NULL constraints for oauth_tokens table See merge request pleroma/pleroma!1901	5 years ago
kaniini	84e992d85b	Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop' ... Add NOT NULL constraints for notifications table See merge request pleroma/pleroma!1900	5 years ago
kaniini	19a625459b	Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop' ... Add NOT NULL constraints for moderation_log table See merge request pleroma/pleroma!1899	5 years ago
kaniini	79702b54b6	Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop' ... Add NOT NULL constraints for markers table See merge request pleroma/pleroma!1898	5 years ago
kaniini	2e7e43c853	Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop' ... Add NOT NULL constraints for lists table See merge request pleroma/pleroma!1897	5 years ago
kaniini	75dab79183	Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop' ... Add NOT NULL constraints for instances table See merge request pleroma/pleroma!1896	5 years ago
kaniini	24699b991a	Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop' ... Add NOT NULL constraints for filters table See merge request pleroma/pleroma!1895	5 years ago
kaniini	3ac8eb4046	Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop' ... Add NOT NULL constraints for conversation_participations table See merge request pleroma/pleroma!1894	5 years ago
kaniini	6be16b8617	Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop' ... Add NOT NULL constraints for conversation_participation_recipient_ships table See merge request pleroma/pleroma!1893	5 years ago
kaniini	b05fbc890e	Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop' ... Add NOT NULL constraints for config table See merge request pleroma/pleroma!1892	5 years ago
kaniini	8785d7ba5d	Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop' ... Add NOT NULL constraints for bookmarks table See merge request pleroma/pleroma!1891	5 years ago
kaniini	93f6f173ce	Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop' ... Add NOT NULL constraints for apps table See merge request pleroma/pleroma!1890	5 years ago
kaniini	5cb5f9a270	Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop' ... Add NOT NULL constraints for activity_expirations table See merge request pleroma/pleroma!1889	5 years ago
Roman Chvanikov	175f6c8355	Add migration	5 years ago
Roman Chvanikov	bdb2039453	Add migration	5 years ago
Roman Chvanikov	f5f9197fce	Add migration	5 years ago
Roman Chvanikov	2e608f7cbf	Add migration	5 years ago
Roman Chvanikov	2810729218	Add migration	5 years ago
Roman Chvanikov	cf72b7649e	Add migration	5 years ago
Roman Chvanikov	a4cf664385	Add migration	5 years ago
Roman Chvanikov	776c31267f	Add migration	5 years ago
Roman Chvanikov	c0b0fb19c8	Add migration	5 years ago
Roman Chvanikov	5fece5f8bc	Put correct migration	5 years ago
Roman Chvanikov	d58cca5f0a	Add migration	5 years ago
Roman Chvanikov	cf0fa124a2	Add migration	5 years ago
Roman Chvanikov	13cc52dc60	Add migration	5 years ago
Roman Chvanikov	55203c198b	Add migration	5 years ago
Roman Chvanikov	b85bee32da	Add migration	5 years ago
Roman Chvanikov	b33aacc4fb	Add migration	5 years ago
Roman Chvanikov	382e83fab5	Add migration	5 years ago
Roman Chvanikov	0223dc4e02	Add migration	5 years ago
Roman Chvanikov	d12555a69e	Add migration	5 years ago
Roman Chvanikov	7ac42fefe3	Add migration	5 years ago
Roman Chvanikov	c1ff8472fd	Add migration	5 years ago
Roman Chvanikov	5cb03fe801	Add migration	5 years ago
Roman Chvanikov	cd0218c205	Add migration	5 years ago
Roman Chvanikov	6e7fd364a4	Add migration	5 years ago
rinpatch	12ab7b3280	User info migration improvements ... - Move column additions into a separate migration, so postgres doesn't need an exclusive lock on the table for the main part - Fill in columns by using one big update statement instead of a bunch of small ones because it's much faster (the migration took 140s on patch.cx database)	5 years ago
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	d3fb9e02cc	add tests	5 years ago
Maksim Pechnikov	aa64b3108b	fix migrate	5 years ago
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
Ivan Tashkinov	11cd994425	[#1304] Fixed null::jsonb handling in User.Info migration.	5 years ago
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	5 years ago
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged `develop`, handled User.Info.invisible.	5 years ago
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	5 years ago
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	5 years ago
Egor Kislitsyn	f726d953d5	Fix typos	5 years ago
kaniini	2ebe8c416a	Merge branch 'feature/activitypub-semantics' into 'develop' ... activitypub semantics See merge request pleroma/pleroma!1798	5 years ago
Egor Kislitsyn	e37d4b2ddf	Revert "Skip deactivated users in followers import" ... This reverts commit 8ad015ef64.	5 years ago
Ivan Tashkinov	75da202ab7	[#1304] Typo fix.	5 years ago
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	5 years ago
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	5 years ago
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	5 years ago
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	5 years ago
Ariadne Conill	34754938ba	add missing migration to drop websub table	5 years ago
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	5 years ago
rinpatch	39e996528c	Fix a migration wiping user info of users that don't have any mutes ... And introduce safe_jsonb_set	5 years ago
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	5 years ago
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
Egor Kislitsyn	8ad015ef64	Skip deactivated users in followers import	5 years ago
Egor Kislitsyn	059005ff82	Replace `user.following` with Pleroma.FollowingRelationship	5 years ago
Egor Kislitsyn	2c7ff32e5b	Add `thread_visibility` to migrations	5 years ago
lain	d7f9679ff2	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Egor Kislitsyn	761ad0b48e	Split CreateFollowingRelationships to multiple migrations	5 years ago
Egor Kislitsyn	6291eaa590	Update CreateFollowingRelationships	5 years ago
rinpatch	32808208be	Enable `mix format` for migrations	5 years ago
Egor Kislitsyn	12ebeef130	Add CreateFollowingRelationships migration	5 years ago
rinpatch	a502155274	Bump pleroma-fe bundle to 122323f35c	5 years ago
lain	e8395bedd2	Merge branch 'develop' into 'reactions' ... # Conflicts: # priv/static/schemas/litepub-0.1.jsonld	5 years ago
Ariadne Conill	19962d2022	clean up bundled litepub schema (closes #1303)	5 years ago
lain	73b6512907	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
rinpatch	ee88afb2e2	Fix muted notification migration only working with a schema ... Should also improve performance. I tested it on my local DB, but if anyone has a backup of <=1.0 db they can test this on, please do	5 years ago
rinpatch	125f96e706	Fix the use of queries with a schema in a migration	5 years ago
rinpatch	fefbd31c6e	Move local keys out of `user.info`	5 years ago
lain	61097ba6ab	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
eugenijm	8249924485	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Mark Felder	a562cb2c34	Update AdminFE bundle	5 years ago
Ariadne Conill	28be12b38e	update admin fe	5 years ago
lain	0aef18bcf4	Litepub Context: Add EmojiReaction.	5 years ago
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	5 years ago
rinpatch	1fba66178d	Merge branch 'develop' into cleanup/drop-subscription-table-if-exists	5 years ago
rinpatch	81b4243173	Remove subscription_notifications table if it existed ... Followup to !1741	5 years ago
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	5 years ago
Roman Chvanikov	b4b147000c	Merge develop	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
Haelwenn (lanodan) Monnier	5820dc40fc	litepub-0.1.jsonld: Add uploadMedia	5 years ago