nrstott
commented
11 years ago I have some conflicts, but I'll work to resolve them. I had started down the same path, but I can redo it off of yours.
On Mon, Sep 2, 2013 at 12:17 AM, Josh Adams notifications@github.comwrote:
Also pulls in most recent design doc changes, removes silly "That's what she said" message that came in from the cowboy websocket server example
Also, moved html file away from pointing to the hosted websocket server, back to the dev server you're running.
ping @benolee https://github.com/benolee @nrstotthttps://github.com/nrstott @rclements https://github.com/rclements et al have a look-see and merge
if you're happy? Tests pass, server actually works in browser as well.
You can merge this Pull Request by running
git pull https://github.com/bosshack/chromechat feature/rename_chatserver_to_channel
Or view, comment on, or merge it at:
https://github.com/bosshack/chromechat/pull/9 Commit Summary
- Rename chatserver to channel
File Changes
- M README.mdhttps://github.com/bosshack/chromechat/pull/9/files#diff-0(65)
- M priv/html_ws_client.htmlhttps://github.com/bosshack/chromechat/pull/9/files#diff-1(2)
- R src/channel.erlhttps://github.com/bosshack/chromechat/pull/9/files#diff-2(8)
- R src/channel_records.hrlhttps://github.com/bosshack/chromechat/pull/9/files#diff-3(0)
- M src/chromechat.erlhttps://github.com/bosshack/chromechat/pull/9/files#diff-4(4)
- M src/ws_handler.erlhttps://github.com/bosshack/chromechat/pull/9/files#diff-5(8)
- R test/unit/channel_test.erlhttps://github.com/bosshack/chromechat/pull/9/files#diff-6(54)
Patch Links:
Also pulls in most recent design doc changes, removes silly "That's what she said" message that came in from the cowboy websocket server example
Also, moved html file away from pointing to the hosted websocket server, back to the dev server you're running.
ping @benolee @nrstott @rclements et al have a look-see and merge if you're happy? Tests pass, server actually works in browser as well.