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: idleog/annotator.touch.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: development
Choose a base ref
...
head repository: aron/annotator.touch.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 19 files changed
  • 2 contributors

Commits on Jun 15, 2013

  1. Upgrade dependencies 

    - added package package.
- Added missing semicolons in stylesheet.
- Removing package dependency.
    @wyoumans @aron
    wyoumans authored and aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    d9ae45d View commit details
    Browse the repository at this point in the history

  2. Use Annotator.Util for escaping

    @wyoumans @aron
    wyoumans authored and aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    9d39d55 View commit details
    Browse the repository at this point in the history

  3. Upgraded Annotator to the latest build

    @wyoumans @aron
    wyoumans authored and aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    4ba298c View commit details
    Browse the repository at this point in the history

  4. Updated node versions in the Readme

    @wyoumans @aron
    wyoumans authored and aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    7bf8d32 View commit details
    Browse the repository at this point in the history

  5. Now serializing selection ranges

    @wyoumans @aron
    wyoumans authored and aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    45cb6f2 View commit details
    Browse the repository at this point in the history

  6. Add specific dependancies to package.json

    @aron
    aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    6a32749 View commit details
    Browse the repository at this point in the history

  7. Update CSS gradients to use "to bottom" syntax

    @aron
    aron committed Jun 15, 2013
    Configuration menu
    Copy the full SHA
    b09bfbf View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2013

  1. Update Annotator and jQuery to latest versions

    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    999c5d0 View commit details
    Browse the repository at this point in the history

  2. Remove sinon-chai library 

    In favour of just using the standard sinon assertions.
    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    54893cc View commit details
    Browse the repository at this point in the history

  3. Update all tests to use sinon assertions

    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    a8d3a91 View commit details
    Browse the repository at this point in the history

  4. Update touch.coffee to work with latest annotator 

    We now piggy back the Annotator#onAdderClick() method and only append
our own range and quote object when the initial annotation is created.
This works around issues created when the onAdderClick method was
changed to also trigger the "annotationCreated" event.
    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    d67e0f4 View commit details
    Browse the repository at this point in the history

  5. Update package version

    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    7932320 View commit details
    Browse the repository at this point in the history

  6. Swap out the Cakefile for a good ole Makefile 

    This removes the horrible dependancy on node-ffi. The image inliner has
been moved into tools/inliner.coffee.
    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    ac1d4a0 View commit details
    Browse the repository at this point in the history

  7. Tidy up Makefile and fix PHONY typo

    @aron
    aron committed Oct 6, 2013
    Configuration menu
    Copy the full SHA
    9126f69 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2013

  1. Bump package version to 1.1.1

    @aron
    aron committed Oct 20, 2013
    Configuration menu
    Copy the full SHA
    ec01b44 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2015

  1. Update development dependencies

    @aron
    aron committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    75eb6a2 View commit details
    Browse the repository at this point in the history

  2. Update annotator to v1.2.9

    @aron
    aron committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    8332ae9 View commit details
    Browse the repository at this point in the history

  3. Upgrade jQuery to the latest 1.11.x version

    @aron
    aron committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    456efb8 View commit details
    Browse the repository at this point in the history

  4. Update path to the GitHub releases page

    @aron
    aron committed Jan 23, 2015
    Configuration menu
    Copy the full SHA
    49d65e7 View commit details
    Browse the repository at this point in the history
Loading