Commits on Mar 15, 2011
  1. @stefanfoulis

    Merge branch 'feature/testrefactor' into develop

    * feature/testrefactor:
      fixed settings/urls for new project name
      add new buildout location to .gitignore
      moved tests to seperate folder, updated buildout.cfg
    stefanfoulis committed Mar 15, 2011
  2. @stefanfoulis
  3. @stefanfoulis
  4. @stefanfoulis
Commits on Mar 14, 2011
  1. @stefanfoulis
  2. @stefanfoulis

    Merge branch 'feature/staticmedia' into develop

    * feature/staticmedia:
      updated testproject to use `django.contrib.staticfiles`, updated default settings to use `STATIC_URL` if available
      moved 'media' to 'static'
    stefanfoulis committed Mar 14, 2011
  3. @stefanfoulis

    updated testproject to use `django.contrib.staticfiles`, updated defa…

    …ult settings to use `STATIC_URL` if available
    stefanfoulis committed Mar 14, 2011
Commits on Mar 13, 2011
  1. @stefanfoulis

    moved 'media' to 'static'

    stefanfoulis committed Mar 13, 2011
Commits on Mar 12, 2011
  1. @stefanfoulis

    Merge branch 'feature/improvewalker' into develop

    * feature/improvewalker:
      Add an option to the management command to enable the user to import the directory structure into an existing folder
    stefanfoulis committed Mar 12, 2011
  2. @yml

    Add an option to the management command to enable the user to import …

    …the directory structure into an existing folder
    yml committed Mar 12, 2011
Commits on Mar 8, 2011
  1. @stefanfoulis

    Merge remote-tracking branch 'klipstein/develop' into develop

    * klipstein/develop:
      fixed some minor style issues
      it also should be possible to set FILER_PUBLICMEDIA_ROOT
      removed unused file
      forgot to import the private media setting
      _file was renamed to file
      added useful property extension to the filemodel
      working with the storage class for determining the relative url
      made dismissPopupAnReload available on the window object (bug when creating a new folder)
      made automatic unzipping of uploaded files configurable
      being able to configure the location where uploaded files are stored added FILER_GET_DIRECTORY_CALLBACK, FILER_UPLOAD_MEDIA_ROOT, FILER_UPLOAD_MEDIA_URL and FILER_FILE_STORAGE to settings
    stefanfoulis committed Mar 8, 2011
  2. fixed some minor style issues

    Tobias von Klipstein committed Mar 8, 2011
  3. it also should be possible to set FILER_PUBLICMEDIA_ROOT

    Tobias von Klipstein committed Mar 8, 2011
  4. removed unused file

    Tobias von Klipstein committed Mar 8, 2011
  5. Merge remote branch 'stefanoulis/develop' into develop

    Conflicts:
    	filer/models/filer_file_storage.py
    	filer/models/imagemodels.py
    	filer/settings.py
    	filer/utils/files.py
    Tobias von Klipstein committed Mar 8, 2011
Commits on Mar 7, 2011
  1. @mitar
Commits on Mar 3, 2011
  1. @mitar

    Updated translations.

    mitar committed Mar 3, 2011
  2. @mitar
Commits on Feb 20, 2011
  1. @stefanfoulis

    Merge branch 'feature/paginate' into develop

    * feature/paginate:
      Improve the pagination template to fix a bug that was causing the lost of the _is_popup=1 in the URL query string.
      Fix the indentation. Fix a bug where we loose the select_folder=1 in a popup window.
      Fix a bug if when q is not provided
      Fix a bug in pagination of search results
      update the folderadmin.py to Import the Exception related to the paginator
      Add pagination to the directory_listing
      Fix a bug introduce by the difference between the FileSystemStorage backend and the in the cloud storage backend. This has been tested with cloud file.
    stefanfoulis committed Feb 20, 2011
  2. @stefanfoulis

    Merge branch 'feature/storage' into feature/paginate

    * feature/storage:
      Improve the pagination template to fix a bug that was causing the lost of the _is_popup=1 in the URL query string.
      Fix the indentation. Fix a bug where we loose the select_folder=1 in a popup window.
      Fix a bug if when q is not provided
      Fix a bug in pagination of search results
      update the folderadmin.py to Import the Exception related to the paginator
      Add pagination to the directory_listing
      Fix a bug introduce by the difference between the FileSystemStorage backend and the in the cloud storage backend. This has been tested with cloud file.
    
    Conflicts:
    	filer/settings.py
    stefanfoulis committed Feb 20, 2011
  3. @stefanfoulis

    Merge branch 'feature/adminurls' into develop

    * feature/adminurls:
      change raw /admin/ urls to admin:index
    stefanfoulis committed Feb 20, 2011
  4. @stefanfoulis

    Merge branch 'feature/attribute-validation' into develop

    * feature/attribute-validation:
      Added related name validation to model fields Added tests for related name validation
    stefanfoulis committed Feb 20, 2011
  5. @stefanfoulis

    Merge branch 'feature/staticserve_integration' into develop

    * feature/staticserve_integration: (26 commits)
      update test to reflect the new way of generating thumbnail filenames
      fix version of easy-thumbnails from github to a specific commit
      fix buildout for testsuite to work with a git clone of easy-thumbnails because the newest version is not released as a package yet. Caveat: you need to run buildout twice initially
      secure storage: basic cleanup done
      secure strorage: It's alive! (but still needs a lot of cleanup)
      private file serving mostly working. thumbnail basedir setting for server/storage still very brittle.
      switch to the new and simplified easy_thumbnails integration
      removed some stuff that is no longer needed due to the storage refactor
      typo in HISTORY file
      return correct storage got thumbnails
      slight doc updates
      provide a custom thumbnail storage on the image model
      re-added filename cleaning (slugify) in default upload_to function
      Remove some print statement
      Use the self.original_filename instead of self.file.name when moving a file between storage
      Finally got all the incantations right. We can have multiple backend and the upload_to is based on the value of instance.is_public.
      add a hack to delete the thumbnails when we move the images
      Make it possible to pass an instance of a Storage backend instead of a string.
      Override the default FILER_*_STORAGE with the values from the project settings file.
      Use the storage api to move file between the private and the public storage backend
      ...
    stefanfoulis committed Feb 20, 2011
  6. @stefanfoulis
  7. @stefanfoulis
  8. @stefanfoulis

    fix buildout for testsuite to work with a git clone of easy-thumbnail…

    …s because the newest version is not released as a package yet. Caveat: you need to run buildout twice initially
    stefanfoulis committed Feb 20, 2011
  9. @stefanfoulis
Commits on Feb 19, 2011
  1. @stefanfoulis
Commits on Feb 17, 2011
  1. @yml

    Improve the pagination template to fix a bug that was causing the los…

    …t of the _is_popup=1 in the URL query string.
    yml committed Feb 17, 2011
Commits on Feb 16, 2011
  1. Added related name validation to model fields

    Added tests for related name validation
    Jonas Obrist committed Feb 16, 2011
  2. @yml
Commits on Feb 15, 2011
  1. @yml

    Fix a bug if when q is not provided

    yml committed Feb 15, 2011
  2. @yml
  3. @yml
  4. @yml