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

559 Commits (ef57ec58c2b8cffb2b69866cb29f9c5a6b3d49cd)

Author SHA1 Message Date
Michael Q Larson ef57ec58c2 improve wikis with hotkey and update the flash to allow links 2015-04-05 17:35:08 -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 c9b4a90f57 more improvements to look of challengeMap 2015-04-03 20:50:27 -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 1248cde97f continue work on nonprofit show views 2015-04-01 22:31:08 -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 e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -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 7d4c30c502 start adding progress bar to nonprofit onboarding 2015-03-25 14:18:27 -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
Michael Q Larson bcec96e427 half way done with the initial views and controllers 2015-03-24 19:08:26 -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
Nathan Leniz 5e095e8832 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-21 13:42:08 +09:00
Nathan Leniz d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson 56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Michael Q Larson af19ea4308 improve upvoting UX and start adding angular validation to submit-story view 2015-03-18 00:40:18 -07:00
Michael Q Larson a52ab83757 half way done with the new upvoting ux 2015-03-17 17:57:50 -07:00
Quincy Larson f144e84310 Merge pull request #214 from MrRenter/upvoteFix 
Upvote fix
 2015-03-17 15:48:15 -07:00
MrRenter 2d5b34802b so spaces and tabs are totally differnt...whitespace fixes 2015-03-17 03:20:07 -04:00
MrRenter 9a5c7a0ce6 dammit part2 2015-03-17 03:09:34 -04:00
MrRenter 6a2209b9b4 god dammit already 2015-03-17 03:07:07 -04:00
MrRenter c9970c1725 Hide upvote arrow on news page if already upvoted. Make it disappear on upvote 2015-03-17 03:00:37 -04:00
Renter b7dd72f3a3 fixed coursewares 2015-03-17 03:00:37 -04: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
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 f068df3ddf Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 22:50:11 -07:00
Quincy Larson 367262403c Merge pull request #177 from jameskopacz/patch-1 
Pointer on upvote button and reply button mouseover
 2015-03-09 22:46:00 -07:00
Michael Q Larson 47507471ff update the stories view to have ghost discuss button and update chat instructions 2015-03-09 22:10:09 -07:00
Michael Q Larson d224fda65f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 17:05:24 -07:00
Michael Q Larson 0d43c8942e add discuss button to views and fix onhover issues 2015-03-09 17:05:18 -07:00
Quincy Larson c0702b9d04 Merge pull request #180 from terakilobyte/master 
MOre news updates
 2015-03-09 16:39:04 -07:00