Commit Graph

698 Commits

Author SHA1 Message Date
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
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
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
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
Egor Kislitsyn 3350cd8d96
Fix formatting in OpenBSD install manual 2019-11-13 18:49:29 +07:00
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User 2019-11-12 18:45:28 +07:00
rinpatch 04473677cc docs: move static-fe docs under a proper category 2019-11-11 23:24:15 +03:00
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
Static frontend

See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
Egor Kislitsyn ab2e61238e
Add a warning about Pg version to the RUM related docs 2019-11-11 19:13:07 +07:00
Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-11 19:18:12 +09:00
Maxim Filippov 31343e4321 Code style fixes 2019-11-11 19:06:09 +09:00
lain a88e834dba Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-11-10 11:32:50 +00:00
Phil Hagelberg 6ef8049664 Add changelog entry, cheatsheet docs, and alphabetize. 2019-11-09 18:09:29 -08:00
rinpatch 518b0193a1 Big config cheatsheet revamp
Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc.
2019-11-10 03:33:36 +03:00
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-08 18:30:49 +09:00
eugenijm 7888803ffe Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations` 2019-11-07 08:26:24 +03:00
Maxim Filippov 43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-05 02:12:48 +03:00
Maxim Filippov ab5c8ec9fa Update docs 2019-11-01 20:27:16 +03:00
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
Haelwenn f01dbc450c Merge branch 'feature/mastofe-pwa' into 'develop'
MastoFE: Add PWA manifest.

See merge request pleroma/pleroma!1834
2019-10-19 20:11:58 +00:00
eugenijm 52ed2f8f2d Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read 2019-10-19 15:24:06 +03:00
KokaKiwi df3c2dfd8b Add documentation for PWA manifest configuration. 2019-10-19 12:15:16 +02:00
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list 2019-10-18 10:24:29 +02:00
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array 2019-10-15 17:33:29 +02:00
feld 3b1bc079af Merge branch 'exclude-visibilities-for-timelines' into 'develop'
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints

See merge request pleroma/pleroma!1818
2019-10-14 19:40:40 +00:00
rinpatch 0e9243e8a2 Preparations for renaming `master` to `stable` 2019-10-14 18:38:51 +03:00
eugenijm a97b642289 Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints 2019-10-14 02:57:21 +03:00
Maxim Filippov cc6875b582 Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Maxim Filippov aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03:00
Maxim Filippov f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
Maxim Filippov ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
Maxim Filippov 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-07 15:41:41 +03:00
Maxim Filippov 7aceaa517b Admin API: Reports, grouped by status 2019-10-07 15:39:07 +03:00
lain 6c278cfe09 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-07 12:31:51 +00:00
Sergey Suprunenko 4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
lain 61097ba6ab Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-06 08:11:47 +00:00
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity 2019-10-05 20:12:00 +03:00