Changeset [17cdab9b8d715d202eaf2de23853a7bd4847592b] by Marnen Laibow-Koser
September 1st, 2011 @ 09:41 PM
Merge branch 'lh53-bundler'
https://github.com/marnen/quorum2/commit/17cdab9b8d715d202eaf2de238...
Committed by Marnen Laibow-Koser
- A config/environments/cucumber.rb
- A config/gemloader.rb
- A config/preinitializer.rb
- A features/step_definitions/extra_web_steps.rb
- A features/support/additional_cucumber_setup.rb
- A public/stylesheets/sass/quorum.scss
- R config/geminstaller.yml
- R public/stylesheets/sass/quorum.sass
- R vendor/gems/haml-2.1.0/FAQ
- R vendor/gems/haml-2.1.0/MIT-LICENSE
- R vendor/gems/haml-2.1.0/README.rdoc
- R vendor/gems/haml-2.1.0/REVISION
- R vendor/gems/haml-2.1.0/Rakefile
- R vendor/gems/haml-2.1.0/VERSION
- R vendor/gems/haml-2.1.0/bin/css2sass
- R vendor/gems/haml-2.1.0/bin/haml
- R vendor/gems/haml-2.1.0/bin/html2haml
- R vendor/gems/haml-2.1.0/bin/sass
- R vendor/gems/haml-2.1.0/init.rb
- R vendor/gems/haml-2.1.0/lib/haml.rb
- R vendor/gems/haml-2.1.0/lib/haml/buffer.rb
- R vendor/gems/haml-2.1.0/lib/haml/engine.rb
- R vendor/gems/haml-2.1.0/lib/haml/error.rb
- R vendor/gems/haml-2.1.0/lib/haml/exec.rb
- R vendor/gems/haml-2.1.0/lib/haml/filters.rb
- R vendor/gems/haml-2.1.0/lib/haml/helpers.rb
- R vendor/gems/haml-2.1.0/lib/haml/helpers/action_view_extensions.rb
- R vendor/gems/haml-2.1.0/lib/haml/helpers/action_view_mods.rb
- R vendor/gems/haml-2.1.0/lib/haml/html.rb
- R vendor/gems/haml-2.1.0/lib/haml/precompiler.rb
- R vendor/gems/haml-2.1.0/lib/haml/shared.rb
- R vendor/gems/haml-2.1.0/lib/haml/template.rb
- R vendor/gems/haml-2.1.0/lib/haml/template/patch.rb
- R vendor/gems/haml-2.1.0/lib/haml/template/plugin.rb
- R vendor/gems/haml-2.1.0/lib/haml/util.rb
- R vendor/gems/haml-2.1.0/lib/sass.rb
- R vendor/gems/haml-2.1.0/lib/sass/css.rb
- R vendor/gems/haml-2.1.0/lib/sass/engine.rb
- R vendor/gems/haml-2.1.0/lib/sass/environment.rb
- R vendor/gems/haml-2.1.0/lib/sass/error.rb
- R vendor/gems/haml-2.1.0/lib/sass/plugin.rb
- R vendor/gems/haml-2.1.0/lib/sass/plugin/merb.rb
- R vendor/gems/haml-2.1.0/lib/sass/plugin/rails.rb
- R vendor/gems/haml-2.1.0/lib/sass/repl.rb
- R vendor/gems/haml-2.1.0/lib/sass/script.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/bool.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/color.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/funcall.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/functions.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/lexer.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/literal.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/number.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/operation.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/parser.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/string.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/unary_operation.rb
- R vendor/gems/haml-2.1.0/lib/sass/script/variable.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/attr_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/comment_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/directive_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/file_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/for_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/if_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/mixin_def_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/mixin_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/rule_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/variable_node.rb
- R vendor/gems/haml-2.1.0/lib/sass/tree/while_node.rb
- R vendor/gems/haml-2.1.0/rails/init.rb
- R vendor/gems/haml-2.1.0/test/benchmark.rb
- R vendor/gems/haml-2.1.0/test/haml/engine_test.rb
- R vendor/gems/haml-2.1.0/test/haml/helper_test.rb
- R vendor/gems/haml-2.1.0/test/haml/html2haml_test.rb
- R vendor/gems/haml-2.1.0/test/haml/markaby/standard.mab
- R vendor/gems/haml-2.1.0/test/haml/mocks/article.rb
- R vendor/gems/haml-2.1.0/test/haml/results/content_for_layout.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/eval_suppressed.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/filters.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/helpers.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/helpful.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/just_stuff.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/list.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/nuke_inner_whitespace.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/nuke_outer_whitespace.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/original_engine.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/partial_layout.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/partials.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/silent_script.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/standard.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/tag_parsing.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/very_basic.xhtml
- R vendor/gems/haml-2.1.0/test/haml/results/whitespace_handling.xhtml
- R vendor/gems/haml-2.1.0/test/haml/rhtml/_av_partial_1.rhtml
- R vendor/gems/haml-2.1.0/test/haml/rhtml/_av_partial_2.rhtml
- R vendor/gems/haml-2.1.0/test/haml/rhtml/action_view.rhtml
- R vendor/gems/haml-2.1.0/test/haml/rhtml/standard.rhtml
- R vendor/gems/haml-2.1.0/test/haml/template_test.rb
- R vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_1.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/_av_partial_2.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/_layout_for_partial.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/_partial.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/_text_area.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/action_view.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/breakage.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/content_for_layout.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/eval_suppressed.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/filters.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/helpers.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/helpful.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/just_stuff.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/list.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/nuke_inner_whitespace.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/nuke_outer_whitespace.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/original_engine.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/partial_layout.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/partialize.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/partials.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/silent_script.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/standard.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/tag_parsing.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/very_basic.haml
- R vendor/gems/haml-2.1.0/test/haml/templates/whitespace_handling.haml
- R vendor/gems/haml-2.1.0/test/linked_rails.rb
- R vendor/gems/haml-2.1.0/test/sass/engine_test.rb
- R vendor/gems/haml-2.1.0/test/sass/functions_test.rb
- R vendor/gems/haml-2.1.0/test/sass/more_results/more1.css
- R vendor/gems/haml-2.1.0/test/sass/more_results/more1_with_line_comments.css
- R vendor/gems/haml-2.1.0/test/sass/more_results/more_import.css
- R vendor/gems/haml-2.1.0/test/sass/more_templates/_more_partial.sass
- R vendor/gems/haml-2.1.0/test/sass/more_templates/more1.sass
- R vendor/gems/haml-2.1.0/test/sass/more_templates/more_import.sass
- R vendor/gems/haml-2.1.0/test/sass/plugin_test.rb
- R vendor/gems/haml-2.1.0/test/sass/results/alt.css
- R vendor/gems/haml-2.1.0/test/sass/results/basic.css
- R vendor/gems/haml-2.1.0/test/sass/results/compact.css
- R vendor/gems/haml-2.1.0/test/sass/results/complex.css
- R vendor/gems/haml-2.1.0/test/sass/results/compressed.css
- R vendor/gems/haml-2.1.0/test/sass/results/expanded.css
- R vendor/gems/haml-2.1.0/test/sass/results/import.css
- R vendor/gems/haml-2.1.0/test/sass/results/line_numbers.css
- R vendor/gems/haml-2.1.0/test/sass/results/mixins.css
- R vendor/gems/haml-2.1.0/test/sass/results/multiline.css
- R vendor/gems/haml-2.1.0/test/sass/results/nested.css
- R vendor/gems/haml-2.1.0/test/sass/results/parent_ref.css
- R vendor/gems/haml-2.1.0/test/sass/results/script.css
- R vendor/gems/haml-2.1.0/test/sass/results/subdir/nested_subdir/nested_subdir.css
- R vendor/gems/haml-2.1.0/test/sass/results/subdir/subdir.css
- R vendor/gems/haml-2.1.0/test/sass/results/units.css
- R vendor/gems/haml-2.1.0/test/sass/script_test.rb
- R vendor/gems/haml-2.1.0/test/sass/templates/_partial.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/alt.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/basic.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/bork.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/bork2.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/compact.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/complex.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/compressed.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/expanded.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/import.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/importee.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/line_numbers.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/mixins.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/multiline.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/nested.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/parent_ref.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/script.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/subdir/nested_subdir/_nested_partial.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/subdir/nested_subdir/nested_subdir.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/subdir/subdir.sass
- R vendor/gems/haml-2.1.0/test/sass/templates/units.sass
- R vendor/gems/haml-2.1.0/test/test_helper.rb
- R vendor/plugins/gemsonrails/init.rb
- R vendor/plugins/gemsonrails/tasks/gems_freeze.rake
- R vendor/plugins/gemsonrails/tasks/gems_link.rake
- R vendor/plugins/gemsonrails/tasks/gems_unfreeze.rake
- R vendor/plugins/gemsonrails/tasks/load_tasks_in_gems.rake
- M .gitignore
- M Gemfile
- M Gemfile.lock
- M config/boot.rb
- M config/deploy-orig.rb
- M config/environment.rb
- M config/environments/development.rb
- M config/environments/test.rb
- M features/calendars/administer_calendars.feature
- M features/manage_subscriptions.feature
- M features/step_definitions/webrat_steps.rb
- M features/support/env.rb
- M lib/tasks/cucumber.rake
- M script/cucumber
- M spec/blueprints.rb
- M vendor/plugins/acts_as_addressed/spec/blueprints.rb
- M vendor/plugins/haml/init.rb
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>