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

some updates #182

Merged
merged 15 commits into from
Mar 12, 2016
Merged

some updates #182

merged 15 commits into from
Mar 12, 2016

Commits on Mar 7, 2016

  1. Merge pull request #1 from llazzaro/master 

    merge upstream
    N committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    059a99b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'llazzaro/develop'

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    117001d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master'

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    23ac41f View commit details
    Browse the repository at this point in the history

  4. updated templates 

    added full calendar admin support and a modal
    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    54fb724 View commit details
    Browse the repository at this point in the history

  5. Revert "updated templates" 

    This reverts commit 54fb724.
    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    476585b View commit details
    Browse the repository at this point in the history

  6. updated the event generator to fix issue llazzaro#141

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    b8920af View commit details
    Browse the repository at this point in the history

  7. added USE_FULLCALENDAR setting

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    3a7437b View commit details
    Browse the repository at this point in the history

  8. updated fullcalendar templates

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    90518fe View commit details
    Browse the repository at this point in the history

  9. updated the occurrence and event editing templates with bootstrap

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    4508ff2 View commit details
    Browse the repository at this point in the history

  10. updated views an utils to support occurrence permissions

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    e10d4be View commit details
    Browse the repository at this point in the history

  11. fixed the views.py differences that failed

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    d7dd922 View commit details
    Browse the repository at this point in the history

  12. fixed event perm issue

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    a1aa98c View commit details
    Browse the repository at this point in the history

  13. fixed fullcalendar url test

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    d9b5c33 View commit details
    Browse the repository at this point in the history

  14. fullcalendar/day_calendar backwards in view

    mac committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    bc637d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. fixed issue llazzaro#123 and issue llazzaro#137 

    the issue was that when events are modified, the persisted occurrences
weren’t having their “original_start” and “original_end” being updated,
so the occurrence replacer wasn’t catching them.

To fix this, I calculated the change of time to the start and end of
the event, and add this to the occurrences, so they maintain their
order in the list of occurrences.
    mac committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    fbae799 View commit details
    Browse the repository at this point in the history