Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements ...

Conflicts:
	views/coursewares/showJS.jade

2015-03-28 00:24:41 -07:00

..

coursewaresHCJQFramework_v0.1.1.js

start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds

2015-03-27 14:36:17 -07:00

coursewaresJSFramework.js

Merge branch 'ziplines' into ux-improvements

2015-03-28 00:24:41 -07:00

iFrameScripts.js

Show tests on html view

2015-02-14 18:31:32 -05:00