Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / config / test.exs
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-12 Ivan Tashkinov[#114] Added tests for "POST /api/account/password_reset".
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 Rin ToshakaMerge develop
2018-12-06 kaniiniMerge branch 'fix/mastodon-api-settings' into 'develop'
2018-12-06 kaniiniMerge branch 'correct-and-improve-http-options' into...
2018-12-06 kaniiniMerge branch 're-mrf' into 'develop'
2018-12-06 kaniiniMerge branch 'feature/compat/push-subscriptions' into...
2018-12-06 Egor Kislitsynadd VAPID to test config
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into...
2018-12-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-04 kaniiniMerge branch 'optional-retry-queue' into 'develop'
2018-12-04 kaniiniMerge branch 'feature/integration_tesla' into 'develop'
2018-12-04 Maksim PechnikovWebSub fix test
2018-12-04 Maksim Pechnikovinit tesla and updated the http requests in Pleroma...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 kaniiniMerge branch 'feature/reverse-proxy' into 'develop'
2018-11-30 hrefreverse proxy / uploads
2018-05-26 lainMerge branch 'develop' into csaurus/pleroma-feature...
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-24 lambdaMerge branch 'feature/incoming-remote-unfollow' into...
2018-05-24 lambdaMerge branch 'feature/change-password' into 'develop'
2018-05-23 lambdaMerge branch 'feature/deps-migration' into 'develop'
2018-05-20 ThogMigrate to comeonin 4 and Cachex 3
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-05 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-05-05 lambdaMerge branch 'feld-test.secret' into 'develop'
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderSpeling
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderMake it possible to use custom database connection...
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-02 Roger BraunRead variable for testing db.
2017-05-07 Roger BraunMerge branch 'develop' into dtluna/pleroma-feature...
2017-05-05 Roger BraunMock HTTPoison in testing.
2017-05-05 Roger BraunMerge branch 'develop' into dtluna/pleroma-refactor/1
2017-04-28 Roger BraunHandle incoming websub subscriptions.
2017-04-28 dtlunaMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-23 lambadalambdaMerge branch 'feature/follow-unfollow-by-screen-name...
2017-04-23 Roger BraunMerge branch 'ostatus' into develop
2017-04-22 Roger BraunOnly have one subscription per callback.
2017-03-28 Roger BraunAdd Uploads.
2017-03-20 Roger BraunAdd basic auth.
2017-03-17 Roger BraunPhoenix skeleton