Commit Graph

9 Commits

Author SHA1 Message Date
Michael Q Larson
f4fcb565f4 Merge branch 'master' into ux-improvements
Conflicts:
	seed_data/coursewares.json
2015-02-22 18:17:47 -08:00
Michael Q Larson
19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Nathan Leniz
dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09:00
Nathan Leniz
ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Nathan Leniz
3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
Nathan Leniz
9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz
693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson
fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08:00
Michael Q Larson
a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00