846 Commits (871fac3e4c9d8b1a138204ac754b2a9633bd9eaa)

Author	SHA1	Message	Date
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
Haelwenn (lanodan) Monnier	646bf01608	Update AdminFE bundle	5 years ago
rinpatch	a21584556f	Update oban to 0.8.1 ... This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam	5 years ago
Roman Chvanikov	76c3e290fc	Merge develop	5 years ago
kaniini	17142a3720	Merge branch 'feature/delivery-tracking' into 'develop' ... Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661	5 years ago
rinpatch	ac4a748fad	Disallow NULLs in deliveries	5 years ago
Roman Chvanikov	0bd2b85edb	Separate Subscription Notifications from regular Notifications	5 years ago
rinpatch	769fb778d4	Track object/create activity fetches	5 years ago
Ivan Tashkinov	ca1ba1e272	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs	5 years ago
rinpatch	16e6be340d	Update frontend bundle to e75ac9dd	5 years ago
Ivan Tashkinov	e890ea7e82	[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # config/config.exs	5 years ago
Maxim Filippov	37dd3867bb	Log admin/moderator actions	5 years ago
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	5 years ago
Ivan Tashkinov	c34126f89c	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
rinpatch	05e7d0a438	Add an index on object likes ... In !1538 favorites timeline was switched to use the joined object, but no idex on likes in the joined object was added.	5 years ago
Ivan Tashkinov	256ff09aa8	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	5 years ago
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
lain	560dbad538	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	5 years ago
Mark Felder	24a731a9a6	Update AdminFE ... Now permits server configuration. Consider this ALPHA.	5 years ago
Ivan Tashkinov	267262491e	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
lain	29807ef6a5	Merge branch 'feature/digest-email' into 'develop' ... Feature/digest email See merge request pleroma/pleroma!1078	5 years ago
lain	a2b98f6d58	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	5 years ago
Hakaba Hitoyo	39c7bbe18f	Remove longfox emoji set	5 years ago
lain	f88560accd	Conversations: Add recipient list to conversation participation. ... This enables to address the same group of people every time.	5 years ago
Ivan Tashkinov	23d279e03e	[#1149] Replaced RetryQueue with oban-based retries.	5 years ago
Mike Verdone	666514194a	Add activity expirations table ... Add a table to store activity expirations. An activity can have zero or one expirations. The expiration has a scheduled_at field which stores the time at which the activity should expire and be deleted.	5 years ago
Haelwenn (lanodan) Monnier	a4647e9804	fr/LC_MESSAGES/errors.po: Create translation file	5 years ago
Roman Chvanikov	9bca70b10a	Merge develop	5 years ago
Egor Kislitsyn	04f18a144b	Add `listMessage` to to the JSON-LD context	5 years ago
Egor Kislitsyn	64a946643e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
Roman Chvanikov	c729883936	Merge branch 'develop' into feature/digest-email	5 years ago
Alexander Strizhakov	e7c39b7ac8	Feature/1072 muting notifications	5 years ago
Roman Chvanikov	eae991b06a	merge develop	5 years ago
Egor Kislitsyn	182f7bbb11	Merge branch 'develop' into feature/addressable-lists	5 years ago
Alex S	936050257d	saving following_address for existing users	5 years ago
Alex S	f8786fa6f2	adding following_address field to user	5 years ago
Egor Kislitsyn	406efb3688	Add Russian translation	5 years ago
Egor Kislitsyn	5104f65b69	Wrap error messages into gettext helpers	5 years ago
Sachin Joshi	6d0ae264fc	add listener port and ip option for 'pleroma.instance gen' and enable its test	5 years ago
Roman Chvanikov	371d39e160	Merge develop	5 years ago
kaniini	4948117fcf	Merge branch 'remove-swift' into 'develop' ... Remove Uploaders.Swift and `httpoison` dependency Closes #1051 See merge request pleroma/pleroma!1374	5 years ago
Roman Chvanikov	efefee8241	Split alters rather than work with indexes	5 years ago
Egor Kislitsyn	4f42093220	Remove Uploaders.Swift	5 years ago
Roman Chvanikov	291d95dcc3	Fix migration	5 years ago
Maksim	85c7916c94	[#1033] Fix database migrations	5 years ago
Roman Chvanikov	657277ffc0	Resolve conflicts	5 years ago
lain	efad26bbb9	Update frontend.	5 years ago
rinpatch	cfb5be3ced	Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop' ... Update mastofe to bundle-2019-06-26 See merge request pleroma/pleroma!1341	5 years ago
Haelwenn (lanodan) Monnier	451931d36f	Update mastofe to bundle-2019-06-26	5 years ago
Mark Felder	7b9e21e8a2	Update adminFE to latest build	5 years ago
kaniini	8b7860f12f	Merge branch 'admin-config' into 'develop' ... Admin config See merge request pleroma/pleroma!1328	5 years ago
Alex S	982cad0268	support for config groups	5 years ago
rinpatch	3ac5ecbac1	Support RUM indexes in the config generator	5 years ago
rinpatch	f4009b6706	Fallback to Config if Mix.Config does not exist, even if Config does not ... exist either For some weird reason Code.ensure_loaded?(Config) is false on OTP releases even though `use Config` from config files works just fine.	5 years ago
rinpatch	960d6b54e8	use Config in generated config when available ... Mix.Config is deprecated and does not work on OTP releases. However we can't fully switch to Config because it is not present in Elixir < 1.9. I tried to evaluate if Config is available at runtime, but for some weird reason OTP releases crash if I do that.	5 years ago
rinpatch	e76115989a	Move config templates to priv so they can be found in releases	5 years ago
rinpatch	431a41b459	Update bundled pleroma-fe to c4fcdc71	5 years ago
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	5 years ago
Sergey Suprunenko	a7d956d383	Remove unused imports and aliases from migration	5 years ago
Roman Chvanikov	01fe5abad1	Resolve conflicts	5 years ago
Egor Kislitsyn	17004a0f1a	Create index on `activities.local`	5 years ago
Roman Chvanikov	b1b1a270e8	Fix conflict	5 years ago
Egor Kislitsyn	9ce928d823	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
kaniini	94d12a79c4	Merge branch 'hotfix/add-in_reply_to_index' into 'develop' ... Add index on inReplyTo for objects See merge request pleroma/pleroma!1240	5 years ago
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	5 years ago
rinpatch	cfc3c62b2f	Add missing tag index on objects ... The previous activity index is useless because objects are not embedded anymore and instead a joined object is queried.	5 years ago
rinpatch	be56801dda	Add index on inReplyTo for objects ... Fixes the performance of `get_existing_votes`	5 years ago
Roman Chvanikov	ce47017c89	Merge develop	5 years ago
William Pitcock	5fbbc57c1b	add migration to add notification settings to user accounts	5 years ago
Egor Kislitsyn	f333041a0a	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
lain	022e6e4b44	RUM: Remove vacuum analyze from migration ... Can't be run in a trnasaction.	5 years ago
Egor Kislitsyn	557f0e33a7	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
Egor Kislitsyn	f2936e0a07	Add `ap_id` to List	5 years ago
lain	412a3d8a0f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index	5 years ago
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	5 years ago
William Pitcock	f3971cbde3	thread visibility function: fix use of no longer used author variable	5 years ago
William Pitcock	71fa7eeb6f	thread visibility function: significantly improve efficiency	5 years ago
William Pitcock	12f45e2a89	update migration	5 years ago
William Pitcock	75ce6adcff	migration: only care about Create activities	5 years ago
William Pitcock	958b4cfde9	migrations: add function to see if a thread can be satisfied	5 years ago
lain	f1e67bdc31	Search: Add optional rum indexing / searching.	5 years ago
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Sachin Joshi	7701a4c841	Make irreversible field default to false in filters	5 years ago
lambda	16cb9e5f1c	Merge branch 'mascot/pleroma-tan-shy' into 'develop' ... pleroma-fox-tan-shy.png: Add another version of pleroma-tan See merge request pleroma/pleroma!1139	5 years ago
Haelwenn (lanodan) Monnier	566a968ab3	pleroma-fox-tan-shy.png: Add another version of pleroma-tan ... Commissioned by https://shitposter.club/users/moonman and drawn by https://shpposter.club/users/Nightingalle Intended to be used when mastofe crashes out and allows to report a bug among other things. Should require a bit of modification on mastofe to use the image as it's more of a vanilla flavour thing.	5 years ago
lain	01c45ddc9e	Search: Use RUM index.	5 years ago
Roman Chvanikov	f1f7a11222	Merge develop	5 years ago
feld	c953ae8c3d	Initial bundle of basic AdminFE ... Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.	5 years ago
Roman Chvanikov	b6b5b16ba4	Merge develop	5 years ago
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	5 years ago
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	5 years ago
lain	0e37fddd5a	Search: Add fts index on objects table.	5 years ago
lain	45f790becc	Merge remote-tracking branch 'origin/develop' into conversations_three	5 years ago
Roman Chvanikov	0f0cc2703b	Merge develop	5 years ago
rinpatch	f8f6af4cc1	Fix MigrateOldBookmarks migration crashing on deleted activities	5 years ago
William Pitcock	52bdfced32	update pleroma frontend	5 years ago
Alex S	229ce6abbc	migration without using old field name ... removing old field from db, after bookmarks migration	5 years ago
Alex S	58711a79d0	removing useless transaction	5 years ago
Alex S	6322c1e123	migration optimization ... changelog wording	5 years ago
Alex S	324c9c8ab5	migrate user.bookmarks to separate table	5 years ago
Alex S	73d01857e3	bookmarks in separate table	5 years ago
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Roman Chvanikov	2359ee38b3	Set digest emails to false by default	5 years ago
Ekaterina Vaartis	c26724cc55	Remove finmoji and add a way to download emojis in packs ... These packs are stored in a git repo on pleroma gitlab	6 years ago
Roman Chvanikov	8add119444	Add User.list_inactive_users_query/1	6 years ago
Roman Chvanikov	371a4aed2c	Add User.Info.email_notifications	6 years ago
Egor Kislitsyn	db4badc6aa	move user disable into deactivation	6 years ago
Egor Kislitsyn	0f2f7d2cec	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	6 years ago
Haelwenn (lanodan) Monnier	51c97d71af	Update Mastodon Frontend to 2019-04-11 bundle ... See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11 [ci skip]	6 years ago
lain	de57094fca	Participations: Add sort index.	6 years ago
lain	280172f6f6	Conversations: Create or bump on inserting a dm.	6 years ago
lain	d1da6b155a	Conversation: Add Conversations and Participations.	6 years ago
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	6 years ago
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	6 years ago
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	6 years ago
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	6 years ago
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	6 years ago
eugenijm	7bf622ce73	Add scheduled activities	6 years ago
Alex S	47b07cec49	token -> invite renaming	6 years ago
Alex S	0484f3a8b1	generating tokens with mix	6 years ago
Sadposter	ffac2593ea	Add index on subscribers	6 years ago
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	6 years ago
Alex S	86f90c0a54	adding indexes to oauth_tokens table	6 years ago
lambda	bd961a3bad	Merge branch 'features/pleroma-tan' into 'develop' ... priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913	6 years ago
Haelwenn (lanodan) Monnier	b2f3a40e53	Revert awfully long migration from 568e34858	6 years ago
Ivan Tashkinov	642075b1a9	[#923] Enabled binding of multiple OAuth provider accounts to single user.	6 years ago
Ivan Tashkinov	20e0f36605	Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth	6 years ago
lambda	21ff78cd40	Merge branch 'replies-count' into 'develop' ... Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974	6 years ago
eugenijm	568e348588	Increment replies_count on replies (MastoAPI)	6 years ago
rinpatch	9725c93cea	Add an id index to notifications	6 years ago
rinpatch	b92a16aa00	Merge branch 'ecto-3-migration' into 'develop' ... Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957	6 years ago
kaniini	b68fb3dc17	Merge branch 'imageoptim' into 'develop' ... used imageOptim to reduce size of image files See merge request pleroma/pleroma!944	6 years ago
rinpatch	e59cfa7cac	modify the migrations to use naive_datetime_usec	6 years ago
rinpatch	cbc4a76b43	Fix filter migration	6 years ago
lain	41511d1926	Update frontend	6 years ago
Ivan Tashkinov	e17a9a1f66	[#923] Nickname & email selection for external registrations, option to connect to existing account.	6 years ago
optikfluffel	a907522690	used imageOptim to reduce size of image files	6 years ago
Ivan Tashkinov	40e9a04c31	[#923] Registration validations & unique index on [:user_id, :provider].	6 years ago
Ivan Tashkinov	26b6354095	[#923] Support for multiple (external) registrations per user via Registration.	6 years ago
Ivan Tashkinov	2739057442	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	6 years ago
Ivan Tashkinov	aacbf0f570	[#923] OAuth: prototype of sign in / sign up with Twitter.	6 years ago
William Pearson	3dadaa4432	robots.txt ... Add default robots.txt that allows bots access to all paths. Add mix task to generate robots.txt taht allows bots access to no paths. Document custom emojis, MRF and static_dir static_dir documentation includes docs for the robots.txt Mix task.	6 years ago
Haelwenn (lanodan) Monnier	bae96206d0	priv/static/images: Add pleroma-tan ... Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02 pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width got divided by two in The GIMP. All the pleroma*.png got optimised with mat2 and optipng/pngcrush, depending on their best results. [ci skip]	6 years ago
Haelwenn (lanodan) Monnier	05cad042ba	Update Mastodon Frontend to 2019-03-07 bundle ... See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07 [ci skip]	6 years ago
William Pitcock	3a097bd770	update pleroma frontend	6 years ago
Egor Kislitsyn	eb84de0143	allow users to disable their own account	6 years ago
eugenijm	8a1e0c9bee	Added migration to update existing user note counters	6 years ago
eugenijm	85734c0d49	Added migration for setting default tags in existing users records	6 years ago
Ivan Tashkinov	b227ccab82	Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.	6 years ago
lain	553ce57d42	update frontend	6 years ago
Egor	bff9eb5ef7	Reports	6 years ago
Ivan Tashkinov	bc4f77b10b	[#468] Merged `upstream/develop`, resolved conflicts.	6 years ago
Ivan Tashkinov	949e35e26d	[#468] OAuth scopes-related data migration simplification.	6 years ago
Ivan Tashkinov	063baca5e4	[#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.	6 years ago
William Pitcock	dd989962e6	litepub schema: add oauthRegistrationEndpoint [ci skip]	6 years ago
Karen Konou	ac72b578da	Merge branch 'develop' into feature/thread-muting	6 years ago
Haelwenn (lanodan) Monnier	fcd8a2d0d6	Update Mastodon Frontend to 2019-02-10 bundle ... See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10 [ci skip]	6 years ago
Karen Konou	6a150de3bd	Add unique index and unique constraint check, uniqueness test fails	6 years ago
Ivan Tashkinov	4ad843fb9d	[#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.	6 years ago
Karen Konou	98ec578f4d	Merge branch 'develop' into feature/thread-muting	6 years ago
Karen Konou	c43f414a79	Somehow fixed the repo insert [skip-ci]	6 years ago
Karen Konou	77448de492	ugghhhh	6 years ago
Karen Konou	f4ff4ffba2	Migration and some boilerplate stuff	6 years ago
Maxim Filippov	f1b72bfb70	Split hide_networ only for local users	6 years ago
lain	78a51f4dd4	update frontend	6 years ago
kaniini	d120aa63f0	Merge branch 'fix-dm-index' into 'develop' ... Massage index until it actually does the stuff we want. See merge request pleroma/pleroma!772	6 years ago
Maxim Filippov	c48aba3c2a	Fix SQL	6 years ago
lain	f3c8b02d65	Massage index until it actually does the stuff we want. ... Also makes the index a lot smoler.	6 years ago
Maxim Filippov	cd6606b7f6	Initialize hide_network with false	6 years ago
Maxim Filippov	16ce129e38	Split hide_network into hide_followers & hide_followings (fixed)	6 years ago
kaniini	486749064f	Revert "Merge branch 'feature/split-hide-network' into 'develop'" ... This reverts merge request !733	6 years ago
kaniini	0a82a7e6d6	Merge branch 'feature/split-hide-network' into 'develop' ... Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma!733	6 years ago
href	b3b0855456	Merge branch '534_federation_targets_reachability' into 'develop' ... [#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703	6 years ago
lambda	a43a1c6d4e	Revert "Merge branch 'spc-fix-3' into 'develop'" ... This reverts merge request !682	6 years ago
kaniini	4d3655c479	Merge branch 'spc-fix-3' into 'develop' ... Spc fix 3 See merge request pleroma/pleroma!682	6 years ago
Haelwenn	00d4333373	Merge branch 'features/glitch-soc-frontend' into 'develop' ... Features/glitch soc frontend See merge request pleroma/pleroma!192	6 years ago
Haelwenn (lanodan) Monnier	de0c1c641a	[MastodonFE] Update Frontend (glitch)	6 years ago
lain	88a40308d3	update frontend	6 years ago
kaniini	d03a116654	Merge branch 'hj-happiness-improvement' into 'develop' ... New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700	6 years ago
Maxim Filippov	50d6183893	Split hide_network into hide_followers & hide_followings	6 years ago
Ivan Tashkinov	d3f9e6f6fe	[#534] Merged `upstream/develop`.	6 years ago
lain	39b2457734	Change default bg image in new config.	6 years ago
Ivan Tashkinov	9560abea10	[#534] Refactoring / tweaks per MR review.	6 years ago
Haelwenn (lanodan) Monnier	cda1470e02	[MastoAPI][GlitchAPI] Add bookmarks	6 years ago
William Pitcock	15d12a69a4	add activities likes index, fixes favorites API call	6 years ago
href	4a13bb75bd	Change webpush endpoint to unlimited varchar ... Fixes #552	6 years ago
William Pitcock	57c3f8214c	update pleroma frontend (summary_html hotfix)	6 years ago
kaniini	4df71cd88b	Merge branch 'classic-flakeids' into 'develop' ... Flake Ids for Users and Activities Closes #450 See merge request pleroma/pleroma!645	6 years ago
William Pitcock	4b76f14da1	update pleroma frontend	6 years ago
href	a3ba72d978	Fix clippy with one/five lines	6 years ago
href	e02b19d1d7	Fix postgres activity_visibility when running in autovacuum	6 years ago
Ivan Tashkinov	f161a92cb1	[#534] Initial implementation of unreachable federation targets retirement.	6 years ago
lain	ab03f81219	Fix info ids. ... The previous migration actually created values for the key "id", including the quotes. This one should fill out all missing ids. Closes #511	6 years ago
href	9ba6e1fabe	FlakeId: chain alter statements	6 years ago
href	e67bd93d90	Flake: migrate pinned_activities in jsonb	6 years ago
href	a92c43bc4b	Clippy!	6 years ago
href	465fb4327d	Lock activities/users table during flake migration.	6 years ago
href	28d77e373c	Flake Ids for Users and Activities	6 years ago
Michael Loftis	98cbeae49c	slightly changes definition so that autovacuum works paralell safe too	6 years ago
lambda	69454c8345	Merge branch 'feature/dm-sanity' into 'develop' ... DM sanitization See merge request pleroma/pleroma!458	6 years ago
lambda	2020f26040	Merge branch '2019-1-20-update-frontend' into 'develop' ... update frontend See merge request pleroma/pleroma!686	6 years ago
lain	deeda94513	update frontend	6 years ago
William Pitcock	75bb663749	litepub schema: add litepub:directMessage flag	6 years ago
lain	b108aeee08	Make use of the indices. ... Indices in postgresql rely on operators, so they won't be used if you use only functions.	6 years ago
lain	bd6c12592e	Add migration to fix spc users.	6 years ago
Ivan Tashkinov	79e44042bc	[#477] User trigram index adjustment.	6 years ago