greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,467 Commits
4 Branches
0 Tags
959 MiB
Commit Graph

207 Commits (d049d7b64675c17c8aa967bf3daecee7563a797d)

Author SHA1 Message Date
Quincy Larson 7b61e9daa2 More view beautification for mobile. 2015-04-30 15:19:38 -07:00
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04: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 4d3337df32 Merge branch 'ziplines' into ux-improvements 
Conflicts:
	views/coursewares/showJS.jade
 2015-03-28 00:24:41 -07: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
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
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 bf7d38e080 resolve conflict 2015-03-15 17:08:34 +09:00
Nathan Leniz c609294e1f force merge conflict for stream viewers 2015-03-15 17:06:05 +09:00
Michael Q Larson 191e38472e make selected indenting and outdenting work on courseware HTML, JS and Bonfires 2015-03-14 15:07:05 -07:00
Michael Q Larson 6a9bfc5ebf remove together.js and add a non-functioning submit form to the index view of news 2015-03-04 23:44:30 -08:00
Nathan Leniz 50b29eb2ba Refactor error message from bonfire 2015-03-01 09:54:03 +09:00
Michael Q Larson e0c82156a7 refactor layout.jade to have universal head, and customize together.js 2015-02-21 14:49:24 -08:00
Michael Q Larson e5cfa147fa attempt to use togetherjs 2015-02-21 14:22:46 -08:00
Nathan Leniz b32f6133db Update bonfire plugin version number to force fresh import on browsers 2015-02-22 06:23:44 +09:00
Nathan Leniz c852aef1be Ramda upgrade 2015-02-21 11:38:03 +09:00
Nathan Leniz 8a70678a0b Merge branch 'master' into ramda-fire 2015-02-16 00:51:11 -05:00
Nathan Leniz e3c9e42fce showJS view now shows errors in a pretty format (kinda) 2015-02-14 18:43:45 -05:00
Nathan Leniz 9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz 693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08:00
Nathan Leniz b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Nathan Leniz a0427b3e18 Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function 2015-02-13 12:14:12 -05:00
Jason Rueckert 54b5870fc9 Merge pull request #91 from phlacin/automaticDating-livepair 
Added Moment.js library and time logic to next Live session
 2015-02-12 20:44:27 -08:00
phlacin 2d447f0bb0 added automatic time logic to live-pair-programming page 2015-02-12 20:31:11 -08:00
Michael Q Larson f8f0c3454a subtle completed challenge button for courseware and add completionMessage to coursewares 2015-02-12 16:48:35 -08:00
phlacin 6455d80a6e Added Moment.js library and added logic to the time for the next Live session. 2015-02-11 23:08:10 -08:00
Michael Q Larson a1507a969b Add should and assert to coursewares and write code to test multiple instances of an element for a condition 2015-02-10 22:22:40 -08:00
Nathan Leniz e7b0cd53ed Adding ramda to bonfire 2015-02-09 14:20:27 -05:00
Nathan Leniz 4fa6c9c65d iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code 2015-02-08 01:12:40 -05:00
Michael Q Larson 180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson 07c5757538 Code cleanup 2015-02-07 20:43:39 -08:00
Michael Q Larson 4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Michael Q Larson a1c5d665e6 Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware 2015-02-06 13:54:55 -08:00
Michael Q Larson 57db67aa82 update the courseware.json to treat challengeSeed as an array, and update schema and write logic to strinify this array 2015-02-06 12:11:22 -08:00
Nathan Leniz f627c156fc Tab now inserts two spaces, the path "coursewares/" is no longer broken 2015-02-06 12:36:55 -05:00
Nathan Leniz d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz 9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz 70d704d975 Correctly display modal on challenge completion 2015-02-04 20:41:02 -05:00
Nathan Leniz 161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Nathan Leniz e55a85a18c Media queries everywhere to size iframe correctly 2015-02-04 02:29:38 -05:00
Nathan Leniz d5231fc43f Add default padding to iframe iphone view 2015-02-04 01:57:00 -05:00
Nathan Leniz c1b995b465 Bonfire Analytics 2015-02-03 18:37:56 -05:00
Michael Q Larson 5ce1eb18db get cdns working in courseware 2015-02-02 23:47:47 -08:00
Michael Q Larson f1000c3189 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	views/layout.jade
 2015-02-02 23:32:46 -08:00
