Code

Fix/css class#121

Code

Open

Dillonjay wants to merge 123 commits intoCapitolCityCoders:masterCapitolCityCoders/GraniteParchmentShears:masterfrom striking-lunatics:fix/cssClassstriking-lunatics/RockPaperScissors:fix/cssClassCopy head branch name to clipboard

+1,389-172

Commits

Commits on Jul 19, 2016

• add small facebook auth

  Dillonjay

  committed
  e439349

  Copy full SHA for e439349

• Merge pull request #1 from striking-lunatics/feature/fbAuth

  Show description for 76ac990
  mccarthyist

  authored
  76ac990

  Copy full SHA for 76ac990

• Add login/signup templates

  sxcw

  committed
  8dc087c

  Copy full SHA for 8dc087c

• Merge pull request #2 from striking-lunatics/feature/login

  Show description for 3596646
  

  Dillon

  authored
  3596646

  Copy full SHA for 3596646

Commits on Jul 20, 2016

• store cookie with facebookb image url and facebook username

  Dillonjay

  committed
  30e9be5

  Copy full SHA for 30e9be5

• Merge pull request #3 from striking-lunatics/feature/fbAuth

  Show description for 26cfcb3
  burtoncooke1

  authored
  26cfcb3

  Copy full SHA for 26cfcb3

• page works, not submitting

  mccarthyist

  committed
  22eb40d

  Copy full SHA for 22eb40d

• almost working

  mccarthyist

  committed
  03ce1d0

  Copy full SHA for 03ce1d0

• Merge remote-tracking branch 'refs/remotes/GranitePapyrusShears/master'

  ChrisWiles

  committed
  76c83fe

  Copy full SHA for 76c83fe

• basic functionality

  mccarthyist

  committed
  ef1883d

  Copy full SHA for ef1883d

• Merge pull request #4 from striking-lunatics/feature/gameChat

  Show description for cc0557a
  

  Dillon

  authored
  cc0557a

  Copy full SHA for cc0557a

• fixed server socket

  mccarthyist

  committed
  b2bf14b

  Copy full SHA for b2bf14b

• add facebook image to player icon

  Dillonjay

  committed
  94cc001

  Copy full SHA for 94cc001

• Merge pull request #5 from striking-lunatics/feature/addImage

  Show description for 31d505e
  mccarthyist

  authored
  31d505e

  Copy full SHA for 31d505e

• Merge branch 'master' of https://github.com/striking-lunatics/RockPaperScissors into feature/gameChat

  mccarthyist

  committed
  91c4448

  Copy full SHA for 91c4448

• Merge branch 'master' of https://github.com/striking-lunatics/RockPaperScissors

  ChrisWiles

  committed
  2ae9cce

  Copy full SHA for 2ae9cce

• working

  mccarthyist

  committed
  b97eea2

  Copy full SHA for b97eea2

• facebook name displayed in battleground

  Dillonjay

  committed
  8724522

  Copy full SHA for 8724522

• Merge pull request #6 from striking-lunatics/feature/fbName

  Show description for 12dbe46
  burtoncooke1

  authored
  12dbe46

  Copy full SHA for 12dbe46

• create Chatbox demo

  ChrisWiles

  committed
  4da772e

  Copy full SHA for 4da772e

• create chatBox demo

  ChrisWiles

  committed
  41d29ca

  Copy full SHA for 41d29ca

• local chatbox working

  mccarthyist

  committed
  1e41e0a

  Copy full SHA for 1e41e0a

• Add a dummy bar chart and WIP: piechart

  sxcw

  committed
  1b4e94e

  Copy full SHA for 1b4e94e

• Merge pull request #7 from striking-lunatics/feature/chatLobbyDemo

  Show description for 26aa71c
  ChrisWiles

  authored
  26aa71c

  Copy full SHA for 26aa71c

• Merge pull request #8 from striking-lunatics/feature/gameChat

  Show description for 0a2af95
  ChrisWiles

  authored
  0a2af95

  Copy full SHA for 0a2af95

• add socket.io

  ChrisWiles

  committed
  183097d

  Copy full SHA for 183097d

• local chat with names

  mccarthyist

  committed
  3e10cdc

  Copy full SHA for 3e10cdc

