Permalink
Commits on Jul 21, 2011
  1. Added Marco Bonetti to AUTHORS

    ojii committed Jul 21, 2011
Commits on Jul 18, 2011
  1. Merge branch 'patch-1' of https://github.com/mvaerle/django-cms into …

    Jonas Obrist
    Jonas Obrist committed Jul 18, 2011
    …mvaerle-patch-1
  2. Test for #893

    Jonas Obrist
    Jonas Obrist committed Jul 18, 2011
Commits on Jul 11, 2011
  1. Merge pull request #899 from mbi/develop

    ojii committed Jul 11, 2011
    Respect settings.SEND_BROKEN_LINK_EMAILS and don't email_managers in case
Commits on Jul 10, 2011
  1. Respect settings.SEND_BROKEN_LINK_EMAILS and don't email_managers in …

    mbi committed Jul 10, 2011
    …case of a failed page lookup
Commits on Jul 6, 2011
  1. Merge branch 'assertNumQueries' of https://github.com/fivethreeo/djan…

    Jonas Obrist
    Jonas Obrist committed Jul 6, 2011
    …go-cms into fivethreeo-assertNumQueries
  2. backport assertNumQueries

    fivethreeo committed Jul 6, 2011
  3. fixed a typo, this completely breaks frontend editing, as there are n…

    mvaerle committed Jul 6, 2011
    …o plugins to add in the dropdown
Commits on Jun 29, 2011
  1. fix improper rebase

    fivethreeo committed Jun 29, 2011
  2. more ugettext fixes

    fivethreeo committed Jun 20, 2011
  3. do not enforce csrf checks

    fivethreeo committed Jun 20, 2011
  4. started permission checks for placeholder admin, but test for edit pl…

    Robert Feldbinder authored and fivethreeo committed Jun 13, 2011
    …ugin fails atm
  5. added test and check for permission on copy plugins.

    Robert Feldbinder authored and fivethreeo committed Jun 10, 2011
  6. Added test on permission check for remove and move plugin; and added …

    Robert Feldbinder authored and fivethreeo committed Jun 10, 2011
    …the permission check
  7. fixed permission check for edit_plugin in page admin

    Robert Feldbinder authored and fivethreeo committed Jun 10, 2011
  8. added a test case for plugin edit permissions

    Robert Feldbinder authored and fivethreeo committed Jun 10, 2011
  9. Made PageAdmin.add_plugin check add permissions for the actual plugin…

    Jonas Obrist authored and fivethreeo committed Jun 1, 2011
    … model
Commits on Jun 28, 2011
  1. Merge pull request #890 from evildmp/patch-4

    chrisglass committed Jun 28, 2011
    Edited docs/extending_cms/custom_plugins.rst via GitHub
  2. Make @FinalAngel happy by allowing sekizai to be used in placeholder.…

    Jonas Obrist
    Jonas Obrist committed Jun 28, 2011
    …html and placeholder_wrapper.html
Commits on Jun 27, 2011
  1. Merge pull request #888 from raidsan/patch-1

    Angelo Dini
    Angelo Dini committed Jun 27, 2011
    Line 79, 88:  old ../img/admin/xxx  should be  ../images/jquery/xxx
  2. Merge pull request #887 from DNX/develop

    ojii committed Jun 27, 2011
    changed FLOAT_CHOICES in Picture model for float field
Commits on Jun 25, 2011
Commits on Jun 24, 2011
  1. Fixed the installation docs asking to add 'publisher' to installed ap…

    ojii committed Jun 24, 2011
    …ps, this app does not exist anymore (in it's old form) and is no longer required to be in installed apps. thanks to Ionel Maries Cristian for pointing this out
Commits on Jun 21, 2011
  1. added more descriptions and removed return values from private method…

    Angelo Dini
    Angelo Dini committed Jun 21, 2011
    …s cause they should not be used externally
Commits on Jun 20, 2011
  1. Merge branch 'develop' of github.com:divio/django-cms into feature/to…

    Angelo Dini
    Angelo Dini committed Jun 20, 2011
    …olbar-frontend