Commit Graph

26729 Commits

Author SHA1 Message Date
1827857eed Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
44ac9bc8cb Merge pull request #1720 from FreeCodeCamp/staging
Update from staging to start new challenges
2015-08-11 13:55:35 +01:00
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
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
9f62d63a68 Merge pull request #1537 from benflinn/patch-1
Update bootstrap.json
2015-08-11 13:12:16 +01:00
ba5d845ac6 Merge pull request #1537 from benflinn/patch-1
Update bootstrap.json
2015-08-11 13:12:16 +01:00
2256f3ef6e fix add github link to passport 2015-08-10 23:38:10 -07:00
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
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
22ce7219a6 get everything seeding again 2015-08-10 22:17:49 -07:00
b4f5f1a81e get everything seeding again 2015-08-10 22:17:49 -07:00
f2356c6767 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
db6db2e403 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
43e3dc8914 Finish onboarding page 2015-08-10 21:55:13 -07:00
341d931833 fix streak show days 2015-08-10 21:01:37 -07:00
666f7377d5 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-10 20:55:14 -07:00
7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -07:00
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
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
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
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
a36fcdabdd 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
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
b3de4e5de4 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
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
44cf78afab Merge pull request #1715 from FreeCodeCamp/onboarding
Onboarding
2015-08-10 20:16:10 -07:00
eb5d275d23 improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
d61dd76875 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
8ee3306bee Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
0670f73b6d Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
f8c63c9dba Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -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
50f3845f32 Merge pull request #1671 from ahstro/ahstro-1402
Disregard order in 'Symmetric Difference'
2015-08-10 19:11:33 -07:00
354338e99f Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
a557f386ed Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
04d6de9a05 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
041ef43be3 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
e7f1f12a6f Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -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
93df41acc6 fix duplicate id's 2015-08-10 17:40:45 -07:00
d67c049d5b make onboarding page the default homepage for authenticated users 2015-08-10 17:40:13 -07:00
234aa0a5ea fix missing quote escape 2015-08-10 17:35:16 -07:00
3c4213dd03 fix missing quote escape 2015-08-10 17:35:16 -07:00
cf1bb322e8 Merge pull request #1709 from martinkwan/patch-2
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
c550760b66 Merge pull request #1709 from martinkwan/patch-2
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
784572009e Merge pull request #1706 from kurzninja/patch-3
Fix for incorrect RGB test value
2015-08-10 16:27:15 -07:00