Commit Graph

1319 Commits (d4eed5b5144fd6b0d14cc423599410174ffd561c)

Author SHA1 Message Date
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
Nathan Leniz b35f5ca59c Working on unifying coursewares view and logic 2015-03-21 13:42:02 +09:00
Nathan Leniz 6aaebbf34e Clean up show all bonfires modal 2015-03-21 12:12:48 +09:00
Nathan Leniz d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson 2f240655a2 update announcements and move announcement modal back into learn-to-code view 2015-03-19 23:24:44 -07:00
Michael Q Larson 29a0701e71 update link to nodeschool challenges video 2015-03-19 23:09:50 -07:00
Michael Q Larson 56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Michael Q Larson 76d0467758 update nonprofit project guide copy 2015-03-18 16:01:21 -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
jameskopacz 5ff3aabdd5 stories js var double output fix
challengeName and user are in stories/index.jade and stories/show.jade.

show.jade is only called from index.jade. This fix removes double output of those vars.
2015-03-17 21:18:55 -05:00
Michael Q Larson a52ab83757 half way done with the new upvoting ux 2015-03-17 17:57:50 -07:00
Michael Q Larson f1dcb4c373 start fixing the password in scope potential corner case security issue 2015-03-17 17:22:58 -07:00
Quincy Larson f144e84310 Merge pull request #214 from MrRenter/upvoteFix
Upvote fix
2015-03-17 15:48:15 -07:00
Nathan Leniz c9dd6366ec Compare against userIds 2015-03-18 05:01:14 +09:00
Nathan Leniz 8b491ed27e Fix display of comments if user is not logged in, disable reply button if no user, reject attempted comments if no user and no author 2015-03-17 17:44:52 +09: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
jameskopacz 6503cfc27d Comment overflow in News fix 2015-03-16 02:21:47 -05:00
Michael Q Larson f99718daa0 update meta og:image 2015-03-14 01:51:28 -07:00
Michael Q Larson 8e8711d947 add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users 2015-03-11 23:58:16 -07:00
Michael Q Larson 58e4e3c21a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-11 23:01:39 -07:00
Michael Q Larson e8ea6b39c9 fix link issue on show view 2015-03-11 22:29:03 -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 bb91982577 make link on show page open in new tab 2015-03-10 12:24:38 -07:00
Michael Q Larson 09f7be37ee make reply button consistent with discuss button throughout camper news 2015-03-10 10:22:20 -07:00
Michael Q Larson 526d874d1b add logic to truncate long headlines fetched from websites 2015-03-10 10:05:29 -07:00
Michael Q Larson ca52ab2b9b make links open a new tab 2015-03-10 09:43:13 -07:00
Michael Q Larson 5c0764c022 switch to tiny bullets in stories 2015-03-09 23:18:09 -07:00
Michael Q Larson f93fe396db hide all codemirror textareas until codemirror can replace them on load 2015-03-09 23:03:17 -07:00
Michael Q Larson f9133957e3 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 22:52:52 -07:00
Quincy Larson 68cc8cf7a7 Merge pull request #178 from jameskopacz/jameskopacz-patch-3
Hide codeEditor textarea to prevent flash
2015-03-09 22:52:03 -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
Nathan Leniz d6a6834971 Validate min length of 5 for username, 8 for password 2015-03-10 08:17:10 +09:00
jameskopacz b21217f80c Hide codeEditor to prevent flash
Fixes #176.

