jprdonnelly/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-04-07 13:01:03 -04:00
Code Issues Projects Releases Wiki Activity
3,967 Commits 7 Branches 0 Tags
dbe50a5dfa16a5ad5cb5da4e0b2efb2f1902dc4f
Commit Graph

69 Commits

Author SHA1 Message Date
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
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
Berkeley Martinez
742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Berkeley Martinez
03ea412b4a major challenges refactor 
commented out resetEditor in main
remove heatmap timout
 2015-06-20 19:55:07 -07:00
Quincy Larson
a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson
883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson
ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson
d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging 
Conflicts:
	server/views/coursewares/showBonfire.jade
 2015-06-19 16:17:59 -07:00
Quincy Larson
0621b8c62b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 13:46:37 -07:00
Quincy Larson
2e1babb12d finalize calculator for release 2015-06-16 13:46:24 -07:00
Quincy Larson
40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
Quincy Larson
2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
terakilobyte
0a8356e50f Configure production to run in https 2015-06-16 14:30:16 -04:00
terakilobyte
b0b236821e More inspectlet configuring 2015-06-16 12:30:49 -04:00
terakilobyte
308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
terakilobyte
3546cf4765 Fetch google fonts over https 2015-06-16 12:09:45 -04:00
Quincy Larson
9bc4f0c25c Merge branch 'master' into staging 2015-06-16 06:08:25 -07:00
Quincy Larson
ef9d6fc55b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 06:08:18 -07:00
Quincy Larson
23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
Quincy Larson
c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
Quincy Larson
6b909d8f59 start refactoring calculator logic 2015-06-15 18:00:13 -07:00
terakilobyte
4fa1f25cc2 Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records. 2015-06-15 20:53:43 -04:00
terakilobyte
40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
Quincy Larson
6c33d4bf78 calculator works 2015-06-14 21:17:48 -07:00