gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,260 Commits 9 Branches 0 Tags
659cc1276b8de68fc7b70a548da86c09b9052c5c
Commit Graph

29260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quincy Larson
0458cbeea3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -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
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
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
c3a2aa3870 manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
Quincy Larson
c408bbe20b 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
75b54a395e 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
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
2941bcd5ea make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
Quincy Larson
a9bea09cc9 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
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
Quincy Larson
3603531208 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
Quincy Larson
9e128e2787 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
e7f4fdc5cf 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
5830ac2f8a 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
82e03b579c 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
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
05afe79320 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
Berkeley Martinez
0838486483 properly define id fields for basic models 
closes #1724
 2015-08-11 14:49:57 -07:00
Berkeley Martinez
0fcf3bcf42 fix challenge completion should give brownie points 
closes #1665
 2015-08-11 14:17:08 -07:00
Berkeley Martinez
6fd19738ce refactor and lint home router 2015-08-11 13:22:16 -07:00
Berkeley Martinez
7348cff96e Update README.md 2015-08-11 12:49:37 -07:00
benmcmahon100
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100
1827857eed Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100
44ac9bc8cb Merge pull request #1720 from FreeCodeCamp/staging 
Update from staging to start new challenges
 2015-08-11 13:55:35 +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
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
benmcmahon100
9f62d63a68 Merge pull request #1537 from benflinn/patch-1 
Update bootstrap.json
 2015-08-11 13:12:16 +01:00
benmcmahon100
ba5d845ac6 Merge pull request #1537 from benflinn/patch-1 
Update bootstrap.json
 2015-08-11 13:12:16 +01:00
Berkeley Martinez
2256f3ef6e fix add github link to passport 2015-08-10 23:38:10 -07: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
Berkeley Martinez
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
Quincy Larson
22ce7219a6 get everything seeding again 2015-08-10 22:17:49 -07:00
Quincy Larson
b4f5f1a81e 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
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery 
Conflicts:
	seed/challenges/bootstrap.json
 2015-08-10 22:03:51 -07:00
Quincy Larson
43e3dc8914 Finish onboarding page 2015-08-10 21:55:13 -07:00
Berkeley Martinez
341d931833 fix streak show days 2015-08-10 21:01:37 -07:00
Quincy Larson
666f7377d5 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-10 20:55:14 -07:00
Quincy Larson
7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -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
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