summaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Expand)Author
2020-08-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1...lain
2020-08-26Update AdminFE build in preparation for 2.1.0 releaseMark Felder
2020-08-25Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0lain
2020-08-17Merge branch 'invisible-index' into 'develop'rinpatch
2020-08-17Migrations: Add an index on the `invisible` field on users.lain
2020-08-14Update AdminFE bundle for 2.1.0 releaseMark Felder
2020-08-13Merge branch 'fix/activity-expirations-again' into 'develop'feld
2020-08-13Update frontendlain
2020-08-13Migrations: Fix Logger requirements.lain
2020-08-12Add warning to the migrationMark Felder
2020-08-12leave expirations with Create and Note typesAlexander Strizhakov
2020-08-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activit...lain
2020-08-11Ensure ap_id column in users table cannot be nullMark Felder
2020-08-11Set `users.approval_pending` default to `false`Egor Kislitsyn
2020-08-10Merge branch 'develop' into fix/activity-expirations-againMark Felder
2020-08-1020200802170532_fix_legacy_tags: chunk the user queryrinpatch
2020-08-1020200802170532_fix_legacy_tags: Select only fields the migration needsrinpatch
2020-08-08Don't filter on localMark Felder
2020-08-08Add migration to remove invalid activity expirationsMark Felder
2020-08-05Merge branch 'migrate-legacy-tags' into 'develop'lain
2020-08-05Merge branch 'unique-app-id' into 'develop'lain
2020-08-04Add a migration to clean up activity_expirations tableMark Felder
2020-08-04Unique apps.client_id for new installations, fixes #2022Alex Gleason
2020-08-02Migrate legacy tags set by AdminFE to match TagPolicy, #2010Alex Gleason
2020-07-27Add configurable registration_reason limitAlex Gleason
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-25added migrate old settings to newMaksim Pechnikov
2020-07-22Migration to fix malformed Pleroma.Formatter configAlex Gleason
2020-07-22Add AutolinkerToLinkify migration testAlex Gleason
2020-07-22Fix linkify ConfigDB migrationAlex Gleason
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
2020-07-16Migrate :auto_linker --> Pleroma.Formatter in ConfigDBAlex Gleason
2020-07-15Squash User approval migrationsAlex Gleason
2020-07-15Update FE bundleMark Felder
2020-07-15Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-14Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-14Merge branch '1940-admin-token-oauthless-auth' into 'develop'feld
2020-07-14Migrate in-db config after updating to Oban 2.0rinpatch
2020-07-19[#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIs...Ivan Tashkinov
2020-07-14Accept `reason` in POST /api/v1/accounts and store in DBAlex Gleason
2020-07-13Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-07-12Add `approval_pending` field to UserAlex Gleason
2020-07-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federa...lain
2020-07-10Update frontendlain
2020-07-10Merge branch 'user-search-nickname-rank-boost' into 'develop'Haelwenn
2020-07-10Translated using Weblate (Italian)Ben Is
2020-07-10Translated using Weblate (Polish)Ben Is
2020-07-09Merge branch 'features/favicons' into 'develop'lain