Permalink
Commits on Jun 25, 2010
  1. minor conflict resolution

    polar committed Jun 25, 2010
  2. Some fixes according to ressy. Eliminated the direct inclusion of com…

    …atose_admin.css and js.
    polar committed Jun 25, 2010
  3. Revert "Added test database file to test directory."

    This reverts commit 99530d9.
    
    Conflicts:
    
    	test/test_helper.rb
    polar committed Jun 25, 2010
  4. Merge remote branch 'ressy/master' into test

    Conflicts:
    	test/test_helper.rb
    	views/layouts/comatose_admin.html.erb
    polar committed Jun 25, 2010
  5. Merge branch 'master' into test

    polar committed Jun 25, 2010
  6. Merge remote branch 'lenalena/master' into test

    Conflicts:
    	generators/comatose_migration/templates/migration.rb
    polar committed Jun 25, 2010
  7. Fixed a test that failed since install.rb now copies .js files to the

    public/javascripts directory.
    polar committed Jun 25, 2010
  8. Merge branch 'test'

    Conflicts:
    	lib/comatose.rb
    polar committed Jun 25, 2010
  9. Merge branch 'master' of http://github.com/toddsundsted/comatose into…

    … test
    
    Conflicts:
    	README.markdown
    	test/functional/comatose_admin_controller_test.rb
    	test/functional/comatose_controller_test.rb
    	test/unit/class_options_test.rb
    	test/unit/comatose_page_test.rb
    	test/unit/processing_context_test.rb
    	test/unit/text_filters_test.rb
    polar committed Jun 25, 2010
  10. Fixed test_harness to copy a environment.rb file into the rails

    directory that will force loading of the acts_as_list and acts_as_tree
    gems.
    polar committed Jun 25, 2010
Commits on Jun 24, 2010
  1. Fixed the tests so that they work as ActiveSupport::TestCase

    and ActiveController::TestCase.
    polar committed Jun 24, 2010
Commits on Jan 23, 2010
Commits on Jan 2, 2010
  1. Cleaned up the README.

    Todd Sundsted committed Jan 2, 2010
  2. fixed comatose 404 handling

    bridiver committed with Todd Sundsted May 10, 2009
Commits on Dec 20, 2009
Commits on Dec 19, 2009
  1. Modified the default admin layout so that it uses the external styles…

    …heet and javascript assets.
    
    There's no point in not using these.  The embedded stylesheet and
    javascript screw up the output when using cucumber; and users have to
    install the image assets anyway.
    toddsundsted committed Dec 19, 2009
Commits on Oct 21, 2009
  1. fixed some buges regarded to slugize

    aslakjo committed Oct 21, 2009
  2. fixed some buges regarded to slugize

    aslakjo committed Oct 21, 2009
  3. fixed visibility of slugize

    aslakjo committed Oct 21, 2009
  4. bumped version

    aslakjo committed Oct 21, 2009
Commits on Oct 20, 2009
  1. fixed some bugs in migration generation, so that full_path and slug g…

    …ets generated
    aslakjo committed Oct 20, 2009
Commits on Oct 14, 2009
  1. edited name

    kristfag committed Oct 14, 2009
Commits on Oct 13, 2009
  1. added hook before edit

    kristfag committed Oct 13, 2009
Commits on Oct 9, 2009
  1. added a hack to enable page_extentions

    aslakjo committed Oct 9, 2009
  2. trying to fix problem around root

    aslakjo committed Oct 9, 2009
Commits on Sep 26, 2009
  1. Removing ComatosePage class redefinition from migration template, so …

    …that before/after filters still get evaluated in following migrations.
    Lena committed Sep 26, 2009
Commits on Sep 22, 2009
  1. fixed bug in create_root_page

    aslakjo committed Sep 22, 2009