Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / xml /
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
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-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-12 kaniiniMerge branch 'support/issue_442' into 'develop'
2018-12-12 Maksim Pechnikovfix warnings
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
2018-12-10 lambdaMerge branch 'parallel588/pleroma-support/compile_warni...
2018-12-09 Maksim Pechnikovfix compile warnings
2018-08-16 kaniiniMerge branch 'fix/put-repeats-at-activitypub-outbox...
2018-06-12 lambdaMerge branch 'develop' into 'develop'
2018-06-12 lambdaMerge branch 'feature/list-streaming' into 'develop'
2018-06-11 ealMerge branch 'fix/mix-task-caching' into 'develop'
2018-06-11 lambdaMerge branch 'feature/domain-blocks' into 'develop'
2018-06-06 lambdaMerge branch 'bugfix/webfinger-xml-crash' into 'develop'
2018-06-06 William PitcockXML: handle erlang errors too
2018-05-24 lambdaMerge branch 'feature/lists' into 'develop'
2018-05-13 lambdaMerge branch 'feature/unrepeats' into 'develop'
2018-05-13 lainMerge branch 'develop' into kaniini/pleroma-bugfix...
2018-05-13 lambdaMerge branch 'patch-2' into 'develop'
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-05-06 lambdaMerge branch 'feld-warnings' into 'develop'
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderMerge branch 'feld-test.secret' into feld-warnings
2018-05-04 Mark FelderFix a bunch of unused variable warnings
2018-04-24 lambdaMerge branch 'favicon_tag' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-07 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-07 lambdaMerge branch 'bugfix/html-webfinger-host-meta' into...
2018-04-07 William PitcockXML: use try/catch with XPath functions
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-30 lainFormat the code.
2018-03-20 lambdaMerge branch 'feld-varnish' into 'develop'
2018-03-20 lambdaMerge branch 'patch-README' into 'develop'
2018-03-20 lambdaMerge branch 'feld-mastoweb5000' into 'develop'
2018-03-20 lambdaMerge branch 'feld-Logger' into 'develop'
2018-03-19 Mark FelderMake XML feel special too
2017-12-09 Roger BraunMerge branch 'develop' into feature/activitypub
2017-11-19 lambdaMerge branch 'feature/fix-warnings' into 'develop'
2017-11-19 ThogFix all compilation warnings
2017-06-24 Roger BraunMore resilient xml parsing.
2017-05-07 Roger BraunMerge branch 'develop' into dtluna/pleroma-feature...
2017-05-05 Roger BraunMerge branch 'develop' into dtluna/pleroma-refactor/1
2017-04-27 Roger BraunRefactor XML parsing.