Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding support for custom user models #2622

Merged
merged 71 commits into from
Feb 28, 2014
Merged

Adding support for custom user models #2622

merged 71 commits into from
Feb 28, 2014

Commits on Feb 10, 2014

  1. Merge pull request #1 from divio/develop 

    updating fork from master
    @daegun
    daegun committed Feb 10, 2014
    Configuration menu
    Copy the full SHA
    c20a6e8 View commit details
    Browse the repository at this point in the history

  2. fix for setting inheritance on a page

    David Lee committed Feb 10, 2014
    Configuration menu
    Copy the full SHA
    6e823ba View commit details
    Browse the repository at this point in the history

  3. temp reverting django-cms#2606 change as it is blowing up

    David Lee committed Feb 10, 2014
    Configuration menu
    Copy the full SHA
    859867c View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2014

  1. removing the spaceless tags as it mucks with html output

    David Lee committed Feb 11, 2014
    Configuration menu
    Copy the full SHA
    79da776 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from daegun/removeSpaceless 

    removing the spaceless tags as it mucks with html output
    @daegun
    daegun committed Feb 11, 2014
    Configuration menu
    Copy the full SHA
    d28dbe0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request django-cms#3 from divio/develop 

    merging main fork into personal fork
    @daegun
    daegun committed Feb 11, 2014
    Configuration menu
    Copy the full SHA
    3328da1 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. fixes the backend part

    @digi604
    digi604 committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    019c21c View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2014

  1. merging main develop branch to test

    David Lee committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    7ffbd41 View commit details
    Browse the repository at this point in the history

  2. Merge pull request django-cms#5 from daegun/test 

    merging main develop branch
    @daegun
    daegun committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    0d464f2 View commit details
    Browse the repository at this point in the history

  3. reverting temp import module change

    David Lee committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    ac80487 View commit details
    Browse the repository at this point in the history

  4. adding tests

    David Lee committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    406229d View commit details
    Browse the repository at this point in the history

  5. remove tabs

    @FinalAngel
    FinalAngel committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    40b705c View commit details
    Browse the repository at this point in the history

  6. Add support for cms page cache invalidation using a cache versioning … 

    …strategy

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    fe9b88d View commit details
    Browse the repository at this point in the history

  7. Use version on cache.get() 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    6f2ccf4 View commit details
    Browse the repository at this point in the history

  8. Add missing import 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    0804d20 View commit details
    Browse the repository at this point in the history

  9. Add tests 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    930c6de View commit details
    Browse the repository at this point in the history

  10. Added some review of the queries performed… 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    e42ddc2 View commit details
    Browse the repository at this point in the history

  11. WIP 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    1dfec0a View commit details
    Browse the repository at this point in the history

  12. fix django-cms#2106

    @digi604
    digi604 committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    7ba647d View commit details
    Browse the repository at this point in the history

  13. Removed hardcoded URLs in admin template.

    @timgraham
    timgraham committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    bc0da31 View commit details
    Browse the repository at this point in the history

  14. Make complex IF condition clearer with formatting 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    bd3b00e View commit details
    Browse the repository at this point in the history

  15. Working tests! 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    460eb2d View commit details
    Browse the repository at this point in the history

  16. More thorough testing 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    c0a7b37 View commit details
    Browse the repository at this point in the history

  17. Don't wholesale change the MW 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    a854a03 View commit details
    Browse the repository at this point in the history

  18. invalidate cache on page move 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    9eae536 View commit details
    Browse the repository at this point in the history

  19. Invalidate page cache on change of in_navigation by way of a new meth… 

    …od on the Page model

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    92773ae View commit details
    Browse the repository at this point in the history

  20. Invalidate the cms page cache on page publish 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    3cafd2e View commit details
    Browse the repository at this point in the history

  21. Invalidate cms page cache on change to page.application_urls 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    12ebf86 View commit details
    Browse the repository at this point in the history

  22. Add support for cms page cache invalidation using a cache versioning … 

    …strategy

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    66cb86c View commit details
    Browse the repository at this point in the history

  23. Use version on cache.get() 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    18a8b4d View commit details
    Browse the repository at this point in the history

  24. Add missing import 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    ca6447c View commit details
    Browse the repository at this point in the history

  25. Add tests 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    8b89d70 View commit details
    Browse the repository at this point in the history

  26. Added some review of the queries performed… 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    0d98b54 View commit details
    Browse the repository at this point in the history

  27. WIP 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    768f6db View commit details
    Browse the repository at this point in the history

  28. Make complex IF condition clearer with formatting 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    b488fff View commit details
    Browse the repository at this point in the history

  29. Working tests! 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    eb44c1b View commit details
    Browse the repository at this point in the history

  30. More thorough testing 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    daa4716 View commit details
    Browse the repository at this point in the history

  31. Don't wholesale change the MW 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    6c61744 View commit details
    Browse the repository at this point in the history

  32. invalidate cache on page move 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    ec7dc03 View commit details
    Browse the repository at this point in the history

  33. Invalidate page cache on change of in_navigation by way of a new meth… 

    …od on the Page model

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    e527747 View commit details
    Browse the repository at this point in the history

  34. Invalidate the cms page cache on page publish 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    5882722 View commit details
    Browse the repository at this point in the history

  35. Invalidate cms page cache on change to page.application_urls 

    Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    fae7834 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'issue_2729' of https://github.com/mkoistinen/django-cms … 

    …into issue_2729
    @mkoistinen
    mkoistinen committed Feb 26, 2014
    Configuration menu
    Copy the full SHA
    36e742c View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2014

  1. Separated PlaceholderAdmin into a mixin class to be used together wit… 

    …h admin.ModelAdmin
    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    d67a004 View commit details
    Browse the repository at this point in the history

  2. Merge pull request django-cms#2737 from timgraham/hardcoded_admin_perms 

    Removed hardcoded URLs in admin template.
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    aebd206 View commit details
    Browse the repository at this point in the history

  3. Fixed a timing problem which occurend sometimes

    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    c0ff51a View commit details
    Browse the repository at this point in the history

  4. Replaced PlaceholderAdmin against PlaceholderAdminMixin together with… 

    … admin.ModelAdmin
    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    2a2c66c View commit details
    Browse the repository at this point in the history

  5. Replaced PlaceholderAdmin against PlaceholderAdminMixin in unit tests

    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    2aa7f69 View commit details
    Browse the repository at this point in the history

  6. Merge pull request django-cms#2735 from mkoistinen/issue_2729 

    Issue 2729 - Ready for review/merge
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    1f27008 View commit details
    Browse the repository at this point in the history

  7. removed prints

    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    f62f46f View commit details
    Browse the repository at this point in the history

  8. Replaced PlaceholderAdmin against PlaceholderAdminMixin in docs

    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    ad2fc3f View commit details
    Browse the repository at this point in the history

  9. fixed typo

    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    c706fe7 View commit details
    Browse the repository at this point in the history

  10. Renamed FrontendEditableAdmin to FrontendEditableAdminMixin for using… 

    … consistent terminology
    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    73f767c View commit details
    Browse the repository at this point in the history

  11. Add comments encouraging use of toggle_in_navigation() method and sma… 

    …rted cache invalidation on its use.