Hide #codeEditor textarea so it won't flash when code mirror hides it.
2015-03-09 17:38:21 -05:00
Berkeley Martinez 489aa68854 Merge pull request #167 from jameskopacz/jameskopacz-patch-1
"Update my public portfolio" button fix
2015-03-09 14:47:08 -07:00
Michael Q Larson 792d72c6b4 alias /news to /stories 2015-03-09 08:54:45 -07:00
Michael Q Larson 09e42df355 update sitemap 2015-03-09 07:18:31 -07:00
Nathan Leniz ac89c44064 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-03-09 18:45:21 +09:00
Nathan Leniz 1da79c2b86 Display meta description 2015-03-09 18:40:14 +09:00
Nathan Leniz af820582b5 Server side checking of user input before allowing signup. 2015-03-09 18:39:31 +09:00
jameskopacz 8326d0f973 "Update my public portfolio" button fix
"Update my public portfolio" button was appearing on all account pages.
2015-03-09 04:39:00 -05:00
Nathan Leniz b7e73c90eb Server side checking of user input before allowing signup. 2015-03-09 18:39:00 +09:00
Nathan Leniz 77cf279f54 Enforce 8 character length password with angular 2015-03-09 18:10:15 +09:00
Michael Q Larson 24ab61e271 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 00:27:23 -07:00
Michael Q Larson d7edde2a19 fix the casing of the views and a minor Jade warn statement 2015-03-09 00:27:17 -07:00
Nathan Leniz 528e0094d1 Add image display to show view for news 2015-03-09 13:55:13 +09:00
Nathan Leniz eb991c4f15 Add image fetching for articles that support the og:image meta tag 2015-03-09 13:08:39 +09:00
Nathan Leniz ca440c53f8 Enter button now triggers comment submission 2015-03-09 11:55:33 +09:00
Nathan Leniz 77496864d4 Unify comment view between comments and show, hide all comment input elements when user clicks on new reply button 2015-03-09 11:31:32 +09:00
Michael Q Larson 2f54153b16 get a running start on refactoring comment ui elements 2015-03-08 18:56:06 -07:00
Michael Q Larson 9475c2a899 start changing the reply areas on camper news from text areas to text fields 2015-03-08 17:51:27 -07:00
Michael Q Larson 48ce07058d disable searching since it's not yet working in production 2015-03-08 16:27:25 -07:00
Michael Q Larson 8d2552fe57 give users without images a default image and retroactively give that to all their stories and comments and also make some UI changes to stories. 2015-03-08 15:39:36 -07:00
Nathan Leniz 7a56d4fcb2 Remove debug/console.log statements 2015-03-09 06:58:08 +09:00
Michael Q Larson b2e8858e68 remove asynchronous loading of jquery 2015-03-08 14:45:06 -07:00
Michael Q Larson 35ce34104c fix bug 144 profile glitch 2015-03-08 13:56:11 -07:00
Michael Q Larson 3bd979ad08 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-08 12:16:35 -07:00
Nathan Leniz 212e59e061 Minor view tweaking 2015-03-08 20:22:55 +09:00
Nathan Leniz 6283ec1174 resolve show.jade merge conflict 2015-03-08 18:50:28 +09:00
Nathan Leniz de91be44da comment submit time bug fixed 2015-03-08 18:48:20 +09:00
Michael Q Larson aacb0070b3 add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces 2015-03-08 01:36:09 -08:00
Nathan Leniz f367a0310e Finalizing display issues for news release 2015-03-08 16:50:51 +09:00
Nathan Leniz bac22c1d96 Space hot stories view, remove all listing and refactor to divs 2015-03-08 12:48:02 +09:00
Nathan Leniz 1edc1aa3cf Begin refactoring story lists to order list, remove separate rank div 2015-03-08 12:32:35 +09:00
Michael Q Larson c8a9f6f810 add benign class that makes search and submit fields on news right size on mobile 2015-03-07 19:03:26 -08:00
Nathan Leniz 790a2d987b Fighting CSS 2015-03-08 11:53:03 +09:00
Michael Q Larson 0a741f0e54 further ux improvements to branch 2015-03-07 17:38:47 -08:00
Michael Q Larson 87ac659038 tighten up the interface for mobile 2015-03-07 16:48:57 -08:00
Nathan Leniz 585544e1fd Minor view improvements and removing extra dom closing tags from views 2015-03-07 21:33:04 +09:00
Nathan Leniz 485bbcc3a9 Bring reply link up closer to comment details 2015-03-07 20:57:28 +09:00
Nathan Leniz b776be58e5 Finish full functionality for intial release of camper news 2015-03-07 20:51:20 +09:00
Michael Q Larson b0e853d600 fix angular but at the cost of losing page speed 2015-03-07 02:30:39 -08:00
Michael Q Larson 8d86a6a060 add compression to svg assets 2015-03-07 02:25:35 -08:00
Michael Q Larson 61435283d0 fix issue with chat page showing 304 in firefox 2015-03-07 01:37:41 -08:00
Nathan Leniz a3769f6507 Story submission now with a description, refactor show to display description above comment box 2015-03-07 18:26:49 +09:00
Michael Q Larson 19afeda949 make google fonts also an async call 2015-03-07 01:08:08 -08:00
Michael Q Larson 297c7f3287 test moving the css to body 2015-03-07 01:02:46 -08:00
Nathan Leniz 9bea52d42f Refactor post flow, get url info back from server, redirect to final submission form 2015-03-07 17:42:22 +09:00
Michael Q Larson 43c729d288 attempt to make css loading asynchronous 2015-03-07 00:36:17 -08:00
Michael Q Larson e049951b88 remove CDN call for bootstrap and font awesome and get them loading locally 2015-03-06 23:56:22 -08:00
Michael Q Larson b73df4686e attempt to make script loads async 2015-03-06 23:22:56 -08:00
Nathan Leniz 39d66ea0da Merge branch 'master' into news 2015-03-07 15:23:56 +09:00
Nathan Leniz 89dd38cbac Fix minor bugs 2015-03-07 03:55:59 +09:00
Nathan Leniz b46fb576c3 window refreshes on comment submission 2015-03-07 02:24:28 +09:00
Nathan Leniz 6910ed0aea Nesting of comments in view, disabling comment form display button on button click 2015-03-07 01:57:09 +09:00
Nathan Leniz 53598a8e6f Properly binding comment comment button to the proper comment 2015-03-06 18:47:41 +09:00
Michael Q Larson 1ee1ff4052 sitemap now works and can be deployed 2015-03-06 00:20:39 -08:00
Michael Q Larson c8c396981a update sitemap 2015-03-06 00:13:58 -08:00
Michael Q Larson 9df29350ed update the search UI 2015-03-05 17:30:05 -08:00
Nathan Leniz 6fc72de232 add basic text search for post headlines 2015-03-06 09:20:30 +09:00
Nathan Leniz 0276c6867e Display hot/recent/submit/search views correctly through index 2015-03-06 08:20:49 +09:00
Nathan Leniz 5440efc729 Wire hot, recent, submit, and search views in app and controller, modified button navigation to fetch their routes 2015-03-06 08:11:18 +09:00
Michael Q Larson 25f589479a refactor camper news into 4 pages instead of one 2015-03-05 13:42:01 -08:00
Nathan Leniz 8552a06ac6 Add url correcting in case user forgets http:// or https:// so url works properly in show view, remove upvote arrows from index view 2015-03-05 19:54:31 +09:00
Nathan Leniz 40a42e29c2 Fixed url redirect after submission, upvoting now works 2015-03-05 19:40:44 +09:00
Nathan Leniz 41442a540f Need to work on story redirect after submission, fix url link in stories/show 2015-03-05 19:21:26 +09:00
Michael Q Larson 6a9bfc5ebf remove together.js and add a non-functioning submit form to the index view of news 2015-03-04 23:44:30 -08:00
Nathan Leniz 3fac5cb70e Improve comment view, re-enable upvoting for articles 2015-03-05 09:13:22 +09:00
Nathan Leniz ba97c984e7 Improve view for individual news story 2015-03-05 07:49:55 +09:00
Michael Q Larson d8b8373b70 do some refactoring of the camper news views 2015-03-03 19:55:04 -08:00
Nathan Leniz 2c375e8c61 Improve layout of posts 2015-03-04 07:55:13 +09:00
Michael Q Larson 260c25a482 some minor UI improvements on news 2015-03-03 14:35:35 -08:00
Nathan Leniz 6ac780e836 Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works 2015-03-04 07:15:00 +09:00
Michael Q Larson 3416353baf remove mention of forum from fcc 2015-03-03 11:31:16 -08:00
Nathan Leniz 968832ae52 start of comments view 2015-03-03 22:52:45 +09:00
Nathan Leniz 4b84b49d07 Added start of individual post view and post lists view, wired upvoting functionality for individual posts 2015-03-03 22:03:33 +09:00
Nathan Leniz 94bbb7a4a5 Beginnings of the show individual post view 2015-03-03 19:50:16 +09:00
Nathan Leniz 52e494407b Get initial view working, sort out mongo mess with seed file 2015-03-03 19:23:56 +09:00
Michael Q Larson b7a95ee56f passing off hacker news clone to Nathan and his pair 2015-03-03 01:41:32 -08:00
Michael Q Larson 595f8d3271 remove facebook from footer 2015-02-28 20:59:39 -08:00
Nathan Leniz 33c302eaa6 Revert from tight-h3 class to prevent text overlapping when the text wrapped on devices with lower resolution 2015-02-27 18:17:42 +09:00
Michael Q Larson 3c1ee02246 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-26 14:38:29 -08:00
Michael Q Larson a524ffdde0 beautify learn-to-code 2015-02-26 14:38:22 -08:00
Michael Q Larson dfa15d8fc1 add menu text to the hamburger menu on mobile 2015-02-26 13:22:12 -08:00
Michael Q Larson 907415e13d add alt text to learn-to-code images 2015-02-26 12:44:32 -08:00
Nathan Leniz 2cc469e293 Refactor undefined check for mainjs, add a challengeName to email signup page 2015-02-27 05:02:52 +09:00
Michael Q Larson a89139119a update navbar link to challenges 2015-02-25 14:22:42 -08:00
Michael Q Larson 120cc113b9 current work on d3 2015-02-22 23:47:30 -08:00
Michael Q Larson f4fcb565f4 Merge branch 'master' into ux-improvements
Conflicts:
	seed_data/coursewares.json
