Merge develop
[akkoma] / lib / pleroma / web / web.ex
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-03-03 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-03 kaniiniMerge branch 'feature/add-pagination-to-users-admin...
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline...
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop'
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical...
2019-02-28 kaniiniMerge branch 'with-mutes' into 'develop'
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop'
2019-02-28 Ivan TashkinovMade auth customization be runtime-configurable.
2019-02-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-02-22 Ivan TashkinovMinor setting name adjustment (:app_template -> :app_la...
2019-02-21 Ivan TashkinovAuth customization support.
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group import/s
2019-02-09 Haelwenn (lanodan... Stash
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-27 lambdaMerge branch 'safe-render-activities' into 'develop'
2019-01-27 hrefViews: wrap activity rendering in a rescue
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-05-07 Roger BraunMerge branch 'develop' into dtluna/pleroma-feature...
2017-05-05 Roger BraunMerge branch 'develop' into dtluna/pleroma-refactor/1
2017-05-03 Roger BraunAttachment parsing, better magic key fetching.
2017-04-28 dtlunaMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-27 dtlunaRefactor code to comply with credo suggestions
2017-04-23 lambadalambdaMerge branch 'feature/follow-unfollow-by-screen-name...
2017-04-23 Roger BraunMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-21 Roger BraunMerge branch 'develop' of ssh.gitgud.io:lambadalambda...
2017-04-17 Roger BraunAdd basic webfinger.
2017-03-30 Roger BraunAdd port if specified.
2017-03-17 Roger BraunPhoenix skeleton