Skip to content

Commit

Permalink
Merge pull request #265 from VeliovGroup/dev
Browse files Browse the repository at this point in the history
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 `[email protected]`
 - 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 #51 and #235
 - `Template` now is weak dependency, by @macrozone - closing #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__
  • Loading branch information
dr-dimitru authored Oct 12, 2016
2 parents 6f94319 + be73637 commit 5e78b51
Show file tree
Hide file tree
Showing 35 changed files with 475 additions and 354 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1. Make sure you're sending PR to `dev` branch
2. Give a short description what you have changed/added and why

## Thank you for contribuution, and do not forget to get rid of this default message
## Thank you for contribution, and do not forget to get rid of this default message
101 changes: 53 additions & 48 deletions .npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ import { FilesCollection } from 'meteor/ostrio:files';

FAQ:
========
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:
* 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
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:
* On `development` stage: `yourDevAppDir/.meteor/local/build/programs/server`
> __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.
* On `production`: `yourProdAppDir/programs/server`
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))
3. When using any of `accounts` packages - package `accounts-base` must be explicitly added to `.meteor/packages` above `ostrio:files`
Expand Down Expand Up @@ -143,7 +144,7 @@ Upload form (template):
```html
<template name="uploadForm">
{{#with currentUpload}}
Uploading <b>{{file.name}}</b>:
Uploading <b>{{file.name}}</b>:
<span id="progress">{{progress.get}}%</span>
{{else}}
<input id="fileInput" type="file" />
Expand Down Expand Up @@ -171,7 +172,7 @@ Template.uploadForm.helpers({
Template.uploadForm.events({
'change #fileInput': function (e, template) {
if (e.currentTarget.files && e.currentTarget.files[0]) {
// We upload only one file, in case
// We upload only one file, in case
// multiple files were selected
var upload = Images.insert({
file: e.currentTarget.files[0],
Expand Down Expand Up @@ -326,6 +327,7 @@ For more expressive example see [Download demo](https://github.com/VeliovGroup/M
Supporters:
========
I would like to thank everyone who support this project. *Because of those guys this project can have 100% of our attention*.
- [@FinnFrotscher](https://github.com/FinnFrotscher)
- [@Neobii](https://github.com/Neobii)
- [@themeteorchef](https://github.com/themeteorchef)
- [@MeDBejoHok](https://github.com/medbejohok)
Expand All @@ -335,4 +337,4 @@ I would like to thank everyone who support this project. *Because of those guys

| Meteor-Files | Expressive package to manage files within Meteor |
|:-------------:|:------------- |
| [![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) |
| [![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) |
12 changes: 6 additions & 6 deletions demo-simplest-download-button/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@

[email protected] # Packages every Meteor app needs to have
[email protected] # Packages for a great mobile UX
[email protected].12 # The database Meteor supports right now
[email protected].12_1 # The database Meteor supports right now
[email protected] # Compile .html files into Meteor Blaze views
[email protected] # Reactive variable for tracker
[email protected] # Helpful client-side library
[email protected] # Meteor's client-side reactive programming library

[email protected].0 # CSS minifier run for production mode
[email protected].0 # JS minifier run for production mode
[email protected].14 # ECMAScript 5 compatibility for older browsers.
[email protected].8 # Enable ECMAScript2015+ syntax in app code
[email protected].0_1 # CSS minifier run for production mode
[email protected].0_1 # JS minifier run for production mode
[email protected].14_1 # ECMAScript 5 compatibility for older browsers.
[email protected].8_1 # Enable ECMAScript2015+ syntax in app code

ostrio:files
aldeed:simple-schema
aldeed:collection2
shell-server
shell-server@0.2.1
2 changes: 1 addition & 1 deletion demo-simplest-download-button/.meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].1
[email protected].2
Loading

0 comments on commit 5e78b51

Please sign in to comment.