Commit Graph

280 Commits (1fca5898054f7714d1395e8f30780c41cac4de83)

Author SHA1 Message Date
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 040d687f20 Removing duplicate analytics call 2015-02-03 01:59:19 -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
Michael Q Larson 0739934c50 make path relative 2015-01-28 14:48:18 -08: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 9fa0323049 Sequence request for new bonfire to wait until save operation, making bonfire fetch unsolved bonfires at a much faster rate to ensure data sync 2015-01-28 17:17:45 -05:00
Nathan Leniz 7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Nathan Leniz 3844542651 Refactor routing, minor display tweaks 2015-01-27 20:12:51 -05:00
Nathan Leniz 01bdbd8f4d Finishing up pathing issues, writing user object if they haven't visited in a day 2015-01-27 17:39:53 -05:00
Nathan Leniz 1988101ba2 Server successfully redirects, still need to work on challenge ordering 2015-01-27 02:55:41 -05:00
Nathan Leniz be0cf978f5 Correctly sorting unsolved bonfires 2015-01-27 02:51:59 -05:00
Nathan Leniz 227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -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
Nathan Leniz 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Nathan Leniz 966eb3d073 More cleanup of input field after user error 2015-01-24 19:16:28 -05: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 a7f228c410 Refactor db read/write ops to use find instead of findOne to improve performance 2015-01-24 14:21:44 -05:00
Nathan Leniz 0ca042a1f0 Paired with is now properly saved, bonfire challenge framework is almost ready for release 2015-01-24 13:40:58 -05:00
Nathan Leniz 4128b3b765 Existing username check now working, error box showing and hiding properly, UI tweaks 2015-01-24 12:51:53 -05:00
Nathan Leniz 022b8daddc Adding in existing username checking, NOT WORKING AT THE MOMENT 2015-01-24 04:14:41 -05: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
Michael Q Larson 6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	controllers/bonfire.js
2015-01-21 15:37: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
Michael Q Larson 0dcce67763 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	public/css/main.less
2015-01-18 16:13:23 -08:00
Nathan Leniz 53e5d06147 Improving bonfire and adding testing 2015-01-18 19:10:03 -05:00
Michael Q Larson f6603aadae work with @brndnb to improve usability of completion modals and write client-side jquery to prevent post if user isn't authenticated, which fixes a javascript error we were experiencing on serverside 2015-01-18 13:36:24 -08:00
Michael Q Larson 7722c20877 Merge branch 'twitter-auth' of https://github.com/FreeCodeCamp/freecodecamp into one-column-challenges
Conflicts:
	app.js
2015-01-17 17:46:12 -08: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
Michael Q Larson 7727368f34 turned the challenges list into a modal 2015-01-17 14:41:30 -08: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
Michael Q Larson 13faedc86e Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder 2015-01-14 13:28:20 -08:00
Michael Q Larson d328842bda only partially working 2015-01-13 12:50:00 -08:00
Michael Q Larson 7136f2eff3 fix angular issue that was preventing load of accounts page 2015-01-12 11:48:36 -08:00
Michael Q Larson fc00ef3f29 restyle portfolio and make all portfolio paths off of root and hide angular form until loaded 2015-01-11 22:19:56 -08:00
terakilobyte 785ed3916c The smoke rises 2015-01-10 15:21:03 -05:00
Michael Q Larson e1ed00419f fix uniqueness and ability to detect original value 2015-01-09 20:03:24 -08:00
terakilobyte b4395e2b59 Cleaning up, enforcing username constraints to match profile page settings. Added uniqueness to profile username. 2015-01-09 22:05:45 -05:00
Michael Q Larson 02eb3b5914 committing what I have for Nathan to continue 2015-01-09 18:09:49 -08:00
Michael Q Larson 3e7da5ae98 start angularizing sign up form 2015-01-09 17:52:19 -08:00
Michael Q Larson 4e91e94463 fix firefox CDN issue and ensure twitter handle, email and username are lowercase 2015-01-09 15:10:34 -08:00
terakilobyte 22ed592134 Finishing up profile 2015-01-07 16:23:25 -05:00
terakilobyte 7e34ea340d More angular validation 2015-01-06 10:28:57 -05:00
terakilobyte 3490ff197d Finish proof of concept of angular forms, added validation 2015-01-06 02:27:08 -05:00
terakilobyte 41a1bc37c3 Hooking up Angular to Profile.jade 2015-01-06 00:52:30 -05:00
Michael Q Larson be22449d25 continue work on angular form 2015-01-05 20:09:23 -08:00
Michael Q Larson 7a47df4e74 start using angular on form 2015-01-05 19:01:58 -08:00
Berkeley Martinez 10fd5dbdea Add AirBnB setting to jshint settings file. 2014-12-24 12:37:16 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson 177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson 09c89a904e start redesign with new logo 2014-11-07 13:25:08 -08:00
Michael Q Larson e36a98cf2a ajax seems to work and we now seem to track completion of challenges 2014-11-06 22:47:35 -08:00
Michael Q Larson 86d433aaba closer to getting ajax to work 2014-11-06 17:38:47 -08:00
Michael Q Larson 80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -08:00
Michael Q Larson 5a2de8c47b start grooming the challenges 2014-11-02 12:24:37 -08:00
Michael Q Larson ff5f12cda8 update views and remove additional cruft 2014-11-01 18:07:59 -07:00
Michael Q Larson d9e68463be completely purge websockets 2014-10-17 19:23:53 -07:00
Michael Q Larson 0ec7a052d1 rip out chat component 2014-10-17 19:10:53 -07:00
Michael Q Larson cd90333bca first attempt at expanding landing page 2014-10-16 13:17:03 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -07:00
Michael Q Larson a5985cd73d start building out views 2014-10-13 14:14:51 -07:00
Michael Q Larson d87db465ad fixed js errors but still not showing firechat or firepad 2014-10-12 18:04:38 -07: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 116378642f Update instruction comments in application.js 2014-02-07 09:46:59 -05:00
Sahat Yalkabov db1a185343 Add application.js for connect-assets to minify and concatenate JS files 2014-02-03 08:35:18 -05: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 65b44f7000 Added jasny bootstrap package 2013-12-05 16:00:21 -05:00
Sahat Yalkabov 389929df8a Blurred background on login and sign up pages, hide navbar on those pages 2013-12-04 18:35:40 -05:00
Sahat Yalkabov 73bcd2df93 dataTable jquery plugin for foursquare api tables 2013-12-04 16:01:09 -05:00
Sahat Yalkabov ff44a0e3bd Removed opacity animations on login page 2013-12-04 06:27:10 -05:00
Sahat Yalkabov 698ef88f64 Pretty sweet login container 2013-12-04 06:05:41 -05:00
Sahat Yalkabov 188539d4fe Removed angular.js related files which are no longer used 2013-12-03 17:36:13 -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 26ddda1c0a Cleanup and refactoring 2013-11-15 11:13:21 -05:00
Sahat Yalkabov c322527b7c added signup template and logout route 2013-11-14 13:29:13 -05:00
Sahat Yalkabov d18ae61019 Finally got angular to work with express partial routes 2013-11-14 02:29:55 -05:00
Sahat Yalkabov 2410aaa74a cleaner assets structure 2013-11-14 00:46:43 -05:00
Sahat Yalkabov 56eb0e4e73 converted all auth functions to use mongoose 2013-11-14 00:15:52 -05:00
Sahat Yalkabov 92a7f6159e Added angular-seed to public folder 2013-11-13 16:05:26 -05:00
Sahat Yalkabov d4b651a5c8 Imported MEAN stack files 2013-11-13 12:32:22 -05:00