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
3c4142c92c
fix profile update button
2015-08-04 18:43:40 -07:00
3551cefb3d
simplify account.jade view for github integration
2015-08-04 18:29:05 -07:00
989cb87c00
add redirect for now vanished field guide articles
2015-08-04 18:00:01 -07:00
5f2ec0aeae
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
...
nto staging
2015-08-04 15:10:15 -07:00
7246945b42
remove bonfires from campers' public portfolios
2015-08-04 15:09:20 -07:00
e01876f3ab
disable username updating when camper is githubCool
2015-08-04 15:03:33 -07:00
73f0dcf732
make wiki open in new tab
2015-08-04 14:58:24 -07:00
041abd1065
fix beta warning
2015-08-04 14:58:04 -07:00
c573caf2e2
remove website links from user model and account view
2015-08-04 14:57:34 -07:00
df786eaf2b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-04 14:40:56 -07:00
0682857236
remove learn link from navbar
2015-08-04 14:40:47 -07:00
2dc9934da2
add user.isGithubCool check
...
if user signs up with github, they become GithubCool.
2015-08-04 13:41:10 -07:00
c8488c8419
reremove extra middlewares from server file
2015-08-04 06:28:10 -07:00
fc0ccf3aea
Fixed typos in magical maths waypoints and restored server.js to a previous working state
2015-08-04 13:28:41 +01:00
a1a64435d6
readding twitter auth
...
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
43d74c2f48
add beta warning banner
2015-08-04 01:34:26 -07:00
efa73c93ee
remove twitter auth
2015-08-04 01:34:26 -07:00
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
a920e16cb9
fix completedWith.toLowerCase bug
2015-08-03 16:35:22 -07:00
7ca1d7cfde
remove facebook/google/linkedin auth from linking
2015-08-03 12:53:23 -07:00
bf1c2ace00
disable facebook/google/linked auth for testing
2015-08-03 12:38:20 -07:00
c5af46b33f
remove beta flash
2015-08-03 08:31:02 -07:00
55731aa52d
fix beta warning title
...
closes #1452
2015-08-02 07:07:03 -07:00
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
1b948ed4af
Merge pull request #1302 from tanis2000/tanis2000-1273
...
Fixes #1273 (URL validation when submitting news)
2015-08-01 16:37:01 -07:00
32ce40b815
add beta site warning
2015-08-01 16:11:05 -07:00
0a34dcf6c3
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:25:49 +01:00
c075eb0116
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:24:16 +01:00
f60bfd5da1
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:22:02 +01:00
aef867cc69
Added extra regex moving on to fix scroller without those new images
2015-08-01 20:20:19 +01:00
abfab7389b
Added the scrolling editor
2015-08-01 19:55:40 +01:00
8270cb4103
add github auth
2015-08-01 08:39:13 -07:00
7b85031a8a
fix issue with nonprofit show views not loading
2015-07-31 22:06:07 -07:00
feab8b508e
remove field guide cruft and update all field guide links to wiki
2015-07-31 21:55:49 -07:00
fd68501e16
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-31 21:13:46 -07:00
439849e9d8
start removing field guide and update nonprofits
2015-07-31 21:13:40 -07:00
13f2f349dc
remove bonfire/comments models
...
remove comments from user router
2015-07-31 20:22:08 -07:00
646fa1cbac
remove mention of comments from zipline
...
update hot stories api uri
2015-07-31 20:10:30 -07:00
ee8776feb3
removes comments
...
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
3f49b6288f
move calculator back to its own view and out of field guide
2015-07-31 17:30:27 -07:00
6454f37079
fix upvoting story no longer gives you brownie points
...
closes #1008
2015-07-31 14:31:12 -07:00
2547868854
fix storage and reset functionality for js and html challenge views
2015-07-31 13:37:06 -07:00
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
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
fd3374fca7
about to start priority and !important waypoints
2015-07-28 17:11:51 -07:00
1b9608f225
fix nonprofits totalSavings errors
2015-07-26 19:15:19 -07:00
dbe50a5dfa
add beta.freecodecamp.com to csp script source
2015-07-25 15:44:40 -07:00
41274fad2d
jobs store fetching
2015-07-25 15:42:03 -07:00
6306580d84
add note about indexof call throwing
2015-07-25 13:35:01 -07:00
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
a1a4ac883d
add user stores/actions
...
construct fetchr on every request
2015-07-24 22:27:52 -07:00
37d5efed4e
Merge branch 'staging' into js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
6de5ad682e
Get rid of uncompletedChallenges on user object
2015-07-23 16:03:52 -07:00
5f52498dc1
lint user file
2015-07-23 16:03:51 -07:00
e22cd5da23
correct answer hits server
2015-07-23 16:03:51 -07:00
bf64beed5d
Hide body overflow
2015-07-23 16:03:50 -07:00
04a5a081b3
fix mixing forward slash on transistionTo
2015-07-23 16:03:48 -07:00
5ba0dc1fec
hikes/:dashedName renders questions
2015-07-23 16:03:47 -07:00
5e02896269
update loading hike directly loads lecture
2015-07-23 16:03:47 -07:00
d0b1d83249
prefetch data and prime stores on client render
2015-07-23 16:03:47 -07:00
f4f2d68551
add state namespace
2015-07-23 16:03:47 -07:00
02e4c66726
add hike service sort by difficulty
2015-07-23 16:03:47 -07:00
de1d931b82
add hikes/map pulls hikes out of db and renders
2015-07-23 16:03:46 -07:00
83654fb86a
finish adding the nodeschool challenges
2015-07-23 16:03:46 -07:00
eb3f993b3b
update split field guide view into categories
2015-07-23 15:50:47 -07:00
60f2bdc685
more minor updates
2015-07-23 15:50:47 -07:00
8b0b5dd6ce
split field guides into separate categories
2015-07-23 15:50:47 -07:00
799f4736d7
fix always call onNext
...
use defaultIfEmpty to prevent filtering from collapsing observable
pipeline early
2015-07-23 15:49:04 -07:00
e04c11c2e7
mid-task commit for Berkeley to take over
2015-07-23 15:49:04 -07:00
94ed227aeb
add video css
2015-07-23 15:49:03 -07:00
ac35b4bf73
fix some typo's
2015-07-23 15:49:03 -07:00
6eca181f6f
add vimeo to connect sources
2015-07-23 15:49:02 -07:00
c1b0035d17
add bundle to react jade template
2015-07-23 15:49:02 -07:00
ef7e0c67ee
fix not found calls next
2015-07-23 15:49:01 -07:00
4c8a8a4875
change mobile to hikes
2015-07-23 15:49:01 -07:00
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
2b80cdbbdc
fix create Router from loopback
2015-07-23 15:49:01 -07:00
e3acbe01a9
initial entry points up
2015-07-23 15:49:01 -07:00
fb244aa165
remove server/server dir
...
accidently added to tracking
2015-07-23 15:49:00 -07:00
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
c33c6c9a8f
introduce es6 and babel to whole app
2015-07-23 15:49:00 -07:00
a0278c114d
add express state extentions to app
2015-07-23 15:49:00 -07:00
a5e7009a57
initial react app(WIP)
2015-07-23 15:49:00 -07:00
05c6dcdf0f
add render$ ($ for stream) method to express res
2015-07-23 15:48:59 -07:00
d80fe7ff43
Fixes URL validation using the standard validator package.
2015-07-15 12:41:09 +02:00
9343806cd7
Fixed password reset. The check on the expiration date was incorrect.
2015-07-15 12:28:13 +02:00
e05cc3fbb9
Profile pictures in 'Camper News' now link to profiles. #1235
2015-07-11 01:12:17 +02:00
8072a4b7f2
fix modal closing a on showJS view
2015-07-10 10:12:53 -07:00
41f5325ab6
update landing page
2015-07-07 10:45:56 -07:00
db324186da
update showjs view
2015-07-05 17:15:54 -07:00
612de6911e
update quotes
2015-07-04 23:52:29 -07:00
c2a9a1ca62
add an ajax challenge
2015-07-02 17:31:08 -07:00
0301d3bc61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-02 13:59:22 -07:00
4fb3b3e7cc
add more cities and move the bootcamp calculator to field guide entries (still untested).
2015-07-02 13:59:13 -07:00
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
71ea26ab96
Implemented scroll-locker
2015-07-02 21:32:20 +01:00
8bed9fa7d7
Implemented scroll-locker
2015-07-02 21:31:59 +01:00
0a59bd5cfb
Implemented scroll-locker
2015-07-02 21:31:28 +01:00
580e2e3ebd
add redirect for https
2015-07-01 14:35:15 -07:00
75948c4bc1
Quite a few spelling and grammar fixes
2015-06-30 04:28:43 +02:00
d9fe6dcef1
fix broken challenges and attempt to make streak more lenient.
2015-06-29 16:32:49 -07:00
3bac247627
remove stack trace from production
2015-06-26 01:30:51 -07:00
7e2d5c91e2
minor ui improvements
2015-06-26 01:28:02 -07:00
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
8570f9b5e7
fix story upvote should happen at end of stream
2015-06-26 00:35:13 -07:00
9818186afc
fix should redirect to /news when no story is found
2015-06-26 00:16:18 -07:00
310bf7f6fb
fix navbar should point to /news not /stories
2015-06-25 23:43:02 -07:00
549434bdbf
fix should be /news for show views
2015-06-25 23:39:38 -07:00
6700729658
update emails and refine sponsor view
2015-06-25 23:35:48 -07:00
82c96ec0ba
bump main.js version
2015-06-25 23:20:16 -07:00
9c2768591d
fix check for user existence
2015-06-25 23:01:04 -07:00
e9450b9321
start building sponsor views
2015-06-25 15:15:41 -07:00
13590a1331
refactor rxify stories
...
fixes many bugs
2015-06-25 15:03:46 -07:00
750a454298
update bootcamp json
2015-06-24 09:37:03 -07:00
1f28f877cf
fix remove mongoose specific function
2015-06-24 08:25:34 -07:00
4871b58904
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:21:22 -07:00
c0c15cf875
fix define story
2015-06-24 07:16:09 -07:00
4d620c5796
comment out feature map modal and camper news notification
2015-06-24 07:06:40 -07:00
0b1e9ba279
fix mismatch property in challenge controller
2015-06-23 16:45:35 -07:00
31eb81bf2f
fix many queries in story
2015-06-23 16:28:16 -07:00
fb04a022ae
refactor rxify fieldguides
2015-06-23 16:22:07 -07:00
1dda8e2f87
refactor Rxify nonprofits router
2015-06-22 19:23:07 -07:00
d624cf3640
factor out (un)dasherize into utils
2015-06-22 17:24:55 -07:00
10a5c3c928
fix send 200 to non users on post to challenges
...
fix remove random 'yo' debug
2015-06-22 16:43:31 -07:00
6972f64697
fix minor issue with controller
2015-06-21 22:46:37 -07:00
a428404600
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-21 21:01:26 -07:00
7df91e6310
add total time to start to logs during waitFordb
2015-06-21 19:11:42 -07:00
5e8ed616d5
add wait for db in development before listening for connections
2015-06-21 18:37:29 -07:00
4804d868c4
wrap server.listen in if module
...
prevents server from starting durring testing/scripting
2015-06-21 18:10:17 -07:00
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
629262dd0d
fix /chat should go to gitterim
2015-06-20 23:15:10 -07:00
8f445b58f2
fix chat links go to Gitter Room
2015-06-20 23:11:33 -07:00
742a49b70d
fix mainjs resetEditor
2015-06-20 22:48:59 -07:00
0623ace259
fix sitemap query's
...
make rx mapping async
2015-06-20 21:21:36 -07:00
f17c442018
fix should be story not store
2015-06-20 20:54:39 -07:00
9fb3c0bff7
fix use secrets.db instead of process.env.MONGOHQ in datasource.local.js
...
this should eliminate timeout issue.
I'd bet my bottom dollar.
2015-06-20 20:43:36 -07:00
049233c0a1
fix add server/utils/rx to commit
2015-06-20 19:55:22 -07:00
03ea412b4a
major challenges refactor
...
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
4d2b0844ae
fix use regex to find challenges
2015-06-20 19:54:08 -07:00
a0f4f91ec1
remove slack completely and update help and pair actions
2015-06-20 18:40:43 -07:00
5212173c61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-20 18:12:24 -07:00
43ae70465b
refactor returnIndividualBonfires
2015-06-20 11:43:12 -07:00
50a0ad3595
fix use gt not $gt
...
closes #1022
2015-06-20 00:36:28 -07:00
883a561d73
finishing touches on calculator
2015-06-19 21:24:04 -07:00
ccc29b7fcb
improve upon @lemonyandrew pull request
2015-06-19 17:26:04 -07:00
6078b54393
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-19 16:18:56 -07:00
d5ea05e448
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
12b055353e
remove challangeMap
...
move to challenges router
2015-06-19 14:49:10 -07:00
938568454e
move getMDNLinks func to utils
2015-06-19 14:32:17 -07:00
f84ac9ad12
remove forceDomain
2015-06-18 19:56:21 -07:00
28f346e830
fix should be connectionTimeout not timeout
2015-06-18 19:08:39 -07:00
81b77ff8ad
increase database timeout
2015-06-18 17:52:23 -07:00
2bf8810d79
add pmx errorhandler in beta spot
2015-06-18 16:19:59 -07:00
0173804e21
updates helmet policies, makes new startup script
2015-06-18 17:08:21 -04:00
9c14e5846d
add www.freecodecamp.org to trusted list
2015-06-18 13:12:35 -07:00
81ae7daff1
fix try using oath instead of oauth2 for google
2015-06-18 12:28:16 -07:00
0ef399ad92
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
server/passport-providers.js
2015-06-17 22:06:40 -07:00
1a3e227920
updated linkedin permissions
2015-06-17 22:05:37 -07:00
c56c8fb310
fix linkedin/google should be oath2
...
fix should be authOptions not oAuthOptions
fix should be LINKEDIN_STATE not LINKED_STATE
2015-06-17 21:43:22 -07:00
caacee7959
fix should be env not ENV
2015-06-17 21:13:47 -07:00
bfddc0330f
add state attribute to linked oauth
...
note: a new variable will need to be added to .env 'LINKEDIN_STATE'
which is a random string
2015-06-17 20:59:35 -07:00
bb6f153858
make server always show stack traces upon error
2015-06-17 20:26:59 -07:00
fbb7d0b065
Remove ssl on node servers
2015-06-17 15:40:44 -04:00
0621b8c62b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-16 13:46:37 -07:00
2e1babb12d
finalize calculator for release
2015-06-16 13:46:24 -07:00
40b5b05ea4
factor JavaScript and JSON into separate files
2015-06-16 13:03:13 -07:00
810bf9a3f7
force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains.
2015-06-16 15:59:22 -04:00
1607fe0ba5
Updates server listen in production
2015-06-16 15:51:04 -04:00
7915e8a77e
99 problems, and production only errors are 98 of them
2015-06-16 15:41:59 -04:00
9e8796a0c4
More tweaking
2015-06-16 15:38:22 -04:00
2cb0a3d717
futher improve calculator ux
2015-06-16 12:32:12 -07:00
a662187d93
More ssl setup
2015-06-16 15:24:55 -04:00
e782e0310f
Remove toString() on certificate reads as per http://stackoverflow.com/questions/20893025/cant-start-nodejs-https-server-v0-10-23
2015-06-16 15:04:20 -04:00
645c0aac0e
Server test
2015-06-16 14:51:40 -04:00
b25dd9416b
More https configuration
2015-06-16 14:43:49 -04:00
7e420217eb
More https configuration
2015-06-16 14:43:12 -04:00
0a8356e50f
Configure production to run in https
2015-06-16 14:30:16 -04:00
b0b236821e
More inspectlet configuring
2015-06-16 12:30:49 -04:00
308e539e1e
More protocol experimentation
2015-06-16 12:23:49 -04:00
3546cf4765
Fetch google fonts over https
2015-06-16 12:09:45 -04:00
97668120ad
More work to load google fonts
2015-06-16 12:04:26 -04:00
efb4bd1781
Even more testing
2015-06-16 11:54:58 -04:00
121dabdf73
More whitelist testing
2015-06-16 11:51:07 -04:00
53f5f36768
whitelist beta site https://freecodecamp.org
2015-06-16 11:44:25 -04:00
5b742121d7
Add pmx error handler for loggign to keymetrics
2015-06-16 09:42:55 -04:00
7f311a1e03
Explicitly add google font servers to whitelist
2015-06-16 09:33:34 -04:00
a621ff3190
Add https to helmet whitelist
2015-06-16 09:18:59 -04:00
9bc4f0c25c
Merge branch 'master' into staging
2015-06-16 06:08:25 -07:00
ef9d6fc55b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-16 06:08:18 -07:00
23eb74c762
improve ux on calculator clicking
2015-06-15 21:44:19 -07:00
cb76aa1ea0
whitelist nginx server in helmet
2015-06-16 00:14:33 -04:00
c9ba210afa
factor bootcamp JSON into seperate file
2015-06-15 20:49:55 -07:00
1cd85eeb8f
Debug statement for fieldguide ID
2015-06-15 23:35:29 -04:00
6b909d8f59
start refactoring calculator logic
2015-06-15 18:00:13 -07:00
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
42aae365f6
Update current challenge logic
2015-06-15 18:57:45 -04:00
4092dcecf7
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-15 18:50:31 -04:00
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
b0dc4ffa12
get account should redirect to '/' when no user is logged in
2015-06-15 15:47:56 -07:00
Berkeley Martinez
Quincy Larson
benmcmahon100
Valerio Santinelli
LumenTeun
terakilobyte