NUKnightLab · Behruz87 · Apr 21, 2014 · Aug 5, 2014 · Aug 5, 2014 · Aug 14, 2014
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,5 @@ source/gfx/Sprites/
 /node_modules
 *.pyc
 codekit-config.json
-build/website
+build
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,9 +1,30 @@
-2.35.3 (pending)
+2.35.6 (2015-03-25)
 ------
+Restore original animation/easing (revert pull #681)
+
+2.35.5 (2015-02-26)
+------
+#672,679,681,683 a series of presentation/performance tweaks from @acdha
+Fix auto-linking regression
+
+2.35.4 (2015-02-17)
+------
+Fix Stamen map tile URL bug
+
+
+2.35.3 (2015-02-17)
+------
+#673 Update Taiwanese locale
+#689 Update Thai locale
 #693 Update Polish locale
+#705 Frisian localization
+#722 Support 'youtubeTheme' config option
 #732 Updated German Translations
 #733 Move "Swipe to Navigate" to I18N. Now we need translations for 55 languages!
-#722 Support 'youtubeTheme' config option
+#744 Hindi localization
+#745 Update Icelandic date formats
+#749 Irish localization
+#762 Belarusian localization
 
 2.35.2 (2014-11-24)
 ------

diff --git a/README.markdown b/README.markdown
@@ -1,3 +1,19 @@
+# This Version of Timeline is no longer under development
+
+Therefore, GitHub issues and pull requests have been disabled. 
+
+Knight Lab has created a new version at https://github.com/NUKnightLab/TimelineJS3 . The new library should work with existing Google Spreadsheets, but not existing TimelineJS JSON files. The new version of TimelineJS requires a new JSON format, and there is no direct conversion tool, although it should not be too complicated to manually or programatically convert an old JSON file.
+
+Knight Lab will continue to serve this version of Timeline from
+
+* https://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js
+* https://cdn.knightlab.com/libs/timeline/latest/js/timeline.js
+* https://cdn.knightlab.com/libs/timeline/latest/css/timeline.css
+
+However, no future development on this line of code is planned.
+
+----
+
 **Table of Contents**
 
 - [TimelineJS](#timelinejs)
@@ -24,8 +40,8 @@
 	- [Media](#media)
 	- [Best practices](#best-practices)
 	- [License](#license)
-	
-# TimelineJS 
+
+# TimelineJS
 ## Document history with TimelineJS
 
 There are lots of timeline tools on the web but they are almost all either
@@ -39,7 +55,7 @@ in the future.
 
 Creating one is as easy as filling in a Google spreadsheet or as detailed as
 JSON.
- 
+
 ## Add it to your site
 
 ### Using Inline (*easiest*)
@@ -65,7 +81,7 @@ Place the embed code where you want the timeline to show in the `<body>` of your
 			js:					'path_to_js/timeline-min.js'	//OPTIONAL PATH TO JS
 		}
 	</script>
-	<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
+	<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
 ```
 ### Using a method (*advanced*)
 You could also initialize a new timeline using the `createStoryJS` method after `storyjs-embed.js` has been loaded
@@ -86,7 +102,7 @@ Here's a simple example:
 		<!-- jQuery -->
 		<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 		<!-- BEGIN TimelineJS -->
-		<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
+		<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
 		<script>
 			$(document).ready(function() {
 				createStoryJS({
@@ -100,7 +116,7 @@ Here's a simple example:
 		</script>
 		<!-- END TimelineJS -->
 	</head>
-	<body>	
+	<body>
 		<div id="my-timeline"></div>
 	</body>
 ```
@@ -112,18 +128,16 @@ If for some reason you need more fine-grained control over your timeline, load t
 
 ```html
 <!-- always load the CSS -->
-<link rel="stylesheet" type="text/css" href="http://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
+<link rel="stylesheet" type="text/css" href="https://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
 <!-- and then one of either -->
-<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/timeline.js"></script>
+<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/timeline.js"></script>
 <!-- or -->
-<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
+<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
 <!-- but no need for both -->
 ```
 
-If you need to use the files on an HTTPS server, you can change the beginning of the url from `http://cdn.knightlab.com/libs/timeline/` to `https://s3.amazonaws.com/cdn.knightlab.com/libs/timeline/` 
-
 If you need to serve copies of the files from your own server, use the entire contents of the ["/build/" directory](https://github.com/NUKnightLab/TimelineJS/tree/master/build) of our GitHub repository. If you use a local copy of `story-embed.js` it should automatically load the other Timeline resources from your server.
-	
+
 ## Config Options
 Here are some of the options you can set in the config.
 
@@ -159,6 +173,7 @@ Languages available:
 * `ar` *Arabic*
 * `hy` *Armenian*
 * `eu` *Basque*
+* `be` *Belarusian*
 * `bg` *Bulgarian*
 * `ca` *Catalan*
 * `zh-cn` *Chinese*
@@ -174,14 +189,17 @@ Languages available:
 * `fa` *Farsi*
 * `fi` *Finnish*
 * `fr` *French*
+* `fy` *Frisian*
 * `gl` *Galician*
 * `ka` *Georgian*
 * `de` *German / Deutsch*
 * `el` *Greek*
 * `he` *Hebrew*
+* `hi` *Hindi*
 * `hu` *Hungarian*
 * `is` *Icelandic*
 * `id` *Indonesian*
+* `ga` *Irish*
 * `it` *Italian*
 * `ja` *Japanese*
 * `ko` *Korean*
@@ -194,6 +212,7 @@ Languages available:
 * `pl` *Polish*
 * `pt` *Portuguese*
 * `pt-br` *Portuguese (Brazilian)*
+* `ro` *Romanian*
 * `rm` *Romansh*
 * `ru` *Russian*
 * `sr-cy` *Serbian - Cyrillic*
@@ -207,40 +226,41 @@ Languages available:
 * `ta` *Tamil*
 * `zh-tw` *Taiwanese*
 * `te` *Telugu*
+* `th` *Thai*
 * `tr` *Turkish*
 * `uk` *Ukrainian*
 
 
 
-Help us add more. Grab a copy of a language file and replace it with your language [Example language file](https://github.com/VeriteCo/StoryJS-Core/blob/master/Language/locale/en.js) and find your language's [two letter code here](http://spreadsheets.google.com/pub?key=p9pdwsai2hDMsLkXsoM05KQ&gid=1)
+Help us add more. Grab a copy of a language file and replace it with your language [Example language file](https://github.com/NUKnightLab/TimelineJS/blob/master/source/js/Core/Language/locale/en.js) and find your language's [two letter code here](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
 
-###Start at End 
+###Start at End
 `start_at_end`
 set to true to start the timeline on the last date.
 *default is false*
 
-###Start at Slide 
+###Start at Slide
 `start_at_slide`
 You can tell TimelineJS to start at a specific slide number
 *default is 0*
 
 ###Start Zoom Adjust
 `start_zoom_adjust`
-This will tweak the default zoom level. Equivilent to pressing the zoom in or zoom out button the specified number of times. Negative numbers zoom out.
+This will tweak the default zoom level. Equivalent to pressing the zoom in or zoom out button the specified number of times. Negative numbers zoom out.
 *default is 0*
 
-###Hash Bookmark 
+###Hash Bookmark
 `hash_bookmark`
 set to true to allow bookmarking slides using the hash tag
 *default is false*
 
-###Debug 
+###Debug
 `debug`
 Will log events etc to the console.
 *default is false*
 
 
-###Map Style Types 
+###Map Style Types
 Due to recent changes to the Google Maps API, you need a [API Key](https://developers.google.com/places/documentation/#Authentication) in order to use custom map types.
 `gmap_key:`
 *required in order to use maptype*
@@ -252,7 +272,7 @@ Due to recent changes to the Google Maps API, you need a [API Key](https://devel
 	* `toner-labels`
 	* `watercolor`
 	* `sterrain`
-		
+
 * Google Maps
 	* `ROADMAP`
 	* `TERRAIN`
@@ -262,7 +282,7 @@ Due to recent changes to the Google Maps API, you need a [API Key](https://devel
 * OpenStreetMap
 	- `osm`
 
-###Font Options 
+###Font Options
 `font:`
 * `AbrilFatface-Average` *Abril Fatface & Average*
 * `Arvo-PTSans` *Arvo & PT Sans*
@@ -293,7 +313,7 @@ Due to recent changes to the Google Maps API, you need a [API Key](https://devel
 JSON is the native data format for TimelineJS.
 
 Remember, JSON is picky. A misplaced comma or quotation mark can
-prevent the timeline from loading properly. 
+prevent the timeline from loading properly.
 
 Here is the full model:
 ```javascript
@@ -311,8 +331,8 @@ Here is the full model:
 		},
 		"date": [
 			{
-				"startDate":"2011,12,10",
-				"endDate":"2011,12,11",
+				"startDate":"2011,12,10,07,02,10",
+				"endDate":"2011,12,11,08,11",
 				"headline":"Headline Goes Here",
 				"text":"<p>Body text goes here, some HTML is OK</p>",
 				"tag":"This is Optional",
@@ -333,7 +353,7 @@ Here is the full model:
 				"text":"<p>Body text goes here, some HTML is OK</p>",
 				"tag":"This is Optional"
 			}
-			
+
 		]
 	}
 }
@@ -381,9 +401,9 @@ storyjs_jsonp_data = {
 				"headline":"Headline Goes Here",
 				"tag":"This is Optional"
 			}
-			
+
 		]
-		
+
 	}
 }
 ```
@@ -402,15 +422,15 @@ using Google Docs:
   1. Make the spreadsheet public:   
 	Google Docs are automatically set to private but the spreadsheet must be
 	public.
-	
+
 	Click the blue “Share” button on the top right-hand corner. In the “Share
 	settings” window, you’ll see the private setting of the spreadsheet: click
 	“Change...”. In the Visibility options window, choose “Public on the Web” and
 	save.
 
   2. Publish to the Web  
 	Under the File menu, select “Publish to the Web.”
-	
+
 	In the next window, check the box next to “Automatically republish when
 	changes are made.” Uncheck all other boxes. Click “start publishing.” This
 	will give you the URL to embed in your HTML file.
@@ -421,7 +441,7 @@ using Google Docs:
 	etc.), then paste it into the timeline’s HTML file (see [Add it to your site](#add-it-to-your-site) )
 
 
-	
+
 ### Storify:
 
 Support for Storify is still in its early stages. It works though. Just paste a link to the storify story as the source.
@@ -444,10 +464,8 @@ Tips and tricks to best utilize TimelineJS
   2. Pick stories that have a strong chronological narrative. It does not work well for stories that need to jump around in the timeline.
   3. Include events that build up to major occurrences, not just the major events.
   4. Don't overwhelm the user. A timeline with hundreds of events is probably not the best use of the format.
-  
+
 ## License
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
diff --git a/build/css/blank.gif b/build/css/blank.gif
diff --git a/build/css/fancybox_sprite.png b/build/css/fancybox_sprite.png
diff --git a/build/css/fancybox_sprite@2x.png b/build/css/fancybox_sprite@2x.png
diff --git a/build/css/loading.gif b/build/css/loading.gif
diff --git a/build/css/loading@2x.gif b/build/css/loading@2x.gif
diff --git a/build/css/themes/dark.css b/build/css/themes/dark.css
diff --git a/build/css/themes/font/AbrilFatface-Average.css b/build/css/themes/font/AbrilFatface-Average.css
diff --git a/build/css/themes/font/Arvo-PTSans.css b/build/css/themes/font/Arvo-PTSans.css
diff --git a/build/css/themes/font/Bevan-PotanoSans.css b/build/css/themes/font/Bevan-PotanoSans.css
diff --git a/build/css/themes/font/BreeSerif-OpenSans.css b/build/css/themes/font/BreeSerif-OpenSans.css