gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,845 Commits 9 Branches 0 Tags
9e41b0ca7b2d7fd5d4f2ca20d25c3abe21db258a
Commit Graph

756 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Quincy Larson
ffa03e57df Merge pull request #30 from FreeCodeCamp/landing 
New, simple landing page based on feedback from @cloudchloe
 2015-01-15 21:42:40 -08:00
Michael Q Larson
2493f159dd minor improvements to landing page 2015-01-15 21:39:01 -08:00
Michael Q Larson
a3f3463546 add links below youtube videos to get around youtube embed issue 2015-01-15 19:05:31 -08:00
Michael Q Larson
a95da3307c update simplified landing page 2015-01-15 19:04:24 -08:00
Michael Q Larson
8d9c0c0605 improve landing page 2015-01-15 17:21:12 -08:00
Michael Q Larson
6c28577dac fix the angular validation Jade that was mangled by my IDE the first time 2015-01-15 15:45:24 -08:00
Michael Q Larson
52ea2f0689 Revert "fix the lack of url validation in the portfolio section" 
This reverts commit af63d84a9d.
 2015-01-15 15:41:50 -08:00
Michael Q Larson
af63d84a9d fix the lack of url validation in the portfolio section 2015-01-15 15:16:35 -08:00
Michael Q Larson
ce3210d8dd make link to nonprofit Trello board more explicit in stats partial 2015-01-14 13:28:50 -08:00
Michael Q Larson
13faedc86e Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder 2015-01-14 13:28:20 -08:00
Michael Q Larson
89357f3d13 add twitch channel to live pair programming page 2015-01-14 13:26:36 -08:00
Michael Q Larson
16e8ab1f40 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-14 12:04:37 -08:00
Nathan
327f45f664 Update faq.jade 
Fix spelling error (perservere to persevere)
 2015-01-14 10:35:02 -05:00
Michael Q Larson
19c39f9fee update live pair programming 2015-01-13 18:37:17 -08:00
Michael Q Larson
b43e4094fe change live code video 2015-01-13 18:26:30 -08:00