Commit Graph

4320 Commits

Author SHA1 Message Date
883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
88286d366f fix a bunch of github issues regarding waypoints 2015-06-19 18:31:21 -07:00
437a564e34 Changed dependency on challenge_key to function 2015-06-19 18:22:57 -07:00
11305c152b Update coursewaresJSFramework_0.0.6.js 2015-06-19 18:02:49 -07:00
fe1b3f4d2a fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
60354d24e6 Auto Save, Removed Stamps +more
Removed stamps so code stays stored until code has been reset. 
--> Added a feature which returns if the storage has been saved since last edit. *codeStorage.hasSaved()* 
--> Changed "localBonfire" to *codeStorage*
2015-06-19 17:47:21 -07:00
cd63977687 Merge branch 'master' into staging
Conflicts:
	seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
9509c5eb2f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-19 17:37:03 -07:00
5a0d38eb5e Merge pull request #984 from rcw271828/staging
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
65d283ed13 Merge pull request #970 from SaintPeter/SaintPeter-patch-1
Improve 'Convert HTML Entities' Bonfire
2015-06-19 17:35:14 -07:00
93ed1cfb1f Merge pull request #961 from LumenTeun/lumenteun-942
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
5f7443c91e Merge pull request #960 from 1hella/1hella-959
1hella 959
2015-06-19 17:31:14 -07:00
25f4d4c30e Merge pull request #958 from LumenTeun/lumenteun-941
'No repeats please' test fix.
2015-06-19 17:29:25 -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
6fed8d1c24 Merge branch 'master' of https://github.com/Lemony-Andrew/freecodecamp into Lemony-Andrew-master 2015-06-19 16:09:42 -07:00
93e96643fb Merge pull request #940 from LumenTeun/lumenteun-907
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
40a1ff835c Merge pull request #939 from LumenTeun/lumenteun-911
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
a339c1b60b Merge pull request #938 from LumenTeun/lumenteun-914
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
c2c64b153a Merge pull request #937 from LumenTeun/lumenteun-918
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
f200a6f8a3 Merge pull request #936 from LumenTeun/lumenteun-924
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -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
adbbbf3743 fix name and dashed name switched
close #975
2015-06-18 20:02:32 -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
9342503873 Added new test with different max number to Bonfire: Truncate a String
Issue 959
2015-06-18 17:48:30 -07:00
d6db51355e Added missing MDN Link
This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
2015-06-18 17:48:30 -07:00
8ade99b5d7 Fixed a word 2015-06-18 17:48:29 -07:00
7735f19fcc Update field-guides.json
Fixed a typo in languages section of field guides.
2015-06-18 20:36:33 -04:00
2bf8810d79 add pmx errorhandler in beta spot 2015-06-18 16:19:59 -07:00
4560cfed03 deleted old setup file 2015-06-18 16:19:59 -07:00
b24699a43e updates pm2 startup script 2015-06-18 17:33:34 -04: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
5a0df0ad46 Merge pull request #2 from SaintPeter/patch-2
Additional test, HTML Entities Link, Clarify Text
2015-06-18 10:38:54 -07:00
d15f83a4c4 Merge pull request #1 from SaintPeter/patch-1
Add w3.org reference for HTML Entities
2015-06-18 10:38:16 -07:00
7a510d6bc6 Add w3.org reference for HTML Entities 2015-06-18 10:33:34 -07:00
7540fe9351 Additional test, HTML Entities Link, Clarify Text 2015-06-18 10:30:06 -07:00
2ec3684825 Add w3.org reference for HTML Entities 2015-06-18 10:01:43 -07:00
842a2efe64 More test cases for 'Seek and Destroy' #942 2015-06-18 11:56:13 +02: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
a8540bee35 add initial react app 2015-06-17 21:04:28 -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