Signed-off-by: Martin Koistinen <mkoistinen@gmail.com>
    @mkoistinen
    mkoistinen committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    501554c View commit details
    Browse the repository at this point in the history

  12. added a page settings button instead of publish if there is no title

    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    cb4d347 View commit details
    Browse the repository at this point in the history

  13. Merge pull request django-cms#2736 from digi604/fix-2106 

    fix django-cms#2106 (redirect on non public root language)
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    ca9bdc7 View commit details
    Browse the repository at this point in the history

  14. set current page to active within the sidebar

    @FinalAngel
    FinalAngel committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    883f030 View commit details
    Browse the repository at this point in the history

  15. PEP8 compliance

    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    d880a72 View commit details
    Browse the repository at this point in the history

  16. testing deprected PlaceholderAdmin

    @jrief
    jrief committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    421f999 View commit details
    Browse the repository at this point in the history

  17. update language on sideframe

    @FinalAngel
    FinalAngel committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    6047f5d View commit details
    Browse the repository at this point in the history

  18. Merge pull request django-cms#8 from FinalAngel/fixes/2685 

    Fixes/2685
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    1f5db0c View commit details
    Browse the repository at this point in the history

  19. Merge branch 'develop' into fix-2685 

    Conflicts:
	cms/templates/admin/cms/page/tree/menu_item.html
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    b7137c2 View commit details
    Browse the repository at this point in the history

  20. Merge pull request django-cms#2741 from mkoistinen/toggle_in_navigation 

    Smarter cache invalidation on use of toggle_in_navigation()
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    b57c975 View commit details
    Browse the repository at this point in the history

  21. Merge pull request django-cms#2743 from digi604/fix-2704 

    added a page settings button instead of publish if there is no title
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    5b5c36d View commit details
    Browse the repository at this point in the history

  22. Merge pull request django-cms#2731 from daegun/fixInheritance 

    Fix inheritance
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    57bdab7 View commit details
    Browse the repository at this point in the history

  23. Merge pull request django-cms#2740 from jrief/fix-issue-2709 

    Fix issue 2709
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    7f06aea View commit details
    Browse the repository at this point in the history

  24. Merge pull request django-cms#2723 from digi604/fix-2685 

    fixes django-cms#2685 (tree view has links to current page language)
    @digi604
    digi604 committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    3a09d5c View commit details
    Browse the repository at this point in the history

  25. Removed restriction that custom user model be named User, changed tes… 

    …t user to EmailUser to verify, updated docs
    @tanderegg
    tanderegg committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    e667c75 View commit details
    Browse the repository at this point in the history

  26. Merged changes from PR

    @tanderegg
    tanderegg committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    3954fbb View commit details
    Browse the repository at this point in the history

  27. Updated travis script to use EmailUser instead of User

    @tanderegg
    tanderegg committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    885ca0c View commit details
    Browse the repository at this point in the history

  28. Merge branch 'develop' of github.com:divio/django-cms into develop

    @tanderegg
    tanderegg committed Feb 27, 2014
    Configuration menu
    Copy the full SHA
    e66bd00 View commit details
    Browse the repository at this point in the history