Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
rinpatch
044eb039c2
OTP Release install docs: Remove --dry-run in cron certbot command
5 years ago
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
deorsum
4c40ada7a5
Add a caveat for docker deployment in the config docs
5 years ago
rinpatch
eddcebf8ae
Add a warning about service files assuming installation paths
5 years ago
rinpatch
b6cfc8f98b
Merge branch 'patch-3' into 'develop'
...
Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352
5 years ago
Yuji Nakao
ab6de9b478
Move all upload contents despite upload folder itself.
5 years ago
Yuji Nakao
b2548e65db
Update migrating_from_source_otp_en.md: Replace `reload-daemon` with `daemon-reload`.
5 years ago
William Pitcock
074ffee0b2
docs: add documentation for MediaProxyWarmingPolicy
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
Julien Wehmschulte
e556c96661
Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files
5 years ago
lain
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
5 years ago
rinpatch
eeb419e3a0
Add a note about the develop branch
5 years ago
rinpatch
4f44732100
Add a note on what OTP releases are
5 years ago
Alexander Strizhakov
c6705144a2
don't delete config settings on admin update
5 years ago
rinpatch
f5f1bb35c3
Instructions on getting the flavour
5 years ago
rinpatch
877f91c0c4
Do not assume ~pleroma == /opt/pleroma
5 years ago
rinpatch
e404335af8
Add all the remaining sections to Switching to OTP releases
5 years ago
kaniini
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
5 years ago
rinpatch
41e4752950
Make default pack extensions configurable and default to png and gif
5 years ago
Maksim
ec01b7c934
Apply suggestion to docs/config.md
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
rinpatch
44aa895b78
Add a note that OTP releases don't contain revision history
5 years ago
rinpatch
57d18b06ab
Remove the useless specification of test size and make the main points bold
5 years ago
rinpatch
687f0aee51
Basic skeleton of "Switching a from-source install to OTP releases"
5 years ago
aries
550302c041
Apply suggestion to docs/config.md
5 years ago
rinpatch
7fc226e0fe
Remove the warning about alpine as the issue is now solved
5 years ago
aries
7daaaf84f1
Fix markdown mistakes
5 years ago
aries
4bac13966b
modify config.md for S3
5 years ago
kaniini
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
5 years ago
rinpatch
40a62839ff
Use build-base instead of individual packages
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
rinpatch
1d3c5e434d
releases_en.md -> otp_en.md
5 years ago
rinpatch
66e92dc0ca
Add a Further Reading section to the OTP install guide
5 years ago
rinpatch
299cefa2bd
Add a section on executing mix tasks
5 years ago
rinpatch
18eabca978
Add a section about updating
5 years ago
rinpatch
9d487ba579
Add docs about SSL certificate auto-renew
5 years ago
rinpatch
7a4c4518b8
Remove a note about needing to add RUM to config manually, as it is now
...
in the config generator
5 years ago
Haelwenn (lanodan) Monnier
ab79a18b77
docs/clients.md: Remove tootdon
...
Of course a proprietary client would send the messages home :D
5 years ago
Alex S
410add1c30
support for tuples with more than 2 values
5 years ago
rinpatch
e00e4c0e7a
Add a warning about OTP releases on Alpine 3.10
5 years ago
rinpatch
177faf15c2
Correct dependencies for RUM on alpine and remove installcheck
5 years ago
rinpatch
50e3cf9d5e
Correct a typo in the apk command
5 years ago
rinpatch
dd05dc65d3
Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine
5 years ago
rinpatch
1d2332ce79
Use uname -m instead of arch for more portability
5 years ago
rinpatch
120f84c83d
Executing create is unnecessary after the postgres script is executed
5 years ago
rinpatch
23608149bc
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
5 years ago
rinpatch
d1d648b0ec
Correct the psql command
5 years ago
rinpatch
452d5d3231
Merge branch 'develop' into release-docs
5 years ago
rinpatch
743bd64883
Apply suggestion to docs/installation/releases_en.md
5 years ago
rinpatch
de77d7621a
Apply suggestion to docs/installation/releases_en.md
5 years ago
rinpatch
8b170b96c7
Apply suggestion to docs/installation/releases_en.md
5 years ago
rinpatch
4bec121798
Do not set ownership group in chown commands
5 years ago
rinpatch
e824025c52
Remove a useless echo
5 years ago
rinpatch
16e9304cec
Change to long adduser options because the short ones only work on busybox
5 years ago
rinpatch
4669a56aa3
Add notes on RUM indexes
5 years ago
rinpatch
f9515a3611
Add a note about RUM indexes package on Debian/Ubuntu
5 years ago
rinpatch
d3d98beaad
Correct package names for Debian
5 years ago
rinpatch
dd23888774
OTP release install guide sceleton
5 years ago
William Pitcock
630ac6a921
docs: better description for mrf anti link spam
5 years ago
William Pitcock
736d8ad6be
implement anti link spam MRF
5 years ago
lain
6745bc951c
Documentation: Document chat token response.
5 years ago
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
lain
774637a2f4
Mastodon API: Document changes.
5 years ago
lain
4265608097
Merge branch 'chore/tagpolicy_docs' into 'develop'
...
Document TagPolicy in `rewrite_policy` section
See merge request pleroma/pleroma!1271
5 years ago
rinpatch
ced59be1ae
Document TagPolicy in `rewrite_policy` section
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
Hakaba Hitoyo
5d5a9a3a35
Better default parameters for suggestion
5 years ago
Egor Kislitsyn
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn
2e5affce61
Add RateLimiter
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
Egor Kislitsyn
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Ivan Tashkinov
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
5 years ago
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
5 years ago
Egor Kislitsyn
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Maksim Pechnikov
96121315f3
fix merge
5 years ago
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
lain
25198d48f7
Docs: Add Explicit addressing to Readme and changelog.
5 years ago
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
kaniini
a536f515dd
Merge branch 'ueberauth_config_extension' into 'develop'
...
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
Ivan Tashkinov
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
William Pitcock
c724d8df98
docs: document mrf_subchain
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
5 years ago
lain
10fe02acef
Documentation: Document Settings store mechanism.
5 years ago
feld
88414151b4
Formatting
5 years ago
feld
75a37a68d4
Install docs should clone from master branch
5 years ago
Mark Felder
e912f81c82
Update docs to reflect we accept nickname for id for both of these endpoints
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
kaniini
75e78d4e23
Merge branch 'feature/mrf-user-filter' into 'develop'
...
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
5 years ago
kaniini
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
William Pitcock
7d9b33b3ce
update documentation for the new MRF features [no-ci]
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
lain
b22145cbc4
Documentation: Specify PEM format for SSH keys.
...
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
William Pitcock
16b260fb19
add mix task to prune the object database using a configured retention period
5 years ago
lain
d378b342ba
MongooseIM: Add documentation.
5 years ago
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini
943d1b2f26
Merge branch 'feature/user-configurable-mascot' into 'develop'
...
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
5 years ago
Aaron Tinio
5aa107d912
Document MRF.Simple :report_removal
5 years ago
Sadposter
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
Sadposter
54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
kaniini
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S
8355d0607e
trailing spaces
5 years ago
Alex S
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
5 years ago
Alex S
aa11fa4864
add report uri and report to
5 years ago
kaniini
a2771869a3
Merge branch 'docs/update_debian_instructions' into 'develop'
...
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
5 years ago
Angelina Filippova
107c83ab2b
Note that nicknames is an array
5 years ago
Angelina Filippova
0641e685c1
Note that nicknames is an array
5 years ago
Angelina Filippova
1d2923e5d0
Update tag/untag docs
5 years ago
PolymerWitch
0ae15c2306
Added package to dependency list
...
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
fc9b4410c4
Add documentation
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Alex S
f46295faa7
unused config paramater
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
xse
2982061dfa
Fix syntax highlighting + clarify :frontend_configuration
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
6 years ago
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
6 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
6 years ago
rinpatch
dfc8425659
Move settings to Source subentity
6 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
6 years ago
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
6 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
6 years ago
kaniini
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
6 years ago
kaniini
7dcac0bac0
Merge branch 'develop' into 'develop'
...
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
6 years ago
ilja
74ef14b04e
Add :emoji settings to config.md
6 years ago
Alex S
d35246c449
added healthcheck setting to instance config
6 years ago
ilja
c876b04aeb
Add shortcode_globs setting to documentation
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
6 years ago
Roman Chvanikov
b87ad13803
Move comments for email_notifications config to docs
6 years ago
Haelwenn (lanodan) Monnier
d086319733
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
6 years ago
Ekaterina Vaartis
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
Ekaterina Vaartis
31cff7dbca
Document the pleroma.emoji task
6 years ago
witches.live
8166cefa21
Include explicit warning for emerge config line as it will vary more widely based on current version of postgres
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
Mark Felder
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
Hakurei Reimu
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
6 years ago
lain
088f378408
Custom Emoji docs: Make it clear that config.exs is not for lewd.
6 years ago
Egor Kislitsyn
38926a063a
add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`
6 years ago
Haelwenn (lanodan) Monnier
48982169dc
docs/installation/arch_linux_en.md: Remove useless ODBC
...
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
6 years ago
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lambda
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
Sadposter
e6778003ab
JSON need quotes!
6 years ago
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
Mark Felder
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
6 years ago
feld
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
rinpatch
79cb34a4b0
Fix preview not being usable in form data
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
rinpatch
e2b94d8f33
Make only important note bold rather than the whole paragraph because it looks better that way
6 years ago
rinpatch
a309b49c2d
Remove outdated howto change config and port and move it to config.md instead
6 years ago
rinpatch
949cfde065
restart makes no sense here as we instructed to stop the service before
6 years ago
rinpatch
bff8cde0cf
Instruct to stop the service only after git pulling and getting deps to minimize downtimes
6 years ago
rinpatch
7c69c6f624
change bold text to be proper geadings in introduction.md
6 years ago
rinpatch
b46e6f0949
Fix backup/restore page to have proper headings
6 years ago
lain
3fc4ea45df
BBS: Add documentation.
6 years ago
rinpatch
42b779527c
document fake option
6 years ago