Commit Graph

659 Commits

Author SHA1 Message Date
Berkeley Martinez
568d1ef1d2 Add promo model 2015-10-29 17:10:29 -07:00
Berkeley Martinez
25464c4f9e Add jobs behind beta flag 2015-10-29 17:10:28 -07:00
Berkeley Martinez
c6c1d7dac4 Add redirects 2015-10-29 17:10:28 -07:00
Berkeley Martinez
ede8da38ba Filter unpaid, unapproved and filled jobs
Fix missing key in react array
2015-10-29 17:10:27 -07:00
Berkeley Martinez
da26f19cde Adds paypal button and completes the number of views 2015-10-29 17:10:26 -07:00
Berkeley Martinez
6613ed95cf Merge pull request #3910 from FreeCodeCamp/clementine
Clementine waypoint is ready
2015-10-28 12:29:31 -07:00
Quincy Larson
fd7451e233 Merge branch 'staging' into improve-early-challenges
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-10-28 02:20:09 -07:00
Quincy Larson
63f56c94b8 continue refining waypoints 2015-10-27 17:49:58 -07:00
Jonathan
5597d0efe3 Update README.md
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
Quincy Larson
baaae041eb add the FCC leaderboard to the labs json 2015-10-26 11:39:45 -07:00
Quincy Larson
dc26195395 finish clementine challenge for now 2015-10-25 23:28:53 -07:00
Quincy Larson
ac4a71a229 fix signin button to use signin instead of login for path 2015-10-25 21:46:54 -07:00
Ben McMahon
0f7b9add2f Merge pull request #3868 from FreeCodeCamp/fix/javascript-linting
Fix linting in JavaScript editor
2015-10-24 00:05:53 +01:00
Berkeley Martinez
756efcd9fb Fix linting in JavaScript editor 2015-10-23 15:38:51 -07:00
Quincy Larson
2ac70458b0 remove unnecessary bullet point from Camper News view 2015-10-23 14:28:27 -07:00
Quincy Larson
4910118366 update flash message 2015-10-23 14:12:09 -07:00
Quincy Larson
1db84d1455 Merge branch 'staging' into feature/block-camper-news 2015-10-23 14:08:19 -07:00
Berkeley Martinez
c13bdb65e5 Add camper must be auth with gitub to post to news 2015-10-21 22:05:27 -07:00
Berkeley Martinez
43155e85e8 Merge pull request #3848 from FreeCodeCamp/feature/nonprofit-ids
Feature/nonprofit ids
2015-10-21 21:41:48 -07:00
Quincy Larson
cbeacbb50c Revert "further work to make challenges and news navigation consistent across mobile and desktop"
This reverts commit 286d0c06c4.
2015-10-21 21:32:30 -07:00
Quincy Larson
1dc0e868b9 update nonprofit files and delete old commented code 2015-10-21 21:30:47 -07:00
Quincy Larson
5077f74ca1 start updating HTML challenge styling 2015-10-21 17:42:01 -07:00
Quincy Larson
286d0c06c4 further work to make challenges and news navigation consistent across mobile and desktop 2015-10-21 12:33:35 -07:00
Berkeley Martinez
7f86c71cb2 Merge pull request #3800 from QuincyLarson/tshirt-improvement
update tshirt banner
2015-10-20 11:33:27 -07:00
Quincy Larson
7f2f3885f8 change blog links to lead to medium subdomain 2015-10-19 21:55:29 -07:00
Quincy Larson
3d63b8b020 update tshirt banner 2015-10-18 19:03:01 -07:00
noinkling
b1a5f517a2 Move time text out of icon element on map page 2015-10-17 18:40:49 +13:00
Berkeley Martinez
af654aebdc Hot fix for chat close button 2015-10-16 20:23:24 -07:00
Quincy Larson
4589b9ae39 add conditional buttons for mobile gitter 2015-10-16 16:45:38 -07:00
Berkeley Martinez
5b9c534bff Fix logic on zipline/basejumps 2015-10-16 16:30:44 -07:00
Berkeley Martinez
1b75d041c1 Fix logic on basejump/ziplines 2015-10-16 16:20:34 -07:00
Berkeley Martinez
12eeef2f41 Add chat room titles 2015-10-16 16:10:45 -07:00
Berkeley Martinez
35219cdce3 Add main chat window on nav bar chat click 2015-10-16 11:57:33 -07:00
Berkeley Martinez
a0182957e7 Add chat to challenges! 2015-10-16 10:37:35 -07:00
Berkeley Martinez
745f059eeb hotfix prevent server from starting twice 2015-10-14 23:49:32 -07:00
Quincy Larson
c552b6d05b Merge pull request #3748 from FreeCodeCamp/feature/add-ga-social-tracking
Add google analytics tracking
2015-10-14 21:57:44 -07:00
Quincy Larson
6955615690 Merge pull request #3746 from FreeCodeCamp/fix/morgan-reporting-order
Change order of information in morgan reporting
2015-10-14 21:49:03 -07:00
Quincy Larson
e8b39648e2 Merge pull request #3745 from FreeCodeCamp/fix/ssl-redirect-rev
Remove rev helper use in ssl redirect
2015-10-14 21:48:51 -07:00
Quincy Larson
cf45d2b01f update landing page and stories 2015-10-14 21:42:29 -07:00
Berkeley Martinez
7c0d801d63 Add google analytics tracking 2015-10-14 21:26:22 -07:00
Berkeley Martinez
aceb1dd9e6 Change order of information in morgan reporting 2015-10-14 20:51:38 -07:00
Berkeley Martinez
3ae7da38a3 Remove rev helper use in ssl redirect 2015-10-14 20:41:36 -07:00
Quincy Larson
99db9eaf33 Merge branch 'staging' into success-stories 2015-10-14 20:00:11 -07:00
Berkeley Martinez
3e828ba266 Merge pull request #3727 from QuincyLarson/estimates
Time estimates for each block of challenge (by popular request)
2015-10-13 15:49:39 -07:00
Berkeley Martinez
7424d85f09 Merge pull request #3728 from FreeCodeCamp/update-step-challenges
Update step challenges
2015-10-13 15:05:03 -07:00
Quincy Larson
2bbb3e98db Merge pull request #3716 from FreeCodeCamp/feature/jobs
Update loopback, ThunderCats and RxJS.
2015-10-13 14:43:56 -07:00
Quincy Larson
407bd16aaf make additional improvements and fixes to step challenges 2015-10-13 10:04:44 -07:00
Quincy Larson
8da93ddea9 add spacing and nowrap to ensure time stays on single line 2015-10-12 23:02:24 -07:00
Quincy Larson
f30239fb6c add time estimates to challenge blocks on map 2015-10-12 22:56:10 -07:00
Quincy Larson
3dee03d38b add more stories and clean up css 2015-10-12 01:22:11 -07:00