Commit Graph

485 Commits (d9e9af0a0f05c57f4f398fd69c7ea313de8f3392)

Author SHA1 Message Date
Ben McMahon 86d7c2f35a Merge pull request #2646 from QuincyLarson/linking 2015-08-25 02:00:04 +01:00
Quincy Larson fd440916a8 add descriptive message to failed account linking attempt 2015-08-24 17:52:12 -07:00
Berkeley Martinez d5118f489f Merge pull request #2619 from bugron/bugron-lisenting_typo
Fixes a typo in source code
2015-08-24 10:57:03 -07:00
Arsen Melikyan 49e3e20555 Fixes a typo in source code 2015-08-24 11:57:14 +04:00
Berkeley Martinez 0f3acc629c fix profile linking 2015-08-21 16:09:07 -07:00
Berkeley Martinez d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
Berkeley Martinez 16dcc6a39e remove old password reset route 2015-08-20 08:55:26 -07:00
Berkeley Martinez eaca9ef495 refactor challenges
now only queries challenges on start up
use default scheduler for array manipulation
2015-08-20 08:55:25 -07:00
Berkeley Martinez 6d1d8a3e28 fix current streak
always start from today
2015-08-20 08:55:25 -07:00
Berkeley Martinez da61161765 fix longest streak 2015-08-20 08:55:25 -07:00
Quincy Larson 1dadc48aea remove angular from user account creation flows 2015-08-19 15:55:40 -07:00
Berkeley Martinez f3410a3a95 remove debug statement 2015-08-19 13:48:04 -07:00
Berkeley Martinez 03b837cf51 fix break current stream 2015-08-19 13:46:26 -07:00
Berkeley Martinez 576315abdc fix current streak,
longest streak still broken
2015-08-19 13:05:53 -07:00
Berkeley Martinez 6a11b30bc2 serve static assets before sessions 2015-08-19 11:28:44 -07:00
Berkeley Martinez 01a45e0635 fix cannot find challengeId of undefined 2015-08-18 20:02:39 -07:00
Berkeley Martinez 0128829d11 fix cannot read property id of user durring upvote
post to upvote without auth returns 401
2015-08-18 19:48:42 -07:00
Berkeley Martinez 8c803281f6 fix cannot read property match of undefined 2015-08-18 19:23:43 -07:00
Berkeley Martinez f59d029336 fix check if url sent with story 2015-08-18 15:56:23 -07:00
Berkeley Martinez 478ed3c522 fix should toString userId's 2015-08-18 15:23:26 -07:00
Quincy Larson 9dcf284825 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 15:21:38 -07:00
Quincy Larson b4ae49f915 add challenge type to beginning of challenge in map 2015-08-18 15:21:26 -07:00
Quincy Larson b667a776ea add bonfires back in but now they are only visible to their creators 2015-08-18 14:53:18 -07:00
Berkeley Martinez b2f4e520cb fix account link failure now flashes 2015-08-18 14:48:52 -07:00
Berkeley Martinez f475a4e1ad fix map, should not mutate challenges 2015-08-16 14:20:00 -07:00
Berkeley Martinez de7eb3d440 fix email password reset 2015-08-16 09:54:59 -07:00
Quincy Larson b05d9338f4 update csp 2015-08-16 08:03:34 -07:00
Quincy Larson d14514f661 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 06:07:49 -07:00
Quincy Larson 58d86ce2dc hide linking buttons 2015-08-16 06:07:38 -07:00
Berkeley Martinez 7d22c2a073 fix should check completed challenge old _id 2015-08-16 05:52:25 -07:00
Quincy Larson e3404c6564 minor improvements and bug fixes to stories 2015-08-15 14:13:21 -07:00
Berkeley Martinez 42303dc6aa fix progressBar not showing
reduce function needs initial seed

