| 
							
							
								 Quincy Larson | e322b3b7d6 | Merge branch 'master' into modals Conflicts:
	seed_data/field-guides.json
	views/coursewares/showHTML.jade | 2015-05-28 17:25:34 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 1c76a104db | Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp | 2015-05-28 17:24:00 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 7e08f9d8f5 | update videos | 2015-05-28 17:22:45 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | a9d8992b88 | fix if else syntax in Jade and add cities | 2015-05-28 16:59:25 -07:00 |  | 
			
				
					| 
							
							
								 terakilobyte | dbf265bd22 | Merge branch 'master' into staging | 2015-05-28 19:53:27 -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 |  | 
			
				
					| 
							
							
								 Quincy Larson | 560e66527b | add jobs | 2015-05-28 16:40:22 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 8501de396f | finish fixing modals | 2015-05-28 16:18:04 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 673a617151 | create pair, help, bug modals | 2015-05-28 14:29:45 -07:00 |  | 
			
				
					| 
							
							
								 Jonathan Montesinos | 7b40edf000 | computer-science spanish translation | 2015-05-28 15:51:49 -05:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 28f1efaab1 | Merge branch 'master' into staging | 2015-05-28 14:14:05 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 72505915f8 | Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging | 2015-05-28 14:13:56 -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 |  | 
			
				
					| 
							
							
								 Quincy Larson | 5d71b87027 | fix another typo in html curriculum | 2015-05-28 10:32:59 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | e7b9a90fbe | add back omitted cities - sorry everyone! | 2015-05-28 10:24:49 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 29fec57af4 | Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp | 2015-05-28 10:07:26 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | cb4c572591 | remove slashes from BR tags and correct Spanish sentence | 2015-05-28 10:07:03 -07:00 |  | 
			
				
					| 
							
							
								 Berkeley Martinez | 167305031f | Update show.jade Typo | 2015-05-28 08:58:01 -07:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 731cd57e8e | closes #702 | 2015-05-28 11:32:41 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | aa6ae15d40 | Fixes typo, closed #700 | 2015-05-28 11:21:18 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 8633315e74 | Fixes test, closes #699 | 2015-05-28 11:13:42 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 625167baf3 | Unifies styling in instructions, closes #638 | 2015-05-28 11:02:41 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 94a303b42b | Betters tests for borders challenge, closes #572. | 2015-05-28 09:49:09 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 08cdc10363 | Updates test hint display, closes #673 | 2015-05-28 09:18:46 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 894428f6e2 | Matches test output hint to instructions for link to external pages challenge, closes #677 | 2015-05-28 09:13:28 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 3fbf84cf21 | Ensures a button has been fully declared, fixes #683 | 2015-05-28 09:08:44 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 14ff6d5306 | Fix typo in waypoint name responsively style radio buttons, closes #667 | 2015-05-28 08:34:22 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | c61a95eae5 | Consistent use of <code>img</code> in add borders challenge, closes #670 | 2015-05-28 08:32:27 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 5fd4ce0030 | Fix typo in import a font family, closes # 698 | 2015-05-28 08:29:35 -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 | f6cebdea27 | Tests correct <a> tag for presence of href attribute set to '#', closes # 686 | 2015-05-28 07:20:50 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 119060dc3f | Reorder tests to display in clockwise notation, fixes typos in tests to match condition, closes #665 | 2015-05-28 07:07:18 -04:00 |  | 
			
				
					| 
							
							
								 LumenTeun | 8f7eea116a | Prevents incorrect solution to Mutations bonfire | 2015-05-28 12:59:25 +02:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 268f585050 | References correct expressworks challenges, closes #692 | 2015-05-28 06:59:11 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | e3fff3808e | Linkifies image in custom heading challenge, closes #693 | 2015-05-28 06:55:03 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 4dcaac8bc5 | Specifies to add a solid border, closes #694 | 2015-05-28 06:51:17 -04:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 077cfabd26 | one last json fix | 2015-05-28 02:14:27 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | cc0fba35e5 | more minor fixes to json | 2015-05-28 02:10:44 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | b2d3416a57 | fix typo | 2015-05-28 02:00:51 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 6dda97b002 | Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp | 2015-05-28 01:33:16 -07:00 |  | 
			
				
					| 
							
							
								 Quincy Larson | 28d2f700c2 | add multi-lingual placeholders and update announcement modal | 2015-05-28 01:32:56 -07:00 |  | 
			
				
					| 
							
							
								 Nathan | e21d25ab45 | Merge pull request #678 from FreeCodeCamp/staging Update README.md | 2015-05-27 22:16:19 -04:00 |  | 
			
				
					| 
							
							
								 Nathan | bca88b78f1 | Update README.md | 2015-05-27 22:15:30 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | bae1c954af | Fix tests for mobile responsive image | 2015-05-27 16:58:16 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | bada25f381 | Improve mobile view of showHTML | 2015-05-27 16:42:08 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 5a1261c449 | fix typo in test for responsive image | 2015-05-27 16:15:27 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | b82f62665a | add tests to ensure clockwise margin | 2015-05-27 16:10:38 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 5f752933d9 | Tests source of second image in mobile responsive challenge. Closes #661 | 2015-05-27 16:01:46 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | 880a51c154 | Replace ableist word crazy with energetic, closed #659 | 2015-05-27 15:43:58 -04:00 |  | 
			
				
					| 
							
							
								 terakilobyte | ad668a6ff5 | Fix typo in test for padding challenge. Closes #658 | 2015-05-27 15:39:14 -04:00 |  |