Merge remote-tracking branch 'upstream/develop' into patch-image-description
[akkoma] / lib / pleroma / web / oauth / fallback_controller.ex
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-29 HaelwennMerge branch 'feature/rich-media-part-2-electric-boogal...
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-28 HaelwennMerge branch 'safe-render-activities' into 'develop'
2019-01-28 hrefMerge branch 'oauth-login-failure-bug' into 'develop'
2019-01-28 lainCorrectly handle invalid credentials on auth login.
2019-01-13 rinpatchResolve merge conflict
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-02-12 lainMerge branch 'hakabahitoyo/pleroma-feature/atom-feed...
2018-02-11 Hakaba HitoyoMerge remote-tracking branch 'hakabahitoyo/feature...
2018-02-11 Roger BraunMerge branch 'develop' into feature/activitypub
2018-02-09 lambdaMerge branch 'develop' into 'develop'
2018-02-08 Calv CollinsChanged fallback controller to handle all cases from...
2018-02-08 Calv CollinsMerge branch 'develop' of https://git.pleroma.social...
2018-02-08 Calv CollinsCreate action_fallback for username/password incorrect...