Egor Kislitsyn
81145ecdf5
Fix markdown
2020-11-11 20:42:05 +04:00
Egor Kislitsyn
d26a449396
Change endpoint path
2020-11-11 20:39:57 +04:00
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
2020-11-11 18:49:15 +03:00
Egor Kislitsyn
0118ccb53c
Add local visibility
2020-11-11 18:54:01 +04:00
7681b4c5cd
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:23 +00:00
776067a9a3
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:17 +00:00
952a8c213e
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:08 +00:00
2933658446
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:00 +00:00
lain
abf2ec2bbe
Update optimizing_beam.md
2020-11-08 09:45:35 +00:00
rinpatch
cc45c69fff
Remove release_env
...
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
2020-11-08 11:56:09 +03:00
Mark Felder
a9c1f83fd8
Markdown, you're drunk
2020-11-06 13:16:22 -06:00
Mark Felder
4999549191
Make it clearer the settings go into the vm.args file
2020-11-06 13:15:21 -06:00
Mark Felder
620f1d7237
More grammar fixes
2020-11-06 13:12:13 -06:00
Mark Felder
da1862e1d3
Less confusing I hope
2020-11-06 13:04:13 -06:00
Mark Felder
9e90e49ad2
Grammar
2020-11-06 13:02:07 -06:00
Mark Felder
60fe4a8393
First draft of tips for optimizing BEAM
2020-11-06 13:00:31 -06:00
lain
9b2ed14277
Docs: Add info about expiring mutes.
2020-11-05 13:23:58 +01:00
lain
78cea44553
Merge branch 'ejabberd-pleroma-auth' into 'develop'
...
Add ejabberd auth document
See merge request pleroma/pleroma!3074
2020-11-04 15:42:48 +00:00
lain
2aeb229de3
Cheatsheet: Add info about :blockers_visible
2020-11-04 16:23:24 +01:00
Ivan Tashkinov
73e66fd31f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-04 17:48:10 +03:00
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
Egor Kislitsyn
ca95cbe0b4
Add with_muted param to ChatController.index/2
2020-11-04 16:40:12 +04:00
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
Ivan Tashkinov
04f6b48ac1
Auth subsystem refactoring and tweaks.
...
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
2020-10-31 13:38:35 +03:00
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
a326a56371
Merge branch 'fix/frontend-cli-docs' into 'develop'
...
Fix formatting and typos in "Managing frontends" guide
See merge request pleroma/pleroma!3098
2020-10-29 21:06:42 +00:00
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
Egor Kislitsyn
75d131ba18
Add documentation and update CHANGELOG
2020-10-29 16:37:51 +04:00
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
Mark Felder
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
lain
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
rinpatch
e6dab6513d
Merge branch 'patch-1' into 'develop'
...
Fix link reference
See merge request pleroma/pleroma!3103
2020-10-26 11:33:16 +00:00
Haelwenn (lanodan) Monnier
1de4ff8b4d
clients.md: Add AndStatus, note supported protocols
2020-10-26 03:23:47 +01:00
Haelwenn
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
Kana
ac692ff3e9
Fix link reference
2020-10-25 08:28:17 +00:00
Maksim Pechnikov
51189ad365
update docs
2020-10-22 11:53:28 +03:00
Egor Kislitsyn
b18b93bbed
Fix formatting and typos in "Managing frontends" guide
2020-10-21 21:42:21 +04:00
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
Egor Kislitsyn
ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup
2020-10-20 17:16:58 +04:00
Egor Kislitsyn
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
Ivan Tashkinov
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
Maksim Pechnikov
2030ffd490
fix test
2020-10-15 22:31:52 +03:00
Maksim Pechnikov
cf53e300f8
added generate the release env to pleroma.instance gen
2020-10-15 22:31:00 +03:00
Maksim Pechnikov
595da6080d
fixed install docs
2020-10-15 22:30:03 +03:00
Maksim Pechnikov
2f6bbd53b5
fix docs
2020-10-15 22:29:37 +03:00
Maksim Pechnikov
20e68b30f0
added generated pleroma.env
2020-10-15 22:28:26 +03:00
Egor Kislitsyn
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
swentel
42112b842c
Change handle and url of contact person for Indigenous client
2020-10-14 21:32:18 +02:00
Alex Gleason
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
Alex Gleason
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
Alex Gleason
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
Ali Riza Keles
943f65c739
Include python script and description
2020-10-13 19:58:38 +01:00
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
Alexander Strizhakov
4c4ea9a348
changes after rebase
2020-10-13 17:10:34 +03:00
Alexander Strizhakov
c497558d43
AuthenticationPlug module name
2020-10-13 16:43:58 +03:00
Alexander Strizhakov
e2332d92ce
LegacyAuthenticationPlug module name
2020-10-13 16:43:54 +03:00
Alexander Strizhakov
a6d8cef33e
OAuthScopesPlug module name
2020-10-13 16:43:54 +03:00
Alexander Strizhakov
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
Ali Riza Keles
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
Mark Felder
6ec1b1615b
Further improvements
2020-10-12 12:23:20 -05:00
Mark Felder
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
Mark Felder
ec217ca638
Spelling
2020-10-09 11:18:48 -05:00
Mark Felder
1e5fec8d45
Ask user to use matching values for database setup
2020-10-09 09:14:02 -05:00
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
Mark Felder
e0c5adcc20
Syntax error
2020-10-08 15:56:37 -05:00
Mark Felder
5f38e03c8a
Don't always need to drop
2020-10-08 15:54:28 -05:00
Mark Felder
a02ed3920f
Improve backup/restore documentation
2020-10-08 15:51:56 -05:00
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
Haelwenn
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
Egor Kislitsyn
6d5f02a1da
Fix API documentation
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
17562bf414
Move API endpoints to /api/v1/pleroma/backups
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
386199063b
Document /api/pleroma/backups API endpoint
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
Mark Felder
b90eda3d8b
Improve description yet again
2020-10-06 17:36:29 -05:00
Mark Felder
e08eb4aba0
Don't leak internal variables in the docs. They're useless to users.
2020-10-06 17:29:56 -05:00
Mark Felder
b8c05f4876
Improve descriptions for reserved and proxies
2020-10-06 17:21:27 -05:00
Mark Felder
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
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
Haelwenn (lanodan) Monnier
4c229d7fcc
docs/ap_extensions.md: Add JSON-LD full names
2020-10-05 17:36:12 +02:00
Haelwenn (lanodan) Monnier
ac6e0f6684
docs/ap_extensions.md: document oauthRegistrationEndpoint
2020-10-05 17:19:21 +02:00
Haelwenn (lanodan) Monnier
858dbe4360
docs/ap_extensions.md: document uploadMedia
2020-10-05 17:14:22 +02:00
lain
8d093a68a6
Docs: Modify docs so the postgres config is harder to get wrong.
2020-10-05 13:58:12 +02:00
lain
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
lain
9a56ec25cb
Changelog: Add info about relay unfollowing
2020-09-29 16:24:02 +02:00
Maksim Pechnikov
de993b856b
added force option to the unfollow operation
2020-09-28 09:16:42 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
7cd662f18c
Added documentation on installation of ffmpeg and ImageMagick dependencies.
2020-09-24 18:02:50 +03:00
Alexander Strizhakov
871fac3e4c
docs update
2020-09-24 09:41:40 +03:00
Alexander Strizhakov
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
Maksim Pechnikov
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
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Maksim Pechnikov
2159daa9af
update changelog
2020-09-18 07:09:53 +03:00
Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
eugenijm
c711a2b157
Return the file content for GET /api/pleroma/admin/instance_document/:document_name
2020-09-17 16:55:53 +03:00
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
lain
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
2020-09-17 13:26:04 +02:00
Maksim Pechnikov
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
rinpatch
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
Mark Felder
40c847dc2a
Spelling
...
Reported by: trevoke
2020-09-11 17:42:39 -05:00
Alex Gleason
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
Alex Gleason
dfb831ca39
Chat moderation: add tests for unauthorized access
2020-09-11 14:11:07 -05:00
Alex Gleason
e229536e5c
Chat Moderation: use explicit sender and recipient fields
2020-09-11 14:11:00 -05:00
Alex Gleason
c361df11b4
Docs: AdminAPI chat moderation
2020-09-11 14:10:45 -05:00
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
rinpatch
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
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
Mark Felder
bccef4b997
Pedantry
2020-09-08 17:01:55 -05:00
Mark Felder
ed847474c3
Fix descriptions
2020-09-08 16:59:53 -05:00
Mark Felder
75b6fef25d
Add mix task for bulk [un]confirming the local instance users
2020-09-08 16:39:41 -05:00
Mark Felder
23ca5f75af
Make it possible to bulk send confirmation emails to all unconfirmed users
2020-09-08 16:39:08 -05:00
Mark Felder
96697db3bc
RelMe and Feed no longer configurable
2020-09-08 20:21:34 +03:00
Mark Felder
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
lain
4306050da9
Merge branch 'develop' into 'develop'
...
Added cmake
See merge request pleroma/pleroma!2953
2020-09-08 13:56:29 +03:00
rinpatch
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
rinpatch
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
Alexander Strizhakov
a83916fdac
adapter options unification
...
not needed options deletion
2020-09-07 19:59:17 +03:00
Maksim Pechnikov
917d325972
added api spec
2020-09-07 07:17:30 +03:00
Maksim Pechnikov
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
Farhan Khan
173b04df48
Added cmake
2020-09-04 18:03:58 +00:00
rinpatch
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
Shpuld Shpludson
35da3be9dd
Add mention of sudo -Hu pleroma to docs
2020-08-28 13:50:21 +00:00
lain
b76839e008
Cheatsheet: Remove misleading example
2020-08-26 13:53:16 +02:00
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
lain
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
Haelwenn (lanodan) Monnier
16f777a7b2
clients.md: Remove Nekonium, Twidere-iOS, Feather; Add DashFE and BloatFE
2020-08-24 23:14:07 +02:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
Haelwenn
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
lain
8d70692abf
Merge branch 'freebsd-docs' into 'develop'
...
FreeBSD installation process
See merge request pleroma/pleroma!2887
2020-08-18 12:56:28 +00:00
lain
368fd04b47
Cheatsheet: Add information about filename descriptions
2020-08-18 13:22:00 +02:00
lain
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
lain
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
Ivan Tashkinov
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
rinpatch
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
Farhan Khan
e8c20c42cd
minor changes
2020-08-14 00:21:42 -04:00
Farhan Khan
a5144f05c2
Removed a trailing comment
2020-08-13 22:49:50 -04:00
Farhan Khan
816c04abdc
Updates
2020-08-13 22:38:23 -04:00
Farhan Khan
b0c456d18d
more acme.sh updates
2020-08-13 22:18:33 -04:00
Farhan Khan
f2665547f5
acme updates
2020-08-13 21:24:08 -04:00
Farhan Khan
24eb917dbc
Rearranging acme
2020-08-13 20:58:46 -04:00
Farhan Khan
cba9f368af
Added comment
2020-08-13 19:34:04 -04:00
Farhan Khan
b5f48275c5
Minor patch update
2020-08-13 19:08:13 -04:00
Farhan Khan
33ea430f3b
acme.sh and netbsd to freebsd updates
2020-08-13 18:59:14 -04:00
Farhan Khan
53c4215ef1
Updated some more instruction specifics.
2020-08-13 18:59:14 -04:00
Farhan Khan
f6686a64af
Updated ssl and domain name updates
...
Removed the reference to niaa
2020-08-13 18:59:14 -04:00
Farhan Khan
da5aca27a8
Minor reorganization
2020-08-13 18:59:13 -04:00
Farhan Khan
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
Maksim Pechnikov
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
Mark Felder
091da10832
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
2020-08-12 11:00:01 -05:00
Maksim Pechnikov
644effc63b
update docs
2020-08-12 08:51:09 +03:00
lain
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
lain
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
lain
4d76c0ec8b
Docs: Add cmake dependency
2020-08-10 15:12:45 +02:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
Ilja
bd7bf6cd19
Apply 1 suggestion(s) to 1 file(s)
2020-08-10 11:29:54 +00:00
Ilja
a4a2d38640
Apply 1 suggestion(s) to 1 file(s)
2020-08-10 11:29:40 +00:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
Ilja
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
Alex Gleason
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
Alex Gleason
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
lain
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
2020-08-07 17:59:55 +02:00
lain
199ad47c22
Docs: Add OTP commands to frontend docs.
2020-08-07 17:04:44 +02:00
Mark Felder
6ddea8ebe8
Add a note about the proper value for uid
2020-08-07 09:42:10 -05:00
lain
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
lain
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
lain
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
lain
8b1da33a54
Docs: Add info about installing from a local path.
2020-08-03 17:50:53 +02:00
lain
5c2745725e
Docs: Document installation of frontends
...
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-08-03 17:44:59 +02:00
lain
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
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
2020-08-02 14:53:42 -05:00
swentel
0012894d4e
Add indigenous to clients
2020-08-02 19:33:22 +02:00
Ilja
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
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
lain
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
lain
37b9e5e138
Apply 1 suggestion(s) to 1 file(s)
2020-07-31 10:29:16 +00:00
Mark Felder
052833f8ee
Fix example json response
2020-07-30 15:57:41 -05:00
Mark Felder
24169ae2e6
Merge branch 'develop' into fix/configdb-otp-instructions
2020-07-30 13:04:49 -05:00
Mark Felder
cfc6484c40
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions.
2020-07-30 12:37:56 -05:00
Mark Felder
1f24186036
Attempt to fix markdown formatting
2020-07-30 12:01:46 -05:00
lain
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
Mark Felder
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
2020-07-29 16:07:22 -05:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
2020-07-29 12:43:39 -05:00
lain
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
lain
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
lain
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
lain
54afb35685
Cheatsheet: Update frontends information.
2020-07-29 13:06:51 +02:00
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden
2020-07-28 14:58:30 -05:00
lain
81350faa8e
Cheatsheet: Add even more info.
2020-07-28 17:50:32 +02:00
lain
393128fb02
Cheatsheet: Add more info.
2020-07-28 17:48:35 +02:00
lain
08732e8a03
Docs: Add frontend info to cheat sheet.
2020-07-28 17:46:37 +02:00
Alex Gleason
520dce857e
Add :registration_reason_length to description.exs
2020-07-27 15:24:20 -05:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
Maksim Pechnikov
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
2020-07-23 16:36:27 +03:00
Maksim Pechnikov
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
Maksim Pechnikov
8d6f7aec21
Merge branch 'develop' into issue/1023
2020-07-22 09:24:16 +03:00
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
lain
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
Maksim Pechnikov
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
Alex Gleason
d0eb43b58b
Add account aliases
2020-07-17 16:17:49 -05:00
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
Alex Gleason
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
Maksim Pechnikov
5fcb3e8738
fix docs
2020-07-16 16:35:09 +03:00
Maksim Pechnikov
6c59fe259d
Merge branch 'develop' into issue/1023
2020-07-16 08:53:21 +03:00
Mark Felder
b2d398b1d0
Merge branch 'develop' into refactor/gun-pool-registry
2020-07-15 13:34:27 -05:00
Mark Felder
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
rinpatch
007843b75e
Add documentation for new connection pool settings and remove some
...
`:retry_timeout` and `:retry` got removed because reconnecting on failure is
something the new pool intentionally doesn't do.
`:max_overflow` had to go in favor of `:max_waiting`, I didn't reuse the key because
the settings are very different in their behaviour.
`:checkin_timeout` got removed in favor of `:connection_acquisition_wait`,
I didn't reuse the key because the settings are somewhat different.
I didn't do any migrations/deprecation warnings/changelog entries because
these settings were never in stable.
2020-07-15 15:26:35 +03:00
Alex Gleason
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
Alex Gleason
20d24741af
AdminAPI: Add PATCH /api/pleroma/admin/users/approve endpoint
2020-07-14 18:02:44 -05:00
Alex Gleason
33f1b29b2c
AdminAPI: Filter users by need_approval
2020-07-14 14:29:03 -05:00
Alex Gleason
b750129da1
AdminAPI: Return approval_pending with users
2020-07-14 13:47:05 -05:00
Alex Gleason
a1570ba6ad
AdminAPI: Return registration_reason with users
2020-07-14 13:08:39 -05:00
3f65f2ea79
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
...
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
2020-07-14 18:07:44 +00:00
2909dc873b
Merge branch '1940-admin-token-oauthless-auth' into 'develop'
...
[#1940 ] Reinstated OAuth-less `admin_token` authentication
Closes #1940
See merge request pleroma/pleroma!2760
2020-07-14 16:48:26 +00:00
rinpatch
8d56fb6d22
Migrate in-db config after updating to Oban 2.0
2020-07-14 13:15:46 +03:00
