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/public event #287

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

Feature/public event #287

wants to merge 41 commits into from

Commits on Feb 11, 2021

  1. basic restoration of code from a deleted branch. includes- adding is_… 

    …public attr to event model, a function that adds a user to existing event and test for that function.
    @noam-y
    noam-y committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    5ef6469 View commit details
    Browse the repository at this point in the history

  2. added 2 functions- one to send an adaptable email, with email body co… 

    …ntent given as a var, and also a func that sends email to all participants in event.
    @noam-y
    noam-y committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    885a843 View commit details
    Browse the repository at this point in the history

  3. added front end button to allow users to join event, not connected to… 

    … backend yet...
    @noam-y
    noam-y committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    1f4b084 View commit details
    Browse the repository at this point in the history

  4. adding testing fixtures

    @noam-y
    noam-y committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    8e0d1ee View commit details
    Browse the repository at this point in the history

  5. adding working user and event fixture, adding is_public param to even… 

    …t creation. fixing tests. tests are not working properly yet!
    @noam-y
    noam-y committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    5a8adeb View commit details
    Browse the repository at this point in the history

  6. subtle changes for debugging add_user_to_event failing tests.

    @noam-y
    noam-y committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    59532d6 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2021

  1. added something that prevents adding null event_id to userevent objects.

    @noam-y
    noam-y committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    235c4b2 View commit details
    Browse the repository at this point in the history

  2. fixed a small bug that made one of the tests fail

    @noam-y
    noam-y committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    d32ca25 View commit details
    Browse the repository at this point in the history

  3. added func that send email to participants given event id- there are … 

    …still bugs inside
    @noam-y
    noam-y committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    ef0f679 View commit details
    Browse the repository at this point in the history

  4. email not working- last commit before rebuild

    @noam-y
    noam-y committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    c6477a5 View commit details
    Browse the repository at this point in the history

  5. merged changes

    @noam-y
    noam-y committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    b7cc686 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2021

  1. merged with current changes + added one func that sends emails to all… 

    … event participants.
    @noam-y
    noam-y committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    540f1bf View commit details
    Browse the repository at this point in the history

  2. improved documentation

    @noam-y
    noam-y committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    49ac8e7 View commit details
    Browse the repository at this point in the history

  3. adds feature that makes sure only the event owner can send email to a… 

    …ll participants
    @noam-y
    noam-y committed Feb 14, 2021
    Configuration menu
    Copy the full SHA
    e111110 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

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

    …into feature/public_event
    @noam-y
    noam-y committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    573cd2b View commit details
    Browse the repository at this point in the history

  2. merged changes w pulled code

    @noam-y
    noam-y committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    847eb09 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Merge branch 'develop' into feature/public_event

    @yammesicka
    yammesicka authored Feb 18, 2021
    Configuration menu
    Copy the full SHA
    b9d6016 View commit details
    Browse the repository at this point in the history

  2. merging conflicts

    @noam-y
    noam-y committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    e715f4c View commit details
    Browse the repository at this point in the history

  3. merge with code

    @noam-y
    noam-y committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    14fc7e2 View commit details
    Browse the repository at this point in the history

  4. trying to add is_public feature to telegram create event bot

    @noam-y
    noam-y committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    f515361 View commit details
    Browse the repository at this point in the history

  5. creating more changes to enable public feature on create event func o… 

    …n telegram
    @noam-y
    noam-y committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    e4f2ee0 View commit details
    Browse the repository at this point in the history

  6. last chance to add telegram feature- will be deleted soon...

    @noam-y
    noam-y committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    9ffa3ea View commit details
    Browse the repository at this point in the history

  7. reverting changes made on telegram

    @noam-y
    noam-y committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    e8571f1 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. merging changes from pulled code

    @noam-y
    noam-y committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    05c90a1 View commit details
    Browse the repository at this point in the history

  2. changed email sending function to depend on send function so its more… 

    … efficient.
    @noam-y
    noam-y committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    71ee772 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2021

  1. moving user and event fixtures to conftest.py so we can use them glob… 

    …ally
    @noam-y
    noam-y committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    9cf15b1 View commit details
    Browse the repository at this point in the history

  2. changing mailing list sender to return the number of emails sent inst… 

    …ead of bool of whether emails were send. tried simple tests for it
    @noam-y
    noam-y committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    70be019 View commit details
    Browse the repository at this point in the history

  3. making test to assert failure of sending mailing list with no logged … 

    …user
    @noam-y
    noam-y committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    1bc712c View commit details
    Browse the repository at this point in the history

  4. merging conflicts

    @noam-y
    noam-y committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    f371ce1 View commit details
    Browse the repository at this point in the history

  5. splitting mailing list send to 2 tests- one where no user is logged (… 

    …sending is supposed to fail) and the second where event owner sends email
    @noam-y
    noam-y committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    05310b7 View commit details
    Browse the repository at this point in the history

  6. small pep changes

    @noam-y
    noam-y committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    c02ffd0 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2021

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

    …into feature/public_event
    @noam-y
    noam-y committed Feb 21, 2021
    Configuration menu
    Copy the full SHA
    8a58f78 View commit details
    Browse the repository at this point in the history

  2. deleting some visual comments according to yam's commends + hooks

    @noam-y
    noam-y committed Feb 21, 2021
    Configuration menu
    Copy the full SHA
    b6ff758 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. trying to add precommit hooks

    @noam-y
    noam-y committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    093881b View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. merge conflicts

    @noam-y
    noam-y committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    7b4ee13 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/public_event' of https://github.com/noam-y/cale… 

    …ndar into feature/public_event
    @noam-y
    noam-y committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    986b43b View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. finally merged conflicts

    @noam-y
    noam-y committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    cf5b771 View commit details
    Browse the repository at this point in the history

  2. added guards and small changes

    @noam-y
    noam-y committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    76db81a View commit details
    Browse the repository at this point in the history

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

    …into feature/public_event
    @noam-y
    noam-y committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    9bbed18 View commit details
    Browse the repository at this point in the history

  4. first try of adding koby's user system to event mailing list send

    @noam-y
    noam-y committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    94c4a32 View commit details
    Browse the repository at this point in the history

  5. moving user fixtures from conftest to user_fixtures.

    @noam-y
    noam-y committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    b08636e View commit details
    Browse the repository at this point in the history