From 78ecf9c0609d66db6856aa4857ed863fa05e809c Mon Sep 17 00:00:00 2001
From: Westin Lohne <westin@cmu.edu>
Date: Mon, 2 Dec 2013 20:07:59 -0500
Subject: [PATCH 01/11] visually aligned bubble with event text

the bubble/line is now more better sligned with event text
---
 index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/index.html b/index.html
index 73706cc..efdca7c 100644
--- a/index.html
+++ b/index.html
@@ -72,7 +72,6 @@ h1{
 	color: rgba(255,255,255,.5);
 }
 #life .event .time{
-	vertical-align: middle;
 	display: inline-block;
 	overflow: hidden;
 	height: 0;

From 45c8bde4fc27836094ff6afd595a0d66525b88cc Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Tue, 3 Dec 2013 23:59:37 +0800
Subject: [PATCH 02/11] Disable telephone number linking in Mobile Safari

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index efdca7c..441e758 100644
--- a/index.html
+++ b/index.html
@@ -2,6 +2,7 @@
 <meta charset="UTF-8">
 <title>Life</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="format-detection" content="telephone=no">
 <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300">
 <style>
 *{

From 8ca0277d20b1d2d9b9ee51c789caa252e93edc4c Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 00:06:11 +0800
Subject: [PATCH 03/11] Add link to other Lives

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 8728a11..cbfa6d2 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,11 @@ Datetime "syntax"
 - `~2005` - event that happen around the time in that year
 - `2005-~` - event that happen from that year and beyond (now).
 
+Other people's Lives
+--------------------
+
+Here's [a compilation of Lives from the people who has forked Life](https://github.com/cheeaun/life/wiki/Lives).
+
 License
 -------
 

From 6b700c2a7998c49f52d81a8f88a1626317525109 Mon Sep 17 00:00:00 2001
From: Norton Wang <nortantivirus@gmail.com>
Date: Tue, 3 Dec 2013 11:23:11 -0500
Subject: [PATCH 04/11] fix minor syntax errors

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 441e758..68c1857 100644
--- a/index.html
+++ b/index.html
@@ -223,7 +223,7 @@ h1{
 				width = daysDiff*dayLength;
 			} else {
 				if (startDate){
-					width = dayLength
+					width = dayLength;
 				} else if (startMonth){
 					width = monthLength;
 				} else {
@@ -242,7 +242,7 @@ h1{
 			var nowYear = new Date().getFullYear();
 			var dayLength = life.yearLength/12/30;
 
-			html = '';
+			var html = '';
 			var days = 0;
 
 			for (var y=firstYear, age = 0; y<=nowYear+1; y++, age++){

From e8f102c6f14cbb8f5e44e8dccdde99635e28e8f9 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 22:45:33 +0800
Subject: [PATCH 05/11] Make the left position number fixed to 2 digits

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 68c1857..b23767f 100644
--- a/index.html
+++ b/index.html
@@ -246,7 +246,7 @@ h1{
 			var days = 0;
 
 			for (var y=firstYear, age = 0; y<=nowYear+1; y++, age++){
-				html += '<section class="year" style="left: ' + (days*dayLength) + 'px">' +
+				html += '<section class="year" style="left: ' + (days*dayLength).toFixed(2) + 'px">' +
 					y + ' (' + age + ')' +
 					'</section>';
 				days += (y % 4 == 0) ? 366 : 365;

From 517763489c1173b3066fff533f7640e1b5ed8886 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 23:05:34 +0800
Subject: [PATCH 06/11] A more flexible year axis

---
 index.html | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index b23767f..1b2dc97 100644
--- a/index.html
+++ b/index.html
@@ -234,23 +234,35 @@ h1{
 			return '<div class="event" style="margin-left: ' + offset.toFixed(2) + 'px"><div class="time" style="width: ' + width.toFixed(2) + 'px"></div><b>' + d.time.title + '</b> ' + d.text + '&nbsp;&nbsp;</div>';
 			return '';
 		},
-		render: function(title, data){
-			document.title = title;
-			life.$title.innerHTML = title;
-
-			var firstYear = life.firstYear = data[0].time.startYear;
-			var nowYear = new Date().getFullYear();
+		renderYears: function(firstYear, lastYear){
 			var dayLength = life.yearLength/12/30;
-
 			var html = '';
 			var days = 0;
-
-			for (var y=firstYear, age = 0; y<=nowYear+1; y++, age++){
+			for (var y=firstYear, age = 0; y<=lastYear+1; y++, age++){
 				html += '<section class="year" style="left: ' + (days*dayLength).toFixed(2) + 'px">' +
 					y + ' (' + age + ')' +
 					'</section>';
 				days += (y % 4 == 0) ? 366 : 365;
 			}
+			return html;
+		},
+		render: function(title, data){
+			document.title = title;
+			life.$title.innerHTML = title;
+
+			// Get the first and last year for the year axis
+			var firstYear = new Date().getFullYear();
+			var lastYear = firstYear;
+			data.forEach(function(d){
+				var time = d.time;
+				var startYear = time.startYear;
+				var endYear = time.endYear;
+				if (startYear && startYear < firstYear) firstYear = startYear;
+				if (endYear && endYear > lastYear) lastYear = endYear;
+			});
+			life.firstYear = firstYear;
+
+			html = life.renderYears(firstYear, lastYear);
 			data.forEach(function(d){
 				html += life.renderEvent(d);
 			});

From 80ade83195ec737498e7d5d9a0d1b0405ea6ec02 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 23:21:23 +0800
Subject: [PATCH 07/11] Add hideAge option

---
 config.example.json |  3 ++-
 index.html          | 33 +++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/config.example.json b/config.example.json
index 2f358cc..83ce44a 100644
--- a/config.example.json
+++ b/config.example.json
@@ -1,4 +1,5 @@
 {
 	"customStylesheetURL": null,
-	"yearLength": 120
+	"yearLength": 120,
+	"hideAge": false
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 1b2dc97..95a1fcc 100644
--- a/index.html
+++ b/index.html
@@ -97,11 +97,27 @@ h1{
 	var life = {
 		$title: document.getElementById('title'),
 		$el: document.getElementById('life'),
-		yearLength: 120, // 120px per year
+		utils: {
+			extend: function(object){
+				var args = Array.prototype.slice.call(arguments, 1);
+				for (var i=0, source; source=args[i]; i++){
+					if (!source) continue;
+					for (var property in source){
+						object[property] = source[property];
+					}
+				}
+				return object;
+			}
+		},
+		config: {
+			yearLength: 120, // 120px per year
+			hideAge: false, // Hide age from year axis
+			customStylesheetURL: null // Custom stylesheet
+		},
 		start: function(){
 			life.loadConfig(function(config){
-				if (config.yearLength) life.yearLength = config.yearLength;
-				if (config.customStylesheetURL) life.injectStylesheet(config.customStylesheetURL);
+				life.config = life.utils.extend(life.config, config)
+				if (life.config.customStylesheetURL) life.injectStylesheet(life.config.customStylesheetURL);
 
 				life.fetch(function(response){
 					var data = life.parse(response);
@@ -193,7 +209,7 @@ h1{
 		firstYear: null,
 		renderEvent: function(d){
 			var firstYear = life.firstYear;
-			var yearLength = life.yearLength;
+			var yearLength = life.config.yearLength;
 			var monthLength = yearLength/12;
 			var dayLength = monthLength/30;
 
@@ -235,13 +251,14 @@ h1{
 			return '';
 		},
 		renderYears: function(firstYear, lastYear){
-			var dayLength = life.yearLength/12/30;
+			var dayLength = life.config.yearLength/12/30;
 			var html = '';
 			var days = 0;
+			var hideAge = life.config.hideAge;
 			for (var y=firstYear, age = 0; y<=lastYear+1; y++, age++){
-				html += '<section class="year" style="left: ' + (days*dayLength).toFixed(2) + 'px">' +
-					y + ' (' + age + ')' +
-					'</section>';
+				html += '<section class="year" style="left: ' + (days*dayLength).toFixed(2) + 'px">'
+					+ y + (hideAge ? '' : (' (' + age + ')'))
+					+ '</section>';
 				days += (y % 4 == 0) ? 366 : 365;
 			}
 			return html;

From 9426ff50fd1a686e0af26e70ee6f53a94e36e6a8 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 23:26:38 +0800
Subject: [PATCH 08/11] Add doc on how to run on a local server

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cbfa6d2..3c89ff8 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,9 @@ How to setup your own *Life*
 2. `git checkout -b gh-pages` (or any branch name you like)
 3. Make a copy of `life.example.md`, rename it to `life.md`.
 4. Add your life events into `life.md`.
-5. Commit `life.md` (not in `master` branch).
-6. `git push origin gh-pages` and publish to [GitHub Pages](http://pages.github.com/).
+5. Preview it on a local server. Use [`python -m SimpleHTTPServer`](http://docs.python.org/2/library/simplehttpserver.html) or [`http-server`](https://github.com/nodeapps/http-server).
+6. Commit `life.md` (not in `master` branch).
+7. `git push origin gh-pages` and publish to [GitHub Pages](http://pages.github.com/).
 
 How to upgrade your *Life*
 --------------------------

From a89c29f8ef9a438afcc8aa7fa4c86c04de4bc91f Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 23:40:25 +0800
Subject: [PATCH 09/11] Add var

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 95a1fcc..4e62bff 100644
--- a/index.html
+++ b/index.html
@@ -279,7 +279,7 @@ h1{
 			});
 			life.firstYear = firstYear;
 
-			html = life.renderYears(firstYear, lastYear);
+			var html = life.renderYears(firstYear, lastYear);
 			data.forEach(function(d){
 				html += life.renderEvent(d);
 			});

From 630ff09db2e872ffeccf34173433408f0c5d88de Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 23:42:40 +0800
Subject: [PATCH 10/11] Make it multiple lines

---
 index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 4e62bff..76b7ffb 100644
--- a/index.html
+++ b/index.html
@@ -247,7 +247,10 @@ h1{
 				}
 			}
 
-			return '<div class="event" style="margin-left: ' + offset.toFixed(2) + 'px"><div class="time" style="width: ' + width.toFixed(2) + 'px"></div><b>' + d.time.title + '</b> ' + d.text + '&nbsp;&nbsp;</div>';
+			return '<div class="event" style="margin-left: ' + offset.toFixed(2) + 'px">'
+				+ '<div class="time" style="width: ' + width.toFixed(2) + 'px"></div>'
+				+ '<b>' + d.time.title + '</b> ' + d.text + '&nbsp;&nbsp;'
+				+ '</div>';
 			return '';
 		},
 		renderYears: function(firstYear, lastYear){

From c482110f0b47342e9931f90d2b345c09f309ab77 Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 4 Dec 2013 23:43:36 +0800
Subject: [PATCH 11/11] Mising semicolons

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 76b7ffb..ffaec38 100644
--- a/index.html
+++ b/index.html
@@ -116,7 +116,7 @@ h1{
 		},
 		start: function(){
 			life.loadConfig(function(config){
-				life.config = life.utils.extend(life.config, config)
+				life.config = life.utils.extend(life.config, config);
 				if (life.config.customStylesheetURL) life.injectStylesheet(life.config.customStylesheetURL);
 
 				life.fetch(function(response){
@@ -288,7 +288,7 @@ h1{
 			});
 			life.$el.innerHTML = html;
 		}
-	}
+	};
 
 	life.start();
 })();