gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,395 Commits 9 Branches 0 Tags
4cecc4cb08f9dfe42c5655df1a74ff7ab72372a0
Commit Graph

2225 Commits

Author SHA1 Message Date
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
49e9d078f1 fix angular.js typo 
closes #1287
 2015-08-12 20:05:06 -07:00
benmcmahon100
7ee6a8f888 Merge pull request #1741 from FreeCodeCamp/staging 
Final update to OOPF before pr into staging
 2015-08-13 00:24:41 +01:00
benmcmahon100
2b654ecd83 Removed the under construction flag 2015-08-13 00:21:52 +01:00
benmcmahon100
7c19d6c0ef First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01:00
Quincy Larson
d138757c52 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
 2015-08-12 02:06:03 -07:00
Quincy Larson
7a2c2544a4 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
Quincy Larson
5c1b45da2e Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
Quincy Larson
84c76bcfd0 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
Quincy Larson
88b6b8a9d8 make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
Quincy Larson
096eb0a67e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
Quincy Larson
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
Quincy Larson
c408bbe20b manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
Quincy Larson
75b54a395e Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
Quincy Larson
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
Quincy Larson
a9bea09cc9 make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
Quincy Larson
9e128e2787 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
Quincy Larson
5830ac2f8a make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
Quincy Larson
82e03b579c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
Quincy Larson
e42e954517 fix omission in simon zipline 2015-08-11 23:53:30 -07:00
benmcmahon100
1dc66b7671 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100
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
Quincy Larson
b4f5f1a81e get everything seeding again 2015-08-10 22:17:49 -07:00
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
 2015-08-10 22:03:51 -07:00
Berkeley Martinez
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
Berkeley Martinez
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
Berkeley Martinez
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
Berkeley Martinez
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
Quincy Larson
853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson
8ee3306bee Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
sonorangirl
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl
8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
Berkeley Martinez
d37a1a1a08 Merge pull request #1671 from ahstro/ahstro-1402 
Disregard order in 'Symmetric Difference'
 2015-08-10 19:11:33 -07:00
Quincy Larson
a557f386ed Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
Quincy Larson
041ef43be3 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
sonorangirl
8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Berkeley Martinez
4b0e95280d fix duplicate id's 2015-08-10 17:40:45 -07:00
Berkeley Martinez
234aa0a5ea fix missing quote escape 2015-08-10 17:35:16 -07:00
Berkeley Martinez
c550760b66 Merge pull request #1709 from martinkwan/patch-2 
Updated DNA Pairing link
 2015-08-10 16:39:13 -07:00
Berkeley Martinez
5b61f15d06 Merge pull request #1706 from kurzninja/patch-3 
Fix for incorrect RGB test value
 2015-08-10 16:27:15 -07:00
Berkeley Martinez
8f332039af Merge pull request #1697 from martinkwan/patch-1 
Updated Pig Latin Link
 2015-08-10 15:46:12 -07:00
Quincy Larson
a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Martin Kwan
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
Martin Kwan
737adf1fac Update intermediate-bonfires.json 2015-08-10 13:42:33 -07:00
Brett Guillory
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
Martin Kwan
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
Berkeley Martinez
129ec7c98e Merge pull request #1613 from ahstro/wrong-class 
Updated test case comment in 'fluid containers'
 2015-08-09 23:06:56 -07:00
Berkeley Martinez
1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00