Commit graph

155 commits

Author SHA1 Message Date
Roger Braun 5fc6e9d467 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop 2017-11-12 14:25:15 +01:00
Roger Braun d293ceb1b5 Add Mastodon frontend. 2017-11-12 14:23:05 +01:00
Roger Braun 6af164f27b Add password reset. 2017-10-19 17:37:24 +02:00
Roger Braun ac3f32da7e Preserve state in oauth 2017-09-14 09:29:51 +02:00
Roger Braun 2a298d70f9 Add very basic oauth and mastodon api support. 2017-09-06 19:06:25 +02:00