Commit Graph

3449 Commits

Author SHA1 Message Date
9509c5eb2f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-19 17:37:03 -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
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
76a800f575 Merge pull request #922 from kurzninja/patch-2
Added missing MDN Link
2015-06-15 20:37:01 -07:00
0237c71a58 Merge pull request #920 from kurzninja/patch-1
Fixed a word
2015-06-15 20:35:46 -07:00
ac282697ea Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-15 11:56:37 -07:00
bd7494c909 Update directory.jade 2015-06-15 11:42:33 -07:00
e9aa4b27a7 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-13 23:28:33 -05:00
bc37c9bbfb Update README
Put it note about switching to loopback.
2015-06-13 23:26:58 -04:00
2dd222a441 Fixed a word 2015-06-13 20:54:43 -05:00
cb0485cb15 update meta 2015-06-13 13:42:59 -07:00
03df5cf492 remove reference to original alumni network 2015-06-11 19:01:31 -07:00
7077b18480 fix twitch view 2015-06-11 18:57:22 -07:00
66d4ffba32 update modal 2015-06-11 15:46:41 -07:00
1e8d58068c add LinkedIn easy route 2015-06-11 15:34:06 -07:00
d56cee1f72 update challenge map and news nav 2015-06-11 15:01:21 -07:00
e190aacd9b update pair programming challenge text 2015-06-10 23:45:03 -07:00
53fe6a1b62 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-10 23:30:34 -07:00
52840884e6 fix 883 2015-06-10 23:13:33 -07:00
a87757b35c fix #888 2015-06-10 23:06:44 -07:00
243f4cd2ec update twitch page and add new cities 2015-06-10 23:04:43 -07:00
d2ea02e60a Merge pull request #878 from ahmednaguib/naguib-782
issue 782
2015-06-10 22:52:03 -07:00
b7e7eb692f add alert message for outdated video 2015-06-09 23:43:58 +02:00
8e7a333520 add link for slack channel 2015-06-09 23:42:33 +02:00
c338b25a77 Merge branch 'ekojsalim-master't push origin master: 2015-06-09 13:04:26 -07:00
1a2a610520 Merge branch 'master' of https://github.com/ekojsalim/freecodecamp into ekojsalim-master 2015-06-09 13:04:21 -07:00
26eb488ded fix #873 2015-06-09 12:58:50 -07:00
f33269d2b9 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
2015-06-09 12:56:22 -07:00
6ffdbb7b8a Merge pull request #872 from treece/treece-864
Fixed regexp on both ul and li opening tags
2015-06-09 12:54:30 -07:00
5eee9b7ac3 fix #867 2015-06-09 12:53:08 -07:00
4de23ac8ac close #874 2015-06-09 12:51:19 -07:00
6b46c097be Changed regexp to Quincy's normal method 2015-06-09 03:22:30 -04:00
56df2f37db fix #870 2015-06-08 22:37:07 -07:00
528344f0ca update cities 2015-06-08 22:31:46 -07:00
a10bd3c456 Fixed regexp on both ul and li opening tags 2015-06-08 23:34:51 -04:00
68ac12d757 improve the wrap an anchor element within a paragraph element challenge 2015-06-07 23:31:16 -07:00
6c9db8c27f super nitpicky copy edit 2015-06-07 22:26:58 -07:00
400bcaf8c8 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-07 22:23:13 -07:00
32c327593e add cities 2015-06-07 22:23:08 -07:00
b7145f4604 fix #856 2015-06-07 21:59:04 -07:00
198d7897f7 Merge pull request #844 from treece/treece-841
Fixes RegExp so it matches the class .blue-text
2015-06-07 21:55:08 -07:00
b88533d189 Merge pull request #855 from treece/treece-845
Removed aarmy example from descr and changed the test for it to passing
2015-06-07 21:52:51 -07:00
de831a9d3c Removed aarmy example from descr and changed the test for it to passing 2015-06-06 21:53:27 -04:00
5bcffa3ccb Add necessary emmet js file 2015-06-06 20:17:35 -04:00
426a1c27c2 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-06 20:11:28 -04:00
e5a8c27e07 Add emmet functionality to html views 2015-06-06 20:10:47 -04:00