fix jquery conflict
Merge branch 'ml-realtime' of https://github.com/kareemf/govsIsle into ml-realtime
Renamed filter folder to filters. Added new truncate filter which is like limitTo with more options (including ellipses). Map - marker descriptions are being truncated. Grunt minification does all filters, not just "sharedFilters"
temporary fix to the map right click event
Merge branch 'ml-realtime' of https://github.com/kareemf/govsIsle into ml-realtime
updated package.json to require mongoose >= 3.8.9, which supports mongo 2.6 full text search. updated Event, Alert, and Amenity models to a multi-key text index for description and name fields
Working events search endpoint method.
Added search endpoint methods for Alerts and Amenities
Merge branch 'search' into ml-realtime
Merge branch 'ml-realtime' of https://github.com/kareemf/govsIsle into ml-realtime
completed yahoo weather api integration in to the app and minor layout update
Merge branch 'ml-realtime' of https://github.com/kareemf/govsIsle into ml-realtime
livereload...
Removed black bar that was extending across the screen on entity type selection
Added angular-dragdrop as a bower dependency. Loading it + jquery ui dependency index.html. Added as required module in app.js
Added ability to drag forms for new entities
Added ability to cancel a marker before selecting a typw
Fixed issues preventing admin interface from adding/editing content. Merged admin interface into public overlay interface.
Existing entity forms are now draggable.
Merge branch 'admin' into ml-realtime