Code

Arh/master#43

Code

Open

lacuchilla wants to merge 29 commits intoAda-C4:arh/masterAda-C4/SinatraSite:arh/masterfrom lacuchilla:arh/masterlacuchilla/SinatraSite:arh/masterCopy head branch name to clipboard

+223-183

Commits

Commits on Oct 27, 2015

• add pry gem

  hougland

  committed
  4b35a0a

  Copy full SHA for 4b35a0a

• add sinatra gem

  hougland

  committed
  7b3131d

  Copy full SHA for 7b3131d

• add html files from project from yesterday

  hougland

  committed
  3bfece9

  Copy full SHA for 3bfece9

• testing filepaths to link to other parts of site

  hougland

  committed
  75ec71d

  Copy full SHA for 75ec71d

• testing another filepath

  hougland

  committed
  98ab96f

  Copy full SHA for 98ab96f

• added photos from personal computer instead of internet

  hougland

  committed
  3214a29

  Copy full SHA for 3214a29

Commits on Oct 28, 2015

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

  Show description for 464eeb7
  Hamled

  committed
  464eeb7

  Copy full SHA for 464eeb7

• Add wave 2 requirements

  kariabancroft

  committed
  66fc2c0

  Copy full SHA for 66fc2c0

• Revert "Rlh/master"

  kariabancroft

  committed
  9747a9a

  Copy full SHA for 9747a9a

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

  Show description for f3fdebe
  kariabancroft

  committed
  f3fdebe

  Copy full SHA for f3fdebe

• Added changes from comments from Kari about Wave 1.

  lacuchilla

  committed
  222e91c

  Copy full SHA for 222e91c

• Merge branch 'master' into arh/master

  lacuchilla

  committed
  df420a2

  Copy full SHA for df420a2

• Added public folder with empty css file and renamed all 4 view erb files to have underscores in the file names as well as corrected relative links in each of the footers.

  lacuchilla

  committed
  1b8fe1c

  Copy full SHA for 1b8fe1c

Commits on Oct 29, 2015

• changed root routes in my-site.rb to reflect the new names of the erb files

  lacuchilla

  committed
  e14ae38

  Copy full SHA for e14ae38

• added correct routes to my-file.rb

  lacuchilla

  committed
  649ce7b

  Copy full SHA for 649ce7b

• Changed a bunch of things, but I'm still not sure what I'm doing.

  lacuchilla

  committed
  695a070

  Copy full SHA for 695a070

• messing around with layout and yeild concepts. Not quite getting what I want.

  lacuchilla

  committed
  0e0911a

  Copy full SHA for 0e0911a

• fixed links in header so they navigate to the proper pages

  lacuchilla

  committed
  dfb2345

  Copy full SHA for dfb2345

• adjusted styling to images in about me and index files

  lacuchilla

  committed
  16467d9

  Copy full SHA for 16467d9

• adjusted styling for the layout page

  lacuchilla

  committed
  8149b3f

  Copy full SHA for 8149b3f

• took out redundant links from footer in view pages

  lacuchilla

  committed
  5cd121c

  Copy full SHA for 5cd121c

Commits on Oct 30, 2015

• adjusted indentation in layout page and put the link hrefs and the meta charset in the head portion of the layout page.

  lacuchilla

  committed
  9b7003a

  Copy full SHA for 9b7003a

• Added feature to layout page that automatically shows the current year.

  lacuchilla

  committed
  5409e4c

  Copy full SHA for 5409e4c

• changed things

  lacuchilla

  committed
  d0b6e36

  Copy full SHA for d0b6e36

• more tweaking of code

  lacuchilla

  committed
  457d826

  Copy full SHA for 457d826

• renamed the stylesheet and did some more tweaking of things.

  lacuchilla

  committed
  a3d196f

  Copy full SHA for a3d196f

• add all the things

  lacuchilla

  committed
  77eb160

  Copy full SHA for 77eb160

Commits on Nov 2, 2015

• More tweaks and such.

  lacuchilla

  committed
  8c57a45

  Copy full SHA for 8c57a45

Commits on Nov 6, 2015

• add file

  lacuchilla

  committed
  bf0d477

  Copy full SHA for bf0d477