Code

Changed placeholder text in view#13

Code

Open

nreddy216 wants to merge 65 commits intosf-wdi-25:mastersf-wdi-25/tunely:masterfrom nscalf561:masterCopy head branch name to clipboard

+974-231

Commits

Commits on Mar 3, 2016

• end of step 1 sprint 1

  nscalf561

  committed
  b0a1318

  Copy full SHA for b0a1318

• add space

  nreddy216

  committed
  7ccf0ce

  Copy full SHA for 7ccf0ce

• fixed merge conflict

  nreddy216

  committed
  d0c9ed6

  Copy full SHA for d0c9ed6

• Finishes Step 1 Sprint 1

  nscalf561

  committed
  d3a4312

  Copy full SHA for d3a4312

• did nothing

  nreddy216

  committed
  711e664

  Copy full SHA for 711e664

• fixed merge conflict 2

  nreddy216

  committed
  eb20edd

  Copy full SHA for eb20edd

• merging

  93lucasp

  committed
  69ad5dc

  Copy full SHA for 69ad5dc

• merging

  93lucasp

  committed
  4358e2f

  Copy full SHA for 4358e2f

• adds /api/albums

  nscalf561

  committed
  55014da

  Copy full SHA for 55014da

• merging1

  93lucasp

  committed
  706009d

  Copy full SHA for 706009d

• merging1

  93lucasp

  committed
  628cd01

  Copy full SHA for 628cd01

• Adds Seed and Database

  nscalf561

  committed
  093dbf6

  Copy full SHA for 093dbf6

• Finishes Sprint 1, links db to api/albums

  nscalf561

  committed
  59655a1

  Copy full SHA for 59655a1

• update

  nreddy216

  committed
  d4ade36

  Copy full SHA for d4ade36

• merging2

  93lucasp

  committed
  63674ec

  Copy full SHA for 63674ec

• fixed renderFile, adds ejs formatting

  nscalf561

  committed
  6c59feb

  Copy full SHA for 6c59feb

• working on merge

  nscalf561

  committed
  02f76ce

  Copy full SHA for 02f76ce

• Merge branch 'master' of https://github.com/nscalf561/tunely

  93lucasp

  committed
  5e03c08

  Copy full SHA for 5e03c08

• form done

  93lucasp

  committed
  9071887

  Copy full SHA for 9071887

• add create route to api albums

  nreddy216

  committed
  2cab258

  Copy full SHA for 2cab258

• Merge pull request #1 from nscalf561/form

  Show description for 3444294
  93lucasp

  committed
  3444294

  Copy full SHA for 3444294

• fix duplicate line

  nreddy216

  committed
  ee0cfb8

  Copy full SHA for ee0cfb8

Commits on Mar 4, 2016

• adds functional form in index

  nscalf561

  committed
  dba4306

  Copy full SHA for dba4306

• functional version

  nscalf561

  committed
  0c11a07

  Copy full SHA for 0c11a07

• Request Ajax completed and fixed bug lat box

  93lucasp

  committed
  2f9899f

  Copy full SHA for 2f9899f

• merged ajax branch with master

  93lucasp

  committed
  9622bba

  Copy full SHA for 9622bba

• half way through sprint 3

  nscalf561

  committed
  e8db737

  Copy full SHA for e8db737

• fixes a typo error

  nscalf561

  committed
  8580c63

  Copy full SHA for 8580c63

• Request Ajax completed and bug fixed

  93lucasp

  committed
  4183fe8

  Copy full SHA for 4183fe8

• Merge pull request #3 from nscalf561/ajax

  Show description for c9bbfa4
  nscalf561

  committed
  c9bbfa4

  Copy full SHA for c9bbfa4

• changed placeholder text

  nreddy216

  committed
  589a30a

  Copy full SHA for 589a30a

• Merge pull request #4 from nscalf561/fixView

  Show description for 5f01acc
  nscalf561

  committed
  5f01acc

  Copy full SHA for 5f01acc

• adds model updates

  nscalf561

  committed
  3e13c93

  Copy full SHA for 3e13c93

• Merge branch 'master' of https://github.com/nscalf561/tunely into sprint3

  nscalf561

  committed
  eb13105

  Copy full SHA for eb13105

• non-functional sprint3 branch

  nscalf561

  committed
  fd38fd1

  Copy full SHA for fd38fd1

• adds songs onto albums

  nscalf561

  committed
  6368572

  Copy full SHA for 6368572

• adds album id's to divs'

  nscalf561

  committed
  eae30f2

  Copy full SHA for eae30f2

• add modal

  93lucasp

  committed
  c0d395c

  Copy full SHA for c0d395c

• about to pull

  nscalf561

  committed
  46adde3

  Copy full SHA for 46adde3

Commits on Mar 5, 2016

• retrieves album.id. Need to build post to interact with the database

  nscalf561

  committed
  d725304

  Copy full SHA for d725304

Commits on Mar 6, 2016

• removes previous functionality, adds ajax work

  nscalf561

  committed
  c7d41e1

  Copy full SHA for c7d41e1

• added route and semi functional delete button

  nreddy216

  committed
  6f658eb

  Copy full SHA for 6f658eb

• adds create album functionality

  nscalf561

  committed
  8146b0d

  Copy full SHA for 8146b0d

• delete route and method working

  nreddy216

  committed
  699458d

  Copy full SHA for 699458d

• Merge pull request #6 from nscalf561/refactoringAjax

  Show description for 0571710
  nscalf561

  committed
  0571710

  Copy full SHA for 0571710

• solves merge conflicts

  nscalf561

  committed
  26bf83d

  Copy full SHA for 26bf83d

• Merge pull request #5 from nscalf561/deleteMethod

  Show description for 477089a
  nscalf561

  committed
  477089a

  Copy full SHA for 477089a

• update missing last part

  93lucasp

  committed
  493262d

  Copy full SHA for 493262d

• update done

  93lucasp

  committed
  32d2c5a

  Copy full SHA for 32d2c5a

Commits on Mar 7, 2016

• about to merge

  nscalf561

  committed
  f20565c

  Copy full SHA for f20565c

• solves merge conflicts

  nscalf561

  committed
  c99e06d

  Copy full SHA for c99e06d

• Merge pull request #7 from nscalf561/update

  Show description for a227663
  nscalf561

  committed
  a227663

  Copy full SHA for a227663

• modal now pops up

  nreddy216

  committed
  fba1003

  Copy full SHA for fba1003

• adds some styling, makes buttons sexy

  nscalf561

  committed
  0e09197

  Copy full SHA for 0e09197

• Merge pull request #8 from nscalf561/branchToMerge

  Show description for 66a160e
  nscalf561

  committed
  66a160e

  Copy full SHA for 66a160e

• solves merge conflicts

  nscalf561

  committed
  a83da8c

  Copy full SHA for a83da8c

• Merge pull request #9 from nscalf561/addSongs

  Show description for f5d5b69
  nscalf561

  committed
  f5d5b69

  Copy full SHA for f5d5b69

• add image urls

  nreddy216

  committed
  b8f8d53

  Copy full SHA for b8f8d53

• added logo and some css stylin

  nreddy216

  committed
  1abc8d9

  Copy full SHA for 1abc8d9

• added album images and songs to seed file

  nreddy216

  committed
  8c9a52a

  Copy full SHA for 8c9a52a

• fixed bug on save

  nreddy216

  committed
  cd8d396

  Copy full SHA for cd8d396

• styling

  nreddy216

  committed
  9d84dee

  Copy full SHA for 9d84dee

• Merge pull request #10 from nscalf561/addImages

  Show description for 7cc05a0
  nscalf561

  committed
  7cc05a0

  Copy full SHA for 7cc05a0

Commits on Mar 9, 2016

• login functionality on one page app without using separate login page

  nreddy216

  committed
  96af377

  Copy full SHA for 96af377

• Merge pull request #11 from nscalf561/oauth

  Show description for d7eb1b0
  nreddy216

  committed
  d7eb1b0

  Copy full SHA for d7eb1b0