Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-11-21 | Merge branch 'list-users' into 'develop' | rinpatch | |
Add CLI list users command See merge request pleroma/pleroma!1990 | |||
2019-11-21 | Add CLI list users command | Alex Schroeder | |
2019-11-19 | AdminAPI: Confirm user account, resend confirmation email | Maxim Filippov | |
2019-11-19 | Support authentication via `x-admin-token` HTTP header | Egor Kislitsyn | |
2019-11-18 | Remove deprecated endpoint from docs that is fully removed from backend now | feld | |
2019-11-15 | Merge branch 'mix-task-warning' into 'develop' | rinpatch | |
Documentation: Add warning about database mix tasks. See merge request pleroma/pleroma!1984 | |||
2019-11-15 | Documentation: Add warning about database mix tasks. | lain | |
2019-11-14 | docs: document MRF ObjectAgePolicy | Ariadne Conill | |
2019-11-14 | Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' | feld | |
Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815 | |||
2019-11-14 | Merge remote-tracking branch 'upstream/develop' into feature/move-activity | Egor Kislitsyn | |
2019-11-14 | Merge branch 'reactions' into 'develop' | rinpatch | |
Emoji Reactions See merge request pleroma/pleroma!1662 | |||
2019-11-13 | Fix formatting in OpenBSD install manual | Egor Kislitsyn | |
2019-11-12 | Add `allow_following_move` setting to User | Egor Kislitsyn | |
2019-11-11 | docs: move static-fe docs under a proper category | rinpatch | |
2019-11-11 | Merge branch 'feature/static-fe' into 'develop' | kaniini | |
Static frontend See merge request pleroma/pleroma!1917 | |||
2019-11-11 | Add a warning about Pg version to the RUM related docs | Egor Kislitsyn | |
2019-11-11 | Merge branch 'develop' into feature/reports-groups-and-multiple-state-update | Maxim Filippov | |
2019-11-11 | Code style fixes | Maxim Filippov | |
2019-11-10 | Merge branch 'develop' into 'reactions' | lain | |
# Conflicts: # CHANGELOG.md | |||
2019-11-09 | Add changelog entry, cheatsheet docs, and alphabetize. | Phil Hagelberg | |
2019-11-10 | Big config cheatsheet revamp | rinpatch | |
Categorize things, remove old deprecation warnings, consistently place dots in unordered lists, fix links, etc. | |||
2019-11-08 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
2019-11-08 | Merge branch 'develop' into feature/reports-groups-and-multiple-state-update | Maxim Filippov | |
2019-11-07 | Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations` | eugenijm | |
2019-11-05 | Merge branch 'develop' into feature/reports-groups-and-multiple-state-update | Maxim Filippov | |
2019-11-01 | Update docs | Maxim Filippov | |
2019-10-20 | [#1304]. Post-merge fixes. Merge branch 'develop' of ↵ | Ivan Tashkinov | |
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 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
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 | [#1304] Moved remaining fields from User.Info to User. | Ivan Tashkinov | |
Misc. fixes / improvements. | |||
2019-10-19 | Merge branch 'feature/mastofe-pwa' into 'develop' | Haelwenn | |
MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834 | |||
2019-10-19 | Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵ | eugenijm | |
conversations as read | |||
2019-10-19 | Add documentation for PWA manifest configuration. | KokaKiwi | |
2019-10-18 | Merge branch 'develop' into feature/relay-list | Maxim Filippov | |
2019-10-15 | DELETE /api/pleroma/admin/users now accepts nicknames array | Maxim Filippov | |
2019-10-14 | Merge branch 'exclude-visibilities-for-timelines' into 'develop' | feld | |
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints See merge request pleroma/pleroma!1818 | |||
2019-10-14 | Preparations for renaming `master` to `stable` | rinpatch | |
2019-10-14 | Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵ | eugenijm | |
notification endpoints | |||
2019-10-11 | Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays | Maxim Filippov | |
2019-10-11 | Deprecate POST/DELETE ↵ | Maxim Filippov | |
/api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it | |||
2019-10-11 | Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of ↵ | Maxim Filippov | |
deleting it | |||
2019-10-09 | Ability to toggle activation status and permission group for a group of users | Maxim Filippov | |
2019-10-07 | Merge branch 'develop' into feature/reports-groups-and-multiple-state-update | Maxim Filippov | |
2019-10-07 | Admin API: Reports, grouped by status | Maxim Filippov | |
2019-10-07 | Merge branch 'develop' into 'reactions' | lain | |
# Conflicts: # CHANGELOG.md | |||
2019-10-07 | Extract RSS Feed functionality from OStatus | Sergey Suprunenko | |
2019-10-06 | Merge branch 'develop' into 'reactions' | lain | |
# Conflicts: # CHANGELOG.md | |||
2019-10-05 | Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity | eugenijm | |
2019-10-05 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
2019-10-05 | Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" | kaniini | |
This reverts merge request !1737 | |||
2019-10-05 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |