Skip to content

Commit 9240996

Browse files
committed
Merge branch 'master' into develop
2 parents 9038607 + 24dc601 commit 9240996

File tree

4 files changed

+37
-14
lines changed

4 files changed

+37
-14
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [3.18.0](https://github.com/filestack/filestack-js/compare/v3.17.0...v3.18.0) (2020-10-01)
6+
7+
8+
### Features
9+
10+
* **miemtypes:** add key extension to list ([a12b477](https://github.com/filestack/filestack-js/commit/a12b4775c42fe69adee7f6056f450d4ac233779b))
11+
* **mimetypes:** check apple mimetypes based on extensions ([#386](https://github.com/filestack/filestack-js/issues/386)) ([08f1154](https://github.com/filestack/filestack-js/commit/08f11548b8fa987698fc2150c7e9e3fc5dcedfd1))
12+
* **picker:** bump picker version to 18 (multiple bugfixes) ([a304076](https://github.com/filestack/filestack-js/commit/a30407661046345bd60dcaf19346c222e00077be))
13+
* **utils:** Replace 'getVersion' function's return statement to use static constant instead of dynamic require. ([77fa52d](https://github.com/filestack/filestack-js/commit/77fa52d3ce7c8488852f0b8e71650ff5c39c1319))
14+
15+
16+
### Bug Fixes
17+
18+
* **cancelToken:** move cancel token to event emmiter ([#384](https://github.com/filestack/filestack-js/issues/384)) ([b1cada8](https://github.com/filestack/filestack-js/commit/b1cada8cf7fefa0664774b79e66e1afef7fa01a7))
19+
* **mimetypes:** if we have mimetype and we cant find excluded type by extension fallback to magic by ([20cfa49](https://github.com/filestack/filestack-js/commit/20cfa49472163f90a7fd96c76d9231445d0a5948))
20+
* **prefetch:** clone deep config before send to avoid referances ([#388](https://github.com/filestack/filestack-js/issues/388)) ([7f3c153](https://github.com/filestack/filestack-js/commit/7f3c1536e3ca745b59597d724eefe123617b17ef))
21+
522
## [3.17.0](https://github.com/filestack/filestack-js/compare/v3.16.0...v3.17.0) (2020-08-24)
623

724

LICENSE

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
Copyright (c) ${year} by Filestack.
2-
Some rights reserved.
1+
MIT License
32

4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
3+
Copyright (c) 2020 Filestack
74

8-
http://www.apache.org/licenses/LICENSE-2.0
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
911

10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
1514

15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "filestack-js",
3-
"version": "3.17.0",
3+
"version": "3.18.0",
44
"description": "Official JavaScript library for Filestack",
55
"main": "build/main/index.js",
66
"module": "build/module/index.js",
@@ -9,7 +9,7 @@
99
"unpkg": "build/browser/filestack.min.js",
1010
"repository": "https://github.com/filestack/filestack-js",
1111
"author": "Filestack <filestack.com>",
12-
"license": "Apache-2.0",
12+
"license": "MIT",
1313
"files": [
1414
"src",
1515
"build"

0 commit comments

Comments
 (0)