Code

2048-rails Dfparh/master#2

Code

Open

lacuchilla wants to merge 102 commits intoAda-C4:dfparh/masterAda-C4/2048-rails:dfparh/masterfrom dezshino:dfparh/masterdezshino/2048-rails:dfparh/masterCopy head branch name to clipboard

+622-48

Commits

Commits on Feb 8, 2016

• Delete excess words from game page

  dezshino

  committed
  81d414c

  Copy full SHA for 81d414c

• Add gems for omniauth

  lacuchilla

  committed
  14ffc5b

  Copy full SHA for 14ffc5b

• Add dotenv-rails to gemfiles, add .env to gitignore

  dezshino

  committed
  6eb9339

  Copy full SHA for 6eb9339

• Set up for omniauth, add sessions controller

  dezshino

  committed
  ba1d6fb

  Copy full SHA for ba1d6fb

• Add a user model

  dezshino

  committed
  25411ab

  Copy full SHA for 25411ab

• Add uid to user model

  dezshino

  committed
  31d5e7c

  Copy full SHA for 31d5e7c

• Add login and log out routes, add to sessions controller

  dezshino

  committed
  2e27c56

  Copy full SHA for 2e27c56

• Correct typo in nav file and add some methods to user model

  lacuchilla

  committed
  a28c7af

  Copy full SHA for a28c7af

Commits on Feb 9, 2016

• Remove navbar until working to test other parts

  dezshino

  committed
  73fa07b

  Copy full SHA for 73fa07b

• Add login path view for now

  dezshino

  committed
  a68ea5e

  Copy full SHA for a68ea5e

• change file name

  dezshino

  committed
  38860b7

  Copy full SHA for 38860b7

• Remove script

  dezshino

  committed
  086cd8b

  Copy full SHA for 086cd8b

• Add bootstrap

  dezshino

  committed
  af63575

  Copy full SHA for af63575

• Bootstrap config

  dezshino

  committed
  0e51f88

  Copy full SHA for 0e51f88

• Styled navbar to remove whitespace above it

  lacuchilla

  committed
  f53980d

  Copy full SHA for f53980d

• Define current user

  dezshino

  committed
  1a24526

  Copy full SHA for 1a24526

• Move navbar to right of screen and add thoughts file.

  lacuchilla

  committed
  91b96a2

  Copy full SHA for 91b96a2

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into amy

  lacuchilla

  committed
  51cf1d2

  Copy full SHA for 51cf1d2

• Add fixed-top-class to navbar and remove unneeded code

  dezshino

  committed
  faad39b

  Copy full SHA for faad39b

• Trying things

  lacuchilla

  committed
  af99b66

  Copy full SHA for af99b66

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into amy

  lacuchilla

  committed
  ccf92d2

  Copy full SHA for ccf92d2

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  lacuchilla

  committed
  be16715

  Copy full SHA for be16715

• Merge branch 'amy' into dfparh/master

  lacuchilla

  committed
  c029d86

  Copy full SHA for c029d86

• Add find_or_create_from_omniauth method to User model

  dezshino

  committed
  b1bd184

  Copy full SHA for b1bd184

• Add method to find or create from omniauth to user model

  dezshino

  committed
  cc5a4c7

  Copy full SHA for cc5a4c7

• Merge branch 'desiree' into dfparh/master

  dezshino

  committed
  ff062b7

  Copy full SHA for ff062b7

• add a few methods

  lacuchilla

  committed
  8adf557

  Copy full SHA for 8adf557

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into amy

  lacuchilla

  committed
  90f856f

  Copy full SHA for 90f856f

• Create a game model

  dezshino

  committed
  0742c72

  Copy full SHA for 0742c72

• Set up active record relation between users and games

  dezshino

  committed
  a16bbd1

  Copy full SHA for a16bbd1

• Merge branch 'desiree' into dfparh/master

  dezshino

  committed
  d29d913

  Copy full SHA for d29d913

