[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18748: Added setting for keyInstanceBaseUrl in general system settings.

Merge authors:
  Halvdan Hoem Grelland (halvdanhg)

revision-diff.txt (6.12 KB)

···

------------------------------------------------------------
revno: 18748 [merge]
committer: Halvdan Hoem Grelland <halvdanhg@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-03-30 16:13:48 +0200
message:
  Added setting for keyInstanceBaseUrl in general system settings.
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm

--
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