Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / web.ex
2019-10-10 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-30 kPheroxMerge remote-tracking branch 'upstream/develop' into...
2019-09-27 kaniiniMerge branch 'patch-2' into 'develop'
2019-09-27 kaniiniMerge branch 'update/docs-jp' into 'develop'
2019-09-25 Maksim PechnikovMerge branch 'develop' into issue/1218
2019-09-23 Maksim PechnikovMerge branch 'develop' into tests/mastodon_api_controll...
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/moderation-log...
2019-09-16 Maxim FilippovMerge branch 'develop' into feature/return-total-for...
2019-09-15 Ivan Tashkinov[#1234] Merge remote-tracking branch 'remotes/upstream...
2019-09-15 Maksim PechnikovMerge branch 'develop' into support/tests
2019-09-14 rinpatchMerge branch 'fix/truncate-remote-user-fields' into...
2019-09-14 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-09-13 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-09-13 lainMerge branch 'refactor/add_link_headers' into 'develop'
2019-09-13 lainMerge remote-tracking branch 'origin/develop' into...
2019-09-13 rinpatchMerge branch 'admin-config-description' into 'develop'
2019-09-12 Maksim PechnikovMerge branch 'develop' into test/activity_pub/transmogr...
2019-09-11 HaelwennMerge branch 'patch-5' into 'develop'
2019-09-11 lainMerge branch 'fix/oom-parallel-rendering' into 'develop'
2019-09-10 rinpatchRevert "Parallelize template rendering"
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-08-24 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-22 Ivan Tashkinov[#1149] Merge remote-tracking branch 'remotes/upstream...
2019-08-20 lainMerge branch 'fix/admin-api-user-deletion' into 'develop'
2019-08-20 lainMerge branch 'digest-template' into 'develop'
2019-08-20 lainMerge branch 'feature/custom-fields' into 'develop'
2019-08-19 lainMerge branch 'develop' into 'fix/reverse-proxy-body...
2019-08-18 kaniiniMerge branch 'feature/hide-muted-threads-from-timeline...
2019-08-16 lainMerge branch 'pleroma-conversations' into 'develop'
2019-08-16 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-08-15 kaniiniMerge branch 'features/formatting-sub_sup' into 'develop'
2019-08-15 lainMerge branch 'feature/parallel-rendering' into 'develop'
2019-08-15 rinpatchParallelize template rendering
2019-08-14 Maxim FilippovMerge branch 'develop' into 'fix/admin-api-user-deletion'
2019-08-14 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-08-14 lainMerge remote-tracking branch 'origin/develop' into...
2019-08-13 rinpatchMerge branch 'feature/mrf-vocabulary' into 'develop'
2019-08-13 kaniiniMerge branch 'feature/mrf-describe' into 'develop'
2019-08-13 rinpatchMerge branch 'length-limit-bio' into 'develop'
2019-08-13 HaelwennMerge branch 'fix/mastoapi-more-object-preloads' into...
2019-08-13 kaniiniMerge branch 'feature/nicer-safe-render-errors' into...
2019-08-13 rinpatchNicer formatting for safe_render errors
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-14 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-12 Roman Chvanikovmerge develop
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-10 kaniiniMerge branch 'localization' into 'develop'
2019-07-10 Egor KislitsynAdd translation helpers
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-03-18 SadposterMerge branch 'develop' of https://git.pleroma.social...
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
next