Commit Graph

320 Commits (cd9dcc6953624f294dda95ef68db17f246668d69)

Author SHA1 Message Date
Quincy Larson 73f0dcf732 make wiki open in new tab 2015-08-04 14:58:24 -07:00
Quincy Larson 041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Quincy Larson df786eaf2b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 14:40:56 -07:00
Quincy Larson 0682857236 remove learn link from navbar 2015-08-04 14:40:47 -07:00
Berkeley Martinez 2dc9934da2 add user.isGithubCool check
if user signs up with github, they become GithubCool.
2015-08-04 13:41:10 -07:00
Berkeley Martinez c8488c8419 reremove extra middlewares from server file 2015-08-04 06:28:10 -07:00
benmcmahon100 fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Berkeley Martinez a1a64435d6 readding twitter auth
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
Berkeley Martinez 43d74c2f48 add beta warning banner 2015-08-04 01:34:26 -07:00
Berkeley Martinez efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
Berkeley Martinez f01a66c5c7 use (LMP)loopback middleware phases
bump loopback-component-passport which uses LMP
move custom middlewares to middlewares directory
2015-08-04 01:34:26 -07:00
Berkeley Martinez a920e16cb9 fix completedWith.toLowerCase bug 2015-08-03 16:35:22 -07:00
Berkeley Martinez 7ca1d7cfde remove facebook/google/linkedin auth from linking 2015-08-03 12:53:23 -07:00
Berkeley Martinez bf1c2ace00 disable facebook/google/linked auth for testing 2015-08-03 12:38:20 -07:00
Berkeley Martinez c5af46b33f remove beta flash 2015-08-03 08:31:02 -07:00
Berkeley Martinez 55731aa52d fix beta warning title
closes #1452
2015-08-02 07:07:03 -07:00
Berkeley Martinez 88092f9ed6 Merge pull request #1255 from ahstro/lumenteun-1235
Profile pictures in 'Camper News' now link to profiles.
2015-08-01 16:51:56 -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
Berkeley Martinez 32ce40b815 add beta site warning 2015-08-01 16:11:05 -07:00
benmcmahon100 0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
benmcmahon100 c075eb0116 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:24:16 +01:00
benmcmahon100 f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
benmcmahon100 aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
benmcmahon100 abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
Berkeley Martinez 8270cb4103 add github auth 2015-08-01 08:39:13 -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
Quincy Larson 439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -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
Quincy Larson 2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -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
Quincy Larson 5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
Berkeley Martinez 1b9608f225 fix nonprofits totalSavings errors 2015-07-26 19:15:19 -07:00
Berkeley Martinez dbe50a5dfa add beta.freecodecamp.com to csp script source 2015-07-25 15:44:40 -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 c0eda90eb1 make production future ready
This commit does the following:

Production start should use the following command `npm run
start-producion` this first runs bower install and builds the front end
app(react). Then it will use the `pm2Start` script. This script will set
up the pm2 daemons to run loopback in cluster mode. This script also use
`production-start` script instead of the regular `server` script.

The reasons are two fold: to ensure `server` is run in es7 mode, and to
wait for handshake from DB or kill itself if no DB can be found within a
certain amount of time.
2015-07-24 22:27:52 -07:00
Berkeley Martinez a1a4ac883d add user stores/actions
construct fetchr on every request
2015-07-24 22:27:52 -07:00
Quincy Larson 37d5efed4e Merge branch 'staging' into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -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 bf64beed5d Hide body overflow 2015-07-23 16:03:50 -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 5e02896269 update loading hike directly loads lecture 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 f4f2d68551 add state namespace 2015-07-23 16:03:47 -07:00
Berkeley Martinez 02e4c66726 add hike service sort by difficulty 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
Quincy Larson 60f2bdc685 more minor updates 2015-07-23 15:50:47 -07:00
Berkeley Martinez 8b0b5dd6ce split field guides into separate 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 94ed227aeb add video css 2015-07-23 15:49:03 -07:00
Berkeley Martinez ac35b4bf73 fix some typo's 2015-07-23 15:49:03 -07:00
Berkeley Martinez 6eca181f6f add vimeo to connect sources 2015-07-23 15:49:02 -07:00
Berkeley Martinez c1b0035d17 add bundle to react jade template 2015-07-23 15:49:02 -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 fb244aa165 remove server/server dir
accidently added to tracking
2015-07-23 15:49:00 -07:00
Berkeley Martinez 570d55193e add entry for use with plain node or node-debug start
i.e. `node-debug server/debug-entry`
2015-07-23 15:49:00 -07:00
Berkeley Martinez c33c6c9a8f introduce es6 and babel to whole app 2015-07-23 15:49:00 -07:00
Berkeley Martinez a0278c114d add express state extentions to app 2015-07-23 15:49:00 -07:00
Berkeley Martinez a5e7009a57 initial react app(WIP) 2015-07-23 15:49:00 -07:00
Berkeley Martinez 05c6dcdf0f add render$ ($ for stream) method to express res 2015-07-23 15:48:59 -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
LumenTeun e05cc3fbb9 Profile pictures in 'Camper News' now link to profiles. #1235 2015-07-11 01:12:17 +02:00
Quincy Larson 8072a4b7f2 fix modal closing a on showJS view 2015-07-10 10:12:53 -07:00
Quincy Larson 41f5325ab6 update landing page 2015-07-07 10:45:56 -07:00
Quincy Larson db324186da update showjs view 2015-07-05 17:15:54 -07:00
Quincy Larson 612de6911e update quotes 2015-07-04 23:52:29 -07: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
Quincy Larson 10f53bdd49 Merge pull request #1161 from LumenTeun/grammar
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
benmcmahon100 71ea26ab96 Implemented scroll-locker 2015-07-02 21:32:20 +01:00
benmcmahon100 8bed9fa7d7 Implemented scroll-locker 2015-07-02 21:31:59 +01:00
benmcmahon100 0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
Berkeley Martinez 580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
LumenTeun 75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson d9fe6dcef1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
Quincy Larson 3bac247627 remove stack trace from production 2015-06-26 01:30:51 -07:00
Quincy Larson 7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -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