Merge branch 'admin-be' into 'develop'
[akkoma] / lib / pleroma / web / pleroma_api / controllers / pleroma_api_controller.ex
2020-01-22 feldMerge branch 'admin-be' into 'develop'
2020-01-22 rinpatchMerge branch 'emoji-reaction-extensions-2' into 'develop'
2020-01-22 lainEmoji reactions: Change cache and reply format
2020-01-21 Roman ChvanikovMerge branch 'develop' into fix/attachments-cleanup
2020-01-21 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-20 Mark FelderMerge branch 'develop' into fix/attachments-cleanup
2020-01-20 rinpatchMerge branch 'favoritng-responses' into 'develop'
2020-01-20 lainMerge branch 'credo/version-bump-1.1.5' into 'develop'
2020-01-20 lainMerge branch 'fix-emoji-reactions-oauth-scope' into...
2020-01-20 lainMerge branch 'fix-admin-api-scope' into 'develop'
2020-01-20 lainPleroma API: `emoji_reactions_by` does not need authori...
2020-01-15 Egor KislitsynMerge branch 'develop' into notifications-from-account
2020-01-12 feldMerge branch 'updated-at-on-conversation-read' into...
2020-01-12 feldMerge branch 'config/benchmark' into 'develop'
2020-01-12 Mark FelderMerge branch 'develop' into issue/1354
2020-01-12 feldMerge branch 'issue/1487' into 'develop'
2020-01-11 Alexander StrizhakovMerge branch 'develop' into admin-be
2020-01-10 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2020-01-10 lainMerge branch 'issue/1490' into 'develop'
2020-01-10 lainMerge branch 'oauth-scopes-tweaks-and-tests' into ...
2020-01-02 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-19 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-12-15 Ivan TashkinovOAuthScopesPlug: disallowed nil token (unless with...
2019-12-09 lainMerge branch 'exclude-visibilities-for-like-notificatio...
2019-11-21 lainMerge branch 'issue/1348' into 'develop'
2019-11-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-11-15 rinpatchMerge branch 'bugfix/1395-email-activation' into 'develop'
2019-11-14 Maxim FilippovMerge branch 'develop' into feature/admin-api-list...
2019-11-14 rinpatchMerge branch 'fix/conversations-rendering' into 'develop'
2019-11-14 feldMerge branch 'feature/reports-groups-and-multiple-state...
2019-11-14 Egor KislitsynMerge remote-tracking branch 'upstream/develop' into...
2019-11-14 rinpatchMerge branch 'reactions' into 'develop'
2019-11-10 lainMerge branch 'develop' into 'reactions'
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-28 Egor KislitsynMerge branch 'develop' into feature/move-activity
2019-10-28 lainMerge branch 'refactor/following-relationships' into...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
2019-10-27 kaniiniMerge branch 'improve-user-info-migration' into 'develop'
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'refactor/db-not-null-constraints-for...
2019-10-27 kaniiniMerge branch 'readme-pg-contrib' into 'develop'
2019-10-26 kaniiniMerge branch 'conversation-read-status-for-blocking...
2019-10-25 eugenijmMark the conversations with the blocked user as read...
2019-10-21 kaniiniMerge branch 'feature/push-subject-for-dm' into 'develop'
2019-10-21 Maksim PechnikovMerge branch 'develop' into feature/masto_api_markers
2019-10-21 Egor KislitsynMerge branch 'develop' into refactor/following-relation...
2019-10-20 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-19 HaelwennMerge branch 'feature/mastofe-pwa' into 'develop'
2019-10-19 HaelwennMerge branch 'mark-all-conversations-as-read' into...
2019-10-19 eugenijmPleroma API: `POST /api/v1/pleroma/conversations/read...
2019-10-19 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-10 lainMerge branch 'develop' into 'reactions'
2019-10-07 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 lainLinting.
2019-10-07 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 kaniiniMerge branch 'mrf/simple_policy/check_actor' into ...
2019-10-07 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-07 HaelwennMerge branch '1234-mastodon-2-4-3-oauth-scopes' into...
2019-10-06 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-10-06 lainMerge branch 'develop' into 'reactions'
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-05 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 lainPleromaAPI: Add unreacting.
2019-10-02 lainPleromaAPI: Fix emoji_reactions_by
2019-10-02 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-30 Ivan Tashkinov[#1260] Merge remote-tracking branch 'remotes/upstream...
2019-09-30 lainPleromaAPIController: Fixes and refactoring.
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-30 Ariadne Conillsplit scrobble functions into their own controller
2019-09-30 Ariadne Conillrouter: change scrobble timeline route from now-playing...
2019-09-30 Ariadne Conillpleroma api: hook up scrobbler controller
next