1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-10-27 17:47:56 +00:00
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 17:42:24 +00:00
2f7401806b
Merge branch 'docs/clients-apc2s' into 'develop'
...
clients.md: Add AndStatus, note supported protocols
See merge request pleroma/pleroma!3104
2020-10-26 15:59:10 +00:00
e6dab6513d
Merge branch 'patch-1' into 'develop'
...
Fix link reference
See merge request pleroma/pleroma!3103
2020-10-26 11:33:16 +00:00
1de4ff8b4d
clients.md: Add AndStatus, note supported protocols
2020-10-26 03:23:47 +01:00
073ad7e6d9
Merge branch 'docs/ap_c2s' into 'develop'
...
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
2020-10-26 02:09:20 +00:00
ac692ff3e9
Fix link reference
2020-10-25 08:28:17 +00:00
51189ad365
update docs
2020-10-22 11:53:28 +03:00
b18b93bbed
Fix formatting and typos in "Managing frontends" guide
2020-10-21 21:42:21 +04:00
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
2020-10-20 17:16:58 +04:00
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
2020-10-18 21:22:21 +03:00
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
2020-10-16 17:36:02 +00:00
2030ffd490
fix test
2020-10-15 22:31:52 +03:00
cf53e300f8
added generate the release env to `pleroma.instance gen`
2020-10-15 22:31:00 +03:00
595da6080d
fixed install docs
2020-10-15 22:30:03 +03:00
2f6bbd53b5
fix docs
2020-10-15 22:29:37 +03:00
20e68b30f0
added generated `pleroma.env`
2020-10-15 22:28:26 +03:00
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
42112b842c
Change handle and url of contact person for Indigenous client
2020-10-14 21:32:18 +02:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
943f65c739
Include python script and description
2020-10-13 19:58:38 +01:00
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
4c4ea9a348
changes after rebase
2020-10-13 17:10:34 +03:00
c497558d43
AuthenticationPlug module name
2020-10-13 16:43:58 +03:00
e2332d92ce
LegacyAuthenticationPlug module name
2020-10-13 16:43:54 +03:00
a6d8cef33e
OAuthScopesPlug module name
2020-10-13 16:43:54 +03:00
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
06934b820e
Add ejabberd auth document
2020-10-12 23:20:10 +01:00
42b4b95467
Merge branch 'docs/improve-backup-restore' into 'develop'
...
Further improvements to backup/restore docs
See merge request pleroma/pleroma!3072
2020-10-12 17:46:25 +00:00
6ec1b1615b
Further improvements
2020-10-12 12:23:20 -05:00
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
ec217ca638
Spelling
2020-10-09 11:18:48 -05:00
1e5fec8d45
Ask user to use matching values for database setup
2020-10-09 09:14:02 -05:00
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
e0c5adcc20
Syntax error
2020-10-08 15:56:37 -05:00
5f38e03c8a
Don't always need to drop
2020-10-08 15:54:28 -05:00
a02ed3920f
Improve backup/restore documentation
2020-10-08 15:51:56 -05:00
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
6d5f02a1da
Fix API documentation
2020-10-07 18:35:28 +04:00
17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
2020-10-07 18:35:27 +04:00
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
minibikini