413 Commits

Author	SHA1	Message	Date
Quincy Larson	50039184e9	Merge branch 'master' into staging	2015-05-23 17:46:08 -07:00
Quincy Larson	ef25bfdcb8	fix some typos and add new cities	2015-05-23 17:05:46 -07:00
Quincy Larson	27a35e65a7	make a ton of small improvements related to github issues	2015-05-23 16:48:55 -07:00
Quincy Larson	f90b96e28c	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-05-22 23:37:01 -07:00
Quincy Larson	9da9b01607	update challenge map challenge	2015-05-22 23:36:42 -07:00
terakilobyte	b626c811d0	Add initial I need help button and slack webhook integration	2015-05-23 02:26:29 -04:00
Quincy Larson	7279559c41	Merge branch 'staging' into nonprofit-improvements ... Conflicts: controllers/resources.js seed_data/bonfires.json views/partials/navbar.jade	2015-05-22 19:36:15 -07:00
Quincy Larson	b9adbd5976	add jobs page	2015-05-22 19:30:56 -07:00
Quincy Larson	38f6d62abb	fix typo on bonfire	2015-05-22 09:08:21 -07:00
Quincy Larson	ce76090367	fix typo	2015-05-21 21:42:45 -07:00
Quincy Larson	94850e8ca6	update bonfires and mdn links	2015-05-21 18:59:55 -07:00
Quincy Larson	0d2ac75b76	update cities	2015-05-21 17:21:00 -07:00
Berkeley Martinez	da19361c85	Merge pull request #468 from sageio/master ... fix typo on line 97 of coursewwares.json	2015-05-21 09:33:48 -07:00
Berkeley Martinez	0bd4d350f4	Merge pull request #458 from phoenixstormcrow/phoenixstormcrow-374 ... Added MDN links to Bonfire 19: Diff Two Arrays	2015-05-21 08:20:13 -07:00
Berkeley Martinez	4ad757ebd5	Merge pull request #466 from terakilobyte/challenge-restructure ... Challenge restructure	2015-05-21 00:12:52 -07:00
Quincy Larson	ff4a239f1d	update cities	2015-05-20 22:46:21 -07:00
terakilobyte	16f9478c3e	Move bonfire view into courseware view folder. Update seed file to exit when finished.	2015-05-21 00:34:51 -04:00
terakilobyte	ca36f636a8	Migration script written.	2015-05-20 23:35:32 -04:00
Quincy Larson	76a49e2ec5	update cities	2015-05-20 11:21:42 -07:00
terakilobyte	77ddaa5b3a	Add challenge type 5 to all bonfires	2015-05-20 11:13:55 -04:00
LumenTeun	7b9faabd32	Github => GitHub	2015-05-20 16:29:05 +02: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	e659d8c7fa	factor challenges and bonfires into smaller json files	2015-05-19 01:58:25 -07:00
Quincy Larson	4a30545511	Merge branch 'master' into challenge-restructure	2015-05-19 01:19:05 -07:00
Quincy Larson	733dce6a06	update cities, improve chat room challenge	2015-05-19 01:15:17 -07:00
Quincy Larson	ae70d0abd9	Merge branch 'courseware' into challenge-restructure	2015-05-18 23:33:03 -07:00
Quincy Larson	1e866868f5	Merge branch 'challenge-restructure' of github.com:FreeCodeCamp/freecodecamp into challenge-restructure	2015-05-18 23:32:34 -07:00
Quincy Larson	fb864a8136	update cities	2015-05-18 23:10:46 -07:00
phoenixstormcrow	ad248a4830	Added MDN links to bonfire 19: Diff Two Arrays ... Fixes FreeCodeCamp/freecodecamp#374	2015-05-18 22:40:09 -07:00
Quincy Larson	45d4954a43	fix script tag importing issue in coursewares	2015-05-18 22:25:48 -07:00
Sage Elliott	51257be6a4	fix typo on line 97 of coursewwares.json	2015-05-18 21:25:22 -07:00
terakilobyte	ba29f0533a	Updated to show how json should be modeled, fleshed out resources to load new challengeMap stub	2015-05-18 22:03:27 -04:00
terakilobyte	e6851b22d8	Minor updates	2015-05-18 21:20:32 -04:00
Quincy Larson	1c6edd6fee	improve zipline tips, add additional coursewares.	2015-05-17 23:16:47 -07:00
Quincy Larson	8077d37f11	add coursewares and note to zipline basejump views	2015-05-17 16:57:16 -07:00
Quincy Larson	57948768bb	QA many of the earlier challenges	2015-05-17 14:58:03 -07:00
Quincy Larson	49c23bbedf	finish rough bootstrap waypoints	2015-05-17 11:56:07 -07:00
Quincy Larson	a9895b920c	add additional local groups	2015-05-17 10:24:03 -07:00
Quincy Larson	a635c87a49	add bootstrap coursewares	2015-05-16 23:53:31 -07:00
Quincy Larson	a90e84f7d5	add further coursewares	2015-05-16 11:19:28 -07:00
Quincy Larson	0724a2ca27	add new cities	2015-05-16 09:30:49 -07:00
Quincy Larson	570e8e5693	add local groups	2015-05-16 00:14:38 -07:00
Quincy Larson	2d981d833c	additional work on courseware	2015-05-15 23:34:20 -07:00
terakilobyte	94abc6cf5b	Begin restructuring all Coursewares and Bonfires to one unified model and flow.	2015-05-16 00:39:43 -04:00
Quincy Larson	8981be2dca	add more courseware and a working submit route	2015-05-15 18:43:07 -07:00
Quincy Larson	be5ea93be5	add more local groups	2015-05-15 15:14:34 -07:00
Quincy Larson	80ceb15714	fix linkedin issue	2015-05-15 13:39:12 -07:00
Quincy Larson	1d1b1ef41f	rearrange local groups	2015-05-14 23:22:54 -07:00
Quincy Larson	8f6093296c	add additional cities	2015-05-14 23:21:02 -07:00
Quincy Larson	0e75d251b5	improvements to fieldguide with alex-dixon	2015-05-13 15:31:32 -07:00