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: cloudinary/cloudinary_java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: AssuredLabor/cloudinary_java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 0 files changed
  • 3 contributors

Commits on Sep 24, 2013

  1. Extracted upload tagParams and upload url functionality into their fu…

    …nctions, this will facilitate frameworks like Angular fetching the server-side params
    jbcpollak authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    89e5d1c View commit details
    Browse the repository at this point in the history
  2. Updated so we don't escapeHTML unless necessary for the server side. …

    …This allows the client-side to receive a JS hash / object directly. This is useful, depending on how the input is rendered.
    jbcpollak authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    0319220 View commit details
    Browse the repository at this point in the history
  3. Escape all public_ids including non-http ones.

    TalLevAmi authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    b77b10e View commit details
    Browse the repository at this point in the history
  4. Rename prepareUploadTagParams to uploadTagParams

    TalLevAmi authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    d1e3417 View commit details
    Browse the repository at this point in the history
  5. [maven-release-plugin] prepare release cloudinary-parent-1.0.6

    TalLevAmi authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    2e22b82 View commit details
    Browse the repository at this point in the history
  6. [maven-release-plugin] prepare for next development iteration

    TalLevAmi authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    49bd93c View commit details
    Browse the repository at this point in the history
  7. Fix handling of boolean parameters on upload

    TalLevAmi authored and Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    f39dea5 View commit details
    Browse the repository at this point in the history
  8. add transformation attribute to cloudinary upload tag

    Max Miracolo committed Sep 24, 2013
    Configuration menu
    Copy the full SHA
    5320724 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e57a09f View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2015

  1. Bring our branch up to Cloudinary 1.0.9 standards.

    Merge commit '2724fd1b7d30ed452bbc098a81c967fdd5c505b8'
    
    * commit '2724fd1b7d30ed452bbc098a81c967fdd5c505b8': (29 commits)
      [maven-release-plugin] prepare release cloudinary-parent-1.0.9
      remove delete_all from tests. fix face coordinates in explicit
      add user agent. fix api test
      refactor Map encoding for upload
      Update README.md
      support multiple face coordinates in upload and explicit. optionaly use Coordinates as a wrapper of multiple rectangles
      add support for overwrite in taglib
      add support for overwrite boolean in upload
      support signed urls
      delete all + cursors, tag and context flags in lists, list by public ids, add support in upload for: face_coordinates, alowed_formats, context
      change dependency to published 1.0.8 and change installation instructions accordingly
      [maven-release-plugin] prepare for next development iteration
      [maven-release-plugin] prepare release cloudinary-parent-1.0.8
      Fix implementation of SmartUrlEncoder in case of non-ascii characters
      fix callback when servlet is not at root
      better handling of raw files
      add subsections in README. Add this to memeber assignments
      move most of stored file logic to core. support stored file in url and url and image tags. add a readme to the sample project
      add support for named transformations as tag attribute
      add support for local secure (and implicit from request)  and cdn_subdomain
      ...
    
    Conflicts:
    	cloudinary-taglib/src/main/java/com/cloudinary/taglib/CloudinaryUploadTag.java
    	cloudinary-taglib/src/main/resources/META-INF/cloudinary.tld
    jbcpollak committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    a34146d View commit details
    Browse the repository at this point in the history
  2. merged up to 1.0.14

    jbcpollak committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    6fea60a View commit details
    Browse the repository at this point in the history
Loading