Commit Graph

351 Commits (a0c9906e69b0b1b49e7b9750aa953dc181985025)

Author SHA1 Message Date
terakilobyte 308e539e1e More protocol experimentation 2015-06-16 12:23:49 -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 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 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
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
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -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 4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -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 57fad7d923 proper fix for uncomment html challenge, improved codemirror performance 2015-05-27 15:29:31 -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
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 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
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
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 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 c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Quincy Larson 222f9b9a64 fix some of the news functionality 2015-04-30 17:18:08 -07:00
Quincy Larson 7b61e9daa2 More view beautification for mobile. 2015-04-30 15:19:38 -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 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
Michael Q Larson 1c7d0b11b6 pass the original story URL to all comments for notification email 2015-04-07 23:39:52 -07:00
Michael Q Larson 840930d967 get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map 2015-04-05 18:37:58 -07:00
Michael Q Larson 60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
Michael Q Larson 9d746f7d49 add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user 2015-04-05 00:01:51 -07:00
Michael Q Larson 97e59d4568 add verified flag to challenges so we can tell which ziplines and basejumps have been verified 2015-04-02 14:07:00 -07:00
Michael Q Larson 36c43cc73a add jQuery to check for broken images and replace them with standard image. Remove gravatar logic. 2015-04-02 13:42:15 -07:00
Michael Q Larson aa01a896a5 Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids 2015-03-29 17:09:12 -07:00
Michael Q Larson 43810ccb0c Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	public/js/main.js
	views/bonfire/show.jade
2015-03-29 14:44:49 -07:00
Michael Q Larson f20743428a Merge branch 'jameskopacz-patch-259' of https://github.com/jameskopacz/freecodecamp into ux-improvements 2015-03-29 14:19:12 -07:00
Nathan Leniz aa2f0e8af8 Change completion event to remove duplicate entries if the user states they paired with themselves 2015-03-29 21:15:18 +09:00
Nathan Leniz 1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors,
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements
Conflicts:
	views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
jameskopacz d3dee00df5 Stories reply and upvote redirect to signin when user isn't signed in.
Redirects user back to story after signing in.
2015-03-28 00:16:48 -05:00
Michael Q Larson f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07:00
Michael Q Larson 09b812688e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
	app.js
2015-03-25 14:20:34 -07:00
Michael Q Larson d4935d44de add the routes, controller actions and views for the nonprofit wizard 2015-03-24 21:46:42 -07:00
Berkeley Martinez f246ef618c Close web worker after completion
closes #257
2015-03-22 16:57:10 -07:00
Michael Q Larson 6e0da758e0 finish wiring in buttons and hotkeys 2015-03-22 01:38:04 -07:00
Michael Q Larson 9633a2dbe0 get hotkey working in showVideo 2015-03-22 01:28:40 -07:00
Nathan Leniz ac511982a4 User facing challenge mentions now point to coursewares, remove completed view from account/show 2015-03-21 18:42:19 +09:00
Nathan Leniz 6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Nathan Leniz a2e2e6bfa2 Improve profile view on devices, store name in completedCoursewares for display in account/show 2015-03-21 15:44:18 +09:00
Nathan Leniz be91849d20 coursewares properly push timestamps to user object 2015-03-21 14:28:00 +09:00
Nathan Leniz cd89ad1574 Change complete-challenge to completed-challenge 2015-03-21 13:50:31 +09:00