Commit Graph

1337 Commits (64a12c6691d9ccb1899e7eb85ee4914619397509)

Author SHA1 Message Date
terakilobyte c170bef08c Hotfix fontawesome for site layout. Update package.json to lock to major version # 2015-05-04 17:37:29 -04:00
Quincy Larson 961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
Quincy Larson 14b99b7b67 finish making cdns gracefully fallback to bower 2015-05-03 16:31:45 -07:00
Quincy Larson a0b7b0b653 heatmap looks better 2015-05-03 14:45:46 -07:00
Quincy Larson 8867fe42d7 get angular working in bower 2015-05-03 14:28:03 -07:00
Quincy Larson c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Quincy Larson 451e3c75f2 improvements to portfolios and heatmaps 2015-05-03 00:34:46 -07:00
Quincy Larson 6d015212e4 add tips to all bonfire views 2015-05-02 18:56:42 -07:00
Quincy Larson ca189c5d71 remove Saturday Summit announcement modal 2015-05-02 18:52:15 -07:00
Quincy Larson b269ca08a0 fix mobile news-nav 2015-05-02 17:08:07 -07:00
Quincy Larson d65f66e03f fix mobile camper news headlines 2015-05-02 17:06:31 -07:00
Quincy Larson ef48efe8a8 improve sitemap 2015-05-02 16:50:59 -07:00
Quincy Larson 80d8fe7e81 add some alt tags to landing page 2015-05-02 16:11:37 -07:00
Quincy Larson 7cbcf46377 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	app.js
	views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
Quincy Larson 0f0adac85c stylize search results 2015-05-01 23:05:37 -07:00
Quincy Larson d492afb4f5 Merge branch 'mobile-news'
Conflicts:
	views/challengeMap/show.jade
