Permalink
Commits on Nov 26, 2014
  1. Multilingual: skip date hierarchy for contentitem admin because it do…

    …esn't work with hvad
    Marco Braak committed Nov 26, 2014
  2. Merge branch 'dev' into multilingual

    Conflicts:
    	fiber/__init__.py
    	fiber/migrations/0014_auto__add_field_page_meta_description__chg_field_page_redirect_page.py
    	setup.py
    	testproject/requirements.txt
    Marco Braak committed Nov 26, 2014
  3. Merge branch 'master' into dev

    Marco Braak committed Nov 26, 2014
  4. Merge branch 'sphinx_django_1_7'

    Marco Braak committed Nov 26, 2014
  5. Merge branch 'master' into dev

    Marco Braak committed Nov 26, 2014
  6. Changed development status to Production/Stable

    Marco Braak committed Nov 26, 2014
  7. Coveralls link refers to dev branch

    Marco Braak committed Nov 26, 2014
  8. Updated development status to stable in setup.py

    Marco Braak committed Nov 26, 2014
  9. Refer to master branch in coveralls link

    Marco Braak committed Nov 26, 2014
  10. Updated version to 1.0

    Marco Braak committed Nov 26, 2014
  11. Updated changelog to 1.0

    Marco Braak committed Nov 26, 2014
  12. Merge branch 'wheel' into dev

    Marco Braak committed Nov 26, 2014
  13. Merge pull request #208 from mbraak/django_1_7_migrations

    Django 1 7 migrations
    Marco Braak committed Nov 26, 2014
  14. Publish script creates egg and wheel files

    Marco Braak committed Nov 26, 2014
  15. Mention Django 1.7 support in changelog

    Marco Braak committed Nov 26, 2014
  16. Added docs about Django 1.7 migrations

    Marco Braak committed Nov 26, 2014
  17. Mention Django 1.7 in the readme

    Marco Braak committed Nov 26, 2014
  18. Updated Sphinx settings to work with Django 1.7

    Marco Braak committed Nov 26, 2014
  19. Removed south from test requirements

    Marco Braak committed Nov 26, 2014
  20. Replaced south migrations with Django 1.7 migrations

    Marco Braak committed Nov 26, 2014
  21. Use python 3.4 in tox config

    Marco Braak committed Nov 26, 2014
  22. Use assertEqual in unit tests

    Marco Braak committed Nov 26, 2014
  23. Merge branch 'dev' into multilingual

    Conflicts:
    	.travis.yml
    	fiber/admin_forms.py
    	fiber/managers.py
    	fiber/tests.py
    	setup.py
    	testproject/requirements.txt
    	testproject/tox.ini
    Marco Braak committed Nov 26, 2014
Commits on Nov 25, 2014
  1. Updated test requirements coverage==3.7.1 South==1.0.1

    Marco Braak committed Nov 25, 2014
  2. Fixed text in test template

    Marco Braak committed Nov 25, 2014
  3. Correctly install locale files

    Marco Braak committed Nov 25, 2014
  4. Removed ADMINS and MANAGERS from example settings to prevent Django 1…

    ….7 warnings
    Marco Braak committed Nov 25, 2014
  5. Fixed test_used_on_pages_json

    Marco Braak committed Nov 25, 2014
  6. Updated django version to 1.5.11 in travis config

    Marco Braak committed Nov 25, 2014
  7. Prefer get_queryset over get_query_set

    Marco Braak committed Nov 25, 2014
  8. Updated README.md

    jbovenschen committed Nov 25, 2014