Commit Graph

1200 Commits (c07fcdbf2b3c28ae4d1d11df4d872f230410f2b5)

Author SHA1 Message Date
Alex Gleason cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop'
4 years ago
Alexander Strizhakov 546da68a11
changelog entry
4 years ago
Mark Felder 5b838accc0 Update Linkify to 0.4.1
4 years ago
lain ae934659d1 Align changelog
4 years ago
lain 5ada38499b Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
4 years ago
lain 322463e1bd Update changelog
4 years ago
lain 463eec992a Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain b988e9cc8b Mix: Update version.
4 years ago
lain a8ca282b4a Update changelog
4 years ago
lain d788b41c2e Report fixes.
4 years ago
lain 0f527c9e02 Mix: Update linkify to 0.4.1
4 years ago
lain 66c75b0192 Update changelog
4 years ago
Mark Felder 42a386eb9f Document fixing the pleroma.user delete_activities mix task
4 years ago
Mark Felder 93852f1b42 Document S3 and Elixir 1.11 compat fix
4 years ago
Haelwenn (lanodan) Monnier aa848cbd75 pleroma.instance: Fix Exiftool module name
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
Alex Gleason 80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Alexander Strizhakov c37f78d1c8 changelog
4 years ago
Alexander Strizhakov cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed
4 years ago
Mark Felder dfde4af0fd Fixed Rich Media Previews
4 years ago
lain 477c6c8e55 Merge branch 'auth-improvements' into 'develop'
4 years ago
lain 1436a2fa2d Merge branch 'stream-follow-updates' into 'develop'
4 years ago
Egor Kislitsyn 97068196a9
Update CHANGELOG
4 years ago
Ivan Tashkinov 36ce45a28c [#3112] Changelog entry.
4 years ago
Ivan Tashkinov c8e7ace812 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
lain ed76323776 Merge branch 'feature/configdb-mix-tasks' into 'develop'
4 years ago
Ivan Tashkinov a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Mark Felder 24673b6ca3 Add entry announcing new ConfigDB mix tasks
4 years ago
lain 9feb678ec8 Docs, Changelog: Add info about regional indicators
4 years ago
lain a0aece3223 Changelog: Update changelog
4 years ago
Ivan Tashkinov f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
lain f9a4cf2097 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Alex Gleason 4999efad3f
Update CHANGELOG.md: registration workflow
4 years ago
Alex Gleason 30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
feld ecd1ef8cb5 Merge branch 'fix/2302-report-duplicates' into 'develop'
4 years ago
lain cc52f03566 Changelog: Add info about search changes
4 years ago
Ivan Tashkinov b27d8f7437 Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
4 years ago
lain 5e04f4156c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov e164c37139 [#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
Haelwenn c8d11c3064 Merge branch '2317-old-reset-tokens' into 'develop'
4 years ago
rinpatch 1eda5ab267 CHANGELOG.md: Move rum fix entry to patch section
4 years ago
lain 3b86ad0744 Changelog: Document breaking change.
4 years ago
lain 1bad91cba2 Changelog: Add info about the websearch option
4 years ago
lain 2ee0fc194a Changelog: Add info about search fixes.
4 years ago
lain 21eaaf491c Changelog: Add info about reset tokens
4 years ago
Alexander Strizhakov 44f3795b8e
changelog entries for fixes
4 years ago
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions'
4 years ago
Mark Felder 1d03ba4ffb Fixed emoji reactions not being filtered from blocked and muted accounts
4 years ago
feld a1056aace1 Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
4 years ago
lain aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop'
4 years ago
lain 1b63aa0b4f Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain d7b63272b8 Changelog: Move api info to api heading.
4 years ago
Mark Felder 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder 56d95203b5 Document fixing the pleroma.user delete_activities mix task
4 years ago
Egor Kislitsyn f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
rinpatch 11d8fefa7b CHANGELOG.md: Use a period after every bullet point for unreleased sections
4 years ago
rinpatch ba214f3f16 CHANGELOG.md: Add back an entry for S3 fix
4 years ago
rinpatch 77c239f309 Import stable commits into develop after releasing 2.2.0
4 years ago
Mark Felder 5cbaa76fd6 Document S3 and Elixir 1.11 compat fix
4 years ago
Alex Gleason 9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Haelwenn 28da36975d Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier e2f573d68b
pleroma.instance: Fix Exiftool module name
4 years ago
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
4 years ago
Ilja 70e4b86250 Make notifs view work for reports
4 years ago
rinpatch 99edfba3da Polish the changelog a bit and specify release date
4 years ago
lain b0e4e0cf2a Changelog: Add info about title injection
4 years ago
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn af3f00292c
Fix formatting
4 years ago
lain 88f6b61a5e Merge branch '2260-wrong-report-link' into 'develop'
4 years ago
rinpatch 6166ecdbc8 CHANGELOG.md: Add an entry for the spoofing fix
4 years ago
Haelwenn 4d693b5e54 Merge branch '2236-no-name' into 'develop'
4 years ago
feld 48f7e12e6c Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
4 years ago
feld 86b4149a13 Merge branch '1668-prometheus-access-restrictions' into 'develop'
4 years ago
lain 5ddf0be208 Changelog: Add info about admin email user link changes.
4 years ago
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain bae48c98e3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
4 years ago
lain 4800ee656b Merge branch 'features/federation-status' into 'develop'
4 years ago
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop'
4 years ago
lain eb1e1e7494 Changelog: Add info about federation status endpoint
4 years ago
rinpatch 7058cac1c2 Merge branch '2257-self-chat' into 'develop'
4 years ago
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
lain e46c95b826 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain f09bb814a9 Changelog: Add info about poll view changes
4 years ago
lain 91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api'
4 years ago
feld 38b481d112 Merge branch 'feature/account-export' into 'develop'
4 years ago
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Alibek Omarov 5591dc0248 Add entry in changelog
4 years ago
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
4 years ago
Egor Kislitsyn 75d131ba18 Add documentation and update CHANGELOG
4 years ago
Egor Kislitsyn fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn 8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov ba50dc05a8 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Egor Kislitsyn 4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
feld 1204aaa2e3 Merge branch 'feature/autofollowing' into 'develop'
4 years ago
Haelwenn d8d4bd15d0 Merge branch '2236-no-name' into 'develop'
4 years ago
feld 03a318af9a Merge branch 'develop' into 'feature/autofollowing'
4 years ago
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope'
4 years ago
Mark Felder 291189357b Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export
4 years ago
feld 5aff479951 Merge branch '1668-prometheus-access-restrictions' into 'develop'
4 years ago
feld e062329a17 Merge branch 'develop' into 'feature/autofollowing'
4 years ago
lain 04b7505c75 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
4 years ago
lain a999e8b0b7 Changelog: Add info about whitespace name remote users.
4 years ago
lain 3fdc2a0d1e Changelog: Add information about self-chats
4 years ago
Maksim Pechnikov add26817e3 update changelog
4 years ago
rinpatch fb0e340363 Rip out fedsockets from the release branch
4 years ago
Egor Kislitsyn e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn 18a91d85e5
Merge branch 'develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov 524fb0e4c2 [#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
4 years ago
Mark Felder d16336e7fb Document autofollowing_nicknames
4 years ago
Mark Felder cb3ee4d543 Fix duplicate Added sections in the changelog
4 years ago
Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
rinpatch 6c1bc9ca39 CHANGELOG.md: prepare 2.2.0 changelog
4 years ago
Egor Kislitsyn a598d5baab
Update CHANGELOG
4 years ago
Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export
4 years ago
Alex Gleason 83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Alex Gleason dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
4 years ago
Egor Kislitsyn 2b58b0dbce
Update CHANGELOG
4 years ago
Ivan Tashkinov 2498e569f1 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov 89c595b772 [#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
4 years ago
Alex Gleason 5c8d2c468c
Blocks: update CHANGELOG
4 years ago
Mark Felder 04b514c567 Merge branch 'develop' into feature/gen-magic
4 years ago
Alex Gleason 9c672ecbb5
Remote Timeline: add Streaming support
4 years ago
Alex Gleason a3964b373e
Aliases: move changelog entry
4 years ago
Alex Gleason 77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Egor Kislitsyn 563801716a
Update changelog
4 years ago
Mark Felder 21a73ce9f2 Document the NSFW link preview change
4 years ago
Mark Felder 346cc3ac24 Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
rinpatch 9e96c9ae48 Merge branch 'fix/empty-params-openapi' into 'develop'
4 years ago
rinpatch 006b62fd12 OpenAPI CastAndValidate: filter out empty params
4 years ago
lain 2a11068a11 Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
4 years ago
Ivan Tashkinov ae26284638 [#3031] Adjusted changelog entry.
4 years ago
lain a24f80badf Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain 9a56ec25cb Changelog: Add info about relay unfollowing
4 years ago
feld 1672d8b37c Merge branch 'feature/bulk-confirmation' into 'develop'
4 years ago
Ivan Tashkinov 7cd662f18c Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.
4 years ago
lain defca4a8b1 Changelog: Add info about user search.
4 years ago
Alexander Strizhakov 3f201475e0
changelog entry
4 years ago
Alexander Strizhakov 958008cc14
changelog entry
4 years ago
Mark Felder f3a1f9c3bb Merge branch 'develop' into feature/bulk-confirmation
4 years ago
lain 436d1a3c41 Merge branch 'develop' into 'issue/2115'
4 years ago
Roman Chvanikov 8f5589cf66 Merge develop
4 years ago
lain a6c14041c4 Merge branch 'develop' into 'issue/1975'
4 years ago
lain 518c0f2962 Changelog: Add info about emoji zip import feature
4 years ago
lain 9d6415de15 Changelog: Info about email fix.
4 years ago
lain df1eb5cf7e Changelog: Add info about chat pagination fix.
4 years ago
Roman Chvanikov b0bd81ef71 Update CHANGELOG
4 years ago
Maksim Pechnikov ed3bc53fa1 Merge branch 'develop' into issue/2099
4 years ago
feld 6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
4 years ago
Steven Fuchs f2ef9735c5 Federate data through persistent websocket connections
4 years ago
Maksim Pechnikov 2159daa9af update changelog
4 years ago
Ivan Tashkinov a428800405 Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
rinpatch 065a4dddfd Merge branch 'stable' into stable-sync/2.1.2
4 years ago
Haelwenn (lanodan) Monnier abf25e5d52 Create MRF.filter_pipeline to inject :object_data when present
4 years ago
rinpatch b751c5babc CHANGELOG.md: Add 2.1.2 entry
4 years ago
Haelwenn beefc022dd Merge branch 'omit-nondiscoverable-from-search' into 'develop'
4 years ago
feld 608824b97e Merge branch 'instance-docs' into 'develop'
4 years ago
rinpatch 22d49993d9 Merge branch 'bugfix/mrf-ingestion' into 'develop'
4 years ago
stwf dfc621a529 add test and changelog entry
4 years ago
lain 7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata'
4 years ago
stwf f58262c673 add description to changelog
4 years ago
eugenijm 582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
Ivan Tashkinov a781f41f96 [#2497] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
4 years ago
eugenijm 3ab59a6f3c Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
4 years ago
Haelwenn 5c4ff5c73c Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
4 years ago
Mark Felder 0b66e806e3 Move changelog entry to next patch
4 years ago
Mark Felder 118bf6e92b Fixed Welcome chats with MRF Simple applied locally
4 years ago
Mark Felder 25d1caf1dd Merge duplicate Changed sections
4 years ago
rinpatch 0b5e72ecf0 Remove `:managed_config` option.
4 years ago
Mark Felder 55562ca936 Merge branch 'develop' into feature/gen-magic
4 years ago
rinpatch 82b56cdb9b CHANGELOG.md: clarify that the functionality is not removed, just the config options
4 years ago
rinpatch a098e10fd6 Document ephemeral activity changes better
4 years ago
Alexander Strizhakov 4954667fb2 changelog
4 years ago
Alexander Strizhakov c6647c08e1
migration and changelog
4 years ago
Mark Felder 34d7e864db New mix tasks for controlling user confirmation status and sending confirmation mails
4 years ago
rinpatch 5ef840ed9c Merge branch 'stable' into stable-sync/2.1.1
4 years ago
Mark Felder 549c895d80 Document breaking change for metadata providers
4 years ago
Mark Felder ff07014b26 Disable providers of user and status metadata when instance is private
4 years ago
rinpatch 7490b76bbf Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
4 years ago
rinpatch e430e98e7d CHANGELOG.md: Add 2.1.1 entry
4 years ago
Mark Felder 21efda2edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
4 years ago
rinpatch 0a05670b44 Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
4 years ago
Alibek Omarov 5d814f739c changelog: add ForceBotUnlistedPolicy
4 years ago
lain 9b85592b8b Merge branch 'fix/rich-media-fake-statuses' into 'develop'
4 years ago
feld 43b07c31cb Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
4 years ago
rinpatch ea4b6c64d6 Merge branch 'feat/rich-media-improvements' into 'develop'
4 years ago
rinpatch 13e606941c Merge branch 'fix/2087-metadata' into 'develop'
4 years ago
rinpatch 84acfab156 Merge branch 'fix-searching-following' into 'develop'
4 years ago
rinpatch 0f27211dd0 CHANGELOG.md: move the exiftool webp entry to a proper section
4 years ago
Mark Felder fa347b9c2f Fix uploading webp image files when Exiftool Upload Filter is enabled
4 years ago
rinpatch d8a48f8386 CHANGELOG.md: Split settings renaming to 2 separate entries
4 years ago
Alexander Strizhakov 7ad1732ed2
changelog entry
4 years ago
rinpatch 8c6485c470 CHANGELOG.md: move Unreleased section ahead of unreleased-patch
4 years ago
Alexander Strizhakov ee67c98e55
removing Stats worker from Oban cron jobs
4 years ago
rinpatch 6c6de8e5df Merge branch 'temp-hackney-fix' into 'develop'
4 years ago
rinpatch 1984ff3103 Add a changelog entry for hackney downgrade
4 years ago
rinpatch e198ba492e Rich Media: Do not cache URLs for preview statuses
4 years ago
Mark Felder cbf7f0e029 Disallow password resets for deactivated accounts.
4 years ago
rinpatch d48fc90978 StatusView: Start fetching rich media cards as soon as possible
4 years ago
rinpatch 19691389b9 Rich media: Add failure tracking
4 years ago
Karol Kosek 868057871a
search: fix 'following' query parameter
4 years ago
lain 4e022fc16c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain 5ffd20f3b5 Changelog: Add info about list fixes.
4 years ago
lain fc42446755 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
feld fb33321fa2 Merge branch 'feature/1952-read-muted-notifications' into 'develop'
4 years ago
lain ea2b5c07e3 Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Alexander Strizhakov 13f6029b4b
additional changelog entry
4 years ago
Alexander Strizhakov fa23d5d3d3
changelog entry
4 years ago
lain 757410a177 Changelog: Add info about upload description changes
4 years ago
lain e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
4 years ago
Hugo b2d3b26511 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Hugo Müller-Downing 317b6c6c52 Start :ssl if not started when running migration or rollback
4 years ago
Sergey Suprunenko 25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
Ivan Tashkinov 60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
Alex Gleason 1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
lain ebb30128af Changelog: Add information about the object age policy
4 years ago
lain bf95dfb240 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Mary Kate f785dba09b changelog for filter whole_word fix
4 years ago
Mark Felder cb7879c7c1 Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator
4 years ago
lain 532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 28584bb224 Merge branch 'email-blacklist' into 'develop'
4 years ago
lain 2f4289d455 Changelog: Add info about email blacklist
4 years ago
lain e26f2c9135 Changelog: Update with frontend mix task.
4 years ago
Ilja f671d7e68c Add welcome chatmessages
4 years ago
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
4 years ago
lain 20d89472e3 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason 026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain f715bf1915 Changelog: Include frontend information.
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
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
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
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
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
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Maksim Pechnikov b620290dd9 update description
4 years ago