• Merge remote-tracking branch 'refs/remotes/origin/feature/chatLobbyDemo'

  Show description for c7ed888
  ChrisWiles

  committed
  c7ed888

  Copy full SHA for c7ed888

• Merge pull request #10 from striking-lunatics/feature/chatInGame

  Show description for a1b42b3
  

  Dillon

  authored
  a1b42b3

  Copy full SHA for a1b42b3

• add socket to server

  ChrisWiles

  committed
  e4a0d96

  Copy full SHA for e4a0d96

• fb username works

  ChrisWiles

  committed
  97c7975

  Copy full SHA for 97c7975

• formating

  ChrisWiles

  committed
  5b05364

  Copy full SHA for 5b05364

• fix bind

  ChrisWiles

  committed
  5eee9df

  Copy full SHA for 5eee9df

• add imageUrl colun to users table

  burtoncooke1

  committed
  ff9cee0

  Copy full SHA for ff9cee0

• made chat in game look better

  mccarthyist

  committed
  0003d02

  Copy full SHA for 0003d02

• delete alert, add facebook name to create component

  Dillonjay

  committed
  bbe2fe7

  Copy full SHA for bbe2fe7

• Merge pull request #11 from striking-lunatics/fix/alert

  Show description for f75fce9
  mccarthyist

  authored
  f75fce9

  Copy full SHA for f75fce9

• Merge pull request #12 from striking-lunatics/feature/chatBetter

  Show description for 84cadda
  

  Dillon

  authored
  84cadda

  Copy full SHA for 84cadda

• clean up code

  ChrisWiles

  committed
  e416000

  Copy full SHA for e416000

• clean up code

  ChrisWiles

  committed
  40e2464

  Copy full SHA for 40e2464

• Merge remote-tracking branch 'origin/master'

  Show description for ba8c2d2
  ChrisWiles

  committed
  ba8c2d2

  Copy full SHA for ba8c2d2

• store facebook username in database

  Dillonjay

  committed
  d82cc8d

  Copy full SHA for d82cc8d

• Merge pull request #13 from striking-lunatics/feature/fbUser

  Show description for 08bc668
  ChrisWiles

  authored
  08bc668

  Copy full SHA for 08bc668

• Merge pull request #14 from striking-lunatics/feature/users-image-column

  Show description for 898fec6
  

  Dillon

  authored
  898fec6

  Copy full SHA for 898fec6

• set up ajax request with facebook image paramater

  Dillonjay

  committed
  d374fa0

  Copy full SHA for d374fa0

• Merge pull request #15 from striking-lunatics/feature/addImgAjax

  Show description for 49129b4
  mccarthyist

  authored
  49129b4

  Copy full SHA for 49129b4

• correct username bug

  ChrisWiles

  committed
  a3f2410

  Copy full SHA for a3f2410

• fixed fbUser

  ChrisWiles

  committed
  7d36442

  Copy full SHA for 7d36442

• Add leaderboard graph

  sxcw

  committed
  91b2e31

  Copy full SHA for 91b2e31

• Merge branch 'master' into feature/pieChart

  sxcw

  committed
  abef268

  Copy full SHA for abef268

• fixed chat

  mccarthyist

  committed
  7f8ca6a

  Copy full SHA for 7f8ca6a

• Merge pull request #16 from striking-lunatics/feature/goodChat

  Show description for 2d95e9f
  

  Dillon

  authored
  2d95e9f

  Copy full SHA for 2d95e9f

• chat in lobby

  ChrisWiles

  committed
  83111f7

  Copy full SHA for 83111f7

Commits on Jul 21, 2016

• Clean up code

  sxcw

  committed
  a1e3dbb

  Copy full SHA for a1e3dbb

• Merge pull request #17 from striking-lunatics/feature/pieChart

  Show description for b8e37c3
  mccarthyist

  authored
  b8e37c3

  Copy full SHA for b8e37c3

• show facebook name on join

  Dillonjay

  committed
  a59b6b6

  Copy full SHA for a59b6b6

• Merge pull request #18 from striking-lunatics/feature/fbJoin

  Show description for 011ac90
  

  Dillon

  authored
  011ac90

  Copy full SHA for 011ac90

• fix chat in mobile, needs work desktop

  ChrisWiles

  committed
  5bb5f71

  Copy full SHA for 5bb5f71