• Add games controller

  dezshino

  committed
  18b4280

  Copy full SHA for 18b4280

• More work on logging in

  lacuchilla

  committed
  fcfc582

  Copy full SHA for fcfc582

• Change game_state in the game model from a string to a text

  dezshino

  committed
  5bc3578

  Copy full SHA for 5bc3578

• fix login/logout. Things seem to be working

  lacuchilla

  committed
  a59eeee

  Copy full SHA for a59eeee

Commits on Feb 10, 2016

• Change game state from string to text

  dezshino

  committed
  7093c60

  Copy full SHA for 7093c60

• Begin to add controller methods for api endpoints

  lacuchilla

  committed
  d1f6004

  Copy full SHA for d1f6004

• Clean up navbar code, move login and out links to the right

  dezshino

  committed
  720a33a

  Copy full SHA for 720a33a

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  dezshino

  committed
  0731c9e

  Copy full SHA for 0731c9e

• More additions to games controller

  lacuchilla

  committed
  d89c438

  Copy full SHA for d89c438

• set default order for games association

  dezshino

  committed
  1a048a3

  Copy full SHA for 1a048a3

• fix order to have lambda

  dezshino

  committed
  5d7ef1c

  Copy full SHA for 5d7ef1c

• Add resource for games

  dezshino

  committed
  3d43f39

  Copy full SHA for 3d43f39

• Working on saving a game to the database

  dezshino

  committed
  b08d370

  Copy full SHA for b08d370

• Able to save games to database

  dezshino

  committed
  4a9da5a

  Copy full SHA for 4a9da5a

• Able to load from database on refresh

  dezshino

  committed
  a2929ee

  Copy full SHA for a2929ee

• Add commented out notes

  dezshino

  committed
  8d2e401

  Copy full SHA for 8d2e401

• Fix height of score containers

  dezshino

  committed
  5c86971

  Copy full SHA for 5c86971

• Adjust navbar links

  dezshino

  committed
  0263621

  Copy full SHA for 0263621

• Add container class for bootstrap, Create a view for a users games

  dezshino

  committed
  4b08896

  Copy full SHA for 4b08896

• Remove excess div

  dezshino

  committed
  813d016

  Copy full SHA for 813d016

• Add migration for adding the provider and image url to users model

  lacuchilla

  committed
  c66d808

  Copy full SHA for c66d808

• Fix merge conflict in games controller

  lacuchilla

  committed
  8334b7f

  Copy full SHA for 8334b7f

• Working on code for creating and saving games

  dezshino

  committed
  6e78ac5

  Copy full SHA for 6e78ac5

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  dezshino

  committed
  88d9e74

  Copy full SHA for 88d9e74

• Add user image and blank default image

  lacuchilla

  committed
  bfea777

  Copy full SHA for bfea777

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into amy

  lacuchilla

  committed
  3d28bf3

  Copy full SHA for 3d28bf3

• Begin working on leaderboard view

  lacuchilla

  committed
  825d5ba

  Copy full SHA for 825d5ba

• Game is updated with every move

  dezshino

  committed
  e737f22

  Copy full SHA for e737f22

Commits on Feb 11, 2016

• More messing around with leaderboard

  lacuchilla

  committed
  aad60d5

  Copy full SHA for aad60d5

• New game works and games autosave/patch with every move

  dezshino

  committed
  586c581

  Copy full SHA for 586c581

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  dezshino

  committed
  852699d

  Copy full SHA for 852699d

• Remove unused code

  dezshino

  committed
  56e6f1d

  Copy full SHA for 56e6f1d

• Remove line of code that was causing refresh to error

  dezshino

  committed
  31abb5d

  Copy full SHA for 31abb5d

• Send MyGames navbar link to games index

  dezshino

  committed
  e1f3d2e

  Copy full SHA for e1f3d2e

• Start building My Games page

  dezshino

  committed
  48d3cdd

  Copy full SHA for 48d3cdd

• Create a table for My Games

  dezshino

  committed
  410d29b

  Copy full SHA for 410d29b

