From 05cddfe4ccd5204b31ea453dc153c3da93762e83 Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Fri, 10 Jul 2015 09:19:47 -0500 Subject: [PATCH 1/6] fix href --- website/templates/_overview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/_overview.html b/website/templates/_overview.html index 190a865..e26d959 100644 --- a/website/templates/_overview.html +++ b/website/templates/_overview.html @@ -5,7 +5,7 @@

TimelineJS

Beautifully crafted timelines that are easy and intuitive to use.

Make a timeline now -

New! Try the TimelineJS 3 beta

+

New! Try the TimelineJS 3 beta

From e0354a79bee159917b583e70cde9307014fa3a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20=C5=BDurek?= Date: Sat, 18 Jul 2015 16:32:12 +0200 Subject: [PATCH 2/6] We want seconds instead of th/st/nd/rd for day --- source/js/Core/Language/locale/cz.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/js/Core/Language/locale/cz.js b/source/js/Core/Language/locale/cz.js index 569167d..40f922d 100644 --- a/source/js/Core/Language/locale/cz.js +++ b/source/js/Core/Language/locale/cz.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d. mmm ", full: "d. mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd. mmmm yyyy''", full_long: "dddd d. mmm yyyy 'v' HH:MM", @@ -34,4 +34,4 @@ if(typeof VMM != 'undefined') { loading: "Nahrávám", swipe_nav: "Swipe to Navigate" } } -} \ No newline at end of file +} From a631ce62c4ca7a23c1ceb8a658c414737a88e8c9 Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Mon, 20 Jul 2015 09:22:00 -0500 Subject: [PATCH 3/6] fix widespread error in date format as in #808 --- source/js/Core/Language/locale/af.js | 2 +- source/js/Core/Language/locale/ar.js | 2 +- source/js/Core/Language/locale/bg.js | 2 +- source/js/Core/Language/locale/ca.js | 2 +- source/js/Core/Language/locale/de.js | 2 +- source/js/Core/Language/locale/el.js | 2 +- source/js/Core/Language/locale/eo.js | 2 +- source/js/Core/Language/locale/es.js | 2 +- source/js/Core/Language/locale/eu.js | 2 +- source/js/Core/Language/locale/fi.js | 2 +- source/js/Core/Language/locale/fo.js | 2 +- source/js/Core/Language/locale/fr.js | 2 +- source/js/Core/Language/locale/ga.js | 2 +- source/js/Core/Language/locale/gl.js | 2 +- source/js/Core/Language/locale/hu.js | 2 +- source/js/Core/Language/locale/hy.js | 2 +- source/js/Core/Language/locale/id.js | 2 +- source/js/Core/Language/locale/is.js | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/source/js/Core/Language/locale/af.js b/source/js/Core/Language/locale/af.js index be00124..731729d 100644 --- a/source/js/Core/Language/locale/af.js +++ b/source/js/Core/Language/locale/af.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "d mmm',' yyyy 'om' HH:MM", diff --git a/source/js/Core/Language/locale/ar.js b/source/js/Core/Language/locale/ar.js index d9845e9..1cf93d8 100644 --- a/source/js/Core/Language/locale/ar.js +++ b/source/js/Core/Language/locale/ar.js @@ -19,7 +19,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "mmm d", full: "mmmm d',' yyyy", - time_short: "h:MM:SS TT", + time_short: "h:MM:ss TT", time_no_seconds_short: "h:MM TT", time_no_seconds_small_date: "h:MM TT'
'mmmm d',' yyyy''", full_long: "mmm d',' yyyy 'at' hh:MM TT", diff --git a/source/js/Core/Language/locale/bg.js b/source/js/Core/Language/locale/bg.js index ea1f151..0603ef6 100644 --- a/source/js/Core/Language/locale/bg.js +++ b/source/js/Core/Language/locale/bg.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "h:MM:SS TT", + time_short: "h:MM:ss TT", time_no_seconds_short: "h:MM TT", time_no_seconds_small_date: "h:MM TT'
'd mmmm yyyy''", full_long: "d mmm yyyy 'at' h:MM TT", diff --git a/source/js/Core/Language/locale/ca.js b/source/js/Core/Language/locale/ca.js index c309bc0..b3c68fd 100644 --- a/source/js/Core/Language/locale/ca.js +++ b/source/js/Core/Language/locale/ca.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "''d mmmm yyyy'' HH:MM", full_long: "dddd',' d mmm yyyy HH:MM", diff --git a/source/js/Core/Language/locale/de.js b/source/js/Core/Language/locale/de.js index 7793671..086f528 100644 --- a/source/js/Core/Language/locale/de.js +++ b/source/js/Core/Language/locale/de.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d. mmm", full: "d. mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd. mmmm yyyy''", full_long: "dddd',' d. mmm yyyy 'um' HH:MM", diff --git a/source/js/Core/Language/locale/el.js b/source/js/Core/Language/locale/el.js index 156c4c7..a020d1e 100644 --- a/source/js/Core/Language/locale/el.js +++ b/source/js/Core/Language/locale/el.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "mmm d", full: "mmmm d',' yyyy", - time_short: "h:MM:SS TT", + time_short: "h:MM:ss TT", time_no_seconds_short: "h:MM TT", time_no_seconds_small_date: "h:MM TT'
'mmmm d',' yyyy''", full_long: "mmm d',' yyyy 'at' h:MM TT", diff --git a/source/js/Core/Language/locale/eo.js b/source/js/Core/Language/locale/eo.js index f368a75..b88dcda 100644 --- a/source/js/Core/Language/locale/eo.js +++ b/source/js/Core/Language/locale/eo.js @@ -21,7 +21,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "dddd',' d mmm yyyy 'ĉe' HH:MM", diff --git a/source/js/Core/Language/locale/es.js b/source/js/Core/Language/locale/es.js index 3a81b8f..21acf61 100644 --- a/source/js/Core/Language/locale/es.js +++ b/source/js/Core/Language/locale/es.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "''d mmmm yyyy'' HH:MM", full_long: "dddd',' d mmm yyyy HH:MM", diff --git a/source/js/Core/Language/locale/eu.js b/source/js/Core/Language/locale/eu.js index 3347d41..c1cd4aa 100644 --- a/source/js/Core/Language/locale/eu.js +++ b/source/js/Core/Language/locale/eu.js @@ -18,7 +18,7 @@ if (typeof VMM != 'undefined') { month: "yyyy'(e)ko' mmmm", full_short: "mmm'-'d", full: "yyyy'(e)ko' mmmm'k' d", - time_short: "h:MM:SS TT", + time_short: "h:MM:ss TT", time_no_seconds_short: "h:MM TT", time_no_seconds_small_date: "h:MM TT'
'yyyy'-'mmm'-'d'", full_long: "yyyy'(e)ko' mmmm'ren' d'(e)an,' hh:MM TT'(r)etan'", diff --git a/source/js/Core/Language/locale/fi.js b/source/js/Core/Language/locale/fi.js index 2d2dc3d..ec2346c 100644 --- a/source/js/Core/Language/locale/fi.js +++ b/source/js/Core/Language/locale/fi.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d. mmm", full: "d. mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd. mmmm yyyy''", full_long: "mmm d yyyy 'klo' HH:MM", diff --git a/source/js/Core/Language/locale/fo.js b/source/js/Core/Language/locale/fo.js index 0763ec3..9daa632 100644 --- a/source/js/Core/Language/locale/fo.js +++ b/source/js/Core/Language/locale/fo.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d'.' mmm", full: "d'.' mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd'.' mmmm yyyy''", full_long: "d'.' mmmm yyyy 'klokkan' HH:MM", diff --git a/source/js/Core/Language/locale/fr.js b/source/js/Core/Language/locale/fr.js index 15e0afd..afec720 100644 --- a/source/js/Core/Language/locale/fr.js +++ b/source/js/Core/Language/locale/fr.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "dddd',' d mmm yyyy 'à' HH:MM", diff --git a/source/js/Core/Language/locale/ga.js b/source/js/Core/Language/locale/ga.js index 09bc3f4..47c2781 100644 --- a/source/js/Core/Language/locale/ga.js +++ b/source/js/Core/Language/locale/ga.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "''d mmmm yyyy'' HH:MM", full_long: "dddd',' d mmm yyyy HH:MM", diff --git a/source/js/Core/Language/locale/gl.js b/source/js/Core/Language/locale/gl.js index 528cae6..63d54cf 100644 --- a/source/js/Core/Language/locale/gl.js +++ b/source/js/Core/Language/locale/gl.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "dddd',' d mmm yyyy 'um' HH:MM", diff --git a/source/js/Core/Language/locale/hu.js b/source/js/Core/Language/locale/hu.js index 6a17503..46f022d 100644 --- a/source/js/Core/Language/locale/hu.js +++ b/source/js/Core/Language/locale/hu.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "yyyy. mmmm", full_short: "mmm d.", full: "yyyy. mmmm d.", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM '
'yyyy. mmmm d.''", full_long: "yyyy. mmm d.',' HH:MM", diff --git a/source/js/Core/Language/locale/hy.js b/source/js/Core/Language/locale/hy.js index 71e1cc1..8f1f142 100644 --- a/source/js/Core/Language/locale/hy.js +++ b/source/js/Core/Language/locale/hy.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm',' yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "H:MM", time_no_seconds_small_date: "H:MM'
'd mmmm',' yyyy''", full_long: "d mmm',' yyyy 'at' H:MM", diff --git a/source/js/Core/Language/locale/id.js b/source/js/Core/Language/locale/id.js index 7755032..5244871 100644 --- a/source/js/Core/Language/locale/id.js +++ b/source/js/Core/Language/locale/id.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d mmm", full: "d mmmm yyyy", - time_short: "HH:MM:SS", + time_short: "HH:MM:ss", time_no_seconds_short: "HH:MM", time_no_seconds_small_date: "HH:MM'
'd mmmm yyyy''", full_long: "dddd',' d mmm yyyy 'pukul' HH:MM", diff --git a/source/js/Core/Language/locale/is.js b/source/js/Core/Language/locale/is.js index 08e7b22..57ba7c9 100644 --- a/source/js/Core/Language/locale/is.js +++ b/source/js/Core/Language/locale/is.js @@ -18,7 +18,7 @@ if(typeof VMM != 'undefined') { month: "mmmm yyyy", full_short: "d'.' mmm", full: "d'.' mmmm yyyy", - time_short: "h:MM:SS TT", + time_short: "h:MM:ss TT", time_no_seconds_short: "hh:MM TT", time_no_seconds_small_date: "hh:MM TT'
'd'.' mmmm yyyy''", full_long: "dddd',' d'.' mmm yyyy 'kl.' hh:MM TT", From 4bc96c9635c77d3b114382b75d101473f7628718 Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Mon, 20 Jul 2015 09:22:48 -0500 Subject: [PATCH 4/6] commit to https for cdn.knightlab.com --- source/embed/index.html | 2 +- website/templates/_demo.html | 2 +- website/templates/_make.html | 2 +- website/templates/base.html | 8 ++++---- website/templates/examples/houston/index.html | 2 +- website/templates/examples/republican/index.html | 2 +- website/templates/examples/shit-people-say/index.html | 2 +- website/templates/examples/user-interface/index.html | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/embed/index.html b/source/embed/index.html index 3771898..0b6628b 100644 --- a/source/embed/index.html +++ b/source/embed/index.html @@ -42,7 +42,7 @@ if (trim_point > 0) { var embed_path = window.location.href.substring(0,trim_point); // supports https access via https://s3.amazonaws.com/cdn.knightlab.com/libs/timeline/latest/embed/index.html } else { - var embed_path = "//cdn.knightlab.com/libs/timeline/latest/"; + var embed_path = "https://cdn.knightlab.com/libs/timeline/latest/"; } diff --git a/website/templates/_demo.html b/website/templates/_demo.html index 7d14f20..fbed749 100644 --- a/website/templates/_demo.html +++ b/website/templates/_demo.html @@ -14,7 +14,7 @@ font: 'NewsCycle-Merriweather', }; - + diff --git a/website/templates/_make.html b/website/templates/_make.html index 7c760b7..66b1dbb 100644 --- a/website/templates/_make.html +++ b/website/templates/_make.html @@ -233,7 +233,7 @@

