Merge conflicts, work on creating sites, added processor as a post process call back using detached rake task to process tiles. started work on skeleton for theme, convert to scss, added home page, updated design
Merge conflicts, work on creating sites, added processor as a post process call back using detached rake task to process tiles. started work on skeleton for theme, convert to scss, added home page, updated design
merge conflicts
convert ie.css to scss
mereg conflicts
delete file added by git due to conflict
Add sites and ability to assign maps to more than one site. Created homepage and finished updating the app to user sites and paperclip maps.
tweaks
Set paperclip options
Add mobile meta
Add link to project page
Redirect to default site if site not setup yet
Update background gradient on homepage, swap out text logo for graphic and update throughout, admin improvement to filter maps by site.
Grammar fix on homepage