Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mitchmac/islandora_plupload
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7.x
Choose a base ref
...
head repository: discoverygarden/islandora_plupload
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7.x
Choose a head ref
Able to merge. These branches can be automatically merged.
15 contributors

Commits on Aug 15, 2013

  1. Merge pull request #1 from mitchmac/7.x 

    Check if values array isset & default fid to 0
    @willtp87
    willtp87 committed Aug 15, 2013
    Copy the full SHA
    ac838a8 View commit details

Commits on Aug 23, 2013

  1. Merge pull request #2 from mitchmac/7.x 

    Handle managed_file fields nested in fieldsets
    @willtp87
    willtp87 committed Aug 23, 2013
    Copy the full SHA
    c1664c7 View commit details

Commits on Sep 26, 2013

  1. updated install directions

    @willtp87
    willtp87 committed Sep 26, 2013
    Copy the full SHA
    e72b877 View commit details

  2. typo

    @willtp87
    willtp87 committed Sep 26, 2013
    Copy the full SHA
    e470544 View commit details

  3. Merge pull request #4 from willtp87/7.x 

    updated install directions
    @MorganDawe
    MorganDawe committed Sep 26, 2013
    Copy the full SHA
    4d128fe View commit details

  4. Merge pull request #3 from mitchmac/7.x 

    Enforce a max_file_count of 1
    @MorganDawe
    MorganDawe committed Sep 26, 2013
    Copy the full SHA
    4132acb View commit details

Commits on Oct 29, 2013

  1. pluploader now maintains it's own required field to mark it self as r… 

    …equired.
    @nigelgbanks
    nigelgbanks committed Oct 29, 2013
    Copy the full SHA
    4165bb5 View commit details

Commits on Oct 31, 2013

  1. Removed the hooks and replaced with inline logic, as per suggested.

    @nigelgbanks
    nigelgbanks committed Oct 31, 2013
    Copy the full SHA
    d4a2b54 View commit details

  2. Added documentation for hack and cleaned up a coder warning.

    @nigelgbanks
    nigelgbanks committed Oct 31, 2013
    Copy the full SHA
    2ec187f View commit details

  3. Merge pull request #5 from nigelgbanks/7.x-EMIC-38-make-pluploader-re… 

    …quireable

Fix required upload problem.
    @willtp87
    willtp87 committed Oct 31, 2013
    Copy the full SHA
    24bfb41 View commit details

Commits on Feb 5, 2014

  1. Fixed an issue that prevent form submission if files are not uploaded… 

    … manually.
    root committed Feb 5, 2014
    Copy the full SHA
    b95512d View commit details

  2. Removed experimental code

    @MorganDawe
    MorganDawe committed Feb 5, 2014
    Copy the full SHA
    16a5403 View commit details

Commits on Feb 7, 2014

  1. Merge pull request #6 from MorganDawe/7.x 

    Pluploader fix
    qadan committed Feb 7, 2014
    Copy the full SHA
    79026bf View commit details

Commits on Mar 28, 2014

  1. Make pupload work with #tree.

    @jordandukart
    jordandukart committed Mar 28, 2014
    Copy the full SHA
    ec9a3f8 View commit details

Commits on Mar 31, 2014

  1. Changes based upon code review.

    @jordandukart
    jordandukart committed Mar 31, 2014
    Copy the full SHA
    fce6202 View commit details

  2. Merge branch '7.x-tree-fixes' of github.com:jordandukart/islandora_pl… 

    …upload into 7.x-tree-fixes

Conflicts:
	islandora_plupload.module
    @jordandukart
    jordandukart committed Mar 31, 2014
    Copy the full SHA
    b346ec4 View commit details

Commits on Apr 1, 2014

  1. Merge pull request #8 from jordandukart/7.x-tree-fixes 

    Make pupload work with #tree.
    @adam-vessey
    adam-vessey committed Apr 1, 2014
    Copy the full SHA
    4a0b4f3 View commit details

