From 33378c200ec2bb4ab02c1c62241a52892cc23bcc Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Tue, 18 Jun 2013 15:45:19 -0500 Subject: [PATCH 1/2] Core submodule updated --- source/js/Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/js/Core b/source/js/Core index 0ec438a0d..b9173c60c 160000 --- a/source/js/Core +++ b/source/js/Core @@ -1 +1 @@ -Subproject commit 0ec438a0d56a65ac15880b6f706a9c4aba33c087 +Subproject commit b9173c60cf8eb2e886fbdc19648cb0fb99c02810 From c8091314b1d310f1742ee6b95b4b132fd707cd91 Mon Sep 17 00:00:00 2001 From: John Kealy Date: Wed, 3 Jul 2013 14:30:15 -0400 Subject: [PATCH 2/2] twitter search activated by /search, not /#search --- compiled/js/timeline.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiled/js/timeline.js b/compiled/js/timeline.js index a64dea2b4..aa2addc36 100644 --- a/compiled/js/timeline.js +++ b/compiled/js/timeline.js @@ -2016,7 +2016,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Util == 'undefined') { .replace(twitterHandlePattern, "@$1"); // TURN THIS BACK ON TO AUTOMAGICALLY LINK HASHTAGS TO TWITTER SEARCH - //.replace(twitterSearchPattern, "$1"); + //.replace(twitterSearchPattern, "$1"); }, linkify_wikipedia: function(text) { @@ -3106,7 +3106,7 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') { var twit = "

"; var td = VMM.Util.linkify_with_twitter(d.text, "_blank"); //td = td.replace(/(@([\w]+))/g,"$1"); - //td = td.replace(/(#([\w]+))/g,"$1"); + //td = td.replace(/(#([\w]+))/g,"$1"); twit += td; twit += "

"; //twit += " " + "" + " "; @@ -10006,4 +10006,4 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef }; -} \ No newline at end of file +}