fixing required objects hook, perhaps?
Initial commit of tei_editor integration with the markup editor module.
Removed dsm statement.
Added our own implementation in emicdora of the markup editor.
Removed dsm statements.
Updated the tei_editor path in hook_block_view.
Resolving merge conflicts.
Made some changes as I reviewed the code, small fixes and some cleanup for
documentation in particular the README. When I deployed the code I was suprised
to find it depended on the islandora_critical_edition module. I got the latest
for it and its other dependancies but they appear to be broken at the moment.
Merge pull request #1 from nigelgbanks/7.x-tei-editor

7.x tei editor
Finished with initial import of the editor, and added a loading screen ot the editor.
Updating naming conventions.
Changed doc text.
Completing some work on text image  linking.
Merge branch '7.x' of https://github.com/MorganDawe/emicdora into MorganDawe-7.x
Merge pull request #4 from ajstanley/7.x

changed content model name to avoid conflicts
added solr callback, fixed compare table population
Merge branch '7.x' of github.com:discoverygarden/emicdora into 7.x