Commit Graph

11125 Commits (f99b8a25ebd89a11ad3b98fa5815cc4fd338eeb1)
 

Author SHA1 Message Date
Haelwenn f99b8a25eb Merge branch 'reject' into 'develop'
4 years ago
lain 8d5f9d4b28 Merge branch 'ci-fix-2' into 'develop'
4 years ago
lain 035c44dd7b CI: Add cmake to build
4 years ago
lain 06e435c959 Merge branch 'update-frontend-2020-08-13' into 'develop'
4 years ago
lain 5bcf15d553 Update frontend
4 years ago
lain 88ec5c2de5 Merge branch 'cmake' into 'develop'
4 years ago
lain a47406d577 Build files: Add cmake
4 years ago
lain 2bc2b321b6 Merge branch 'fix/users_ap_id_not_null' into 'develop'
4 years ago
lain aaf7bd89a7 Migrations: Fix Logger requirements.
4 years ago
lain 5be25b3e38 Merge branch '1152-deletion' into 'develop'
4 years ago
feld a94210c70b Merge branch 'docs_improve_static_dir_documentation' into 'develop'
4 years ago
feld 3aa7969ff9 Update robots_txt.md
4 years ago
feld dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
4 years ago
Mark Felder b89fc1f227 Add warning to the migration
4 years ago
lain 05ff666f99 AdminApiControllerTest: Add test that `deleted` users get deactivated.
4 years ago
lain 2e347e8286 ActivityPub: Remove `reject`, move everything to the Pipeline.
4 years ago
lain 7224bf309e Transmogrifier: Move Rejects to the Pipeline
4 years ago
lain 62f7cca9a1 Transmogrifier Tests: Extract rejections.
4 years ago
lain bb92ad44a6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
4 years ago
rinpatch 86c18e4165 Merge branch 'issue/2036-job-monitor' into 'develop'
4 years ago
Maksim Pechnikov 76462efbfa fix job monitor
4 years ago
lain 500576dcb6 Linting fixes.
4 years ago
lain 25bfee0d12 ActivityPub: Remove ActivityPub.accept
4 years ago
Mark Felder ff4e282aad Ensure ap_id column in users table cannot be null
4 years ago
lain f988d82e46 Transmogrifier: Handle accepts with the pipeline
4 years ago
lain 9dda13bfa1 Transmogrifier Test: Remove mastodon hack test.
4 years ago
lain 3f6d50111e Linter fixes.
4 years ago
lain c66f6bd0ad Merge branch 'set-approval-pending-default-to-false' into 'develop'
4 years ago
lain da3f9b9988 Transmogrifier: Remove handling of orphaned accepts
4 years ago
lain 8b1e8bec2f AcceptValidation: Codify accept rules.
4 years ago
Egor Kislitsyn 304ed35743
Set `users.approval_pending` default to `false`
4 years ago
lain f1a0c10b17 AcceptValidator: Add basic validator with tests.
4 years ago
lain 8f9fbc86c0 Transmogrifier: Small readability changes.
4 years ago
lain 54a6855ddf Transmogrifier Tests: Extract Accept handling
4 years ago
lain 686002164a Merge branch '204-fix' into 'develop'
4 years ago
lain 9a9121805c Apply 1 suggestion(s) to 1 file(s)
4 years ago
feld 78484fe0ef Merge branch 'admin-active-filter' into 'develop'
4 years ago
Egor Kislitsyn 249f21dcbb Admin API: Filter out unapproved users when the `active` filter is on
4 years ago
lain 93fbf39954 Merge branch 'revert-a6d3bb5f' into 'develop'
4 years ago
lain 353f3466d6 Merge branch 'remove-unreachable-code' into 'develop'
4 years ago
lain 73af60d02f Merge branch 'develop' into 'develop'
4 years ago
lain 517d42646a Merge branch '2039-cmake' into 'develop'
4 years ago
lain 11fc90744c Transmogrifier: Remove duplicate code.
4 years ago
Alibek Omarov a2f2ba3fbb docs: add cmake to other installation guides
4 years ago
lain 4d76c0ec8b Docs: Add cmake dependency
4 years ago
lain 5c4548d5e7 Revert "Merge branch 'issue/1023' into 'develop'"
4 years ago
Ilja bd7bf6cd19 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Ilja a4a2d38640 Apply 1 suggestion(s) to 1 file(s)
4 years ago
rinpatch 00a4980c61 Merge branch 'fix/flaky-migration-episode-666' into 'develop'
4 years ago
rinpatch 21dfcafeb1 Merge branch '2038-old-update-info' into 'develop'
4 years ago