Commits on Apr 9, 2014

  1. made selector more selective

    Alan Stanley committed Apr 9, 2014
    Copy the full SHA
    05bf2a5 View commit details

Commits on Apr 10, 2014

  1. Merge pull request #9 from ajstanley/7.x 

    made selector more selective
    @daniel-dgi
    daniel-dgi committed Apr 10, 2014
    Copy the full SHA
    cdf1a4a View commit details

Commits on Apr 14, 2014

  1. repackeged

    Alan Stanley committed Apr 14, 2014
    Copy the full SHA
    4657951 View commit details

  2. repackaged

    Alan Stanley committed Apr 14, 2014
    Copy the full SHA
    3d24a6b View commit details

Commits on Apr 15, 2014

  1. updated path

    Alan Stanley committed Apr 15, 2014
    Copy the full SHA
    df9ec3f View commit details

Commits on Apr 17, 2014

  1. Merge pull request #10 from ajstanley/7.x 

    repackaged
    @adam-vessey
    adam-vessey committed Apr 17, 2014
    Copy the full SHA
    c58e529 View commit details

Commits on Sep 15, 2014

  1. Add a flag to allow the alter to be skipped. 

    ...  Makes me sad to have to do, but a better way, I couldn't really see...
    @adam-vessey
    adam-vessey committed Sep 15, 2014
    Copy the full SHA
    0ad7528 View commit details

Commits on Sep 16, 2014

  1. Add blurb about new flag to the README.

    @adam-vessey
    adam-vessey committed Sep 16, 2014
    Copy the full SHA
    ab4a3df View commit details

Commits on Sep 17, 2014

  1. Merge pull request #11 from adam-vessey/7.x-LIB-14 

    Add a flag to allow the alter to be skipped.
    @jordandukart
    jordandukart committed Sep 17, 2014
    Copy the full SHA
    d5ac42d View commit details

Commits on Dec 12, 2014

  1. This change is for when a user submits the form without first uploadi… 

    …ng the

files.

In particular when using more than one plupload element in the form, although
it did not work with just a single plupload previously.
    @nigelgbanks
    nigelgbanks committed Dec 12, 2014
    Copy the full SHA
    3d3714c View commit details

Commits on Dec 16, 2014

  1. Turns out the problem and the work around solution stemmed from the S… 

    …pinner in

Islandora.

It prevents pluploads default behaviour of clicking on the submit button to
trigger a submission after the uploads have finished.

So if we no longer provide a default submit button the plupload module will
default to triggering the submission via the form itself.
    @nigelgbanks
    nigelgbanks committed Dec 16, 2014
    Copy the full SHA
    eab3b97 View commit details

Commits on Dec 17, 2014

  1. Added back in, as otherwise the first button will be use which result… 

    …s in going backward on multipaged forms.
    @nigelgbanks
    nigelgbanks committed Dec 17, 2014
    Copy the full SHA
    bc331ae View commit details

Commits on Jan 6, 2015

  1. Merge pull request #12 from nigelgbanks/7.x-allow-multiple-uploaders-… 

    …to-upload-after-submission

This change is for when a user submits the form without first uploading ...
    @willtp87
    willtp87 committed Jan 6, 2015
    Copy the full SHA
    6bd76f8 View commit details

Commits on Jan 8, 2016

  1. Force insert image/jp2 mimetype into supported plupload mimeTypes var… 

    …iable to allow for jp2 extension restriction when using plupload field.
    @matthewperry
    matthewperry committed Jan 8, 2016
    Copy the full SHA
    2a8cc51 View commit details

  2. Merge pull request #13 from matthewperry/7.x-inject-jp2-mimetype-support 

    Force insert image/jp2 mimetype into supported plupload mimeTypes var…
    Daniel Aitken committed Jan 8, 2016
    Copy the full SHA
    29c2232 View commit details

