Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / upload /
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-20 rinpatchResolve merge conflicts
2019-07-20 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-19 Roman ChvanikovMerge develop
2019-07-19 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-19 kaniiniMerge branch 'feature/richmedia-ttl' into 'develop'
2019-07-18 Maxim FilippovMerge branch 'develop' into feature/admin-api-user...
2019-07-17 kaniiniMerge branch 'feature/mention-mrf' into 'develop'
2019-07-16 kaniiniMerge branch 'tests/upload_filters' into 'develop'
2019-07-16 Maksimadded tests for Pleroma.Upload.Filter
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
2019-07-11 Egor KislitsynMerge branch 'develop' into feature/addressable-lists
2019-07-09 kaniiniMerge branch 'remove-avatar-header' into 'develop'
2019-07-06 sadposterMerge branch 'develop' of https://git.pleroma.social...
2019-07-01 HaelwennMerge branch 'fix/docs-dry-run' into 'develop'
2019-07-01 HaelwennMerge branch 'ci-improvements' into 'develop'
2019-06-30 Roman ChvanikovMerge branch 'develop' into feature/digest-email
2019-06-30 Ivan Tashkinov[#161] Merge remote-tracking branch 'remotes/upstream...
2019-06-30 rinpatchMerge branch 'issues/1026' into 'develop'
2019-06-30 Maksim[#1026] Filter.AnonymizeFilename added ability to retai...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
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... Credo fixes: parameter consistency
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-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/mix-task-uploads-moduledoc' into...
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-10 Maksim Pechnikovupdates
2018-12-09 Maksim Pechnikovfix compile warnings
2018-12-07 hrefAnonymizeFilename: allow for a pre-defined text instead...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-12-01 kaniiniMerge branch 'feature/anonymize-filenames' into 'develop'
2018-11-30 hrefUpload filter: anonymize filename
2018-11-30 kaniiniMerge branch 'feature/reverse-proxy' into 'develop'
2018-11-30 hrefUploads fun, part. 2