Commit Graph

26729 Commits

Author SHA1 Message Date
7910f0ae2c Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display 2015-08-13 01:20:12 +01:00
781f717896 Merge pull request #1741 from FreeCodeCamp/staging
Final update to OOPF before pr into staging
2015-08-13 00:24:41 +01: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
73b649723b 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
4349a5cf6e First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01:00
e36dd9970a fix rx long stack trace support 2015-08-12 11:47:03 -07:00
ca01115674 fix next challenge unknown bug
closes #1725
2015-08-12 11:47:03 -07:00
0fdf9fbe62 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
d138757c52 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
760fa4e360 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
7a2c2544a4 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
5e5c3c32e1 Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
5c1b45da2e Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
f673a1f707 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
84c76bcfd0 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
f1b2c57bea make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
88b6b8a9d8 make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
0458cbeea3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
096eb0a67e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
011d1fe903 Merge pull request #1643 from Greenheart/greenheart-1628
clarified description for waypoint: make images mobile responsive
2015-08-12 01:23:18 -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
c3a2aa3870 manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
c408bbe20b manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
aeb5b40168 Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
75b54a395e Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
51227f2d34 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
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
2941bcd5ea make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
a9bea09cc9 make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
9ff8440d1d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/jquery-ajax-and-json.json
2015-08-12 01:06:03 -07:00
690369f76a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/jquery-ajax-and-json.json
2015-08-12 01:06:03 -07:00
3603531208 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
9e128e2787 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
b87f8f0234 Merge pull request #1617 from ahstro/target-elements
Improves 'Target Elements by ID Using jQuery'
2015-08-12 00:55:20 -07:00
e7f4fdc5cf Merge pull request #1617 from ahstro/target-elements
Improves 'Target Elements by ID Using jQuery'
2015-08-12 00:55:20 -07:00
78441a49d4 make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
5830ac2f8a make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
848d6b8cfc Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
82e03b579c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
d18c819ebd fix omission in simon zipline 2015-08-11 23:53:30 -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
05afe79320 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
0838486483 properly define id fields for basic models
closes #1724
2015-08-11 14:49:57 -07:00
0fcf3bcf42 fix challenge completion should give brownie points
closes #1665
2015-08-11 14:17:08 -07:00
6fd19738ce refactor and lint home router 2015-08-11 13:22:16 -07:00
7348cff96e Update README.md 2015-08-11 12:49:37 -07:00
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00