Age | Commit message (Collapse) | Author | |
---|---|---|---|
2020-01-29 | Emoji Reactions: Document changes | lain | |
2020-01-24 | Emoji reactions: Update docs and changelog | lain | |
2020-01-23 | Merge branch 'emoji-notifications' into 'develop' | Haelwenn | |
Emoji notifications See merge request pleroma/pleroma!2130 | |||
2020-01-22 | Document new EmojiReaction notifications | lain | |
2020-01-22 | Merge branch 'admin-be' into 'develop' | feld | |
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976 | |||
2020-01-22 | little fixes | Alexander Strizhakov | |
2020-01-22 | docs update | Alexander Strizhakov | |
2020-01-22 | Emoji reactions: Document changes | lain | |
2020-01-22 | Merge branch 'develop' into admin-be | Alexander Strizhakov | |
2020-01-20 | StatusView: Add `emoji_reactions` | lain | |
2020-01-14 | Merge branch 'develop' into admin-be | Alexander Strizhakov | |
2020-01-11 | docs: API: update Mastodon API link | Alibek Omarov | |
2020-01-10 | more renamings | Alexander Strizhakov | |
2020-01-10 | dynamic_configuration renaming | Alexander Strizhakov | |
and moving it from instance settings | |||
2020-01-10 | fix for pleroma assets group update | Alexander Strizhakov | |
2020-01-10 | typo fix | Alexander | |
2020-01-10 | errors on endpoints | Alexander | |
2020-01-10 | partially settings update | Alexander | |
2020-01-10 | config editing through database | Alex S | |
2019-12-20 | Remove `/api/account/register` documentation from pleroma_api.md | Egor Kislitsyn | |
2019-12-12 | Merge branch 'develop' into feature/report-notes | Maxim Filippov | |
2019-12-10 | Merge branch 'develop' into '1427-oauth-admin-scopes' | lain | |
# Conflicts: # CHANGELOG.md | |||
2019-12-10 | [ActivityPub] Configurable ActivityPub actor type | Hakaba Hitoyo | |
2019-12-10 | Merge remote-tracking branch 'remotes/upstream/develop' into ↵ | Ivan Tashkinov | |
1427-oauth-admin-scopes # Conflicts: # CHANGELOG.md | |||
2019-12-09 | Merge branch 'issue/1342' into 'develop' | lain | |
[#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920 | |||
2019-12-09 | Update pleroma_api.md | lain | |
2019-12-09 | Document `with_move` parameter of the notification API | Egor Kislitsyn | |
2019-12-08 | update docs | Maksim Pechnikov | |
2019-12-08 | Docs | Maxim Filippov | |
2019-12-06 | [#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API ↵ | Ivan Tashkinov | |
documentation entry. | |||
2019-12-04 | Add report notes | Maxim Filippov | |
2019-12-02 | Merge branch 'feature/move-activity' into 'develop' | lain | |
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883 | |||
2019-11-27 | Add a view for the move notification | Egor Kislitsyn | |
2019-11-22 | Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' | lain | |
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994 | |||
2019-11-19 | AdminAPI: Confirm user account, resend confirmation email | Maxim Filippov | |
2019-11-18 | Remove deprecated endpoint from docs that is fully removed from backend now | feld | |
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-12 | Add `allow_following_move` setting to User | Egor Kislitsyn | |
2019-11-11 | Code style fixes | Maxim Filippov | |
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 | Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵ | eugenijm | |
conversations as read | |||
2019-10-18 | Merge branch 'develop' into feature/relay-list | Maxim Filippov | |