Changeset [accd4cc9a26689f4589e4ee780a1f6943079f5fd] by Marnen Laibow-Koser
Revision accd4cc9a26689f4589e4ee780a1f6943079f5fd,
committed by Marnen Laibow-Koser
· August 5th, 2013 @ 12:55 PM
Merge branch 'master' into 55-rails-3.1. NOT ALL TESTS PASSING. [#55]
Conflicts:
Gemfile Gemfile.lock config/initializers/app_globals.rb
vendor/plugins/ym4r_gm/gmaps_api_key.yml.sample
vendor/plugins/ym4r_gm/init.rb
vendor/plugins/ym4r_gm/javascript/markerGroup.js
vendor/plugins/ym4r_gm/javascript/ym4r-gm.js
vendor/plugins/ym4r_gm/lib/gm_plugin/control.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/geocoding.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/helper.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/key.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/layer.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/map.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/mapping.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/overlay.rb
vendor/plugins/ym4r_gm/lib/gm_plugin/point.rb
vendor/plugins/ym4r_gm/lib/tasks/gm_tasks.rake
vendor/plugins/ym4r_gm/lib/ym4r_gm.rb
vendor/plugins/ym4r_gm/test/gm_test.rb
https://github.com/marnen/quorum2/commit/accd4cc9a26689f4589e4ee780...
77 changed files
-
A
.ruby-gemset -
A
.ruby-version -
A
app/helpers/gmaps_helper.rb -
A
config.ru -
A
db/migrate/20130803025446_change_geometry_columns_to_new_format.rb -
A
features/step_definitions/comment_steps.rb -
A
features/support/geocoder.rb -
A
lib/acts/geocoded.rb -
A
spec/helpers/gmaps_helper_spec.rb -
A
spec/lib/acts/geocoded_spec.rb -
A
spec/support/geocoder.rb -
A
spec/support/geocoder_helpers.rb -
R
.rvmrc -
R
lib/geocoding_utilities.rb -
R
lib/tasks/databases.rake -
R
lib/tasks/rspec.rake -
R
vendor/plugins/ym4r_gm/gmaps_api_key.yml.sample -
R
vendor/plugins/ym4r_gm/init.rb -
R
vendor/plugins/ym4r_gm/install.rb -
R
vendor/plugins/ym4r_gm/javascript/clusterer.js -
R
vendor/plugins/ym4r_gm/javascript/geoRssOverlay.js -
R
vendor/plugins/ym4r_gm/javascript/markerGroup.js -
R
vendor/plugins/ym4r_gm/javascript/wms-gs.js -
R
vendor/plugins/ym4r_gm/javascript/ym4r-gm.js -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/control.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/geocoding.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/helper.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/key.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/layer.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/map.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/mapping.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/overlay.rb -
R
vendor/plugins/ym4r_gm/lib/gm_plugin/point.rb -
R
vendor/plugins/ym4r_gm/lib/tasks/gm_tasks.rake -
R
vendor/plugins/ym4r_gm/lib/ym4r_gm.rb -
R
vendor/plugins/ym4r_gm/rakefile.rb -
R
vendor/plugins/ym4r_gm/test/gm_test.rb -
M
CHANGELOG.md -
M
Gemfile -
M
Gemfile.lock -
M
app/controllers/events_controller.rb -
M
app/helpers/events_helper.rb -
M
app/models/event.rb -
M
app/models/user.rb -
M
app/views/events/map.html.haml -
M
app/views/layouts/_head.html.haml -
M
app/views/layouts/application.html.haml -
M
config/database-orig.yml -
M
config/deploy-orig.rb -
M
config/initializers/app_globals.rb -
M
db/migrate/20090508200432_restore_srid.rb -
M
db/schema.rb -
M
features/calendars/administer_calendars.feature -
M
features/events/event_map.feature -
M
features/manage_subscriptions.feature -
M
features/step_definitions/calendar_steps.rb -
M
features/step_definitions/event_steps.rb -
M
features/step_definitions/user_steps.rb -
M
features/support/fetch_helpers.rb -
M
public/javascripts/events/map.js -
M
public/stylesheets/sass/quorum.scss -
M
spec/controllers/application_controller_spec.rb -
M
spec/controllers/events_controller_spec.rb -
M
spec/helpers/events_helper_spec.rb -
M
spec/models/calendar_spec.rb -
M
spec/models/commitment_spec.rb -
M
spec/models/event_spec.rb -
M
spec/models/permission_spec.rb -
M
spec/models/user_spec.rb -
M
spec/spec_helper.rb -
M
spec/views/calendars/users.html.haml_spec.rb -
M
spec/views/events/_attendance.html.haml_spec.rb -
M
spec/views/events/_event.html.haml_spec.rb -
M
spec/views/events/ical.ics.erb_spec.rb -
M
spec/views/events/index.html.haml_spec.rb -
M
spec/views/events/new.html.haml_spec.rb -
M
spec/views/events/show.html.haml_spec.rb