Nathan Leniz 6c48e1170e Coursewares framework for codemirror, not working 2015-02-03 02:17:36 -05:00
Nathan Leniz c3926423af Adding analytics to bonfire 2015-02-03 01:57:35 -05:00
Nathan Leniz 3f8c0c5c41 Change layout to grab ionicons css framework from local files 2015-02-02 20:53:48 -05:00
Nathan Leniz a558777382 Cleaning up angular, preparing to make new editor framework for coursewares 2015-02-02 20:39:05 -05:00
Nathan Leniz d443f92f33 Prevent success from showing if no tests or other errors are encountered 2015-01-28 17:32:21 -05:00
Nathan Leniz 3844542651 Refactor routing, minor display tweaks 2015-01-27 20:12:51 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Nathan Leniz ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Nathan Leniz f8eb5971b8 Fixing playground for to not include a null symbol 2015-01-26 00:15:46 -05:00
Nathan Leniz 26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Michael Q Larson 413d89cf18 minor improvements to the navbar and layout in general 2015-01-25 14:05:56 -08:00
Nathan Leniz 00dfdb2e1e More layout improvements, adding in contextual icons for test success/failure and styling font of test output 2015-01-25 15:22:21 -05:00
Michael Q Larson fa5a1a8618 make test results look better 2015-01-25 10:35:41 -08:00
Michael Q Larson f593ebbbf2 start widescreen refactor 2015-01-25 09:06:30 -08:00
Michael Q Larson 54c3305281 change bonfire path to playground and update links, and also add a should example test to playground 2015-01-24 14:42:34 -08:00
Nathan Leniz a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05:00
Nathan Leniz 6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Nathan Leniz bc1f01f67b More bonfire improvements, restoring functionality to original bonfire module after growing it to accept the challenge framework 2015-01-22 22:47:15 -05:00
Nathan Leniz e0311210e0 Improving bonfire flow, working on seed.js 2015-01-22 18:44:25 -05:00
Nathan Leniz 8a3618e366 No longer overwriting user entrypoint with predefined test entry point 2015-01-22 16:15:43 -05:00
Nathan Leniz 0e9523ab72 More steps towards integrating the bonfire challenge framework. Importing challnge seed, public tests, private tests, entry point and entry point negator 2015-01-22 15:49:16 -05:00
Nathan Leniz 99dcbd16e5 Adding should BDD to bonfire 2015-01-22 03:03:37 -05:00
Nathan Leniz 4026ae1c75 Cleaning up framework 2015-01-22 00:38:39 -05:00
Nathan Leniz 74291d2299 More bonfire improvements. Removed redundant console statements, improved test scraping, comment scraping included, better reset behavior 2015-01-21 23:54:59 -05:00
Michael Q Larson 9e41b0ca7b minor refactor on bonfire framework.js 2015-01-21 16:59:19 -08:00
Michael Q Larson ae50945e1a update default copy in bonfire playground 2015-01-21 16:03:14 -08:00
Nathan Leniz bf1d8cd81a Improving bonfire layout to remove the need for scrolling and allow the input and output elements to grow dynamically with user input 2015-01-21 18:10:21 -05:00
Nathan Leniz c422f9474b More improvements, keyboard shortcuts working again, extra protection against fatal errors 2015-01-21 17:17:45 -05:00
jmcshane 62648a4103 Cleanup after final changes 2015-01-21 01:49:50 -05:00
jmcshane 6a15e4e8f8 Finalizing code after testing 2015-01-21 01:48:48 -05:00
jmcshane 03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Nathan Leniz 202805dc52 preparing for integration of testing 2015-01-20 20:35:25 -05:00
Nathan Leniz a4dc2f0206 marginal steps towards removing scrollbars and scrolling from bonfire viewports 2015-01-20 16:44:09 -05:00
Nathan Leniz 7e46af3d42 Major refactor of Bonfire.jade to pull out all JS and put into framework.js, resizing font to 14px and setting to Ubuntu Mono, permanently change layout of bonfire.jade to 2 column responsive 2015-01-20 15:21:11 -05:00
Nathan Leniz bfb711166c further improvement of bonfire view 2015-01-20 03:10:24 -05:00
Nathan Leniz bb87cc4bb3 Pre View configurating 2015-01-20 02:19:39 -05:00
Nathan Leniz cc3fa8e5f7 Configurating Console.log 2015-01-20 00:36:14 -05:00
Nathan Leniz 4755bfcb56 Reset to working condition 2015-01-19 23:52:39 -05:00
Nathan Leniz 53e5d06147 Improving bonfire and adding testing 2015-01-18 19:10:03 -05:00
webdev c90d062f7b Enables twitter users to immediately log in to FCC without having to reauthorize the app 2015-01-17 17:44:06 -05:00
webdev c39e2672fc Basic bonfire functionality completed 2015-01-16 21:55:01 -05:00
webdev adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
terakilobyte 785ed3916c The smoke rises 2015-01-10 15:21:03 -05:00
terakilobyte 3490ff197d Finish proof of concept of angular forms, added validation 2015-01-06 02:27:08 -05:00
Sahat Yalkabov 04c5262bea windows-cr line endings commit 2014-07-01 17:05:49 -04:00
Sahat Yalkabov 7621f4edf2 Updated jQuery to 2.1.1 2014-06-06 15:36:08 -04:00
Sahat Yalkabov 5ec41e4b45 Update jQuery and Bootstrap libraries 2014-02-01 00:23:54 -05:00
Sahat Yalkabov 275be06fa3 Upgrade to Bootstrap 3.1 2014-01-30 20:23:56 -05:00
Sahat Yalkabov 8b81e3ef98 Removed flat-ui checkbox and radiobox 2014-01-23 21:36:10 -05:00
Sahat Yalkabov 7e6dc8fefa Got rid of datatables. 
Cleanup and refactoring.
 2014-01-07 18:47:16 -05:00
Sahat Yalkabov bc39cd197c Flat UI checkboxes and radio buttons 2013-12-18 02:57:24 -05:00
Sahat Yalkabov ee62128fe7 Removed css and js which are no longer used 2013-12-14 17:38:48 -05:00
Sahat Yalkabov e82160ede9 Major account page redesign 2013-12-05 16:42:30 -05:00
Sahat Yalkabov 73bcd2df93 dataTable jquery plugin for foursquare api tables 2013-12-04 16:01:09 -05:00
Sahat Yalkabov d2b60b64c1 Added list.js 2013-12-02 16:15:07 -05:00
Sahat Yalkabov 3dbe5fab18 Removed jquery-validate, use server-side only instead 2013-11-20 01:46:32 -05:00
Sahat Yalkabov 9d3da077a6 added validation with jquery-validate on signup page 2013-11-19 15:52:34 -05:00
Sahat Yalkabov 2410aaa74a cleaner assets structure 2013-11-14 00:46:43 -05:00