Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 2, 2011
  1. @chrisglass
  2. @chrisglass
Commits on Apr 29, 2011
  1. @ojii
Commits on Apr 26, 2011
  1. @ojii
  2. @ojii

    Merged pull request #764 from elpargo/develop.

    ojii authored
    Adding a comma for copy&paste goodness
Commits on Apr 24, 2011
  1. @ojii
Commits on Apr 20, 2011
  1. @chrisglass
Commits on Apr 17, 2011
  1. @ojii
  2. @ojii

    Fixed cms.models.pagemodel.Page.get_home_pk_cache and cms.models.page…

    ojii authored
    …model.Page.set_home_pk_cache querying django.contrib.sites.Site by using self.site_id instead of self.site.pk
Commits on Apr 7, 2011
  1. @elpargo
Commits on Apr 3, 2011
  1. @ojii
  2. @ojii

    Merge branch 'develop' of github.com:divio/django-cms into feature/se…

    ojii authored
    …kizai-more-tests
    
    Conflicts:
    	cms/admin/pageadmin.py
    	cms/models/pagemodel.py
    	cms/tests/admin.py
  3. @ojii

    Merge branch 'develop' of github.com:divio/django-cms into jezdez-per…

    ojii authored
    …missions-merge3
    
    Conflicts:
    	cms/templates/cms/toolbar/toolbar.html
  4. @ojii
  5. @ojii

    Merge branch 'feature/toolbar-frontend' of github.com:FinalAngel/djan…

    ojii authored
    …go-cms into feature/toolbar
  6. @FinalAngel
  7. @ojii
  8. @FinalAngel

    Merge branch 'feature/toolbar' of https://github.com/ojii/django-cms

    FinalAngel authored
    …into feature/toolbar-frontend
  9. @ojii

    Switched Logout to GetButton

    ojii authored
  10. @FinalAngel

    Merge branch 'feature/toolbar' of https://github.com/ojii/django-cms

    FinalAngel authored
    …into feature/toolbar-frontend
  11. @ojii

    Fixed cms.toolbar.items.GetButton

    ojii authored
    Switched moderator button to GetButton instead of Anchor
  12. @FinalAngel

    Merge branch 'feature/toolbar' of https://github.com/ojii/django-cms

    FinalAngel authored
    …into feature/toolbar-frontend
  13. @ojii

    Merge branch 'feature/toolbar-frontend' of github.com:FinalAngel/djan…

    ojii authored
    …go-cms into feature/toolbar
  14. @FinalAngel

    added cancel button

    FinalAngel authored
  15. @ojii

    removed silly pseudo test

    ojii authored
  16. @ojii
  17. @ojii

    added publish buton

    ojii authored
  18. @FinalAngel

    added backend comment

    FinalAngel authored
  19. @FinalAngel
  20. @FinalAngel
  21. @FinalAngel
  22. @FinalAngel

    Merge branch 'feature/toolbar' of https://github.com/ojii/django-cms

    FinalAngel authored
    …into feature/toolbar-frontend
  23. @ojii

    fixed 'admin menu'

    ojii authored
  24. @FinalAngel

    Merge branch 'feature/toolbar' of https://github.com/ojii/django-cms

    FinalAngel authored
    …into feature/toolbar-frontend
Something went wrong with that request. Please try again.