636 Commits (66acfa6882152de9f7b5181e708de02bb97d42a8)

Author	SHA1	Message	Date
Mark Felder	3d24a0917b	Update AdminFE build ... - Removed Grouped Reports; API needs proper architecture/refactor - Cannot set Tesla adapter in AdminFE as it's not safe yet - Layout/rendering improvements	5 years ago
Mark Felder	554bc88e8a	Update AdminFE build	5 years ago
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
eugenijm	7ad5c51f23	Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope	5 years ago
lain	2d5cf0f8cd	Migrations: Make them not fail for old databases	5 years ago
Mark Felder	6a97c1b9ff	Update adminFE build	5 years ago
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	5 years ago
Mark Felder	f9eb35d48e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211	5 years ago
Mark Felder	de0fea4634	Update AdminFE build	5 years ago
lain	60de311164	Update frontend	5 years ago
Maksim Pechnikov	cd040691bd	maked `unread_count` as virtual field	5 years ago
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	5 years ago
rinpatch	f13b7878b4	Merge branch 'rename_emoji_reactios' into 'develop' ... EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181	5 years ago
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	5 years ago
Mark Felder	fed9b0d1e0	Update FE bundle	5 years ago
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	5 years ago
lain	f5bfb29d3b	Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9	5 years ago
lain	6fab5fe7f8	Merge branch 'translation/errors-french' into 'develop' ... Translation/errors french See merge request pleroma/pleroma!1457	5 years ago
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	5 years ago
feld	be27777156	Merge branch 'admin-be' into 'develop' ... Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976	5 years ago
Haelwenn (lanodan) Monnier	bd3f3756fb	Update MastoFE bundle to 2020-01-22	5 years ago
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	5 years ago
Alexander Strizhakov	7ee2f86d76	Revert "Update AdminFE build" ... This reverts commit 6395ad942c	5 years ago
Mark Felder	2860bee604	Last AdminFE update was accidentally built from master, not develop	5 years ago
Mark Felder	bc2ebdcfd6	Update AdminFE build	5 years ago
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	5 years ago
Ivan Tashkinov	d1e9768e10	[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.	5 years ago
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	5 years ago
Alexander Strizhakov	6395ad942c	Update AdminFE build	5 years ago
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	5 years ago
Mark Felder	fd3c23af63	Update AdminFE build	5 years ago
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	5 years ago
lain	756a029edf	Update frontend	5 years ago
lain	2792672793	Revert "Merge branch 'admin-scope-support-code' into 'develop'" ... This reverts merge request !2055	5 years ago
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