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

1198 Commits (22f8cc2b65143b8b65c223cfd32b0e5db1d1086d)

Author SHA1 Message Date
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
Michael Q Larson ddb88643e0 Nathan's updates to the userMigration script' 2015-04-14 21:19:05 -07:00
Michael Q Larson e033f224bc fix challenge map to redirect to nonprofits 2015-04-14 20:20:38 -07: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 d7a698f629 fix the field guide 2015-04-14 19:39:25 -07:00
Michael Q Larson be00c7e402 Revert "remove inspectlet thinking this may be the malware twitter is finding" 
This reverts commit 4b9be16b24.
 2015-04-14 16:03:27 -07:00
Michael Q Larson 4b9be16b24 remove inspectlet thinking this may be the malware twitter is finding 2015-04-14 13:44:17 -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 332d4f1875 refactor story.js mailer and remove some cruft 2015-04-09 17:50:10 -07:00
Michael Q Larson 6f752b2437 minor tweaks to landing page 2015-04-09 13:06:36 -07:00
Michael Q Larson 62cabd56ff update camper news and chat challenges to have new videos and updated copy 2015-04-09 12:58:30 -07:00
Michael Q Larson 9fb048183c finish up adding the slack functionality with a redirect on the chat navbar button 2015-04-08 22:52:14 -07:00
Michael Q Larson 9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07: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 73b536de95 update sitemap 2015-04-08 15:05:24 -07:00
Michael Q Larson 29b4e3b970 get seed data seeding and improve application submitted button 2015-04-08 14:57:08 -07:00
Michael Q Larson c02fafa6a9 add status, turn hours into integer, create a directory view of all nonprofits 2015-04-08 14:36:05 -07:00
Michael Q Larson 61e07041a7 camper news reply emails go out to original story poster and poster of replied-to comment, works with old stories as well 2015-04-08 13:16:16 -07:00
Michael Q Larson 889de9c875 build other solutions page of links for nonprofits 2015-04-08 00:42:33 -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 751d25219e improve the wiki seed file and add strikethrough to read wikis 2015-04-07 22:33:49 -07:00
Michael Q Larson df4c698177 improve the challenge map 2015-04-07 12:45:31 -07:00
Michael Q Larson 2c6a781890 add inspectlet javascript 2015-04-07 00:32:01 -07:00
Michael Q Larson bd7c5310b1 improve the footer 2015-04-07 00:11:31 -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 ef57ec58c2 improve wikis with hotkey and update the flash to allow links 2015-04-05 17:35:08 -07:00
Michael Q Larson 32f9a61d5d add hotkey to wiki pages 2015-04-05 17:17:31 -07:00
Michael Q Larson 60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
Michael Q Larson c8b72499ab dynamically redirect chat link in navbar 2015-04-05 00:16:23 -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 29568d45b8 fix a typo related to challenge tweets 2015-04-03 23:54:31 -07:00
Michael Q Larson c9b4a90f57 more improvements to look of challengeMap 2015-04-03 20:50:27 -07:00
Michael Q Larson fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
Michael Q Larson 3cff4e9879 add logic to add campers to nonprofit projects of interest to them 2015-04-02 17:23:45 -07:00
Michael Q Larson 4aea12abca make slight modifications to the d3 calendar heatmap on the portfolio page 2015-04-02 15:53:38 -07:00
Michael Q Larson 44c5da8f72 improve the streak counter which previously wasn't defaulting to one day 2015-04-02 14:23:56 -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 fa74a1b454 got show all nonprofits button working and improved nonprofit show view 2015-03-31 17:38:33 -07:00
Michael Q Larson 8c97528171 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-31 13:32:51 -07:00
Michael Q Larson a24ad9b993 update the welcome mailer and change fontsize on bonfire helpful links 2015-03-31 10:00:30 -07:00
Michael Q Larson ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
Michael Q Larson acea52dc1b make further improvements to wiki and start new show view for nonprofits 2015-03-30 18:02:50 -07:00
Michael Q Larson 18a9818200 Merge branch 'master' into nonprofit-show 
Conflicts:
	controllers/challenges.js
	controllers/courseware.js
 2015-03-30 16:17:04 -07:00
Michael Q Larson 106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -07:00
Michael Q Larson 23a3e235a7 Update routes for all static pages and leave redirects for existing routes to get to new wiki routes 2015-03-30 15:15:07 -07:00
Michael Q Larson 660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -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 83a9223dcc respond to @BerkeleyTrue feedback 2015-03-30 13:09:24 -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 5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -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 f0ae47dcf2 Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires 2015-03-29 16:47:49 -07:00
Michael Q Larson 9fe8bf2fbf remove references to codepen from codebase 2015-03-29 15:14:13 -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
Michael Q Larson 70f812dc78 Merge branch 'master' into ux-improvements 
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	views/bonfire/show.jade
 2015-03-29 13:05:39 -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 f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
Michael Q Larson 47d0d8e0da Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-28 23:43:08 -07:00
Quincy Larson 1b247f97fc Merge pull request #262 from aldraco/bonfirelinks 
Bonfire MDN links - Issue #255
 2015-03-28 20:34:34 -07:00
Michael Q Larson ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07: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
Nathan Leniz 9e1a4a1348 Streak display in account/show.jade, refactor courseware.json for error handling and linting 2015-03-28 23:42:07 +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 94b6cae3ec apply Nathan's insights into multistep form' 2015-03-27 12:36:21 -07:00
Michael Q Larson c69d919d46 Merge branch 'master' into ux-improvements 2015-03-27 10:28:31 -07:00
Michael Q Larson 683498e62a remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting 2015-03-27 00:20:50 -07:00
Michael Q Larson e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -07:00
Michael Q Larson d64b5c5718 add progress bar to nonprofit project proposal wizard 2015-03-25 15:25:19 -07:00
Michael Q Larson 7d4c30c502 start adding progress bar to nonprofit onboarding 2015-03-25 14:18:27 -07:00
Michael Q Larson 6e4067ee00 most views are now in place 2015-03-24 22:12:16 -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
A. Drake b3174eeadf If no links are present, the template does not show the helpful links header. 2015-03-24 01:24:06 -04:00
A. Drake 4dae91ff41 formatting done. 2015-03-23 23:57:44 -04:00
A. Drake dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
A. Drake 0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
Michael Q Larson 1facf532f3 start building the nonprofit project flow 2015-03-23 10:42:59 -07:00
Michael Q Larson f9523beb29 update copy on show all bonfires button 2015-03-22 18:22:07 -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 d0a40dc202 fix intermittent variable declaration error in camper news view 2015-03-22 01:16:02 -07:00
Michael Q Larson 91edf73965 start building zipline views and controller 2015-03-21 17:23:13 -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 fa0462da4c point courseware reference in navbar to challenges 2015-03-21 18:58:14 +09:00
Nathan Leniz cf44287d7a resolve merge conflict in navbar 2015-03-21 18:53:15 +09: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