merge develop into regions#4607

Merged

sbesson merged 77 commits intoome:regionsfrom

mtbc:merge-develop-into-regions

Apr 25, 2016

Commits on Feb 29, 2016

Commits on Mar 1, 2016

Modify getFileAnnotationContent to consume new function.
imunro
committed

Commits on Mar 11, 2016

Commits on Mar 12, 2016

Commits on Mar 13, 2016

Commits on Mar 14, 2016

Commits on Mar 15, 2016

Remove Robot 'Test Copy Paste Orphaned Image'. Not supported now
will-moore
committed

Commits on Mar 17, 2016

Disable Cut and Copy of P/D/I/S/P in Tag Tree
will-moore
committed

Commits on Mar 18, 2016

Commits on Mar 23, 2016

jsTree sort plugin handles images and acquisitions (under tags)
will-moore
committed

Commits on Mar 25, 2016

Add test for regex import of nested directory
Colin Blackburn
committed
Use the annotation with the highest id
Colin Blackburn
committed
Add tests to check discriminator for regex templates
Colin Blackburn
committed
Fix bug in Dataset choice for regex import
Colin Blackburn
committed

Commits on Apr 7, 2016

Commits on Apr 8, 2016

Commits on Apr 12, 2016

Address Colin's comments
sbesson
committed

Commits on Apr 13, 2016

Commits on Apr 14, 2016

Commits on Apr 17, 2016

choose server id when logging in
atarkowska
committed

Commits on Apr 18, 2016

Commits on Apr 19, 2016

Commits on Apr 22, 2016

Merge pull request #4593 from mtbc/trac-13197-skiphead-duplicate
jburel
committed

Commits on Apr 25, 2016

Merge remote-tracking branch 'remotes/origin/develop' into HEAD
mtbc
committed