conflict in template_tags.py solved. I don't know why this could not be merged automatically
Merge branch 'master' of https://github.com/comic/comic-django
fixes #177
Added
initial files for MeVisLab remote rendering integration
Switched to new version remote rendering. Required Nijmegen ANKH test server currently
added fullscreen mode to COMICWebWorkstation tag
Moved css to the right spot,
Improvements to COMICWebWorkstation integration: added small and large screen buttons, added loading animation, fixed going fullscreen before window was loaded, fixed info message style
Removed debug msg
changed port number for rendering server because Alex needed to change it
Fixed error in comicmodels migration 0003 by setting south dependency
Fixed error where migration could not find user 'everyone' by creating this user
fixed another migration error in 0012
Fixed final bug in south migration dependencies. Fixes #170. Migration from scratch now works
added debug message when main project has no pages
Made main project 'comic' into a variable in settings, so there is less hardcoded 'comic' in the code.
Added proper feedback when starting from fresh install: When no project is defined, when no pages are found for main project, now showing helpful links instead of errors.
Tried to stop ckeditor from converting &#37; to { when saving. editor setting seem to have no effect. Leaving this for now
Loading inital data in early south migration now. This makes sure that a
clean install will start with at least a project and a page. Had to do
quite some patching to get south to use the frozen (ORM) version of all
the models instead of the current versions. Needed to install a thirdparty
lib as part of this. The problem was that south calls the django command
'loaddata' to load initial data. When importing this uses the current
version of each model. If a current field is not found in the inital data
it will throw an error. You want loaddata to check agains the models as
they were when you made the initial data. See
http://stackoverflow.com/questions/5472925/django-loading-data-from-fixture-after-backward-migration-loaddata-is-using-mo/5906258#5906258