lain
2008fa9c7f
Merge branch 'fix/captcha' into 'develop'
...
Fix account registration when captcha is enabled but not provided
Closes #1712
See merge request pleroma/pleroma!2438
4 years ago
Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Alexander Strizhakov
631e8c1feb
docs update
4 years ago
Alexander Strizhakov
1fd40532ae
docs fix
4 years ago
Alexander Strizhakov
1c1b7e22af
list of options for pack metadata
4 years ago
Alexander Strizhakov
ddb757f743
emoji api packs changes in routes with docs update
4 years ago
Alexander Strizhakov
95759310ab
docs update
4 years ago
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
4 years ago
lain
528ea779a6
Apply suggestion to docs/API/chats.md
4 years ago
Egor Kislitsyn
8148d76ec5
Document `captcha_answer_data` parameter
4 years ago
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
lain
30ea6bb167
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Mark Felder
4b3298133b
Document DELETE /api/v1/notifications/destroy_multiple
4 years ago
lain
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
764b4f95a8
Merge branch 'develop' into global-status-expiration
4 years ago
Maksim Pechnikov
270c3fe446
fix markdown format
4 years ago
lain
b550ef5611
Docs: Align chat api changes with docs.
4 years ago
lain
4cadaf7e96
Docs: Add `/api/v1/instance` information
4 years ago
lain
e62f8542a1
Docs: Add chat motivation and api description.
4 years ago
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alex Gleason
1bd9749a8f
Let blob: pass CSP
4 years ago
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
4 years ago
lain
8480f84615
Update differences_in_mastoapi_responses.md
4 years ago
Alexander
be34672d67
formatting
4 years ago
Alexander
6e625a427c
reply filtering
4 years ago
lain
a51cdafc01
Docs: Add documentation about chatmessages
4 years ago
Egor Kislitsyn
1b06a27746
Update Flake ID description
4 years ago
Ivan Tashkinov
0062116e07
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Ivan Tashkinov
2958a7d246
Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.
4 years ago
lain
c466e739b6
Merge branch 'docs/debian-packages' into 'develop'
...
debian_based_*.md: Use erlang-nox metapackage
See merge request pleroma/pleroma!2268
4 years ago
lain
568f48435e
Apply suggestion to docs/installation/debian_based_en.md
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
4 years ago
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
4 years ago
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
4 years ago
lain
617a9f6208
Merge branch 'mrf-docs-update' into 'develop'
...
Expand MRF SimplePolicy docs
See merge request pleroma/pleroma!2370
4 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
5 years ago
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
Ilja
aa0a4a1e78
small fix in the rewrite_policy example
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Alex Gleason
ed894802d5
Expand MRF SimplePolicy docs
5 years ago
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
5 years ago
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
5 years ago
Alexander Strizhakov
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
5 years ago
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
5 years ago
Egor Kislitsyn
8a0ffaa9ea
Fix formatting in documentation
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
5 years ago
Alexander Strizhakov
7af0959a07
updating docs
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
rinpatch
69341cbcba
Merge branch 'feature/1530-removing-with_move' into 'develop'
...
Feature/1530 removing with move
Closes #1530
See merge request pleroma/pleroma!2306
5 years ago
eugenijm
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
eugenijm
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
Alexander Strizhakov
f3791add99
removing with_move parameter
5 years ago
Mark Felder
8dd01b24d2
Improve documentation of mrf_object_age
5 years ago
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
lain
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
5 years ago
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
Ivan Tashkinov
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
5 years ago
rinpatch
4db88242e5
Merge branch 'docs/direct_conversation_id' into 'develop'
...
pleroma_api.md: direct_conversation_id vs. conversation_id
See merge request pleroma/pleroma!2263
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Ivan Tashkinov
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
5 years ago
rinpatch
00d1752031
Merge branch 'docs/new_user' into 'develop'
...
CLI_tasks/user.md: Fix `pleroma.user new` documentation
Closes #1621
See merge request pleroma/pleroma!2286
5 years ago
Haelwenn (lanodan) Monnier
6316726a5f
CLI_tasks: Use manpage formatting conventions
...
- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated
[ci skip]
5 years ago
Haelwenn (lanodan) Monnier
a06104b9d5
CLI_tasks/user.md: Fix `pleroma.user new` documentation
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621
[ci skip]
5 years ago
Ivan Tashkinov
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
Haelwenn (lanodan) Monnier
d9134d4430
installation/otp_en.md: Fix pleroma.nginx target [deb]
...
Needs to be backported to stable.
Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
5 years ago
lain
841e4e4d83
Merge branch 'patch-1' into 'develop'
...
Better advice for vacuuming after restoring.
See merge request pleroma/pleroma!2233
5 years ago
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
feld
9b740cfb23
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
...
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
5 years ago
Alexander Strizhakov
b34bc669b9
adding descriptions
5 years ago
Alexander Strizhakov
8d9dee1ba9
retry_timeout description change
5 years ago
Alexander Strizhakov
8854770fc4
retry and retry_timeout settings default change
5 years ago
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout
5 years ago
Alexander Strizhakov
df3c59d928
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier
9b6c7843d6
debian_based_*.md: Use erlang-nox metapackage
5 years ago
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
5 years ago
Mark Felder
f987d83885
Clarify in docs how to control connections_pool for Gun.
...
It could easily be confused with the Hackney settings.
5 years ago
Ivan Tashkinov
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
5 years ago
lain
4c02e04935
Merge branch 'prepared-statements-settings' into 'develop'
...
Prepared statements settings
See merge request pleroma/pleroma!2238
5 years ago
eugenijm
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
ilja
036e8a40a2
fix for :fetch_initial_posts
...
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
5 years ago
Haelwenn (lanodan) Monnier
deb5f5c40e
pleroma_api.md: direct_conversation_id vs. conversation_id
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
5 years ago
Ilja
53ef8c11b9
Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
...
I also made a more explicit distinction between OTP and from source installs in the general explanation
5 years ago
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
rinpatch
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
rinpatch
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
5 years ago
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
eugenijm
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
Alexander Strizhakov
6b012ddd69
some docs
5 years ago
lain
e4804137b3
Document database default changes
5 years ago
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Ilja
c0146f4859
DOCS Theming your instance
...
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
5 years ago
lain
c05cbc47f9
Better advice for vacuuming after restoring.
5 years ago
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
Igeljäger
1ed485ec1d
added why doing a vacuum after restoring a backup is so important
5 years ago
Egor Kislitsyn
011ede4536
Update documentation
5 years ago
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
5 years ago
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
lain
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
5 years ago
lain
d536a00d42
Merge branch 'docs_updating' into 'develop'
...
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
5 years ago
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
lain
3af6d3f8e2
Emoji Reactions: Add documentation
5 years ago
feld
53a7680c16
Merge branch 'develop' into 'fix/mrf-sample-doc'
...
# Conflicts:
# docs/configuration/mrf.md
5 years ago
feld
3416948cdf
Merge branch 'fix/mrf-docs' into 'develop'
...
Fix MRF documentation
See merge request pleroma/pleroma!2187
5 years ago
Mark Felder
cf94349287
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
Alexander Strizhakov
514c899275
adding gun adapter
5 years ago
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Mark Felder
589bffa57d
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
5 years ago
Mark Felder
31749559e1
Fix MRF docs further. I don't think anyone has actually tested with the old docs.
5 years ago
feld
6caf6a86c5
Apply suggestion to docs/configuration/mrf.md
5 years ago
Mark Felder
88a76d0142
Update suggested path for location of your custom MRF
5 years ago
Egor Kislitsyn
0ddcd67d32
Update `cheatsheet.md` and `config/description.exs`
5 years ago
Mark Felder
2c95b0fab9
Make the sample code actually compile
5 years ago
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
lain
2f1c61255f
Merge branch 'doc/unlisted-search' into 'develop'
...
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes #1164
See merge request pleroma/pleroma!2195
5 years ago
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
lain
5ebffd5224
Merge branch 'docs/kyclos' into 'develop'
...
clients.md: Add Kyclos
See merge request pleroma/pleroma!2196
5 years ago
Maksim Pechnikov
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
Haelwenn (lanodan) Monnier
209e4d8432
clients.md: Add Kyclos
5 years ago
Haelwenn (lanodan) Monnier
ad16f38b9c
differences_in_mastoapi_responses.md: Add note about unlisted results
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
5 years ago
rinpatch
94e5ca1105
Merge branch 'issue/1383' into 'develop'
...
[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015
5 years ago
Ilja
a9e946b99a
DOCS Backup/Restore/Migrate your instance
...
* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server
* Added an optional step to reinstall pleroma (esp. for migrating servers)
* Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types'
* I added a new step to drop and recreate an empty pleroma-database
* I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working
* This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15
5 years ago
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
dad23e3766
need_reboot flag
5 years ago
Egor Kislitsyn
815f659ed8
Fix MRF documentation
5 years ago
lain
57098713c0
Apply suggestion to docs/API/pleroma_api.md
5 years ago
lain
713645d5c5
Apply suggestion to docs/API/pleroma_api.md
5 years ago
Lain Soykaf
ce95882009
EmojiReactions: Add docs and Changelog
5 years ago
rinpatch
f13b7878b4
Merge branch 'rename_emoji_reactios' into 'develop'
...
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
5 years ago
Alexander Strizhakov
01da001da1
fix
5 years ago
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
feld
e12bf05f23
Merge branch 'fix/dymamic-docs' into 'develop'
...
Simplify in-database config docs
See merge request pleroma/pleroma!2178
5 years ago
rinpatch
6769ecd948
Merge branch 'develop' into fix/dymamic-docs
5 years ago
rinpatch
6722dade42
Simplify in-database config docs
...
Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore)
5 years ago
Alexander Strizhakov
c85aa6e87f
removing confusing error
5 years ago
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
rinpatch
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
5 years ago
Lain Soykaf
90b862e7ab
Add cheatsheet entry
5 years ago
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
lain
774cba84f5
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
...
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
5 years ago
lain
01537cc1d6
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
rinpatch
ff4bef140a
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
rinpatch
889965141a
RemoteIp: only trust X-Forwarded-For
...
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
5 years ago
rinpatch
f5cb2af85a
cheatsheet: improve rate limiter docs and add new limiters
5 years ago
lain
d378550d2d
Emoji Reactions: Document changes
5 years ago
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
lain
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
5 years ago
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
5 years ago
Ilja
c8964cc438
DOCS General update for the "Introduction to Pleroma" section
...
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check)
* Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check)
* Added a newline above the bulletpoints because otherwise they are broken on docs-develop
* Remove the 😄 thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis
* Add a link to fediverse.network
* Update to add new stuff and fix things that aren't correct (any more)
5 years ago
Alexander Strizhakov
7c6e5c541d
docs update
5 years ago
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
lain
9a994878f1
Emoji reactions: Update docs and changelog
5 years ago
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
Haelwenn
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
5 years ago
Farhan Khan
89eeadc2a8
Updated OpenBSD installation guide for version OpenBSD 6.6
...
* initdb command now requires explicit -U and -D flags
* acme-client now requires version v02 API endpoint
* Added step to add admin user, per other installation guides
* Corrected setup_db.psql path
5 years ago
Mark Felder
4c59e9477a
Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest
5 years ago
lain
85f45c7689
Document new EmojiReaction notifications
5 years ago
Egor Kislitsyn
b8b90d967a
Update documentation
5 years ago
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
feld
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
Maksim
e761d76e4f
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
Maksim
d43c9ab286
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
Alexander Strizhakov
f3e074e949
little fixes
5 years ago
Alexander Strizhakov
a9c6f119ac
docs update
5 years ago
lain
043cd5aa54
Emoji reactions: Document changes
5 years ago
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
Alexander Strizhakov
f01ab6cd29
some refactor and tests
5 years ago
lain
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
ilja
e02eb8de3e
Add OTP to updating.md
...
* I removed the Update section from the OTP install and added it to updating.md
* I also added a link to the updating.md from the OTP install page
* I added a Questions section to the OTP install, similar to the debian_based_en.md
* Restructured the updating.md a bit
I would very much also like to link to the changelog, but I don't know how to do it because I can't find the page in the docs?
5 years ago
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
Alibek Omarov
e1308f10bd
docs: API: update Mastodon API link
5 years ago
Alexander Strizhakov
d933fd3d61
more renamings
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Alexander Strizhakov
958d0452e4
fix for pleroma assets group update
5 years ago
Alexander Strizhakov
00aff5f78c
syncing new setting to descriptions.exs
5 years ago
Alexander
bb9a43c3ae
typo fix
5 years ago
Alexander
fea734ca70
errors on endpoints
5 years ago
Alexander
5cacb988b9
partially settings update
5 years ago
Alex S
2753285b77
config editing through database
5 years ago
RX14
b55f2563d0
Fix SMTP mailer example
...
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
5 years ago
Haelwenn
11e010fc77
Merge branch 'feat/doc-improvements' into 'develop'
...
Documentation imrpovements
See merge request pleroma/pleroma!2084
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
5 years ago
Egor Kislitsyn
fc79c69173
Remove `/api/account/register` documentation from pleroma_api.md
5 years ago
Egor Kislitsyn
36d66d9655
Fix typo
5 years ago
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
5 years ago
Egor Kislitsyn
c6f2735ffa
Remove runtime modules config example
5 years ago
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
rinpatch
d237e9b11d
docs: drop CentOS 7 install guide
5 years ago
rinpatch
8dbe2dfde1
docs: use tabs and improve grammar in OTP install guide
5 years ago
rinpatch
0a8b32a661
docs: remove overoptimistic OTP benefits and use tabs in migration from source
5 years ago
rinpatch
b0505b2cc7
docs: fix incorrect display in digest task docs
5 years ago
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
lain
4692919ea6
Update pleroma_api.md
5 years ago
rinpatch
990cd7ef5d
Merge branch 'feat/docs-otp-source-picker' into 'develop'
...
docs: add OTP/From source tabs to CLI tasks
See merge request pleroma/pleroma!2046
5 years ago
Egor Kislitsyn
b4027e7187
Document `with_move` parameter of the notification API
5 years ago
rinpatch
eb9ea8475b
docs: add OTP/From source tabs to CLI tasks
5 years ago
Maksim Pechnikov
e260a16c05
update docs
5 years ago
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov
00c38cf28d
Docs
5 years ago
Ivan Tashkinov
93a80ee915
[ #1427 ] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
5 years ago
Egor Kislitsyn
157bceeda9
Move runtime configuration from `:instance` to `:modules`
5 years ago
Egor Kislitsyn
48ae3c4347
Add support for custom modules
5 years ago
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
lain
9487995e8b
Cheat Sheet: Addg chat_limit information.
5 years ago
Maksim Pechnikov
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov
4b60d41db9
Add report notes
5 years ago
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago