[Merge] lp:dhis2 into lp:~tw-msf/dhis2/dhis2

Mahendra Kariya has proposed merging lp:dhis2 into lp:~tw-msf/dhis2/dhis2.

Requested reviews:
  Lars Helge Øverland (larshelge)
Related bugs:
  Bug #338615 in DHIS: "DXF Import tries importing when no file is selected"
  https://bugs.launchpad.net/dhis2/+bug/338615
  Bug #339272 in DHIS: "i18n resource editor not working with Indic scripts"
  https://bugs.launchpad.net/dhis2/+bug/339272
  Bug #339807 in DHIS: "Menu crashes with WebKit"
  https://bugs.launchpad.net/dhis2/+bug/339807
  Bug #340918 in DHIS: "The english help page contains errors"
  https://bugs.launchpad.net/dhis2/+bug/340918
  Bug #341630 in DHIS: "The login screen does not focus on field when page loads"
  https://bugs.launchpad.net/dhis2/+bug/341630
  Bug #344152 in DHIS: "ANM Indian mobile application - exiting midway"
  https://bugs.launchpad.net/dhis2/+bug/344152
  Bug #363292 in DHIS: "SMS Listener Does Not Remember COM Port"
  https://bugs.launchpad.net/dhis2/+bug/363292
  Bug #363645 in DHIS: "Data Element Group Editor does not show any group members"
  https://bugs.launchpad.net/dhis2/+bug/363645
  Bug #418065 in DHIS: "IE7 selection lists not working"
  https://bugs.launchpad.net/dhis2/+bug/418065
  Bug #421110 in DHIS: "SMSListener throws ArithmeticException while Decompression"
  https://bugs.launchpad.net/dhis2/+bug/421110
  Bug #421111 in DHIS: "SMS Listener does not show version or branding"
  https://bugs.launchpad.net/dhis2/+bug/421111
  Bug #423727 in DHIS: "Data Browser: Browse by orgunit does not show orgunit tree and fails"
  https://bugs.launchpad.net/dhis2/+bug/423727
  Bug #426160 in DHIS: "Prune periods fails on a foreign key constraint"
  https://bugs.launchpad.net/dhis2/+bug/426160
  Bug #496938 in DHIS: "Sorting should be ignore case for all lists"
  https://bugs.launchpad.net/dhis2/+bug/496938
  Bug #525787 in DHIS: "Division by zero error when loading data entry form"
  https://bugs.launchpad.net/dhis2/+bug/525787
  Bug #537522 in DHIS: "Build fails if bzr is not found on PATH or not installed"
  https://bugs.launchpad.net/dhis2/+bug/537522
  Bug #537672 in DHIS: "Filtering elements in list doesn't work in other browsers, only FF"
  https://bugs.launchpad.net/dhis2/+bug/537672
  Bug #540908 in DHIS: "Data Element Groups: both available and selected DE lists are empty in the edit data element group window"
  https://bugs.launchpad.net/dhis2/+bug/540908
  Bug #664390 in dhis-mobile: "Data elements in program stage are not arranged in order"
  https://bugs.launchpad.net/dhis-mobile/+bug/664390
  Bug #675872 in dhis-mobile: "Activity plan lacks sorting "
  https://bugs.launchpad.net/dhis-mobile/+bug/675872
  Bug #987316 in DHIS: "ouwt: should always reload from server when organisationUnit.size == 0"
  https://bugs.launchpad.net/dhis2/+bug/987316
  Bug #994079 in DHIS: "Wrong column names in Data Browser"
  https://bugs.launchpad.net/dhis2/+bug/994079

For more details, see:
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/219164

- Changed Translation to have uid of the translated object rather than the database id.
- Added an API for Translations. (Get all / Post )
- Making pwd validation optional for update user api
- Adding get user preference web api

review-diff.txt (517 KB)

···

--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/219164
Your team DHIS 2 developers is subscribed to branch lp:dhis2.

The proposal to merge lp:dhis2 into lp:~tw-msf/dhis2/dhis2 has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/219164

···

--
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+merge/219164
Your team DHIS 2 developers is subscribed to branch lp:dhis2.