tonyta / ProjectBernies

71%

master: 54%

LAST BUILD ON BRANCH ArtifactMapper

branch: ArtifactMapper

CHANGE BRANCH

x

Reset

• ArtifactMapper
• Add_Validations
• Add_features_to_artifact
• AddsGeocoderMapping
• AddsGeolocation
• AllResponsive
• AllViews
• ArtListView
• ArtifactView
• Artifact_votes_view_and_routes
• LocationSpec
• NearMeMapView
• PictureEditView
• PostGIS
• Responsive
• ResponsiveGlobal
• TouchUps
• UploaderViews
• adds_controllers
• adds_neighborhoods
• artifact_without_pic_bug
• beautiful_day_in_the_neighborhood
• carrierwave
• cleansJS
• controller_refactoring
• css_fix
• iPhoneResponsive
• lat_long
• maps_for_artifact_view
• master
• meta-data-conditional
• more_rspec
• post_to_open_311
• refactoring_code
• remove_turbolinks
• removes_glyphicons
• strip_to_mvp
• temp_controller
• validations
• votes_migration
• votes_rebased

Merge branch 'ArtifactMapper' of https://github.com/tonyta/ProjectBernies into ArtifactMapper

Conflicts:
	app/assets/javascripts/artifacts.js
	app/assets/stylesheets/custom.css
	app/controllers/artifacts_controller.rb
	app/controllers/pictures_controller.rb