Code

Master#1

Code

Open

addster1018 wants to merge 26 commits intoaddchatCompPlay/server_php:addchatfrom masterCompPlay/server_php:masterCopy head branch name to clipboard

+1,064-857

Commits

Commits on Sep 5, 2015

• Changed login from email to username

  sidkurella

  committed
  194a51f

  Copy full SHA for 194a51f

• Updated Map

  brendanahart

  committed
  ab8401a

  Copy full SHA for ab8401a

• Merge branch 'master' of https://github.com/CompPlay/server_php

  brendanahart

  committed
  d5cb031

  Copy full SHA for d5cb031

• Map UI

  brendanahart

  committed
  30b1f12

  Copy full SHA for 30b1f12

• added gitignore

  sidkurella

  committed
  8e572ef

  Copy full SHA for 8e572ef

• test

  sidkurella

  committed
  6bf7a26

  Copy full SHA for 6bf7a26

• undid test

  sidkurella

  committed
  193ce55

  Copy full SHA for 193ce55

• Map size change

  addster1018

  committed
  98f53e4

  Copy full SHA for 98f53e4

• Nav bar padding to 0px

  Show description for fc7c219
  addster1018

  committed
  fc7c219

  Copy full SHA for fc7c219

Commits on Sep 6, 2015

• gigantic commit with all the marker code and ajax

  sidkurella

  committed
  c7dbd9f

  Copy full SHA for c7dbd9f

• skilllevel strings

  sidkurella

  committed
  a77efaf

  Copy full SHA for a77efaf

• forgot string concat operator

  sidkurella

  committed
  82de645

  Copy full SHA for 82de645

• logout added

  sidkurella

  committed
  31d813d

  Copy full SHA for 31d813d

• added creating pins w/ right click

  sidkurella

  committed
  b86f197

  Copy full SHA for b86f197

• fixed infobox showing up weirdly

  sidkurella

  committed
  4119fd5

  Copy full SHA for 4119fd5

• added javascript libraries

  sidkurella

  committed
  a4ad354

  Copy full SHA for a4ad354

• updated gitignore

  sidkurella

  committed
  74be89b

  Copy full SHA for 74be89b

• FIXED ALL THE SHIT REGARDING ONLY ONE INFOWINDOW WE DID IT REDDIT

  sidkurella

  committed
  da0470c

  Copy full SHA for da0470c

• Messenger file

  addster1018

  committed
  bba12e6

  Copy full SHA for bba12e6

• style sheet for messenger

  addster1018

  committed
  672ba8b

  Copy full SHA for 672ba8b

• created getmessages php

  sidkurella

  committed
  8d0c2a3

  Copy full SHA for 8d0c2a3

• Merge remote-tracking branch 'origin/master'

  sidkurella

  committed
  3d3bc27

  Copy full SHA for 3d3bc27

• Allowed for joining of groups

  sidkurella

  committed
  2817709

  Copy full SHA for 2817709

• Added favicon

  sidkurella

  committed
  c357f48

  Copy full SHA for c357f48

• added favicon to html files

  sidkurella

  committed
  2bac341

  Copy full SHA for 2bac341

• fixed errors

  sidkurella

  committed
  3738f9a

  Copy full SHA for 3738f9a