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: aron/annotator.readmill.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.readmill.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gh-pages
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 14, 2011

  1. Added an index page for the GitHub pages

    @aron
    aron committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    4eb0de2 View commit details
    Browse the repository at this point in the history

  2. Fixed the authEndpoint config option

    @aron
    aron committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    c959d47 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2011

  1. Merge branch 'prototype' into gh-pages

    @aron
    aron committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    fcb3278 View commit details
    Browse the repository at this point in the history

  2. Updated index.html to use the new example.html

    @aron
    aron committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    4069a0c View commit details
    Browse the repository at this point in the history

  3. Adding annotator.readmill.js

    @aron
    aron committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    061e01d View commit details
    Browse the repository at this point in the history

  4. Re-updated the proxy and callback endpoints

    @aron
    aron committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    a93b1b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2012

  1. Merge branch 'development' into gh-pages

    @aron
    aron committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    e3f6b8f View commit details
    Browse the repository at this point in the history

  2. Replaced annotator.readmill.js with minified version

    @aron
    aron committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    2b35e13 View commit details
    Browse the repository at this point in the history

  3. Updated index.html to use new minified plugin

    @aron
    aron committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    45a1897 View commit details
    Browse the repository at this point in the history

  4. Updated callbackUrl option

    @aron
    aron committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    8d72112 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development'

    @aron
    aron committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    2313a2a View commit details
    Browse the repository at this point in the history

  6. Adding the test suite html to gh-pages

    @aron
    aron committed Jan 6, 2012
    Configuration menu
    Copy the full SHA
    16225c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2012

  1. Fixed compilation issues in minified script

    @aron
    aron committed Jan 17, 2012
    Configuration menu
    Copy the full SHA
    1f56125 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2012

  1. Merge branch 'development'

    @aron
    aron committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    6b19f57 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into gh-pages 

    Conflicts:
	test/index.html
    @aron
    aron committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    55f9316 View commit details
    Browse the repository at this point in the history

  3. Updated index.html to use the latest code

    @aron
    aron committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    c28bf54 View commit details
    Browse the repository at this point in the history

  4. Added compiled pkg files

    @aron
    aron committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    8bc4b14 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. Update Readmill plugin to v0.2.1

    @aron
    aron committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    6caed4c View commit details
    Browse the repository at this point in the history
Loading