Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:collective/collective.upload

  • Loading branch information...
commit 8fd86f126d6808d2a89f5805b6403c38f83f91b6 2 parents f6ed85f + 8c7c43d
@Quimera Quimera authored
View
4 README.txt
@@ -16,6 +16,7 @@ any folderish content type based on Archetypes or Dexterity.
Features
--------
+- Support for Archetypes and Dexterity-based content types
- **Multiple file upload**: Allows to select multiple files at once and upload
them sequentially (simultaneously is not currently enabled)
- **Drag & Drop support**: Allows to upload files by dragging them from your
@@ -66,7 +67,6 @@ We want to implement these features at some point in the future:
browsers supporting the Blob API
- **HTML file upload form fallback**: Shows a standard HTML file upload form
if JavaScript is disabled
-- Support for Archetypes-based content types
- Enable/disable automatic uploads
- Server side image resizing
- Server side file type constraint
@@ -140,7 +140,7 @@ vendor/jquery.getimagedata.min.js
Roadmap
---------------
-* Check if constraints are in place before adding the menu item
+* Check if constraints are in place before adding the menu item.
Mostly Harmless
---------------
View
11 docs/CREDITS.txt
@@ -1,18 +1,17 @@
Share and Enjoy
---------------
-collective.upload would not have been possible without the contribution of the
-following people:
+``collective.upload`` would not have been possible without the contribution of
+the following people:
- Silvestre Huens
- Joaquín Rosales
- Héctor Velarde
- Gonzalo Almeida
-Development sponsored by Open Multimedia.
+Development sponsored by OpenMultimedia.
-collective.upload is an implementation of the `jQuery File Upload`_ plugin for
-Plone.
+``collective.upload`` is an implementation of the `jQuery File Upload`_ plugin
+for Plone.
.. _`jQuery File Upload`: http://blueimp.github.com/jQuery-File-Upload/
-
View
20 docs/HISTORY.txt
@@ -6,6 +6,16 @@ Because you have to know where your towel is.
1.0b3 (unreleased)
^^^^^^^^^^^^^^^^^^
+- Added support for Cross-site file uploads. [quimera]
+
+- Fixed URL generation in the sub menu item. [quimera]
+
+- Fixed compatibility with Chameleon and the JavaScript template. [quimera]
+
+- Refactoring (almost) all dirty JavaScript code. [quimera]
+
+- Updated version of jQuery File Upload. [quimera]
+
- Add deprecation warning message on the IMultipleUpload behavior. [hvelarde]
- Tested compatibility with Plone 4.3. [hvelarde]
@@ -18,16 +28,6 @@ Because you have to know where your towel is.
- Fixed browser layer interface. [hvelarde]
-- Added new version of jquery-file-upload. [quimera]
-
-- Refactoring (almost) all dirty js code. [quimera]
-
-- Fixed compatibility with chameleon and the js template. [quimera]
-
-- Fixed url generation in the sub menu item. [quimera]
-
-- Added support for crossdomain uploads [quimera]
-
1.0b2 (2012-05-16)
^^^^^^^^^^^^^^^^^^
View
7 docs/INSTALL.txt
@@ -16,10 +16,11 @@ To enable this product in a buildout-based installation:
[versions]
plone.app.jquery = 1.7.2
- plone.app.jquerytools = 1.4
+ plone.app.jquerytools = 1.5.1
-3. You may need to extend a five.grok known good set (KGS) to make sure that
- you get the right versions of the packages that make up five.grok::
+3. If you are using Plone 4.1, you may need to extend a five.grok known good
+ set (KGS) to make sure that you get the right versions of the packages that
+ make up five.grok::
[buildout]
...
View
2  docs/LICENSE.txt
@@ -1,4 +1,4 @@
- collective.upload is copyright
+ collective.upload is copyright 2012-2013, OpenMultimedia.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Please sign in to comment.
Something went wrong with that request. Please try again.