nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove tiff support from photos

Browse source 
closes #7576
This commit is contained in:
Manuel Vögele 2017-08-24 17:07:31 +02:00 committed by Benjamin Neff
parent ce40ec128f
commit 0f771dbb10
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -4,6 +4,7 @@
* Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551) * Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)
* Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557) * Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
* Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568) * Sort notifications by last interaction [#7568](https://github.com/diaspora/diaspora/pull/7568)
* Remove tiff support from photos [#7576](https://github.com/diaspora/diaspora/pull/7576)
## Bug fixes ## Bug fixes
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579) * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)

2
app/assets/javascripts/app/views/publisher/uploader_view.js
View file

@ -5,7 +5,7 @@
// progress. Attaches previews of finished uploads to the publisher. // progress. Attaches previews of finished uploads to the publisher.
app.views.PublisherUploader = Backbone.View.extend({ app.views.PublisherUploader = Backbone.View.extend({
allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"], allowedExtensions: ["jpg", "jpeg", "png", "gif"],
sizeLimit: 4194304, // bytes sizeLimit: 4194304, // bytes
initialize: function(opts) { initialize: function(opts) {

2
app/assets/javascripts/mobile/mobile_file_uploader.js
View file

@ -19,7 +19,7 @@ function createUploader(){
} }
}, },
validation: { validation: {
allowedExtensions: ["jpg", "jpeg", "png", "gif", "tif", "tiff"], allowedExtensions: ["jpg", "jpeg", "png", "gif"],
sizeLimit: 4194304 sizeLimit: 4194304
}, },
button: document.getElementById("file-upload-publisher"), button: document.getElementById("file-upload-publisher"),

2
app/uploaders/processed_image.rb
View file

@ -10,7 +10,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
end end
def extension_whitelist def extension_whitelist
%w[jpg jpeg png gif tiff] %w[jpg jpeg png gif]
end end
def filename def filename