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

wip #76 begin work on ChatComponent #123

Merged
merged 8 commits into from
Mar 29, 2017
Merged

wip #76 begin work on ChatComponent #123

merged 8 commits into from
Mar 29, 2017

Commits on Mar 22, 2017

  1. wip #76 being work on ChatComponent

    @simon-bourque
    simon-bourque committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    56d8dd3 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. wip #76 update models and controllers to contain array of objects ins… 

    …tead of references
    @Philippe229
    Philippe229 committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    4ded3e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/jacobrs/SOEN341 into chat… 

    …_front
    @simon-bourque
    simon-bourque committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    5598f03 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2017

  1. wip #76 revert and fix studyGroup.controller createStudyGroup

    @Philippe229
    Philippe229 committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    a8a1caa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'chat_front' of https://github.com/jacobrs/SOEN341 into … 

    …chat_front
    @simon-bourque
    simon-bourque committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    f1dff9d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/jacobrs/SOEN341 into chat… 

    …_front
    @simon-bourque
    simon-bourque committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    a110bce View commit details
    Browse the repository at this point in the history

  4. wip #76 Implement sending messages to everyone in the study group

    @simon-bourque
    simon-bourque committed Mar 24, 2017
    Configuration menu
    Copy the full SHA
    f61853d View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2017

  1. wip #76 Don't render chat when no study group is selected

    @simon-bourque
    simon-bourque committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    99f2c93 View commit details
    Browse the repository at this point in the history