Merge branch 'release/2.0.0' into 'stable'
[akkoma] / lib / pleroma / web / views /
2019-06-06 Roman ChvanikovResolve conflicts
2019-06-06 rinpatchReplace Mix.env with Pleroma.Config.get(:env)
2019-06-04 Roman ChvanikovFix conflict
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-05-29 Roman ChvanikovMerge develop
2019-05-11 Roman ChvanikovMerge develop
2019-05-08 Roman ChvanikovMerge develop
2019-04-30 Roman ChvanikovMerge develop
2019-04-20 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-20 Roman ChvanikovDigest emails
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop'
2019-02-20 lambdaMerge branch 'feature/improve-error-logging' into ...
2019-02-20 William Pitcocklogging: only return ISE reasons in API responses when...
2019-02-20 William Pitcocklogging: improve visibility into ISE errors
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.
2017-09-11 lambadalambdaMerge branch 'oauth2' into 'develop'
2017-09-11 Roger BraunMerge branch 'develop' into oauth2
2017-09-06 Roger BraunAdd very basic oauth and mastodon api support.
2017-03-17 Roger BraunPhoenix skeleton