Merge branch 'master' into document_transaction
Playing with types
Fixing merge conflict.
reduce the use of $rootScope a bit for docViewerWrapper, and pass type information around with document.annotation_types
Adding cropdowns for enums
Fixing merge conflict
resolve merge conflict from 49a9403ce4f835a7cf685b7e8f1092f591625f8e
more styling
Merge branch 'document_transaction' of https://github.com/sharewave/frontus into document_transaction
minor refactor of the annotation directive
Merge branch 'document_transaction' of github.com:sharewave/frontus into document_transaction
minor cleanup / rename
move the annotation type information inside the annotation (currently controlled by annotation controller, should move to service)
force annotation required if required for transaction
add a hacked boolean type for annotations
more styling
styled the dropdown box
Merge branch 'document_transaction' of https://github.com/sharewave/frontus into document_transaction
add date input type for date dropdown
Merge branch 'document_transaction' of github.com:sharewave/frontus into document_transaction