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

739 Commits

Author SHA1 Message Date
Quincy Larson
fea723efbd Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
 2015-08-13 15:39:30 -07:00
Quincy Larson
0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
Quincy Larson
2711664505 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
 2015-08-13 13:25:53 -07:00
Quincy Larson
bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson
99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez
e76b5c8e7f remove codemirror docs from tracking 2015-08-12 21:01:07 -07:00
Berkeley Martinez
3196824b61 remove unnecessary codemirror modes 2015-08-12 20:49:44 -07:00
Berkeley Martinez
ac5f8b9d9a remove unneccassry demo dir from codemirror 
closes #1730
 2015-08-12 20:42:37 -07:00
benmcmahon100
7910f0ae2c Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display 2015-08-13 01:20:12 +01:00
benmcmahon100
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
 2015-08-10 22:03:51 -07:00
Quincy Larson
d67c049d5b make onboarding page the default homepage for authenticated users 2015-08-10 17:40:13 -07:00
Quincy Larson
5fb1df0d55 start onboarding page 2015-08-08 16:13:23 -07:00
benmcmahon100
91c7bce758 Font on submit buttons should be correct now 2015-08-05 17:04:02 +01:00
Quincy Larson
fa86f650e2 update cats to fetch from s3 2015-08-04 23:31:00 -07:00
Quincy Larson
041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
Shouvik Roy
c05a936c87 Update main.less to fix #1510 
Update main.less to fix #1510. There was an alignment issue on Safari because of missing vendor prefix ```-webkit``` on ```transform``` on the ```.points-on-top``` class.
 2015-08-04 20:47:25 +05:30
Berkeley Martinez
7cf6b4e683 Merge pull request #1470 from cahlan/patch-2 
add devmount bootcamp new location
 2015-08-03 15:13:36 -07:00
benmcmahon100
4be714aa97 Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework 2015-08-03 18:02:26 +01:00
benmcmahon100
2f5b7a7db2 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1433 blocked tests passing when exploit used 2015-08-03 17:12:48 +01:00
cahlan
1654d535ac adding new location 2015-08-03 05:32:27 +00:00
benmcmahon100
dc0f72292a Remove the backslash escaping from JavaScript challenge output (e.g. \") 2015-08-01 20:45:07 +01:00
benmcmahon100
608071df08 added a width to make the scrolling editor look nice 2015-08-01 20:01:47 +01:00
benmcmahon100
abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
Quincy Larson
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -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
ae38aab8cc fix issue with codemirror framework and script tag rendering 2015-07-31 16:38:12 -07:00
Quincy Larson
2ccd6e3ee3 fix html view instruction column 2015-07-31 14:36:00 -07:00
Quincy Larson
a0230609f5 fix resultant javascript error on certain pages 2015-07-31 13:38:04 -07:00
Quincy Larson
2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
benmcmahon100
e6694023c6 Emergency check fix for the scroll locker 
Fix to stop main.js from completely bugging out on any page that isn't challengeType: 0
 2015-07-30 20:45:51 +01:00
Ryan Malm
fb79970382 Fixed dropdown-menu CSS bug on mobile 2015-07-26 05:07:42 +00:00
Quincy Larson
fab672f8c6 all field guides operational 2015-07-23 15:50:47 -07:00
Berkeley Martinez
94ed227aeb add video css 2015-07-23 15:49:03 -07:00
Berkeley Martinez
c664796165 fix check if scrollOffset exist 2015-07-23 15:49:02 -07:00
Quincy Larson
e11b0f8d04 update housing cost on bootcamp.json 2015-07-07 16:16:37 -07:00
cahlan
bbcb10325c Update bootcamps.json 2015-07-07 16:36:56 -06:00
Quincy Larson
c2a9a1ca62 add an ajax challenge 2015-07-02 17:31:08 -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
5cedb09703 Combined UI Fixes 
phone overlap bug fix + scroll-locker feature added
 2015-07-02 21:27:16 +01:00
LumenTeun
75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02: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
82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
Berkeley Martinez
13590a1331 refactor rxify stories 
fixes many bugs
 2015-06-25 15:03:46 -07:00
Quincy Larson
1df962bb07 Merge branch 'master' into staging 
Conflicts:
	controllers/resources.js
	public/js/main_0.0.2.js
	seed/challenges/advanced-bonfires.json
	seed/challenges/basic-bonfires.json
	seed/challenges/get-set-for-free-code-camp.json
	server/views/partials/navbar.jade
 2015-06-24 07:19:54 -07:00
Quincy Larson
135047027a add new field guides and challenges 2015-06-23 11:42:27 -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
742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00