Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 9689 [merge]
committer: Jan Henrik Overland
branch nick: dhis2
timestamp: Sat 2013-02-02 12:55:37 +0100
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-visualiz
revno: 9690
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sat 2013-02-02 21:22:58 +0200
message:
Encoding in template
modified:
dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html
d
revno: 9691
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sat 2013-02-02 21:59:51 +0200
message:
Including org unit children in html based standard report
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org
revno: 9692
committer: Lars Helge Øverland
branch nick: dhis2
timestamp: Sat 2013-02-02 22:04:33 +0200
message:
Reverted r 9687, dhis 1.4 calculated data element import
modified:
dhis-2/dhis-services/dhis-service-importexport/src/ma
revno: 9693
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Sun 2013-02-03 12:46:01 +0700
message:
FRED-API: return facility body as JSON on POST/PUT, this makes sure that the
ETag returned can be reused for later PUTs
mod
There are two problems here:
1. The syntax to define a function. Can we check
http://tldp.org/LDP/abs/html/functions.html
2. The character "-" is really trick when define functions with.
I changed to this:
#!/bin/bash
# get ready to catch errors
trap ctrl_c INT
trap unexpected_exit ERR
ctrl_c
revno: 9694
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Sun 2013-02-03 14:37:12 +0700
message:
refactored i18n* to allow for loading with package name only (old version
would strip of end of clazzName, which means that
revno: 9695
committer: Morten Olav Hansen
branch nick: dhis2
timestamp: Sun 2013-02-03 14:37:51 +0700
message:
Minor
modified:
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/DefaultResourceBun
8 matches
Mail list logo