2015-05-01 21:54:10 -07:00
terakilobyte cbdba845df Resolve merge conflicts 2015-05-02 00:41:38 -04:00
Quincy Larson f3c99d90a7 Merge pull request #406 from QuincyLarson/auth
potentially fix the too many redirects issue
2015-05-01 21:32:57 -07:00
Quincy Larson ec5c542d07 potentially fix the too many redirects issue 2015-05-01 21:32:24 -07:00
terakilobyte 1fc3595145 Fix twitter link in bonfire/show 2015-05-01 16:56:09 -04:00
terakilobyte a9b2e546de Fix twitter link on bonfire 2015-05-01 16:33:49 -04:00
Quincy Larson 18d9f06c14 make / path redirect to landing in case of old account issue 2015-05-01 10:18:24 -07:00
Quincy Larson d8b5028619 update announcement modal 2015-05-01 00:07:34 -07:00
Quincy Larson f17d8abf01 revert logo to free code camp logo 2015-05-01 00:05:32 -07:00
Quincy Larson 19456f2e23 add unsubscribe path 2015-04-30 23:41:40 -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 d6da385b92 remove some whitespace 2015-04-30 19:03:55 -07:00
Quincy Larson fefd7e19f5 update the sitemap to new news path 2015-04-30 17:22:14 -07:00
Quincy Larson 222f9b9a64 fix some of the news functionality 2015-04-30 17:18:08 -07:00
Quincy Larson 2cb02176a4 more camper news improvements 2015-04-30 15:56:14 -07:00
Quincy Larson 7b61e9daa2 More view beautification for mobile. 2015-04-30 15:19:38 -07:00
Quincy Larson cc13b325d6 fix some issues with @terakilobyte and beautify the camper news index view 2015-04-30 14:55:00 -07:00
Quincy Larson 164411e2c4 fix spelling of pinterest 2015-04-30 08:53:48 -07:00
Quincy Larson 026f210b6e fix the button hotkeys in the showZiplineOrBasejump view 2015-04-29 22:32:52 -07:00
Quincy Larson 19a556af80 add videos to some challenges 2015-04-29 22:05:21 -07:00
Quincy Larson a201633e09 improvements and fixes for our field guide. Add 20 day announcement modal 2015-04-29 15:31:49 -07:00
Quincy Larson 589059aa05 start styling news for mobile 2015-04-28 22:29:59 -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 35515c2da5 Merge branch 'videos' into pmi 2015-04-28 12:12:20 -07:00
Quincy Larson 0bbc803955 replace landing youtube videos with superior vimeo video 2015-04-28 12:11:49 -07:00
terakilobyte cef70a67a9 Fix broken url 2015-04-27 19:39:58 -04:00
Quincy Larson fd456ec9be make new landing pages and forms for project managers and nonprofits 2015-04-27 16:17:29 -07:00
Quincy Larson 45490f75c4 make checkboxes larger and remove text clicking for completion 2015-04-27 00:10:14 -07:00
Maxim Orlov 1539708613 Fix Camper News email notification logic 2015-04-25 16:05:36 +02:00
Quincy Larson e49c9ca87e make some improvements to the field guide articles and move the bonfire styleguide into field guides 2015-04-24 21:30:22 -07:00
Nathan 15ea7f3473 Merge pull request #363 from FreeCodeCamp/root
Root
2015-04-24 19:16:43 -04:00
terakilobyte f79834bec9 Greatly increase the speed of sitemap by a factor of at least 10 (Nathan, Quincy, and Berkeley pairing). 2015-04-24 18:57:55 -04:00
terakilobyte a8689fec4a Refactor sitemap function to use async for for easier reasoning. Factor out the user fetch as this was causing a huge blocking operation and eating a massive amount of memory. 2015-04-24 13:13:50 -04:00
Quincy Larson bea77c580e redirect user to bonfires if has completed waypoints but not bonfires gulp 2015-04-24 02:02:02 -07:00
Quincy Larson e5e47136ea make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse 2015-04-24 01:31:59 -07:00
Quincy Larson bf723b522b start making ux changes 2015-04-23 23:46:58 -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
Quincy Larson 92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
Quincy Larson be36f3dafd remove confusing modal 2015-04-23 07:57:14 -07:00
Quincy Larson 26d84a21e0 fix issues with unauthenticated field guide browsing 2015-04-22 15:50:11 -07:00
terakilobyte 935ba93b19 On to my next challenge change 2015-04-22 08:36:31 -04:00
terakilobyte f321d7f22f Merge branch 'master' of heroku.com:freecodecamp 2015-04-22 07:46:20 -04:00
Quincy Larson 0394c6d764 re-enable oauth providers 2015-04-22 04:40:25 -07:00
Quincy Larson 34ac36a64a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-21 19:46:08 -07:00
Quincy Larson 3a54f3b5ad update the meta image files for our new curriculum 2015-04-21 19:38:13 -07:00
terakilobyte e9c13124f1 Remove mention of ng-lodash from universal-head 2015-04-21 17:39:34 -04:00
Quincy Larson 05944b5c53 cosmetic update to nonprofit project page 2015-04-20 23:55:30 -07:00
terakilobyte 8781bc3e63 Accept comment edit pr 2015-04-19 22:22:11 -04:00
Quincy Larson b115b81204 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-19 18:07:29 -07:00
Quincy Larson 993819cf3b mirror the zipline view and the showVideo view 2015-04-19 18:07:19 -07:00
terakilobyte f396dad029 Fix upvote button on initial story submission. 2015-04-19 20:28:56 -04:00
terakilobyte 2736dfe638 Merge remote-tracking branch 'origin/master' 2015-04-19 03:37:25 -04:00
terakilobyte 08bf658897 Harden camper news and don't expose user object. Upvoting still needs to be looked at. 2015-04-19 03:36:54 -04:00
Michael Q Larson d078c6768a make the all field guides view conform to the challengeMap aesthetic 2015-04-18 17:19:06 -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 aacfb86e1f improve challenge map look 2015-04-18 14:17:10 -07:00
MrRenter b2f18a790a Changed from post to put for since updating not creatings 2015-04-18 11:53:46 -04:00
Michael Q Larson e39dfee5ef getting closer with the persisted checklists 2015-04-17 23:51:57 -07:00
MrRenter 790a4f941d Removed alert and added server side check for 10minutes 2015-04-18 02:46:16 -04:00
MrRenter 349dbbc2af Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js. 2015-04-18 02:40:48 -04:00
MrRenter 47bb301a91 Made it so edit will only be displayed for the user. Since its on client side (following practices used) a final check should be used when actually saving edit to db 2015-04-17 22:36:09 -04:00
MrRenter c711b41fa0 Added code to display edit button next to discuss button when viewing a story. Button will vanish if comment was posted > 10 minutes 2015-04-17 22:33:07 -04:00
Michael Q Larson 13d5b64427 fix a bug in the account view 2015-04-17 19:28:07 -07:00
Michael Q Larson b1e92ddcd8 comment out non-twitter auth options and add pintrest clone to basejumps 2015-04-17 19:04:46 -07:00
Nathan 5bdcc15e05 Enable search 2015-04-17 20:32:46 -04:00
Michael Q Larson 820fbb99c7 finalize the way zipline and basejump challenges will look, fix twitch view 2015-04-17 15:01:08 -07:00
Michael Q Larson 061d86b074 simplify the camper news UX 2015-04-17 13:09:35 -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 dbc99eafb6 Update chat link and copy. 2015-04-17 01:41:01 -04:00
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