alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,916 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

634 Commits

Author SHA1 Message Date
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
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 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
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
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
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
Egor Kislitsyn 1fc28a4b44
Add a view for the move notification 2019-11-27 17:52:02 +07: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
Maxim Filippov 46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Egor Kislitsyn 36686f5245
Support authentication via `x-admin-token` HTTP header 2019-11-19 15:58:20 +07:00
feld adacf1b5e1 Remove deprecated endpoint from docs that is fully removed from backend now 2019-11-18 16:16:27 +00:00
rinpatch 9e3868425a Merge branch 'mix-task-warning' into 'develop' 
Documentation: Add warning about database mix tasks.

See merge request pleroma/pleroma!1984
 2019-11-15 19:38:52 +00:00
lain 234c27cb20 Documentation: Add warning about database mix tasks. 2019-11-15 14:30:59 +01:00
Ariadne Conill 29f49bf5fa docs: document MRF ObjectAgePolicy 2019-11-14 19:47:54 -06:00
feld 1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' 
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
 2019-11-14 13:35:41 +00:00
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop' 
Emoji Reactions

See merge request pleroma/pleroma!1662
 2019-11-14 08:47:10 +00:00