Commit Graph

5945 Commits

Author SHA1 Message Date
de7657bbea Fix update properties challenge 2015-10-28 10:35:01 -07:00
21fd983bb0 one more commit before resuming on Berkeley side 2015-10-28 10:11:46 -07:00
d2ce2275b3 everything is ready except OOP 2015-10-28 05:13:49 -07:00
44c77d65b1 fix some mis-mergings for basic-javascript.json 2015-10-28 02:39:51 -07:00
fd7451e233 Merge branch 'staging' into improve-early-challenges
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-10-28 02:20:09 -07:00
74e4b21ec6 Merge pull request #3909 from ltegman/fix/waypoint-slot-machine-permits-more-efficient-answer-2278
Fix Waypoint Create Slot Machine Tests
2015-10-28 01:49:39 -07:00
4ad65513cc Merge pull request #3483 from awesomeaniruddh/fix/add-test-cases-for-bonfire
Add tests to intermediate bonfire
2015-10-28 01:25:32 -07:00
eb0a1bea01 Merge pull request #3946 from ltegman/fix/bootstrap-waypoint-wording-3895-3893
Fix Bootstrap Waypoints Wording Clarifications
2015-10-28 01:20:06 -07:00
7f5653963b finish JavaScript and OOP sections for QA 2015-10-28 01:15:54 -07:00
6c3319321a major improvements to basic-javascript.json 2015-10-27 23:16:08 -07:00
dd3893145d finish first pass of jQuery 2015-10-27 21:02:08 -07:00
6936d35c5d Merge pull request #3944 from mschultz4/fix/typos-intermediate-bonfire
Fixed typos in assert messages
2015-10-27 19:36:39 -07:00
fa8674c588 Fix Bootstrap Waypoints Wording Clarifications
Closes #3895 and #3893
2015-10-27 19:30:47 -07:00
37b5784899 Fixed typos in assert messages 2015-10-27 20:57:48 -04:00
63f56c94b8 continue refining waypoints 2015-10-27 17:49:58 -07:00
ee69ff4314 Merge pull request #3885 from tdugger/fix/3884
The word several is repeated in step 11
2015-10-27 17:29:38 -07:00
17310b0a98 Merge pull request #3936 from XianPalin/fix/incorrect_text_objective_2
Fix example for black background color in Objective 2
2015-10-27 17:28:22 -07:00
f423bbf4ea Fix example for black background color closes #3870 2015-10-27 12:28:15 -04:00
ae2be7234b Merge pull request #3920 from CodeNonprofit/new-nonprofits
Added nonprofits and changed status of several ongoing projects to "started"
2015-10-27 14:37:58 +00:00
096d0099c5 Merge pull request #3922 from krantzinator/feature/add-basic-bonfire-solutions
finished adding solutions for the Basic Bonfires
2015-10-27 14:24:09 +00:00
9f901ec97a Merge pull request #3926 from Em01/ew/fix-typo-boolean-waypoint-3897
Fixed typos in in JS Waypoints 2, 4 and 23.
2015-10-27 14:20:10 +00:00
daeaf34372 Fixed same issue in waypoint 4 2015-10-27 14:06:34 +00:00
72c52114f6 Fixed additional typos. 2015-10-27 09:49:56 +00:00
218f44e40b Fixed typos in in JS Waypoints. Closes #3897 2015-10-26 23:59:43 +00:00
2852b5a196 Merge pull request #3924 from Chiouonthis/patch-1
Update README.md
2015-10-26 16:31:41 -07:00
5597d0efe3 Update README.md
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
cd430a5167 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
ae4011766b Update nonprofits.json 2015-10-26 16:44:06 -04:00
90175a2e90 Updated nonprofits directory 2015-10-26 16:40:19 -04:00
d9cd9363bb Merge pull request #3917 from CodeNonprofit/remove-canceled-nonprofit-project
removed solace foundation
2015-10-26 13:12:25 -07:00
b2a9368e77 removed solace foundation 2015-10-26 15:37:20 -04:00
baaae041eb add the FCC leaderboard to the labs json 2015-10-26 11:39:45 -07:00
e9bcbbb333 continue improving early challenges 2015-10-26 03:14:03 -07:00
75c534c984 update onboarding challenges 2015-10-26 02:50:02 -07:00
dc26195395 finish clementine challenge for now 2015-10-25 23:28:53 -07:00
a398c8a908 Fix Waypoint Create Slot Machine Tests
Permits solutions that don't explicitly call Math.random three times and instead wrap that operation in a function.
2015-10-25 23:08:00 -07:00
30d49e92ec Merge pull request #3908 from FreeCodeCamp/fix/signin-button
fix signin button to use signin instead of login for path
2015-10-25 22:31:25 -07:00
b3c58910ac Merge branch 'staging' into clementine
Conflicts:
	seed/challenges/basejumps.json
2015-10-25 22:15:59 -07:00
c75e938359 add more gifs to basejump onboarding 2015-10-25 22:14:51 -07:00
ac4a71a229 fix signin button to use signin instead of login for path 2015-10-25 21:46:54 -07:00
8fd3f55a7a Merge pull request #3907 from FreeCodeCamp/fix/loop-waypoint-typo
fix waypoint typo
2015-10-25 19:48:13 -07:00
033dd5ee9c fix waypoint typo 2015-10-25 19:47:02 -07:00
3883483d8d Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
7605a92e35 The word several is repeated in step 11
In step 11 of the build a personal portfolio zipline, the word
“several” is repeated.
2015-10-24 23:38:55 -05:00
93681509e5 Add tests to intermediate bonfire
The bonfire only tested the camper's solution for numbers upto 29. This
commit adds tests that verify the solution for numbers upto 1000. This
should motivate the campers to create a more sound logic that will work
for more numbers.
2015-10-25 10:32:48 +08:00
565d4d1309 Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228
Conflicts:
	seed/challenges/basic-javascript.json
2015-10-24 01:39:05 -07:00
0e70f98171 Merge branch 'fcc-running-cats' of https://github.com/ptsurbeleu/FreeCodeCamp into ptsurbeleu-fcc-running-cats
Conflicts:
	seed/challenges/bootstrap.json
2015-10-24 01:33:26 -07:00
b2a19cfec5 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
711b5cb8be Merge branch 'awesomeaniruddh-fix/bonfire-test' into staging 2015-10-24 01:26:18 -07:00
6dbbf56c5c Merge branch 'fix/bonfire-test' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-fix/bonfire-test
Conflicts:
	seed/challenges/basic-bonfires.json
2015-10-24 01:25:42 -07:00