Merge branch 'patch-1' into 'develop'
[akkoma] / lib / pleroma / uploaders /
2019-05-01 Alex SMerging with develop
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-29 lambdaMerge branch 'feature/deploy-docs' into 'develop'
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-25 lainMerge remote-tracking branch 'origin/develop' into...
2019-03-25 rinpatchMerge branch 'bugfix/missing-announces' into 'develop'
2019-03-25 kaniiniMerge branch 'features/s3-uploader-digital-ocean' into...
2019-03-24 Austin Lanariadd overriding truncated_namespace condition for trunca...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo][CI] Add readability as it’s fixed
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 Haelwenn (lanodan... [Credo] Remove parentesis on argument-less functions
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-15 rinpatchMerge branch 'hellthread-filter-fix' into 'develop'
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-14 kaniiniMerge branch 'fix/credo-issues-test' into 'develop'
2019-02-13 kaniiniMerge branch 'bugfix/mdii-uploader' into 'develop'
2019-02-13 hakabahitoyobugfix mdii uploader
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-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop'
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-30 kaniiniMerge branch 'multiple-hackney-pools' into 'develop'
2019-01-30 hrefUse multiple hackney pools
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop'
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop'
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop'
2019-01-23 lainMerge branch 'develop' into rename/pleroma_activity_con...
2019-01-22 HaelwennMerge branch 'fix/activity_get_by_id' into 'develop'
2019-01-22 kaniiniMerge branch 'uploader-controller' into 'develop'
2019-01-21 hrefUploader callback controller
2019-01-21 hrefS3 Namespace
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/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-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into...
2018-12-05 lainMerge remote-tracking branch 'origin' into follower...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-04 kaniiniMerge branch 'optional-retry-queue' into 'develop'
2018-12-04 kaniiniMerge branch 'feature/integration_tesla' into 'develop'
2018-12-04 Maksim Pechnikovstatus_code -> status
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 kaniiniMerge branch 'feature/reverse-proxy' into 'develop'
2018-11-30 hrefUploads fun, part. 2
2018-11-30 hrefreverse proxy / uploads
2018-11-27 kaniiniMerge branch 'ogg-theora-detection' into 'develop'
2018-11-17 kaniiniMerge branch 'feature/uploader-mdii' into 'develop'
2018-11-17 hakabahitoyofallbacking into local uploader
2018-11-17 hakabahitoyobetter config reading
2018-11-16 hakabahitoyobetter config
2018-11-16 hakabahitoyobetter extension detection
2018-11-15 hakabahitoyodebug
2018-11-15 hakabahitoyoformat
2018-11-15 Hakaba Hitoyodebuf
next