Lain Soykaf
ce95882009
EmojiReactions: Add docs and Changelog
2020-02-07 14:59:26 +01:00
rinpatch
f13b7878b4
Merge branch 'rename_emoji_reactios' into 'develop'
...
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
2020-02-07 10:35:37 +00:00
Alexander Strizhakov
01da001da1
fix
2020-02-07 10:48:10 +03:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
feld
e12bf05f23
Merge branch 'fix/dymamic-docs' into 'develop'
...
Simplify in-database config docs
See merge request pleroma/pleroma!2178
2020-02-06 16:03:29 +00:00
rinpatch
6769ecd948
Merge branch 'develop' into fix/dymamic-docs
2020-02-06 15:04:21 +03:00
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)
2020-02-06 15:00:33 +03:00
Alexander Strizhakov
c85aa6e87f
removing confusing error
2020-02-06 12:50:36 +03:00
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +03:00
rinpatch
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
Lain Soykaf
90b862e7ab
Add cheatsheet entry
2020-02-04 16:22:13 +01:00
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
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
2020-01-30 18:47:44 +00:00
lain
01537cc1d6
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-30 18:28:28 +00:00
rinpatch
ff4bef140a
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-30 13:24:24 +00:00
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.
2020-01-30 00:06:58 +03:00
rinpatch
f5cb2af85a
cheatsheet: improve rate limiter docs and add new limiters
2020-01-30 00:06:58 +03:00
lain
d378550d2d
Emoji Reactions: Document changes
2020-01-29 11:40:57 +01:00
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
lain
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
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)
2020-01-28 12:57:06 +00:00
Alexander Strizhakov
7c6e5c541d
docs update
2020-01-27 19:48:20 +03:00
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
lain
9a994878f1
Emoji reactions: Update docs and changelog
2020-01-24 10:53:01 +01:00
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
Haelwenn
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
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
2020-01-22 17:33:10 -05:00
Mark Felder
4c59e9477a
Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest
2020-01-22 15:59:37 -06:00
lain
85f45c7689
Document new EmojiReaction notifications
2020-01-22 20:11:18 +01:00
Egor Kislitsyn
b8b90d967a
Update documentation
2020-01-22 22:28:06 +04:00
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
feld
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
Maksim
e761d76e4f
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-22 16:58:50 +00:00
Maksim
d43c9ab286
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-22 16:58:43 +00:00
Alexander Strizhakov
f3e074e949
little fixes
2020-01-22 18:22:54 +03:00
Alexander Strizhakov
a9c6f119ac
docs update
2020-01-22 18:08:53 +03:00
lain
043cd5aa54
Emoji reactions: Document changes
2020-01-22 13:58:02 +01:00
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
Alexander Strizhakov
f01ab6cd29
some refactor and tests
2020-01-21 18:42:00 +03:00
lain
4c5b5f14dc
StatusView: Add `emoji_reactions`
2020-01-20 16:24:20 +01:00
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?
2020-01-15 09:12:24 +01:00
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
Alibek Omarov
e1308f10bd
docs: API: update Mastodon API link
2020-01-11 05:06:40 +00:00
Alexander Strizhakov
d933fd3d61
more renamings
2020-01-10 19:51:32 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov
958d0452e4
fix for pleroma assets group update
2020-01-10 18:18:09 +03:00
Alexander Strizhakov
00aff5f78c
syncing new setting to descriptions.exs
2020-01-10 17:54:54 +03:00
Alexander
bb9a43c3ae
typo fix
2020-01-10 15:52:01 +03:00
Alexander
fea734ca70
errors on endpoints
2020-01-10 15:52:00 +03:00
Alexander
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
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.
2020-01-05 19:00:48 +00:00
Haelwenn
11e010fc77
Merge branch 'feat/doc-improvements' into 'develop'
...
Documentation imrpovements
See merge request pleroma/pleroma!2084
2019-12-24 19:57:41 +00:00
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
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
2019-12-21 11:56:24 +00:00
Egor Kislitsyn
fc79c69173
Remove `/api/account/register` documentation from pleroma_api.md
2019-12-20 19:47:44 +07:00
Egor Kislitsyn
36d66d9655
Fix typo
2019-12-17 02:06:58 +07:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
2019-12-16 22:24:03 +07:00
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
2019-12-14 21:44:10 +03:00
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07:00
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
Egor Kislitsyn
c6f2735ffa
Remove runtime modules config example
2019-12-12 14:37:57 +07:00
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:38:25 +00:00
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-10 00:16:43 +07:00
rinpatch
d237e9b11d
docs: drop CentOS 7 install guide
2019-12-09 20:11:39 +03:00
rinpatch
8dbe2dfde1
docs: use tabs and improve grammar in OTP install guide
2019-12-09 20:09:47 +03:00
rinpatch
0a8b32a661
docs: remove overoptimistic OTP benefits and use tabs in migration from source
2019-12-09 20:08:31 +03:00
rinpatch
b0505b2cc7
docs: fix incorrect display in digest task docs
2019-12-09 20:07:43 +03:00
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
2019-12-09 19:41:43 +03:00
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
lain
4692919ea6
Update pleroma_api.md
2019-12-09 14:15:59 +00:00
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
2019-12-09 10:27:43 +00:00
Egor Kislitsyn
b4027e7187
Document `with_move` parameter of the notification API
2019-12-09 14:46:06 +07:00
rinpatch
eb9ea8475b
docs: add OTP/From source tabs to CLI tasks
2019-12-09 04:07:16 +03:00
Maksim Pechnikov
e260a16c05
update docs
2019-12-08 22:09:15 +03:00
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
Maxim Filippov
00c38cf28d
Docs
2019-12-08 11:29:33 +03:00
Ivan Tashkinov
93a80ee915
[ #1427 ] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
2019-12-06 16:56:23 +03:00
Egor Kislitsyn
157bceeda9
Move runtime configuration from `:instance` to `:modules`
2019-12-06 15:04:46 +07:00
Egor Kislitsyn
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
lain
9487995e8b
Cheat Sheet: Addg chat_limit information.
2019-12-04 12:51:06 +01:00
Maksim Pechnikov
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Maksim Pechnikov
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
Maksim Pechnikov
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
2019-11-25 14:32:20 +03:00
Sadposter
e2dc89069d
move documentation section for http client
2019-11-25 11:26:42 +00:00
Sadposter
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
rinpatch
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00