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

messaging additions #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

messaging additions #16

wants to merge 2 commits into from

Commits on Aug 12, 2017

  1. Added notifications on messages from non-selected conversation

    root committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    59f0c91 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new' of ssh://github.com/syurchen/talk-example 

    Conflicts:
	app/Http/Controllers/HomeController.php
	app/Http/Controllers/MessageController.php
	config/app.php
	config/talk.php
	public/chat/css/style.css
	public/chat/js/talk.js
	resources/views/auth/login.blade.php
	resources/views/home.blade.php
	resources/views/layouts/app.blade.php
	resources/views/layouts/chat.blade.php
	resources/views/partials/peoplelist.blade.php
	resources/views/welcome.blade.php
	routes/web.php
    @syurchen
    syurchen committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    81207f0 View commit details
    Browse the repository at this point in the history