• 2048 link in navbar goes to root_path now

  dezshino

  committed
  774c2bb

  Copy full SHA for 774c2bb

• Begin work on adding score to game object

  lacuchilla

  committed
  d04421b

  Copy full SHA for d04421b

• Format dates for now

  dezshino

  committed
  2657b21

  Copy full SHA for 2657b21

• Display a message instead of table if there are no games

  dezshino

  committed
  29e9cd6

  Copy full SHA for 29e9cd6

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  dezshino

  committed
  01b176d

  Copy full SHA for 01b176d

• Fix broken code

  lacuchilla

  committed
  ad931f5

  Copy full SHA for ad931f5

• Fix spacing

  dezshino

  committed
  ee27497

  Copy full SHA for ee27497

• Can delete games now in My Games page

  dezshino

  committed
  e297c14

  Copy full SHA for e297c14

• Improve navbar styling

  dezshino

  committed
  266e8c2

  Copy full SHA for 266e8c2

• Make dates more readable

  dezshino

  committed
  f0e1061

  Copy full SHA for f0e1061

• Update create method in games controller

  lacuchilla

  committed
  bd42c84

  Copy full SHA for bd42c84

• Fix merge conflict in game params

  lacuchilla

  committed
  872e3b7

  Copy full SHA for 872e3b7

• Add best score attribute to user model

  lacuchilla

  committed
  84e3b7b

  Copy full SHA for 84e3b7b

Commits on Feb 12, 2016

• Add score

  dezshino

  committed
  9be4232

  Copy full SHA for 9be4232

• Fix update, also has score now

  dezshino

  committed
  0e837b1

  Copy full SHA for 0e837b1

• Resume game works

  dezshino

  committed
  7610d50

  Copy full SHA for 7610d50

• Commented out notes

  dezshino

  committed
  aed6401

  Copy full SHA for aed6401

• Remove unneccessary instance variable symbols

  dezshino

  committed
  5a80948

  Copy full SHA for 5a80948

• Require login

  dezshino

  committed
  34b7b73

  Copy full SHA for 34b7b73

• Undo for now

  dezshino

  committed
  0b356e4

  Copy full SHA for 0b356e4

• Add require login back in, wasn't the issue

  dezshino

  committed
  82d856a

  Copy full SHA for 82d856a

• Add table-hover style to My Games table

  dezshino

  committed
  196205d

  Copy full SHA for 196205d

• Update styling

  dezshino

  committed
  64ee9e2

  Copy full SHA for 64ee9e2

• Match games index font color to gameboard color

  dezshino

  committed
  f2a406d

  Copy full SHA for f2a406d

• Populate leaderboard with user id and high scores

  lacuchilla

  committed
  7f871dd

  Copy full SHA for 7f871dd

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into amy

  lacuchilla

  committed
  057aecb

  Copy full SHA for 057aecb

• Setup flash notices

  dezshino

  committed
  3e23f30

  Copy full SHA for 3e23f30

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  dezshino

  committed
  7438d7e

  Copy full SHA for 7438d7e

• Move flash message down so they show

  dezshino

  committed
  3f7fe70

  Copy full SHA for 3f7fe70

• Add leaderboard ranking

  lacuchilla

  committed
  1932046

  Copy full SHA for 1932046

• Merge branch 'dfparh/master' of github.com:desireepoland/2048-rails into dfparh/master

  lacuchilla

  committed
  7113d2d

  Copy full SHA for 7113d2d

• Add bootstrap rows to header info in line

  dezshino

  committed
  72a1d6d

  Copy full SHA for 72a1d6d

• Add another row, everything centered now

  dezshino

  committed
  8c53d8d

  Copy full SHA for 8c53d8d

• Game works for non signed in users now

  dezshino

  committed
  fe80903

  Copy full SHA for fe80903

• Styling for table on leaderboard page

  lacuchilla

  committed
  fe886e0

  Copy full SHA for fe886e0