summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-06avoid mix format bugHakaba Hitoyo
2018-12-06remove follow_redirect optionsHakaba Hitoyo
2018-12-06remove pool and timeout options which duplicate with the defaultHakaba Hitoyo
2018-12-06Merge remote-tracking branch 'origin/debug-suggestions-api' into ↵Hakaba Hitoyo
correct-and-improve-http-options
2018-12-05Merge branch 'follower-hiding' into 'develop'kaniini
Network hiding Closes #356 See merge request pleroma/pleroma!490
2018-12-05Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini
added data-user and data-tag attributes Closes #410 See merge request pleroma/pleroma!504
2018-12-06added data attrs to twitter scrubberVald
2018-12-05Fix merge.lain
2018-12-05Merge remote-tracking branch 'origin' into follower-hidinglain
2018-12-05MastodonAPI: Show users their own network.lain
2018-12-06resolved activity view testVald
2018-12-06lintVald
2018-12-06resolved api and controller test failuresVald
2018-12-05TwitterAPI: Show users their own network.lain
2018-12-06lintingVald
2018-12-06resolved formatter_test failuresVald
2018-12-06added data attrs for user and tagVald
2018-12-05TwitterAPI: Add network hiding.lain
2018-12-05Merge branch 'support/oauth_fetch_token' into 'develop'lambda
[#273] bugfix/273 See merge request pleroma/pleroma!502
2018-12-05Merge branch 'fix/mix-tasks-userinfo' into 'develop'lambda
Update mix tasks that use User.info.info_changeset since it is deprecated See merge request pleroma/pleroma!503
2018-12-05SorryRin Toshaka
2018-12-05Update mix tasks since User.info.info_changeset is deprecatedRin Toshaka
2018-12-05fix/273Maksim Pechnikov
2018-12-05Merge branch 'bugfix/408' into 'develop'lambda
ensure user info is populated when registering users See merge request pleroma/pleroma!500
2018-12-05debug /api/v1/suggestionshakabahitoyo
2018-12-05tests: add regression test for bug #408William Pitcock
2018-12-05user: put default user info when registering a userWilliam Pitcock
2018-12-04Merge branch 'optional-retry-queue' into 'develop'kaniini
Make retry queue optional. See merge request pleroma/pleroma!498
2018-12-04Make retry queue optional.lain
At the moment, it can use a lot of memory really fast.
2018-12-04Merge branch 'feature/integration_tesla' into 'develop'kaniini
[#354] Move all http interactions to Tesla See merge request pleroma/pleroma!487
2018-12-04Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'lambda
bugfix: MRF simple media removal See merge request pleroma/pleroma!497
2018-12-04MRF: simple policy: fix media removalWilliam Pitcock
2018-12-04add testMaksim Pechnikov
2018-12-04remove httpoison_mockMaksim Pechnikov
2018-12-04formatting the codeMaksim Pechnikov
2018-12-04all tests passedMaksim Pechnikov
2018-12-04update testMaksim Pechnikov
2018-12-04update testMaksim Pechnikov
2018-12-04update testMaksim Pechnikov
2018-12-04update testMaksim Pechnikov
2018-12-04add http requests mockMaksim Pechnikov
2018-12-04status_code -> statusMaksim Pechnikov
2018-12-04fix http request in SalmonMaksim Pechnikov
2018-12-04WebSub fix testMaksim Pechnikov
2018-12-04init tesla and updated the http requests in Pleroma.Web.WebsubMaksim Pechnikov
2018-12-03Merge branch 'fix/parse-user-bio' into 'develop'lambda
Parse user's bio on register See merge request pleroma/pleroma!492
2018-12-03Merge branch 'fix-media-proxy-defaults' into 'develop'lambda
Fix media proxy config defaults See merge request pleroma/pleroma!495
2018-12-03Parse bio for MastodonAPIMaxim Filippov
2018-12-03Merge branch 'update-pleroma-frontend' into 'develop'kaniini
update-pleroma-frontend See merge request pleroma/pleroma!494
2018-12-03update-pleroma-frontendhakabahitoyo