Code

merging popup chat#30

Code

Merged

yowiputra merged 17 commits intoyowiputra:masteryowiputra/BuddyUp:masterfrom jv-cortez:masterjv-cortez/BuddyUp:masterCopy head branch name to clipboardAug 24, 2017

Commits

Commits on Aug 21, 2017

• Merge pull request #12 from yowiputra/master

  Show description for ea160f5
  jv-cortez

  authored
  ea160f5

  Copy full SHA for ea160f5

• Merge pull request #13 from yowiputra/master

  Show description for a706690
  jv-cortez

  authored
  a706690

  Copy full SHA for a706690

• fixed spacing

  jv-cortez

  committed
  de94377

  Copy full SHA for de94377

Commits on Aug 22, 2017

• added files from upstream

  jv-cortez

  committed
  0f7cdb2

  Copy full SHA for 0f7cdb2

• removed popupchat component

  jv-cortez

  committed
  454bdf0

  Copy full SHA for 454bdf0

• removed unnecessary spaces and added margin-bottom for main page

  jv-cortez

  committed
  4af35c7

  Copy full SHA for 4af35c7

Commits on Aug 24, 2017

• removed unnecessary styling and added placeholder for logo placement

  jv-cortez

  committed
  be25016

  Copy full SHA for be25016

• binded newPost

  jv-cortez

  committed
  2af8ab3

  Copy full SHA for 2af8ab3

• Fixed spaces, removed unnecessary commented code, and styling to create popup chat window

  jv-cortez

  committed
  d54697f

  Copy full SHA for d54697f

• removed conflicting inline styling

  jv-cortez

  committed
  fc7939d

  Copy full SHA for fc7939d

• added comments to label which stylings belong to which, added styling for pop up chat window and fixed syntax

  jv-cortez

  committed
  0b1d362

  Copy full SHA for 0b1d362

• Merge pull request #15 from yowiputra/master

  Show description for 06234e5
  jv-cortez

  authored
  06234e5

  Copy full SHA for 06234e5

• Merge branch 'master' into feature/chat-popup

  jv-cortez

  authored
  412c637

  Copy full SHA for 412c637

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

  Show description for f557878
  jv-cortez

  authored
  f557878

  Copy full SHA for f557878

• Changed slider default value placement to under the slideText

  jv-cortez

  committed
  3dd800c

  Copy full SHA for 3dd800c

• fixed slider position

  jv-cortez

  committed
  2bec392

  Copy full SHA for 2bec392

• Merge branch 'master' into master

  jv-cortez

  authored
  24a09e5

  Copy full SHA for 24a09e5