2015-02-22 18:17:47 -08:00
Michael Q Larson 55f892a974 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 18:16:42 -08:00
Michael Q Larson fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08:00
Michael Q Larson 19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Michael Q Larson 67ff808734 Merge branch 'master' into ux-improvements
Conflicts:
	views/bonfire/show.jade
2015-02-22 15:26:22 -08:00
Nathan Leniz 0674466f5f Add bitly url shortening to twitter buttons 2015-02-23 08:01:55 +09:00
Nathan Leniz dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09:00
Mike 380e301a9a Flip windows and mac gitter links 2015-02-22 08:05:32 -07:00
Nathan Leniz ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Nathan Leniz 3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
Nathan Leniz b5a449cb1c Cross off completed bonfires in list of all bonfires in modal 2015-02-22 17:36:43 +09:00
Nathan Leniz 90caed3369 More UX improvements 2015-02-22 16:46:55 +09:00
Nathan Leniz a197e99b1e Starting bonfires view partial, ajax call works, need to work into view 2015-02-22 16:27:38 +09:00
Nathan Leniz 8a5e3d9a9a Merge branch 'ux-improvements' of https://github.com/freecodecamp/freecodecamp into ux-improvements 2015-02-22 14:58:50 +09:00
Nathan Leniz 89eb361ec3 Merge master 2015-02-22 14:58:45 +09:00
Michael Q Larson 53bbe90290 find a son format that works with d3 2015-02-21 21:45:25 -08:00
Michael Q Larson e0c82156a7 refactor layout.jade to have universal head, and customize together.js 2015-02-21 14:49:24 -08:00
Michael Q Larson e5cfa147fa attempt to use togetherjs 2015-02-21 14:22:46 -08:00
Michael Q Larson 04cd57b919 Revert "add together.js"
This reverts commit a41c37ec03.
2015-02-21 01:53:13 -08:00
Michael Q Larson dfc44651e2 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	app.js
2015-02-21 01:20:17 -08:00
Michael Q Larson a41c37ec03 add together.js 2015-02-21 01:17:54 -08:00
Michael Q Larson 74f6fc6763 continue work trying to get d3 to work 2015-02-20 23:55:19 -08:00
Michael Q Larson 80485a9ad6 one in 100 page loads will show dinosaur in the free code camp graphic 2015-02-20 22:32:39 -08:00
Nathan Leniz 9a8fd73d53 Merge branch 'master' into ramda-fire 2015-02-21 14:47:55 +09:00
Nathan Leniz c852aef1be Ramda upgrade 2015-02-21 11:38:03 +09:00
Michael Q Larson 2e8c6461e6 Start work on D3 cal-heatmap 2015-02-19 17:18:44 -08:00
Michael Q Larson 85f6c6eb4d make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page 2015-02-19 16:33:08 -08:00
Michael Q Larson d93e0fb56a uncomment twitter login - it works again 2015-02-19 13:33:08 -08:00
Michael Q Larson 749954542f refactor learn-to-code view to look more visual and have fewer components 2015-02-18 22:58:10 -08:00
Michael Q Larson 884ff62bcc make the footer look better on desktop with more descript links and make the go to next challenge button the CTA button style and added the difficulty label to the flames in bonfire 2015-02-18 21:20:44 -08:00
Michael Q Larson 9d60f9e0c5 add Angelica to counselors 2015-02-18 17:30:29 -08:00
Michael Q Larson c766ad3766 remove twitter login option until we can fix it 2015-02-18 13:18:53 -08:00
Michael Q Larson 4ef8e7eda4 reverse the attempts to allow cross site scripts and just use relative paths for now 2015-02-17 15:35:16 -08:00
Michael Q Larson 09e9dcefe0 attempt to configure mimetype for ajax calls 2015-02-17 14:52:46 -08:00
Michael Q Larson ca9658bf16 update API routes 2015-02-17 14:14:25 -08:00
Michael Q Larson 0d3ee3c2b4 add screen hero installation view 2015-02-17 14:10:15 -08:00
Michael Q Larson 449589827c add ajax for github calls 2015-02-17 13:31:59 -08:00
Michael Q Larson bc57bbdc37 add trello ajax partial 2015-02-17 13:06:46 -08:00
Michael Q Larson 8e209d6bca start refactoring the learn-to-code view to use ajax 2015-02-16 23:35:02 -08:00
Michael Q Larson 44ea0039f6 fix a button link issue 2015-02-16 18:31:40 -08:00
Michael Q Larson d279ac6d1b add announcements and make the github api calls more robust 2015-02-16 17:48:42 -08:00
Michael Q Larson 762ee8aa26 fix about view to render data from github 2015-02-16 01:21:40 -08:00
Michael Q Larson 9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -08:00
Nathan Leniz 92136dcd1f Fixing dependency injection for account view as well as defining a challengeName to suppress errors 2015-02-14 22:52:44 -05:00
Nathan Leniz e3c9e42fce showJS view now shows errors in a pretty format (kinda) 2015-02-14 18:43:45 -05:00
Nathan Leniz 9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz 693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08:00
Michael Q Larson 255d2654ea fix an indentation issue in showHTML 2015-02-14 12:52:04 -08:00
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz efa4b2d9bc Factor all challenges button out of showvideo 2015-02-13 21:07:56 -05:00
Nathan Leniz b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Nathan Leniz 0eededde36 merge master into coderbye 2015-02-13 16:56:09 -05:00
Michael Q Larson bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
Nathan Leniz a0427b3e18 Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function 2015-02-13 12:14:12 -05:00
Nathan Leniz 995ca3d376 Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide 2015-02-13 00:24:57 -05:00
Jason Rueckert 54b5870fc9 Merge pull request #91 from phlacin/automaticDating-livepair
Added Moment.js library and time logic to next Live session
2015-02-12 20:44:27 -08:00
phlacin 2d447f0bb0 added automatic time logic to live-pair-programming page 2015-02-12 20:31:11 -08:00
Michael Q Larson f8f0c3454a subtle completed challenge button for courseware and add completionMessage to coursewares 2015-02-12 16:48:35 -08:00