Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[akkoma] / lib / pleroma / web / ostatus / ostatus_controller.ex
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 feldMerge branch 'feature/reports-groups-and-multiple-state...
2019-11-14 rinpatchMerge branch 'reactions' into 'develop'
2019-11-11 kaniiniMerge branch 'feature/static-fe' into 'develop'
2019-11-11 lainMerge branch 'update-docs' into 'develop'
2019-11-11 lainMerge branch 'iss-1376' into 'develop'
2019-11-11 lainMerge branch 'fix/1399' into 'develop'
2019-11-11 lainMerge branch 'new-rate-limiter' into 'develop'
2019-11-11 Steven FuchsNew rate limiter
2019-11-10 Phil HagelbergMove static FE routing into its own plug.
2019-11-10 Phil HagelbergApply all suggested changes from reviewers.
2019-11-10 Phil HagelbergFix activity_representer to work with User.get_or_fetch...
2019-11-10 Phil HagelbergFix OStatus controller to know about StaticFEController.
2019-11-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-11-04 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-27 Maxim FilippovMerge branch 'develop' into feature/store-statuses...
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 rinpatchMerge branch 'mix-emoji-task-pack-json' into 'develop'
2019-10-18 Mark FelderMerge branch 'develop' into feature/push-subject-for-dm
2019-10-18 rinpatchMerge branch 'patch-1' into 'develop'
2019-10-18 rinpatchMerge branch 'fix/pleroma-ctl-rpc' into 'develop'
2019-10-18 Maxim FilippovMerge branch 'develop' into feature/relay-list
2019-10-18 kaniiniMerge branch 'feature/ostatus-removal' into 'develop'
2019-10-18 Ariadne Conillkill almost all of the OStatus module
2019-10-18 Ariadne Conillremove Salmon module
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-10-07 Maxim FilippovMerge branch 'develop' into feature/reports-groups...
2019-10-07 lainMerge branch 'develop' into 'reactions'
2019-10-07 kaniiniMerge branch 'feature/move-rss-out-of-ostatus' into...
2019-10-07 Sergey SuprunenkoExtract RSS Feed functionality from OStatus
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
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 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kaniiniMerge branch 'features/apc2s-media-upload' into 'develop'
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-26 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-26 Roman ChvanikovMerge develop
2019-09-26 kaniiniMerge branch 'hex-flake-id' into 'develop'
2019-09-25 rinpatchMerge branch 'hotfix/hackney-1.15.2' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-24 Maxim FilippovMerge branch 'develop' into feature/return-link-for...
2019-09-24 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 kaniiniMerge branch 'feature/force-password-reset' into 'develop'
2019-09-23 kaniiniMerge branch 'support-rel-ugc' into 'develop'
2019-09-23 kaniiniMerge branch 'remove-direct-messages-from-public-timeli...
2019-09-23 kaniiniMerge branch 'test/activity_pub/transmogrifier.ex'...
2019-09-23 kaniiniMerge branch 'clean-up-views' into 'develop'
2019-09-23 Steven FuchsClean up views
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-22 Maxim FilippovMerge branch 'develop' into feature/return-link-for...
2019-09-19 HaelwennMerge branch 'docs/clients-update' into 'develop'
2019-09-19 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-19 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-18 HaelwennMerge branch 'issue/733' into 'develop'
2019-09-17 Maksim PechnikovMerge branch 'develop' into issue/733
2019-09-17 Maksim PechnikovMerge branch 'develop' into issue/733
2019-09-16 Maksim PechnikovMerge branch 'develop' into issue/733
2019-09-12 Maksim Pechnikovadded test for Ostatus
2019-08-31 Ivan Tashkinov[#1149] Added Oban job for "activity_expiration". Merge...
2019-08-25 kaniiniMerge branch 'issue/1177' into 'develop'
2019-08-25 kaniiniMerge branch 'feature/moderation-log' into 'develop'
2019-08-25 Maxim FilippovLog admin/moderator actions
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Maksim PechnikovMerge branch 'develop' into issue/1177
2019-08-22 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-22 feldMerge branch 'support/tests' into 'develop'
2019-08-22 lainMerge branch 'improve-ap-routes-rate-limit' into 'develop'
2019-08-22 Egor KislitsynImprove AP routes rate limit
2019-08-21 lainMerge branch 'rate-limit-ap-routes' into 'develop'
2019-08-20 Egor KislitsynAdd `:ap_routes` rate limit
2019-08-02 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-31 rinpatchMerge branch 'develop' into feature/hide-follows-remote
2019-07-29 lainMerge branch 'refactor/use-constants' into 'develop'
2019-07-29 kaniiniMerge branch 'tests/ostatus_controller' into 'develop'
2019-07-29 Maksimadded tests for OstatusController
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-12 Roman Chvanikovmerge develop
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-10 kaniiniMerge branch 'localization' into 'develop'
2019-07-10 Egor KislitsynWrap error messages into gettext helpers
2019-05-01 Alex SMerging with develop
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-29 lambdaMerge branch 'feature/deploy-docs' into 'develop'
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-24 rinpatchMerge branch 'features/mrf-keyword-nil-summary' into...
2019-03-24 rinpatchMerge branch 'fix/eldap-warnings' into 'develop'
2019-03-24 kaniiniMerge branch 'feature/object-normalize-preload' into...
next