Commit Graph

9 Commits

Author SHA1 Message Date
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
terakilobyte
56e45ba9dd resolve merge conflict 2015-04-15 18:35:06 -04:00
terakilobyte
9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
Geoff Storbeck
e6272d4c7e Forgot comma on the end of the new entry to bonfireMDNlinks.js 2015-04-04 12:22:29 -04:00
Ashley Drake
85c996ad2e Added bonfire links for level 3. 2015-03-26 10:45:33 -04:00
Ashley Drake
c053069f23 Added bonfire links for level 2. 2015-03-26 10:34:59 -04:00
A. Drake
c4624b7f20 links added, basic functionality working across pages. 2015-03-24 01:17:21 -04:00
A. Drake
dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
A. Drake
0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00