Commit Graph

4507 Commits (858dbe43607b31cba8c319755c92099cd2c9f5c1)

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 5316e231b0
Pipeline Ingestion: Audio (Part 2)
4 years ago
Haelwenn 3d5d8c05c9 Merge branch '2064-image-blanking' into 'develop'
4 years ago
Ivan Tashkinov da116d81fb [#2497] Added video preview proxy. Switched from exexec to Port.
4 years ago
Ivan Tashkinov 27e7999a15 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain f0a8d723bb Transmogrifier Test: Extract audio tests.
4 years ago
lain aabc26a573 Pleroma.Upload: Set default upload name / description based on config.
4 years ago
Alex Gleason a0f5eb1a55
Test that `POST /api/pleroma/delete_account` purges the user
4 years ago
Alex Gleason dcc8926ff1
Test purging a user with User.delete/1
4 years ago
Alex Gleason c12c576ee2
Also purge bio and display name
4 years ago
Alex Gleason d55faa2f8f
Purge a local user upon deletion, fixes #2062
4 years ago
lain 34b099fffa Merge branch 'issue/1936' into 'develop'
4 years ago
Sergey Suprunenko 25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
Maksim Pechnikov f6da12f45d fix search media proxy urls
4 years ago
Ivan Tashkinov 60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
Sergey Suprunenko 0865f36965
Mark notifications about statuses from muted users as read automatically
4 years ago
Ivan Tashkinov 95529ab709 [#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop'
4 years ago
Haelwenn f99b8a25eb Merge branch 'reject' into 'develop'
4 years ago
lain 5be25b3e38 Merge branch '1152-deletion' into 'develop'
4 years ago
Maksim Pechnikov 56470647de Merge branch 'develop' into issue/1936
4 years ago
Alexander Strizhakov 3ab83f837e
don't load pinned activities in due_expirations
4 years ago
feld dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
4 years ago
lain 05ff666f99 AdminApiControllerTest: Add test that `deleted` users get deactivated.
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
lain 0589e9156a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
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 da3f9b9988 Transmogrifier: Remove handling of orphaned accepts
4 years ago
lain 8b1e8bec2f AcceptValidation: Codify accept rules.
4 years ago
lain f1a0c10b17 AcceptValidator: Add basic validator with tests.
4 years ago
Ivan Tashkinov 2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
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
lain 677abbf0ee Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain 7e4932362b SideEffects: Handle strange deletion case.
4 years ago
Maksim Pechnikov 345ac512e4 added paginate+search for admin/MediaProxy URLs
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 5c4548d5e7 Revert "Merge branch 'issue/1023' into 'develop'"
4 years ago
lain 66122a11b5 AccountController: Build the correct update activity.
4 years ago
lain d0fc48ea67 Merge branch 'develop' into 'feat/floki-fast-html-2'
4 years ago
Egor Kislitsyn e5557bf8ba
Add mix task to add expiration to all local statuses
4 years ago
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Alex Gleason 673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
lain 50d5bdfd31 Mix Task Frontend test: Expand.
4 years ago
rinpatch 7e23a48d38 rel me test: fix HTML so broken browsers (and therefore
4 years ago
rinpatch 325c7c924b Make Floki use fast_html
4 years ago
lain de00a4c0f1 Mix Task Frontend Test: Capture IO.
4 years ago
lain d97b76104e Mix Task Frontend: Add tests.
4 years ago
lain 34cbe9f44a Merge branch 'features/poll-validation' into 'develop'
4 years ago
Maksim Pechnikov 8e90cc58e7 Merge branch 'develop' into feature/update-welcome-setting-in-description
4 years ago
Maksim Pechnikov 6e6276b4f8 added test
4 years ago
Ivan Tashkinov 56ddf20208 Removed unused alias.
4 years ago
Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain bf95dfb240 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 10b0e55acf Merge branch 'whole-word-filter-hotfix' into 'develop'
4 years ago
Mary Kate f785dba09b changelog for filter whole_word fix
4 years ago
Mary Kate d6ab9f2132 update test for whole_word in filter
4 years ago
Roman Chvanikov 4672b61106 Merge branch 'develop' into command-available-check
4 years ago
lain 7755f49e28 Merge branch 'migrate-legacy-tags' into 'develop'
4 years ago
lain 9c96fc052a CommonValidations: Extract modification right checker
4 years ago
lain 2173945f90 MailerTest: Give it some time.
4 years ago
Roman Chvanikov 8c57a299b4 Handle non-list keys in Config.fetch/1
4 years ago
Roman Chvanikov 2299bfe4c1 Merge branch 'develop' into refactor/config-get
4 years ago
Roman Chvanikov 97b5701449 Update clear_config macro
4 years ago
Mark Felder 0f9aecbca4 Remove fallback to local database when LDAP is unavailable.
4 years ago
Mark Felder f7146583e5 Remove LDAP mail attribute as a requirement for registering an account
4 years ago
Roman Chvanikov 6f60ac9f41 Refactor config
4 years ago
lain 19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain 474aba984f Merge branch 'unique-app-id' into 'develop'
4 years ago
rinpatch b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop'
4 years ago
Alex Gleason 184742af5e
Unique apps.client_id for new installations, fixes #2022
4 years ago
Egor Kislitsyn 91fbb5b21f
Fix ActivityExpirationPolicy
4 years ago
lain 878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
4 years ago
lain 532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 36aa34a1a8 MastodonAPITest: Do the needful
4 years ago
Haelwenn (lanodan) Monnier 0f088d8ce3
question_validator: Allow content to be an empty-string (blank)
4 years ago
lain 1a00713744 CommonValidations: Treat deactivated users as not present.
4 years ago
lain 0cfadcf2ca TransmogrifierTest: Add test for deactivated users
4 years ago
lain e92c040ad3 CommonAPITest: Add test that deactivated users can't post.
4 years ago
lain 953f71bcfa App Test: Make more resilient
4 years ago
Roman Chvanikov 56e9bf3393 Unify Config.get behaviour for atom/list key param
4 years ago
lain 28584bb224 Merge branch 'email-blacklist' into 'develop'
4 years ago
Alex Gleason 4f57e85ab9
Email blacklist: Update phrasing again
4 years ago
Alex Gleason 058daf498f
Email blacklist: Update response phrasing
4 years ago
lain e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
4 years ago
Ilja cbf8bfc694 Improved WelcomeChatMessageTest
4 years ago
lain 56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop'
4 years ago
lain de3bdc63ad AccountControllerTest: Add test for message returned.
4 years ago
lain 5876d5123c Merge branch 'object-age-fix' into 'develop'
4 years ago
lain 10c792110e MRF Object Age Policy: Don't break on messages without cc/to
4 years ago
Alex Gleason f9301044ed
Add ReportNote test
4 years ago
Alex Gleason 77b48cb4ce
Factory: Add report_activity_factory
4 years ago
Alex Gleason dc88b6f091
Add email blacklist, fixes #1404
4 years ago
Alex Gleason c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
4 years ago
Ilja f671d7e68c Add welcome chatmessages
4 years ago
lain 4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'"
4 years ago
lain 010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'"
4 years ago
lain 1ac0969c72 Merge branch 'mrf-silence-2' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
4 years ago
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed.
4 years ago
lain 1dd162a5f7 SimplePolicy: Fix problem with DM leaks.
4 years ago
Haelwenn d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop'
4 years ago
Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop'
4 years ago
lain 781b270863 ChatMessageReferenceView: Display preview cards.
4 years ago
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
4 years ago
lain e2e66e50d3 SimplePolicyTest: Add test for leaking DMs.
4 years ago
lain d39b72c8fa Merge branch 'feature/captcha-expose-timeout' into 'develop'
4 years ago
Maksim Pechnikov cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency
4 years ago
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason 00d090004e
:show_reactions, refactor the other test
4 years ago
Alex Gleason 026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop'
4 years ago
lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
Haelwenn 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop'
4 years ago
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 2e27847573
feed/user_controller: Return 404 when the user is remote
4 years ago
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
4 years ago
lain 6a25f72a75 FrontendStatic: Work correctly for other frontend types.
4 years ago
lain c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
4 years ago
lain edf8b6abfe EnsureRePrepended: Don't break on chat messages.
4 years ago
Maksim Pechnikov 15b8446cdb updated dev & test packages
4 years ago
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
lain ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration.
4 years ago
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
Alex Gleason f43518eb74
Lint, fix test
4 years ago
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
lain 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov 643664d583 added migrate old settings to new
4 years ago
Lain Soykaf 1dd6de03ee CommonAPI Tests: Check that undoing objects federates them as embeds.
4 years ago
Lain Soykaf 3d13fb05f8 Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf 91f3cf9bc6 Pipeline: Add embedded object federation.
4 years ago
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn 6100b90209 Merge branch '1976-status-view-fixes' into 'develop'
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
4 years ago
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
lain b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop'
4 years ago
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
4 years ago
lain a81581472f Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 7991ddad58 added warning to use old keys
4 years ago
Alex Gleason b6488a4db4
Update linkify migration tests to use config from ConfigDB
4 years ago
Alex Gleason c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
4 years ago
Alex Gleason b87a1f8eaf
Refactor require_migration/1 into a test helper function
4 years ago
Alex Gleason 67389b77af
Add AutolinkerToLinkify migration test
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov 5879d36854 fix sender for welcome email
4 years ago
Maksim Pechnikov 8d6f7aec21 Merge branch 'develop' into issue/1023
4 years ago
Maksim Pechnikov 7cafb96c02 added tests
4 years ago
Mark Felder 109836306c Test that Emoji Packs can be listed when instance is not public
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
4 years ago
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop'
4 years ago
Ivan Tashkinov b8021016eb [#2497] Resolved merge conflicts.
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Alexander Strizhakov 6afc6717d6
copy tmp file if test depends on it
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Alex Gleason ae74c52e22
Test angry face in formatter D:< #1968
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason 15f8921b11
Test that unapproved users can never log in regardless of admin settings
4 years ago
Alex Gleason 5756843736
Fully delete users with status :approval_pending
4 years ago
Alex Gleason 880301985b
Formatter: Test link with local mention
4 years ago
Maksim Pechnikov 6c59fe259d Merge branch 'develop' into issue/1023
4 years ago
Alex Gleason 9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
Maksim Pechnikov 3f8bff8d6b Merge branch 'develop' into issue/sign-authority
4 years ago
href e499275076 Don't test tls_options in adapter helper test.
4 years ago
rinpatch bf3492ceb3 Connection Pool: add tests
4 years ago
rinpatch 721e89e88b Remove tests for old pool
4 years ago
Haelwenn (lanodan) Monnier e4beff90f5
Create Question: Add context field to create
4 years ago
Haelwenn (lanodan) Monnier 922ca23298
Question: Add tests on HTML tags in options
4 years ago
Haelwenn (lanodan) Monnier c19bdc811e
Fix attachments in polls
4 years ago
lain 040524c09f Merge branch 'tests/apc2s-update_outbox' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 39870d99b8
transmogrifier tests: Move & enhance in specialised modules
4 years ago
Haelwenn (lanodan) Monnier 82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
Haelwenn (lanodan) Monnier 173f69c854
question_validator: fix for mastodon poll expiration
4 years ago
Haelwenn (lanodan) Monnier 10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
4 years ago
Haelwenn (lanodan) Monnier 7bcd7a9595
QuestionValidator: Create
4 years ago
Haelwenn (lanodan) Monnier 6d8427cca2
AP C2S tests: Make sure you can't use another user's AP id
4 years ago
Alex Gleason 0d004a9d04
Email admins when a new unapproved account is up for review
4 years ago
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason fab44f6970
Test User with confirmation_pending: true, approval_pending: true
4 years ago
Alex Gleason 20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason 33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Maksim Pechnikov 1dd767b8c7 Include port in host for signatures
4 years ago
Mark Felder 777a7edc6b Lint and fix test to match new log message
4 years ago
Alex Gleason a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
feld 3f65f2ea79 Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
4 years ago
feld 2909dc873b Merge branch '1940-admin-token-oauthless-auth' into 'develop'
4 years ago
Ivan Tashkinov 124b4709dc [#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
feld 246f49d685 Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
4 years ago
Ivan Tashkinov 9b225db7d8 [#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.
4 years ago
Ivan Tashkinov cf3f8cb72a [#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
4 years ago
Maksim Pechnikov 3062f86613 added generated `pleroma.env`
4 years ago
Alex Gleason 5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
= b221b640a2 Transmogrifier: filtering weirdness in address fields
4 years ago
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings
4 years ago
feld 5d215fd81f Merge branch 'config-behaviours-runtime' into 'develop'
4 years ago
feld 8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
4 years ago
Haelwenn f918b6f86d Merge branch '1937-renaming' into 'develop'
4 years ago
Alex Gleason bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
4 years ago
Alex Gleason e4e5577818
Prevent unapproved users from logging in
4 years ago
Alex Gleason 51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Alex Gleason a62f17da17
Add `approval_pending` field to User
4 years ago
href 4347d2de5e Config/Docs: Expand behaviour suggestions at runtime
4 years ago
Alexander Strizhakov b376442325
MediaProxy whitelist setting now supports hosts with scheme
4 years ago
Roman Chvanikov aedbbec88a Add Pleroma.Utils.command_available?/1 and use where appropriate
4 years ago
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section
4 years ago
Mark Felder 6167593881 Support Exiftool for stripping EXIF data
4 years ago
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban
4 years ago
feld ce9514000d Merge branch 'proxy-range-and-chunk' into 'develop'
4 years ago
href a1dace088c ReverseProxy: Streaming and disable encoding if Range
4 years ago
lain 93e494ec21 ActivityPub: Don't rename a clashing nickname with the same ap id.
4 years ago
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn 31a0ed5d01 Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
4 years ago
lain 4d809144d8 Merge branch 'cluster-test-ci' into 'develop'
4 years ago
Haelwenn 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
4 years ago
Haelwenn 5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop'
4 years ago
stwf 08211eff22 Re-enable the federated tests, increase timeout
4 years ago
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
Mark Felder 2b979cc90c Add AdminFE reports URL to report emails
4 years ago
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
4 years ago
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
4 years ago
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop'
4 years ago
eugenijm c2be0da79f Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago