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: MarkUsProject/Markus
base: 720712d5ff59
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 4be27a14ce21
Choose a head ref
  • 8 commits
  • 7 files changed
  • 2 contributors

Commits on Aug 16, 2012

  1. fix #830

    Mina Almasry committed Aug 16, 2012
    Copy the full SHA
    ae1bdcd View commit details
    Browse the repository at this point in the history
  2. removed annotation hiding code

    Mina Almasry committed Aug 16, 2012
    Copy the full SHA
    91c03ba View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    a3031b2 View commit details
    Browse the repository at this point in the history
  4. added error messages

    Mina Almasry committed Aug 16, 2012
    Copy the full SHA
    8e433f2 View commit details
    Browse the repository at this point in the history
  5. adjust comments

    Mina Almasry committed Aug 16, 2012
    Copy the full SHA
    64e64c9 View commit details
    Browse the repository at this point in the history
  6. added translations

    Mina Almasry committed Aug 16, 2012
    Copy the full SHA
    7333540 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2012

  1. Merge branch 'master' into image-annot

    Conflicts:
    	app/views/results/common/_annotations.js.erb
    Mina Almasry committed Aug 17, 2012
    Copy the full SHA
    ca752ac View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2012

  1. Merge pull request #831 from mina/image-annot

    Image annot
    jerboaa committed Sep 12, 2012
    Copy the full SHA
    4be27a1 View commit details
    Browse the repository at this point in the history