Code

Jblg#7

Code

Open

lgranger wants to merge 53 commits intoAda-C4:jblgAda-C4/2048-rails:jblgfrom lgranger:jblglgranger/2048-rails:jblgCopy head branch name to clipboard

+733-117

Commits

Commits on Feb 8, 2016

• new rails, user model, sessions controller, gems

  

  Lauren Granger

  committed
  ccbc5b7

• find and create methods for new users in user model

  

  Lauren Granger

  committed
  81f9d84

• add create and destroy methods to sessions controller

  jbuechs

  committed
  22be941

• Merge branch 'jblg' of github.com:lgranger/2048-rails into jblg

  jbuechs

  committed
  d232d57

• login not working

  jbuechs

  committed
  3179fff

Commits on Feb 9, 2016

• add omniauth config file

  jbuechs

  committed
  8660ceb

• navbar css

  

  Lauren Granger

  committed
  d19696d

• more navbar styles

  

  Lauren Granger

  committed
  a23d5b2

• login and logout functionality working

  

  Lauren Granger

  committed
  c6fb38c

• game controller and comments for what the game functions should be

  

  Lauren Granger

  committed
  03fcfe5

Commits on Feb 10, 2016

• work on the AJAX button for save game

  

  Lauren Granger

  committed
  80696ec

• change post and routes for saving game

  jbuechs

  committed
  211bdef

• add gamestate field to game model

  jbuechs

  committed
  065b2e0

• add game save logic for new game

  jbuechs

  committed
  07a2d38

• updating games to the db successsfuly

  

  Lauren Granger

  committed
  89d458b

• bugfix for error where player can't play when not logged in

  jbuechs

  committed
  9e6c5f6

• new game sets new game id in session

  

  Lauren Granger

  committed
  b55907d

• working on loading game - json parsing not working

  jbuechs

  committed
  0b46b87

Commits on Feb 11, 2016

• change saving of gamestate to parsed json in database

  jbuechs

  committed
  3a78bab

• loaded game theoretically functional

  jbuechs

  committed
  493de95

• fix update save game bug and remove extra console logs

  jbuechs

  committed
  fe3cb4f

• new show views route

  

  Lauren Granger

  committed
  a1962d7

• game score migration

  

  Lauren Granger

  committed
  13b045b

• fix merge conflicts

  

  Lauren Granger

  committed
  1e5716e

• fix unfixed merge issue

  

  Lauren Granger

  committed
  3770042

• game score saving and pulling from db

  

  Lauren Granger

  committed
  8b14cba

• moving to partial

  jbuechs

  committed
  8429a89

• pulling top games and user's games from the db

  

  Lauren Granger

  committed
  e6799d6

• reworked langauge at the bottom of the page

  

  Lauren Granger

  committed
  64bc835

• load game is updated when new game is saved

  jbuechs

  committed
  c538aa8

• game loading merged

  jbuechs

  committed
  c15b655

• bugfix to load games on document ready

  jbuechs

  committed
  6ef185c

• update navbar to not link to show games

  jbuechs

  committed
  c548ff1

• create simple grid layout

  jbuechs

  committed
  2e7afeb

• fix load game click error on homepage load

  jbuechs

  committed
  c825925

• fancy saved message apperates on click of save button

  

  Lauren Granger

  committed
  23178e9

• Merge branch 'jblg' of github.com:lgranger/2048-rails into jblg

  

  Lauren Granger

  committed
  569d6a2

Commits on Feb 12, 2016

• style game list

  jbuechs

  committed
  f8f1ead

• add logic to check whether game is over

  jbuechs

  committed
  7b635ac

• style navbar

  jbuechs

  committed
  63560e0

• format navbar

  jbuechs

  committed
  2b7cd2c

• add leaderboard on game load

  jbuechs

  committed
  55bacbf

• Merge branch 'jblg' of github.com:lgranger/2048-rails into jblg

  

  Lauren Granger

  committed
  470e7fa

• change container min width

  jbuechs

  committed
  38fe45f

• merge

  jbuechs

  committed
  84fed89

• Merge branch 'leaderboard' into jblg

  jbuechs

  committed
  b0cf1a8

• add leaderboard

  jbuechs

  committed
  3a46276

• load leaderboard every 3 seconds

  jbuechs

  committed
  949e11a

• add delete game functionality

  jbuechs

  committed
  5b41011

• complete delete game functionality

  jbuechs

  committed
  620e86f

• format your games table

  jbuechs

  committed
  ef7a198

• refactor loadLeaderboard to game_manager

  jbuechs

  committed
  6ed0f03

• refactor loadsavedgames function to game_manager

  jbuechs

  committed
  49ba967