409 Commits

Author SHA1 Message Date
Quincy Larson
edf9959fc9 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
Quincy Larson
7c5d5cc51a finish QAing bootstrap 2015-08-13 20:58:27 -07:00
Quincy Larson
060eeefd32 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
Quincy Larson
9402b3b052 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Berkeley Martinez
c84a25c582 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
Quincy Larson
34c65633c0 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
Berkeley Martinez
cd5d7ac8e8 lint json 2015-08-13 15:42:17 -07:00
Quincy Larson
9275bd5076 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
Quincy Larson
837d412777 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
Quincy Larson
b14990dd63 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
Quincy Larson
c801b4b907 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
benmcmahon100
74ba74bb3b Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
043ef69d2f start adding json challenges 2015-08-13 12:55:50 -07:00
benmcmahon100
d881c14070 Add some code highlighting 2015-08-13 17:36:02 +01:00
benmcmahon100
b470523d89 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
Quincy Larson
2bbb2bd541 remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
Quincy Larson
3aacf90018 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Quincy Larson
19fbd00ed8 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson
024cf33f34 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez
30070c4f74 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
Berkeley Martinez
60189e2428 fix angular.js typo
closes #1287
2015-08-12 20:05:06 -07:00
benmcmahon100
781f717896 Merge pull request #1741 from FreeCodeCamp/staging
Final update to OOPF before pr into staging
2015-08-13 00:24:41 +01:00
benmcmahon100
73b649723b Removed the under construction flag 2015-08-13 00:21:52 +01:00
benmcmahon100
4349a5cf6e First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01:00
Quincy Larson
0fdf9fbe62 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
Quincy Larson
760fa4e360 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
Quincy Larson
5e5c3c32e1 Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
Quincy Larson
f673a1f707 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
Quincy Larson
f1b2c57bea make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
Quincy Larson
0458cbeea3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
Quincy Larson
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
Quincy Larson
c3a2aa3870 manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
Quincy Larson
aeb5b40168 Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
Quincy Larson
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
Quincy Larson
2941bcd5ea make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
Quincy Larson
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
Quincy Larson
3603531208 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
Quincy Larson
b87f8f0234 Merge pull request #1617 from ahstro/target-elements
Improves 'Target Elements by ID Using jQuery'
2015-08-12 00:55:20 -07:00
Quincy Larson
78441a49d4 make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
Quincy Larson
848d6b8cfc Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
Quincy Larson
d18c819ebd fix omission in simon zipline 2015-08-11 23:53:30 -07:00
benmcmahon100
05afe79320 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
1827857eed Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100
928afe9915 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
benmcmahon100
9f62d63a68 Merge pull request #1537 from benflinn/patch-1
Update bootstrap.json
2015-08-11 13:12:16 +01:00
Berkeley Martinez
382393e1f2 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
Quincy Larson
22ce7219a6 get everything seeding again 2015-08-10 22:17:49 -07:00
Quincy Larson
f2356c6767 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
Berkeley Martinez
5ad9cf8fab 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
0420624d6a Merge pull request #1612 from ahstro/ahstro-1467
Improve 'Turn an image to a Link'-waypoint
2015-08-10 20:25:54 -07:00