Changeset [5a52580ef196f0eca1b23edb9ddb3d33ce846333] by Marnen Laibow-Koser

August 2nd, 2013 @ 10:29 PM

Merge branch '82-remove-ym4r' into 86-upgrade-or-replace-spatial-adapter

Conflicts:
Gemfile Gemfile.lock https://github.com/marnen/quorum2/commit/5a52580ef196f0eca1b23edb9d...

Committed by Marnen Laibow-Koser

  • A features/step_definitions/comment_steps.rb
  • A features/support/geocoder.rb
  • A lib/acts/geocoded.rb
  • A spec/lib/acts/geocoded_spec.rb
  • A spec/support/geocoder.rb
  • A spec/support/geocoder_helpers.rb
  • R lib/geocoding_utilities.rb
  • R vendor/plugins/ym4r_gm/README
  • 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/ym4r_gm.rb
  • R vendor/plugins/ym4r_gm/rakefile.rb
  • R vendor/plugins/ym4r_gm/tasks/gm_tasks.rake
  • R vendor/plugins/ym4r_gm/test/gm_test.rb
  • M Gemfile
  • M Gemfile.lock
  • M app/helpers/events_helper.rb
  • M app/models/event.rb
  • M app/models/user.rb
  • M app/views/layouts/_head.html.haml
  • M app/views/layouts/application.html.haml
  • M config/initializers/app_globals.rb
  • M features/calendars/administer_calendars.feature
  • M features/manage_subscriptions.feature
  • M features/step_definitions/calendar_steps.rb
  • M features/support/fetch_helpers.rb
  • M spec/controllers/events_controller_spec.rb
  • M spec/helpers/events_helper_spec.rb
  • M spec/models/event_spec.rb
  • M spec/models/user_spec.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

<p>This is the issue tracker for the Quorum calendar system. Also see our <a href="http://github.com/marnen/quorum2">Github repository</a> and our <a href="http://quorum2.sourceforge.net">project website</a>.</p>
<p>Please tag bug reports with <strong>bug</strong> and feature requests with <strong>feature</strong>. Use additional descriptive tags as necessary.</p>

Shared Ticket Bins