Code

Submitting 2048 Rails#1

Code

Open

emgord wants to merge 58 commits intoAda-C4:egah/masterAda-C4/2048-rails:egah/masterfrom emgord:egah/masteremgord/2048-rails:egah/masterCopy head branch name to clipboard

+744-58

Commits

Commits on Feb 8, 2016

• gem install

  annaleeherrera

  committed
  cd62763

• omniauth facebook

  annaleeherrera

  committed
  1c09dd0

• added callback for facebook oauth

  emgord

  committed
  f27ef9a

• working on creating users from omniauth fb

  emgord

  committed
  4cf7932

• added tests for find or create from omniauth

  emgord

  committed
  da29efe

Commits on Feb 9, 2016

• rspec tests and login and logout routes

  annaleeherrera

  committed
  02efcc6

• sessions new login and root route

  annaleeherrera

  committed
  e2d91f3

• fb omniauth working and creating new users

  emgord

  committed
  9529f81

• all tests working

  emgord

  committed
  1fe52ea

• require login working

  emgord

  committed
  648bef0

• logout path added

  emgord

  committed
  c215e00

• gamesetup model and migration

  annaleeherrera

  committed
  b30155f

• api endpoint for retrieving games from db is set up

  emgord

  committed
  4280e56

• show method and updating validations

  annaleeherrera

  committed
  deb31d1

• added font awesome and bootstrap

  emgord

  committed
  8f08c2a

Commits on Feb 10, 2016

• created remote storage manager

  emgord

  committed
  16f5160

• RemoteStorage getGame function building

  annaleeherrera

  committed
  59d91d1

• game setup method work

  annaleeherrera

  committed
  4eacbbd

• you can load games from the db

  emgord

  committed
  0dc4b2c

• merge conflicts resolved

  emgord

  committed
  6a308f4

• setGameState function work

  annaleeherrera

  committed
  e9837bb

• troubleshooting post game state

  emgord

  committed
  6c25d98

• post request is working to create method, need to handle on the rails side

  emgord

  committed
  063abfc

Commits on Feb 11, 2016

• create method for gamesetup controller

  annaleeherrera

  committed
  bedc148

• games can be saved. hooray

  emgord

  committed
  7407c6e

• added navbar and alert style

  emgord

  committed
  a4e367b

• added x to alert

  emgord

  committed
  5a27cbd

• minor change to nav

  emgord

  committed
  1a93ef5

• added styling for game play page

  emgord

  committed
  1cb4bc1

• save game functionality

  annaleeherrera

  committed
  ed90c9c

• working on load game button

  emgord

  committed
  c583d36

• Merge branch 'egah/master' into loadgame/master

  emgord

  committed
  283d0d7

• css save game and score

  annaleeherrera

  committed
  00a4619

• play game function passes id of desired game to load controller method

  emgord

  committed
  d5c839e

Commits on Feb 12, 2016

• working on click to load game

  emgord

  committed
  158df96

• user can load saved games

  emgord

  committed
  9417c7e

• removed commented out code that is no longer needed

  emgord

  committed
  4821744

• removed unneeded load route from project

  emgord

  committed
  cef5abc

• Merge pull request #1 from emgord/loadgame/master

  Show description for ab5f4bf
  emgord

  committed
  ab5f4bf

• return high score method

  annaleeherrera

  committed
  f5219ad

• Merge branch 'leaderboard' into egah/master

  annaleeherrera

  committed
  760d7d0

• removed some text from home page

  emgord

  committed
  0ea9a4a

• commented out all places where best score is being pulled from local storage

  emgord

  committed
  958eda9

• leaderboard page and home icon

  annaleeherrera

  committed
  08e0783

• high score is pulling from db when logged in

  emgord

  committed
  bcbdefd

• removed some info from home page

  emgord

  committed
  e0e4944

• remove save button if not logged in

  emgord

  committed
  7c64e1d

• Merge pull request #3 from emgord/bestscoreshow

  Show description for 903a5e6
  emgord

  committed
  903a5e6

• Merge branch 'egah/master' into style

  emgord

  committed
  f616e81

• delete button

  annaleeherrera

  committed
  a9715d2

• Merge branch 'deletegames' into egah/master

  annaleeherrera

  committed
  3588d5a

• score boxes are the correct size now

  emgord

  committed
  e87d3c5

• fix form for leaderboard

  annaleeherrera

  committed
  0a4b00c

• Merge branch 'style' into egah/master

  emgord

  committed
  e3e69bb

• flash notice when game saved successfully

  emgord

  committed
  43944a3

• flash notice when game is detroyed

  emgord

  committed
  718729e

• change localhost to heroku link

  annaleeherrera

  committed
  f24dc99

• handle if user does not have any saved games high score is zero

  emgord

  committed
  3753225