Commit Graph

2793 Commits (e77eae2643d08ab9f28e82c023c5f867fdd6dccc)

Author SHA1 Message Date
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
Geoff Storbeck 003f6c6c0a Updated language and added more test cases 2015-03-31 19:07:22 -04: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
Michael Q Larson 22507de01f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-31 13:43:35 -07:00
Quincy Larson 362959ef42 Merge pull request #291 from jameskopacz/jameskopacz-patch-283
On story submission create unique story URL if slug already exists
2015-03-31 13:43:28 -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 f72774d412 minor wording improvement to a zipline. 2015-03-31 13:32:39 -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
jameskopacz f5d6abdfef On story submission create unique story URL if slug already exists 2015-03-30 23:14:39 -05:00
Geoff Storbeck 46d185a503 added 5 new bonfires 2015-03-30 23:27:09 -04: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
Berkeley Martinez b6dc82805d Merge pull request #279 from FreeCodeCamp/styleguide
Take @brndbr's styleguide to address #112
2015-03-30 13:12:40 -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
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 44ffc715de add nonprofit.json seed data from scrapped nonprofit branch 2015-03-29 15:29:14 -07:00
Michael Q Larson 9fe8bf2fbf remove references to codepen from codebase 2015-03-29 15:14:13 -07:00
Michael Q Larson 15728510ea t push origin ux-improvements:Merge branch 'terakilobyte-ux-improvements' into ux-improvements 2015-03-29 14:57:11 -07:00
Michael Q Larson 81ce249dfc tiny fix for a bonfire 2015-03-29 14:56: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
Quincy Larson 4405defb0f Merge pull request #275 from storbeck/master
Posts completed status when challenge 2 is opened for issue #274
2015-03-29 14:34:13 -07:00
Quincy Larson 7a27ded5bc Merge pull request #273 from aldraco/coursewaresErr
Coursewares error handling (issue #261)
2015-03-29 14:32:16 -07:00
Quincy Larson d5fdc15605 Merge pull request #272 from aldraco/bonfireMDN3-4
Bonfire mdn links: 3-4 flame
2015-03-29 14:28:58 -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 b0099efe6e updates to javascript waypoints 2015-03-29 14:19:04 -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
Michael Q Larson 4a805729cf add javascript waypoints 2015-03-29 12:51:23 -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 75073e362a Add errantly removed ramda include 2015-03-29 21:41:29 +09:00