Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit c7ed6e6

Browse files
authored
Merge branch 'master' into feature/flexible-upload-support
2 parents e81d180 + e6ae625 commit c7ed6e6

File tree

13 files changed

+22
-20
lines changed

13 files changed

+22
-20
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ unit-test-dir = $(test-dir)/unit
2222

2323
export-file = $(js-src-dir)/export.js
2424

25-
preamble = "// Fine Uploader $(version) - (c) 2013-present Widen Enterprises, Inc. MIT licensed. http://fineuploader.com"
25+
preamble = "// Fine Uploader $(version) - MIT licensed. http://fineuploader.com"
2626

2727
cryptojs-files = \
2828
$(js-3rdparty-src-dir)/crypto-js/core.js \

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,14 @@ There are absolutely no other required external dependencies. For more informati
3131

3232
## Contributing
3333

34-
Fine Uploader and all other projects in this organization thrive thanks to donations by Widen (the project's sponsor)
35-
and support by developers in the community. If you'd like to help and keep this project strong and relevant, you have several options.
34+
If you'd like to help and keep this project strong and relevant, you have several options.
35+
36+
37+
### Help us pay the bills
38+
39+
Fine Uploader is currently looking for a sponsor to pay the AWS bills (which have recently lapsed).
40+
These add up to about $40/month. Please open an issue if you are interesting in becoming a sponsor.
41+
We will happily list you as sponsor on the site and README.
3642

3743

3844
### File a bug report

client/js/upload-handler/xhr.upload.handler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ qq.XhrUploadHandler = function(spec) {
259259
cachedChunks = this._getFileState(id).temp.cachedChunks,
260260

261261
// To work around a Webkit GC bug, we must keep each chunk `Blob` in scope until we are done with it.
262-
// See https://github.com/Widen/fine-uploader/issues/937#issuecomment-41418760
262+
// See https://github.com/FineUploader/fine-uploader/issues/937#issuecomment-41418760
263263
blob = cachedChunks[chunkIndex] || qq.sliceBlob(fileOrBlob, startBytes, endBytes);
264264

265265
cachedChunks[chunkIndex] = blob;

client/js/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/*global qq */
2-
qq.version = "5.16.0-alpha.16";
2+
qq.version = "5.16.0-beta.0";

docs/_templates/footer.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
<footer>
2-
<p>Fine Uploader - &copy; 2013-present, <a href="http://www.widen.com/">Widen Enterprises, Inc.</a>.</p>
3-
</footer>
4-

docs/_templates/macros/github.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% macro issue(num) -%}
2-
<a href="https://github.com/Widen/fine-uploader/issues/{{ num }}">#{{ num }}</a>
2+
<a href="https://github.com/FineUploader/fine-uploader/issues/{{ num }}">#{{ num }}</a>
33
{%- endmacro %}

docs/api/options.jmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ mode you are in and keep that in mind when determining the meaning of a particul
3535

3636
{{ api_option("autoUpload", "autoUpload", "Set to `false` if you want to be able to upload queued items later by calling the [`uploadStoredFiles()` method](methods.html#uploadStoredFiles).", "Boolean", "true") }}
3737

38-
{{ api_option("button", "button", "Specify an element to use as the 'select files' button. [Cannot be a `<button>`](https://github.com/Widen/fine-uploader/issues/33).", "HTMLElement", "null") }}
38+
{{ api_option("button", "button", "Specify an element to use as the 'select files' button. [Cannot be a `<button>`](https://github.com/FineUploader/fine-uploader/issues/33).", "HTMLElement", "null") }}
3939

4040
{{ api_option("debug", "debug", "This will result in log messages being written to the [`window.console`](https://developer.mozilla.org/en-USDOM/console.log) object", "Boolean", "false") }}
4141

docs/browser-support.jmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ Note: Any features not listed here are supported in all browsers.
352352
</tbody>
353353
</table>
354354

355-
<small><a style="font-size: 24px" name="ios-multiple">*</a> - Some iOS browsers are unable to upload multiple files when video files are allowed to be uploaded due to a long-standing iOS bug. See case <a href="https://github.com/Widen/fine-uploader/issues/990">#990</a> on our bug tracker for more details.</small>
355+
<small><a style="font-size: 24px" name="ios-multiple">*</a> - Some iOS browsers are unable to upload multiple files when video files are allowed to be uploaded due to a long-standing iOS bug. See case <a href="https://github.com/FineUploader/fine-uploader/issues/990">#990</a> on our bug tracker for more details.</small>
356356

357357

358358
### Upload size Limitations

docs/endpoint_handlers/amazon-s3.jmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Using the direct-to-S3 uploader module means that most of the server-side work required to parse upload requests is
1616
handled by Amazon for you. However, there is some minimal communication required between Fine Uploader and your local
1717
server. This document will outline both required and optional server-side tasks. Note that, at the writing of this
18-
document, Fine Uploader developers have provided fully functional [server-side examples](https://github.com/Widen/fine-uploader-server)
18+
document, Fine Uploader developers have provided fully functional [server-side examples](https://github.com/FineUploader/fine-uploader-server)
1919
in PHP, node.js, Python, and Java. Other examples will be created in the future.
2020

2121
{{ alert(

docs/endpoint_handlers/azure.jmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ to this thumbnail in your response to the `uploadSuccess` request via a `thumbna
120120
The URL may be cross-origin as well. See the [previews/thumbnails feature page][thumbnails]
121121
for more information on this feature.
122122

123-
[csharp]: https://github.com/Widen/fine-uploader-server/tree/master/C%23/azure
123+
[csharp]: https://github.com/FineUploader/fine-uploader-server/tree/master/C%23/azure
124124
[azurecors]: http://msdn.microsoft.com/en-us/library/windowsazure/dn535601.aspx
125125
[403]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4
126126
[completeevent]: ../api/events.html#complete

docs/faq.jmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
**A**: Android doesn't officially support the multiple attribute on file input elements. I believe
1414
some builds of Android unofficially supported this, but I can't recall which specific versions.
15-
See case [#840](https://github.com/Widen/fine-uploader/issues/840) for more details.
15+
See case [#840](https://github.com/FineUploader/fine-uploader/issues/840) for more details.
1616

1717
<br/>
1818
**Q**: I'm using core mode, but I don't want to write my own code to handle dropped files and folders. Can
@@ -69,7 +69,7 @@ in Chrome, Safari, & Opera after the last byte has been sent but the server has
6969

7070
**A:** The implementation of the onProgress notification that tells us the status of the bytes sent to the server varies from browser to browser, unfortunately.
7171
Webkit browsers have elected to follow the "spirit" of the W3C spec, while Firefox, and (I believe) IE10, obey the spec in the most strict sense. I have discussed
72-
this in some detail [in the "processing" status message feature case](https://github.com/Widen/fine-uploader/issues/404#issuecomment-10124160).
72+
this in some detail [in the "processing" status message feature case](https://github.com/FineUploader/fine-uploader/issues/404#issuecomment-10124160).
7373

7474
<br/>
7575
**Q:** When chunking and multipart encoded are both enabled, why must I determine the original file's name by parsing the qqfilename parameter?

docs/index.jmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ to the API documentation section.
6262
* [Traditional Server](endpoint_handlers/traditional.html) - For upload servers that you control and build.
6363
* [Amazon S3](endpoint_handlers/amazon-s3.html) - For uploads directly to S3 from the browser.
6464
* [Azure Blob Storage](endpoint_handlers/azure.html) - For uploads directly to Azure from the browser.
65-
* [Examples](https://github.com/Widen/fine-uploader-server) - GitHub repo of server-side examples to handle all types of Fine Uploader requests.
65+
* [Examples](https://github.com/FineUploader/fine-uploader-server) - GitHub repo of server-side examples to handle all types of Fine Uploader requests.
6666

6767

6868
### Additional Information
@@ -78,7 +78,7 @@ to the API documentation section.
7878
* [Official Site](http://fineuploader.com)
7979
* [Blog](http://blog.fineuploader.com/)
8080
* [Support](http://fineuploader.com/support)
81-
* [GitHub repository](https://github.com/Widen/fine-uploader)
81+
* [GitHub repository](https://github.com/FineUploader/fine-uploader)
8282

8383
{% endmarkdown %}
8484
{% endblock %}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"title": "Fine Uploader",
44
"main": "lib/traditional.js",
55
"types" : "typescript/fine-uploader.d.ts",
6-
"version": "5.16.0-alpha.16",
6+
"version": "5.16.0-beta.0",
77
"description": "Multiple file upload plugin with progress-bar, drag-and-drop, direct-to-S3 & Azure uploading, client-side image scaling, preview generation, form support, chunking, auto-resume, and tons of other features.",
88
"keywords": [
99
"amazon",
@@ -35,7 +35,7 @@
3535
"type": "git",
3636
"url": "git://github.com/FineUploader/fine-uploader.git"
3737
},
38-
"author": "Widen Enterprises, Inc.",
38+
"author": "Ray Nicholus",
3939
"contributors": [
4040
{
4141
"name": "Ray Nicholus",

0 commit comments

Comments
 (0)