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

Fix no user comment display #217

Merged
merged 6 commits into from
Mar 17, 2015
Merged

Fix no user comment display #217

merged 6 commits into from
Mar 17, 2015

Commits on Mar 15, 2015

  1. force merge conflict for stream viewers

    @terakilobyte
    terakilobyte committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    c609294 View commit details
    Browse the repository at this point in the history

  2. resolve conflict

    @terakilobyte
    terakilobyte committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    bf7d38e View commit details
    Browse the repository at this point in the history

  3. Add compiles bundle.js to .gitignore

    @terakilobyte
    terakilobyte committed Mar 15, 2015
    Configuration menu
    Copy the full SHA
    39555fc View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2015

  1. Merge remote-tracking branch 'upstream/master'

    @terakilobyte
    terakilobyte committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    8306662 View commit details
    Browse the repository at this point in the history

  2. Fix display of comments if user is not logged in, disable reply butto… 

    …n if no user, reject attempted comments if no user and no author
    @terakilobyte
    terakilobyte committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    8b491ed View commit details
    Browse the repository at this point in the history

  3. Compare against userIds

    @terakilobyte
    terakilobyte committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    c9dd636 View commit details
    Browse the repository at this point in the history