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

70 Commits (8f6093296c30ca6efae6adf8364054128433b191)

Author SHA1 Message Date
Quincy Larson d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Quincy Larson fb3a116fff Merge branch 'master' into mobile-news 
Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade
 2015-04-30 19:10:10 -07:00
Quincy Larson 026f210b6e fix the button hotkeys in the showZiplineOrBasejump view 2015-04-29 22:32:52 -07:00
terakilobyte 9e8a618491 Twitter fixes. 2015-04-28 20:40:02 -04:00
terakilobyte 2487f0421b Fix tweeting in challenges 2015-04-28 19:35:12 -04:00
Quincy Larson 45490f75c4 make checkboxes larger and remove text clicking for completion 2015-04-27 00:10:14 -07:00
terakilobyte 4b2c04dd59 Improve functionality and allow rebinding if user doesn't hit control-enter 2015-04-23 20:14:20 -04:00
terakilobyte 98785184ef Improve functionality and allow rebinding if user doesn't hit control-enter 2015-04-23 19:55:33 -04:00
terakilobyte a4164276de Remove unnecessary unbinds. 2015-04-23 19:39:20 -04:00
terakilobyte 2a00a79ffc Fixes issue #353, add control-enter functionality to display modal as well as submit completion. Added bonus is to remove event listener. 2015-04-23 19:30:24 -04:00
terakilobyte 935ba93b19 On to my next challenge change 2015-04-22 08:36:31 -04:00
Quincy Larson 993819cf3b mirror the zipline view and the showVideo view 2015-04-19 18:07:19 -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 e39dfee5ef getting closer with the persisted checklists 2015-04-17 23:51:57 -07:00
Michael Q Larson e0aa084c7a finish getting field-guide working and improve zipline show view 2015-04-14 20:12:47 -07: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 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
Berkeley Martinez b6da312547 Merge pull request #278 from FreeCodeCamp/accessability 
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
 2015-03-30 13:12:56 -07:00
Michael Q Larson 97c978dc7c Make Basejumps show up properly and get their github routes persisting in the database. 2015-03-29 18:13:04 -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
Nathan Leniz b00c5be45c View improvement for users that are not logged in or happen to hit control enter 2015-03-29 21:41:59 +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
Nathan Leniz 6a19dc9bda Zipline/Basejump view with controller logic to serve. Will have to change based upon json 2015-03-29 00:09:50 +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
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 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
Michael Q Larson 2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 
Conflicts:
	controllers/resources.js
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
 2015-03-21 16:36:35 -07:00
Michael Q Larson 88e261ccf6 Merge branch 'master' into ux-improvements 
Conflicts:
	controllers/resources.js
	controllers/user.js
	seed_data/challenges.json
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
 2015-03-21 16:25:39 -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 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
Nathan Leniz d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Nathan Leniz ac4b4c64de Merge remote-tracking branch 'upstream/master' into next-courseware-flow 2015-03-12 00:04:12 +09:00
Nathan Leniz 4b1be9c67a Fix flow of next courseware in showJS view 2015-03-12 00:03:56 +09:00
Michael Q Larson f93fe396db hide all codemirror textareas until codemirror can replace them on load 2015-03-09 23:03:17 -07:00
Michael Q Larson aacb0070b3 add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces 2015-03-08 01:36:09 -08:00
Michael Q Larson f4fcb565f4 Merge branch 'master' into ux-improvements 
Conflicts:
	seed_data/coursewares.json
 2015-02-22 18:17:47 -08:00
Michael Q Larson 19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Nathan Leniz dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09:00
Nathan Leniz ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Nathan Leniz 3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09: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
Michael Q Larson 255d2654ea fix an indentation issue in showHTML 2015-02-14 12:52:04 -08:00
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz efa4b2d9bc Factor all challenges button out of showvideo 2015-02-13 21:07:56 -05:00