Queues - Allison Northrop - Trek - #34

Open

Allison-Northrop wants to merge 18 commits into

Ada-C7:masterfrom

Allison-Northrop:master

Commits on May 23, 2017

got the names of the trips to show up
Allison-Northrop
committed
5e5d0cd
Added continent trip is one, week duration and formatting
Allison-Northrop
committed
a0b17fd

Commits on May 24, 2017

Commits on May 25, 2017

got the id's working with the description
Allison-Northrop
committed
abfda58
got the info(including category and cost) to show - only the slide up isn't working
Allison-Northrop
committed
faf2f22

Commits on May 26, 2017

committing to switch to new branch
Allison-Northrop
committed
a4f8925
trying to get .hide function to work
Allison-Northrop
committed
1dc8567
got a form to show up
Allison-Northrop
committed
fde6236
switching to new branch
Allison-Northrop
committed
f23be8b
fixed merge conflicts
Allison-Northrop
committed
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
switching to slide branch
Allison-Northrop
committed
84c04ea
fixed something wrong with the form section tag
Allison-Northrop
committed
8a56dce

Commits on May 30, 2017

changed the html so it would recognize and save the correct trip id
Allison-Northrop
committed
b7edc7f
added styling
Allison-Northrop
committed
e9a0ef2