[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / lib / pleroma / web / templates / layout / app.html.eex
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-15 rinpatchMerge branch 'hellthread-filter-fix' into 'develop'
2019-02-14 lambdaMerge branch 'bugfix/activitypub-reserialization' into...
2019-02-14 kaniiniMerge branch 'fix/credo-issues-test' into 'develop'
2019-02-14 kaniiniMerge branch 'feature/activitypub-oauth-endpoints'...
2019-02-13 kaniiniMerge branch 'feature/better-login-errors' into 'develop'
2019-02-13 Mark FelderImprove login error for OAuth flow
2019-02-13 Ivan Tashkinov[#468] User UI for OAuth permissions restriction. Stand...
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop'
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-02 rinpatchMerge branch 'fix/oauth-page-responsiveness' into ...
2019-02-02 Maxim FilippovAdd responsive features to layout
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-27 kaniiniMerge branch 'fix/version-string-force-git-abbrev-size...
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-27 HaelwennMerge branch 'feature/mrf-user-allowlist' into 'develop'
2018-11-26 kaniiniMerge branch 'fix/pleromafe-title' into 'develop'
2018-11-26 Mark FelderReplace this hardcoded <title>
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-16 lambdaMerge branch 'feature/masto-styled-login-page' into...
2017-11-16 Roger BraunSmall css fix.
2017-11-16 Shpuld ShpuldsonAdd styles to make login page resemble mastodon's
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.