Skip to content

Commit 5e78b51

Browse files
authored
Merge pull request veliovgroup#265 from VeliovGroup/dev
v1.7.4 This is first update based on community contribution. Thank you everyone who has a chance to take a part in this project, you've made this lib better! v1.7.4: - Comparability with `meteor@1.4.1.2` - Update Google integration docs - @salmanhasni - `.find()` and `.findOne()` methods of `FilesCollection` now acts in the same way as instances of `Mongo.Collection` - @exKAZUu - Explanation around `storagePath` option - @elewis33 & @yanickrochon - Option to set different DDP connection, per Collection and per Upload. By @rafaelcorreiapoli - closing veliovgroup#51 and veliovgroup#235 - `Template` now is weak dependency, by @macrozone - closing veliovgroup#242 - Demo app: UI fixes for Safari - Demo app: Notice if video or audio not supported by browser. The __.mp4__ was deprecated in Chromium in favour of __.webm__
2 parents 6f94319 + be73637 commit 5e78b51

35 files changed

+475
-354
lines changed

.github/PULL_REQUEST_TEMPLATE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
1. Make sure you're sending PR to `dev` branch
22
2. Give a short description what you have changed/added and why
33

4-
## Thank you for contribuution, and do not forget to get rid of this default message
4+
## Thank you for contribution, and do not forget to get rid of this default message

.npm/package/npm-shrinkwrap.json

+53-48
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.versions

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ blaze@2.1.8
77
blaze-tools@1.0.9
88
boilerplate-generator@1.0.9
99
caching-compiler@1.1.6
10-
caching-html-compiler@1.0.6
1110
callback-hook@1.0.9
1211
check@1.2.3
1312
coffeescript@1.2.3
@@ -28,7 +27,6 @@ id-map@1.0.8
2827
jquery@1.11.9
2928
logging@1.1.14
3029
meteor@1.2.16
31-
minifier-js@1.1.13
3230
minimongo@1.0.17
3331
modules@0.7.5
3432
modules-runtime@0.7.5
@@ -38,16 +36,14 @@ npm-mongo@1.5.45
3836
observe-sequence@1.0.12
3937
ordered-dict@1.0.8
4038
ostrio:cookies@2.0.5
41-
ostrio:files@1.7.3
39+
ostrio:files@1.7.4
4240
promise@0.8.3
4341
random@1.0.10
4442
reactive-var@1.0.10
4543
retry@1.0.8
4644
routepolicy@1.0.11
4745
spacebars@1.0.12
4846
spacebars-compiler@1.0.12
49-
templating@1.2.13
50-
templating-tools@1.0.4
5147
tracker@1.1.0
5248
ui@1.0.11
5349
underscore@1.0.9

README.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ import { FilesCollection } from 'meteor/ostrio:files';
9797

