Commit Graph

1845 Commits (9e41b0ca7b2d7fd5d4f2ca20d25c3abe21db258a)

Author SHA1 Message Date
Michael Q Larson 9e41b0ca7b minor refactor on bonfire framework.js 2015-01-21 16:59:19 -08:00
Michael Q Larson ae50945e1a update default copy in bonfire playground 2015-01-21 16:03:14 -08:00
Quincy Larson 2486d88942 Merge pull request #45 from FreeCodeCamp/bonfire-improvement
Bonfire improvement
2015-01-21 15:50:27 -08:00
Michael Q Larson 3810b4d9ae Merge branch 'master' into bonfire-improvement
Conflicts:
	views/bonfire/bonfire.jade
2015-01-21 15:42:08 -08:00
Michael Q Larson b1f22ef925 update the title on bonfire.js 2015-01-21 15:38:39 -08:00
Michael Q Larson 6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	controllers/bonfire.js
2015-01-21 15:37:14 -08:00
Michael Q Larson 93e15a6d1f get a better info footer icon 2015-01-21 15:36:07 -08:00
Nathan Leniz bf1d8cd81a Improving bonfire layout to remove the need for scrolling and allow the input and output elements to grow dynamically with user input 2015-01-21 18:10:21 -05:00
Michael Q Larson 87625387ff update node.js and npm versions to edge and update package.json 2015-01-21 14:37:10 -08:00
Michael Q Larson 9385b666e3 specify that we're using English in the layout file and state the npm and node version in package.json' 2015-01-21 14:29:16 -08:00
Nathan Leniz c422f9474b More improvements, keyboard shortcuts working again, extra protection against fatal errors 2015-01-21 17:17:45 -05:00
Michael Q Larson 14bd902eec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-21 14:14:52 -08:00
Michael Q Larson e5a407eacd make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags' 2015-01-21 14:12:19 -08:00
Nathan e6930c58c4 Merge pull request #41 from iheartkode/master
Added a title to bonfire for seo
2015-01-21 10:22:46 -05:00
jmcshane 62648a4103 Cleanup after final changes 2015-01-21 01:49:50 -05:00
jmcshane 6a15e4e8f8 Finalizing code after testing 2015-01-21 01:48:48 -05:00
jmcshane 03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Michael Q Larson da0180e7eb update twitch.tv link 2015-01-20 20:28:01 -08:00
Michael Q Larson 92a8107fcd add twitch to footer and update the live pair programming page 2015-01-20 20:05:23 -08:00
Michael Q Larson 9e3f5eadc6 update live code 2015-01-20 18:17:25 -08:00
Michael Q Larson 38de94138d update live-pair-programming 2015-01-20 18:14:35 -08:00
Nathan Leniz 202805dc52 preparing for integration of testing 2015-01-20 20:35:25 -05:00
Nathan Leniz a4dc2f0206 marginal steps towards removing scrollbars and scrolling from bonfire viewports 2015-01-20 16:44:09 -05:00
Nathan Leniz 15eb0c0ef0 Turn off css boxing for view debugging 2015-01-20 15:22:04 -05:00
Nathan Leniz 7e46af3d42 Major refactor of Bonfire.jade to pull out all JS and put into framework.js, resizing font to 14px and setting to Ubuntu Mono, permanently change layout of bonfire.jade to 2 column responsive 2015-01-20 15:21:11 -05:00
Nathan Leniz bfb711166c further improvement of bonfire view 2015-01-20 03:10:24 -05:00
Nathan Leniz bb87cc4bb3 Pre View configurating 2015-01-20 02:19:39 -05:00
Nathan Leniz cc3fa8e5f7 Configurating Console.log 2015-01-20 00:36:14 -05:00
Nathan Leniz 4755bfcb56 Reset to working condition 2015-01-19 23:52:39 -05:00
Michael Q Larson 88d353a3ca add new counselors and add legacy route for about path 2015-01-19 10:31:31 -08:00
Michael Q Larson 0dcce67763 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	public/css/main.less
2015-01-18 16:13:23 -08:00
Nathan Leniz 53e5d06147 Improving bonfire and adding testing 2015-01-18 19:10:03 -05:00
Michael Q Larson f6603aadae work with @brndnb to improve usability of completion modals and write client-side jquery to prevent post if user isn't authenticated, which fixes a javascript error we were experiencing on serverside 2015-01-18 13:36:24 -08:00
iheartkode 1c6f95bdca Added a title to bonfire for seo 2015-01-18 08:30:44 -08:00
Michael Q Larson 1e427d723c fix bug that was crashing heroku 2015-01-17 19:07:57 -08:00
Nathan 610af83978 Merge pull request #37 from FreeCodeCamp/one-column-challenges
Fix Twitter auth, make challenge view single-column, fix some navbar issues, add footer, add bonfire
2015-01-17 21:56:07 -05:00
Michael Q Larson bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
Michael Q Larson 7722c20877 Merge branch 'twitter-auth' of https://github.com/FreeCodeCamp/freecodecamp into one-column-challenges
Conflicts:
	app.js
2015-01-17 17:46:12 -08:00
Michael Q Larson a9d52c82c0 improve footer and add navbar link to bonfire 2015-01-17 17:30:10 -08:00
Michael Q Larson be2e224f93 Merge branch 'footer' into one-column-challenges
Conflicts:
	public/css/main.less
2015-01-17 17:05:52 -08:00
Michael Q Larson c3a114c45a Simplify challenge view and make bolder modals. Remove duplicate bootstrap.js inclusion that was causing glitches. 2015-01-17 16:36:10 -08:00
Michael Q Larson 0c935623b7 Fix hamburger menu weirdness 2015-01-17 16:09:35 -08:00
webdev c90d062f7b Enables twitter users to immediately log in to FCC without having to reauthorize the app 2015-01-17 17:44:06 -05:00
Michael Q Larson 7727368f34 turned the challenges list into a modal 2015-01-17 14:41:30 -08:00
Michael Q Larson 044f89b8cc add footer 2015-01-17 14:16:29 -08:00
Michael Q Larson 279df2995c change about path to learn-to-code for SEO purposes and remove learn-to-code view and controller action 2015-01-17 11:27:27 -08:00
webdev c39e2672fc Basic bonfire functionality completed 2015-01-16 21:55:01 -05:00
webdev adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
Michael Q Larson 456f7063de minor copy tweak 2015-01-15 22:59:54 -08:00
Michael Q Larson 08f4383f62 clean up whitespace on the landing page and add new camp counselors to about page 2015-01-15 22:25:04 -08:00