Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow all file type on file upload #485

Merged
merged 3 commits into from
May 9, 2019
Merged

Allow all file type on file upload #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
429849d
allow all file type for file upload
BenGamma May 9, 2019
b6437fd
tidy functions console logs
chrismclarke May 9, 2019
fabe70c
Merge branch 'master' of https://github.com/OneArmyWorld/onearmy
BenGamma May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion functions/src/Utils/image.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import * as sharp from 'sharp'
import { tmpdir } from 'os'
import { ensureDir } from 'fs-extra'

console.log('sharp', sharp)
// These are the widths used when compressing images to different sizes
export enum STANDARD_WIDTHS {
thumb = 160,
Expand Down
1 change: 1 addition & 0 deletions functions/src/exports/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as bodyParser from 'body-parser'
import * as cors from 'cors'
import * as express from 'express'

console.log('api init')
const app = express()
// use bodyparse to create json object from body
app.use(
Expand Down
1 change: 0 additions & 1 deletion functions/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { api } from './exports/api'
import { weeklyTasks, dailyTasks } from './exports/tasks'
import { DHSite_getUser, DHSite_migrateAvatar } from './exports/dhsite'

console.log('functions init')
// the following endpoints are exposed for use by various triggers
// see individual files for more informaiton
exports.api = api
Expand Down
2 changes: 1 addition & 1 deletion src/components/FileInput/UppyConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const UPPY_CONFIG: Partial<Uppy.UppyOptions> = {
maxFileSize: 5000000,
maxNumberOfFiles: 5,
minNumberOfFiles: null,
allowedFileTypes: ['.pdf', 'image/*'],
allowedFileTypes: ['*'],
},
locale: {
strings: {
Expand Down