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

Conflicts:
	views/coursewares/showJS.jade

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

..

angular

Finish proof of concept of angular forms, added validation

2015-01-06 02:27:08 -05:00

angular-bootstrap

Finish proof of concept of angular forms, added validation

2015-01-06 02:27:08 -05:00

bonfire

Merge branch 'ziplines' into ux-improvements

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

chai

courseware testing implemented

2015-02-04 19:59:51 -05:00

codemirror

Refactor routing, minor display tweaks

2015-01-27 20:12:51 -05:00

codemirror-accessible

Change layout to grab ionicons css framework from local files

2015-02-02 20:53:48 -05:00

coursewares

Merge branch 'ziplines' into ux-improvements

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

jailed

Work on bonfire and make better .jshintrc files

2015-01-16 18:58:27 -05:00

moment

added automatic time logic to live-pair-programming page

2015-02-12 20:31:11 -08:00

ramda

Ramda upgrade

2015-02-21 11:38:03 +09:00

bootstrap.min.js

windows-cr line endings commit

2014-07-01 17:05:49 -04:00

jquery-2.1.1.min.js

Updated jQuery to 2.1.1

2014-06-06 15:36:08 -04:00