dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13064 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-11-29 12:09:04 +0100
message:
  Manifest href, work in progress.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/manifest.webapp
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/manifest.webapp


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/manifest.webapp	2013-11-25 13:06:15 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/manifest.webapp	2013-11-29 11:08:00 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "http://localhost:8080";
+            "href": "../.."
         }
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/manifest.webapp'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/manifest.webapp	2013-11-26 14:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/manifest.webapp	2013-11-29 11:08:00 +0000
@@ -15,7 +15,7 @@
     "default_locale": "en",
     "activities": {
         "dhis": {
-            "href": "http://localhost:8080";
+            "href": "../.."
         }
     }
 }