Merge branch 'develop' into gun
[akkoma] / lib / pleroma / web / uploader_controller.ex
2020-03-03 Mark FelderMerge branch 'develop' into gun
2020-03-03 HaelwennMerge branch 'chore/update-copyrights' into 'develop'
2020-03-03 Mark FelderUpdate Copyrights
2019-08-24 lainMerge branch 'admin-create-users' into 'develop'
2019-07-20 rinpatchResolve merge conflicts
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-18 kaniiniMerge branch 'feature/signed-object-fetches' into ...
2019-07-18 kaniiniMerge branch 'tests/uploads' into 'develop'
2019-07-18 Maksimtests for Uploader with webhook
2019-07-15 Mark FelderMerge branch 'develop' into feature/matstodon-statuses...
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 KislitsynWrap error messages into gettext helpers
2019-07-10 kaniiniMerge branch 'release/listener' into 'develop'
2019-07-10 kaniiniMerge branch 'fix/license-attribution' into 'develop'
2019-07-10 feldAdd license/copyright to all project files
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... Make credo happy
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop'
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop'
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider'
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