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 |
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 |
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 |
lain
|
9487995e8b
|
Cheat Sheet: Addg chat_limit information.
|
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 |
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
5 years ago |
Sadposter
|
e2dc89069d
|
move documentation section for http client
|
5 years ago |
Sadposter
|
d3656c2725
|
add ability to set a custom user-agent string
|
5 years ago |
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
|
5 years ago |
rinpatch
|
c2ad9fd5f9
|
Merge branch 'list-users' into 'develop'
Add CLI list users command
See merge request pleroma/pleroma!1990
|
5 years ago |
Alex Schroeder
|
fbc379d689
|
Add CLI list users command
|
5 years ago |
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
Egor Kislitsyn
|
36686f5245
|
Support authentication via `x-admin-token` HTTP header
|
5 years ago |
feld
|
adacf1b5e1
|
Remove deprecated endpoint from docs that is fully removed from backend now
|
5 years ago |
rinpatch
|
9e3868425a
|
Merge branch 'mix-task-warning' into 'develop'
Documentation: Add warning about database mix tasks.
See merge request pleroma/pleroma!1984
|
5 years ago |
lain
|
234c27cb20
|
Documentation: Add warning about database mix tasks.
|
5 years ago |
Ariadne Conill
|
29f49bf5fa
|
docs: document MRF ObjectAgePolicy
|
5 years ago |
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
|
5 years ago |
Egor Kislitsyn
|
3c0abfca53
|
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
|
5 years ago |
rinpatch
|
6085c71bd1
|
Merge branch 'reactions' into 'develop'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
5 years ago |
Egor Kislitsyn
|
3350cd8d96
|
Fix formatting in OpenBSD install manual
|
5 years ago |
Egor Kislitsyn
|
e6d7e27bd6
|
Add `allow_following_move` setting to User
|
5 years ago |
rinpatch
|
04473677cc
|
docs: move static-fe docs under a proper category
|
5 years ago |
kaniini
|
2cc043591c
|
Merge branch 'feature/static-fe' into 'develop'
Static frontend
See merge request pleroma/pleroma!1917
|
5 years ago |
Egor Kislitsyn
|
ab2e61238e
|
Add a warning about Pg version to the RUM related docs
|
5 years ago |
Maxim Filippov
|
46787b9fe1
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
Maxim Filippov
|
31343e4321
|
Code style fixes
|
5 years ago |
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Phil Hagelberg
|
6ef8049664
|
Add changelog entry, cheatsheet docs, and alphabetize.
|
5 years ago |
rinpatch
|
518b0193a1
|
Big config cheatsheet revamp
Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc.
|
5 years ago |
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
eugenijm
|
7888803ffe
|
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
|
5 years ago |
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
Maxim Filippov
|
ab5c8ec9fa
|
Update docs
|
5 years ago |
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
|
5 years ago |
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
|
5 years ago |
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
5 years ago |
Haelwenn
|
f01dbc450c
|
Merge branch 'feature/mastofe-pwa' into 'develop'
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
|
5 years ago |
eugenijm
|
52ed2f8f2d
|
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
|
5 years ago |
KokaKiwi
|
df3c2dfd8b
|
Add documentation for PWA manifest configuration.
|
5 years ago |
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
5 years ago |
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
|
5 years ago |
rinpatch
|
0e9243e8a2
|
Preparations for renaming `master` to `stable`
|
5 years ago |
eugenijm
|
a97b642289
|
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
|
5 years ago |
Maxim Filippov
|
cc6875b582
|
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
|
5 years ago |
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
5 years ago |
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
5 years ago |
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
5 years ago |
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
5 years ago |
lain
|
6c278cfe09
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
5 years ago |
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
lain
|
1ed8fbc4d9
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
5 years ago |
lain
|
d9aaea44ff
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
kaniini
|
5c04e81724
|
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
|
5 years ago |
Maxim Filippov
|
795ea5dfc2
|
Move HTTP verb to the header (admin_api.md)
|
5 years ago |
lain
|
27110793a7
|
Merge branch 'featrue/job-monitor' into 'develop'
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
|
5 years ago |
Haelwenn (lanodan) Monnier
|
e4ab9a05dd
|
cheatsheet.md: link to pleroma-fe docs for :frontend_configurations
|
5 years ago |
eugenijm
|
06d9df79c5
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
rinpatch
|
69784eb75a
|
Add a missing language specification
|
5 years ago |
rinpatch
|
1cae564b5d
|
Move config task docs to a separate file and mark it as WIP
|
5 years ago |
rinpatch
|
6baa037903
|
Move database maintenance tasks docs to a separate file
|
5 years ago |
rinpatch
|
8e08d5b233
|
MkDocs does not like if a paragraph doesn't have a newline after it
|
5 years ago |
rinpatch
|
2656f41818
|
Remove silent mode note as it's no longer relevant
|
5 years ago |
rinpatch
|
aefb4dcff5
|
Cheatsheet: Use note/warning blocks instead of bold text
|
5 years ago |
rinpatch
|
e560d65db3
|
Fix a typo in activity expirations
|
5 years ago |
rinpatch
|
25849157aa
|
Remove fe settings from :instance as they no longer do anything
|
5 years ago |
rinpatch
|
4e70009490
|
Move bold text in RemoveIp description into a proper warning
|
5 years ago |
rinpatch
|
cb162678df
|
Add missing language spec
|
5 years ago |
rinpatch
|
66450f8615
|
Cheatsheet: Move the deprecated config warning into a warning block
|
5 years ago |
rinpatch
|
2cbe2dcbde
|
Oops
|
5 years ago |
rinpatch
|
b4ca864c6b
|
Move user tasks docs to a separate file
|
5 years ago |
rinpatch
|
8fd47a4a5a
|
Use consistent command signature
|
5 years ago |
rinpatch
|
f5372bfb4a
|
Fix up some headings
|
5 years ago |
rinpatch
|
d39ccc2e7f
|
Move uploads task docs to a separate file
|
5 years ago |
rinpatch
|
808d0a0170
|
Move relay docs to a separate file
|
5 years ago |
rinpatch
|
6435ba83cd
|
Move instance CLI task docs to a text file
|
5 years ago |
rinpatch
|
a54739a530
|
Improve styling of CLI tasks
|
5 years ago |