| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-12-19 | [#2068] Introduced proper OAuth tokens usage to controller tests. | Ivan Tashkinov | |
| 2019-12-15 | OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵ | Ivan Tashkinov | |
| controller tests modification: OAuth scopes usage. | |||
| 2019-11-08 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 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-19 | Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵ | eugenijm | |
| conversations as read | |||
| 2019-10-16 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | Ivan Tashkinov | |
| 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 | |
| 2019-10-04 | Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity | eugenijm | |
| 2019-10-02 | PleromaAPI: Add unreacting. | lain | |
| 2019-10-02 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 2019-09-30 | . | lain | |
| 2019-09-30 | Extract mascot actions from `MastodonAPIController` to MascotController | Egor Kislitsyn | |
| 2019-09-30 | Add PleromaAPI.AccountController | Egor Kislitsyn | |
| 2019-09-30 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 2019-09-30 | change new scrobble endpoint | Ariadne Conill | |
| 2019-09-30 | test: fix scrobble controller tests | Ariadne Conill | |
| 2019-09-30 | pleroma api: hook up scrobbler controller | Ariadne Conill | |
| 2019-09-29 | Revert subscription refactoring. | rinpatch | |
| As discussed in pleroma-meta#2 This reverts commit eb9aa7aa1095de150d036839c78c402019efb4b1, reversing changes made to c4fbb56984d8f86df948cfd9b0f7c081d688c365. | |||
| 2019-09-26 | Merge develop | Roman Chvanikov | |
| 2019-09-25 | Fix nodeinfo handling | Ekaterina Vaartis | |
| 2019-09-25 | Add an API endpoint for listing remote packs | Ekaterina Vaartis | |
| 2019-09-23 | Emoji API Controller: Follow phoenix directory structure | rinpatch | |
| 2019-09-17 | Move pleroma_api controllers into controllers sub-folders | Roman Chvanikov | |
| 2019-09-17 | Rename SubscriptionNotificationController list and get actions to index and show | Roman Chvanikov | |
| 2019-09-17 | Apply suggestion to ↵ | Roman Chvanikov | |
| test/web/pleroma_api/subscription_notification_controller_test.exs | |||
| 2019-09-16 | Move subscription notifications to a separate controller | Roman Chvanikov | |
| 2019-09-13 | Merge remote-tracking branch 'origin/develop' into reactions | lain | |
| 2019-09-13 | ActivityPub: Use is_unicode_emoji? function. | lain | |
| 2019-09-12 | PleromaAPIController: Add endpoint to fetch emoji reactions. | lain | |
| 2019-09-04 | PleromaAPIController: Add emoji reactions. | lain | |
| 2019-09-04 | Extend `/api/pleroma/notifications/read` to mark multiple notifications | rinpatch | |
| as read and make it respond with Mastoapi entities | |||
| 2019-08-12 | Conversation: Add endpoint to get a conversation by id. | lain | |
| 2019-08-12 | Conversations: Use 'recipients' for accounts in conversation view. | lain | |
| According to gargron, this is the intended usage. | |||
| 2019-08-05 | Linting. | lain | |
| 2019-08-05 | Pleroma Conversations API: Add a way to set recipients. | lain | |
| 2019-08-02 | Pleroma API: Add endpoint to get conversation statuses. | lain | |
 |
index : pleroma | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiff |