Code

code working #20

Code

Open

jasminejeane wants to merge 48 commits intosf-wdi-25:mastersf-wdi-25/tunely:masterfrom chencaleb:masterchencaleb/Tunely:masterCopy head branch name to clipboard

+995-191

Commits

Commits on Mar 3, 2016

• first commit

  chencaleb

  committed
  23b2e7b

• completed first sprint

  chencaleb

  committed
  82b9e08

Commits on Mar 4, 2016

• sprint 2 step 3

  chencaleb

  committed
  b5a5556

• user can create album

  chencaleb

  committed
  78db5d3

• v1

  chencaleb

  committed
  27273c1

• Adds ejs

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  462b842

• Fixes ejs problem

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  a8fabb1

• Merge pull request #1 from chencaleb/albumdelete

  Show description for ca73889
  chencaleb

  committed
  ca73889

• Adds working delete button

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  4c9f859

• Merge pull request #2 from chencaleb/albumdelete

  Show description for f5a6a0f
  chencaleb

  committed
  f5a6a0f

• creates genre

  chencaleb

  committed
  764328b

• creates genre model/view

  chencaleb

  committed
  6cccbd6

• Merge pull request #3 from chencaleb/createGenre

  Show description for d0fa9d0
  FranchiniMae

  committed
  d0fa9d0

• created genre view page

  chencaleb

  committed
  1705806

Commits on Mar 5, 2016

• Merge pull request #4 from chencaleb/createGenre

  Show description for da1bbf6
  FranchiniMae

  committed
  da1bbf6

• fix master merge conflicts

  chencaleb

  committed
  6690941

• Adds working delete button for genres

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  1244ed8

• Merge pull request #5 from chencaleb/deletegenre

  Show description for e6a9374
  chencaleb

  committed
  e6a9374

• reordering code

  chencaleb

  committed
  031b137

• fix merge conflict

  chencaleb

  committed
  4f72058

• user can create genres

  chencaleb

  committed
  9385936

• Merge pull request #6 from chencaleb/createGenreFeature

  Show description for ce6dc1e
  FranchiniMae

  committed
  ce6dc1e

• editing genre.ejs

  chencaleb

  committed
  12d465f

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

  chencaleb

  committed
  97bab47

Commits on Mar 6, 2016

• update albums feature

  chencaleb

  committed
  3bfc73f

• Merge pull request #8 from chencaleb/updateFeature

  Show description for 37ffad4
  chencaleb

  committed
  37ffad4

• edit genre

  jasminejeane

  committed
  08928ea

• Merge pull request #9 from chencaleb/updateg

  Show description for 5d17395
  chencaleb

  committed
  5d17395

Commits on Mar 7, 2016

• working on adding image

  jasminejeane

  committed
  dea91f8

• fixed typo with genre id

  jasminejeane

  committed
  dd0fb5b

• Merge pull request #10 from chencaleb/updateg

  Show description for 4155b18
  FranchiniMae

  committed
  4155b18

• Adds commit after pulling updateg

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  8a78155

• Adds incomplete navbar

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  b0bcae7

• Merge pull request #11 from chencaleb/navbar

  Show description for 20da889
  FranchiniMae

  committed
  20da889

• css style changes

  jasminejeane

  committed
  5b40f39

• splash page

  chencaleb

  committed
  80ab397

• user can see image on genre page

  jasminejeane

  committed
  64b9421

• splashpage

  chencaleb

  committed
  202484d

• Adds vinyl icon to navbar

  

  YOUR_GITHUB_USERNAME

  authored and

  YOUR_GITHUB_USERNAME

  committed
  1a67948

• Merge pull request #12 from chencaleb/navbar

  Show description for f4cac51
  chencaleb

  committed
  f4cac51

• change fade in time

  chencaleb

  committed
  fe58a08

• changed fade time

  chencaleb

  committed
  8c984a5

• fix merge conflicts

  chencaleb

  committed
  b48b8ed

• Merge pull request #13 from chencaleb/splashpage

  Show description for 9e1b163
  chencaleb

  committed
  9e1b163

• vapor font working

  jasminejeane

  committed
  226f966

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

  jasminejeane

  committed
  7e2455a

• fix merge conflict

  chencaleb

  committed
  a1d4526

• Merge pull request #15 from chencaleb/css2

  Show description for ea6069b
  chencaleb

  committed
  ea6069b