Commit Graph

799 Commits (43cfd024df6960be24bec13e0b519eac6c439851)

Author SHA1 Message Date
Alexey Nikitin d3e0b9b754 Bug with hover effect on footer's social links.
The footer's social link changes itself's height when it is hovered. This leads to appearing scroll bar and as a result changing page's width. The content jumps.
2015-08-19 13:10:44 +03:00
Quincy Larson 9dcf284825 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 15:21:38 -07:00
Quincy Larson b4ae49f915 add challenge type to beginning of challenge in map 2015-08-18 15:21:26 -07:00
benmcmahon100 6de1f49a1f Temp fix for buttons on modals and bonfires exec on load 2015-08-18 19:21:34 +01:00
benmcmahon100 1bdb40bcaf The FCC editor will now catch un-closed comments! This can be extended to catch quotes as well if needed. Fix #1839 2015-08-17 15:43:36 +01:00
benmcmahon100 a11064ba74 Small CSS hack to fix a display glitch 2015-08-17 14:30:57 +01:00
benmcmahon100 3d42b09bca Added a helper function to main.js for challenge making 2015-08-14 23:57:43 +01:00
benmcmahon100 6377cc124e Moved a permanent set css prop from jquery to CSS 2015-08-14 21:48:17 +01:00
benmcmahon100 d784cfcd76 Fix editor height locking features where it was displaying overflow instead of autoing 2015-08-14 21:46:13 +01:00
benmcmahon100 f07f74f523 Fixed a weird error involving RegEx and single quotes 2015-08-14 21:45:25 +01:00
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
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
Quincy Larson 40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
terakilobyte 810bf9a3f7 force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains. 2015-06-16 15:59:22 -04:00
Quincy Larson 2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
terakilobyte 308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
terakilobyte 97668120ad More work to load google fonts 2015-06-16 12:04:26 -04:00
Andrew Cay a53114e7b6 Update and rename coursewaresJSFramework_0.0.5.js to coursewaresJSFramework_0.0.6.js
Added auto save(to local storage) for any progress. It will set the IDE text to whatever the user last saw within 24 hours. 
The auto save happens every 1.5 seconds _after_ someone lifts a key.
2015-06-15 22:47:17 -07:00
Quincy Larson 23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
Quincy Larson 6b909d8f59 start refactoring calculator logic 2015-06-15 18:00:13 -07:00
Quincy Larson b6fc2551d9 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
Berkeley Martinez 147f1d1d37 fix user.exists returns an object with property exists 2015-06-10 17:21:57 -07:00
Berkeley Martinez f3b1b5ca0d remove misc console.logs 2015-06-10 17:14:48 -07:00
Berkeley Martinez 9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
terakilobyte 25e500a457 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-09 16:49:10 -04:00
Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
terakilobyte 870c80d72d Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch. 2015-06-09 16:46:41 -04:00
Quincy Larson 0c799ec02f make bonfire view look like html view 2015-06-07 21:49:14 -07:00
Quincy Larson b84d41bcd6 write tests for first 5 jquery challenges 2015-06-07 18:29:00 -07:00
Quincy Larson 6953cb6347 make the view even more compact 2015-06-06 22:55:24 -07:00
Quincy Larson feb0678a46 start shrinking down the views. 2015-06-06 22:51:39 -07:00
terakilobyte 7cfca0b5f8 Bump a delay on test runs and show pattern for expect tests 2015-06-06 23:58:27 -04:00
terakilobyte 5bcffa3ccb Add necessary emmet js file 2015-06-06 20:17:35 -04:00
terakilobyte e5a8c27e07 Add emmet functionality to html views 2015-06-06 20:10:47 -04:00
Quincy Larson aef35860dc fix mobile view issue 2015-06-05 22:35:13 -07:00
Quincy Larson 6e1d5968bc improve mobile menu 2015-06-05 22:11:30 -07:00
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00