Commit Graph

1096 Commits (3d5940da3ec891cf4941a472a9e9d5fc908112e3)

Author SHA1 Message Date
Mark Felder 24169ae2e6 Merge branch 'develop' into fix/configdb-otp-instructions
4 years ago
Mark Felder cfc6484c40 OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
4 years ago
Mark Felder 1f24186036 Attempt to fix markdown formatting
4 years ago
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
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 d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop'
4 years ago
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
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 81350faa8e Cheatsheet: Add even more info.
4 years ago
lain 393128fb02 Cheatsheet: Add more info.
4 years ago
lain 08732e8a03 Docs: Add frontend info to cheat sheet.
4 years ago
Alex Gleason 520dce857e
Add :registration_reason_length to description.exs
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
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
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
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance
4 years ago
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Maksim Pechnikov 5fcb3e8738 fix docs
4 years ago
Maksim Pechnikov 6c59fe259d Merge branch 'develop' into issue/1023
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 007843b75e Add documentation for new connection pool settings and remove some
4 years ago
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
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
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
rinpatch 8d56fb6d22 Migrate in-db config after updating to Oban 2.0
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
Maksim Pechnikov 3062f86613 added generated `pleroma.env`
4 years ago
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings
4 years ago
Mark Felder 442fe3cd45 Show examples for both OTP and source
4 years ago
Alex Gleason 51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Mark Felder 0871e8b8fe Make the query more precise
4 years ago
Mark Felder 133004e22d Improve database config migration and add documentation
4 years ago
Alexander Strizhakov b376442325
MediaProxy whitelist setting now supports hosts with scheme
4 years ago
lain 11dd29ef3f Merge branch 'feature/upload-filter-exiftool' into 'develop'
4 years ago
Alibek Omarov d885540590 docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
4 years ago
Mark Felder 6167593881 Support Exiftool for stripping EXIF data
4 years ago
feld 167a619432 Merge branch 'fix/1924-s3-descriptions' into 'develop'
4 years ago
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain 48f98a2748 Merge branch 'mix-tasks-improvement' into 'develop'
4 years ago
Alexander Strizhakov b1b8f5f11a
docs and descriptions for s3 settings
4 years ago
Alexander Strizhakov c2edfd16e0
fix for user revoke invite task
4 years ago
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
4 years ago
lain 393a588265 Merge branch 'patch-1' into 'develop'
4 years ago
Dym Sohin 6465257e1f missed `:` (colon) before mrf_steal_emoji
4 years ago
Dym Sohin 6e54972252 added link to changelog, removed repetition
4 years ago
lain 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 31fef95e35
Add changelog and documentation
4 years ago
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Ivan Tashkinov 20461137a3 [#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
4 years ago
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
lain 1adda637d3 Docs: Document resetting of images
4 years ago
lain 729506c56a Docs: document instance differences
4 years ago
lain 2e21ae1b6d Docs: Add description limits to cheat sheet
4 years ago
lain 01695716c8 Docs: Document `accepts_chat_messages` setting.
4 years ago
lain b374fd622b Docs: Document the added `accepts_chat_messages` user property.
4 years ago
Mark Felder 02d855b2b9 Document the new API extension of /api/v1/instance
4 years ago
Alex Gleason 8daacc9114
AutoLinker --> Linkify, update to latest version
4 years ago
lain 577da132da Merge branch '1031-parent-visible' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier efb5d64e50
differences_in_mastoapi_responses: Update account fields
4 years ago
Mark Felder 69848d5c97 Rename notification "privacy_option" setting
4 years ago
Mark Felder fd5e797379 Simplify notification filtering settings further
4 years ago
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings
4 years ago
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings
4 years ago
Alex Gleason 28d4e60f66
MastoAPI differences: Document not implemented features
4 years ago
lain 637bae42b4 Docs: Document added parent_visible field.
4 years ago
Roman Chvanikov 1471b70ef1 Merge develop
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
lain 59e2a1018a Merge branch 'fix_1586_provide_index_md' into 'develop'
4 years ago
lain 31489bc864 Merge branch 'docs_use_include_for_install_further_reading' into 'develop'
4 years ago
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
4 years ago
Ilja 499324f7be Removed a space that was too much
4 years ago
Ilja 1e089cdf29 I forgot to git add some files, oops (should be squashed with MR)
4 years ago
Ilja a3b10a4f64 Fix 1586 Docs: provide a index.md
4 years ago
Ilja 9f7ee5dfa2 Add include for the "Further reading" section
4 years ago
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop'
4 years ago
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE
4 years ago
Haelwenn (lanodan) Monnier 15ba539258
cheatsheet.md: no_attachment_links → attachment_links
4 years ago
Alexander Strizhakov 02ca8a363f
default page size for files
4 years ago
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action
4 years ago
Maksim abfb1c756b Apply suggestion to docs/API/admin_api.md
4 years ago
Maksim 90613348ed Apply suggestion to docs/API/admin_api.md
4 years ago
Alexander Strizhakov b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago