Changelog for version 3.0.0
================================

8559d23 (HEAD, develop) Updated metadata
07a544f (origin/develop) Fixed failint rubber bands test in dock
2ad5d29 (upstream/develop) Merge pull request #1597 from timlinux/develop
79898e5 Fix for wizard layout issue on windows 7. Remove ugly hack. Place stackwidget in a scrollarea so overflow happens into sroll area and doesnt cause widget resize. Fix #1588
eb9939d Merge pull request #1596 from ismailsunni/fix_test
1286674 Update sha for test data.
fc9a105 Update sha test_data and fix unit test in test_wizards.
49101d9 Merge pull request #1593 from ismailsunni/fix_test
50e1b49 Merge branch 'aifdr_develop' into fix_test
9a72a70 Merge pull request #1592 from ismailsunni/remove_unit_continouous_wizard
ad428b2 Make test_mouse_drag skipped or green.
cf5137a Remove unit_continuous from Wizard.
daec527 Merge remote-tracking branch 'upstream/develop' into develop
46a24aa Merge pull request #1590 from ismailsunni/fix_test
2e93750 Merge pull request #1591 from akbargumbira/develop
f906600 Fix Classified IF on building docstring so the dock can recognise it.
ee9d0f7 Fix failed unit test: test_post_processor_output.
098333a Merge pull request #1589 from ismailsunni/translation
1ab9f26 Update translation.
8ed2f49 Merge remote-tracking branch 'aifdr/develop' into translation
2c69e88 Update translation.
b32ca34 Fixes for wizard placement on windows 7 (dirty hack) - see #1561
c2c2a5a Merge pull request #1587 from akbargumbira/develop
93ff447 Wrap a function to load HTML either from HTML string or a file.
f8e2529 Fix to test_layer_changed
ad7f161 Merge branch 'translation' into aifdr_develop
d4c7958 Merge pull request #1586 from akbargumbira/develop
1b8e8d0 Compatibility checks through QGIS 2.0 - QGIS 2.6
f69122c Merge pull request #1584 from timlinux/develop
b61dcf5 Updated characterisation images for tests
d3cc173 Merge pull request #1583 from timlinux/develop
3a6a71b All pep8 and pylint checks passing now
cc2a1d9 Merge pull request #1582 from ismailsunni/develop
960605f Merge remote-tracking branch 'aifdr/develop' into develop
1d3158e Work on Wizard's font.
3a5aaea Merge pull request #1581 from ismailsunni/develop
1066e30 Pep8.
8a92f12 Fix failed unit test.
37c5c5c Merge pull request #1580 from ismailsunni/develop
dc21d1c Close #1510
5f5b69b Update translation.
b18bd21 Merge pull request #1579 from ismailsunni/fix_unit_test
5667bdd Fix unit test in test_wizard_dialog.py.
d97fb1f Merge pull request #1577 from timlinux/develop
aa19191 Merge remote-tracking branch 'borys/develop' into develop
7a21a25 More pylint fixes
4820ded [IFCW] Make pep8 happy
6cb09e0 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
2c0ad6b [IFCW] Add a memo note about constaints of the layer we're looking for - Fixes #1465
e79f32b Merge pull request #1575 from timlinux/develop
6d093eb Merge remote-tracking branch 'borys/develop' into develop
a779671 Fixes for pylint errors
f74014d [Wizard] Update test
1045cc2 Merge remote-tracking branch 'borys/develop' into develop
4ed3b46 Pylint fixes
1e6f519 [Wizard] Update test
6d1467c Merge pull request #1573 from borysiasty/develop
5bd6408 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
e8d70c2 [IFCW] Better formatting of the summary tab. Fixes #1453
0691f00 Merge pull request #1572 from timlinux/develop
035c4df Resolved merge conflicts
b4f373c Merge pull request #1569 from cchristelis/develop
2cb6a07 [IFCW] Minor gui tweaks
d9e64de [IFCW] Display an information if the PostGIS connection list in the browser is empty
5c3afe3 Pylint: Some suppress statements and a rename to tie up the last of the violations
047428c [IFCW] Do not accept keywords without category (i.e. just the name)
6eb11b0 removing unneeded pylint markers.
f0afb2d Pylint: suppress redefining __doc__ warning
5db24dd Pylint: supress scope warning W0621
e7fb284 Pylint: supress scope warning W0621
8c127c9 Comment out temporarily unused variables.
aa14953 Include unspecified argument.
cf5afe5  pylint: suppress unused import for QgsComposition
9304fe2 Suppress pylint violation in wizard dialog
6f20196 [Wizard] Remove the help button from the wizard, keeping the help file for a case. Brutally fixes #1452
25829da [IFCW] Put a big dot to a selected cell of the constraint matrices
3f8974e Merge branch 'develop' of github.com:AIFDR/inasafe into develop
f7ae6d3 suppress pylint
228b855 Fixing and adding back previously excluded test. Also fixing undelying issue.
e145f8e make pep8 happy
0ad6387 [Keyword Wizard] Add a step to set the allow_resampling keyword. Fixes #1365
f6fc6e1 update expected type to also allow expected type of super class.
43098ad pylint: Suppress import message.
b1dcf2b pylint: Remove unused imports.
7fd5d60 pylint: Remove offending import from unused test.
ea0dc59 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
90b1f16 [Keyword Wizard] Rollback commit cbed05c0a7ec - automatically set allow_resampling to false
f891f2b Merge pull request #1567 from ismailsunni/fix_1554_no-layer-category
406b125 [Wizard] Fix the wizard window geometry if overflows from the window. Hopefully fixes #1484 and #1561
96431b7 Fix #1554
14efcb5 Suppress qgis unused import lookup in test cases
d2b4934 Suppress pylint check.
80c935b Remove unneeded import
7a70022 Suppress pylint check for argument number discrepancies between property and setter and base class
3794433 Interpolation fixing pylint, re-introducing test which was masked by previous variable re-name
1562765 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
46dec15 Merge pull request #1564 from timlinux/develop
62812e6 Update input types screen on wizard to show more helpful text regarding continuous and classified data. See #1559
22e7a9b Merge pull request #1560 from ismailsunni/translation
11ef597 Fix typo in translation.
514dc9f [IFCW] Added missing icon
53d7e7f Merge branch 'develop' of github.com:AIFDR/inasafe into develop
b6b68c9 [IFCW] Validate analysis extent - fixes #1470
8ba3c66 Merge pull request #1559 from timlinux/develop
ccd7c87 Merge remote-tracking branch 'upstream/develop' into develop
2c7c504 Updates to the text for wizards. Added descriptions to the different layer types in metadata. Try to have a single point of truth for metadata instead of duplicating it in different places.
cbc015e [IFCW] Fix disjoint layers detection if OTFR enabled
246fee0 Merge pull request #1558 from akbargumbira/remove_html_renderer
7616442 Merge branch 'remove_html_renderer' of github.com:akbargumbira/inasafe into remove_html_renderer
a99296a Remove control image for testing render_html_to_image.
c28ac87 Remove control image for testing render_html_to_image
b59200d Remove unused HTMLRenderer.
56f37d7 Merge pull request #1557 from borysiasty/develop
714bad4 [IFCW] Filter layers according to constraints set in the first two steps
e70ce39 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
58ee44a Merge branch 'develop' of github.com:AIFDR/inasafe into develop
7caf15e Fix test keywords dialog
52c49da Fix small issue on the IF docstring.
50ec152 Merge pull request #1556 from akbargumbira/develop
45bf024 Update Classified and Continuous IF docstrings so that dock can recognise it.
02c35a9 Merge pull request #1555 from akbargumbira/develop
3a25a80 [Impact Merge Tools] Put the temp file for html(s) generated temporarily on its own dir.
64e8fb9 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
dde2bba [Keyword Wizard][IFCW] Add Keywords Continouous or Classified For Raster #1548
014c14c Merge pull request #1551 from timlinux/develop
ed65d5b Fix all pep8 issues
bf11e57 Merge pull request #1545 from timlinux/develop
f7ec118 Added missing license file for flood_on_population.tif added by Akbar in commit 476efbe518723
d738ee2 Update checksum for district_osm_jakarta following changes made in af778b9fb0f33483
fc208de Added license for IP checks for keywordless_layer
851aa4a Extend filter list for data ip audit checker
db35231 Added missing license file for bangunan
694b9a1 Merge remote-tracking branch 'origin/develop' into develop
cc6a512 Merge remote-tracking branch 'upstream/develop' into develop
2fddd99 [IFCW] Update icon name
5b79b47 [IFCW] Autofocus table widgets as inactive selection is hardly visible in Ubuntu
570c2c8 Merge pull request #1550 from akbargumbira/develop
9513294 Support QGIS < 2.4 for printing routines.
a45f283 Merge pull request #1549 from ismailsunni/tephra_to_volcanic_ash
7ed49c5 PEP8.
6512da3 Fix merged conflict.
f8e3e6f Change tephra to volcanic ash.
40bc3fa Merge pull request #1531 from ismailsunni/fix_1471_categorical-vs-categorised
60df1e8 Merge remote-tracking branch 'aifdr/develop' into fix_1471_categorical-vs-categorised
cc7c901 Merge pull request #1547 from akbargumbira/develop
f43bc79 [Realtime] Fix loading the translation file
ffc39a2 Merge pull request #1526 from ismailsunni/fix_1441_minimum-needs-result
7f72f8e Merge remote-tracking branch 'aifdr/develop' into fix_1441_minimum-needs-result
4a4f5ca Pep8 and coding standard.
4709319 Apply Tim's comment for classified_hazard_building output.
3865489 Add layer_raster_continuous and layer_raster_classified.
c08fa3c Merge pull request #1544 from cchristelis/develop
687e6ea Merge remote-tracking branch 'upstream/develop' into develop
72a91f3 Merge pull request #1546 from ismailsunni/translation
830a206 (ismail/translation) Update translation.
0dab91f better fix for Force aspect ratio to fix #1533 to support user logos too
0161e44 Merge remote-tracking branch 'origin/develop' into develop
7c3a3fc Force aspect ratio to fix #1533
281fd6e Fixing bug #1491 - Allow unicode for StringParameter
001b5a4 (ismail/fix_1471_categorical-vs-categorised) Merge remote-tracking branch 'aifdr/develop' into fix_1471_categorical-vs-categorised
4a878be Change unit_categorical and unit_normalised to unit_class and unit_continuous.
a1ffe9a Change IF Categorical population to IF Classified population.
fba6256 Change IF Categorical building to IF Classified building.
92a916b Change categorised IF to continuous IF.
b401ad7 (ismail/develop) Merge pull request #1543 from ismailsunni/hot_fix
289ce02 (ismail/hot_fix) Add uncatched exception in dock.py
714f106 Merge pull request #1540 from ismailsunni/translation
a8fd758 Translation files update.
d0c4138 Update text regarding Tim's suggestion.
3631943 (ismail/fix_1441_minimum-needs-result) Add extra notes and table header for impact report.
83c99f2 Merge pull request #1538 from timlinux/develop
0350183 Fixed syntax error in plugins.py
867c0fb Resolved merge conflicts
5dac4a4 Merge pull request #1537 from timlinux/develop
df0904d Merge remote-tracking branch 'upstream/develop' into develop
653c390 Remove unwanted import
6eb3dea let logging rely on QGIS
5865790 Remove unwanted print call in defaults
d78eeef Import qgis for sip2
ecd2c3e Updated changelog and version in metadata
dbb00a5 Merge pull request #1536 from timlinux/develop
5cbaea9 Updated plugin to have simple vs complete toolbar. Defaults to complete for now
9819c0c Selectively port work from safe_refactor
7ff6d44 Merge pull request #1534 from timlinux/develop
0011c08 More fixes to make i18n work
c52152d Fix translation loading
1a1b60c Update metadata related to categorical building IF.
eddfefe Merge remote-tracking branch 'aifdr/develop' into fix_1441_minimum-needs-result
da5a1d9 (ismail/fix_1482_remove-IF-browser) Merge remote-tracking branch 'aifdr/develop' into fix_1482_remove-IF-browser
8a5febe (ismail/remove_tephra) Merge remote-tracking branch 'aifdr/develop' into remove_tephra
f84e1bc Fix merged conflict.
329e7c6 Change docstring and metadata of IFs. For #1471.
4ac7778 Merge pull request #1529 from ismailsunni/fix_test_IF_metadata
8c963c8 (ismail/fix_test_IF_metadata) Add is_valid for checking IF's metadata's validity.
c1bc274 Remove tephra from supported hazard.
a444d18 Remove IF browser per #1482
9d4b1d3 Merge remote-tracking branch 'aifdr/develop' into fix_1441_minimum-needs-result
7cfd6a7 Merge pull request #1525 from borysiasty/develop
e3797cd Add more notes for MinimumNeeds report
19ad833 [IFCW] minor fixes
3c8aecd Fix #1441
08fbe1b Fix yellow dots.
0c327c8 (borys/develop) [IFCW] After selecting a layer from browser, add it to map canvas
32cae6d [IFCW] Fix layer names on the Summary tab
1264b83 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
98d7416 Merge pull request #1524 from akbargumbira/develop
895dcfe Use local HTML file to set HTML of QgsComposerHTML for QGIS < 2.6 compatibility.
a7f62a0 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
3223a31 Merge pull request #1523 from akbargumbira/develop
02c054d Move printing to pdf logic to avoid referring local var outside the scope .
d3393b0 Merge pull request #1521 from akbargumbira/develop
49157ac Save keywords of delimitedtext provider to keywords db.
4132bae [IFCW] Update tests
fa23995 [IRCW] Refactor IF matrices data backend, better texts in table headers and labels
4b2ba48 [IFCW] Better formatting of the IF constraint matrix
636d918 [IFCW] Doubleclick on the IF constraint matrix enters the next step
e14bf5f Merge pull request #3 from ismailsunni/IF_API
2c9c2b8 (ismail/IF_API) Add IF API get_available_exposures and get_functions_for_constraints.
5670d0a [IFCW] Impact functions constraint matrices
0747ed7 Merge pull request #1518 from akbargumbira/develop
50fcb48 Update impact path to the message viewer every time user changes the active layer.
beb7c78 Changed max QGIS version to qgisMaximumVersion=2.99
d2cd24c Change version to 3.0.0
fd7e35e Merge pull request #1515 from ismailsunni/fix_1492
52b51d6 (ismail/fix_1492) Merge remote-tracking branch 'aifdr/develop' into fix_1492
70f04d8 Merge pull request #1516 from akbargumbira/develop
18a2e8c Change wording related to nearby cities to the earthquake.
59d242a The mmi-nearest.tif generated has no "No Data" value set.
f32c598 [Refactor] Move plugin.py to safe directory.
5f08cd5 Merge remote-tracking branch 'aifdr/develop' into fix_1492
ccbcd28 Change back None to undefined in load_layer.
11e5ce1 [Makefile] Remove compile.
e65fb8a Better docstring for unit test.
f9cb015 Add unit test for keywordless layer.
6b83071 Dirty hack for #1492.
4558676 Merge pull request #1512 from akbargumbira/develop
226a5df [Realtime] Fix failing tests except test_18n.
72e47a9 [Realtime] Update the IF name for the assessment.
5eaf6b0 Ensure that the text input to our tr is a string.
bf2bbe2 Use urlparse to get layer path.
3c42cf3 Merge pull request #1506 from akbargumbira/develop
431fde6 Catch the unhandled case when user wants to print nonexistent template.
21ce746 Merge pull request #1504 from akbargumbira/develop
8bdddd4 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ade24ae [Realtime] Pass shakemaps extract dir and web dir to make-public.sh
0479497 Merge pull request #1503 from akbargumbira/develop
5f8be7d Remove shakemaps_cache reference.
f2e7dc8 Merge pull request #1502 from akbargumbira/develop
2c8cd0b [Realtime] Pass shakemaps dir as argument for make-latest-shakemap.sh
5b3911b Merge pull request #1497 from akbargumbira/develop
3b3a978 Import tr function from safe.utilities.i18n.
4a7e3de Merge pull request #1495 from akbargumbira/develop
6e0a4c0 Remove unused qpt templates.
9bf7442 Fix error on IF wizard when cancelling the impact report dialog.
e9a0cd3 Merge pull request #1490 from akbargumbira/realtime_local
46486a5 Use default QGIS installed prefix path for realtime.
f84cab1 Merge pull request #1444 from akbargumbira/realtime_local
95dbac6 Fix failing tests after merging develop to realtime.
ebed9a8 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_local
8a0ed6c Merge pull request #1485 from akbargumbira/legend_issue
11dbc1a Remove unused import in AnalysisHandler class.
31336ff Unintentionally committed run-env-linux.sh
71c761e Remove redundant getter and setter for template
7c6316d Make a wrapper function to print both the map and the table.
0ca4e39 Use composition to print the pdf report in Batch Dialog.
4746f2b Fix Batch Dialog in Develop
914cf3d Print Impact Table using Composition.
82018b2 Use TemplateComposition class in Impact Merge Dialog
4b28b54 Remove Map class and update AnalysisHandler to use MapReport.
13094dd Update Batch Dialog to use new Map Report class.
3603ebf Various work on reporting and update plugin metadata.
798f66d Reporting work.
ed03b13 Feed QgsMapSettings as a param to QgsComposition.
e123609 Merge pull request #1474 from ismailsunni/fix_1473
d721687 (ismail/fix_1473) Pep8
20d1eb3 Fix #1473
6d33077 Add new class TemplateComposition.
c3ecca0 Merge branch 'legend_issue' of github.com:akbargumbira/inasafe into legend_issue
ec84995 fix compile doc typos
e86f60e Merge pull request #1464 from akbargumbira/develop
fc07131 Fix small issue and remove setup.py
b0dfa35 Merge pull request #1462 from akbargumbira/test_data
3e86c40 Fix tests related to changes on some functions.
54e4f1b Merge pull request #1461 from akbargumbira/develop
82d1908 Sort minimum needs profiles based on QGIS' locale.
5d49701 Merge pull request #1460 from ismailsunni/fix_wizard
ce0539d (ismail/fix_wizard) Make wizard to use parameter from user input.
8012d62 Merge pull request #1459 from akbargumbira/develop
6b88fe3 Update Jenkins Script.
3c58c29 Merge pull request #1458 from ismailsunni/fix_wizard
03860d4 Initialize analysis in init function.
248bf01 Fix #1454 and #1456.
c692b6e Remove needs parameter from non-population IF.
060c2f7 Merge pull request #1451 from akbargumbira/test_data
a06e413 Update some tests and add test data.
165645d Fix failing tests in test_function_options_dialog.py
03b3408 Merge pull request #1457 from ismailsunni/fix_test
a86a269 (ismail/fix_test) Fix failed unit test in test_impact_function_manager.py.
bb1a72f Merge branch 'develop' of github.com:AIFDR/inasafe into test_data
5a115cf Pep8.
9840802 Merge pull request #1450 from borysiasty/IFCW2
7665cfb Fix test_issue_230 that was failed because load_layer has changed.
2396ca7 Update test_project_interpretation to use data in source tree.
af778b9 Update the tests and test data.
669b8df Update the tests in test_keywords_dialog module.
476efbe Update tests in test_map_legend.
c23a113 Update tests in test_map module.
398c6f6 Update test_print_impact_table.
fd7e828 Use *test* dir in *temp_dir* for testing.
ebd4b32 Update test_keyword_io to use data from source tree.
6c193aa Remove DIRECTORY param in load_layer function.
f78df19 Update test_get_keyword_from_file to use data from InaSAFE source.
b1d62d3 (borys/IFCW2) [IFCW] IFCW unit test
c656ff2 Fix safe.test.utilities.clone_raster_layer
ed4239f [IFCW] Minor re-oder of the class
c976845 [IFCW] Follow up the previous commit
9bd716c [IFCW] Rename WizardAnalysisHandler to just AnalysisHandler
dc1264f [IFCW] Vsual bugfixes
05e5665 Merge branch 'develop' of github.com:AIFDR/inasafe into IFCW2
2e5de8c [IFCW] Autoselect or disable layer origin radiobuttons according to available layers
2e80016 Temporarily disable qgisMaximumVersion check to allow development on master
d2a645a [IFCW] Fix for displaying summary of minimym needs
35af63a Merge pull request #1447 from akbargumbira/fix_travis
93bd7d5 Address Pylint Violation.
81067b0 Update Travis Configuration.
b4ce6ee Update Makefile
8d22bbc [IFCW] Auto select source layers if there is only one item in a list
311f7d5 [IFCW] pep8 fixes
467f875 [IFCW] Manual merge develop to IFCW2
3565fbc Merge branch 'develop' of github.com:AIFDR/inasafe into IFCW2
873a70a Address Pep8 Violation
addee87 Update Travis Configuration.
2b7834b Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_local
cc7cd63 Merge pull request #1445 from akbargumbira/safe_refactor
d6b759b [IFCW] Use the ExtentSelectorDialog for setting user extent
2877353 Apply PR #1446 to safe_refactor branch.
dbfb76e Merge branch 'fix_bug' of https://github.com/ismailsunni/inasafe into IFCW2
a86ceb0 Remove safe.common.testing.
00e95e8 Move variables that refer to inasafe_data from safe.common.testing to safe.test.utilities.
f41bacb Move test_lines and test_polygon from safe.common.testing to safe.storage.test.test_polygon
cedd14b Move GEOTRANSFORMS from safe.common.testing to safe.storage.test.test_io
b70b3e0 Move FEATURE_COUNTS from safe.common.testing to safe.storage.test.test_io
fac5667 Move get_qgis_app from safe.common.testing to safe.test.utilities.
51e54d7 Move combine_coordinates froms safe.common.testing to safe.test.utilities.
9e4814a Remove get_shake_test_data_path in safe.common.testing and rather use test_data_path directly.
a86103e Hide busy.
e05d022 Fix bugs from dock stripping.
1ccd7c5 Test Impact Merge Tool: Update the test data dir in temp directory, not in our test data dir.
24ca2fe Add test data that was deleted unintentionally.
cbcdda5 Remove UNITDATA and its usage. Use test_data_path() instead.
8f990ff pep8 fixes
9b3c4f2 [IFCW] Add extent selection
c435cc7 Utilise test_data_path in safe.gui
ebc86e0 Remove test_safe_interface.
0e163b2 Utilise test_data_path in test_dock
f7a3def Update test_data_path function to return any data or dir path of test data.
936f584 Tidy up control data and move utilities_for_testing to safe.test.utilities.
980787d Legend workaround with base safe_refactor.
98e8f3b [IFCW] minor fix
cbed05c [IFCW] For exposure rasters with unit people_per_pixel automtically set allow_resampling to false (fixes #1078)
66c877e [IFCW] minor fix
48c487a Merge pull request #2 from ismailsunni/IFCW2
8231c1c Fix path templates in Impact Report Dialog.
3d14fd1 Change the way we load the ui files. Just pass it to get_ui_class.
005cc06 (ismail/IFCW2) Fix path for to safe_extras.
b0614a2 Remove the max qgis version, temporary.
9a66dc2 Skip translation test.
3e45fe8 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
7524a0b Some fix on Makefile.
f8debac [IFCW] Add extent selector step
b9a65e4 [IFCW] Update the wizard to the recent API changes
9c9d262 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
483abb6 Update location to test data.
839970c Fix save scenario dialog.
827cd36 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
8e6f245 [Safe Refactor] Update scripts and Makefile.
272d36a Fix test data location in test_message_viewer.
5076e49 Building type postprocessor needs to import tr.
89998e9 Fix test data dir path in test_dock.
8e0079f Fix test data dir path in test_osm_downloader.
424d8d0 Fix resources location in Impact Merge Tool.
cc8062f Fix missing import.
6d0c113 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
3291b3a Fix test for categorical hazard population IF.
689adc0 Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor
cf4fc87 Tidy up path generation in dynamic translation tests
d93c0f1 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
453319e Fix unit test, qgis.core will always be available.
72fb891 Fix for failing report render test
640712f Resolve merge conflicts with akbars code
bccf14f Delete makefile for ui files.
3b43a0d Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
3584d88 Dynamically load ui files for GUI.
6e75b6c [Safe Refactor] Add some unit tests.
3acfac8 Fixes for translation related test fails
c065da2 Fix merged conflict.
994539d [Safe Refactor] Fix merged conflict.
af7d3c3 [Safe refactor, hack code to make it aware.]
18242ac Resolved merge conflicts
5876777 In progress updates for unified translation system
840b78f [Travis] Remove --use-mirrors for pip command and only test safe package.
5df5640 Change tests that are checking the output hash.
74913a2 Fixed icons in toolbar
68decd4 In progress refactoring
6e5e8b4 [Safe Extras] Remove test from parameters.
c1c0f04 Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor
ce984bb Further progress on i18n consolidation to use only Qt translation framework and remove gettext. In progress.
76b5a79 Update parameter.
9c04982 Merge branch 'safe_refactor' of github.com:timlinux/inasafe into safe_refactor
c65758d Renamed the test numeric module.
c4be977 [Realtime] Update scripts.
438fff7 [Realtime] Remove any references to ftp or sftp.
dc0cae3 Realtime refactor
e71ad88 Dont store generated python from ui files in source tree
b8ae62e In progress updates for refactoring into one top level package
3ecee8e [Refactor] Add test for resource paramter widget.
4fb360c Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor
1512829 Use directly shakemaps in sftp folder.
08f1eb4 Further updates to resources and utilities refactoring
8aa4cc8 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
a9df6ed [Refactor] Add unit test for resource parameter and fix functionality.
33fa3ce Resolved merge conflicts with akbar's branch
4099482 Further refactor for utilities and move resources to top level
28f4694 [Refactor] Add more rich in serialize and load_dictionary.
6397155 [Refactor] Walk through safe_common, leave green dots.
e12f069 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
3d6f930 Add test for Categorised Hazard Population Impact Function.
a21bc03 Add test for EarthquakeBuildingImpactFunction.
6045598 Address FIXME Ole: Add test for Volcano Point on Population.
550fbd7 Resolved merge conflicts with akbars branch
63b9ac3 Move Volcano Polygon on Population IF from safe.engine to safe.impact_functions.
e637030 [Refactor] Fix error when remove numerics.py
d6e41df More refactoring resources
bd47174 [Refactor] geometry to gis.
0dd385f Add init file in safe.impact_functions.earthquake.test package.
d1e066d Move test for Pager Earthquake Fatality Model from safe.engine to safe.impact_functions.
cf096cc Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
7f129e4 [Refactor] Remove unused code.
504412f Move test ITBEarthquakeFatalityModel IF from safe.engine module to safe.impact_functions.
d187eff [Refactor] Fix segmentation fault on test_dock.py.
c36c247 In progress refactor of inasafe
251e75c Make public should be executable
4053c65 [Refactor] Move test code to test directory.
dec1a37 [Refactor] Delete tephra directory.
ea7e3fb [Refactor] Move Ole's code to one directory.
1c0b868 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
dd8d908 [Refactor] Fix a failed test.
c6166cc Delete test of impact function in test_dock.
88b695b Add test on Volcano Building IF and delete it from test_engine.
4a73bf1 Update the description of the module.
672023b Fix the description of the module.
1ae04cc Add test Flood Vector on Polygon and delete from test_engine.
96c4f25 [Fix #392]
1fba7ff Add test Flood Raster on Population IF and delete it from test_engine.
ff10e0e Delete test on FloodBuildingIF in test_engine.
725fa11 Add test for FloodOSMBuildingIF.
cee74d5 Move i18n to top level.
c50c2c7 Standardising test package in safe.storage.
a3bc87a Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
6cda183 Delete safe.storage.clipping.
5b88b1d Standardising test package in safe.messaging and safe.postprocessor.
fea0c78 Removed monkey patching of minimum needs params for all IFs
a49ebcd [Refactor] Add function to unload the unused impact function.
e93f027 Merge conflict.
2bf9a6c Standardising tests in safe.impact_functions package.
4285c98 [Refactor] Fix merged conflict.
f827cc1 [Refactor] Update unit test.
ab36988 In progress removing monkey patching of minimum needs params for all IFs
52bed14 Delete safe.api.
f3d1216 [Refactor] Delete disabled impact functions.
24cdec4 At last, remove safe_interface from the universe.
cd122ef Added test for messaging styles
b69de75 Refactored defaults into a single module
26bd886 [Refactor] Move safe.exceptions to safe.common.exceptions.
b82efb0 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
6fc6962 Move write_keywords_to_file from safe_interface to safe.utilities.utilities
0dfb610 Merge remote-tracking branch 'akbar/safe_refactor' into jaran
ff7d5de Move read_file_keywords from safe_interface to safe.utilities.utilities.
be770d0 [Refactor] Fix merge conflict.
b852a7b Move convert_safe_layer to safe.utilities.utilities.
ab2f9c1 [Refactor] Fix bug on running test related to os.environ['LANG'] == 'id'.
0b5d253 Remove silly code.
5d697f5 Remove get_style_info function in safe_interface.
aafeab1 Use Qt Translation in dock.
9261625 More implementation for removing qt resource usage
7629718 More replacement or resources to use local files
ecf2b6b Refactoring away resources
826fd2d [Refactor] Remove unused code.
436cd93 [Refactor] Some thought to commit.
eaffe16 Remove available_functions in safe_interface and directly use get_admissible_plugins.
639fba1 Refactor get_optimal_extent in safe_interface into safe.utilities.analysis.
ccf783a Remove get_buffered_extent from safe_interface and use buffered_bounding_box from safe.storate.utilities instead.
18c51f4 Remove calculate_safe_impact in safe_interface and use directly from safe.engine.core
e346ec8 Remove verify function in safe_interface and use directly from safe.common
a4a5555 Remove read_keywords_from_layer function in safe_interface as it only being used in the test.
b1bd9e7 Remove read_safe_layer wrapper in safe_interface.
2f7f5dd Get rid of safe_interface usage in safe.widgets and safe.test.
2a54c60 Get rid of safe_interface usage in impact_statistics and utilities package.
304cea0 Get rid of safe_interface usage in tools package.
d9dd701 Get rid of safe_interface usage in report package.
26db57b Get rid of safe_interface usage in postprocessor_manager.py.
f4b634d Get rid of safe_interface usage in function_options_dialog.py.
270c73b Get rid of safe_interface usages in aggregator.py.
2204bd0 Delete Makefile in safe_qgis.
2915ecd Move test package to safe.
6457813 Move plugin.py and exceptions.py to safe package.
bedde50 Fix some issues after moving utilities module.
c02d33a [IFCW] Fix ui layout
ccedec3 [IFCW] Fix pep8 and pylint
dfcc227 [IFCW] Hide unsupported branches from the browser
24bf9f4 [IFCW] Fix validation for PostGIS layers
5dca411 [IFCW] Postgis support in the qgsBrowser
5a659d4 [IFCW] Some obvious pylint.
378769c [IFCW] Pep8.
d1ed468 [IFCW] More code cleaning.
a60465f [IFCW] Cleaning code.
84853a3 [IFCW] Merge analysis branch and IFCW from borys.
f2007c0 [IFCW] Clean code, comment for pydev line.
ba04a87 [IFCW] Greener code.
708b621 [IFCW] Fix unit tests in test_wizard_dialog.py
61fbb92 [Wizard] Fix action icon
86b9437 [Wizard] bugfixes
59c87ed [Wizard] The Analysis tab
aab5195 [Wizard] The Analysis tab
972c4cd [Wizard] Embed the existing IF parameters tab widget
7902703 [Wizard] Typo fix
4548f6b [Wizard] Embed the keywords creation thread into the function centric thread
0f0a5e7 [Wizard] First steps of the function centric workflow
13842d9 [Wizard] Follow up f0b0a77e05c13
762f6a2 [Wizard] Initial commit of the function centric part
36a2c35 Pep8
b14c6fb Add API for get_exposures_for_if. #1256
830e25a Add API for #1256.
2f19d2e Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
f05d3e4 Move utilities package to safe.
2a0ca8b Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor
8bf756d Move widgets and test data from safe_qgis to safe.
6eb78a5 Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor
866949f [Refactor] Move resource_parameters to safe from safe_extras.
0e8398a Move resources package into safe.
bb1033d Rollback ismailsunni lontongness.
48391bb [Refacto] Fix unit test and update impact function.
a478afc Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
9c8cd6b Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor
8fabfbf Move report package under safe package.
54bc845 [Refactor] Remove impact functions in safe/extras
5726c62 Move impact_statistics to safe package.
909fc59 Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor
d2a178f [Refactor] Remove retired impact functions from code base.
2c9f981 Move tools package to safe.
7b375df Merge remote-tracking branch 'origin/develop' into safe_refactor
ec453d1 Merge pull request #1440 from akbargumbira/develop
4831761 Don't change run-env-linux configurations.
9eeda05 Delete files directory.
439c439 Merge branch 'develop' of git://github.com/AIFDR/inasafe into aifdr_develop
f7007df Move minimum needs tests to a more propriate place.
ce203d4 [Minimum Needs] Move profiles to resources.
123130c Merge pull request #1439 from ismailsunni/develop
57eb7a7 Merge remote-tracking branch 'aifdr/develop' into develop
8c64a7a Merge remote-tracking branch 'aifdr/master' into develop
26f5fe2 Merge remote-tracking branch 'aifdr/master' into aifdr_develop
0d73dd6 Merge pull request #1431 from ismailsunni/fix_1429
1ba54ed (ismail/fix_1429) Make sure to handle point building for raster hazard. See #334
30f7742 Remove unused code.
ae3b340 Set current status to alpha.
f7c251a Fix #1429
e624c49 Merge pull request #1362 from ismailsunni/analysis
4123c9c (ismail/analysis) Fix unit test from merging.
337426c Merge pull request #1344 from mbernasocchi/metadata
2cdfff3 Fix merged conlict.
353d597 Merge pull request #1421 from timlinux/develop
e59e4c1 Added throughput graph on readme
c1e4a10 allow upload in geonode, in case it will ever be needed :)
bc7a234 remove the $ISO19115_LINEAGE placeholder if no source is defined
d00e71f Pep8.
4b7fb22 Merge remote-tracking branch 'aifdr/develop' into analysis
032b260 [Analysis] Finnaly, all pass after refactor.
1a4ac84 Fix unit test in save_scenario.
46803eb A better one of dock.
4059451 It works.
13ab9c2 First step to strip the extent from dock.
139f269 Update metadata's key of Impact Functions.
c9bd306 More on fix conflicts.
0c944c6 Fix merged conflict.
8cf0194 Merge remote-tracking branch 'aifdr/develop' into analysis
b1fcbcb [Analysis] Fix merged conflict.
3ba4d06 [Analysis] Fix merged conflict.
717bcb7 Merge remote-tracking branch 'aifdr/develop' into analysis
cbe9364 [Analysis] Make metadata in IFs consistent.
0a9de70 [Analysis] More removing unrelated code.
29d7e75 [Analysis] Resolve merged conflicts and pep8.
523d2f0 [Analysis] Insufficient Memory Warning.
3290b84 [Analysis] Remove unused code.
30440ad [Analysis] Green Code.
ffb73c2 [Analysis] All Green.
b6f24db [Analysis] Runtime keywords dialog.
07cd3f2 Merge remote-tracking branch 'aifdr/develop' into dock_stripping
e6ae062 [Analysis] Fix test_aggregator.py
b3f6223 Fix merged conflict.
d801958 (ismail/dock_striping) [Analysis] Fix unit test.
3fd4316 [Analysis] Fix batch runner.
408a43a [Analysis] All test_dock pass.
a6a3c68 (refs/bisect/bad) Merge branch 'aifdr_develop' into dock_striping
8fddedd (refs/bisect/good-8fddedd6e9c06df59e7f9700a7e41930d99887f5) [Analysis] Another test passed, test_rubber_band.
c33e433 (refs/bisect/good-c33e433bc9a5589d42a99a2d9004c4f2d7814e17) [Analysis] Another test passed.
bfd56e7 [Analysis] Add test_analysis.
67a0097 (refs/bisect/good-67a00973c2dc37298ca821307f50dd2043d0c359) [Analysis] More works on passing the unit tests.
164a47e [Analysis] Fix typo and double run_analysis.
d51db82 [Analysis] Works but got double result.
f8b8c8d More code to analysis.py
ba833ea (refs/bisect/good-ba833eaf95dfe1dd2a7fd16ee1d9c81e097394b6) Work, but many failed tests.
98b7f89 Almost working.
6c9056b Initial not working version.
08c70e0 Add new signals.
80db796 Remove unused code.
0bc018b Minor fix.
daf80fa Coding Standard on impact_calculator.py
19f0726 Coding Standard on test_impact_calculator.py

Changelog for version 2.2.0
================================

a6f560f (HEAD, develop) Updated metadata with key changes
0a8a81b (upstream/develop) Merge pull request #1400 from timlinux/fix-1367
e074737 Merge pull request #1398 from timlinux/fix-1380
28c2c05 (origin/develop) Merge pull request #1399 from timlinux/fix-1388-1391
ae534fb Merge pull request #1397 from timlinux/safe_extras
3da29ac (origin/fix-1367) Fix #1367 - subcategory combo box does not expand to dialog width
899d2a7 (origin/fix-1388-1391) Fix #1388 #1389 #1390 #1391 - show state of profile properly on dialog open
b6dd67f (origin/fix-1380) Fix for #1380 - remove in kw editor does not remove kw
aa8cbad (origin/safe_extras) Changed third_party module to safe_extras since third_party is commonly used by other packages and then results in import errors if it shadows ours.
925eb2b Merge pull request #1396 from timlinux/fix-1387
fce89ab Merge pull request #1395 from timlinux/fix-1386
e0b0ef3 (origin/fix-1387) Fix #1387 - escape / close / window x should not close needs manager when in resource edit mode
87ed8e9 Merge pull request #1394 from timlinux/fix-1393
26d36b2 (origin/fix-1386) Fix 1386 - validate min max and default for new resource in minimum needs
84cb600 (origin/fix-1393) Workaround to fix #1393
0cf7dad Merge pull request #1392 from akbargumbira/develop
97339b0 Fix unable to open OSM Downloader Dialog.
fce6a39 Enable only quick tests in travis
96e2642 Update README.md
8b6c1c0 Merge pull request #1385 from timlinux/develop
ec79c1e Added user extents help and placeholder for id help
e2d0be4 Merge pull request #1384 from timlinux/develop
4a2ced6 Added minimum needs help and placeholders for id help - still unstranslated
1935c31 Merge pull request #1383 from timlinux/develop
00abbc4 Added xml files for test data
f2acaa6 Merge pull request #1382 from timlinux/develop
678ed84 compile fix for doc
0f6443c fix for crash on start when reading minimum needs from QSettings
4bbab30 Merge pull request #1381 from ismailsunni/update_test
8f38a03 Merge remote-tracking branch 'aifdr/develop' into develop
38d0ae0 Pep and hash for image.
9b13d54 typo fix for doc compile
5f207f3 Merge pull request #1369 from timlinux/develop
868807f Merge pull request #1379 from akbargumbira/develop
436c239 Fix minimum needs tools failing test
af145f6 Merge pull request #1378 from akbargumbira/develop
f703dfd Fix extent selector dialog.
5fe6c5b Update metadata.txt
3635bf2 Merge pull request #1377 from akbargumbira/develop
d3d9fa0 Use the new parameter style for testing.
2b378a4 Merge pull request #1376 from akbargumbira/develop
cd03dfc Fix wrong import of OSMDownloader tests.
894a1fc Merge pull request #1375 from akbargumbira/develop
b7ff6e6 Fix QVariant Problems. Force using SIP API V.2
04c8ec4 Merge pull request #1371 from ismailsunni/unit_test_2
77ce806 Fix merge conflict.
79ea1cd Merge pull request #1374 from timlinux/marquee_fix
64b6f9b (origin/marquee_fix) Fix base class for extents selector
5cb6a96 Merge pull request #1372 from timlinux/minimum_needs_fix
7f444a8 (origin/minimum_needs_fix) Fix for minimum needs startup on a fresh machine
29814e3 Use makedirs instead mkdir.
a368825 Fix unit test related to QVariant.
c02f754 Merge remote-tracking branch 'aifdr/develop' into unit_test
026702d Update unit test.
8f72442 Resolved merge conflicts
2e18e2c Resolved merge conflicts
9f1a40a Remove in progress IF from Christian
de23b00 Merge pull request #1368 from ismailsunni/translation
e3e15c2 Update string translation.
e546eb6 Merge pull request #1348 from timlinux/issue-1339
c0d7d61 (origin/issue-1339) Regenerated resources file
79ddf5b merged from master
d93f9b5 Merge pull request #1357 from timlinux/marquee_fixes
97502ba (origin/marquee_fixes) Regenerated ui py files
fa89677 Resolved merge conflicts
e030037 Deleting my email - overwhelming my inbox
c98c343 Merge pull request #1366 from timlinux/feature/inasafe-1334-new-style-parameters
259c3c6 (origin/feature/inasafe-1334-new-style-parameters) Regenerated resources
39af87e Resolved merge conflicts
21750a4 Regenerated broken resources file
532ce2b Resolved merge conflicts
031fc2a Merge remote-tracking branch 'upstream/develop' into issue-1339
9742e30 fix failing test on travis
4c39f7c Merge pull request #1364 from ismailsunni/translation
0f653b9 Pylint and pep8
7bc8157 Translation file updates.
4115dc2 Resolving conflicts with merge from develop
e958f6c Changing the default import path to the defaults (as per Charlottes request)
e91b931 Updating Tests.
933ac6b Updating Tests.
dbb9e2b More pep8
2d77f86 Fixing PEP8
3522120 Remove profile
b4bcd94 Merge pull request #4 from timlinux/feature/inasafe-1334-new-style-parameters
8382d1b Further interaction cleanups for minimum needs manager
06d867e Resolved merge conflicts
111d646 Merge pull request #1355 from essc/develop
5be60ad changed legend title
fbc6349 Updated clear new profile behaviour. Started on context switch. Remove QFile and QDir in favour of native python file handling.
525ac7d needs manager coding convention and button bar updates
b3367da Merge pull request #3 from timlinux/feature/inasafe-1334-new-style-parameters
a61716b Layout improvements for minimum needs editor
7dd96f5 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
05ed9bd Merge remote-tracking branch 'christian/feature/inasafe-1334-new-style-parameters' into feature/inasafe-1334-new-style-parameters
0a95b91 Updated icons for minimum needs manager
7413dfe Updated icons for minimum needs manager
a748bfe Always import new profiles into minimum needs directory
93677e4 changed rounding method
14b404b changed density term
a316154 Replacing hard with soft coded paths
8af94e5 Updating needs defaults
abc9a3e Added comment explaining why test is expected to fail
a3aa025 Update the plugin path to be relative
56c9ed1 Mark canvas test as expected to fail
f2a17db Merge branch 'develop' into marquee_fixes
55953c6 Merge pull request #2 from timlinux/feature/inasafe-1334-new-style-parameters
132c1c7 Put minum needs related stuff into a package in tools
5ae04b9 Renamed shakemap importer to shakemap importer dialog for consistency
40eb0d6 Remove old minimum needs dialog
271d3bf Merge pull request #1 from timlinux/feature/inasafe-1334-new-style-parameters
bc6250a Refactored dialogs for consistent and logical naming
7872722 Merge branch 'develop' into feature/inasafe-1334-new-style-parameters
5a79e81 Merge pull request #1349 from ismailsunni/fix_358
5e1824f Merge remote-tracking branch 'aifdr/develop' into fix_358
b9d1136 Improve layout of items
c0ddb37 Merged develop into branch
4d56af6 make tests pass
b6e3361 Merge pull request #1353 from akbargumbira/develop
8d37635 Updated the unit.
da8ae2d changed population rounding
bc6bf9a Use the same rounding for total population in volcano on population IF.
7a9da82 Update hash test data.
0fbe828 Fix rounding issue on tsunami on people IF #1352
4d80237 Changed density term.
450fa1f Fix and test attempts for extent selector
6879c87 Updated all remaining IF. Cleared minimum needs on import.
9611876 In progress test for marquee
672bf6f Merge pull request #1350 from cchristelis/inasafe-1230-minimum-needs
786ce04 Updating minimum_needs in Bahasa Indonesia
b929225 Pep8.
1c530e5 Update hash value for Makefile.
7603896 Merge remote-tracking branch 'aifdr/develop' into fix_358
8e8cab4 Update unit test on ubuntu.
089ac69 Add unit test related to Windows.
8943835 Unit test for #358.
eb72e3a Updated options dialog to move org logo option to first panel, and default to off. See #1339
48bbd73 Updated logo for #1339
d06807e Merge pull request #1346 from timlinux/pep8-1.5.6
24192a0 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/inasafe-1334-new-style-parameters
bc5f007 Merge pull request #1347 from cchristelis/develop
7c5036a Choosing the first page as the langing page in the options dialog
3d6eac6 Removing a print
51b2b5b Working for the first impact function.
f42a2ab Early stages, committing as a baseline
6179aae (origin/pep8-1.5.6) Resolved merge conflict
d49bbf2 fixes some new introduced doc bugs
25bf718 fix doc compile bugs
4b5779a Merge pull request #1345 from timlinux/develop
0a7195d PEP8 v 1.5.6 fixes - no more pep8 violations.
c189e46 More pep8 fixes - 125 left
6c90001 Improved UI for extents selector tool for #1332
6a86584 Merge pull request #1341 from cchristelis/inasafe-1230-minimum-needs
a091cb9 fix doc compile bugs
8b4abcd Updated the minimum needs default profiles text.
b478aeb Updating the minimum needs for drinking water to 67l weekly (which is 9.7 daily).
2f2927a Change the default save as to exclude the extenion from the profile.
6c2fa95 Fixing import minimum needs
5baa911 Resolved merge conflicts
99d36ef More pep8 fixes
b425945 Order profiles by language settings
691e6bb More pep8 fixes
242f194 Make pep8 pass on pep8 1.5.6
9f0e441 Fix last failing tests
43130f0 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
cb95c82 Increasing consistency in table layout
59ce5c6 removing margins from parameter widget
64c2057 Fixing single test run. Added other tests.
845a1e7 Divide frequency into batches by adding the rich minimum needs to metadata. Some minor refactoring
4d4d47a Merge pull request #1338 from timlinux/marquee_fixes
58dc679 When opening the extents creation tool, remember the previously set extent and use it as default.
826df94 Merge pull request #1329 from cchristelis/develop
796e7d4 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
f788a95 Minor comment improvement
7ad58f9 make minimum needs scrollable in the minimum needs tab
a3f83dd Merge pull request #1331 from timlinux/develop
d011e57 Fix #1330 - Extents to dataset not respected.
083b460 Add Philippine minimum needs
d345dfc Fixing file access issues.
d355be9 Merge pull request #1313 from assefay/develop
c7eba6d Merge pull request #1326 from timlinux/marquee_fixes
a632af2 Wrap resource list text
4c0edbb Change minimum needs to int values to avoid the '.0'
fb5af8a Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ec59b34 Add support for ordered dicts in keywords.
e3443fb clear button for extent selector
cecf473 Added clear button
fe8c1e8 Fix for user extents so that they can be cleared properly
f58da6e Merge pull request #1322 from akbargumbira/develop
515f11b Merge branch 'develop' of github.com:AIFDR/inasafe into develop
dd54fce Merge pull request #1320 from essc/develop
22806ac Merge pull request #1323 from mbernasocchi/metadata
77e61e1 Merge branch 'develop' into metadata
3c72b4b implemented gmd:LI_Lineage to close #1245
53648c0 FIx volcano IF problem when the hazard is point.
c1bc367 applied new minimum needs
0cd80cc last pep and lint.  @assefay please review this and act accordingly if needed.
d5e206a fixed all but one pylint and pep8.
4172fe9 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
0ae73e9 fix NameError: global name 'extent_to_geo_array' is not defined
29eeb00 set target_field for styling
7717386 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
880aed8 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
0f1dfb7 Quick fix last quicktests - @cchristelis you need to check this
f0a22c9 Quick fix last quicktests - @cchristelis you need to check this
703e2b6 Merge pull request #1312 from cchristelis/develop
7ba94ff Moved minimum_needs default to defaults.py
215a448 Fixed minimum-needs test
853b4fc merging origin develop into local develop
6d1f891 fixing the safe_qgis import in safe
8315a92 disable simply of polygons for roads #1300
bb015ae Merge pull request #1311 from timlinux/papercuts
641986d (origin/papercuts) Fix for makefile issue
cd8392d Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop
e9d5ade Run pep8 etc tests first, not last
b617615 Merge pull request #1302 from timlinux/marquee
e70bd1e (origin/marquee) Resolved merge conflicts
a550c83 Updated resources
bf7f584 Merge pull request #1308 from cchristelis/inasafe-1230-minimum-needs
bb39918 Resolved merge conflicts
baaceaf merged develop into branch
1f37645 Merge pull request #1306 from mbernasocchi/metadata
b66853e Merge remote-tracking branch 'origin/develop' into marquee
2dceb06 Merge branch 'develop' of github.com:AIFDR/inasafe into metadata
c4b40bf Make sure the aggregator gets the correct damaged buildings
5617fcc fix small failing tests
4846fe1 Fixed error message of failing test
6b894b4 Fix for travis test error
3550f92 Allow for title substitution at XML generation
3b78be1 Fixes for failing tests on travis
39cd368 Merge branch 'essc-generic_categorised_hazard' into develop
9e5cde6 Merge branch 'generic_categorised_hazard' of https://github.com/essc/inasafe into essc-generic_categorised_hazard
4071756 support for updating legacy kw in sqlite db. If the DB already has a record for the given URI, it converts the legacy format into ISO xml
9c1bb90 fixed last failing guitest
7d80924 removed a duplicated test
ef04205 (marquee) Fix last two travis failing tests?
44b75d7 fighting with tests and incorporated Ismails suggestions
069c33f updated make file test data hash. All guitest should pass now
29bf9bd added gui support far the metadata elements
1d58feb more tests stuff
5c5fab1 more test stuff
98cf5f6 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
ed1e5c4 changing tests
8c68508 More passing tests and allow dynamic date generation for ISO
21d7e49 Dont stop travis to ask about adding a repo
ca34100 Fixes for aggregation tests - use user-extent
3657569 Merge remote-tracking branch 'origin/develop' into marquee
cffe36f Merge remote-tracking branch 'origin' into marquee
cfc2314 Fixing tests.
ddf9ae1 updating more tests
7514869 Fixes for travis builds
0f1ba2a Merge branch 'develop' of github.com:AIFDR/inasafe into metadata
e0bc79b Install more recent version of QGIS for travis testing
d8701f9 Fixing tests and removing prints.
2a00944 Merge pull request #1310 from ismailsunni/new_bangunan_data
821053a [Data Test] Add new datatest for volcano.
c216ba9 Fix for failing tests in marquee branch
d502355 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
48c5e27 using the QFile and QDirectory api to access files relative to '.qgis2'.
9e4827f Merge branch 'develop' of github.com:AIFDR/inasafe into metadata
8a5354d use /usr/local/qgis as default
7c1daed Remove incorrect call to canvas.get_Extent
6660ef3 cleanedup after renaming get_defaults
43870d1 Merge branch 'develop' into marquee
9843021 moved xml template to an xml file
476a1cd Merge pull request #1294 from ismailsunni/volcano
61d4b2e Merge branch 'develop' of github.com:AIFDR/inasafe into metadata
200a606 fixed some issues
43c25c5 removed 'categorised'
a0fa2f2 fixed pep8
5c008c8 added categorised for unit test
f98b0dd added unit_categorised for unit test
0049988 Get Travis working
d5e6a67 Get Travis working
689324f Get Travis working
e58dce3 load defaults rather than going into panic if no profiles are found.
dd256b4 Removed an unneccessary requirements addition
314095c Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
27aecb3 Updated some tests
0a9e1f6 Romoved testing profile. Corrected BNPB minimum needs profile.
12fbe2d Merged develop into branch
b260c2d More pylint, pep8 and spelling improvements
4405f7a fix typo for documentation compiling
c87e3ba more pylint
2d3fa65 imports cleanup
605abc7  fixed pep8 and pylint
90af38e Merged develop
95e4d4e merged develop
59800d4 PEP8
f4f62b1 clean up
177ec93 allow generating xml without writing to file
c8b9e0c Removed the minimum_needs tab from the options dialog
b4bf991 Hot plug the new minimum needs into the IF after saving
4412ce1 Setup export functionality to use the correct extention if none is given
2fe44ad added initial read write suport for non file based layers
bed6f44 XML Template can now use the values from safe.defaults.get_defaults
0b02d02 new profile and fixed edit resource
162a712 added gui capabilities for setting defaults for iso metadata. I used the already present DEFAULTS method so that we have a central place in safe with all the defaults.
a169dc5 [Volcano] PEP8.
a9f8b3a Merge remote-tracking branch 'aifdr/develop' into volcano
dccc005 [Volcano] Add 'other' building type.
9662e85 Save and save as profile
880585f Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
05d9f36 changed target_field to affected_field
c08239a Keep the current profile as the default
fa264f9 file based profiles
b0a7668 Merge pull request #1254 from akbargumbira/flood_IF
261ddf0 Address Charlotte and Tim's feedbacks.
457d098 Merge branch 'develop' of github.com:AIFDR/inasafe into flood_IF
f4ea8b3 Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
a118e1a merged from develop
825e63b add edit options created. Access parameters outside method in which they where created.
5b73a25 added tests for writing xml metadata
f48962c added read keywords from iso file. not handling errors yet
96be77c replaced teplate with one generated at http://inspire-geoportal.ec.europa.eu/editor/
4658860 Merge pull request #1286 from assefay/assefa_clip
15e447a Fix wrong method.
6f46f87 Fix wording.
bd2ecfd Change the way we adjust the extent so that user's extent won't get cut.
ee1cb0c Merge remote-tracking branch 'assefa/assefa_clip' into marquee
c5c8129 Use explicit extent in tests to make them more deterministic
232a9d7 Adding the parameters tool
f0370d2 Merge branch 'develop' into marquee
67fc44b Merge pull request #1303 from timlinux/develop
c2350ca Reverted north arrow corrupted by compression.
6289a45 Fix failing test
9258f55 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
6e0e6a9 changed format for analysis result
e4ac50e #1301 Update adjust_clip_extent to use two dimensional cell size.
d26e19c Fixes and tests in progress for user defined extents
fc9139c changed text
073a8ad set total_impact for calling total population affected
d7c0961 Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
27e0660 greener code
6136fee Fix failing tests caused by alignment.
149e899 [Realtime] Update realtime related to #1301.
20fb2f5 Resolved merge conflicts
c00f1fb State saving added for user extentsso they are restored when re-opening QGIS.
cf14dc5 #1301 Make get_wgs84_resolution function return tuple containing cell_size_x and cell_size_y.
17a2f97 Coding standards.
1b5ea3d In progress state saving for user analysis extent
8860f28 Updated save scenario tool to take into account user defined analysis extent if present
bfc488d Merge branch 'develop' into marquee
0e0fc37 added tests for writing xml metadata
c8b6a83 Fixed issue when marquee selection is cancelled and tool was not reverted
863d4f3 Marquee selection now working - analysis is constrained to that extent
6703cd6 More cleanups for user analysis selection and extents and crs propogate back to dock now. User analysis extent rubber band displayes nicely.
a52e179 added note about CDATA in ElementTree
171b53b refactored all into an own module and added support for CDATA in ElementTree
42f9f3d Also adjust the extent for the case hazard==raster and exposure==vector so that the hazard will be clipped properly.
6f477d1 added 'categorised' for unit options
afadf2e initial implementation of raw writing of keywords in an xml template
05bd952 In progress hookup of extent selector to dock etc.
acbaa84 Merge remote-tracking branch 'origin/develop' into assefa_clip
b813df9 Update exposure description.
940dfaa Address Charlotte's feedback.
8ecc222 In progress updates for user analysis extents support. Persist rubber band extents for last and next analysis extent when rubber bands are toggled. Implementation for slot for user extents. Refactor code in dock to avoid duplication.
a89d81c Merge develop upstream.
4454bcf changed back constant to linear.
23c3069 removed unused line
06c1254 Merge pull request #1295 from akbargumbira/reporting
306d3dd Merge pull request #1235 from ismailsunni/point_building
6ba5091 make test
bb5c01e Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
c8c2d3c make test
fd97579 Fix merged conflict.
26351d0 Fix merged conflict.
dfc709d Merge pull request #1282 from cchristelis/inasafe-1239-population-rounding
74ad359 incorporated Ismail's comments
4dc0df9 Moved minimum needs to its own window
f164543 fixed pep8
b183bfc fixed pep8
e8aad76 change border
f3e4b0d [Reporting] Dont print as full page, instead allow the method to specify page margin.
193bb53 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
1743c3a fixed styling
775185c [Volcano Building] Fix Unit test.
81c5923 [Point building] Fix unit test.
cee6778 Merge branch 'aifdr_develop' into volcano
360fb97 Pep8.
a8da790 Fix conlict test.
f34bb5e fixed pep8
04e0efc Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
499674b More small marquee tweaks
d29121a Incremental improvements to extent selector
0bea075 test_map seems to be a bit random...
58eda16 Fixed safe_qgis side tests
f7a6eb6 In progress support for extents selection for analysis. Reorganised dialog to be more compact and get rid of some cruft.
7a65f8e In progress support for extents selection for analysis. Interactive setting of marquee now works - still needs to by used by dock prior to running analysis.
fd29442 fixed assigning of damage attribute
432c269 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
878e969 (upstream/master, origin/master, master) Merge pull request #1291 from timlinux/master
08ad884 Possible remedy for #1287
5deead8 Fixing tests
0b48ad6 In progress work on marquee selector
4b114b1 Merge pull request #1289 from timlinux/issue-1287
96eaa9f Move adjust_clip_extent to clipper module.
ca5dfcd (origin/issue-1287) Possible remedy for #1287
2246f1f Charlote got hawk eyes. Use repr function in order not to lose precision of the extent and cell size.
1da2582 Optimise allignment of the clipped layer and provide tests.
afe3787 added generic [categorised] on keywords dialog
44e7f95 changed border width to 0.1
56d179e fixed assigning other values not in parameters as not affected
8ad0bfa assigning other values not in parameters as zero
44c0e99 Merge remote-tracking branch 'assefay/develop' into assefa_clip
b5e9f5f Merge branch 'develop' of https://github.com/assefay/inasafe into generic_categorised_hazard
e449447 Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
eb14eb9 added borders
eed36f8 In progress support for analysis extent definition.
54f93b2 Merge pull request #1260 from akbargumbira/jenkins_qgis2.4
8f50448 Merge pull request #1283 from akbargumbira/develop
e1eba00 Merge pull request #1285 from akbargumbira/test
d96dab1 tests updated
96b3ef7 Update tests
4de614b Update hash test data.
18496d1 Delete unnecessary test.
d35fee2 Fix failing local tests.
e9d7719 Merge remote-tracking branch 'origin/develop' into test
61a9d8b Don't use grid from inasafe_data and rather use it from inasafe test data.
5aaee6c In progress creation of new analysis extents tool
4189a65 Merge pull request #1284 from timlinux/marquee
137de7c Fix small bug where inasafe toggle icon is incorrect when QGIS starts if dock is closed in session restore. Bumped version to 2.2.0 beta
1dd5574 #1188 Delete scenario files under files folder. We can access them from data.inasafe.org
04ca0b0 changed border color to black
5f0cca8 Merge branch 'develop' of https://github.com/AIFDR/inasafe into generic_categorised_hazard
de60928 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
752c9d8 adding mode
770e67b Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
d3586bb select row to for clarity
212bf8b Merge pull request #1269 from timlinux/compressed-images
f3de726 (origin/compressed-images) Fix for messy looking logo in header bar of docs
5e9fc12 Dont use degraded wizard icone image
1628a56 Merge remote-tracking branch 'timlinux/compressed-images' into develop
1d76ecd Added dropdowns on new lines. Added note that changes only take affect after restart. Widened the the dialog to hopefully show everything even on Charlotte's PC.
e0f20a6 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
c29214e Update after merge also changed 'to' to 'up to'
dc0d0d0 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1239-population-rounding
042ebe2 Updated the volcano evecuation IF
fc41794 Updated rounding
20baf31 generic
a12e22a Added generic IF for buildings and population
61472a4 added unit_categorised in metadata
f401db1 added flood [categorised] to keywords dialog
1d476ab change linear to constant interpolation
50c3667 added generic hazard impact function for buildings
a8d087a Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
43422a2 (compressed-images) Compressed all images
ec95c3d Added image compression logic
0c940e6 align result raster to exposure or harzard #344 #710 #344
341efe1 Merge remote-tracking branch 'upstream/develop' into develop
e34c0f7 align result raster to exposure or harzard #344 #710
18afeaa Update script to use qgis 2.4 for jenkins.
3f72514 Merge remote-tracking branch 'upstream/develop' into develop
34c32ea Added tests for minimum needs.
6fc588a Update minimum needs class
b404236 - Get minimum needs from QMinimumNeeds. - Make minimum needs handling generic.
3aefe1b Updated minimum needs table creation in IF.
3dc6313 Faster flood OSM Building IF.
fe874f1 Quick hackfest on Flood IF.
a1ab64a Updated the minimum_needs tool to include editable drop-down fields.
5f90598 Updated the minimum_needs tool to include editable drop-down fields.
d513aab Updating docstrings and other pep and pylint requirements
173d404 Minimum needs added all event connections, added doc strings, added import export and add/remove row logic
13dc655 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1230-minimum-needs
394db16 Minimum needs interface - updating needs works
93455de Pep8 and pylint.
5346d03 Fix typo.
6fbcffc Breakdown result by building type.
6234536 #1183 propagate interpolation mode
d29fc61 Merge remote-tracking branch 'upstream/develop' into develop
7a9ac43 Volcano building impact to give exposure as the result, not the hazard.
7ccd419 Merge branch 'aifdr_develop' into volcano
6ea9c46 Point for building volcano impact function.
a9cdcce Fix for #993
ada6dde Add point for building in flood_osm_building_impact.py
d3a1b40 Snap to pixel edge #1083
57d5081 Better unit tests.
cb85813 Add total needs to impact layer's keywords.
7dba91f Fix merge conflict.
164d427 Add get total needs for impact layer.
43ef1fd Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
9a51d35 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
042185d First try
0038e06 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
5680359 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
fb2804e Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
afd1298 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
3f54359 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
27175e3 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
483b45b Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
54d16a5 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
db042c2 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
cac6717 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
f12766a Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
b8b3fc8 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
2393b4b Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
0b3b7af Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
9c329d2 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
8e42eb6 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
d3b97fe Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
f25e56e Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
4f1936b Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
bb947c0 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
ba7cccd Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
fe79d9c Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
8e4dacc Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
fc7841d Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
d887cfd Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
7723c34 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
0c36349 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
98a49dd Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
6964574 fixed merge conflict
b4106c6 fixed merge conflicts

Changelog for version 2.1.1
================================

a8ec132 Update changelog.
f969da5 Bump version 2.1.1 and update changelog.
87e30c1 Merge branch 'aifdr_develop' into version-2_1_1
98df3b5 Merge pull request #1266 from timlinux/develop
380d343 Also build travis on master changes
85437c9 Merge pull request #1264 from timlinux/faster-line-intersect
daae132 Merge remote-tracking branch 'origin/develop' into faster-line-intersect
303041d Merge pull request #1262 from timlinux/travis
8a4427d Fixes for travis building and merge changes from akbargumbira
634a779 Merge remote-tracking branch 'origin/master' into travis
02960e2 Simplyfy polgyons with level 1 before intersecting roads for faster performance.
78381f9 Add changelog.
605b363 Merge branch 'master' into develop
cc62c80 Use AIFDR repo for Travis badge in readme.
5e9978d Merge pull request #1257 from akbargumbira/tsunami_IF
9b1f860 Fix  for python deps not being installed in travis
95292e8 Use make testdata in travis rather
b0dea59 move some travis logic into before install so that we can split testing time
3574798 Update translations.
e30edd3 Checkout test data and add processing to python path before trying to run scripts.
2fdead3 Fix conflict of merging.
6fb6794 Merge pull request #1263 from ismailsunni/version-2_1_1
9a0b10e Merge remote-tracking branch 'timlinux/develop' into develop
6ab88b3 Comment out unused vars in flood on roads gdal IF
2508c65 Fix failing tests and green dot.
7be0f1c Code formatting tidy-ups only
a813f85 Merge pull request #1259 from ismailsunni/fix_jenkins_test
0236b00 Pylint and update hash for image checking in jenkins.
98317b4 Merge pull request #1258 from akbargumbira/develop
ea8e129 Update the hash of the last commit in inasafe_data.
ac5abe3 Merge pull request #1250 from akbargumbira/inasafe_1112
49633db Update branch with develop branch.
92074e5 Merge pull request #1249 from akbargumbira/inasafe_1233
94e67a6 Update translations.
7b92635 Update wording from Charlotte's feedback.
42aa51e Update the failing tests.
b7495f7 Change the wording to female count and some coding standards.
98278ef Update wording related to population.
e853d54 Change the position of overlapping elements.
c4f5654 Update template using QGIS 2.4 and set print as raster to True.
b4a8679 Changing density to count.
8165f46 Merge pull request #1208 from mbernasocchi/inasafe-1191
63e6c05 Disconnect only our own slot
a23f373 fixed typo
fb80742 Merge pull request #1222 from akbargumbira/develop
b4f7c28 Update control files in regard to water minimum needs changes #1193.
a186c1d Merge pull request #1215 from akbargumbira/develop
a1133a0 Update test after the fix of clean water.
39e0acf Update control file for clean water minimum needs changes in tests.
8080b5c Update some hash.
843e28c Keep up with QGIS latest version for testing.
177dc7d Merge pull request #1210 from cchristelis/develop
0ab342b Merge branch 'develop' of github.com:AIFDR/inasafe into develop
5bc457d Updated test behaviour to match new nan for nodata behaviour.
78e7b2d Added nodata handling standardization to only use nan's. Update loaded data to have nodata values set
c171a27 Fix failing test (due to minimum needs update).
139bc55 297 - Rework raster layer to read on load not on get data.
50309f1 Merge pull request #1209 from cchristelis/develop
4227b34 Undoing merge/rollback issues
8e5c5da Merge branch 'develop' of github.com:AIFDR/inasafe into develop
9657e96 refactored FakeLayer class to utilities for testing
d3d8860 added test. closes #1191
36679d5 Added connection to set a layer's title in the kw directly from qgis legend
a7ff6f0 Merge pull request #1204 from assefay/develop
fa3bf4b Try to force multi-line strings to line strings #1152
2b8dbc4 Merge pull request #1192 from assefay/develop
4769c64 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
1418928 Bug Fixing: #341 - remove custom ordered dict and replace it with built in
b976cb3 Merge pull request #1126 from ismailsunni/fix_1114
4a1322a Fix merge conflict.
0ce918b Bring minimum needs test up to date with the new weekly water needs
39fb2ec Bug fix: #1193, Minimum water needs changed from 105 to 67
ec9c428 Merge pull request #1197 from akbargumbira/develop
28ac6af Use get version instead of hardcoded inasafe version.
830c099 Fix failing realtime unit tests.
0a202fd Merge pull request #1194 from timlinux/develop
34ecc2d Green dot for shake event
0c3a673 Use unaryUnion to combine polygons #1189
912a404 Merge pull request #1187 from akbargumbira/develop
81879a5 Add its own environment for realtime.
0dfe625 Dont bother to continue the process if the sftp contains no shakemaps.
9c07a0e Merge pull request #1177 from timlinux/develop
7206df7 Merge pull request #1185 from akbargumbira/develop
bc4f9ea Update translation.
a2a8f02 Add software tag for realtime report.
17bff35 Merge remote-tracking branch 'origin' into develop
4655f25 Fix incorrect quote style
c9b9f8d Merge pull request #1175 from akbargumbira/develop
fdd6ca1 Fix  #1174.
0deb79c Merge pull request #1148 from akbargumbira/develop
ba96af0 [Realtime] Skipping test pickle reader. We will get rid of that pickle things next version.
25cd399 Merge pull request #1147 from akbargumbira/develop
09a71ba Merge branch 'develop' of github.com:AIFDR/inasafe into develop
b2a0788 Add new make-public script.
0bf45eb [Realtime] Deleted web resources files.
037eac4 Merge pull request #1145 from akbargumbira/develop
8c8f88b [Realtime] Fix failing tests.
e3f3d2c Merge pull request #1144 from timlinux/develop
2f1f857 More realtime refactoring for code compliance
03c6f87 Sofcode sqlite path for realtime
a0710a7 Merge pull request #1142 from akbargumbira/develop
f0c304c [Realtime] Port needs to be int.
ce6cb9e Merge pull request #1140 from akbargumbira/develop
8d7cd85 [Realtime] Update inasafe logo.
cf87741 Merge pull request #1138 from akbargumbira/develop
7c52c83 [Realtime] Fix wrong resource location.
45c9199 Merge pull request #1137 from akbargumbira/develop
aee070e [Realtime] Fix typo.
60bf24b Merge pull request #1136 from akbargumbira/develop
08ca611 [Realtime] Add more descriptive docstring.
da45c5e Fix wrong env variable
c1890f6 Wrap sftp configuration.
9d499cb Merge pull request #1134 from akbargumbira/develop
cd49e6f [Realtime] Allow sftp configuration to use port.
82596a5 Merge pull request #1133 from akbargumbira/develop
480a63b Dont translate minimum needs item for now. Will be addressed on the new design
40a6ceb Merge pull request #1131 from akbargumbira/develop
13ff755 [Realtime] Add id locale on making the report to ensure the translation is working properly on realti
5038bfe Merge pull request #1130 from akbargumbira/develop
095dabb Merge branch 'develop' of github.com:AIFDR/inasafe into develop
55486ed [Realtime] Fix map canvas rendering issue in QGIS 2.4
dbc8fa8 Merge pull request #1129 from akbargumbira/develop
008562b [Realtime] Adjust some configurations to suit the deployment.
e73b8e9 Update unit test for code coverage 80% #337
aaeffd9 Pep8.
0acc93a Merge remote-tracking branch 'origin/develop' into develop
a1476a7 Fix #1114, failure in single test.
126b8a2 update ubuntu12.04 test png
3193760 Merge pull request #1122 from akbargumbira/develop
6b6319a Delete and update some test control files and address Map Legend class coding standard.
254595d Merge pull request #1121 from akbargumbira/develop
b48eabc Fix render html to pdf and use lower dpi to fasten test.
711d9e5 Merge pull request #1120 from timlinux/master
00bcf1c Merge pull request #1119 from timlinux/develop
2613cae Test checksum fixes for test map
ec52b04 Merge pull request #1118 from akbargumbira/realtime_tests
5f7b5eb Used temp folder to do testing to keep inasafe_data clean.
06f8306 Merge remote-tracking branch 'origin/develop' into develop
40f5a63 Merge pull request #1117 from akbargumbira/develop
2588fbb Use a fresh (not fresh instance, but a clean one) for each test.
e275178 Keep record of registered layers in our testing CANVAS.
cc209ae Merge remote-tracking branch 'origin/develop' into develop
7de608d Coding standards.
04cba1e Merge pull request #1113 from akbargumbira/develop
dbe32b8 #1097 Add more tests in realtime. The coverage is 86% now.
3fb669f Merge pull request #1108 from timlinux/develop
a658d81 Added checksums for tests when running make (different to pycharm)
69b25ad Merge pull request #1107 from timlinux/develop
c0ded39 Deprecate use of addMapLayer in favour of addMapLayers([]) as the former causes some tests to fail un
195f601 Merge pull request #1106 from timlinux/develop
9925947 Fix for render checksum in test html renderer.
cdf34ba Merge pull request #1104 from akbargumbira/reorder_report_table
2644b75 Fix failing related to report hash since we changed it.
a8156fb Merge pull request #1103 from akbargumbira/reorder_report_table
7f843a7 #761 Reorder impact report (the table one)
9571da6 Merge pull request #1102 from akbargumbira/develop
d02b19c Fix PEP8 and Pylint violation.
d4e4e86 Merge pull request #1101 from akbargumbira/error_windows
8216bde Delete the folder testing after test_check_aggregation test.
3c69be1 Don't use our singleton object on instantiating Wizard Dialog on tests.
3019352 Merge pull request #1100 from ismailsunni/keyword_dialog
455fd22 Pep8.
00c808a Fix failed unit test. Wrong indentation.
a584569 Fix failed test. Backward compatibility.
6166ceb Merge pull request #1093 from ismailsunni/keyword_dialog
4f28234 [Wizard] Get global default and do not use value from metadata.
a81e5cd Update translation.
71c303c Translation file updates
0e2dd58 Merge pull request #1096 from ismailsunni/develop
475f131 Mispelled.
15c54fd Merge remote-tracking branch 'origin/develop' into develop
7d1499c Make test pass.
39f0db0 Merge pull request #1095 from ismailsunni/pep8
c470e7a Pep8.
c1f7d77 Merge pull request #1092 from cchristelis/feature/handle_duplicate_class_names
9827296 Merge pull request #1090 from cchristelis/develop
eec23cd [Fix Bug] For #1088, locale agggregation attribute.
77a2833 Raise an exception when adding a duplicate impact function name.
f84c913 [Fix Bug] Small bug in wizards.
317df4d Standardized all impact function population impact. (issue #910)
6a3b73e [Fix Bug] Enable ratio default when use global default.
6bb245a Fix failing tests on windows.
8e9bac1 Merge pull request #1087 from akbargumbira/error_fix
a81ca68 Warn user for using filtered layer on opening keywords editor.
2675a50 Merge pull request #1082 from ismailsunni/translations
bd94328 Compile translation.
0caed28 Merge pull request #1081 from akbargumbira/develop
f3605e6 Force our QGIS APP on testing to use API v.2
9c68463 Translation file updates
b99ecb1 Merge pull request #1080 from ismailsunni/green_code
c5b4855 Merge pull request #1079 from akbargumbira/develop
d16ece0 Delete unused third_party.
f1fb65a Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ab75a3f Make a separate QGIS configuration for testing purposes.
da327e4 Greener code.
277393f Greener code.
359a4fe Merge remote-tracking branch 'origin/develop' into fix_bugs
de49ec5 Merge pull request #1077 from timlinux/develop
ed9f98c [Fix bug] Delete bad code.
b1d7c85 Better logic formulation for user specification of whether resampling is allowed.
0a16818 Implemented logic to suppres exposure resampling as per @assefay's suggestion in #1008
89c62bf Merge pull request #1076 from ismailsunni/green_code
a1805bb Tim's review.
ef2e21c [Green Code] Remove unused code.
4988437 Merge pull request #1075 from assefay/develop
592fee7 Pep8.
1ec0e35 [Green Code] Code standard and fixing for api-doc generator.
f1a1a0c [Green Code] Coding standards and docstring.
acaeb34 fix flood on roads: adjust clip extents used for the  raster #1030
190a71a For fixing inasafe-doc.
920e15a Merge remote-tracking branch 'origin/develop' into fix_wizard
c9a9020 Merge pull request #1074 from akbargumbira/develop
59abb24 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
f86c0f0 Fix translation issues on windows.
ae4bc70 Merge pull request #1073 from akbargumbira/develop
ff6d355 Fix failing tests on windows.
1ac1673 Merge pull request #1072 from akbargumbira/develop
12020d1 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
bf37d7f Merge pull request #1070 from akbargumbira/develop
9fd8462 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
bd8b9f4 [Realtime] Use simple keywords name to pass the tests on windows.
314f51c Merge pull request #1071 from timlinux/develop
1edb7e7 Fix pylint error in qgis_interface.py
bbcbb0c Some Tim's workaround for failing tests in windows.
475c58e Merge pull request #1069 from timlinux/develop
fde2b48 Fixed failing tests on ub14.04 since version update.
875865a Fix failing tests on jenkins caused by version change.
67061ac Merge pull request #1068 from timlinux/develop
9a863da Added 'final' designation to version in metadata.txt for 2.1.0 release.
939500e Merge pull request #1067 from timlinux/develop
7d15414 Resolved merge conflicts
53c2275 Updated resources file
f20b568 Removed the 'MINE' designation from flood impact on roads gdal IF. Annotated flood impact on roads qg
8803ae6 Merge pull request #1066 from akbargumbira/develop
fc31b4c Fix shakemap converter tool.
56c47d6 Merge pull request #1065 from akbargumbira/develop
2c5bc30 Fix last pylint violation.
d18ca53 Merge pull request #1064 from akbargumbira/develop
2d5d0b6 Pylint, remove trailing spaces.
f846c16 Merge pull request #1063 from akbargumbira/develop
f573531 Fixes for Pep8 Pylint violation and failing test of realtime.
ea5d196 Merge pull request #1062 from akbargumbira/develop
b00c262 Pep8 Pylint fixes.
656e115 Merge pull request #1061 from akbargumbira/develop
471ef01 [Keywords Dialog] Age ratio will be validated if it's postprocessing layer.
080b0bb fix compile problems with documentation part1
b51bcef Updated changelog in metadata file
e393508 Changelog update
a9b69a8 Refactor to rename some IF's to more sensible names.
478cc68 Merge pull request #1060 from akbargumbira/realtime_2.1
4971e8b Added a note about enabling sentry in run-env-linux
268aac3 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_2.1
50d1d67 Merge pull request #1059 from timlinux/develop
