Permalink
Commits on Jun 14, 2012
  1. Merge branch 'maint'

    * maint:
      FeinCMS v1.5.5
    
    Conflicts:
    	feincms/__init__.py
    matthiask committed Jun 14, 2012
  2. FeinCMS v1.5.5

    matthiask committed Jun 14, 2012
  3. FeinCMS v1.6.0

    Be bold
    matthiask committed Jun 14, 2012
Commits on Jun 13, 2012
  1. Merge remote-tracking branch 'mk/mk/mpttadmin' into next

    * mk/mk/mpttadmin:
      TreeEditor: Copy delete_selected_tree implementation from FeinCMSModelAdmin
      Use MPTTAdminForm for models using the tree editor too
      PageAdminForm: Inherit cleaning behavior of MPTTAdminForm
    matthiask committed Jun 13, 2012
Commits on Jun 12, 2012
  1. Regenerate AUTHORS file

    matthiask committed Jun 12, 2012
  2. Fix django-mptt link

    matthiask committed Jun 12, 2012
  3. TreeEditor: Copy delete_selected_tree implementation from FeinCMSMode…

    …lAdmin
    
    Thanks Craig de Stigter for the implementation.
    matthiask committed Jun 12, 2012
  4. Add a deprecation timeline

    matthiask committed Jun 12, 2012
  5. feincms.admin.editor will not exist in v1.8 anymore

    It has already been deprecated in the v1.5 release.
    matthiask committed Jun 12, 2012
Commits on Jun 11, 2012
  1. Fixed "View on site" link in inline admin

    Refs Django issue #18433.
    matthiask committed Jun 8, 2012
Commits on Jun 9, 2012
  1. Add staticfiles to testsuite

    matthiask committed Jun 9, 2012
  2. Make testsuite pass

    matthiask committed Jun 9, 2012
  3. Fix mispositioned commas

    matthiask committed Jun 9, 2012
  4. Merge branch 'master' into next

    * master:
      Doc fix
    matthiask committed Jun 9, 2012
  5. Doc fix

    bmihelac committed Jun 9, 2012
Commits on Jun 8, 2012
  1. Merge remote-tracking branch 'mjl/next' into next

    * mjl/next:
      Move the pre_delete hook to delete media files to post_delete, so we keep the files if for some reason the db delete fails.
      Add logging when MediaFile is deleted so we have an audit trail.
      Use a signal to catch MediaFile deletions and delete the linked media file too.
      On MediaFile deletion, remove the underlying media file too.
      Manually import fix in ea75cb3
    matthiask committed Jun 8, 2012
  2. Merge branch 'next' of github.com:matthiask/feincms into next

    * 'next' of github.com:matthiask/feincms:
      Deprecate extensions shorthands for registration
      Clarify deprecations and work on release notes a bit
      Remove a TODO concerning feincms_navigation
      Make feincms_nav official
      Fix #277: Add the page cache key to app reverse cache keys
    matthiask committed Jun 8, 2012
  3. Merge branch 'mk/timezone' into next

    * mk/timezone:
      Switch over to django.utils.timezone completely
    matthiask committed Jun 8, 2012
Commits on Jun 7, 2012
  1. Clarify deprecations and work on release notes a bit

    I should really update the testsuite and the example app.
    matthiask committed Jun 7, 2012
  2. Make feincms_nav official

    matthiask committed Jun 7, 2012