Merge branch 'feature/room_metadata' into develop
dffc5ad3dc73
Actions

Description

Merge branch 'feature/room_metadata' into develop

Details

Provenance

Aaron Seigo <seigo@kolabsystems.com>	Authored on May 24 2017, 2:13 PM
• seigo	Pushed on May 24 2017, 2:14 PM

Parents

rKC32801a967414: auto-invitation
rKC3cffc71a2542: add remix for live *code* rebuilding

Branches

Unknown

Tags

Unknown

Build Status

Buildable 10121

Event Timeline

Aaron Seigo <seigo@kolabsystems.com> committed rKCdffc5ad3dc73: Merge branch 'feature/room_metadata' into develop (authored by Aaron Seigo <seigo@kolabsystems.com>).May 24 2017, 2:13 PM

Merged Changes

32801a967414 auto-invitation
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
478b50233c05 respond to invitations automatically for now
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
b11509701952 refactor of presence and notifications
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
3fdffbdfc348 use the room from the assigns, not the conn
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
bf07a1b66b91 match on the channel name
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
5eaefb46042c if we aren't given a room name, make one up for the client
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
ff618ae85e9f function for opening an existing chat, let server name new chats
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
11d9331efdcc add uuid generator lib as a dep
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
19a9dac4f877 don't bother sending a username with the msg
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
dc02406b1e4f use the username in the socket
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits
b17161df68dc update the dependencies to most recent versions
Author
Aaron Seigo <seigo@kolabsystems.com>
Browse Repository
Building
No Audits

Changes (13)

Path

Size

assets/

js/

widgets/

lib/

kolab_chat/

web/

channels/

controllers/

templates/

chat/

layout/

rKCdffc5ad3dc73

View Options

assets/js/api.js

View Options

assets/js/app.js

View Options

assets/js/widgets/userlist.js

View Options

assets/js/widgets/userstatus.js

View Options

lib/kolab_chat/web/channels/room_channel.ex

View Options

lib/kolab_chat/web/channels/system_channel.ex

View Options

lib/kolab_chat/web/channels/user_channel.ex

View Options

lib/kolab_chat/web/channels/user_socket.ex

View Options

lib/kolab_chat/web/controllers/chat_controller.ex

View Options

lib/kolab_chat/web/templates/chat/index.html.eex

View Options

lib/kolab_chat/web/templates/layout/chat.html.eex

View Options

mix.exs

View Options

Merge branch 'feature/room_metadata' into developdffc5ad3dc73Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rKCdffc5ad3dc73

assets/js/api.js

assets/js/app.js

assets/js/widgets/userlist.js

assets/js/widgets/userstatus.js

lib/kolab_chat/web/channels/room_channel.ex

lib/kolab_chat/web/channels/system_channel.ex

lib/kolab_chat/web/channels/user_channel.ex

lib/kolab_chat/web/channels/user_socket.ex

lib/kolab_chat/web/controllers/chat_controller.ex

lib/kolab_chat/web/templates/chat/index.html.eex

lib/kolab_chat/web/templates/layout/chat.html.eex

mix.exs

mix.lock

Merge branch 'feature/room_metadata' into develop
dffc5ad3dc73
Actions