9898
FAQ:
9999
========
100-
1. __Where files is stored by default?__: by default if `config.storagePath` isn't passed into [*Constructor*](https://github.com/VeliovGroup/Meteor-Files/wiki/Constructor) it's equals to `assets/app/uploads` and relative to running script:
101-
* On `development` stage: `yourDevAppDir/.meteor/local/build/programs/server`, note: __all files will be removed as soon as your application will rebuild__ or you run `meteor reset`. To keep you storage persistent use absolute path *outside of your project folder*, we recommend to use `/data` directory
100+
1. __Where are files stored by default?__: by default if `config.storagePath` isn't passed into [*Constructor*](https://github.com/VeliovGroup/Meteor-Files/wiki/Constructor) it's equals to `assets/app/uploads` and relative to running script:
101+
* On `development` stage: `yourDevAppDir/.meteor/local/build/programs/server`
102+
> __Note: All files will be removed as soon as your application rebuilds__ or you run `meteor reset`. To keep your storage persistent during development use an absolute path *outside of your project folder*, e.g. `/data` directory.
102103
* On `production`: `yourProdAppDir/programs/server`
103104
2. __How to pause/continue upload and get progress/speed/remaining time?__: see *Object* returned from [`insert` method](https://github.com/VeliovGroup/Meteor-Files/wiki/Insert-(Upload))
104105
3. When using any of `accounts` packages - package `accounts-base` must be explicitly added to `.meteor/packages` above `ostrio:files`
@@ -143,7 +144,7 @@ Upload form (template):
143144
```html
144145
<template name="uploadForm">
145146
{{#with currentUpload}}
146-
Uploading <b>{{file.name}}</b>:
147+
Uploading <b>{{file.name}}</b>:
147148
<span id="progress">{{progress.get}}%</span>
148149
{{else}}
149150
<input id="fileInput" type="file" />
@@ -171,7 +172,7 @@ Template.uploadForm.helpers({
171172
Template.uploadForm.events({
172173
'change #fileInput': function (e, template) {
173174
if (e.currentTarget.files && e.currentTarget.files[0]) {
174-
// We upload only one file, in case
175+
// We upload only one file, in case
175176
// multiple files were selected
176177
var upload = Images.insert({
177178
file: e.currentTarget.files[0],
@@ -326,6 +327,7 @@ For more expressive example see [Download demo](https://github.com/VeliovGroup/M
326327
Supporters:
327328
========
328329
I would like to thank everyone who support this project. *Because of those guys this project can have 100% of our attention*.
330+
- [@FinnFrotscher](https://github.com/FinnFrotscher)
329331
- [@Neobii](https://github.com/Neobii)
330332
- [@themeteorchef](https://github.com/themeteorchef)
331333
- [@MeDBejoHok](https://github.com/medbejohok)
@@ -335,4 +337,4 @@ I would like to thank everyone who support this project. *Because of those guys
335337

336338
| Meteor-Files | Expressive package to manage files within Meteor |
337339
|:-------------:|:------------- |
338-
| [![logo](https://raw.githubusercontent.com/VeliovGroup/Meteor-Files/master/logo-bw.png)](https://github.com/VeliovGroup/Meteor-Files) | If you found this package useful, please do not hesitate to star it at both [GitHub](https://github.com/VeliovGroup/Meteor-Files) and [Atmosphere](https://atmospherejs.com/ostrio/files). Also you may like to [Tweet](https://twitter.com/share?url=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files&text=File%20upload%20and%20delivery%20in%20Meteorjs%20-%20now%20it's%20easy!) about it or share at [Facebook](https://www.facebook.com/sharer.php?u=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files) <br /> [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FVDSXRFW9VGA2) |
340+
| [![logo](https://raw.githubusercontent.com/VeliovGroup/Meteor-Files/master/logo-bw.png)](https://github.com/VeliovGroup/Meteor-Files) | If you found this package useful, please do not hesitate to star it at both [GitHub](https://github.com/VeliovGroup/Meteor-Files) and [Atmosphere](https://atmospherejs.com/ostrio/files). Also you may like to [Tweet](https://twitter.com/share?url=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files&text=File%20upload%20and%20delivery%20in%20Meteorjs%20-%20now%20it's%20easy!) about it or share at [Facebook](https://www.facebook.com/sharer.php?u=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files) <br /> [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FVDSXRFW9VGA2) |

demo-simplest-download-button/.meteor/packages

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66

77
meteor-base@1.0.4 # Packages every Meteor app needs to have
88
mobile-experience@1.0.4 # Packages for a great mobile UX
9-
mongo@1.1.12 # The database Meteor supports right now
9+
mongo@1.1.12_1 # The database Meteor supports right now
1010
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
1111
reactive-var@1.0.10 # Reactive variable for tracker
1212
jquery@1.11.9 # Helpful client-side library
1313
tracker@1.1.0 # Meteor's client-side reactive programming library
1414

15-
standard-minifier-css@1.2.0 # CSS minifier run for production mode
16-
standard-minifier-js@1.2.0 # JS minifier run for production mode
17-
es5-shim@4.6.14 # ECMAScript 5 compatibility for older browsers.
18-
ecmascript@0.5.8 # Enable ECMAScript2015+ syntax in app code
15+
standard-minifier-css@1.2.0_1 # CSS minifier run for production mode
16+
standard-minifier-js@1.2.0_1 # JS minifier run for production mode
17+
es5-shim@4.6.14_1 # ECMAScript 5 compatibility for older browsers.
18+
ecmascript@0.5.8_1 # Enable ECMAScript2015+ syntax in app code
1919

2020
ostrio:files
2121
aldeed:simple-schema
2222
aldeed:collection2
23-
shell-server
23+
shell-server@0.2.1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.4.1.1
1+
METEOR@1.4.1.2

0 commit comments

Comments
 (0)