Commit Graph

5008 Commits

Author SHA1 Message Date
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
b4f5f1a81e get everything seeding again 2015-08-10 22:17:49 -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
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
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
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
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
853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
8ee3306bee Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -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
a557f386ed Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
041ef43be3 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -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
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
c550760b66 Merge pull request #1709 from martinkwan/patch-2
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
5b61f15d06 Merge pull request #1706 from kurzninja/patch-3
Fix for incorrect RGB test value
2015-08-10 16:27:15 -07:00
8f332039af Merge pull request #1697 from martinkwan/patch-1
Updated Pig Latin Link
2015-08-10 15:46:12 -07:00
a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
f8665324ad simplify user account and profile system for github locking 2015-08-10 15:37:49 -07:00
add87ae801 start simplifying account page 2015-08-10 15:10:38 -07:00
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
737adf1fac Update intermediate-bonfires.json 2015-08-10 13:42:33 -07:00
8dabd39950 add to seed script: exit on error
filter challenge blocks that do not have challenges
2015-08-10 12:15:30 -07:00
a851e575bc Merge pull request #1708 from issyl0/fix_typos_in_basic_javascript_challenge
Fix typos in the Basic Javascript challenge
2015-08-10 12:03:31 -07:00
8d680b487d Merge pull request #1704 from ahstro/completion-monitor
Refactored CompletionMonitor() slightly
2015-08-10 11:30:14 -07:00
97b0ccac8f fix mising type
remove extra bonfire in title
2015-08-10 11:27:12 -07:00
1731a549b2 Merge pull request #1701 from ahstro/seed-error
Incorrect keys caused error during seed
2015-08-10 11:22:58 -07:00
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
9513a8b0e5 Incorrect JSON caused error during seed 2015-08-10 20:11:59 +02:00
aec8680567 Refactored CompletionMonitor() slightly 2015-08-10 18:44:19 +02:00
d7e824ebbe done adding static images 2015-08-10 00:44:37 -07:00
d56ecd1979 add a bunch of new images to onboarding 2015-08-10 00:42:33 -07:00
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
129ec7c98e Merge pull request #1613 from ahstro/wrong-class
Updated test case comment in 'fluid containers'
2015-08-09 23:06:56 -07:00
1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
0c349f9763 Merge pull request #1675 from alanmbarr/alanmbarr-1375
Update bootstrap.json waypoint-line-up-form-elements-responsively-with-bootstrap typo
2015-08-09 22:46:09 -07:00
a551c3ad57 Merge pull request #1692 from royshouvik/patch-1
Update basic-javascript.json to fix #1642
2015-08-09 22:41:58 -07:00
13f08bf037 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
f3028b0e6a continue work on get-started 2015-08-09 21:59:49 -07:00
4ed041c0db update curriculum structure again 2015-08-09 21:26:26 -07:00