Commit Graph

725 Commits (71a02ed8b7c4d676349f77ea961c3f6426ff3a1d)

Author SHA1 Message Date
benmcmahon100 91c7bce758 Font on submit buttons should be correct now 2015-08-05 17:04:02 +01: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
Berkeley Martinez 03ea412b4a major challenges refactor
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
Quincy Larson e03d16e6a6 Merge pull request #1003 from Lemony-Andrew/patch-3
Auto Save, Removed Stamps +more, done
2015-06-20 18:43:31 -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
Andrew Cay 437a564e34 Changed dependency on challenge_key to function 2015-06-19 18:22:57 -07:00
Andrew Cay 11305c152b Update coursewaresJSFramework_0.0.6.js 2015-06-19 18:02:49 -07:00
Andrew Cay 60354d24e6 Auto Save, Removed Stamps +more
Removed stamps so code stays stored until code has been reset. 
--> Added a feature which returns if the storage has been saved since last edit. *codeStorage.hasSaved()* 
--> Changed "localBonfire" to *codeStorage*
2015-06-19 17:47:21 -07:00
Quincy Larson ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson 6078b54393 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -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
terakilobyte 0173804e21 updates helmet policies, makes new startup script 2015-06-18 17:08:21 -04: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
terakilobyte 8735f164f8 Remove https from blob code 2015-06-16 16:28:09 -04:00