Code

Sat/master#44

Code

Open

trowbrsa wants to merge 22 commits intoAda-C4:sat/masterAda-C4/SinatraSite:sat/masterfrom trowbrsa:sat/mastertrowbrsa/SinatraSite:sat/masterCopy head branch name to clipboard

+277-115

Commits

Commits on Oct 27, 2015

• add pry gem

  hougland

  committed
  4b35a0a

• add sinatra gem

  hougland

  committed
  7b3131d

• add html files from project from yesterday

  hougland

  committed
  3bfece9

• testing filepaths to link to other parts of site

  hougland

  committed
  75ec71d

• testing another filepath

  hougland

  committed
  98ab96f

• added photos from personal computer instead of internet

  hougland

  committed
  3214a29

Commits on Oct 28, 2015

• Merge pull request Ada-C4#20 from hougland/rlh/master

  Show description for 464eeb7
  Hamled

  committed
  464eeb7

• Added more space between blocks in my-site.rb

  trowbrsa

  committed
  b7cd5bd

• Add wave 2 requirements

  kariabancroft

  committed
  66fc2c0

• Revert "Rlh/master"

  kariabancroft

  committed
  9747a9a

• Merge pull request Ada-C4#23 from Ada-C4/revert-20-rlh/master

  Show description for f3fdebe
  kariabancroft

  committed
  f3fdebe

• Merge branch 'master' into sat/master

  trowbrsa

  committed
  f3e6813

Commits on Oct 29, 2015

• Added more CSS to homepage

  trowbrsa

  committed
  39732f2

• Added copyright to footer

  trowbrsa

  committed
  b2d103c

• Added layout.erb file, commented out duplicate information

  trowbrsa

  committed
  d6b87b1

• Added time.now method

  trowbrsa

  committed
  e9737a8

Commits on Oct 30, 2015

• Finalized self method for blog

  trowbrsa

  committed
  0af3141

• Updated footer

  trowbrsa

  committed
  15f5914

• Added more CSS styling to layout

  trowbrsa

  committed
  b46cef6

Commits on Nov 2, 2015

• Final commit for Wave 3

  trowbrsa

  committed
  28485b3

• Took out duplicate code for footer

  trowbrsa

  committed
  8a4f99f

Commits on Nov 6, 2015

• final commit before Heroku deployment

  trowbrsa

  committed
  01beab1