Permalink
Switch branches/tags
Nothing to show
Commits on Jul 2, 2013
Commits on Jun 27, 2013
  1. edited file browser url in wymeditor script script so it works with m…

    …y version of file browser.
    committed Jun 27, 2013
Commits on Jun 26, 2013
Commits on May 30, 2012
Commits on May 16, 2012
  1. Merge pull request #60 from dmitry-sobolev/master

    Ran 81 tests in 15.502s
    OK (skipped=1)
    batiste committed May 16, 2012
  2. Delegation pages are being searched only if the PAGE_USE_STRICT_URL s…

    …etting is set to False. And if there is no delegation page found method returns None.Delegation pages is searching only if setting PAGE_USE_STRICT_URL is False. And if didn't found any delegation page function returns None.
    Dmitry Sobolev committed with batiste May 16, 2012
  3. Delegation pages are being searched only if the PAGE_USE_STRICT_URL s…

    …etting is set to False. And if there is no delegation page found method returns None.Delegation pages is searching only if setting PAGE_USE_STRICT_URL is False. And if didn't found any delegation page function returns None.
    Dmitry Sobolev committed May 16, 2012
Commits on May 7, 2012
  1. Merge pull request #59 from nanonyme/master

    Missing import in pages/admin/__init__.py
    batiste committed May 7, 2012
Commits on May 6, 2012
  1. Fix missing import

    nanonyme committed May 6, 2012
Commits on Apr 26, 2012
  1. Fix the test for Django 1.4

    batiste committed Apr 26, 2012
Commits on Apr 15, 2012
  1. Merge with wardi 2857038

    batiste committed Apr 15, 2012
  2. haystack development version compat

    wardi committed with batiste Apr 11, 2012
  3. Chery-pick resolve conflict

    wardi committed with batiste Apr 11, 2012
  4. fix urlify.js url too

    wardi committed with batiste Apr 11, 2012
Commits on Apr 14, 2012
  1. Merge branch 'feature-json-export'

    Conflicts:
    	pages/managers.py
    	pages/models.py
    wardi committed Apr 14, 2012
  2. page list admin: fix select/deselect all pages

    checkboxes for changed items in the list after expand/collapse/move pages
    did not interact properly with the select/deselect-all checkbox
    wardi committed Apr 14, 2012
  3. make exporting of content language update order explicit

    also switch back to dicts for language content
    wardi committed Apr 14, 2012
  4. fix for slug importing

    wardi committed Apr 14, 2012
  5. remove freeze_date from json export

    its use will result in broken pages because the content blocks created
    will have different dates than the source
    wardi committed Apr 14, 2012
  6. better fix for language_up_to_date, redirect_to

    sort languages by latest content change in export
    handle redirect_to in a separate pass, no need to import twice
    wardi committed Apr 14, 2012
Commits on Apr 13, 2012
  1. json format change: content blocks now ordered by creation date

    this fixes a problem with secondary languages being marked
    as not up-to-date when importing pages with multiple languages
    wardi committed Apr 13, 2012
  2. Merge branch 'feature-json-export'

    wardi committed Apr 13, 2012