Backend side merged completely. LDAP auth completely ported, API extended to append/remove values from a specific property, and server code improvements
Added _version_ field to solr schema to keep track of last update and avoid concurrency issues
Merge: media assets, css and templates
Merge: backbone app updated
code beautification
fix on content.jade after merge
improvements on setUser and content.jade identation
updated default files for entity in entity tarball
fix on print view for profile
Merge branch 'master' into feature_merge
code beautification and solrManager improvements
added link field
resizeIndex triggers 'left' event to signal a change on the css left property of the #content div. This can be used by the extended code to adapt other elements to it
setting month and year facet fields from a date field. Frontend still doesn't know how to use those fields unless specified in the schema
removed config for testing
merge from internal repo finished: flash instance passed through modules and minor improvements
Merged with internal repo and resolved