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

650 Commits

Author SHA1 Message Date
lain 9a994878f1 Emoji reactions: Update docs and changelog 2020-01-24 10:53:01 +01: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
lain 85f45c7689 Document new EmojiReaction notifications 2020-01-22 20:11:18 +01: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
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
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
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be 2020-01-14 14:52:00 +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
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