Commit Graph

241 Commits

Author SHA1 Message Date
Berkeley Martinez
a1a64435d6 readding twitter auth
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
Berkeley Martinez
43d74c2f48 add beta warning banner 2015-08-04 01:34:26 -07:00
Berkeley Martinez
efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
Berkeley Martinez
7ca1d7cfde remove facebook/google/linkedin auth from linking 2015-08-03 12:53:23 -07:00
Berkeley Martinez
bf1c2ace00 disable facebook/google/linked auth for testing 2015-08-03 12:38:20 -07:00
Berkeley Martinez
88092f9ed6 Merge pull request #1255 from ahstro/lumenteun-1235
Profile pictures in 'Camper News' now link to profiles.
2015-08-01 16:51:56 -07:00
benmcmahon100
0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
benmcmahon100
c075eb0116 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:24:16 +01:00
benmcmahon100
f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
benmcmahon100
aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
benmcmahon100
abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
Berkeley Martinez
8270cb4103 add github auth 2015-08-01 08:39:13 -07:00
Quincy Larson
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson
fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
Quincy Larson
439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
Berkeley Martinez
ee8776feb3 removes comments
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
Quincy Larson
3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
Quincy Larson
2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
Berkeley Martinez
c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Quincy Larson
5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson
fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
Quincy Larson
37d5efed4e Merge branch 'staging' into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Berkeley Martinez
bf64beed5d Hide body overflow 2015-07-23 16:03:50 -07:00
Berkeley Martinez
eb3f993b3b update split field guide view into categories 2015-07-23 15:50:47 -07:00
Quincy Larson
60f2bdc685 more minor updates 2015-07-23 15:50:47 -07:00
Berkeley Martinez
94ed227aeb add video css 2015-07-23 15:49:03 -07:00
Berkeley Martinez
ac35b4bf73 fix some typo's 2015-07-23 15:49:03 -07:00
Berkeley Martinez
c1b0035d17 add bundle to react jade template 2015-07-23 15:49:02 -07:00
Berkeley Martinez
a5e7009a57 initial react app(WIP) 2015-07-23 15:49:00 -07:00
LumenTeun
e05cc3fbb9 Profile pictures in 'Camper News' now link to profiles. #1235 2015-07-11 01:12:17 +02:00
Quincy Larson
8072a4b7f2 fix modal closing a on showJS view 2015-07-10 10:12:53 -07:00
Quincy Larson
41f5325ab6 update landing page 2015-07-07 10:45:56 -07:00
Quincy Larson
db324186da update showjs view 2015-07-05 17:15:54 -07:00
Quincy Larson
0301d3bc61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-02 13:59:22 -07:00
Quincy Larson
4fb3b3e7cc add more cities and move the bootcamp calculator to field guide entries (still untested). 2015-07-02 13:59:13 -07:00
Quincy Larson
10f53bdd49 Merge pull request #1161 from LumenTeun/grammar
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
benmcmahon100
71ea26ab96 Implemented scroll-locker 2015-07-02 21:32:20 +01:00
benmcmahon100
8bed9fa7d7 Implemented scroll-locker 2015-07-02 21:31:59 +01:00
benmcmahon100
0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
Berkeley Martinez
580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
LumenTeun
75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson
7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
Quincy Larson
378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez
310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
Quincy Larson
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez
82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
Quincy Larson
e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
Quincy Larson
4d620c5796 comment out feature map modal and camper news notification 2015-06-24 07:06:40 -07:00
Quincy Larson
ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez
8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00