Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rioleo/CS147
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Jasonvdm/CS147
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 11 commits
  • 10 files changed
  • 1 contributor

Commits on Sep 26, 2012

  1. First changes

    @Jasonvdm
    Jasonvdm committed Sep 26, 2012
    Copy the full SHA
    d3727b9 View commit details

Commits on Oct 3, 2012

  1. last lecture

    @Jasonvdm
    Jasonvdm committed Oct 3, 2012
    Copy the full SHA
    cd2d240 View commit details

  2. Merge branch 'master' of https://github.com/rioleo/CS147

    @Jasonvdm
    Jasonvdm committed Oct 3, 2012
    Copy the full SHA
    441b4ff View commit details

  3. section 2

    @Jasonvdm
    Jasonvdm committed Oct 3, 2012
    Copy the full SHA
    6fbc173 View commit details

Commits on Oct 10, 2012

  1. merge conflicts

    @Jasonvdm
    Jasonvdm committed Oct 10, 2012
    Copy the full SHA
    1216aba View commit details

Commits on Oct 17, 2012

  1. all changes

    @Jasonvdm
    Jasonvdm committed Oct 17, 2012
    Copy the full SHA
    d92a126 View commit details

  2. ignoring merges

    @Jasonvdm
    Jasonvdm committed Oct 17, 2012
    Copy the full SHA
    de3351e View commit details

Commits on Oct 31, 2012

  1. past changes

    @Jasonvdm
    Jasonvdm committed Oct 31, 2012
    Copy the full SHA
    c2965bb View commit details

Commits on Nov 14, 2012

  1. merges

    @Jasonvdm
    Jasonvdm committed Nov 14, 2012
    Copy the full SHA
    a0fffef View commit details

  2. Merge branch 'master' of https://github.com/rioleo/CS147

    @Jasonvdm
    Jasonvdm committed Nov 14, 2012
    Copy the full SHA
    be58e6b View commit details

Commits on Nov 15, 2012

  1. asda

    @Jasonvdm
    Jasonvdm committed Nov 15, 2012
    Copy the full SHA
    30c8e7a View commit details
Showing with 60 additions and 15 deletions.
  1. +19 −10 week1/index.html
  2. +26 −0 week2/index.html
  3. +6 −0 week3/config.php
  4. +1 −1 week3/index.php
  5. +4 −0 week4/config.php
  6. +0 −1 week4/index.php
  7. BIN week6/lighthouse.jpg
  8. +4 −3 week6/map/index.html
  9. BIN week8/sandbox/css.zip
  10. BIN week8/sandbox/js.zip
29 changes: 19 additions & 10 deletions week1/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<title>MyApp</title>
<!DOCTYPE html>
<html>
<head>
<title>MyApp</title>
</head>

<style type="text/css">
body {
background:#eee;
font-family: Helvetica, Arial, sans-serif;
}
h2 {
font-size:22px;
font-weight:300;
color:#aaa;
}
</style>

<body>
<h2>Rio Akasaka</h2>
<div id='bio'>Crime-solver. Noir detective extraordinaire.</div>

<body>
<h2>Rio Akasaka</h2>
<div id='bio'>Crime-solver. Noir detective extraordinaire.</div>

<h3>Assignments</h3>
<ul id='assignments'>
@@ -24,6 +33,6 @@ <h3>An invisible seal</h3>
<h3>A video</h3>

<h3>Two boxes side by side</h3>

</body>

</body>
</html>
26 changes: 26 additions & 0 deletions week2/index.html
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,13 @@
</head>

<body>
<<<<<<< HEAD
<!-- This is the top bit with the image.
=======
<style>
</style> <!-- This is the top bit with the image.
>>>>>>> 8865913693746c227d84e5de89407297f0367e59
I wonder why there's no image tag here? -->
<div class="whitebit"></div>

@@ -33,6 +37,20 @@

<!-- Let's put in a timer here -->
<script type="text/javascript">
<<<<<<< HEAD
var count = 30;
var counter = setInterval(timer, 1000);
function timer() {
count = count - 1;
if (count <= 0) {
clearInterval(counter);
alert("Boom!");
document.getElementById('button').style.visibility = 'hidden';
return;
}
document.getElementById("timer").innerHTML = count + " secs";
}
=======
var count = 30;
var counter = setInterval(timer, 1000);

@@ -48,11 +66,18 @@
document.getElementById("timer").innerHTML = count + " secs";
}

>>>>>>> 8865913693746c227d84e5de89407297f0367e59
</script>

<!-- Let's put in the geolocation stuff here -->
<script type="text/javascript">
$(function () {
<<<<<<< HEAD
$("#button").click(function () {
});
});

=======
$("#button").click(function () {
getLocation();
});
@@ -72,6 +97,7 @@
}

getLocation();
>>>>>>> 8865913693746c227d84e5de89407297f0367e59
</script>
</body>
</html>
6 changes: 6 additions & 0 deletions week3/config.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?php

$link = mysql_connect('mysql-user-master.stanford.edu', 'ccs147jasonvdm', 'iegheith');
mysql_select_db('c_cs147_jasonvdm');

?>
2 changes: 1 addition & 1 deletion week3/index.php
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
</head>

<body>

<div class="banner"></div>

<table>
4 changes: 4 additions & 0 deletions week4/config.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?php
$link = mysql_connect('mysql-user-master.stanford.edu', 'ccs147jasonvdm', 'iegheith');
mysql_select_db('c_cs147_jasonvdm');
?>
1 change: 0 additions & 1 deletion week4/index.php
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
</head>

<body>

<div class="banner"></div>
<?php
include("menu.php");
Binary file added week6/lighthouse.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions week6/map/index.html
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link href='http://fonts.googleapis.com/css?family=Cherry+Swash' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="jquery.mobile-1.2.0.css" />
<link rel="stylesheet" href="style.css" />
<link rel="apple-touch-icon" href="appicon.png" />
@@ -62,8 +62,9 @@ <h1>Map!</h1>
geocoder.geocode({'address': $("#startingpoint").val() }, function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {

// Add debug code here

console.log("This is the address location entered: ")
debug = results;
console.log(debug);



Binary file added week8/sandbox/css.zip
View file
Binary file not shown.
Binary file added week8/sandbox/js.zip
View file
Binary file not shown.