e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
386199063b
Document `/api/pleroma/backups` API endpoint
2020-10-07 18:34:30 +04:00
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
b90eda3d8b
Improve description yet again
2020-10-06 17:36:29 -05:00
e08eb4aba0
Don't leak internal variables in the docs. They're useless to users.
2020-10-06 17:29:56 -05:00
b8c05f4876
Improve descriptions for reserved and proxies
2020-10-06 17:21:27 -05:00
7aff2b47c5
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
2020-10-06 15:47:11 -05:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
4c229d7fcc
docs/ap_extensions.md: Add JSON-LD full names
2020-10-05 17:36:12 +02:00
ac6e0f6684
docs/ap_extensions.md: document oauthRegistrationEndpoint
2020-10-05 17:19:21 +02:00
858dbe4360
docs/ap_extensions.md: document uploadMedia
2020-10-05 17:14:22 +02:00
8d093a68a6
Docs: Modify docs so the postgres config is harder to get wrong.
2020-10-05 13:58:12 +02:00
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
9a56ec25cb
Changelog: Add info about relay unfollowing
2020-09-29 16:24:02 +02:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
7cd662f18c
Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.
2020-09-24 18:02:50 +03:00
871fac3e4c
docs update
2020-09-24 09:41:40 +03:00
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
2159daa9af
update changelog
2020-09-18 07:09:53 +03:00
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
2020-09-17 16:55:53 +03:00
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
2020-09-17 13:26:04 +02:00
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
0b5e72ecf0
Remove `:managed_config` option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
2020-09-14 18:04:16 +03:00
40c847dc2a
Spelling
...
Reported by: trevoke
2020-09-11 17:42:39 -05:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
dfb831ca39
Chat moderation: add tests for unauthorized access
2020-09-11 14:11:07 -05:00
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
2020-09-11 14:11:00 -05:00
c361df11b4
Docs: AdminAPI chat moderation
2020-09-11 14:10:45 -05:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
a098e10fd6
Document ephemeral activity changes better
...
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
2020-09-10 21:52:30 +03:00
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
bccef4b997
Pedantry
2020-09-08 17:01:55 -05:00
ed847474c3
Fix descriptions
2020-09-08 16:59:53 -05:00
75b6fef25d
Add mix task for bulk [un]confirming the local instance users
2020-09-08 16:39:41 -05:00
23ca5f75af
Make it possible to bulk send confirmation emails to all unconfirmed users
2020-09-08 16:39:08 -05:00
96697db3bc
RelMe and Feed no longer configurable
2020-09-08 20:21:34 +03:00
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
efff2caccc
docs: cheatsheet: add ForceBotUnlistedPolicy
2020-09-08 11:34:04 +00:00
4306050da9
Merge branch 'develop' into 'develop'
...
Added cmake
See merge request pleroma/pleroma!2953
2020-09-08 13:56:29 +03:00
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
a83916fdac
adapter options unification
...
not needed options deletion
2020-09-07 19:59:17 +03:00
917d325972
added api spec
2020-09-07 07:17:30 +03:00
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
173b04df48
Added cmake
2020-09-04 18:03:58 +00:00
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
35da3be9dd
Add mention of sudo -Hu pleroma to docs
2020-08-28 13:50:21 +00:00
b76839e008
Cheatsheet: Remove misleading example
2020-08-26 13:53:16 +02:00
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
5722b0e2e5
Merge branch 'docs/update-clients' into 'develop'
...
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
See merge request pleroma/pleroma!2914
2020-08-25 07:41:25 +00:00
16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
2020-08-24 23:14:07 +02:00
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
8d70692abf
Merge branch 'freebsd-docs' into 'develop'
...
FreeBSD installation process
See merge request pleroma/pleroma!2887
2020-08-18 12:56:28 +00:00
368fd04b47
Cheatsheet: Add information about filename descriptions
2020-08-18 13:22:00 +02:00
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
e154fcf525
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
...
[#2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes #2046
See merge request pleroma/pleroma!2890
2020-08-17 12:26:53 +00:00
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
4fcf272717
Docs: Fix the way tabs are declared
...
Since python doesn't have a way to lock deps for a particlar project
by default, I didn't bother with it. This resulted in mkdocs updating at
some point, bringing a breaking change to how tabs are declared and
broken tabs on docs-develop.pleroma.social. I've learned my lesson
and locked deps with pipenv in pleroma/docs!5. This MR updates Pleroma
docs to use the new tab style, fortunately my editor did most of it.
Closes #2045
2020-08-15 09:55:59 +03:00
e8c20c42cd
minor changes
2020-08-14 00:21:42 -04:00
a5144f05c2
Removed a trailing comment
2020-08-13 22:49:50 -04:00
816c04abdc
Updates
2020-08-13 22:38:23 -04:00
b0c456d18d
more acme.sh updates
2020-08-13 22:18:33 -04:00
f2665547f5
acme updates
2020-08-13 21:24:08 -04:00
24eb917dbc
Rearranging acme
2020-08-13 20:58:46 -04:00
cba9f368af
Added comment
2020-08-13 19:34:04 -04:00
b5f48275c5
Minor patch update
2020-08-13 19:08:13 -04:00
33ea430f3b
acme.sh and netbsd to freebsd updates
2020-08-13 18:59:14 -04:00
53c4215ef1
Updated some more instruction specifics.
2020-08-13 18:59:14 -04:00
f6686a64af
Updated ssl and domain name updates
...
Removed the reference to niaa
2020-08-13 18:59:14 -04:00
da5aca27a8
Minor reorganization
2020-08-13 18:59:13 -04:00
07376bd21a
Adding installation documentation for FreeBSD + rc.d script
2020-08-13 18:59:13 -04:00
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
a94210c70b
Merge branch 'docs_improve_static_dir_documentation' into 'develop'
...
Improve static_dir documentation
See merge request pleroma/pleroma!2864
2020-08-12 16:39:19 +00:00
3aa7969ff9
Update robots_txt.md
2020-08-12 16:19:34 +00:00
091da10832
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
2020-08-12 11:00:01 -05:00
644effc63b
update docs
2020-08-12 08:51:09 +03:00
93fbf39954
Merge branch 'revert-a6d3bb5f' into 'develop'
...
Revert "Merge branch 'issue/1023' into 'develop'"
Closes #2033
See merge request pleroma/pleroma!2868
2020-08-10 13:59:38 +00:00
73af60d02f
Merge branch 'develop' into 'develop'
...
docs: add cmake to other installation guides
Closes #2039
See merge request pleroma/pleroma!2870
2020-08-10 13:47:02 +00:00
a2f2ba3fbb
docs: add cmake to other installation guides
2020-08-10 16:24:45 +03:00
4d76c0ec8b
Docs: Add cmake dependency
2020-08-10 15:12:45 +02:00
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
bd7bf6cd19
Apply 1 suggestion(s) to 1 file(s)
2020-08-10 11:29:54 +00:00
a4a2d38640
Apply 1 suggestion(s) to 1 file(s)
2020-08-10 11:29:40 +00:00
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
e0dee833f2
Improve static_dir documentation
...
* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
* i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.
2020-08-08 12:21:44 +02:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
2020-08-07 17:59:55 +02:00
199ad47c22
Docs: Add OTP commands to frontend docs.
2020-08-07 17:04:44 +02:00
6ddea8ebe8
Add a note about the proper value for uid
2020-08-07 09:42:10 -05:00
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
2020-08-03 21:01:56 +00:00
8b1da33a54
Docs: Add info about installing from a local path.
2020-08-03 17:50:53 +02:00
5c2745725e
Docs: Document installation of frontends
...
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-08-03 17:44:59 +02:00
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
dc88b6f091
Add email blacklist, fixes #1404
2020-08-02 14:53:42 -05:00
0012894d4e
Add indigenous to clients
2020-08-02 19:33:22 +02:00
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
2020-07-31 14:43:33 +00:00
37b9e5e138
Apply 1 suggestion(s) to 1 file(s)
2020-07-31 10:29:16 +00:00
052833f8ee
Fix example json response
2020-07-30 15:57:41 -05:00
24169ae2e6
Merge branch 'develop' into fix/configdb-otp-instructions
2020-07-30 13:04:49 -05:00
cfc6484c40
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
2020-07-30 12:37:56 -05:00
1f24186036
Attempt to fix markdown formatting
2020-07-30 12:01:46 -05:00
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
2020-07-30 12:41:47 +00:00
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
2020-07-29 16:07:22 -05:00
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
2020-07-29 12:43:39 -05:00
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
2020-07-29 13:45:15 +00:00
79f9ddd8b7
Merge branch 'by-approval' into 'develop'
...
Registrations "by approval" mode
Closes #1931
See merge request pleroma/pleroma!2757
2020-07-29 11:27:26 +00:00
54afb35685
Cheatsheet: Update frontends information.
2020-07-29 13:06:51 +02:00
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
81350faa8e
Cheatsheet: Add even more info.
2020-07-28 17:50:32 +02:00
393128fb02
Cheatsheet: Add more info.
2020-07-28 17:48:35 +02:00
08732e8a03
Docs: Add frontend info to cheat sheet.
2020-07-28 17:46:37 +02:00
520dce857e
Add :registration_reason_length to description.exs
2020-07-27 15:24:20 -05:00
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
2020-07-23 16:36:27 +03:00
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
8d6f7aec21
Merge branch 'develop' into issue/1023
2020-07-22 09:24:16 +03:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
2020-07-21 19:35:43 +00:00
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
5fcb3e8738
fix docs
2020-07-16 16:35:09 +03:00
6c59fe259d
Merge branch 'develop' into issue/1023
2020-07-16 08:53:21 +03:00
b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
2020-07-15 13:34:27 -05:00
Egor Kislitsyn
Mark Felder
Haelwenn (lanodan) Monnier
lain
Maksim Pechnikov
Ivan Tashkinov
Alexander Strizhakov
feld
Steven Fuchs
eugenijm
rinpatch
Alex Gleason
Alibek Omarov
Farhan Khan
Shpuld Shpludson
Haelwenn
Ilja
Ilja
swentel