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 |
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
5 years ago |
|
eugenijm
|
8249924485
|
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
|
5 years ago |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
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 |
|
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 |
|
rinpatch
|
869ea2ab90
|
Move digest email docs to a separate file and improve styling
|
5 years ago |
|
rinpatch
|
bd9c7807fb
|
Move emoji task docs to a separate file
|
5 years ago |
|
rinpatch
|
2767c413fb
|
Remove a reference to inline docs since everything it describes is
described in the cheatsheet already and add A TODO
|
5 years ago |
|
rinpatch
|
0ba5c1a9d7
|
Fix more links
|
5 years ago |
|
rinpatch
|
b8e5e46fa8
|
Fix references to other pages
|
5 years ago |
|
rinpatch
|
74d682a09e
|
Remove Small customizations as it's contents have been integrated into
static_dir.md
|
5 years ago |
|
rinpatch
|
838ff12ec5
|
Remove "General tips for customizing Pleroma FE" because it's no longer
relevant and we have actual fe docs now
|
5 years ago |
|
rinpatch
|
03e1898917
|
Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit
about how Pleroma Configuration works
|
5 years ago |
|
rinpatch
|
acc62f327d
|
Rename some directories because MkDocs uses them for categories
|
5 years ago |
