Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / test / web / ostatus / ostatus_controller_test.exs
2019-10-10 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-10-07 kaniiniMerge branch 'feature/move-rss-out-of-ostatus' into...
2019-10-07 Sergey SuprunenkoExtract RSS Feed functionality from OStatus
2019-10-04 lainMerge branch 'featrue/job-monitor' into 'develop'
2019-10-04 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-10-02 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-10-02 kaniiniMerge branch 'feature/send-identifier-on-oauth-error...
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 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 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-26 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-26 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-26 Roman ChvanikovMerge develop
2019-09-26 kaniiniMerge branch 'refactor/notification-controller' into...
2019-09-26 kaniiniMerge branch 'feature/return-link-for-password-reset...
2019-09-26 kaniiniMerge branch 'refactor/user' into 'develop'
2019-09-26 kaniiniMerge branch 'hex-flake-id' into 'develop'
2019-09-25 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-24 Haelwenn (lanodan... /api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 Egor KislitsynAdd User.change_info/2 and User.update_info/2
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-23 rinpatchMerge branch 'better-emoji-packs' into 'develop'
2019-09-23 Haelwenn (lanodan... Add support for AP C2S uploadMedia
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-18 rinpatchMerge branch 'chores/bump-copyright-year' into 'develop'
2019-09-18 Haelwenn (lanodan... Bump copyright years of files changed in 2019
2019-08-27 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-19 lainMerge branch 'support/test_helpers' into 'develop'
2019-08-19 Maksimadded test helpers to clear config after tests
2019-08-02 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-31 sadposterMerge branch 'develop' of https://git.pleroma.social...
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-23 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-20 rinpatchResolve merge conflicts
2019-07-20 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-07-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-20 kaniiniMerge branch '1112-user-insert-conflict-id-preservation...
2019-07-20 kaniiniMerge branch 'tests/mock-sha512-crypt' into 'develop'
2019-07-20 Sergey Suprunenko[tests] Mock :crypt.crypt/2 function in AuthenticationP...
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 'release/listener' into 'develop'
2019-07-09 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-09 rinpatchMerge branch '878-activity-object-decoupling-in-tests...
2019-07-09 Ivan Tashkinov[#878] Merge remote-tracking branch 'remotes/upstream...
2019-07-09 Roman ChvanikovMerge develop
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-07-09 Mark FelderMerge branch 'develop' into feature/allow-user-query...
2019-07-09 kaniiniMerge branch 'remove-swift' into 'develop'
2019-07-09 kaniiniMerge branch 'features/sec-websocket-protocol-header...
2019-07-09 HaelwennMerge branch 'enable-ogp-by-default' into 'develop'
2019-07-09 feldMerge branch 'proxy-error' into 'develop'
2019-07-09 HaelwennMerge branch 'test-speedup' into 'develop'
2019-07-09 lainTesting: Don't federate in testing.
2019-07-08 Ivan Tashkinov[#878] Refactored assumptions on embedded object presen...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-30 Roman ChvanikovMerge develop
2019-04-29 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 kaniiniMerge branch 'get-cached-everywhere' into 'develop'
2019-04-22 EgorUse `User.get_cached*` everywhere
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-03-18 SadposterMerge branch 'develop' of https://git.pleroma.social...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.AliasOrder
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
next