• fixed css

  ChrisWiles

  committed
  0815ff6

  Copy full SHA for 0815ff6

• Fix endpoint and add Stats router

  sxcw

  committed
  13f1b31

  Copy full SHA for 13f1b31

• update existing users in database

  burtoncooke1

  committed
  dda5b5d

  Copy full SHA for dda5b5d

• update existing users in database

  burtoncooke1

  committed
  8c84a4b

  Copy full SHA for 8c84a4b

• Merge pull request #20 from striking-lunatics/feature/pieChart

  Show description for adca60c
  sxcw

  authored
  adca60c

  Copy full SHA for adca60c

• Add tooltip to barchart

  sxcw

  committed
  031413a

  Copy full SHA for 031413a

• update css

  ChrisWiles

  committed
  5402988

  Copy full SHA for 5402988

• merge

  burtoncooke1

  committed
  bc9d770

  Copy full SHA for bc9d770

• Merge pull request #21 from striking-lunatics/fix/player-name-display

  Show description for 2c41e85
  mccarthyist

  authored
  2c41e85

  Copy full SHA for 2c41e85

• Merge branch 'master' into feature/pieChart

  sxcw

  committed
  ed81d3c

  Copy full SHA for ed81d3c

• add user image into database

  Dillonjay

  committed
  b7fc2f2

  Copy full SHA for b7fc2f2

• Merge pull request #22 from striking-lunatics/feature/addImg

  Show description for c4848c8
  mccarthyist

  authored
  c4848c8

  Copy full SHA for c4848c8

• show opponent image

  Dillonjay

  committed
  5b2a179

  Copy full SHA for 5b2a179

• convert skelton to bootstrap Lobby, Menu

  ChrisWiles

  committed
  296b189

  Copy full SHA for 296b189

• Merge pull request #23 from striking-lunatics/feature/addImg

  Show description for 0cea13d
  ChrisWiles

  authored
  0cea13d

  Copy full SHA for 0cea13d

• Merge pull request #24 from striking-lunatics/feature/Bootstrap

  Show description for f7d28fe
  

  Dillon

  authored
  f7d28fe

  Copy full SHA for f7d28fe

• delete broken facebook function

  Dillonjay

  committed
  1882731

  Copy full SHA for 1882731

• Merge pull request #25 from striking-lunatics/fix/deleteFbFunction

  Show description for 50d0568
  mccarthyist

  authored
  50d0568

  Copy full SHA for 50d0568

• accesscode -> accessCode

  ChrisWiles

  committed
  b769e11

  Copy full SHA for b769e11

• Merge remote-tracking branch 'origin/master'

  ChrisWiles

  committed
  0786174

  Copy full SHA for 0786174

• add bootstrap table

  ChrisWiles

  committed
  e9ecca5

  Copy full SHA for e9ecca5

• Merge pull request #26 from striking-lunatics/feature/Bootstrap

  Show description for b918d28
  

  Dillon

  authored
  b918d28

  Copy full SHA for b918d28

• Sort and Limit players, WIP: tooltip message

  sxcw

  committed
  83137ff

  Copy full SHA for 83137ff

• adding features to database

  burtoncooke1

  committed
  054e994

  Copy full SHA for 054e994

• Merge branch 'master' into feature/pieChart

  sxcw

  committed
  a99cae9

  Copy full SHA for a99cae9

• update chatbox

  ChrisWiles

  committed
  bef9dae

  Copy full SHA for bef9dae

• update buttons

  ChrisWiles

  committed
  1e69e19

  Copy full SHA for 1e69e19

• add 10 msgs

  ChrisWiles

  committed
  76292af

  Copy full SHA for 76292af

• Merge pull request #27 from striking-lunatics/feature/pieChart

  Show description for 0542e04
  

  Dillon

  authored
  0542e04

  Copy full SHA for 0542e04

• Merge remote-tracking branch 'refs/remotes/origin/master' into feature/Bootstrap

  ChrisWiles

  committed
  ac990f3

  Copy full SHA for ac990f3

• Merge remote-tracking branch 'refs/remotes/origin/master' into feature/Bootstrap

  Show description for 3a4922e
  ChrisWiles

  committed
  3a4922e

  Copy full SHA for 3a4922e

• intermediary commit

  burtoncooke1

  committed
  ae9616e

  Copy full SHA for ae9616e