Commits on Aug 2, 2017

  1. Make spinners spin again.

    @jonathangreen
    jonathangreen committed Aug 2, 2017
    Copy the full SHA
    933a917 View commit details

Commits on Aug 3, 2017

  1. Merge pull request #14 from jonathangreen/spinner 

    Make spinners spin again.
    @willtp87
    willtp87 authored Aug 3, 2017
    Copy the full SHA
    2bd3408 View commit details

Commits on Aug 14, 2017

  1. Widen selector used so that importer auto-submits as well.

    @jonathangreen
    jonathangreen committed Aug 14, 2017
    Copy the full SHA
    13661f1 View commit details

Commits on Aug 15, 2017

  1. Merge pull request #15 from jonathangreen/importer 

    Widen selector used
    @willtp87
    willtp87 authored Aug 15, 2017
    Copy the full SHA
    a58cee8 View commit details

Commits on Sep 28, 2018

  1. supporting file validation

    @willtp87
    willtp87 committed Sep 28, 2018
    Copy the full SHA
    ca055e9 View commit details

  2. coder

    @willtp87
    willtp87 committed Sep 28, 2018
    Copy the full SHA
    66c8054 View commit details

  3. add license

    @willtp87
    willtp87 committed Sep 28, 2018
    Copy the full SHA
    9d9bd2a View commit details

  4. Signaling all files need re-submit

    @willtp87
    willtp87 committed Sep 28, 2018
    Copy the full SHA
    10607b3 View commit details

Commits on Oct 1, 2018

  1. only setting one error, https://www.drupal.org/project/drupal/issues/… 

    …203508
    @willtp87
    willtp87 committed Oct 1, 2018
    Copy the full SHA
    4bb9298 View commit details

Commits on Oct 2, 2018

  1. Breaking file validation out for re-use by multifile uploads, allowin… 

    …g upload validators
    @willtp87
    willtp87 committed Oct 2, 2018
    Copy the full SHA
    8bdcfb3 View commit details

Commits on Oct 3, 2018

  1. need some spoofing for extension validation

    @willtp87
    willtp87 committed Oct 3, 2018
    Copy the full SHA
    fd2f865 View commit details

  2. Merge pull request #16 from willtp87/7.x.validation 

    7.x.validation
    @adam-vessey
    adam-vessey authored Oct 3, 2018
    Copy the full SHA
    dbb7df3 View commit details

Commits on Jan 10, 2019

  1. Remove plupload form alter from default thumbs admin

    @IAMlKeno
    IAMlKeno committed Jan 10, 2019
    Copy the full SHA
    7d424aa View commit details

Commits on Jan 11, 2019

  1. Merge pull request #17 from IAMlKeno/7.x-FD-6982 

    Remove plupload form alter from default thumbs admin
    @mghughes
    mghughes authored Jan 11, 2019
    Copy the full SHA
    ae1b089 View commit details

Commits on Jan 16, 2019

  1. Added extensions for args when calling file_validate_extensions

    @IAMlKeno
    IAMlKeno committed Jan 16, 2019
    Copy the full SHA
    297ed73 View commit details

Commits on Jan 17, 2019

  1. Added function to dynamically build allowable exts. list

    @IAMlKeno
    IAMlKeno committed Jan 17, 2019
    Copy the full SHA
    d24ce21 View commit details

  2. Update coding standards, remove unused foreach

    @IAMlKeno
    IAMlKeno committed Jan 17, 2019
    Copy the full SHA
    eede44e View commit details

Commits on Jan 18, 2019

  1. Update to display appropriate exts for DS replace form

    @IAMlKeno
    IAMlKeno committed Jan 18, 2019
    Copy the full SHA
    b45a7d2 View commit details
Showing with 851 additions and 50 deletions.
  1. +674 −0 LICENSE.txt
  2. +9 −3 README.md
  3. +1 −1 islandora_plupload.info
  4. +114 −23 islandora_plupload.module
  5. +53 −23 js/element.js
Loading