Embed the code into your website

Grab the embed code and paste it on your site where you want your TimelineJS to appear (just like a YouTube video).

-

+

Preview Link to Preview

diff --git a/website/templates/base.html b/website/templates/base.html index 3253ed1..ec08f90 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -26,9 +26,9 @@ meta name="viewport" content="initial-scale=1,width=device-width" someone needs to go through Blueline and fix the small viewport CSS details before we can turn this on. --> - + - + @@ -138,13 +138,13 @@ {% block scripts %} - + - + diff --git a/website/templates/examples/houston/index.html b/website/templates/examples/houston/index.html index dd97c42..35b5cae 100644 --- a/website/templates/examples/houston/index.html +++ b/website/templates/examples/houston/index.html @@ -41,7 +41,7 @@ font: 'Bevan-PotanoSans' } - + diff --git a/website/templates/examples/republican/index.html b/website/templates/examples/republican/index.html index 11d4cf7..a28a115 100644 --- a/website/templates/examples/republican/index.html +++ b/website/templates/examples/republican/index.html @@ -41,7 +41,7 @@ font: 'PT' } - + diff --git a/website/templates/examples/shit-people-say/index.html b/website/templates/examples/shit-people-say/index.html index 214f099..d483d53 100644 --- a/website/templates/examples/shit-people-say/index.html +++ b/website/templates/examples/shit-people-say/index.html @@ -41,7 +41,7 @@ font: 'Pacifico-Arimo' } - + diff --git a/website/templates/examples/user-interface/index.html b/website/templates/examples/user-interface/index.html index efec3d1..0883ec4 100644 --- a/website/templates/examples/user-interface/index.html +++ b/website/templates/examples/user-interface/index.html @@ -41,7 +41,7 @@ font: 'SansitaOne-Kameron' } - + From ac54d03874d71297ec151d3accb892adc0225f72 Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Mon, 20 Jul 2015 09:23:01 -0500 Subject: [PATCH 5/6] commit to https for cdn.knightlab.com --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 514ca46..a9df7cc 100644 --- a/config.json +++ b/config.json @@ -182,7 +182,7 @@ "cdn": "dev" }, "deploy_context": { - "generator_embed_path": "//cdn.knightlab.com/libs/timeline/dev/embed/index.html" + "generator_embed_path": "https://cdn.knightlab.com/libs/timeline/dev/embed/index.html" } }, "prd": { @@ -191,7 +191,7 @@ "cdn": "latest" }, "deploy_context": { - "generator_embed_path": "//cdn.knightlab.com/libs/timeline/latest/embed/index.html" + "generator_embed_path": "https://cdn.knightlab.com/libs/timeline/latest/embed/index.html" } } } From 803d2d733c2cc308bd721b43d43f18f3c02bdcd6 Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Mon, 20 Jul 2015 09:23:20 -0500 Subject: [PATCH 6/6] commit to https for cdn.knightlab.com --- README.markdown | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.markdown b/README.markdown index 12d5541..4344396 100644 --- a/README.markdown +++ b/README.markdown @@ -65,7 +65,7 @@ Place the embed code where you want the timeline to show in the `` of your js: 'path_to_js/timeline-min.js' //OPTIONAL PATH TO JS } - + ``` ### Using a method (*advanced*) You could also initialize a new timeline using the `createStoryJS` method after `storyjs-embed.js` has been loaded @@ -86,7 +86,7 @@ Here's a simple example: - + + - + ``` -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 use the files on an HTTPS server, you can change the beginning of the url from `https://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.