opensource/freeCodeCamp
3
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-09-24 23:01:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,733 Commits 4 Branches 0 Tags
2a00a79ffc04ff4ff54564fd148697254fec8a0f
Commit Graph
97 Commits
Author SHA1 Message Date
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04: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 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 a24ad9b993 update the welcome mailer and change fontsize on bonfire helpful links 2015-03-31 10:00:30 -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 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 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 4d3337df32 Merge branch 'ziplines' into ux-improvements 
Conflicts:
	views/coursewares/showJS.jade
 2015-03-28 00:24:41 -07: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
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 f9523beb29 update copy on show all bonfires button 2015-03-22 18:22:07 -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
Michael Q Larson f93fe396db hide all codemirror textareas until codemirror can replace them on load 2015-03-09 23:03:17 -07: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
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
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 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 90caed3369 More UX improvements 2015-02-22 16:46:55 +09: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 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
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 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 4fa6c9c65d iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code 2015-02-08 01:12:40 -05:00
Michael Q Larson 180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson 4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
 2015-02-06 14:39:16 -05:00
Nathan Leniz dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Nathan Leniz 51e8cd410e Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-05 10:02:24 -05:00
Nathan Leniz 995ba0b9ed Fixed accessibility issue whereby completion button for bonfires was set to be hidden to screenreaders 2015-02-05 10:01:55 -05:00
Nathan Leniz c22a38972b Cleaning up generator pages 2015-02-04 23:59:05 -05:00
Nathan Leniz 7344a74c01 Configuring the modal 2015-02-04 21:35:20 -05:00
Michael Q Larson f2ad94d7c6 add h1 text to bonfire, challenge and account views 2015-02-04 13:04:51 -08:00
Michael Q Larson f1000c3189 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	views/layout.jade
 2015-02-02 23:32:46 -08:00
Quincy Larson f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire 
Ga bonfire
 2015-02-02 23:04:54 -08:00
Nathan Leniz c3926423af Adding analytics to bonfire 2015-02-03 01:57:35 -05:00
Michael Q Larson 0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Michael Q Larson e7da57401e fix the icons after an accidental breaking change on completion modals 2015-01-30 17:42:17 -08:00
Michael Q Larson 380a7ce8c9 add ng-cloak to our ng-show alert messages to prevent them from showing while the page is loading 2015-01-30 12:06:21 -08:00
Michael Q Larson d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson 74acf75c0c left align font on bonfire challenges 2015-01-28 21:14:26 -08:00
Michael Q Larson 2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00