• Merge pull request #29 from striking-lunatics/feature/Bootstrap

  Show description for d96d316
  mccarthyist

  authored
  d96d316

  Copy full SHA for d96d316

• again

  burtoncooke1

  committed
  a3b3848

  Copy full SHA for a3b3848

• add facebook auth own file

  ChrisWiles

  committed
  7ac2a5b

  Copy full SHA for 7ac2a5b

• Fix CSS

  sxcw

  committed
  6e282ad

  Copy full SHA for 6e282ad

• working draft

  ChrisWiles

  committed
  f4b28e2

  Copy full SHA for f4b28e2

• Merge pull request #30 from striking-lunatics/feature/Bootstrap

  Show description for e62c0a2
  

  Dillon

  authored
  e62c0a2

  Copy full SHA for e62c0a2

• nav bar

  ChrisWiles

  committed
  1c17047

  Copy full SHA for 1c17047

• Merge pull request #31 from striking-lunatics/feature/Bootstrap

  Show description for 140d209
  ChrisWiles

  authored
  140d209

  Copy full SHA for 140d209

• WIP: fix tooltip

  sxcw

  committed
  3c9ce44

  Copy full SHA for 3c9ce44

• fix css error

  Dillonjay

  committed
  6d6c39c

  Copy full SHA for 6d6c39c

• Merge pull request #32 from striking-lunatics/fix/css

  Show description for 40a0d58
  

  Dillon

  authored
  40a0d58

  Copy full SHA for 40a0d58

• add rock, paper buttons

  ChrisWiles

  committed
  185944b

  Copy full SHA for 185944b

• Add tooltip attributes

  sxcw

  committed
  ba5ce7c

  Copy full SHA for ba5ce7c

• fix navbar

  Dillonjay

  committed
  fbd254f

  Copy full SHA for fbd254f

• Merge pull request #33 from striking-lunatics/fix/css

  Show description for 65cd180
  

  Dillon

  authored
  65cd180

  Copy full SHA for 65cd180

• Add CSS to make tooltip text show up

  sxcw

  committed
  db920f4

  Copy full SHA for db920f4

• chat display below input. add background image.

  Dillonjay

  committed
  79d7f78

  Copy full SHA for 79d7f78

• Merge pull request #34 from striking-lunatics/fix/css

  Show description for e2112da
  mccarthyist

  authored
  e2112da

  Copy full SHA for e2112da

• wins and losses working

  burtoncooke1

  committed
  75695a1

  Copy full SHA for 75695a1

• merge conflicts resolved

  burtoncooke1

  committed
  b3a9937

  Copy full SHA for b3a9937

• Merge pull request #35 from striking-lunatics/feature/wins-losses

  Show description for 448e34b
  

  Dillon

  authored
  448e34b

  Copy full SHA for 448e34b

• css files now local

  ChrisWiles

  committed
  b81a68c

  Copy full SHA for b81a68c

• Remove players that score zero

  sxcw

  committed
  9e5e917

  Copy full SHA for 9e5e917

• game timestamp working

  burtoncooke1

  committed
  7104f79

  Copy full SHA for 7104f79

• fixed in game chat

  mccarthyist

  committed
  f4e8b7b

  Copy full SHA for f4e8b7b

• Merge pull request #36 from striking-lunatics/feature/wins-losses

  Show description for 5777505
  mccarthyist

  authored
  5777505

  Copy full SHA for 5777505

• Merge pull request #37 from striking-lunatics/fix/gameChat

  Show description for 701ab8d
  burtoncooke1

  authored
  701ab8d

  Copy full SHA for 701ab8d

• Merge branch 'master' into feature/pieChart

  sxcw

  committed
  cdddeed

  Copy full SHA for cdddeed

• Merge pull request #38 from striking-lunatics/feature/pieChart

  Show description for 838974b
  burtoncooke1

  authored
  838974b

  Copy full SHA for 838974b

• fix css

  Dillonjay

  committed
  2e89aab

  Copy full SHA for 2e89aab

• fix merge

  Dillonjay

  committed
  8892d13

  Copy full SHA for 8892d13

• chat fb picture

  ChrisWiles

  committed
  4020981

  Copy full SHA for 4020981

• add class name to player in battleground

  Dillonjay

  committed
  ec146c9

  Copy full SHA for ec146c9