Merge branch 'master' into search
authorErik Haider Forsén <erik@forsen.not>
Sat, 14 Nov 2015 13:04:45 +0000 (14:04 +0100)
committerErik Haider Forsén <erik@forsen.not>
Sat, 14 Nov 2015 13:04:45 +0000 (14:04 +0100)
* master:
  [apiService] created a service for getting the API URL

# Conflicts:
# src/components/app.ts
# src/index.html

1  2 
src/components/app.ts
src/index.html

@@@ -18,4 -25,4 +25,4 @@@ class App 
  
  }
  
- bootstrap(App,[HTTP_PROVIDERS, ELEMENT_PROBE_PROVIDERS]);
 -bootstrap(App,[HTTP_PROVIDERS,DhisapiService]);
++bootstrap(App,[HTTP_PROVIDERS, ELEMENT_PROBE_PROVIDERS, DhisapiService]);
diff --cc src/index.html
@@@ -3,15 -3,7 +3,9 @@@
  <head>
      <meta charset="UTF-8">
      <title>Sample App</title>
-     <script>
-         var xhReq = new XMLHttpRequest();
-         xhReq.open("GET", "../manifest.webapp", false);
-         xhReq.send(null);
-         var serverResponse = JSON.parse(xhReq.responseText);
-         var dhisAPI = serverResponse.activities.dhis.href;
-     </script>
 +    <script src="../node_modules/@reactivex/rxjs/dist/global/Rx.js"></script>
 +
      <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDlgw6kZAQvD8ex_md-6wb_NcnVlZWkbE4"></script>
      <script src="../node_modules/systemjs/dist/system.src.js"></script>
      <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>