Permalink
Commits on Jul 11, 2011
  1. @ojii

    Merge pull request #899 from mbi/develop

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

    Respect settings.SEND_BROKEN_LINK_EMAILS and don't email_managers in …

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

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

    backport assertNumQueries

    fivethreeo committed Jul 6, 2011
Commits on Jun 29, 2011
  1. @fivethreeo

    fix improper rebase

    fivethreeo committed Jun 29, 2011
  2. @fivethreeo
  3. @fivethreeo
  4. @fivethreeo

    more ugettext fixes

    fivethreeo committed Jun 20, 2011
  5. @fivethreeo

    merged properly with develop

    fivethreeo committed Jun 20, 2011
  6. @fivethreeo
  7. @fivethreeo

    do not enforce csrf checks

    fivethreeo committed Jun 20, 2011
  8. @fivethreeo

    started permission checks for placeholder admin, but test for edit pl…

    …ugin fails atm
    Robert Feldbinder committed with fivethreeo Jun 13, 2011
  9. @fivethreeo

    added test and check for permission on copy plugins.

    Robert Feldbinder committed with fivethreeo Jun 10, 2011
  10. @fivethreeo

    Added test on permission check for remove and move plugin; and added …

    …the permission check
    Robert Feldbinder committed with fivethreeo Jun 10, 2011
  11. @fivethreeo

    fixed permission check for edit_plugin in page admin

    Robert Feldbinder committed with fivethreeo Jun 10, 2011
  12. @fivethreeo

    added a test case for plugin edit permissions

    Robert Feldbinder committed with fivethreeo Jun 10, 2011
  13. @fivethreeo

    Made PageAdmin.add_plugin check add permissions for the actual plugin…

    … model
    Jonas Obrist committed with fivethreeo Jun 1, 2011
Commits on Jun 28, 2011
  1. @chrisglass

    Merge pull request #890 from evildmp/patch-4

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

    …html and placeholder_wrapper.html
    Jonas Obrist committed Jun 28, 2011
Commits on Jun 27, 2011
  1. @FinalAngel

    Merge pull request #888 from raidsan/patch-1

    Line 79, 88:  old ../img/admin/xxx  should be  ../images/jquery/xxx
    FinalAngel committed Jun 27, 2011
  2. @ojii

    to make those frontend guys happy

    ojii committed Jun 27, 2011
  3. @ojii

    Merge pull request #887 from DNX/develop

    changed FLOAT_CHOICES in Picture model for float field
    ojii committed Jun 27, 2011
  4. @raidsan
Commits on Jun 25, 2011
  1. @DNX
Commits on Jun 24, 2011
  1. @ojii

    Fixed the installation docs asking to add 'publisher' to installed ap…

    …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
    ojii committed Jun 24, 2011
Commits on Jun 21, 2011
  1. @FinalAngel

    added more descriptions and removed return values from private method…

    …s cause they should not be used externally
    FinalAngel committed Jun 21, 2011
Commits on Jun 20, 2011
  1. @FinalAngel
  2. @FinalAngel
  3. @FinalAngel

    always use triple equal

    FinalAngel committed Jun 20, 2011
Commits on Jun 19, 2011
  1. @ojii

    Merge pull request #880 from FinalAngel/feature/toolbar-frontend

    Feature/toolbar frontend
    ojii committed Jun 19, 2011
  2. @FinalAngel

    admin css fix

    FinalAngel committed Jun 19, 2011
  3. @FinalAngel
  4. @FinalAngel

    API Namespace changes

    FinalAngel committed Jun 19, 2011