Commit Graph

14 Commits (e3890785a2d328b246f4859f3d8608bdfefd621e)

Author SHA1 Message Date
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Berkeley Martinez 748f7ab93f Progress towards refactoring 2015-11-29 16:21:04 -08:00
Berkeley Martinez 87fa38182e bundle vendor files 2015-11-29 16:20:17 -08:00
Quincy Larson 60d059f71e remove angular from bower file and scripts 2015-10-06 16:17:31 -07:00
Quincy Larson 118c71e57e fix css issue and use bower instead of files 2015-09-14 14:05:43 -07:00
Quincy Larson 4d0017a4d4 bower install jshint and build more coursewares 2015-05-11 23:40:04 -07:00
Quincy Larson d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Quincy Larson 8867fe42d7 get angular working in bower 2015-05-03 14:28:03 -07:00
Quincy Larson c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Sahat Yalkabov 2410aaa74a cleaner assets structure 2013-11-14 00:46:43 -05:00
Sahat Yalkabov a6ab977396 Handle bootstrap, jquery and angular via Bower 2013-11-14 00:33:44 -05:00
Sahat Yalkabov 06b777cce9 Cleanup 2013-11-13 15:49:58 -05:00
Sahat Yalkabov bc463f80c3 Small adjustments 2013-11-13 12:37:40 -05:00
Sahat Yalkabov d4b651a5c8 Imported MEAN stack files 2013-11-13 12:32:22 -05:00