greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,941 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

599 Commits (bfe3c96ba991c751b59448e1b1ef5b2c3662aecf)

Author SHA1 Message Date
Nathan Leniz aa2f0e8af8 Change completion event to remove duplicate entries if the user states they paired with themselves 2015-03-29 21:15:18 +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
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 e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -07:00
Michael Q Larson 09b812688e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 
Conflicts:
	app.js
 2015-03-25 14:20:34 -07:00
Michael Q Larson 7d4c30c502 start adding progress bar to nonprofit onboarding 2015-03-25 14:18:27 -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
Berkeley Martinez f246ef618c Close web worker after completion 
closes #257
 2015-03-22 16:57:10 -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
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 d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson 56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -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
Michael Q Larson a52ab83757 half way done with the new upvoting ux 2015-03-17 17:57:50 -07:00
Quincy Larson f144e84310 Merge pull request #214 from MrRenter/upvoteFix 
Upvote fix
 2015-03-17 15:48:15 -07:00
MrRenter 2d5b34802b so spaces and tabs are totally differnt...whitespace fixes 2015-03-17 03:20:07 -04:00
MrRenter 9a5c7a0ce6 dammit part2 2015-03-17 03:09:34 -04:00
MrRenter 6a2209b9b4 god dammit already 2015-03-17 03:07:07 -04: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
Renter b7dd72f3a3 fixed coursewares 2015-03-17 03:00:37 -04:00
Nathan Leniz bf7d38e080 resolve conflict 2015-03-15 17:08:34 +09:00
Nathan Leniz c609294e1f force merge conflict for stream viewers 2015-03-15 17:06:05 +09:00
Michael Q Larson 191e38472e make selected indenting and outdenting work on courseware HTML, JS and Bonfires 2015-03-14 15:07:05 -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 f068df3ddf Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 22:50:11 -07:00
Quincy Larson 367262403c Merge pull request #177 from jameskopacz/patch-1 
Pointer on upvote button and reply button mouseover
 2015-03-09 22:46:00 -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
jameskopacz 6f18936ee9 Pointer on upvote button and reply button mouseover 2015-03-09 16:18:12 -05:00
jameskopacz 3a0bda0f92 "challengeName is not defined" fix 
Was getting this error in Firefox and Chrome: Uncaught ReferenceError: challengeName is not defined
 2015-03-09 04:49:03 -05:00
Nathan Leniz 25b14354ad Use params correctly and improve display of meta description. Refactor to media object. 2015-03-09 18:38:05 +09:00
Nathan Leniz 528e0094d1 Add image display to show view for news 2015-03-09 13:55:13 +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 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 dd1b1b3635 fix issue #150 Show user rendering glitch 2015-03-08 13:44:09 -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
Nathan Leniz f367a0310e Finalizing display issues for news release 2015-03-08 16:50:51 +09:00
Michael Q Larson 7b7f808385 minor fix to the showHTML view. No longer has awkward horizontal scroll, and should prevent this UX nonstarter throughout app now 2015-03-07 22:20:29 -08: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 7bb18d41a8 Revert "Add cloud front and remove together.js" 
This reverts commit e029a00440.
 2015-03-07 14:53:28 -08:00
Michael Q Larson e029a00440 Add cloud front and remove together.js 2015-03-07 12:48:25 -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
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 43c729d288 attempt to make css loading asynchronous 2015-03-07 00:36:17 -08:00
Michael Q Larson 687eb6c477 add font-awesome 2015-03-07 00:09:04 -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
Nathan Leniz 39d66ea0da Merge branch 'master' into news 2015-03-07 15:23:56 +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
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 046a209637 Comment submission now works on main story, need to refresh page after submission to display new comment 2015-03-06 06:08:40 +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
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
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 50b29eb2ba Refactor error message from bonfire 2015-03-01 09:54:03 +09:00
Michael Q Larson d962e3afe5 fix a line spacing issue 2015-02-27 14:00:47 -08: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
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 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 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
Nathan Leniz dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +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 90caed3369 More UX improvements 2015-02-22 16:46:55 +09: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
Nathan Leniz b32f6133db Update bonfire plugin version number to force fresh import on browsers 2015-02-22 06:23:44 +09:00
Nathan Leniz 9a8fd73d53 Merge branch 'master' into ramda-fire 2015-02-21 14:47:55 +09:00