Commit Graph

812 Commits (d86ecfce87e9a6d09f496dd3f3eeecb7e62833ef)

Author SHA1 Message Date
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
terakilobyte 53a31509e6 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 22:36:08 -04:00
terakilobyte f002e7c3f7 Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches. 2015-06-04 22:35:42 -04:00
Berkeley Martinez cfb5f06cdf Use strings for challengeMap
fixes switch when numbers are strings
2015-06-04 13:28:35 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Quincy Larson 79e90c82a8 close issues by updating json files 2015-06-04 01:01:48 -07:00
Quincy Larson ee1f336475 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	public/css/main.less
2015-06-04 00:22:16 -07:00
Charles Treece d6f1565e19 changed z-index of iframe-croll class to 1 2015-06-03 23:04:43 -04:00
Quincy Larson d6e09ad1e5 fix the html mobile view to have taller iframe 2015-06-03 15:50:28 -07:00
Quincy Larson 51bfa12c33 make iphone stand out over footer 2015-06-02 19:45:58 -07:00
Quincy Larson 2fa0f34eb8 add progress bars 2015-06-01 23:27:33 -07:00
Quincy Larson 4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -07:00
Quincy Larson 5380a9ea74 add yet unfinished curriculum overview to challengeMap 2015-05-31 02:01:55 -07:00
Quincy Larson e322b3b7d6 Merge branch 'master' into modals
Conflicts:
	seed_data/field-guides.json
	views/coursewares/showHTML.jade
