From: Jason Skomorowski <jason@indexdata.com>
Date: Mon, 22 Sep 2014 14:14:39 +0000 (-0400)
Subject: Merge branch 'master' into templateallthemarkup
X-Git-Tag: 1.0.0~324^2~24
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=a28667229f37a181910a8d5fff3815c1e3949057;hp=-c

Merge branch 'master' into templateallthemarkup
---

a28667229f37a181910a8d5fff3815c1e3949057
diff --combined examples/htdocs/jasmine-popup.html
index 533dd4e,7d1b157..a6d1fff
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@@ -10,7 -10,7 +10,7 @@@
      <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
      <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
      <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
 -    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
 +    <script type="text/javascript" src="tools/htdocs/handlebars-v1.3.0.js"></script>
  
      <script type="text/javascript" src="src/mkws-handlebars.js"></script>
      <script type="text/javascript" src="src/mkws-core.js"></script>
@@@ -18,7 -18,6 +18,7 @@@
      <script type="text/javascript" src="src/mkws-filter.js"></script>
      <script type="text/javascript" src="src/mkws-popup.js"></script>
      <script type="text/javascript" src="src/mkws-widget.js"></script>
 +    <script type="text/javascript" src="src/mkws-templates.js"></script>
      <script type="text/javascript" src="src/mkws-widget-main.js"></script>
      <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
      <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
@@@ -53,8 -52,8 +53,8 @@@
      // use a our main service proxy with mkws test account
      var mkws_config = {
        perpage_default: 10,
-       pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
-       service_proxy_auth:   "//mkws.indexdata.com/service-proxy-testauth"
+       pazpar2_url:          "//sp-mkws.indexdata.com/service-proxy/",
+       service_proxy_auth:   "//sp-mkws.indexdata.com/service-proxy-testauth"
      };
  
      var jasmine_config = {