gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,680 Commits 9 Branches 0 Tags
2c53a17521bee5a4d9b9aff17afab80cf6b99f1e
Commit Graph

696 Commits

Author SHA1 Message Date
Michael Q Larson
7bc2232c01 remove api.js as it is a vestigial hackathon starter controller 2015-04-17 19:27:44 -07:00
Michael Q Larson
d10011acc3 Pull some useful changes from aborted branch 2015-04-16 23:54:26 -07:00
Michael Q Larson
d2fae63310 fix a few minor issues post merge 2015-04-16 23:16:55 -07:00
terakilobyte
edefd90268 Fix bug where users could get points for completing the same challenge. 2015-04-17 01:40:32 -04:00
terakilobyte
f1acc59f82 Fix bug where users could get points for completing the same challenge. 2015-04-17 01:39:55 -04:00
terakilobyte
b9372b9af6 Resolve merge conflicts using Webstorm's merge integration tool. v2 2015-04-17 00:39:48 -04:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -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
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
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
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -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
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
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
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
2328cc2927 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 
Conflicts:
	controllers/user.js
 2015-03-31 15:11:06 -07:00
Michael Q Larson
a60c5eb92c refactor passport so that emails aren't fired if there are errors in save actions 2015-03-31 15:07:34 -07:00
Berkeley Martinez
2bc92924e2 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-31 13:46:49 -07:00
Berkeley Martinez
e04470872e Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261 
Conflicts:
	controllers/courseware.js
 2015-03-31 13:43:58 -07:00
jameskopacz
f5d6abdfef On story submission create unique story URL if slug already exists 2015-03-30 23:14:39 -05: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
cdc5af4194 fix the challenges show all challenges button 2015-03-30 16:30:12 -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
64c4bfd566 remove a leftover console.log 2015-03-30 12:55:31 -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