closes #1753
2015-08-14 18:24:14 -07:00
Quincy Larson ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Berkeley Martinez acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -07:00
Quincy Larson 40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00
Berkeley Martinez 7eaccffd15 remove hikes from map
closes #1682
2015-08-12 20:39:40 -07:00
Berkeley Martinez cd9dcc6953 hide react routes 2015-08-12 20:32:27 -07:00
Berkeley Martinez eb07cbfea6 fix override user identity login to reformat provider 2015-08-12 20:10:12 -07:00
Berkeley Martinez fc29c1fd9b linking accounts now works.
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
Berkeley Martinez ca01115674 fix next challenge unknown bug
closes #1725
2015-08-12 11:47:03 -07:00
Berkeley Martinez 0fcf3bcf42 fix challenge completion should give brownie points
closes #1665
2015-08-11 14:17:08 -07:00
Berkeley Martinez 6fd19738ce refactor and lint home router 2015-08-11 13:22:16 -07:00
Berkeley Martinez 5f21db457d fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
Quincy Larson d67c049d5b make onboarding page the default homepage for authenticated users 2015-08-10 17:40:13 -07:00
Quincy Larson a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Quincy Larson f8665324ad simplify user account and profile system for github locking 2015-08-10 15:37:49 -07:00
Quincy Larson add87ae801 start simplifying account page 2015-08-10 15:10:38 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Quincy Larson 5fb1df0d55 start onboarding page 2015-08-08 16:13:23 -07:00
Berkeley Martinez 71a02ed8b7 update all instances of progressTimestamp to check for objects 2015-08-07 13:32:30 -07:00
Berkeley Martinez 8d293c9fc6 fix order of user/pairedWith in withLatestFrom operator in challenges 2015-08-06 15:51:36 -07:00
Berkeley Martinez 0def1b3ba8 readd challenges 2015-08-05 13:21:53 -07:00
Berkeley Martinez f167238c74 remove public accounts if user is not github cool or grandfathered 2015-08-05 13:01:48 -07:00
Berkeley Martinez 504239050c remove old license information
repo is now under copyright to FCC
find license in root directory
2015-08-05 13:01:48 -07:00
Quincy Larson 3c4142c92c fix profile update button 2015-08-04 18:43:40 -07:00
Quincy Larson 989cb87c00 add redirect for now vanished field guide articles 2015-08-04 18:00:01 -07:00
Quincy Larson 7246945b42 remove bonfires from campers' public portfolios 2015-08-04 15:09:20 -07:00
Berkeley Martinez a920e16cb9 fix completedWith.toLowerCase bug 2015-08-03 16:35:22 -07:00
Berkeley Martinez 1b948ed4af Merge pull request #1302 from tanis2000/tanis2000-1273
Fixes #1273 (URL validation when submitting news)
2015-08-01 16:37:01 -07:00
Quincy Larson 7b85031a8a fix issue with nonprofit show views not loading 2015-07-31 22:06:07 -07:00
Quincy Larson feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
Berkeley Martinez 13f2f349dc remove bonfire/comments models
remove comments from user router
2015-07-31 20:22:08 -07:00
Berkeley Martinez 646fa1cbac remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
Berkeley Martinez ee8776feb3 removes comments
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
Quincy Larson 3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
Berkeley Martinez 6454f37079 fix upvoting story no longer gives you brownie points
closes #1008
2015-07-31 14:31:12 -07:00
Berkeley Martinez c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Berkeley Martinez 1b9608f225 fix nonprofits totalSavings errors 2015-07-26 19:15:19 -07:00
Berkeley Martinez 41274fad2d jobs store fetching 2015-07-25 15:42:03 -07:00
Berkeley Martinez 6306580d84 add note about indexof call throwing 2015-07-25 13:35:01 -07:00
Berkeley Martinez a1a4ac883d add user stores/actions
construct fetchr on every request
2015-07-24 22:27:52 -07:00
Berkeley Martinez 6de5ad682e Get rid of uncompletedChallenges on user object 2015-07-23 16:03:52 -07:00
Berkeley Martinez 5f52498dc1 lint user file 2015-07-23 16:03:51 -07:00
Berkeley Martinez e22cd5da23 correct answer hits server 2015-07-23 16:03:51 -07:00
Berkeley Martinez 04a5a081b3 fix mixing forward slash on transistionTo 2015-07-23 16:03:48 -07:00
Berkeley Martinez 5ba0dc1fec hikes/:dashedName renders questions 2015-07-23 16:03:47 -07:00
Berkeley Martinez d0b1d83249 prefetch data and prime stores on client render 2015-07-23 16:03:47 -07:00
Berkeley Martinez de1d931b82 add hikes/map pulls hikes out of db and renders 2015-07-23 16:03:46 -07:00
Quincy Larson 83654fb86a finish adding the nodeschool challenges 2015-07-23 16:03:46 -07:00
Berkeley Martinez eb3f993b3b update split field guide view into categories 2015-07-23 15:50:47 -07:00
Berkeley Martinez 799f4736d7 fix always call onNext
use defaultIfEmpty to prevent filtering from collapsing observable
pipeline early
2015-07-23 15:49:04 -07:00
Quincy Larson e04c11c2e7 mid-task commit for Berkeley to take over 2015-07-23 15:49:04 -07:00
Berkeley Martinez ac35b4bf73 fix some typo's 2015-07-23 15:49:03 -07:00
Berkeley Martinez ef7e0c67ee fix not found calls next 2015-07-23 15:49:01 -07:00
Berkeley Martinez 4c8a8a4875 change mobile to hikes 2015-07-23 15:49:01 -07:00
Berkeley Martinez bb37583c90 fix should be getChildRoutes
fix fromNodeCallback returns array of values from callback
fix remove require.ensure - needs to be tested
2015-07-23 15:49:01 -07:00
Berkeley Martinez 2b80cdbbdc fix create Router from loopback 2015-07-23 15:49:01 -07:00
Berkeley Martinez e3acbe01a9 initial entry points up 2015-07-23 15:49:01 -07:00
Berkeley Martinez c33c6c9a8f introduce es6 and babel to whole app 2015-07-23 15:49:00 -07:00
Berkeley Martinez a5e7009a57 initial react app(WIP) 2015-07-23 15:49:00 -07:00
Valerio Santinelli d80fe7ff43 Fixes URL validation using the standard validator package. 2015-07-15 12:41:09 +02:00
Valerio Santinelli 9343806cd7 Fixed password reset. The check on the expiration date was incorrect. 2015-07-15 12:28:13 +02:00
Quincy Larson c2a9a1ca62 add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson 0301d3bc61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-02 13:59:22 -07:00
Quincy Larson 4fb3b3e7cc add more cities and move the bootcamp calculator to field guide entries (still untested). 2015-07-02 13:59:13 -07:00
Berkeley Martinez 580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
Quincy Larson d9fe6dcef1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez 8570f9b5e7 fix story upvote should happen at end of stream 2015-06-26 00:35:13 -07:00
Berkeley Martinez 9818186afc fix should redirect to /news when no story is found 2015-06-26 00:16:18 -07:00
Berkeley Martinez 549434bdbf fix should be /news for show views 2015-06-25 23:39:38 -07:00
Quincy Larson 6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez 9c2768591d fix check for user existence 2015-06-25 23:01:04 -07:00
Quincy Larson e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
Berkeley Martinez 13590a1331 refactor rxify stories
fixes many bugs
2015-06-25 15:03:46 -07:00
Berkeley Martinez 1f28f877cf fix remove mongoose specific function 2015-06-24 08:25:34 -07:00
Berkeley Martinez c0c15cf875 fix define story 2015-06-24 07:16:09 -07:00
Berkeley Martinez 0b1e9ba279 fix mismatch property in challenge controller 2015-06-23 16:45:35 -07:00
Berkeley Martinez 31eb81bf2f fix many queries in story 2015-06-23 16:28:16 -07:00
Berkeley Martinez fb04a022ae refactor rxify fieldguides 2015-06-23 16:22:07 -07:00
Berkeley Martinez 1dda8e2f87 refactor Rxify nonprofits router 2015-06-22 19:23:07 -07:00
Berkeley Martinez d624cf3640 factor out (un)dasherize into utils 2015-06-22 17:24:55 -07:00
Berkeley Martinez 10a5c3c928 fix send 200 to non users on post to challenges
fix remove random 'yo' debug
2015-06-22 16:43:31 -07:00
Quincy Larson 6972f64697 fix minor issue with controller 2015-06-21 22:46:37 -07:00
Quincy Larson ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez 629262dd0d fix /chat should go to gitterim 2015-06-20 23:15:10 -07:00
Berkeley Martinez 742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Berkeley Martinez 0623ace259 fix sitemap query's
make rx mapping async
2015-06-20 21:21:36 -07:00
Berkeley Martinez f17c442018 fix should be story not store 2015-06-20 20:54:39 -07:00
Berkeley Martinez 03ea412b4a major challenges refactor
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
Berkeley Martinez 4d2b0844ae fix use regex to find challenges 2015-06-20 19:54:08 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Berkeley Martinez 43ae70465b refactor returnIndividualBonfires 2015-06-20 11:43:12 -07:00
Berkeley Martinez 50a0ad3595 fix use gt not $gt
closes #1022
2015-06-20 00:36:28 -07:00
Berkeley Martinez 12b055353e remove challangeMap
move to challenges router
2015-06-19 14:49:10 -07:00
Berkeley Martinez 938568454e move getMDNLinks func to utils 2015-06-19 14:32:17 -07:00
Quincy Larson 40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
Quincy Larson 2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
Quincy Larson ef9d6fc55b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 06:08:18 -07:00
Quincy Larson 23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
Quincy Larson c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
terakilobyte 1cd85eeb8f Debug statement for fieldguide ID 2015-06-15 23:35:29 -04:00
terakilobyte 4fa1f25cc2 Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records. 2015-06-15 20:53:43 -04:00
terakilobyte 42aae365f6 Update current challenge logic 2015-06-15 18:57:45 -04:00
terakilobyte 4092dcecf7 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:50:31 -04:00
terakilobyte c136895064 Rewrite challenge controller to use dashed names, update index.js to include new utility function getDashedNames 2015-06-15 18:50:18 -04:00
Berkeley Martinez b0dc4ffa12 get account should redirect to '/' when no user is logged in 2015-06-15 15:47:56 -07:00
Berkeley Martinez c4d229e62d remove email verification step.
users are marked for future uses
2015-06-15 15:43:12 -07:00
terakilobyte a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -04:00
Quincy Larson 43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
terakilobyte 5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
Berkeley Martinez 0f5f92b937 fix user deletion of credentials
should use a where clause with destroyAll
2015-06-12 11:58:31 -07:00
Berkeley Martinez c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez 5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
terakilobyte f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
terakilobyte 0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
Berkeley Martinez fe5cbec117 add pull in user image on signup when available 2015-06-11 11:38:08 -07:00
Berkeley Martinez 84f2168769 fix remove stray profile reference
fix findOne queries should have where filter
2015-06-10 17:12:21 -07:00
Berkeley Martinez 9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez bdb7d40548 fix usernames should be saved lowercased 2015-06-10 15:22:57 -07:00
Berkeley Martinez 996c3e7816 fix make email optional 2015-06-10 15:12:48 -07:00
Berkeley Martinez cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
Berkeley Martinez b34646dd6b remove passport file
remove unneeded comments
2015-06-09 16:45:14 -07:00
terakilobyte 5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04:00
Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
Berkeley Martinez 78dac937f7 remove email verification. 2015-06-07 22:07:38 -07:00
terakilobyte 1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
terakilobyte 6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00
terakilobyte 21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
terakilobyte 4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
terakilobyte d782ac9520 Update find method in fieldGuide.js 2015-06-05 13:25:28 -04:00
terakilobyte a0b34c8e90 Redirect to home path on unsuccessful query rather than induce infinite redirect loop. 2015-06-05 09:41:53 -04:00
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Berkeley Martinez 7a2bcc06f7 add passport stuff back
Because Berkeley really needs to wait for his coffee to kick in before
commiting anything...
2015-06-04 12:03:53 -07:00
Berkeley Martinez 075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez e349797a4b rename boot utility
remove subrouter use in server.js
2015-06-03 16:56:48 -07:00
Berkeley Martinez bfd33d8b40 fix use app.use(router) to add sub router 2015-06-03 16:31:42 -07:00
Berkeley Martinez 8165105b29 refactor all boot to export func and use loopback 2015-06-03 16:19:23 -07:00
Berkeley Martinez 65cde59f0d use app instead of server in boot directories 2015-06-03 12:26:11 -07:00
Berkeley Martinez 79cbe13c62 fix seed paths 2015-06-03 12:23:37 -07:00
Berkeley Martinez e7d01424e9 refactor challenge and challengeMap 2015-06-02 19:02:54 -07:00
Berkeley Martinez 956a2b915e initial move to loopback server 2015-06-02 17:27:02 -07:00
Berkeley Martinez 279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
Quincy Larson f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
Berkeley Martinez 7643f1cabe fix FCC running using router syntax 2015-06-01 17:01:54 -07:00
Berkeley Martinez 7bb11e9fbe fix linting errors in server/boot/utilities 2015-06-01 16:48:16 -07:00
Berkeley Martinez d67f7c666d refactor challenge controller to router syntax 2015-06-01 16:45:21 -07:00
Berkeley Martinez 28f0320f18 refactor fieldGuide controller to router 2015-06-01 16:32:54 -07:00
Berkeley Martinez 7c2f171d31 fix all the linting errors in boot 2015-06-01 16:23:53 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00