Commit Graph

3868 Commits (60f2bdc68507f23b0f4c34f876e88bb067e5aab5)

Author SHA1 Message Date
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
Quincy Larson fb1897073c Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-23 11:42:41 -07:00
Quincy Larson 135047027a add new field guides and challenges 2015-06-23 11:42:27 -07:00
LumenTeun 51faa9e80f Fixes misspelling that caused 'undefined is not function' error 2015-06-23 20:15:09 +02:00
Quincy Larson 738afa817c update challenge copy 2015-06-23 08:10:20 -07:00
Rex Schrader 99459feb5e Add Symmetric Difference link to bonfire 2015-06-22 21:49:44 -07:00
Rex Schrader 1cdd0eee6d Add video link for Symmetric Difference 2015-06-22 21:46:09 -07:00
Rex Schrader 02b67edfe8 Merge pull request #3 from FreeCodeCamp/staging
Pull up to date
2015-06-22 21:43:52 -07:00
Natasha Haggard e3aee8f421 Issue 1036 - Fixed minor grammatical mistake
Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element"
2015-06-22 22:13:21 -05:00
Nathan 71223de101 Merge pull request #1071 from StevenXL/stevenxl-1070
Change links to Gitter channel.
2015-06-22 22:31:30 -04:00
Berkeley Martinez 1dda8e2f87 refactor Rxify nonprofits router 2015-06-22 19:23:07 -07:00
Berkeley Martinez b383da47bb fix uncompletedBonfires should default to empty array 2015-06-22 19:18:15 -07:00
Steven Leiva 663d559fb4 Change links to Gitter channel. 2015-06-22 22:08:58 -04: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
terakilobyte 7aff6dd285 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-22 10:31:24 -04:00
terakilobyte 7004e81b4a Fixes #1053
This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference.
2015-06-22 10:30:26 -04:00
Berkeley Martinez 91cc320cb2 Merge pull request #1041 from SaintPeter/patch-3
Fix missing semicolon in Symmetric Differences test
2015-06-22 06:59:19 -07:00
Berkeley Martinez d6ea2d931c Merge pull request #1043 from brandenbyers/issue-192
Change eqls to equal
2015-06-22 06:52:57 -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
greasan 6950ebc346 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-21 12:25:45 +02:00
Berkeley Martinez 9f1b6c58a5 fix /chat should go to gitter 2015-06-20 23:17:09 -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
Quincy Larson c2d3652272 fix navbar for gitter 2015-06-20 23:07:49 -07:00
Quincy Larson 1a502b1696 hotfix for production gitter change 2015-06-20 23:00:19 -07:00
brandenbyers 5db883346e Change eqls to equal 2015-06-21 00:56:20 -05:00
Berkeley Martinez 742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Rex Schrader c113c72082 Fix missing semicolon in Symmetric Differences test
The first test of Symmetric Differences is broken because it was missing a semicolon, making it impossible to pass.
2015-06-20 22:09:21 -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
Quincy Larson e03d16e6a6 Merge pull request #1003 from Lemony-Andrew/patch-3
Auto Save, Removed Stamps +more, done
2015-06-20 18:43:31 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson 5212173c61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson dd3d445054 add new chat challenge 2015-06-20 18:12:12 -07:00
Berkeley Martinez 43ae70465b refactor returnIndividualBonfires 2015-06-20 11:43:12 -07:00
greasan 817f27bd5b Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-20 10:46:50 +02:00
Berkeley Martinez 50a0ad3595 fix use gt not $gt
closes #1022
2015-06-20 00:36:28 -07:00
Quincy Larson 883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00