2015-05-28 17:25:34 -07:00
terakilobyte 193f9d16db Set a refresh on codemirror instance rather than setting the cursor position. Closes #640 2015-05-28 19:51:42 -04:00
Quincy Larson 8501de396f finish fixing modals 2015-05-28 16:18:04 -07:00
Quincy Larson 673a617151 create pair, help, bug modals 2015-05-28 14:29:45 -07:00
terakilobyte 131b9ad1b7 bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes # 2015-05-28 14:13:31 -04:00
terakilobyte 718ae04f2f Add ability to test editor contents. Ensures classes are implemented, closes # 684 2015-05-28 08:26:25 -04:00
terakilobyte bada25f381 Improve mobile view of showHTML 2015-05-27 16:42:08 -04:00
terakilobyte 57fad7d923 proper fix for uncomment html challenge, improved codemirror performance 2015-05-27 15:29:31 -04:00
terakilobyte 79b20d9798 Update copy for uncomment html. Fix iframe view covering up button in narrow width. Make iframe fixed so it's viewable as code editor expands and people scroll down. closes #596, closes #655 2015-05-27 15:15:28 -04:00
terakilobyte 6a2d365b9a Update framework version, set cursor to line 15 on load to force full display. Closes #653 2015-05-27 14:40:06 -04:00
terakilobyte cad39e1b5e Fixes duplication bug in Firefox 2015-05-27 13:39:37 -04:00
terakilobyte fa43dd1051 Unbind click handler on next-courseware-button to prevent repeated presses from advancing more than one challenge 2015-05-26 12:32:50 -04:00
terakilobyte e7c855d72f Fully disable all help buttons for now, remove post to slack functionality for aventerous campers who enable the buttons through their console 2015-05-26 11:10:10 -04:00
terakilobyte ff6e11433c Update bonfire framework to know how to use chai.should() 2015-05-26 10:41:50 -04:00
terakilobyte 186d320d01 version updates to force browser fetch so buttons works 2015-05-26 09:14:10 -04:00
Quincy Larson 7581ed9b30 quick challenge hot fixes 2015-05-26 00:33:13 -07:00
terakilobyte 6ce5ccf449 Rename framework file to force new browser fetching. Update view to remove unused vars 2015-05-26 02:31:10 -04:00
terakilobyte 1c4b40c8e6 Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username 2015-05-25 17:27:27 -04:00
Quincy Larson 31e10444a5 improve field guide look and add cracking code interview article 2015-05-25 00:42:32 -07:00
Quincy Larson 3ee2c29324 more challenge-related view and copy improvements 2015-05-24 23:51:56 -07:00
Quincy Larson bf0cf4cc7d add the bug, pair and help buttons to challenge views 2015-05-24 00:53:01 -07:00
Quincy Larson 1949005632 remove modal from field guide and create index view 2015-05-23 18:39:30 -07:00
Quincy Larson a3ab32f339 improve get help and add find a pair 2015-05-23 00:53:41 -07:00
terakilobyte b626c811d0 Add initial I need help button and slack webhook integration 2015-05-23 02:26:29 -04:00
Quincy Larson 7279559c41 Merge branch 'staging' into nonprofit-improvements
Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade
2015-05-22 19:36:15 -07:00
Quincy Larson b9adbd5976 add jobs page 2015-05-22 19:30:56 -07:00
Quincy Larson 2e46777f8e add simply hired page 2015-05-22 12:57:43 -07:00
Berkeley Martinez c63a77066d Merge pull request #460 from phoenixstormcrow/phoenixstormcrow-459
removed "white-space: pre-line" rule from pre.wrappable elements to p…
2015-05-21 08:19:04 -07:00
Berkeley Martinez 4ad757ebd5 Merge pull request #466 from terakilobyte/challenge-restructure
Challenge restructure
2015-05-21 00:12:52 -07:00
terakilobyte 5e918bdd7c Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename. 2015-05-20 22:31:20 -04:00
terakilobyte 16ca72f716 Update views for new variable names. Get profile view working. Update challenge map. 2015-05-20 21:50:31 -04:00
LumenTeun 7b9faabd32 Github => GitHub 2015-05-20 16:29:05 +02:00
terakilobyte a174a1c630 Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js 2015-05-19 22:31:01 -04:00
phoenixstormcrow 804866013f removed "white-space: pre-line" rule from pre.wrappable elements to prettify bonfire solution formatting. 2015-05-19 18:00:25 -07:00
Quincy Larson ae70d0abd9 Merge branch 'courseware' into challenge-restructure 2015-05-18 23:33:03 -07:00
Quincy Larson 45d4954a43 fix script tag importing issue in coursewares 2015-05-18 22:25:48 -07:00
terakilobyte e6851b22d8 Minor updates 2015-05-18 21:20:32 -04:00
Quincy Larson 68962d4d82 further improvements to coursewares and bonfires 2015-05-10 22:33:04 -07:00
Quincy Larson d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Quincy Larson f3646b0aae give points for upvoting, add facebook profile attribute, improve social profile icons 2015-05-09 16:23:45 -07:00
Quincy Larson 70503528d2 give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib 2015-05-09 15:53:01 -07:00
terakilobyte 72339f9183 Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc. 2015-05-06 14:06:10 -04:00
Quincy Larson 961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
Quincy Larson a0b7b0b653 heatmap looks better 2015-05-03 14:45:46 -07:00
Quincy Larson c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Quincy Larson 451e3c75f2 improvements to portfolios and heatmaps 2015-05-03 00:34:46 -07:00
Quincy Larson d65f66e03f fix mobile camper news headlines 2015-05-02 17:06:31 -07:00
Quincy Larson 0f0adac85c stylize search results 2015-05-01 23:05:37 -07:00
Quincy Larson 222f9b9a64 fix some of the news functionality 2015-04-30 17:18:08 -07:00
Quincy Larson 2cb02176a4 more camper news improvements 2015-04-30 15:56:14 -07:00
Quincy Larson 7b61e9daa2 More view beautification for mobile. 2015-04-30 15:19:38 -07:00
Quincy Larson cc13b325d6 fix some issues with @terakilobyte and beautify the camper news index view 2015-04-30 14:55:00 -07:00
Quincy Larson 589059aa05 start styling news for mobile 2015-04-28 22:29:59 -07:00
Quincy Larson 45490f75c4 make checkboxes larger and remove text clicking for completion 2015-04-27 00:10:14 -07:00
Quincy Larson b8bffae47b @terakilobyte cleaned up event handlers 2015-04-25 18:59:15 -07:00
Quincy Larson 20c2b7a0ac Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352 2015-04-25 18:17:46 -07:00
terakilobyte a9feb269f6 Remove some debug/console.log statements.
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367.
2015-04-25 12:28:14 -04:00
Maxim Orlov 1539708613 Fix Camper News email notification logic 2015-04-25 16:05:36 +02:00
Quincy Larson e5e47136ea make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse 2015-04-24 01:31:59 -07:00
Quincy Larson bf723b522b start making ux changes 2015-04-23 23:46:58 -07:00
terakilobyte 8781bc3e63 Accept comment edit pr 2015-04-19 22:22:11 -04:00
terakilobyte 08bf658897 Harden camper news and don't expose user object. Upvoting still needs to be looked at. 2015-04-19 03:36:54 -04:00
Quincy Larson 2c53a17521 fix an issue with checklists 2015-04-18 21:09:24 -07:00
Michael Q Larson b671ab9817 move checkboxes to the left of the showVideo view 2015-04-18 15:00:31 -07:00
Michael Q Larson aacfb86e1f improve challenge map look 2015-04-18 14:17:10 -07:00
Michael Q Larson 6106dfa31a presist checklist states in localStorage 2015-04-18 01:29:10 -07:00
Michael Q Larson e39dfee5ef getting closer with the persisted checklists 2015-04-17 23:51:57 -07:00
Michael Q Larson 11ece0fda1 fix courseware.json typo and make it easier to click checkboxes 2015-04-17 22:37:13 -07:00
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
Michael Q Larson e0aa084c7a finish getting field-guide working and improve zipline show view 2015-04-14 20:12:47 -07:00
terakilobyte 9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
Michael Q Larson 11548bfcf9 add checkbox cross off effect to challenges and reword pairwise bonfire 2015-04-13 02:41:42 -04:00
Michael Q Larson 7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson 6242f322d7 still working on passing original author email all the way down the comment chain 2015-04-08 00:30:51 -07:00