Quincy Larson 
							
						 
					 
					
						
						
							
						
						ae38aab8cc 
					 
					
						
						
							
							fix issue with codemirror framework and script tag rendering  
						
						 
						
						
						
						
					 
					
						2015-07-31 16:38:12 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						2547868854 
					 
					
						
						
							
							fix storage and reset functionality for js and html challenge views  
						
						 
						
						
						
						
					 
					
						2015-07-31 13:37:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						742a49b70d 
					 
					
						
						
							
							fix mainjs resetEditor  
						
						 
						
						
						
						
					 
					
						2015-06-20 22:48:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Cay 
							
						 
					 
					
						
						
							
						
						437a564e34 
					 
					
						
						
							
							Changed dependency on challenge_key to function  
						
						 
						
						
						
						
					 
					
						2015-06-19 18:22:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Cay 
							
						 
					 
					
						
						
							
						
						11305c152b 
					 
					
						
						
							
							Update coursewaresJSFramework_0.0.6.js  
						
						 
						
						
						
						
					 
					
						2015-06-19 18:02:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Cay 
							
						 
					 
					
						
						
							
						
						60354d24e6 
					 
					
						
						
							
							Auto Save, Removed Stamps +more  
						
						 
						
						... 
						
						
						
						Removed stamps so code stays stored until code has been reset. 
--> Added a feature which returns if the storage has been saved since last edit. *codeStorage.hasSaved()* 
--> Changed "localBonfire" to *codeStorage* 
						
						
					 
					
						2015-06-19 17:47:21 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						ccc29b7fcb 
					 
					
						
						
							
							improve upon @lemonyandrew pull request  
						
						 
						
						
						
						
					 
					
						2015-06-19 17:26:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						6078b54393 
					 
					
						
						
							
							Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging  
						
						 
						
						
						
						
					 
					
						2015-06-19 16:18:56 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						d5ea05e448 
					 
					
						
						
							
							Merge branch 'Lemony-Andrew-master' into staging  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/views/coursewares/showBonfire.jade 
						
						
					 
					
						2015-06-19 16:17:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						0173804e21 
					 
					
						
						
							
							updates helmet policies, makes new startup script  
						
						 
						
						
						
						
					 
					
						2015-06-18 17:08:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andrew Cay 
							
						 
					 
					
						
						
							
						
						a53114e7b6 
					 
					
						
						
							
							Update and rename coursewaresJSFramework_0.0.5.js to coursewaresJSFramework_0.0.6.js  
						
						 
						
						... 
						
						
						
						Added auto save(to local storage) for any progress. It will set the IDE text to whatever the user last saw within 24 hours. 
