|
|
515a011448
|
one more commit before resuming on Berkeley side
|
2015-10-28 10:11:46 -07:00 |
|
|
|
21fd983bb0
|
one more commit before resuming on Berkeley side
|
2015-10-28 10:11:46 -07:00 |
|
|
|
4820ae2e36
|
everything is ready except OOP
|
2015-10-28 05:13:49 -07:00 |
|
|
|
d2ce2275b3
|
everything is ready except OOP
|
2015-10-28 05:13:49 -07:00 |
|
|
|
6a7d9e2878
|
fix some mis-mergings for basic-javascript.json
|
2015-10-28 02:39:51 -07:00 |
|
|
|
44c77d65b1
|
fix some mis-mergings for basic-javascript.json
|
2015-10-28 02:39:51 -07:00 |
|
|
|
7326996bdb
|
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 |
|
|
|
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 |
|
|
|
4011efdaed
|
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 |
|
|
|
bcc730cbee
|
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 |
|
|
|
42cb25ca2a
|
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 |
|
|
|
eef1c5136a
|
finish JavaScript and OOP sections for QA
|
2015-10-28 01:15:54 -07:00 |
|
|
|
7f5653963b
|
finish JavaScript and OOP sections for QA
|
2015-10-28 01:15:54 -07:00 |
|
|
|
419f6507d0
|
major improvements to basic-javascript.json
|
2015-10-27 23:16:08 -07:00 |
|
|
|
6c3319321a
|
major improvements to basic-javascript.json
|
2015-10-27 23:16:08 -07:00 |
|
|
|
1344283221
|
finish first pass of jQuery
|
2015-10-27 21:02: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 |
|
|
|
57f20bfcfe
|
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 |
|
|
|
c1e0cf5cc9
|
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 |
|
|
|
307fe9e4b3
|
Fixed typos in assert messages
|
2015-10-27 20:57:48 -04:00 |
|
|
|
bf00eff111
|
continue refining waypoints
|
2015-10-27 17:49:58 -07: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 |
|
|
|
6ab127d68d
|
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 |
|
|
|
3e79fdb145
|
Fix example for black background color closes #3870
|
2015-10-27 12:28:15 -04: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 |
|
|
|
faf131769d
|
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 |
|
|
|
9030bc3a20
|
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 |
|
|
|
0db2882f42
|
Fixed same issue in waypoint 4
|
2015-10-27 14:06:34 +00:00 |
|
|
|
daeaf34372
|
Fixed same issue in waypoint 4
|
2015-10-27 14:06:34 +00:00 |
|
|
|
ea632c3a79
|
Fixed additional typos.
|
2015-10-27 09:49:56 +00:00 |
|
|
|
72c52114f6
|
Fixed additional typos.
|
2015-10-27 09:49:56 +00:00 |
|
|
|
35aa781215
|
Fixed typos in in JS Waypoints. Closes #3897
|
2015-10-26 23:59:43 +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 |
|
|
|
9663b33ab5
|
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 |
|
|
|
1ddff390bf
|
Update nonprofits.json
|
2015-10-26 16:44:06 -04:00 |
|
