Code

Queues - Allison Northrop - Trek#34

Code

Open

Allison-Northrop wants to merge 18 commits intoAda-C7:masterAda-C7/trek:masterfrom Allison-Northrop:masterAllison-Northrop/trek:masterCopy head branch name to clipboard

+213

Commits

Commits on May 23, 2017

• got the names of the trips to show up

  Allison-Northrop

  committed
  5e5d0cd

  Copy full SHA for 5e5d0cd

• Added continent trip is one, week duration and formatting

  Allison-Northrop

  committed
  a0b17fd

  Copy full SHA for a0b17fd

Commits on May 24, 2017

• refactored to utilize underscore in html

  Allison-Northrop

  committed
  c9d8200

  Copy full SHA for c9d8200

• linked the trip title to trip details (summary, cost, category)

  Allison-Northrop

  committed
  7e5b8a4

  Copy full SHA for 7e5b8a4

• added styles.css

  Allison-Northrop

  committed
  68d1623

  Copy full SHA for 68d1623

• added drop down function

  Allison-Northrop

  committed
  a1644b4

  Copy full SHA for a1644b4

Commits on May 25, 2017

• got the id's working with the description

  Allison-Northrop

  committed
  abfda58

  Copy full SHA for abfda58

• got the info(including category and cost) to show - only the slide up isn't working

  Allison-Northrop

  committed
  faf2f22

  Copy full SHA for faf2f22

Commits on May 26, 2017

• committing to switch to new branch

  Allison-Northrop

  committed
  a4f8925

  Copy full SHA for a4f8925

• trying to get .hide function to work

  Allison-Northrop

  committed
  1dc8567

  Copy full SHA for 1dc8567

• got a form to show up

  Allison-Northrop

  committed
  fde6236

  Copy full SHA for fde6236

• switching to new branch

  Allison-Northrop

  committed
  f23be8b

  Copy full SHA for f23be8b

• fixed merge conflicts

  Allison-Northrop

  committed
  7677288

  Copy full SHA for 7677288

• added a new template to fix the empty description bug. Still need to deal with not calling the api more thna once even if the title is clicked on again.

  Allison-Northrop

  committed
  857a2e8

  Copy full SHA for 857a2e8

• switching to slide branch

  Allison-Northrop

  committed
  84c04ea

  Copy full SHA for 84c04ea

• fixed something wrong with the form section tag

  Allison-Northrop

  committed
  8a56dce

  Copy full SHA for 8a56dce

Commits on May 30, 2017

• changed the html so it would recognize and save the correct trip id

  Allison-Northrop

  committed
  b7edc7f

  Copy full SHA for b7edc7f

• added styling

  Allison-Northrop

  committed
  e9a0ef2

  Copy full SHA for e9a0ef2