Merge branch 'release/0.2.0'

fabrice · fabrice · commit c112e153bfdb · 2014-11-18T10:06:10.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 
 # Changelog
 
+__v0.2.0__
+
+  - update polymer to 0.5.x
+
+__v0.1.1__
+
+  - FIX dateclick event for firefox
+  
 __v0.1.0__
 
   - update polymer to 0.4.2
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "zdk-calendar",
-	"version": "0.1.1",
+	"version": "0.2.0",
 	"authors": [
 		"Fabrice <fabrice.lecoz@zedesk.net>"
 	],
@@ -22,6 +22,6 @@
 	],
 	"dependencies": {
 		"momentjs": "2.8.3",
-		"polymer": "Polymer/polymer#0.4.2"
+		"polymer": "Polymer/polymer#~0.5.1"
 	}
 }
diff --git a/index.htm b/index.htm
@@ -5,7 +5,7 @@
 	<title>calendar test page</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link href="/css/font.css" rel="stylesheet">
-	<script src="../platform/platform.js"></script>
+	<script src="../webcomponentsjs/webcomponents.min.js"></script>
 	<link rel="import" href="zdk-calendar.html">
 
 	<style>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zdk-calendar",`
`3`		`- "version": "0.1.1",`
	`3`	`+ "version": "0.2.0",`
`4`	`4`	`"authors": [`
`5`	`5`	`"Fabrice <fabrice.lecoz@zedesk.net>"`
`6`	`6`	`],`
`@@ -22,6 +22,6 @@`
`22`	`22`	`],`
`23`	`23`	`"dependencies": {`
`24`	`24`	`"momentjs": "2.8.3",`
`25`		`- "polymer": "Polymer/polymer#0.4.2"`
	`25`	`+ "polymer": "Polymer/polymer#~0.5.1"`
`26`	`26`	`}`
`27`	`27`	`}`