2b080ec2b7
Problem Instruction clarrification
...
Replaced with correct instruction to the problem.
2015-08-18 04:17:24 +05:30
45ad2a7c20
Merge remote-tracking branch 'origin/staging' into staging
2015-08-17 22:57:36 +01:00
7c80d64d08
Fix #1942
2015-08-17 22:57:25 +01:00
5034a92038
Fix <a target='_blank'></a> code tags
...
Changed &rt to >.
2015-08-17 16:49:19 -04:00
8f0fba855e
Update basic-ziplines.json
...
Add missing </code> around <a target='_blank'&rt;</a>.
2015-08-17 16:43:43 -04:00
4d56972e21
Fixed #1926
2015-08-17 16:42:20 -04:00
0cab1ebfe5
Moved closing code to line 961
2015-08-17 16:34:45 -04:00
8722a0a294
Fixes #1878
2015-08-17 16:19:02 -04:00
7c360285aa
Spaced out code a bit more on the shift challenge
2015-08-17 21:12:19 +01:00
0bbb5cf122
fixed the moved some comments in a seed that were causing confusion
2015-08-17 21:11:01 +01:00
f0f75eeae5
fixed the tests on a challenge
2015-08-17 21:09:40 +01:00
e8bffc5721
Spelling and grammar edit.
...
Minor spelling and grammar edit in the description of "Waypoint: Use Hex Code for Specific Colors" for clarity.
2015-08-17 14:55:22 -05:00
db4170eed7
Merge pull request #1769 from djordjelacmanovic/djordjelacmanovic-1005
...
fixed #1005
2015-08-17 20:25:16 +01:00
cebe1bfdcb
Merge pull request #1853 from AryanJ-NYC/AryanJ-NYC-1849
...
Fixed #1849
2015-08-17 20:25:02 +01:00
9727f3e520
Merge pull request #1812 from AryanJ-NYC/AryanJ-NYC-1807
...
Fixes #1807
2015-08-17 20:22:55 +01:00
f0fd811faf
Merge pull request #1818 from michael-krebs/michael-krebs-935
...
fix #935
2015-08-17 20:22:44 +01:00
7f4aa5487f
Fix #1895
2015-08-17 20:16:11 +01:00
b35c77deb7
Fix #1871
2015-08-17 20:11:04 +01:00
93a7fa1c34
Fix #1870 #1874 and there was another issue but i cant find it related to the arithmetic on decimals challenge
2015-08-17 20:08:21 +01:00
bfabe09dad
Fix case insensitivity to colors
2015-08-17 10:18:28 -07:00
2fade59319
Changed test case for Waypoint: target elements by id
2015-08-17 16:01:51 +00:00
4abddbbfe0
Merge pull request #1814 from AryanJ-NYC/AryanJ-NYC-1806
...
Fixed issue #1806
2015-08-17 15:18:34 +01:00
4b2a53f974
Merge pull request #1857 from AryanJ-NYC/AryanJ-NYC-1856
...
Fixes #1856
2015-08-17 14:53:40 +01:00
6cf25e6a35
Fixes #1856
2015-08-17 09:52:34 -04:00
4b05626ce3
fix #1847
2015-08-17 14:34:19 +01:00
d601240b98
Merge remote-tracking branch 'origin/staging' into staging
2015-08-17 14:28:54 +01:00
946717fc65
Fix #1838
2015-08-17 14:28:30 +01:00
06c3d78c64
Update basic-javascript.json
2015-08-17 14:16:16 +01:00
e63c387ef7
Merge pull request #1815 from AryanJ-NYC/AryanJ-NYC-1813
...
Fixed #1813
2015-08-17 14:15:37 +01:00
d4b3b0c336
Fixed #1849
2015-08-17 09:12:04 -04:00
1ce1c75c4d
Fix #1835
2015-08-17 14:11:49 +01:00
c748534b43
Merge pull request #1851 from AryanJ-NYC/AryanJ-NYC-1848
...
Fixed #1848
2015-08-17 14:03:04 +01:00
11f62a7cbf
Fixed #1848
2015-08-17 09:01:48 -04:00
c523e59b24
Merge pull request #1811 from AryanJ-NYC/AryanJ-NYC-1801
...
Fixed issue #1801
2015-08-17 14:00:42 +01:00
cffefac4ca
Merge pull request #1832 from ahstro/ahstro-1830
...
Ignore case in HTML/CSS hex color waypoints.
2015-08-17 13:58:35 +01:00
6f7495e6cb
Added additional test case
2015-08-17 18:27:33 +05:30
97b3d298fe
fix 1844
2015-08-17 05:30:28 -07:00
9681534f24
Ignore case in HTML/CSS hex color waypoints. #1830
2015-08-17 10:21:01 +02:00
42b42fd6b0
Improve OOP challenges
2015-08-16 19:34:11 -07:00
1be07e73c1
fix #935
2015-08-16 20:59:17 -04:00
fda754f187
Fixed #1813
2015-08-16 20:47:43 -04:00
e4e13cf676
Fixed issue #1806
2015-08-16 20:38:49 -04:00
854406e5fa
Fixes #1807
2015-08-16 20:14:12 -04:00
ae4ec8e9fd
Deleted extra comma
2015-08-16 20:08:37 -04:00
1790b14808
Fixes #1801
2015-08-16 20:06:47 -04:00
b4afc3430a
Fixed #1090
2015-08-16 21:11:36 +00:00
817276ab96
Added test cases for Bonfire: Where do I belong
...
Checks for proper positioning of element based on proper sorting order.
2015-08-17 02:18:27 +05:30
0fd90f4aaf
Fix #1790
2015-08-16 21:06:42 +01:00
9c7b651827
Fixed a challenge test on modify array data with indexes
2015-08-16 20:17:06 +01:00
33d0faae24
Fixed a challenge test
2015-08-16 18:26:11 +01:00
63be84f47f
fix some minor issues with oop challenges
2015-08-16 09:12:54 -07:00
33ae7b243c
fix #1771
2015-08-16 08:10:40 -07:00
b05d9338f4
update csp
2015-08-16 08:03:34 -07:00
edb58f6890
add authentication back in
2015-08-16 05:47:13 -07:00
8534ae2639
improvements to OOP
2015-08-16 05:25:10 -07:00
1c7db6e7a3
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-16 04:06:09 -07:00
bce3b34f9b
improvements to javascript challenges
2015-08-16 04:05:15 -07:00
db21489541
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
2015-08-16 03:45:32 -07:00
0908844e6d
run only user/identity migration
2015-08-16 03:45:00 -07:00
1fbb2a32f8
fix nested array challenge
2015-08-15 15:56:56 -07:00
d80ed9f366
fixes issue #1005
2015-08-16 00:37:31 +02:00
40e14c3999
fix critical failing test in early waypoint
2015-08-15 15:33:21 -07:00
c8f44d98bf
resequence some challenges
2015-08-15 14:23:10 -07:00
bc163bef38
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-15 14:13:29 -07:00
38ceeee635
Update intermediate-bonfires.json
2015-08-15 14:04:01 -07:00
dee33beafc
Merge pull request #1761 from rtperson/staging
...
Added improved instructions to Least Common Multiple Bonfire.
2015-08-15 14:02:21 -07:00
40dc5db1fe
Merge pull request #1768 from issyl0/staging
...
Close a <code> tag so that only actual code is marked
2015-08-15 13:59:59 -07:00
f2ee2e4031
update JavaScript challenges
2015-08-15 13:57:44 -07:00
2538a6c5fb
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
2015-08-15 12:25:39 -07:00
13b38aefb5
add random attribute to user props
...
Allows easier random sampling
2015-08-15 12:19:36 -07:00
fa454cfdd4
Close a <code> tag so that only actual code is marked
...
- Fixes #1767 , hopefully.
2015-08-15 19:53:04 +01:00
1dd0294a18
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-15 11:11:40 -07:00
98bf10a7d3
QA javascript challenges and remove slot machine for now
2015-08-15 11:11:25 -07:00
59609b655c
migration improvements
2015-08-14 18:24:13 -07:00
40ab7d2911
more style improvements to front end challenges
2015-08-14 18:17:34 -07:00
2bbad67141
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-14 17:29:28 -07:00
aed4b6bfe1
improvements to copy of text and test output
2015-08-14 17:26:24 -07:00
326c22276d
Added a helper function to main.js for challenge making
2015-08-15 01:08:33 +01:00
e6297de282
add semicolons to end of all tests in js-style challenges
2015-08-14 14:48:59 -07:00
3a81e6efb3
improve javascript challenge copy
2015-08-14 14:40:02 -07:00
338485db8e
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-14 13:50:31 -07:00
28e0ad29cf
more improvements to javascript challenges
2015-08-14 13:50:20 -07:00
01d71ca1d9
Added improved instructions to Least Common Multiple Bonfire.
2015-08-14 16:29:16 -04:00
d0b5bcd0b0
Fixed a weird error involving RegEx and single quotes
2015-08-14 20:26:05 +01:00
8a9a8710da
Allow optional white space when nesting arrays
2015-08-14 12:08:40 +01:00
af3f6bb109
more improvements to javascript challenges
2015-08-14 01:13:07 -07:00
2acf8b727c
Bonfire: Where art thou test case update
...
Added further test cases to check for adhering to the instructions in bonfire properly.
2015-08-14 12:31:58 +05:30
99e7116ee5
make additional improvements to JavaScript challenge copy
2015-08-13 23:44:13 -07:00
f3cef6de46
finish jquery and start modifying javascript
2015-08-13 22:07:54 -07:00
f1dd82974f
finish QAing bootstrap
2015-08-13 20:58:27 -07:00
914d9c81b0
fix a ton of bugs in waypoints
2015-08-13 17:57:06 -07:00
ed0d38a474
make more progress QAing challenges
2015-08-13 17:20:52 -07:00
12f2aa9957
Merge pull request #1748 from FreeCodeCamp/jquery
...
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
dc54e37df6
move json and ajax challenges to under construction directory
2015-08-13 15:49:38 -07:00
146f42ef41
lint json
2015-08-13 15:42:17 -07:00
fea723efbd
Merge branch 'staging' into jquery
...
Conflicts:
seed/challenges/basic-javascript.json
seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
3f05565739
use double quotes for all string literals in waypoints
2015-08-13 15:32:40 -07:00
0a8855fb11
Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 14:36:41 -07:00
2711664505
Merge branch 'staging' into jquery
...
Conflicts:
seed/challenges/basic-ziplines.json
seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
095552dbbe
Added a more specific example
2015-08-13 21:25:31 +01:00
4cdd0e20d9
start adding json challenges
2015-08-13 12:55:50 -07:00
299405694b
Add some code highlighting
2015-08-13 17:36:02 +01:00
c0140a9510
Added some testing and debugging challenges
2015-08-13 17:33:23 +01:00
66bd9338ab
remove inaccurate copy from jQuery challenge
2015-08-13 00:57:36 -07:00
1b7195fbc1
replace RSAP with read-search-ask and replace AWS gifs with Imgur
2015-08-13 00:56:05 -07:00
bf2db5ff62
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-12 21:25:11 -07:00
99d0a58049
update the look of onboarding and change RSAP to RSA
2015-08-12 21:24:57 -07:00
cc2e7a69f9
fix loopback migration to new auth scheme
...
closes #1735
2015-08-12 20:30:08 -07:00
49e9d078f1
fix angular.js typo
...
closes #1287
2015-08-12 20:05:06 -07:00
7ee6a8f888
Merge pull request #1741 from FreeCodeCamp/staging
...
Final update to OOPF before pr into staging
2015-08-13 00:24:41 +01:00
2b654ecd83
Removed the under construction flag
2015-08-13 00:21:52 +01:00
7c19d6c0ef
First twelve OOP challenges ready to roll
2015-08-13 00:20:15 +01:00
d138757c52
Merge branch 'staging' into jquery
...
Conflicts:
seed/challenges/bootstrap.json
seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
7a2c2544a4
fix issue discovered by @reddraft
2015-08-12 02:00:24 -07:00
5c1b45da2e
Fix issues discovered by @eaglecookie and @sonorangirl
2015-08-12 01:39:17 -07:00
84c76bcfd0
fix typo discovered by @pieterdeville
2015-08-12 01:35:27 -07:00
88b6b8a9d8
make @nickbarry's recommended get-set-for-ziplines copy fixes'
2015-08-12 01:32:16 -07:00
096eb0a67e
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-12 01:23:27 -07:00
ae0175b396
Merge pull request #1643 from Greenheart/greenheart-1628
...
clarified description for waypoint: make images mobile responsive
2015-08-12 01:23:18 -07:00
c408bbe20b
manually add minor test improvement submitted by @ramadis
2015-08-12 01:21:25 -07:00
75b54a395e
Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging
2015-08-12 01:16:04 -07:00
2c623ad78a
Merge pull request #1655 from ahstro/ahstro-1647
...
'Convert HTML Entities' now allows upper and lower case entities
2015-08-12 01:13:14 -07:00
a9bea09cc9
make changes suggested by @ahstro
2015-08-12 01:11:56 -07:00
9e128e2787
manually apply pull requests submitted by @cristianvnica and @kurzninja
2015-08-12 01:04:46 -07:00
5830ac2f8a
make all single quotes in jquery challenges double quotes
2015-08-12 00:52:40 -07:00
82e03b579c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-11 23:54:15 -07:00
e42e954517
fix omission in simon zipline
2015-08-11 23:53:30 -07:00
1dc66b7671
First four OOP challenges and the final slot machine challenge.
2015-08-12 00:11:56 +01:00
9df99eb635
Removed new incomplete JS Challenges and moved to OOPF branch.
2015-08-11 15:39:07 +01:00
bfcd36ff88
Merge pull request #1716 from sonorangirl/slot-machine-challenge
...
Slot machine challenge - Fixed Typos and 4th test
2015-08-11 13:43:00 +01:00
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
b4f5f1a81e
get everything seeding again
2015-08-10 22:17:49 -07:00
db6db2e403
Merge branch 'staging' into jquery
...
Conflicts:
seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
34a06f987f
Merge pull request #1512 from djordjelacmanovic/djordjelacmanovic-1511
...
fixed issue #1511 - now checking for words longer than 9 chars
2015-08-10 20:40:39 -07:00
6691897dbe
Merge pull request #1612 from ahstro/ahstro-1467
...
Improve 'Turn an image to a Link'-waypoint
2015-08-10 20:25:54 -07:00
e7a4ec068c
Merge pull request #1614 from ahstro/ahstro-1461
...
Grammatical error in 'Use Hex Code for Specific Colors'
2015-08-10 20:23:29 -07:00
f67b37ff7b
Merge pull request #1616 from ahstro/ahstro-1451
...
Wrong element in 'Target HTML Elements with Selectors Using jQuery'
2015-08-10 20:21:59 -07:00
853c728d9c
improve get-started view and fix duplicate bonfire issue
2015-08-10 20:13:13 -07:00
8ee3306bee
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding
2015-08-10 19:58:56 -07:00
fb44b50941
Made some spaces optional for 4th test
2015-08-10 19:32:52 -07:00
8efe8ee825
Fixed RegEx so that 4th test would pass
2015-08-10 19:22:18 -07:00
d37a1a1a08
Merge pull request #1671 from ahstro/ahstro-1402
...
Disregard order in 'Symmetric Difference'
2015-08-10 19:11:33 -07:00
a557f386ed
Merge branch 'staging' into onboarding
2015-08-10 18:30:34 -07:00
041ef43be3
Merge branch 'staging' into onboarding
2015-08-10 18:30:15 -07:00
8a16942036
Fixed typos in 1st slot machine challenge
2015-08-10 18:05:07 -07:00
4b0e95280d
fix duplicate id's
2015-08-10 17:40:45 -07:00
234aa0a5ea
fix missing quote escape
2015-08-10 17:35:16 -07:00
c550760b66
Merge pull request #1709 from martinkwan/patch-2
...
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
5b61f15d06
Merge pull request #1706 from kurzninja/patch-3
...
Fix for incorrect RGB test value
2015-08-10 16:27:15 -07:00
8f332039af
Merge pull request #1697 from martinkwan/patch-1
...
Updated Pig Latin Link
2015-08-10 15:46:12 -07:00
a44622af82
Merge branch 'staging' into onboarding
2015-08-10 15:42:07 -07:00
81af7a69e6
Updated DNA Pairing link
...
Updated link so it would open in a new tab instead of the current tab
2015-08-10 14:42:37 -07:00
737adf1fac
Update intermediate-bonfires.json
2015-08-10 13:42:33 -07:00
8dabd39950
add to seed script: exit on error
...
filter challenge blocks that do not have challenges
2015-08-10 12:15:30 -07:00
133c91fd16
Fix for incorrect RGB test value
...
RGB test value was testing for (0,0,255) which is B, should be testing for (0, 255,0), which is green.
2015-08-10 13:20:18 -05:00
5c987cbe9a
Updated Pig Latin Link
...
Updated link so it would open in a new tab instead of the current tab
2015-08-10 00:40:12 -07:00
129ec7c98e
Merge pull request #1613 from ahstro/wrong-class
...
Updated test case comment in 'fluid containers'
2015-08-09 23:06:56 -07:00
1d724f145e
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging
2015-08-09 22:58:46 -07:00
967f92e6f4
fix challenge naming scheme
2015-08-09 22:46:44 -07:00
0c349f9763
Merge pull request #1675 from alanmbarr/alanmbarr-1375
...
Update bootstrap.json waypoint-line-up-form-elements-responsively-with-bootstrap typo
2015-08-09 22:46:09 -07:00
a551c3ad57
Merge pull request #1692 from royshouvik/patch-1
...
Update basic-javascript.json to fix #1642
2015-08-09 22:41:58 -07:00
13f08bf037
Merge branch 'staging' into onboarding
2015-08-09 22:00:26 -07:00
4ed041c0db
update curriculum structure again
2015-08-09 21:26:26 -07:00
02717582d8
Update basic-javascript.json to fix #1642
...
Fixed following issues
#1639 : Fixed ```description``` to have "In JavaScript" instead of "in JavaScript" and added punctuation.
#1640 #1641 Added punctuation and fixed typo to have "perform mathematical functions" instead of "preform mathematical functions".
2015-08-10 07:32:57 +05:30
e0bd8c6dd2
remove pair programming Bonfire warm up challenge
2015-08-09 17:03:49 -07:00
76e4fc2d33
Fix typos in the Basic Javascript challenge
...
- Partially fixes #1519 - looks like some of those typos had already
been fixed.
2015-08-09 19:32:10 +00:00
8d680b487d
Merge pull request #1704 from ahstro/completion-monitor
...
Refactored CompletionMonitor() slightly
2015-08-10 11:30:14 -07:00
97b0ccac8f
fix mising type
...
remove extra bonfire in title
2015-08-10 11:27:12 -07:00
9513a8b0e5
Incorrect JSON caused error during seed
2015-08-10 20:11:59 +02:00
aec8680567
Refactored CompletionMonitor() slightly
2015-08-10 18:44:19 +02:00
2476f35309
add challenge order to individual challenge
2015-08-09 07:40:16 -07:00
50db4b9aaa
other typo
...
text input instead of area for clarity
2015-08-08 22:10:07 -07:00
6d1ddc759d
Update bootstrap.json
2015-08-08 21:59:03 -07:00
9bed47a763
Disregard order in 'Symmetric Difference' #1402
2015-08-09 02:08:44 +02:00
5fb1df0d55
start onboarding page
2015-08-08 16:13:23 -07:00
f22672e6c1
Removed new incomplete JS Challenges and moved to OOPF branch.
2015-08-08 17:21:13 +01:00
0f81e8465a
Update to include OOP & functional programming course layout
2015-08-08 17:11:11 +01:00
b1e34f8cc8
create name/dashName at seed
2015-08-08 07:50:35 -07:00
26e69c8621
add type to challenges
2015-08-07 23:37:32 -07:00
f241a362d5
rename top level `title` to name
2015-08-07 18:43:45 -07:00
c5fb8c83f5
Added even more HTML entities and removed &APOS;
2015-08-08 03:43:14 +02:00
9d6c5e63ab
'Convert HTML Entities' now allows upper and lower case entities #1647
2015-08-08 03:29:23 +02:00
e7c8589d08
Everything is horrible
2015-08-08 02:38:16 +02:00
e1fb3856c4
Merge pull request #1637 from Greenheart/staging
...
fixed small typo
2015-08-07 09:01:44 -07:00
8ff778b358
Fix for #1644
...
Change challenge description of "Bonfire: Where art thou", to fix issue #1644 . Changed description to say "an array" instead of "a list" to make it clear and less confusing.
2015-08-07 21:04:20 +05:30
93083eb1c9
clarified description for waypoint: make images mobile responsive
2015-08-07 17:03:29 +02:00
805327ebac
fixed small typo
2015-08-07 14:53:24 +02:00
350d59a235
revamp onboarding challenges to reflect changes to curriculum and wiki
2015-08-07 00:18:30 -07:00
c5ad1ad851
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-06 23:19:18 -07:00
629eaa6ef9
restructure curriculum to split jQuery and Ajax into seperate sections
2015-08-06 23:19:05 -07:00
344b729bce
fixed tests to check for lowercase hexadecimal colors
2015-08-07 02:13:11 +02:00
42321f5cef
Wrong element in jQuery targeting waypoint
2015-08-06 22:41:49 +02:00
3b14872cbe
updated instructions for waypoint: get set for ziplines to fit with new Codepen UI
2015-08-06 22:30:46 +02:00
fb2599b8fe
Grammatical error in 'Use Hex Code for Specific Colors'
2015-08-06 22:27:16 +02:00
b2d714112f
Updated test case comment in 'fluid containers'
2015-08-06 22:23:00 +02:00
52300b9648
Changed test order & added <code> in 'img to link'
2015-08-06 22:07:54 +02:00
cf9b981564
fixed typos
2015-08-06 21:31:24 +02:00
4349d06d16
fixed typos
2015-08-06 20:45:59 +02:00
0993261ebc
sputkin -> sputnik
2015-08-06 16:02:20 +02:00
e68bc0272d
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593
2015-08-06 14:54:44 +01:00
5eb9c060e1
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599
2015-08-06 14:51:26 +01:00
61507f575d
fix some issues that were breaking seed task
2015-08-06 02:27:56 -07:00
dfb48fbdad
update dashed name
2015-08-06 02:26:09 -07:00
2e0e7d5a74
rename all of Ben's JavaScript challenges to be more in line with other waypoints
2015-08-06 02:06:53 -07:00
e8a3f3ef04
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-06 01:44:37 -07:00
89fffce02d
add simon zipline
2015-08-06 01:44:31 -07:00
8b8d9cab51
Merge pull request #1594 from martinkwan/patch-1
...
Updated Roman Numeral Challenge link
2015-08-06 00:58:24 -07:00
eeffb7f706
Merge pull request #1595 from flota113/flota113-1585
...
Fixed a few typos in javascript-basic
2015-08-06 00:57:56 -07:00
47403e204c
Merge pull request #1592 from cristianvnica/cristianvnica-1488
...
Fixing issue #1488
2015-08-06 00:57:06 -07:00
5882b9b84f
Fixed a few typos in javascript-basic
2015-08-06 09:03:03 +02:00
3b94475f9d
Updated Roman Numeral Challenge link
...
Updated link so it would open in a new tab instead of the current tab.
2015-08-06 00:02:15 -07:00
f33ac57984
Fixing issue #1488
...
Correcting small mistakes in the waypoint instruction.
2015-08-06 09:30:13 +03:00
7d04da6c60
Merge pull request #1584 from flota113/flota113-1579
...
Fixed tests in Waypoint: Use Comments to Clarify Code
2015-08-06 00:21:59 +01:00
c577190e67
Fixed tests
...
Added check if the object isn't null and escaped quotes because text
enclosed apostrophe
2015-08-06 00:57:55 +02:00
073456e0de
changed to agree with the style -
...
greater than 0 instead of greater than or eqal to 1
2015-08-06 00:25:11 +02:00
c6b2140c02
first fixes - length larger _or equal_ to 1
...
I'm not sure if the tests are too vague - they allow to comment out way
more than just the text specified - like the whole page..
2015-08-06 00:20:52 +02:00
36f66c1262
Fixed tests in waypoint
...
changes col-xs-12 to col-xs-6 so the tests works
Issue #1578
2015-08-05 23:53:45 +02:00
43a1a62536
Fix for Issue #1540
2015-08-05 17:34:06 -04:00
117306de33
Merge pull request #1576 from cristianvnica/cristianvnica-1575
...
Fixing #1575
2015-08-05 21:24:05 +01:00
caef8c9da8
Fixing #1575
...
Fixing small typo
2015-08-05 23:22:37 +03:00
145cb422e2
Merge pull request #1573 from Greenheart/staging
...
added test for object for steamroller bonfire
2015-08-05 21:22:12 +01:00
3cfd69c704
add loopbackMigrationGrandfathered flag
2015-08-05 13:01:48 -07:00
974bf503ec
Merge pull request #1572 from cristianvnica/cristianvnica-1571
...
Trying to fix : #1571
2015-08-05 20:43:17 +01:00
27cff0becf
added test for object for steamroller bonfire
2015-08-05 21:37:04 +02:00
40cdf76035
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-05 11:58:09 -07:00
01e408d48c
new final-ish curriculum structure
2015-08-05 11:57:58 -07:00
5ff371fc6f
Trying to fix : #1571
...
I have found a small typo on challenge: An Array Of new Information
2015-08-05 21:55:25 +03:00
71ca6b1b5b
mark if user is github cool during migration
2015-08-05 11:22:58 -07:00
f656311b3e
remove comments from migration
2015-08-05 11:22:58 -07:00
f68c6d0fa3
Changed the object lessons to use dot notation instead of bracket
...
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
2015-08-05 17:31:42 +01:00
e7cac3ccf9
fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559
2015-08-05 16:54:57 +01:00
4ff54006d3
Merge remote-tracking branch 'origin/staging' into staging
2015-08-05 15:39:18 +01:00
ceed3c4877
Fix some typos
2015-08-05 15:38:54 +01:00
959fde64fc
add a span challenge and replace more old outside images with s3 images
2015-08-05 00:06:20 -07:00
fa86f650e2
update cats to fetch from s3
2015-08-04 23:31:00 -07:00
932bc0ab65
continue working on jquery challenges
2015-08-04 23:24:26 -07:00
c9e0184387
Merge pull request #1508 from flota113/flota113-1502
...
Small Fix of Bootstrap waypoint challenge - Issue 1502
2015-08-04 12:35:08 -07:00
00a9cfdf48
Merge pull request #1517 from ngalluzzo/fix-class-typo
...
Typo on 'Responsive Design with Bootstrap'
2015-08-04 12:34:47 -07:00
ecacbc6233
Update bootstrap.json
...
fixed typo (misspelled 'container')
2015-08-04 14:03:19 -05:00
ad46b72bd0
Update bootstrap.json
2015-08-04 08:54:21 -07:00
a3e5005058
fixed issue #1511 - now checking for words longer than 9 chars
...
closes #1511
2015-08-04 16:51:10 +02:00
dbf8443430
Small Fix of Bootstrap waypoint challenge - Issue 1502
...
Changed second check for second class - 'btn-default'
2015-08-04 15:00:22 +02: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
aa10e1ff69
quick sweep to make sure all tests run properly
2015-08-03 23:03:12 -07:00
eb8b9df5ad
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-03 21:17:55 -07:00
e6f14fc25f
Merge remote-tracking branch 'origin/staging' into staging
2015-08-04 00:53:34 +01:00
aa906f81c3
fix https://github.com/FreeCodeCamp/freecodecamp/issues/1450 missing semi-colon and assert(
2015-08-04 00:53:20 +01:00
4c94bf7fcd
Merge pull request #1231 from ahstro/lumenteun-410
...
Improved consitency in 'Friendly Date Ranges' test cases.
2015-08-03 16:04:37 -07:00
2f1d9c4826
Merge pull request #1197 from 1hella/1hella-1156
...
Fix typos in Bonfire: Friendly Date Ranges #1156
2015-08-03 16:02:50 -07:00
c9db4191c2
fixed a typo as per issue 1473
2015-08-04 00:39:11 +02:00
6c0049803d
Fixed two typos and fixed a no tests tun error
2015-08-03 20:43:23 +01:00
4be714aa97
Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework
2015-08-03 18:02:26 +01:00
c9c2a74461
Hardened The check-the-length-property-of-a-string-variable challenge to make it hard to get no tests run
2015-08-03 17:01:27 +01:00
43bba0744a
Fixed route on waypoint-label-bootstrap-wells and the tests. Fixed the test messages on waypoint-give-each-element-a-unique-id
2015-08-03 16:42:26 +01:00
dfa45edb7c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-02 19:06:32 -07:00
686017006b
fix minor grammar issue in javascript challenges
2015-08-02 19:06:25 -07:00
a879441c77
Two of the tests were inverted
2015-08-02 22:09:36 +01:00
c8f2b4a571
Allows users to add values to the inner arrays
2015-08-02 21:24:13 +01:00
b7324b4155
Fixed the fact it was myDecimal instead of myFloat
2015-08-02 21:15:39 +01:00
f0aeb26337
'Create a Text Field' now makes sure the input type is text. #1241
2015-08-01 17:07:03 -07:00
28610c4092
Merge branch 'staging' of https://github.com/amorphid/freecodecamp into amorphid-staging
2015-08-01 16:47:26 -07:00
dcbb753b71
Typo in Waypoint #38
...
Deleted extra semicolon.
2015-08-01 16:39:38 -07:00
ca26efa4fb
Merge branch 'Sazumo-1248' of https://github.com/Sazumo/freecodecamp into Sazumo-Sazumo-1248
2015-08-01 16:12:08 -07:00
21cc71ab24
add help room to chat room challenge, thanks to SaintPeter's suggestion
2015-08-01 12:36:42 -07:00
a5b1d23a3c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-01 12:16:14 -07:00
44007c9643
implement ckylee additional test to everything be true bonfire #1397
2015-08-01 12:14:25 -07:00
cc890d017a
Merge pull request #1399 from biellls/patch-1
...
Change order of subarrays to cover all cases
2015-08-01 11:53:47 -07:00
2b9c89eccc
fixed tcyrus broken pull request and also extend its methodology to another challenge
2015-08-01 11:45:59 -07:00
942e26fed5
Merge branch 'staging' of https://github.com/tcyrus/freecodecamp into tcyrus-staging
2015-08-01 11:30:22 -07:00
61a8a54682
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-01 11:29:54 -07:00
5937ceaec7
Merge pull request #1432 from SaintPeter/sorted_union_bonfire
...
Added additional tests to Sorted Union Bonfire
2015-08-01 11:27:45 -07:00
fd0307ffcf
Added extra regex moving on to fix scroller without those new images
2015-08-01 19:13:37 +01:00
7443236912
Added extra regex moving on to fix scroller without those new images
2015-08-01 19:12:44 +01:00
596f8f660a
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-01 08:26:07 -07:00
1e2011a354
fix some issues and finalize jquery challenges for today
2015-08-01 08:25:56 -07:00
f6564884a2
All done without extra regex
2015-08-01 16:11:57 +01:00
8f47390b79
Merge remote-tracking branch 'origin/staging' into staging
2015-08-01 16:10:58 +01:00
9370561579
All done without the extra regex
2015-08-01 16:10:21 +01:00
57592545d9
add two more jquery challenges
2015-08-01 07:11:11 -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
646fa1cbac
remove mention of comments from zipline
...
update hot stories api uri
2015-07-31 20:10:30 -07:00
99304b3a04
Added additional tests to Sorted Union Bonfire
2015-07-31 18:04:06 -07:00
d52525f1f4
Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location
2015-08-01 00:47:39 +01:00
ae38aab8cc
fix issue with codemirror framework and script tag rendering
2015-07-31 16:38:12 -07:00
2ccd6e3ee3
fix html view instruction column
2015-07-31 14:36:00 -07:00
2547868854
fix storage and reset functionality for js and html challenge views
2015-07-31 13:37:06 -07:00
4b47e5282c
Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location
2015-07-31 19:56:11 +01:00
74d938b3af
Merge remote-tracking branch 'origin/staging' into staging
2015-07-31 19:54:00 +01:00
dd9984fc2d
Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location
2015-07-31 19:53:21 +01:00
051a7bb287
add new jquery challenges and resequence other challenges
2015-07-30 22:40:17 -07:00
62897b8a51
add removal and clone jquery challenges
2015-07-30 18:31:40 -07:00
1d7fc8589c
add .remove() challenge
2015-07-30 18:12:29 -07:00
d4d4124158
add a removeClass challenge
2015-07-30 18:05:02 -07:00
1fa0c48257
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 17:31:53 -07:00
489f52180b
add two new jquery challenges
2015-07-30 17:31:47 -07:00
972ae79b22
Ready JavaScript Curriculum
2015-07-31 00:22:56 +01:00
482f16893c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 15:51:38 -07:00
b9adf97a91
Ready JavaScript Curriculum
2015-07-30 23:46:47 +01:00
60105a9fe7
finish drafting copy and tests for bootstrap section
2015-07-30 15:45:54 -07:00
d588263658
Extra comma was breaking node seed
2015-07-30 21:54:33 +01:00
448daf1fa4
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 13:01:57 -07:00
35761f6316
fix some minor issues with bootstrap challenges
2015-07-30 13:01:46 -07:00
1e412b1498
Ready JavaScript Curriculum
2015-07-30 20:58:02 +01:00
14368f6471
add container-fluid divs to all bootstrap waypoints
2015-07-30 12:20:34 -07:00
fc7af46e0c
finish color tutorial
2015-07-29 23:21:44 -07:00
549ab1bd0e
start work on RGB section
2015-07-29 00:33:17 -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
2d009777b3
add ID related challenges
2015-07-28 18:51:39 -07:00
fd3374fca7
about to start priority and !important waypoints
2015-07-28 17:11:51 -07:00
e67d843f48
Fix Issue #1015
...
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
19c2408348
Change order of subarrays to cover all cases
...
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02:00
9bc14d24a4
Display contact information for job and size thumbnail
2015-07-26 07:57:14 -07:00
f547ce32f7
update jobs model and jobs seed
2015-07-25 21:59:52 -07:00
4792485ac4
show jobs route up
2015-07-25 21:32:18 -07:00
fe51774814
Fix dup id's in basic javascript
2015-07-25 20:22:13 -07:00
37d5efed4e
Merge branch 'staging' into js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
ea26455c4c
Merge branch 'js-curriculum' of https://github.com/benmcmahon100/freecodecamp into benmcmahon100-js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 15:59:37 -07:00
890bd8cd9c
additional refactor of HTML challenges
2015-07-23 22:24:51 -07:00
efa5d769c2
QA first dozen html challenges
2015-07-23 18:44:16 -07:00
a24ef288b4
Ready Js Curriculum
...
Added Regex, Random Numbers and If else Challenges
2015-07-24 00:38:13 +01:00
01c72656c8
fix 'id' not _id.
...
fix spacing after semi colon
2015-07-23 16:14:45 -07:00
3dfeaadba0
update zipline copy with CodePen override warning
2015-07-23 16:03:51 -07:00
47901a9b0a
add missing false in hikes challenge
2015-07-23 16:03:49 -07:00
ac5e31596d
add transcript for missing hike
2015-07-23 16:03:49 -07:00
a4c4eb1493
fix type hike not hikes
2015-07-23 16:03:47 -07:00
3df60136e8
add title field to challenges
2015-07-23 16:03:46 -07:00
8f738fb1d0
add videos to new challenges
2015-07-23 16:03:46 -07:00
83654fb86a
finish adding the nodeschool challenges
2015-07-23 16:03:46 -07:00
8b78d6e9ca
update basejump demo urls
2015-07-23 16:03:46 -07:00
99b99dc1a7
finish scripts and overall structure for new curriculum
2015-07-23 16:03:46 -07:00
60f2bdc685
more minor updates
2015-07-23 15:50:47 -07:00
fab672f8c6
all field guides operational
2015-07-23 15:50:47 -07:00
03a225e640
update hikes.json
2015-07-23 15:50:47 -07:00
8b0b5dd6ce
split field guides into separate categories
2015-07-23 15:50:47 -07:00
bfd51b66b6
add hikes.json
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
158baca3d3
fix typo in nonprofit field guide
2015-07-23 15:49:03 -07:00
c98afee926
continue building the jQuery Playground
2015-07-23 15:49:03 -07:00
c492576181
start building the jquery playground bootstrap.json flow
2015-07-23 15:49:03 -07:00
fe03ee557d
restructure entire curriculum sequence and json files
2015-07-23 15:49:03 -07:00
c8f8ab7af2
continue adding rgb challenges to basic-html5
2015-07-23 15:49:02 -07:00
e17b838c80
add babel-node to seed
2015-07-23 15:49:01 -07:00
cc9af1c67b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-20 22:56:23 -07:00
d9d9c67ae0
update field guides
2015-07-20 22:56:12 -07:00
003805d834
Added start of the random number challenges
2015-07-16 11:06:04 +01:00
7af3c1c67d
Full JS Stuff
...
There is a bit more RegEx and if else stuff. Other challenges can be added later but this is the base working set without @QuincyLarson 's fixes to the copy
2015-07-13 21:55:36 +01:00
5d8d7a8f0f
Add <p> element to label the new ordered list.
...
- Improve consistency of challenge seeds
- Clarify challenge objective for "Waypoint: Created an ordered list"
2015-07-13 13:20:28 -07:00
ffd0d7e905
almost complete js challenges
2015-07-13 00:48:58 +01:00
3d51e7776d
Clarify text for 'Waypoint: Add a Negative Margin to an Element'
...
- the user was asked to change text to a negative number
- this was confusing, as the test only passes if the value ia -15px
2015-07-11 10:52:58 -04:00
a39c398b8c
Update to 30!
2015-07-10 17:22:58 +01:00
46066e5be1
Third commit to the new curriculum
2015-07-10 00:56:30 +01:00
27df132367
Update 2 of the new js curriculum!
...
7 more challenges added!
2015-07-09 00:26:16 +01:00
d6b9093be9
Improved consitency in 'Friendly Date Ranges' test cases. #410
2015-07-08 21:19:34 +02:00
91d6520817
Final wording tweak to line 1803
2015-07-08 19:51:19 +01:00
dd249197cb
Updated to reflect original wording a bit better
...
Another slight tweak to line 1803 to make it more true to the original wording of the challenge
2015-07-08 19:45:27 +01:00
3066bdc335
Fix for #1218
2015-07-06 23:46:26 +01:00
3098a6dc60
add basic javascript.json
2015-07-05 17:12:52 -07:00
655c7eef52
clear basic-javascript.json
2015-07-05 17:03:41 -07:00
3842c0b9c8
Fixed typos in Bonfire: Friendly Date Ranges #1156
2015-07-04 16:04:12 -07:00
c66b501837
start purging the br challenges
2015-07-03 01:08:11 -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
21a4dc1808
Merge pull request #1159 from LumenTeun/lumenteun-1151
...
'Font degrade'-test now check order of font-familiy.
2015-07-02 13:57:41 -07:00
d3a6ff1ba1
Merge pull request #1160 from LumenTeun/lumenteun-1158
...
Slightly clarifies 'Uncomment HTML'.
2015-07-02 13:56:48 -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
552ffb40d9
Merge pull request #1163 from kmiasko/staging
...
Waypoint: Get Set for Basejumps changed deprecated heroku command
@kmiasko Thanks for fixing this!
2015-07-02 13:51:23 -07:00
d96dde8d68
Merge pull request #1172 from LumenTeun/lumenteun-1168
...
Reword parts of 'how-to-npm'-waypoint.
2015-07-02 13:50:22 -07:00
9120edc67c
Update basic-html5-and-css.json
2015-07-01 15:28:29 +01:00
3955767c79
solution to issue #1173
...
this solution may also be needed for some of the other css-based challenges
2015-07-01 15:16:44 +01:00
85c628dc00
Reword parts of 'how-to-npm'-waypoint. #1168
2015-07-01 13:46:36 +02:00
c434342f15
update official LA FCC chat room
2015-07-01 01:31:51 -07:00
ad69a923ce
add official fcc chat room list
2015-07-01 01:26:56 -07:00
154f8c894e
add more cities
2015-07-01 00:57:15 -07:00
3a1b5e79b5
add gitter rooms to cities
2015-07-01 00:45:19 -07:00
b27832f0d0
more improvements to html.json
2015-06-30 23:21:34 -07:00
7035f1fcf0
finish the color section of the basic html section
2015-06-30 20:10:00 -07:00
bc8a677be5
finish the color priority section of basic-html
2015-06-30 18:17:20 -07:00
2bbdf75ab9
Waypoint: Get Set for Basejumps changed deprecated heroku command
2015-06-30 12:25:51 +02:00
75948c4bc1
Quite a few spelling and grammar fixes
2015-06-30 04:28:43 +02:00
f6602fe680
half way done creating css priority challenges
2015-06-29 19:17:06 -07:00
ca9d951ce3
Slightly clarifies 'Uncomment HTML'. Regarding #1158
2015-06-30 03:17:12 +02:00
33fa2d1939
'Font degrade'-test now check order of font-familiy. Fixes #1151
2015-06-30 02:52:21 +02:00
d9fe6dcef1
fix broken challenges and attempt to make streak more lenient.
2015-06-29 16:32:49 -07:00
cf167b3c11
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-28 18:03:21 -07:00
c4c1a44c48
make the Mobile Responsive Images challenge more robust fixes #998
2015-06-28 18:03:11 -07:00
2284a9fcd7
Merge pull request #1115 from NatashaHaggard/923
...
Issue 923 - Grammatical error
2015-06-28 15:24:52 -07:00
1fabe07bcd
Merge pull request #1124 from greasan/greasan-translateDE
...
First two sections translated into German
2015-06-28 15:22:58 -07:00
bdb2c2989f
Merge pull request #1114 from NatashaHaggard/1059
...
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
d857bbcc0b
Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
...
fixes issue #1148
2015-06-28 15:21:11 -07:00
68dfa51719
Merge pull request #1074 from SaintPeter/staging
...
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
bdb170b0df
fixes issue #1148
2015-06-28 15:03:52 -07:00
0350980c3a
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-27 19:43:13 -07:00
05cfe86cd0
add some additional jquery challenges
2015-06-27 19:42:25 -07:00
7ee4b22a57
update the cities on the field guide
2015-06-27 15:28:37 -07:00
75c77cdb6f
clean up future jquery challenges
2015-06-27 11:56:31 -07:00
20fde8a8ab
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-26 19:22:13 +02:00
66e4138b36
fix buffer return from database query
2015-06-26 01:51:27 -07:00
e53419bb59
fix should be bufferWithCount
2015-06-26 01:48:21 -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
6700729658
update emails and refine sponsor view
2015-06-25 23:35:48 -07:00
2422663f34
add comments migration to loopback script
2015-06-25 21:47:25 -07:00
6c9cb28fdc
Issue 923 - Grammatical error
...
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."
Removed the "and" after "his or her".
This closes #923
2015-06-24 22:40:10 -05:00
42eba3becc
Issue 1059 - Wording issue on instructions
...
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".
This closes #1059
2015-06-24 21:52:10 -05:00
95b0884df5
Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036
...
Issue 1036 - Fixed minor grammatical mistake
2015-06-24 10:43:12 -07:00
c3d9598d18
Merge pull request #1102 from NatashaHaggard/patch-2
...
Issue 1080
2015-06-24 10:32:58 -07:00
c8c03aae10
'Slack' to 'Gitter or Slack'
2015-06-24 10:29:52 -07:00
95f47de9f0
'Slack' to 'Gitter'
2015-06-24 10:29:52 -07:00
1df962bb07
Merge branch 'master' into staging
...
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
bd0a517144
Issue 1080
...
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
1e84751a0f
Issue 1094 - Field Guide Error
...
"Contact Jason Ruekert - he's @jsonify in Slack."
Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
99459feb5e
Add Symmetric Difference link to bonfire
2015-06-22 21:49:44 -07:00
1cdd0eee6d
Add video link for Symmetric Difference
2015-06-22 21:46:09 -07:00
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
d0477bfb2b
WP 12-13 ES Translation
2015-06-22 20:22:09 -03:00
7aff6dd285
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-22 10:31:24 -04:00
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
6950ebc346
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-21 12:25:45 +02:00
5db883346e
Change eqls to equal
2015-06-21 00:56:20 -05:00
5212173c61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-20 18:12:24 -07:00
dd3d445054
add new chat challenge
2015-06-20 18:12:12 -07:00
817f27bd5b
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-20 10:46:50 +02:00
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
fe1b3f4d2a
fix broken test from recent pull request
2015-06-19 17:53:59 -07:00
cd63977687
Merge branch 'master' into staging
...
Conflicts:
seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
5a0d38eb5e
Merge pull request #984 from rcw271828/staging
...
Fixed typo in field-guides.json
2015-06-19 17:36:19 -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
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
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
adbbbf3743
fix name and dashed name switched
...
close #975
2015-06-18 20:02:32 -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
842a2efe64
More test cases for 'Seek and Destroy' #942
2015-06-18 11:56:13 +02:00
d1a12fc894
'No repeats please' test fix. #941
2015-06-17 23:30:08 +02:00
d615e94c29
fix minor typo in html challenge
2015-06-16 18:00:17 -07:00
13c3d213ce
WP11 ES Translation
2015-06-16 18:27:58 -03:00
07c2e6b1c3
Translated basic HTML5 and CSS
2015-06-16 19:40:07 +02:00
891aa09f04
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-16 19:20:27 +02:00
e319652373
Fix wikipedia viewer zipline naming
2015-06-16 08:36:54 -04: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
3d8b8e4c73
rename flattenUser to loopbackMigration
...
add stories migration to script
2015-06-15 16:47:50 -07:00
d6ddd632d0
Remove excess debug statements from flattenUser.js
2015-06-15 19:12:48 -04:00
76811b9215
Fix json typo
2015-06-15 18:59:56 -04:00
988242df03
Ensure build process is part of npm install
2015-06-15 18:10:48 -04:00
845c0ccc74
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-15 18:54:20 +02:00
663492c582
Check fix in 'Bootstrap Grid'. #907
2015-06-15 18:26:44 +02:00
480c5dec0a
Test for almost palindromes. #911
2015-06-15 18:14:55 +02:00
0038c48875
Improves check for catphotoapp.com. Fixes #914
2015-06-15 18:06:09 +02:00
00c1cdef5b
Fixed Zipline jQuery.getJSON() links. Fixes #918 #919
2015-06-15 17:43:52 +02:00
f50cee119c
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-15 17:26:37 +02:00
b6fc2551d9
Merge branch 'interview' into staging
...
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
2b7177e856
add dashedName attributes to JSON
2015-06-14 00:55:27 -07:00
2c8a134e80
first challenge json file updated with dashedname
2015-06-13 23:50:36 -07:00
5b2b7e23ae
Take id property of username, remove wasteful save on profile lookup.
2015-06-12 19:16:10 -04:00
d07e5351ea
Comment out blacklist
2015-06-12 18:55:47 -04:00
90b2f99a70
add create identities on flatten users
2015-06-12 15:27:51 -07:00
f2ff5236eb
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-12 22:19:10 +02:00
173d46ae01
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/field-guides.json
2015-06-12 12:40:26 -07:00
d9e64f842f
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-12 14:08:44 +02:00
f7bb14803e
Update field guides to display properly. Correct models on user object.
2015-06-11 16:19:44 -04:00
5fb89cb091
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-11 11:16:31 -07:00
4d8ab0a915
fix conflicting id
2015-06-11 10:36:47 -07:00
701241aac8
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-10 07:16:02 +02:00
c5d3b4a041
move get emails script to seed
2015-06-09 16:49:03 -07:00
61486c2d7c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
ab9fcc6f29
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-08 07:25:05 +02:00
28f273e7ee
save users into new `user` collection
2015-06-07 22:06:57 -07:00
0c6c170754
initial script to flatten user object
2015-06-07 17:15:53 -07:00
8b8dab2970
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-05 15:48:38 +02:00
b6a0edc964
fix nonprofit ids should be unique
2015-06-04 14:32:16 -07:00
3654bb7e6f
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
02b195511e
fix challengeSeeds should be arrays
2015-06-04 12:31:33 -07:00
618cedddb0
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-04 12:24:30 -07:00
272d9b4ad5
Update seed directory to use loopback
2015-06-02 20:32:10 -07:00
Abhisek Pattnaik
benmcmahon100
ayampol
Aryan Jabbari
Matt Trifilo
Quincy Larson
Juan Martínez
ahstro
Michael Krebs
Juan Martínez
Berkeley Martinez
Djordje Lacmanović
Isabell Long
Roger Turnau
sonorangirl
Martin Kwan
Brett Guillory
Shouvik Roy
alanmbarr
Samuel Plumppu
Dealga McArdle
Marcin Flotyński
Cristian V. Nica
Rafael J. Rodriguez
Ben
Nic Galluzzo
Jose M Viloria
SaintPeter
TCYRUS
biellls
Sean Nguyen
Michael Pope
Stephen Wanhella
Krzysztof Miąsko
JonSonesen
greasan
Natasha Haggard
Matias Cao
terakilobyte
brandenbyers
rcw271828