Skip to content

Commit

Permalink
Merge pull request #774 from veliovgroup/dev
Browse files Browse the repository at this point in the history
dev->master

- Merge #773 by @ttencate — Fixing link in the documentation
- Merge #771 by @harryadel — Fixing typo in the in-code documentation

Thank you guys!
  • Loading branch information
dr-dimitru authored Nov 10, 2020
2 parents ed5ed33 + 84bb152 commit 143ad19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Stable, fast, robust, and well-maintained Meteor.js package for files management
## Why `Meteor-Files`?

- Compatible with all front-end frameworks from Blaze to [React](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/react-example.md)
- Upload via `HTTP` and `DDP` transports, [read about difference](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/3rd-party-storage.md)
- Upload via `HTTP` and `DDP` transports, [read about difference](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/about-transports.md)
- Sustainable and resumable uploads, which will survive connection interruption and server reboot (*if a server has persistent storage*)
- Upload files through computing cloud without persistent File System, like Heroku
- You need store files at *[GridFS](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/gridfs-bucket-integration.md#use-gridfs-with-gridfsbucket-as-a-storage)*, *[AWS S3](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/aws-s3-integration.md)*, *[Google Storage](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/google-cloud-storage-integration.md)* or *[DropBox](https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/dropbox-integration.md)*? (*[Use 3rd-party storage](hhttps://github.com/VeliovGroup/Meteor-Files/blob/master/docs/3rd-party-storage.md)*)
Expand Down
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ export class FilesCollection extends FilesCollectionCore {
};

// Method used to Abort upload
// - Feeing memory by .end()ing writableStreams
// - Freeing memory by ending writableStreams
// - Removing temporary record from @_preCollection
// - Removing record from @collection
// - .unlink()ing chunks from FS
Expand Down

0 comments on commit 143ad19

Please sign in to comment.