Code

Feature/chat#21

Code

Merged

jv-cortez merged 10 commits intomasteryowiputra/BuddyUp:masterfrom feature/chatyowiputra/BuddyUp:feature/chatCopy head branch name to clipboardAug 21, 2017

Commits

Commits on Aug 17, 2017

• Merge pull request #9 from yowiputra/master

  Show description for f8f8f32
  jv-cortez

  authored
  f8f8f32

  Copy full SHA for f8f8f32

Commits on Aug 19, 2017

• Merge pull request #10 from jv-cortez/feature/chat

  Show description for 33d5bf2
  jv-cortez

  authored
  33d5bf2

  Copy full SHA for 33d5bf2

Commits on Aug 20, 2017

• Deleted submit button due to bugs. Added socket listeners to send and receive messages. Needed to reformat how information is sent to popupbox component due to socket listeners.

  johnwonghw

  committed
  f9ac78a

  Copy full SHA for f9ac78a

• test

  johnwonghw

  committed
  68597bb

  Copy full SHA for 68597bb

• Eliminated remainging footer tags

  jv-cortez

  committed
  3b659f4

  Copy full SHA for 3b659f4

• removed unnecessary colons

  jv-cortez

  committed
  88e9088

  Copy full SHA for 88e9088

• fixed conflicts from pull request

  jv-cortez

  committed
  18b4149

  Copy full SHA for 18b4149

• resolved conflicts from pull request

  jv-cortez

  committed
  a010d80

  Copy full SHA for a010d80

Commits on Aug 21, 2017

• Reverted changes to remove popup box for chat and instead add chatbox as a component directly to matmakerpage.

  johnwonghw

  committed
  47d09e0

  Copy full SHA for 47d09e0

• Merge branch 'feature/chat' into feature/chat

  jv-cortez

  authored
  d47009b

  Copy full SHA for d47009b