Commit Graph

1915 Commits

Author SHA1 Message Date
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
53e5d06147 Improving bonfire and adding testing 2015-01-18 19:10:03 -05:00
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
1c6f95bdca Added a title to bonfire for seo 2015-01-18 08:30:44 -08:00
1e427d723c fix bug that was crashing heroku 2015-01-17 19:07:57 -08:00
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
bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
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
a9d52c82c0 improve footer and add navbar link to bonfire 2015-01-17 17:30:10 -08:00
be2e224f93 Merge branch 'footer' into one-column-challenges
Conflicts:
	public/css/main.less
2015-01-17 17:05:52 -08:00
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
0c935623b7 Fix hamburger menu weirdness 2015-01-17 16:09:35 -08:00
c90d062f7b Enables twitter users to immediately log in to FCC without having to reauthorize the app 2015-01-17 17:44:06 -05:00
7727368f34 turned the challenges list into a modal 2015-01-17 14:41:30 -08:00
044f89b8cc add footer 2015-01-17 14:16:29 -08:00
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
c39e2672fc Basic bonfire functionality completed 2015-01-16 21:55:01 -05:00
adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
456f7063de minor copy tweak 2015-01-15 22:59:54 -08:00
08f4383f62 clean up whitespace on the landing page and add new camp counselors to about page 2015-01-15 22:25:04 -08:00
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
2493f159dd minor improvements to landing page 2015-01-15 21:39:01 -08:00
a3f3463546 add links below youtube videos to get around youtube embed issue 2015-01-15 19:05:31 -08:00
a95da3307c update simplified landing page 2015-01-15 19:04:24 -08:00
8d9c0c0605 improve landing page 2015-01-15 17:21:12 -08:00
6c28577dac fix the angular validation Jade that was mangled by my IDE the first time 2015-01-15 15:45:24 -08:00
52ea2f0689 Revert "fix the lack of url validation in the portfolio section"
This reverts commit af63d84a9d.
2015-01-15 15:41:50 -08:00
af63d84a9d fix the lack of url validation in the portfolio section 2015-01-15 15:16:35 -08:00
ce3210d8dd make link to nonprofit Trello board more explicit in stats partial 2015-01-14 13:28:50 -08:00
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
89357f3d13 add twitch channel to live pair programming page 2015-01-14 13:26:36 -08:00
16e8ab1f40 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-14 12:04:37 -08:00
0dced1538c Merge pull request #27 from figitalboy/patch-1
Update challenges.json
2015-01-14 11:55:42 -05:00
ac3b01dd8b Update challenges.json
Fixing typo in reference to issue https://github.com/FreeCodeCamp/freecodecamp/issues/25
2015-01-14 11:54:34 -05:00
327f45f664 Update faq.jade
Fix spelling error (perservere to persevere)
2015-01-14 10:35:02 -05:00
19c39f9fee update live pair programming 2015-01-13 18:37:17 -08:00
b43e4094fe change live code video 2015-01-13 18:26:30 -08:00
da9d2bd6d3 live code 2015-01-13 18:13:56 -08:00
42f7d3875c update live coding page 2015-01-13 17:26:16 -08:00
da5c8d771d Merge pull request #23 from FreeCodeCamp/angular-nonprofit
Angularize nonprofit form
2015-01-13 17:52:17 -05:00
9d3cf9f13f finish angularizing forms 2015-01-13 14:43:57 -08:00
d328842bda only partially working 2015-01-13 12:50:00 -08:00
8fa5f6b094 fix contact form 2015-01-13 12:08:46 -08:00
b858fdbe6a update link for live pair programming 2015-01-13 10:31:16 -08:00
f55b341380 Merge pull request #21 from brndnb/patch-2
Edit wording of jquery exercises
2015-01-12 22:12:42 -08:00
e46046c1f3 Merge pull request #22 from FreeCodeCamp/passreset
Passreset
2015-01-12 22:10:35 -08:00
26c3f265ad update the reset password functionality and make the password reset form consistent with other such forms 2015-01-12 22:02:33 -08:00
3afd05ad85 Merge branch 'passreset' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-12 21:36:38 -08:00
5765c18def Re-enabling password reset for email signups 2015-01-13 00:35:11 -05:00
4bdc3d34ad Add blogger API to FCC and list 5 most recent blog posts on about page 2015-01-12 21:28:58 -08:00