The auto save happens every 1.5 seconds _after_ someone lifts a key. 
						
						
					 
					
						2015-06-15 22:47:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						b6fc2551d9 
					 
					
						
						
							
							Merge branch 'interview' into staging  
						
						 
						
						... 
						
						
						
						Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json 
						
						
					 
					
						2015-06-14 01:02:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						25e500a457 
					 
					
						
						
							
							Merge branch 'staging' of  http://github.com/FreeCodeCamp/freecodecamp  into staging  
						
						 
						
						
						
						
					 
					
						2015-06-09 16:49:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						870c80d72d 
					 
					
						
						
							
							Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch.  
						
						 
						
						
						
						
					 
					
						2015-06-09 16:46:41 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						b84d41bcd6 
					 
					
						
						
							
							write tests for first 5 jquery challenges  
						
						 
						
						
						
						
					 
					
						2015-06-07 18:29:00 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						6953cb6347 
					 
					
						
						
							
							make the view even more compact  
						
						 
						
						
						
						
					 
					
						2015-06-06 22:55:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						7cfca0b5f8 
					 
					
						
						
							
							Bump a delay on test runs and show pattern for expect tests  
						
						 
						
						
						
						
					 
					
						2015-06-06 23:58:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						e5a8c27e07 
					 
					
						
						
							
							Add emmet functionality to html views  
						
						 
						
						
						
						
					 
					
						2015-06-06 20:10:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						f002e7c3f7 
					 
					
						
						
							
							Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches.  
						
						 
						
						
						
						
					 
					
						2015-06-04 22:35:42 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						193f9d16db 
					 
					
						
						
							
							Set a refresh on codemirror instance rather than setting the cursor position.  Closes   #640  
						
						 
						
						
						
						
					 
					
						2015-05-28 19:51:42 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						131b9ad1b7 
					 
					
						
						
							
							bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes #  
						
						 
						
						
						
						
					 
					
						2015-05-28 14:13:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						718ae04f2f 
					 
					
						
						
							
							Add ability to test editor contents. Ensures classes are implemented, closes # 684  
						
						 
						
						
						
						
					 
					
						2015-05-28 08:26:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						57fad7d923 
					 
					
						
						
							
							proper fix for uncomment html challenge, improved codemirror performance  
						
						 
						
						
						
						
					 
					
						2015-05-27 15:29:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						6a2d365b9a 
					 
					
						
						
							
							Update framework version, set cursor to line 15 on load to force full display.  Closes   #653  
						
						 
						
						
						
						
					 
					
						2015-05-27 14:40:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						cad39e1b5e 
					 
					
						
						
							
							Fixes duplication bug in Firefox  
						
						 
						
						
						
						
					 
					
						2015-05-27 13:39:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						fa43dd1051 
					 
					
						
						
							
							Unbind click handler on next-courseware-button to prevent repeated presses from advancing more than one challenge  
						
						 
						
						
						
						
					 
					
						2015-05-26 12:32:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						ff6e11433c 
					 
					
						
						
							
							Update bonfire framework to know how to use chai.should()  
						
						 
						
						
						
						
					 
					
						2015-05-26 10:41:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						186d320d01 
					 
					
						
						
							
							version updates to force browser fetch so buttons works  
						
						 
						
						
						
						
					 
					
						2015-05-26 09:14:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						6ce5ccf449 
					 
					
						
						
							
							Rename framework file to force new browser fetching. Update view to remove unused vars  
						
						 
						
						
						
						
					 
					
						2015-05-26 02:31:10 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						1c4b40c8e6 
					 
					
						
						
							
							Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username  
						
						 
						
						
						
						
					 
					
						2015-05-25 17:27:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						5e918bdd7c 
					 
					
						
						
							
							Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename.  
						
						 
						
						
						
						
					 
					
						2015-05-20 22:31:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						16ca72f716 
					 
					
						
						
							
							Update views for new variable names. Get profile view working. Update challenge map.  
						
						 
						
						
						
						
					 
					
						2015-05-20 21:50:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								terakilobyte 
							
						 
					 
					
						
						
							
						
						a174a1c630 
					 
					
						
						
							
							Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js  
						
						 
						
						
						
						
					 
					
						2015-05-19 22:31:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						45d4954a43 
					 
					
						
						
							
							fix script tag importing issue in coursewares  
						
						 
						
						
						
						
					 
					
						2015-05-18 22:25:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						68962d4d82 
					 
					
						
						
							
							further improvements to coursewares and bonfires  
						
						 
						
						
						
						
					 
					
						2015-05-10 22:33:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						d63b8f01be 
					 
					
						
						
							
							improve bonfires and js coursewares  
						
						 
						
						
						
						
					 
					
						2015-05-10 21:59:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						4d3337df32 
					 
					
						
						
							
							Merge branch 'ziplines' into ux-improvements  
						
						 
						
						... 
						
						
						
						Conflicts:
	views/coursewares/showJS.jade 
						
						
					 
					
						2015-03-28 00:24:41 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						f7f7fb39b9 
					 
					
						
						
							
							start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds  
						
						 
						
						
						
						
					 
					
						2015-03-27 14:36:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						6e0da758e0 
					 
					
						
						
							
							finish wiring in buttons and hotkeys  
						
						 
						
						
						
						
					 
					
						2015-03-22 01:38:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						ac511982a4 
					 
					
						
						
							
							User facing challenge mentions now point to coursewares, remove completed view from account/show  
						
						 
						
						
						
						
					 
					
						2015-03-21 18:42:19 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						6ad7c22313 
					 
					
						
						
							
							Working on codemirror display issue in html coursewares  
						
						 
						
						
						
						
					 
					
						2015-03-21 16:34:06 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						191e38472e 
					 
					
						
						
							
							make selected indenting and outdenting work on courseware HTML, JS and Bonfires  
						
						 
						
						
						
						
					 
					
						2015-03-14 15:07:05 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						e3c9e42fce 
					 
					
						
						
							
							showJS view now shows errors in a pretty format (kinda)  
						
						 
						
						
						
						
					 
					
						2015-02-14 18:43:45 -05: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						b5c0ad9942 
					 
					
						
						
							
							Building out new challenge framework to allow controller to determine view type for challenge  
						
						 
						
						
						
						
					 
					
						2015-02-13 20:55:49 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						f8f0c3454a 
					 
					
						
						
							
							subtle completed challenge button for courseware and add completionMessage to coursewares  
						
						 
						
						
						
						
					 
					
						2015-02-12 16:48:35 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Q Larson 
							
						 
					 
					
						
						
							
						
						a1507a969b 
					 
					
						
						
							
							Add should and assert to coursewares and write code to test multiple instances of an element for a condition  
						
						 
						
						
						
						
					 
					
						2015-02-10 22:22:40 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Leniz 
							
						 
					 
					
						
						
							
						
						4fa6c9c65d 
					 
					
						
						
							
							iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code  
						
						 
						
						
						
						
					 
					
						2015-02-08 01:12:40 -05:00