Columns plugin #1472

Closed
wants to merge 26 commits into
from
Commits on Sep 19, 2012
  1. @yakky

    Migrations rewritten: all migrations has been created from scratch us…

    yakky committed Sep 19, 2012
    …ing using South==0.7.5 and saved as 0001_initial; all others are empty just to keep migration history consistent
Commits on Oct 4, 2012
  1. @digi604

    initial commit

    digi604 committed Oct 4, 2012
Commits on Oct 8, 2012
  1. @digi604

    somehow working

    digi604 committed Oct 8, 2012
Commits on Oct 10, 2012
  1. @digi604
Commits on Oct 11, 2012
  1. @ojii

    Saner defaults for plugins

    ojii committed Oct 11, 2012
    * Fixes #1373.
    * The default name for plugins is now nicer.
    * The render method of plugins now by default adds.
      the instance and placeholder to the context and
      returns it, eliminating the need to overwrite this
      method in simple plugins.
  2. @ojii
  3. @piquadrat

    Merge pull request #1474 from ojii/simple-plugins

    piquadrat committed Oct 11, 2012
    Saner defaults for plugins
Commits on Oct 12, 2012
  1. @yakky

    Migrations rewritten: all migrations has been created from scratch us…

    yakky committed Sep 19, 2012
    …ing using South==0.7.5 and saved as 0001_initial; all others are empty just to keep migration history consistent
  2. @yakky

    Documentation for new migrations

    yakky committed Oct 12, 2012
  3. @yakky

    Merge branch 'feature/migrations_history_rewrite' of github.com:yakky…

    yakky committed Oct 12, 2012
    …/django-cms into feature/migrations_history_rewrite
  4. @digi604

    Merge pull request #1434 from yakky/feature/migrations_history_rewrite

    digi604 committed Oct 12, 2012
    Migrations rewritten
Commits on Oct 17, 2012
  1. @piquadrat

    fixed the inherit plugin so that it does not explode when trying to r…

    piquadrat committed Oct 17, 2012
    …ender an "empty" plugin
    
    "empty" means in this case a plugin that has a ``CMSPlugin`` instance, but no subclass instance, despite having a ``plugin_type`` other than ``CMSPluginBase``. Such plugins can come into existence e.g. when the user starts creating a plugin, but cancels the creation of the plugin.
Commits on Oct 18, 2012
  1. @digi604

    Merge pull request #1482 from piquadrat/feature/fix-inherit-empty-plugin

    digi604 committed Oct 18, 2012
    fixed the inherit plugin so that it does not explode when trying to render an "empty" plugin
  2. @tomscytale
  3. @tomscytale
  4. @digi604

    Merge pull request #1483 from tomscytale/develop

    digi604 committed Oct 18, 2012
    Develop: Django 1.5 compatibility - remove simple_class_factory and verify_exists
  5. @yakky
  6. @yakky
  7. @digi604
Commits on Oct 19, 2012
  1. @digi604
  2. @digi604

    migrations, docs, cleanup

    digi604 committed Oct 19, 2012
  3. @digi604

    removed manage.py

    digi604 committed Oct 19, 2012
  4. @digi604

    fixed a doc error

    digi604 committed Oct 19, 2012
  5. @digi604

    other doc errors

    digi604 committed Oct 19, 2012
  6. @digi604

    cleanup docs

    digi604 committed Oct 19, 2012
  7. @digi604

    Merge branch 'develop' into columns-plugin

    digi604 committed Oct 19, 2012
    Conflicts:
    	docs/upgrade/2.4.rst