Quincy Larson
23003e8724
add new congratulatory quotes
2015-08-16 04:05:49 -07:00
Quincy Larson
e3404c6564
minor improvements and bug fixes to stories
2015-08-15 14:13:21 -07:00
Berkeley Martinez
bcdda9c62a
fix unexpected syntax error on map
2015-08-14 18:25:34 -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
0a8855fb11
Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 14:36:41 -07:00
benmcmahon100
5905e19e1b
Merge remote-tracking branch 'origin/OOPF' into OOPF
2015-08-13 12:57:14 +01:00
Quincy Larson
40b43370eb
update twitch page title thanks to @1hella for spotting this
2015-08-13 01:20:45 -07:00
Quincy Larson
c50b9c5afa
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 00:57:42 -07:00
Quincy Larson
1b7195fbc1
replace RSAP with read-search-ask and replace AWS gifs with Imgur
2015-08-13 00:56:05 -07:00
Berkeley Martinez
0262d1b676
fix github link
...
link callback uri should have some path as auth callback uri
2015-08-12 21:44:55 -07:00
Quincy Larson
bf2db5ff62
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-12 21:25:11 -07:00
Quincy Larson
99d0a58049
update the look of onboarding and change RSAP to RSA
2015-08-12 21:24:57 -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
Quincy Larson
315b78fb69
update copy on onboarding
2015-08-12 20:27:46 -07:00
Berkeley Martinez
4b0a9bef0a
fix social auth scheme
...
closes #1734
2015-08-12 20:10:12 -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
a4e220e2bc
Move auth functions to central location
2015-08-12 20:10:11 -07:00
Quincy Larson
8cdc545f71
minor ux improvement to onboarding
2015-08-12 18:25:43 -07:00
benmcmahon100
7910f0ae2c
Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display
2015-08-13 01:20:12 +01: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
2256f3ef6e
fix add github link to passport
2015-08-10 23:38:10 -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
43e3dc8914
Finish onboarding page
2015-08-10 21:55:13 -07:00
Berkeley Martinez
341d931833
fix streak show days
2015-08-10 21:01:37 -07:00
Quincy Larson
7bfe61731b
give a user a brownie point when they start
2015-08-10 20:55:01 -07:00
Quincy Larson
853c728d9c
improve get-started view and fix duplicate bonfire issue
2015-08-10 20:13:13 -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
Quincy Larson
d7e824ebbe
done adding static images
2015-08-10 00:44:37 -07:00
Quincy Larson
d56ecd1979
add a bunch of new images to onboarding
2015-08-10 00:42:33 -07:00
Berkeley Martinez
1d724f145e
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
2015-08-09 22:58:46 -07:00
Berkeley Martinez
967f92e6f4
fix challenge naming scheme
2015-08-09 22:46:44 -07:00
Quincy Larson
13f08bf037
Merge branch 'staging' into onboarding
2015-08-09 22:00:26 -07:00
Quincy Larson
f3028b0e6a
continue work on get-started
2015-08-09 21:59:49 -07:00
Quincy Larson
4ed041c0db
update curriculum structure again
2015-08-09 21:26:26 -07:00
Quincy Larson
e0bd8c6dd2
remove pair programming Bonfire warm up challenge
2015-08-09 17:03:49 -07:00
Quincy Larson
0994dbaabe
finalize copy on get-started
2015-08-08 22:46:21 -07:00
Quincy Larson
5fb1df0d55
start onboarding page
2015-08-08 16:13:23 -07:00
Berkeley Martinez
554c6ce228
Merge branch 'title' of https://github.com/ahstro/freecodecamp into ahstro-title
2015-08-07 18:41:05 -07:00
Berkeley Martinez
013d983c2e
add github refresh button
2015-08-07 18:29:56 -07:00
Berkeley Martinez
611098ba09
if user is github cool navbar links to account show page
2015-08-07 18:26:18 -07:00
Berkeley Martinez
83397b7e1b
add picture on github signin/up
2015-08-07 18:10:32 -07:00
ahstro
e7c8589d08
Everything is horrible
2015-08-08 02:38:16 +02: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
783d7cf1ec
fix string non-alphanumeric non-whitespace chars before regex
2015-08-06 15:37:07 -07:00
Berkeley Martinez
222d841e4f
on oauth signin only set profile/username if using github
2015-08-06 00:19:03 -07:00
Berkeley Martinez
0ce81bbabb
fix email sign should not require username
2015-08-05 19:29:17 -07:00
Berkeley Martinez
a838a4097d
fix clicking on image or points always takes you to /account
2015-08-05 19:12:54 -07:00
Berkeley Martinez
07e9bbf00a
add link to github waypoint to non github cool campers
2015-08-05 13:54:48 -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
3551cefb3d
simplify account.jade view for github integration
2015-08-04 18:29:05 -07:00
Quincy Larson
989cb87c00
add redirect for now vanished field guide articles
2015-08-04 18:00:01 -07:00
Quincy Larson
5f2ec0aeae
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
...
nto staging
2015-08-04 15:10:15 -07:00
Quincy Larson
7246945b42
remove bonfires from campers' public portfolios
2015-08-04 15:09:20 -07:00
Berkeley Martinez
e01876f3ab
disable username updating when camper is githubCool
2015-08-04 15:03:33 -07:00
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
Berkeley Martinez
310bf7f6fb
fix navbar should point to /news not /stories
2015-06-25 23:43:02 -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
82c96ec0ba
bump main.js version
2015-06-25 23:20:16 -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
Quincy Larson
750a454298
update bootcamp json
2015-06-24 09:37:03 -07:00
Berkeley Martinez
1f28f877cf
fix remove mongoose specific function
2015-06-24 08:25:34 -07:00
Quincy Larson
4871b58904
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:21:22 -07:00
Berkeley Martinez
c0c15cf875
fix define story
2015-06-24 07:16:09 -07:00
Quincy Larson
4d620c5796
comment out feature map modal and camper news notification
2015-06-24 07:06:40 -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
a428404600
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-21 21:01:26 -07:00
Berkeley Martinez
7df91e6310
add total time to start to logs during waitFordb
2015-06-21 19:11:42 -07:00
Berkeley Martinez
5e8ed616d5
add wait for db in development before listening for connections
2015-06-21 18:37:29 -07:00
Berkeley Martinez
4804d868c4
wrap server.listen in if module
...
prevents server from starting durring testing/scripting
2015-06-21 18:10:17 -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
8f445b58f2
fix chat links go to Gitter Room
2015-06-20 23:11:33 -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
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
Berkeley Martinez
049233c0a1
fix add server/utils/rx to commit
2015-06-20 19:55:22 -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