Changeset [21209c7b11d819c408ee374220b5a08e9dd75e17] by Marnen Laibow-Koser
January 6th, 2015 @ 01:13 AM
Merge branch 'rails-3.2' into 84-rails-4.0
https://github.com/marnen/quorum2/commit/21209c7b11d819c408ee374220...
Committed by Marnen Laibow-Koser
- A acts_as_addressed/.autotest
- A acts_as_addressed/.gitignore
- A acts_as_addressed/.rspec
- A acts_as_addressed/Gemfile
- A acts_as_addressed/LICENSE.txt
- A acts_as_addressed/README.md
- A acts_as_addressed/Rakefile
- A acts_as_addressed/acts_as_addressed.gemspec
- A acts_as_addressed/lib/acts/addressed/address.rb
- A acts_as_addressed/lib/acts/addressed/country.rb
- A acts_as_addressed/lib/acts/addressed/quiet_nil.rb
- A acts_as_addressed/lib/acts/addressed/state.rb
- A acts_as_addressed/lib/acts_as_addressed.rb
- A acts_as_addressed/lib/acts_as_addressed/version.rb
- A acts_as_addressed/spec/acts/addressed/address_spec.rb
- A acts_as_addressed/spec/acts/addressed/country_spec.rb
- A acts_as_addressed/spec/acts/addressed/quiet_nil_spec.rb
- A acts_as_addressed/spec/acts/addressed/state_spec.rb
- A acts_as_addressed/spec/acts_as_addressed_spec.rb
- A acts_as_addressed/spec/blueprints.rb
- A acts_as_addressed/spec/spec_helper.rb
- A app/assets/images/accept.png
- A app/assets/images/add.png
- A app/assets/images/arrow_right.png
- A app/assets/images/attend_maybe.gif
- A app/assets/images/attend_no.png
- A app/assets/images/attend_yes.png
- A app/assets/images/cross.png
- A app/assets/images/date.png
- A app/assets/images/delete.png
- A app/assets/images/exclamation.png
- A app/assets/images/feed-icon-14x14.png
- A app/assets/images/map.png
- A app/assets/images/pdf-icon-16x16.png
- A app/assets/images/pencil.png
- A app/assets/images/progress.gif
- A app/assets/images/rails.png
- A app/assets/images/sources/attend_maybe.svg
- A app/assets/images/sources/attend_no.svg
- A app/assets/images/star.png
- A app/assets/images/tick.png
- A app/assets/javascripts/application.js
- A app/assets/javascripts/clusterer.js
- A app/assets/javascripts/controls.js
- A app/assets/javascripts/dragdrop.js
- A app/assets/javascripts/effects.js
- A app/assets/javascripts/events/index.js
- A app/assets/javascripts/events/map.js
- A app/assets/javascripts/geoRssOverlay.js
- A app/assets/javascripts/lowpro/behaviours/autocompleter.js
- A app/assets/javascripts/lowpro/behaviours/date_selector.js
- A app/assets/javascripts/lowpro/behaviours/draggable.js
- A app/assets/javascripts/lowpro/behaviours/inplace_editor.js
- A app/assets/javascripts/lowpro/lowpro.js
- A app/assets/javascripts/markerGroup.js
- A app/assets/javascripts/prototype.js
- A app/assets/javascripts/rails.js
- A app/assets/javascripts/wms-gs.js
- A app/assets/javascripts/ym4r-gm.js
- A app/assets/stylesheets/_icon.scss
- A app/assets/stylesheets/quorum.scss
- A config/initializers/prawn-rails.rb
- A config/initializers/wrap_parameters.rb
- R config/initializers/action_mailer_patch.rb
- R config/initializers/has_many_patch.rb
- R public/images/accept.png
- R public/images/add.png
- R public/images/attend_maybe.gif
- R public/images/attend_no.png
- R public/images/attend_yes.png
- R public/images/cross.png
- R public/images/date.png
- R public/images/delete.png
- R public/images/exclamation.png
- R public/images/feed-icon-14x14.png
- R public/images/map.png
- R public/images/pdf-icon-16x16.png
- R public/images/pencil.png
- R public/images/progress.gif
- R public/images/rails.png
- R public/images/sources/attend_maybe.svg
- R public/images/sources/attend_no.svg
- R public/images/star.png
- R public/javascripts/application.js
- R public/javascripts/clusterer.js
- R public/javascripts/controls.js
- R public/javascripts/dragdrop.js
- R public/javascripts/effects.js
- R public/javascripts/events/index.js
- R public/javascripts/events/map.js
- R public/javascripts/geoRssOverlay.js
- R public/javascripts/lowpro/behaviours/autocompleter.js
- R public/javascripts/lowpro/behaviours/date_selector.js
- R public/javascripts/lowpro/behaviours/draggable.js
- R public/javascripts/lowpro/behaviours/inplace_editor.js
- R public/javascripts/lowpro/lowpro.js
- R public/javascripts/markerGroup.js
- R public/javascripts/prototype.js
- R public/javascripts/rails.js
- R public/javascripts/wms-gs.js
- R public/javascripts/ym4r-gm.js
- R public/stylesheets/sass/_icon.scss
- R public/stylesheets/sass/quorum.scss
- R vendor/plugins/acts_as_addressed/.autotest
- R vendor/plugins/acts_as_addressed/MIT-LICENSE
- R vendor/plugins/acts_as_addressed/README
- R vendor/plugins/acts_as_addressed/Rakefile
- R vendor/plugins/acts_as_addressed/init.rb
- R vendor/plugins/acts_as_addressed/install.rb
- R vendor/plugins/acts_as_addressed/lib/acts/addressed/address.rb
- R vendor/plugins/acts_as_addressed/lib/acts/addressed/country.rb
- R vendor/plugins/acts_as_addressed/lib/acts/addressed/quiet_nil.rb
- R vendor/plugins/acts_as_addressed/lib/acts/addressed/state.rb
- R vendor/plugins/acts_as_addressed/lib/acts_as_addressed.rb
- R vendor/plugins/acts_as_addressed/spec/acts/addressed/address_spec.rb
- R vendor/plugins/acts_as_addressed/spec/acts/addressed/country_spec.rb
- R vendor/plugins/acts_as_addressed/spec/acts/addressed/quiet_nil_spec.rb
- R vendor/plugins/acts_as_addressed/spec/acts/addressed/state_spec.rb
- R vendor/plugins/acts_as_addressed/spec/acts_as_addressed_spec.rb
- R vendor/plugins/acts_as_addressed/spec/blueprints.rb
- R vendor/plugins/acts_as_addressed/spec/spec.opts
- R vendor/plugins/acts_as_addressed/spec/spec_helper.rb
- R vendor/plugins/acts_as_addressed/tasks/acts_as_addressed_tasks.rake
- R vendor/plugins/acts_as_addressed/uninstall.rb
- R vendor/plugins/haml/init.rb
- R vendor/plugins/html_output/README.textile
- R vendor/plugins/html_output/init.rb
- R vendor/plugins/html_output/lib/html_output.rb
- R vendor/plugins/html_output/test/test.rb
- R vendor/plugins/prawnto/.gitignore
- R vendor/plugins/prawnto/MIT-LICENSE
- R vendor/plugins/prawnto/README
- R vendor/plugins/prawnto/Rakefile
- R vendor/plugins/prawnto/init.rb
- R vendor/plugins/prawnto/lib/prawnto.rb
- R vendor/plugins/prawnto/lib/prawnto/action_controller.rb
- R vendor/plugins/prawnto/lib/prawnto/action_view.rb
- R vendor/plugins/prawnto/lib/prawnto/template_handler/compile_support.rb
- R vendor/plugins/prawnto/lib/prawnto/template_handlers/base.rb
- R vendor/plugins/prawnto/lib/prawnto/template_handlers/dsl.rb
- R vendor/plugins/prawnto/lib/prawnto/template_handlers/raw.rb
- R vendor/plugins/prawnto/tasks/prawnto_tasks.rake
- R vendor/plugins/prawnto/test/action_controller_test.rb
- R vendor/plugins/prawnto/test/base_template_handler_test.rb
- R vendor/plugins/prawnto/test/dsl_template_handler_test.rb
- R vendor/plugins/prawnto/test/raw_template_handler_test.rb
- R vendor/plugins/prawnto/test/template_handler_test_mocks.rb
- R vendor/plugins/rails_upgrade/MIT-LICENSE
- R vendor/plugins/rails_upgrade/README
- R vendor/plugins/rails_upgrade/Rakefile
- R vendor/plugins/rails_upgrade/init.rb
- R vendor/plugins/rails_upgrade/install.rb
- R vendor/plugins/rails_upgrade/lib/application_checker.rb
- R vendor/plugins/rails_upgrade/lib/gemfile_generator.rb
- R vendor/plugins/rails_upgrade/lib/new_configuration_generator.rb
- R vendor/plugins/rails_upgrade/lib/rails_upgrade.rb
- R vendor/plugins/rails_upgrade/lib/routes_upgrader.rb
- R vendor/plugins/rails_upgrade/lib/tasks/rails_upgrade_tasks.rake
- R vendor/plugins/rails_upgrade/test/application_checker_test.rb
- R vendor/plugins/rails_upgrade/test/gemfile_generator_test.rb
- R vendor/plugins/rails_upgrade/test/new_configuration_generator_test.rb
- R vendor/plugins/rails_upgrade/test/routes_upgrader_test.rb
- R vendor/plugins/rails_upgrade/test/test_helper.rb
- R vendor/plugins/rails_upgrade/uninstall.rb
- R vendor/plugins/rspec_autotest/lib/rspec_autotest.rb
- R vendor/plugins/rspec_autotest/tasks/rspec_autotest.rake
- M ".gitignore"
- M Gemfile
- M Gemfile.lock
- M app/controllers/application_controller.rb
- M app/controllers/events_controller.rb
- M app/controllers/users_controller.rb
- M app/models/search.rb
- M app/models/user_mailer.rb
- M app/views/events/_event.html.haml
- M app/views/events/index.html.haml
- M app/views/events/index.pdf.prawn
- M app/views/events/show.html.haml
- M config/application.rb
- M config/deploy-orig.rb
- M config/environments/development.rb
- M config/environments/production.rb
- M config/environments/test.rb
- M config/initializers/app_globals.rb
- M config/initializers/haml.rb
- M lib/acts/geocoded.rb
- M spec/controllers/events_controller_spec.rb
- M spec/controllers/users_controller_spec.rb
- M spec/models/search_spec.rb
- M spec/models/user_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
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>