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

Feature/restore deleted events #310

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Feature/restore deleted events #310

wants to merge 19 commits into from

Commits on Feb 10, 2021

  1. Change requirements

    @YairEn
    YairEn committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    3603fc6 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2021

  1. Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar … 

    …into develop
    @YairEn
    YairEn committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    4c0ef83 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar … 

    …into develop
    @YairEn
    YairEn committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    ab738c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2021

  1. Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar … 

    …into develop
    @YairEn
    YairEn committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    6758cfb View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Add restore deleted events feature 

    Add html page
Add css to dayview
Add routers to profile
Add restore_events logic
Change event.py
    @YairEn
    YairEn committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    532fe20 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar … 

    …into develop
    @YairEn
    YairEn committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    d547f24 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/restore_deleted_events

    @YairEn
    YairEn committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    b548d6a View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Chane user at dayview, weekview 

    add annotaions
    @YairEn
    YairEn committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    2e76687 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar … 

    …into develop
    @YairEn
    YairEn committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    b33002f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/restore_deleted_events

    @YairEn
    YairEn committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    48a1a3d View commit details
    Browse the repository at this point in the history

  4. Add restore_tests

    @YairEn
    YairEn committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    c0cde18 View commit details
    Browse the repository at this point in the history

  5. Fix Pylint

    @YairEn
    YairEn committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    8e76a04 View commit details
    Browse the repository at this point in the history

  6. Fix Pylint

    @YairEn
    YairEn committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    8e479e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. Merge branch 'develop' into feature/restore_deleted_events 

    And Fix CR and conflicts
    @YairEn
    YairEn committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    6c76739 View commit details
    Browse the repository at this point in the history

  2. Change tests test_event delete

    @YairEn
    YairEn committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    15b0657 View commit details
    Browse the repository at this point in the history

  3. Remove if main

    @YairEn
    YairEn committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    4d386c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. Fix CR

    @YairEn
    YairEn committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    8a3e642 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts

    @YairEn
    YairEn committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    9c9a39b View commit details
    Browse the repository at this point in the history

  3. Resolve conflicts

    @YairEn
    YairEn committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    08b0a2e View commit details
    Browse the repository at this point in the history