Code

Jmn/master#40

Code

Open

jennaplusplus wants to merge 39 commits intoAda-C4:jmn/masterAda-C4/SinatraSite:jmn/masterfrom jennaplusplus:jmn/masterjennaplusplus/SinatraSite:jmn/masterCopy head branch name to clipboard

+285-302

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

• updated CV

  jennaplusplus

  committed
  2311c0f

  Copy full SHA for 2311c0f

• updated about page

  jennaplusplus

  committed
  25a0f1e

  Copy full SHA for 25a0f1e

• 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

• updated css file

  jennaplusplus

  committed
  e7f27bb

  Copy full SHA for e7f27bb

• Merge remote-tracking branch 'upstream/master' into jmn/master

  jennaplusplus

  committed
  9f2402d

  Copy full SHA for 9f2402d

Commits on Oct 29, 2015

• decent home page

  jennaplusplus

  committed
  f8312b8

  Copy full SHA for f8312b8

• updated main page

  jennaplusplus

  committed
  7f87744

  Copy full SHA for 7f87744

• decenter main page

  jennaplusplus

  committed
  3802b14

  Copy full SHA for 3802b14

• decent projects page

  jennaplusplus

  committed
  65a5592

  Copy full SHA for 65a5592

• decent blog

  jennaplusplus

  committed
  0a87a2a

  Copy full SHA for 0a87a2a

• Update README.md

  kariabancroft

  committed
  1c81fee

  Copy full SHA for 1c81fee

• Update README.md

  kariabancroft

  committed
  a4b34eb

  Copy full SHA for a4b34eb

• replaced lyrics with ruby loop

  jennaplusplus

  committed
  8cb249a

  Copy full SHA for 8cb249a

• added test layout/partial

  jennaplusplus

  committed
  531ea3f

  Copy full SHA for 531ea3f

• added year to index page

  jennaplusplus

  committed
  43ab2e9

  Copy full SHA for 43ab2e9

• Merge remote-tracking branch 'upstream/master' into jmn/master

  jennaplusplus

  committed
  dc00b1d

  Copy full SHA for dc00b1d

• added copyright

  jennaplusplus

  committed
  fdce180

  Copy full SHA for fdce180

• added Ruby to about page

  jennaplusplus

  committed
  a292963

  Copy full SHA for a292963

• added variable for page title

  jennaplusplus

  committed
  66deeb9

  Copy full SHA for 66deeb9

• template and partial for index

  jennaplusplus

  committed
  e88e407

  Copy full SHA for e88e407

• layout with all pages

  jennaplusplus

  committed
  e19c5c5

  Copy full SHA for e19c5c5

• changed blog formatting

  jennaplusplus

  committed
  8042d1d

  Copy full SHA for 8042d1d

Commits on Oct 30, 2015

• working version of all pages

  jennaplusplus

  committed
  24217a6

  Copy full SHA for 24217a6

• updated projects page

  jennaplusplus

  committed
  80c4a24

  Copy full SHA for 80c4a24

• fixed inaccessible link on projects page

  jennaplusplus

  committed
  f506c60

  Copy full SHA for f506c60

• random link in albert logo

  jennaplusplus

  committed
  87ba27b

  Copy full SHA for 87ba27b

• created div to replace stroop image

  jennaplusplus

  committed
  f204aa6

  Copy full SHA for f204aa6

• fixed stroop again

  jennaplusplus

  committed
  93a6eb6

  Copy full SHA for 93a6eb6

• wave 3

  jennaplusplus

  committed
  35a28a4

  Copy full SHA for 35a28a4

Commits on Nov 6, 2015

• added Procfile

  jennaplusplus

  committed
  3bb785a

  Copy full SHA for 3bb785a