Python-safe

================================

40c5ad2 (HEAD, upstream/develop, develop, 3.2-release-prep) Merge pull request 2394 from lucernae/translation
5d9cabb translation
cfbeaff Merge pull request 2391 from ismailsunni/develop
b597c15 Merge pull request 2386 from timlinux/inasafe-2265
0b14adb Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
635e327 All is translated.
2570d94 Update strings.
2f18f08 Update translation from transifex
513e334 New string to be translated.
4e941fb Composer template update for A3 Landscape - see 2265
00ecadf Commit missing template changes for 2265 fixes
1bcaa23 Merge pull request 2387 from ismailsunni/develop
e61cf6c Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
3d7d1b8 Merge pull request 2383 from ismailsunni/develop
6c598a0 fix for 2265 - improve map layout and fix inconsistencies
7b13a75 Fix typo.
8983f5c Put new string inside tr().
39b5474 PEP8.
3a1fd6a Rename Null name field in aggregation layer to Unnamed Area [feature.id()]
ccf512d Add handlers for Null in messaging item and abstract_list
b513b65 Rename Null value for attribute's value in aggregation layer.
2b0da22 (origin/develop, origin/HEAD) Merge pull request 2377 from timlinux/inasafe-2313
fff2e8c Merge pull request 2379 from ismailsunni/apidocs_2
06e9529 Merge pull request 2378 from timlinux/2210
2e85e93 (origin/2210, 2210) Fix syntax error in aggregator.py
e037939 (origin/inasafe-2313, inasafe-2313) Fix failing test in 2313 branch
34145a7 Further enhancements for 2313 - improve keyword display. Added if branches for cases when we want to show values from definitions.py rather than keyword literal.
d6bd562 Further improvements to keywords display in dock. See 2313
8357391 Merge pull request 2375 from lucernae/realtime
dd17599 fix 2210 - Use context based feedback during analysis to properly reflect what clipping behaviour is in place.
4ba88f2 Merge pull request 2374 from timlinux/3.2-release-prep
e96dcea fix 2342: change report message
f3d2c8d Removed stray comment in keywords_io
ea18d12 fix 2313 - Use sensible ordering for keywords in dock.
eca7688 (inasafe-1212) Merge pull request 2371 from lucernae/realtime
ae22d3d (origin/3.2-release-prep) Updated metadata for release
f6e4f9e Fix potential bug with realtime extract process:
b9758be Merge branch 'develop' of git://github.com/AIFDR/inasafe into apidocs_2
33ad557 More explanation for make target.
82d5254 Fix favicon path.
a457496 Update directory again.
476d781 Update conf.py and make target
5937bbc Move to proper directory
c4129d3 Merge pull request 2368 from timlinux/inasafe-2367
c4d1a6e Update make target for apidocs
f2d18db (origin/inasafe-2367, inasafe-2367) fix 2367 - regression caused by 2322
c25bbca (inasafe-2357) Merge pull request 2364 from timlinux/inasafe-2322
6a6ead5 Update directory for better separating.
0b26209 Generated file from sphinx-quickstart
b0d05a1 (origin/inasafe-2322, inasafe-2322) Fix docstring in add above layer method
240e33e Use single line for method signature in add_above_layer as per ismailsunni's PR review for 2364
10ce427 Fixed failing test for add_above_layer method in dock
b64b590 Remove old api-docs
d58ef29 Add make target for apidocs
1e1eccb In progress added tests for add_above_layer for 2322 - still failing though
35a7846 fix 2322 - ensure impact and intermediate layers are added directly above exposure and aggregation layers respectively. I also made various other tweaks and optimisations to the related code paths in dock.
cdfcacc Merge pull request 2363 from ismailsunni/develop
63c8f41 Set legend title for generic and volcanic IFs
cef2158 Set legend title for road IF.
a135c14 Set legend title for population IF.
b7d9247 Set legend title for flood building.
e8c733f Merge pull request 2360 from cchristelis/bugfix/2318
f594d63 Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2318
2a98cd6 Fixing removal of large numbers in postprocessors.
687878a In progress implementation for 2322 - layer inserts but not showing in legend.
8b3a63c Merge pull request 2358 from Samweli/develop
1abf7fa Fix syntax errors for 2322
8afe885 Merge remote-tracking branch 'upstream/develop' into inasafe-2322
d6d0243 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ce3f94b translated correctly the TZ minimum needs profile
e9c502d In progress fix for 2322
7740c52 Merge pull request 2356 from timlinux/parameters
81d2d9c (origin/parameters) Second part of fix 2355 - make checkboxes to the left of checkbox labels
4da2685 Part one of 2355 fix - make checkable group boxes formatting better and remove excess widget padding.
b3188dc Merge pull request 2352 from tomchadwin/develop
2be5e4f Travus: Move python-software-properties install from pip to addons
bc3107f Travis: Install python-software-properties via pip
d1f0be7 Travis: Avoid sudo for git install
fbd9562 Merge pull request 2351 from timlinux/pep8
4f23b5e Travis: Install packages via pip
ce5e333 (origin/pep8) Fix pylint
6c2672c Fix pep8 errors
7d889134 Merge pull request 2348 from borysiasty/develop
b225fef [Wizard] Fix main icon
c4a8929 Merge pull request 2345 from cchristelis/bugfix/2318
c529521 Merge pull request 2346 from borysiasty/develop
e7a67c6 Merge branch 'develop' of github.com:borysiasty/inasafe into develop
955e522 [IFCW] Fix the test
98932ef [IFCW] Try to fix the test
babe4b3 [IFCW] Embed the Extent Selector dialog in the wizard window.
14068ed Merge pull request 2344 from timlinux/osm-url
3cdfba0 [IFCW] Try to fix the test
bddf894 [IFCW] Embed the Extent Selector dialog in the wizard window.
0b46e81 (origin/osm-url) fix 2343 - Use InaSAFE uri for osm downloader
916a23c Merge pull request 2336 from ismailsunni/develop
1dce5a8 Compile translation.
bf6159f New translation.
f2a220a Translation file updates
4a31cd9 Add proper punctuations.
075c20f Fix merged conflict.
c67b271 Merge pull request 2341 from lucernae/indicator
cdc7311 fix pep8 & pylint
c040624 Merge branch 'develop' of github.com:AIFDR/inasafe into indicator
236f393 fix 2340: correct bug to clearly get the relevant shake id
b1d4812 Merge pull request 2339 from timlinux/3.2-release-prep
f7c31ad Updated changelog for release
185a1e4 Fix for 2260 - inasafe package is too big
26634c9 Merge pull request 2337 from lucernae/fix_pylint
d11b1f7 Merge pull request 2338 from timlinux/develop
0b6c86f fix timezone issues and bug in getting the last shake map
d231495 Fixes for broken wizard tests in PR 2333 in Charlottes branch
8b33087 Merge remote-tracking branch 'upstream/develop' into develop
0c92063 fix_pylint: with some tentative modificatin
fae4fa1 (ismail/develop, inasafe-2336) Compile translation.
645b449 Add Spanish in translation.
da8f076 Translation file updates. All strings are translated.
38f50bb Translation file updates
395b4e6 Pull translation.
5642ae8 PEP8
75a6d5e Merge pull request 2330 from lucernae/indicator
945ccc3 [Wizard] String update
ebfaee4 Merge branch 'develop' of github.com:AIFDR/inasafe into indicator
2a3b7a9 fix pep8
24959f3 Merge pull request 2335 from borysiasty/develop
068437a [Wizard] Fix 2327
62c5f7d [IFCW] Properly detect layers with mismatching keywords version
952accd (charlotte/develop) update user facing names in definitions.py - take 2
4c0deab update user facing names in definitions.py - take 2
1e41f51 update user facing names in definitions.py - take 2
a899285 Merge pull request 2295 from lucernae/fix_zero_impact_exception
1c8ecc8 Merge pull request 2331 from timlinux/inasafe-2253
2c3dc2c update user facing names in definitions.py - take 2
d012926 (origin/inasafe-2253) fix 2253 0 remove scalebar from map template
009bf1b Merge pull request 2328 from timlinux/inasafe-2313
fe7c355 Merge pull request 2324 from cchristelis/bugfix/2318
c6b29ed Merge pull request 2315 from timlinux/develop
bdc682e Merge pull request 2326 from Charlotte-Morgan/develop
901ebda Merge pull request 2323 from borysiasty/develop
a6f4354 Implementation for 2313 - let the keywords table keys be shown from definitions list rather. Also refactored the keywords table generation into keywords.io so that it can be re-used elsewhere...
eb9034a fix bug in notify shakemap push
ab6034d tweak wizard_dialogue.py replace "register" with "assign keywords"
88a0d18 Fixing tests
7ff29f6 add Realtime indicator features
eb46929 Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2318
0c6a1be Hiding empty/'no data' columns
fae9eb3 [IFCW] Better explanation why a chosen layer has unsuitable keywords/type
7f87744 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_zero_impact_exception
d93a3a6 Fix untranslatable strings
ce915b6 [IFCW] Don't list xml files in the browser + pep8 fixes
231c826 Merge pull request 2307 from cchristelis/bugfix/2276
e950d2c [IFCW] Properly disable the Next button when re-entering steps with browser. Fixes partially 2282
2e258b1 Merge pull request 2317 from borysiasty/develop
8925217 [Wizard] Better prevention from creating multiple wizard sessions. Fix some simple cases of 2075
9b7d51d Merge pull request 2316 from ismailsunni/develop
654ddd7 Change text in wizard. Fix 2312
cfa59a4 Merge pull request 2314 from ismailsunni/develop
b5cf220 Added sorter for grid.xml files
f885134 Updated minimum needs post processor to fix nan bug.
93dca6e All is translated. Not yet compiled.
8470a43 Update translation string.
730d90b Fix sentence.
07efec3 Update string translation after fixing typo.
c58e338 Fix typo. Fix 2310. Fix 2309.
1a89737 All strings translated. String freeze for version 3.2
8dea44e [Wizard] Make the dialog big enough to avoid scrollbars in KDE. Please revert if it breaks anything on Windows.
2ab0678 Merge pull request 2308 from borysiasty/develop
bb40275 [IFCW] Fix 2217
612b7e2 Bugfix: don't count unaffected buildings into total affected.
89924ea Merge branch 'develop' of github.com:AIFDR/inasafe into fix_zero_impact_exception
7ba27fe fix 2220: - Earthquake Building (Raster Hazard - Vector Exposure) - Generic IF Classified Polygon Building (Vector Hazard - Vector Exposure) - Flood Raster Road (Raster Hazard - Vector Exposure)
89a5671 Merge pull request 2304 from ismailsunni/develop
754d0c3 Translation file updates
d27152c Merge pull request 2297 from Charlotte-Morgan/develop
604c343 tweak wizard_strings.py
297adf1 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_zero_impact_exception
2f9b30a Merge pull request 2303 from ismailsunni/fix_2301
8c3865c (ismail/fix_2301) Fix 2301
9911625 Merge pull request 5 from timlinux/charlotte-develop
1b637c1 (origin/charlotte-develop) Fix for unused argument error in wizard
54617e9 Merge pull request 2298 from timlinux/pycharm-in-readme
82448e5 fix 2288 to gracefully handle cases where zero impact occurs for flood polygons on buildings.
0b533ff fix 2221 - ensure override cursor is restored after an error occurs.
120b605 Give polygon flood on roads IF a better name. Handle zero impact better in latter IF. In progress fixes for 2288
83f31a8 Fix 2286 - Keyword wizard fails on to_text call
e368524 (origin/pycharm-in-readme) Updated README to include thank you to pycharm
51d4e0a tweak wizard_strings.py
0cd7c62 tweak wizard_strings.py
58d59f6 tweak wizard_strings.py
98c76c4 tweak wizard_strings.py
1dc7142 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_zero_impact_exception
845dd52 fix 2220: raise ZeroImpactException when no roads intersected
4ce19d9 Merge pull request 2294 from timlinux/inasafe-2288
c4cf2e3 (origin/inasafe-2288) fix 2288 to gracefully handle cases where zero impact occurs for flood polygons on buildings.
40086c6 fix 2221 - ensure override cursor is restored after an error occurs.
e429958 (inasafe-2288) Merge remote-tracking branch 'upstream/develop' into inasafe-2288
365b67c Merge pull request 2287 from timlinux/inasafe-2286
c7f0e41 Give polygon flood on roads IF a better name. Handle zero impact better in latter IF. In progress fixes for 2288
894e706 tweak wizard_strings.py
82b4a39 tweak wizard_strings.py
6b54159 tweak wizard_strings.py
5b88db1 tweak wizard_strings.py
28dd12f tweak wizard_strings.py
6a02dee (origin/inasafe-2286, inasafe-2286) Fix 2286 - Keyword wizard fails on to_text call
01607c5 Merge pull request 2283 from ismailsunni/develop
526935a PEP8.
9461435 Fix 2279, typo.
e51a98c Merge pull request 2280 from Charlotte-Morgan/develop
7e38671 Merge pull request 2275 from cchristelis/bugfix/2228
97441ab Update disclaimer text in defaults.py
cb440cd Update text in wizard_strings.py
7b749e5 Merge pull request 2263 from lucernae/fix_impact_merge_dialog
4d9a145 Merge pull request 2274 from timlinux/inasafe-2268
46e0183 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_impact_merge_dialog
4890424 Merge pull request 2256 from cchristelis/bugfix/2235
8f8666e (origin/inasafe-2268, inasafe-2268) fix inasafe-2268 - use nicer table formatting for keywords in dock
cf51b84 Update disclaimer text in defaults.py
f789d13 Merge pull request 2271 from ismailsunni/translation
595ab29 (ismail/translation) Update string for translation.
53771b5 Merge pull request 2270 from ismailsunni/fix_2266
b83a856 (ismail/fix_2266) Coding standard.
a8ceaf0 PEP8
54d66fc fix 2266
89ad3fe fix 2262 2233: remove ascii hacky fix.
29b9ca4 Merge pull request 2269 from timlinux/inasafe-2267
bcc8784 Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2228
ce95020 Bugfix 2228: Population on vector flood fails to run.
a031efd (origin/inasafe-2267) fix 2267 - too much padding at top of dock
996b689 Merge pull request 2264 from cchristelis/bugfix/2258
ea11479 address issue 2262
11f4873 address issue 2262
68e949b t push Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2258
bf2253c Bugfix 2258: Buildings should only be added once to total.
37c162a bugfix for issues 2229 and 2233.
b64240f Merge pull request 2255 from timlinux/inasafe-2242
443e9a7 Merge pull request 2254 from timlinux/inasafe-2241
d9083bd (origin/inasafe-2242) fix 2242 - squashed skippy in about box
f71212e Merge pull request 2251 from ismailsunni/set_all_hazard_categories
5adb360 Merge pull request 2252 from cchristelis/bugfix/2240
1db65e5 Fix icon size issue in dock for inasafe logo.
e2ddf0e (origin/inasafe-2221) Merge pull request 2246 from timlinux/inasafe-2244
7d46d93 Merge pull request 2248 from timlinux/inasafe-2245
51fa3ee Added missing icons in 2241 fix
b7df222 fix 2241 and added both blank and white variants of InaSAFE logo. Fixed logo and padding in wizard too.
4087606 Merge pull request 2250 from timlinux/develop
0640f4e (origin/inasafe-2244) Fixed corrupted about dialog
144ffea Merge pull request 2249 from cchristelis/bugfix/2222
ce36a53 (origin/inasafe-2245) One more tweak for 2245
111bbd0 (inasafe-2245) fix 2245 - lets just use a sans serif font for now - font-face is not working well in dock under osx and windows. Also the fonts are quite large and I prefer not to bloat out the package size of the plugin installer if possible.
7223736 (ismail/set_all_hazard_categories) PEP8.
976fa61 Set organisation logo in dock to false by default (boomerang issue)
52dcb99 Merge branch 'develop' of git://github.com/AIFDR/inasafe into set_all_hazard_categories
5e17ecc Fix test in test_wizard_dialog.
96184bc Update disclaimer text in defaults.py
6fe9297 Update disclaimer text in Readme
6a4acaf PEP8.
d54abbf Fix 2153
ec39191 Set all IF to multiple and single hazard.
daea29a fix 2245 UI: new look is missing bold
ba46882 Resolved merge conflicts with Charlottes disclaimer text
7cccdf9 Merge pull request 2243 from Charlotte-Morgan/develop
84e1b6c Merge pull request 2234 from ismailsunni/fix_2153_flood_on_road
16744f8 Added more padding around dialogs
05c9540 Adding road report test.
40365b4 Updated roads raster flood impact function to work with report mixin.
63f6471 Updated roads flood ploygon impact function to work with mixin.
052ea62 Roads report mixin.
17c60b6 Merge pull request 2232 from cchristelis/feature/report_mixin
8b4df19 Update disclaimer text in defaults.py
c03314d Update disclaimer text in Readme
d00dcaf (ismail/fix_2153_flood_on_road) PEP8.
b27a393 Merge branch 'develop' of git://github.com/AIFDR/inasafe into fix_2153_flood_on_road
a88170d Fix 2153
4c5c078 Merge pull request 2199 from timlinux/resources
3b01582 (origin/resources, resources) Fix last failing test in resources branch
014de92 Merge pull request 2224 from timlinux/wizard
8b93a02 Merge pull request 2227 from ismailsunni/fix_2156
acc0ae3 Merge pull request 2219 from ismailsunni/fix_2198_apply_to_develop
cb6a647 Annotated brand class to indicate which version it was added in.
9be9ecb Fixed typo causing ubuntu fonts to not load
942f7f6 Merge remote-tracking branch 'origin/resources' into maria
dfaa257 Resolved merge conflicts with css branch
50e3b72 Merge remote-tracking branch 'upstream/develop' into maria
5b894e7 (origin/wizard) Fixed failing tests in wizards caused by removal of definitions import by reinstating it and adding a note explaining why it is there. fix 2207
bcc2808 Merge pull request 2157 from cchristelis/feature/report_mixin
38ce57b (origin/css) Update another reference to logo to use brand rather
1ce8f20 Don't use javascript to do branding styling - I think it hangs tests
35c1bf1 Merge pull request 2223 from timlinux/inasafe-2221
29c2929 Merge pull request 2226 from timlinux/templates
6a2e865 (wizard) Styling updates for wizard header
5ce2478 Added styling for wizard header
16a1039 Prevent rampant resize in wizard - fix 2206
0e064c2 Bugfix 2235: Fixing earthquake population count issue introduced in c6d83eedba7852fd84a85f4392395cc65766f43a
679f2de (ismail/fix_2156) Fix 2156
5949c1b Remove many spacers and use more minimalistic layouts - working on 2207 wizard resize issue.
ee7b642 Bugfix 2240: fixing inundation problem due to bad merge at 9fc87d8cfe8d83cb3d965f018bc9a2dfaee6a233
59194c7 Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2222
a1333b6 Bugfix: Handle exception that causes OSX to crash on empty minimum needs provenance.
11fc1b7 Adding road report test.
afef20c Updated roads raster flood impact function to work with report mixin.
8a8228d Updated roads flood ploygon impact function to work with mixin.
3a10b0b Roads report mixin.
75ac27e (origin/templates, templates) Added new templates from Iwan - see 1314
14ed0cf (css) Resolved merge conflicts while applying Maria beautiful styling updates
4c39324 (inasafe-2221) Try to restore override cursor - see 2221
831b712 In progress sizing tweaks for wizard - see 2207
0985a1c Change test for smaller screen size on travis.
8cd6bc4 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
84acc82 (ismail/fix_2198_apply_to_develop) PEP8.
30b9570 Fix failed test due to cherry-pick.
ae1aeb6 Added unit test for 2132
66f7c1f Fix 2132 - backported string conversion when reading minimum needs to master branch
f76eaad Remove un-related changes.
b2ed262 returned the working tests in minimum needs
25efcdd added Tanzania minimum needs json file
cefaa85 Fixng tests.
539d394 Updating docstrings and versions.
f6744d5 Coding standards: Adding docstrings
befd3f3 Fixing issues introduced by merge.
cf19dcd (maria/develop) Style update
3a37415 Merge remote-tracking branch 'AIFDR/develop' into develop
64a6a2a (tempaltes) Merge pull request 2202 from timlinux/papercuts
740b949 Merge pull request 2215 from timlinux/ui-tweaks
01f95a0 Merge pull request 2214 from timlinux/icons
7a27805 (origin/icons, icons) Updated icons from Maria
abbac6e (origin/ui-tweaks, ui-tweaks) Make extents selector dialog help consistent with osm downloader help
25caf8c Merge remote-tracking branch 'upstream/develop' into resources
6b52a27 (origin/papercuts, papercuts) Fix another deprecated test reference to 'click for details'
8754f0d Fix for failing test due to error message string change
cfe35d2 (origin/inasafe-2206, minimum-needs, inasafe-2206) Merge pull request 2211 from timlinux/inasafe-2207
9d09bbf (origin/inasafe-2207, inasafe-2207) Fixed failing tests for 2207 - OSM downloader
7bdf3f6 One more fix for OSM downloader sizing issues
07fe396 Further fixes for OSM downloader interactions
95cdf1b Fixed context help in OSM downloader dialog
90e27ea In progress fixes for 2207 - osm downloader is too large for screen
95052c6 Merge pull request 2208 from lucernae/realtime
e705402 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
fcac293 Merge pull request 2184 from cchristelis/bugfix/2142
4ea408b Made unicode friendly, made variables explicit.
9e6a242 Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2142
14b7d5f Merge pull request 2183 from cchristelis/bugfix/2051
3c16236 Merge pull request 2209 from timlinux/inasafe-2206
ed40053 Updated help text on minimum needs calculator to include point layers as possible input types
fad38c9 Added some more sanity checking on minimum needs calculator so that it only shows fields from the selected record that are not strings - and disables the run button if a given layer has not valid fields
0691fce Resolved merge conflicts
e4d38d9 Updated help text on minimum needs calculator to include point layers as possible input types
71539d0 Added some more sanity checking on minimum needs calculator so that it only shows fields from the selected record that are not strings - and disables the run button if a given layer has not valid fields
9025785 fix 2206 - Disable ok button in minimum needs calculator if no suitable layers loaded
ab99cc1 Realtime fix: - Fix errors in realtime where hazard name is read as int instead of str - Fix some errors in realtime tests
fe77f2c Resolved merge conflicts with Maria's branch
98bb1c5 The doc section update
4ed1128 Case consistency for Shakemap Converter in menu - see 2199
e4d5a5f Merge remote-tracking branch 'upstream/develop' into resources
2773ab9 Merge pull request 2205 from timlinux/extents-selector
d5bf993 Merge pull request 2204 from ismailsunni/new_metadata_support_marco
90da7ce Merge branch 'develop' of github.com:AIFDR/inasafe into bugfix/2051
59896dd Merge pull request 2203 from ismailsunni/version_mismatch
48a4e0c (origin/extents-selector, extents-selector) Hide bookmarks and disable radio button in extents selector if there are no bookmarks. Also display a helpful message
19529eb Tidied up README
2b1ffde (ismail/version_mismatch) Disable make pylint for a while
f359e87 Apply Tim's comment.
c159395 (ismail/new_metadata_support_marco) Merge branch 'develop' of git://github.com/AIFDR/inasafe into new_metadata_support_marco
9fd1bd0 fix 1861 - dont warn about no keywords if no layer is active in QGIS
b0dfacc PEP8 Pylint
4d66357 Merge branch 'develop' of git://github.com/AIFDR/inasafe into version_mismatch
22060e9 Filter out mismatch version.
d1815b6 Remove text saying 'click for details' in error dialog
4a92688 Enable gitter notifications after travis builds
aa4bb65 Fix path to icon in metadata and remove redundant icons
626286f Add message for mismatch keyword version.
2e4fc9b Removed unused resources
1926950 Merge remote-tracking branch 'maria/develop' into develop
aa01bd5 Merge pull request 2194 from ismailsunni/develop
7f8d9d5 Merge pull request 2172 from ismailsunni/qgis-2.8.3
1c4430b Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
ad02fc3 (ismail/qgis-2.8.3) Merge branch 'develop' of git://github.com/AIFDR/inasafe into qgis-2.8.3
b14caf9 Merge pull request 2193 from ismailsunni/develop
b425227 Merge pull request 2179 from timlinux/menus
2b1e0a3 Merge pull request 2190 from timlinux/inasafe-2189
cce1264 Remove typo.
fd9b1a6 Add path.
ff1f474 Adding package.
4704d2b Add --force-yes.
ba31bb7 Logo, icon and font update
84fca79 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
a90ffe7 Add package for scrutinizer.
6e20e6c Merge pull request 2192 from ismailsunni/develop
d4f01fc Add more excluded path.
4720d66 Exclude safe_extras in scrutinizer.
c88d77d Merge pull request 1 from AIFDR/develop
4ed0a7d Merge pull request 2191 from timlinux/inasafe-2171
408496c Fix merged conlflict.

0e70def Backport from master.
88ea710 fix 1739 exception about canceled download
077d57a fix 1735 : fix tests
806eb63 Merge pull request 1738 from akbargumbira/develop
87db32b Fix Flood IF Raster on Population.
2fc8dc1 fix 1735 : improvements about the OSM downloader's progress dialog
ef3ec64 Merge remote-tracking branch 'upstream/develop' into develop
e6d81d1 Merge pull request 1731 from Gustry/fix-1730
b827129 merge develop
c81bfa5 fix 1730 grammar
fcb65cd Merge pull request 1733 from Gustry/fix-1732
f1a2d7b fix 1732 : OSM downloader : skip a feature type if one is empty
68cafcc fix pep8 and fix 1730 : improvements on the OSM downloader
3859c8d Merge remote-tracking branch 'upstream/develop' into develop
3e8ffc9 (tag: version-3.0.0) Merge pull request 1724 from timlinux/master
b5f65bf (origin/master, master) Pep8 fix
421a8d2 Merge pull request 1723 from timlinux/master
f2bf097 Fix for failing test on fedora
2d21873 Pep8 fixes
81e7d6f Merge pull request 1722 from Gustry/fix-1721
1964872 fix 1721 : fix typo
5aae1f3 Merge pull request 1674 from akbargumbira/unicode
ba6e5d8 Fix pylint issues
85e248a fix 1721 : change test and fix some language typo
847de34 fix 1721 add a locale flag in the url for osm downloader
a9d53f8 Merge pull request 1718 from Gustry/fix-1207
2ec811f (akbar/unicode) Merge branch 'develop' of github.com:AIFDR/inasafe into unicode
b8987c2 Merge pull request 1720 from timlinux/jenkins-tweaks
c587b48 (origin/jenkins-tweaks) Force locale to utf-8 for jenkins
2c6cb63 Use logo resizing logic from master
6e6af50 fix pep8
ea38f5e Merge pull request 1719 from lucernae/master_icon_change
276dc5a (rizky/master_icon_change) Update translation on the 'Layer keyword missing' interface
141cdcc add 'building points' to the osm downloader
7049199 Merge branch 'master' of github.com:AIFDR/inasafe into master_icon_change
e2121bf Merge remote-tracking branch 'origin/develop' into develop
925b98f Change icon in the description to appropriate icon
3f82710 Merge pull request 1717 from timlinux/fix-1712
eae7ed6 Merge pull request 1702 from timlinux/fix-1533
c9ec0a3 Merge pull request 1715 from timlinux/fix-1713
784f085 Merge branch 'develop' of github.com:AIFDR/inasafe into unicode
a0c546c (origin/fix-1712) [BACKPORT] Fix 1688 - disconnect() failed between 'loadFinished' and 'unislot'
b6cb606 [Unicode] Handle error when Exception.message returns Message object
22eb144 Merge pull request 1641 from lucernae/fix_layer_uri_normalization
c2b6157 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_layer_uri_normalization
c4df525 Merge pull request 1714 from lucernae/master_translation
288d332 (origin/fix-1713) Fix 1713 for divide by zero error when rescaling logo.
0924f79 Add new translation on dock interfaces
aa35fd5 Merge pull request 1678 from Gustry/fix-1225
789a152 Merge pull request 1711 from lucernae/master_pep8
358e048 [Unicode] Ensure that html to be written to file is in unicode for codecs module
8ce9d37 Fix lambda warning and changed it to use def
aa25d8e Fix PEP8 warnings
1820043 [Unicode] Fix failing test in keywords_dialog.
70c610d PEP8 fix
98a7d3e Merge pull request 1704 from lucernae/master
f22a53f Merge branch 'master' of github.com:AIFDR/inasafe
93241a4 Merge pull request 1708 from timlinux/master
4369b2b Merge pull request 1707 from timlinux/issue-1706
c2ce737 Merge pull request 1709 from lucernae/line_ending_fix
6f38dd0 Merge branch 'develop' of github.com:AIFDR/inasafe into line_ending_fix
24034cf Merge branch 'master' of github.com:AIFDR/inasafe
2110dc1 [Unicode] Write or read file using codecs module.
83a05e3 Line ending fixed
f37d3cd Merge remote-tracking branch 'upstream/master'
9686706 [BACKPORT] Fix 1706 - logo does not display in dock during processing.
617a7ee (origin/issue-1706) [BACKPORT] Fix 1706 - logo does not display in dock during processing.
588482b Merge pull request 1705 from ismailsunni/backport_if_split
904ff2f Merge remote-tracking branch 'origin/develop' into develop
68b1a68 [Unicode] Update some test data to contain unicode chars.
83c94a7 Fix unused import.
05eb165 Fix failed unit tests when backporting.
5328c15 Merge pull request 1703 from timlinux/master
cb70fcf Issue 1642: change the description to toolbar instead of plugins
d347bd0 Fix one more unit test from IF splitting.
8fb56bd PEP8.
f20cb8f Issue 1642 Update in getting started message to point out user to use keywords creation wizard in the Plugins > Inasafe menu
2fd84c3 Fix all failed unit tests related to IF split.
38895bc Fix more unit tests related to split IF.
492792c Split to flood_vector_OSM_building_impact.py
d1834c1 Fix unit test due to IF splitting.
6bd6296 Split Flood OSM building IF.
b4fc68d Fix 1699 - fix typo introduced in previous commit
ea87983 Fix 1699 - cancel button on minimum needs calculator dialog does nothing
9809d4d [BACKPORT] Fix 1694 - clear default paths if they point to Qt resource bundles.
aaa22fa Further fixes for 1533
1986d9d [BACKPORT] Further fix for 1533 - scale size nicely if logo is wider than the dock
2691468 [BACKPORT] Fix 1533 - logo is squashed in dock
52ed4ad (origin/fix-1533) Further fixes for 1533
bc01405 Merge pull request 1697 from timlinux/fix-1688
ff22f67 Merge pull request 1700 from timlinux/fix-1699
1998270 [BACKPORT] Further fix for 1533 - scale size nicely if logo is wider than the dock
4c3ea7d Merge branch 'develop' of github.com:AIFDR/inasafe into unicode
3b03780 It's OK to write None or empty string to keywords in Keywords Editor.
0a2af15 Merge pull request 1701 from akbargumbira/master
56a4a10 (origin/fix-1699) Fix 1699 - fix typo introduced in previous commit
e31534a (akbar/master) Remove unnecessary inspection.
5747827 Fix nonexistent wizard_dialog.get_exposure_layer
b8d5f42 Fix 1699 - cancel button on minimum needs calculator dialog does nothing
a8fec08 Merge pull request 1696 from akbargumbira/develop
e17e357 Merge pull request 1698 from timlinux/fix-1694
5f071d7 Change CRLF to LF
765be91 (origin/fix-1694) [BACKPORT] Fix 1694 - clear default paths if they point to Qt resource bundles.
aed69da Merge pull request 1692 from ismailsunni/split_IF
ec8a500 Fix one more unit test from IF splitting.
db73ac0 (origin/fix-1688) [BACKPORT] Fix 1688 - disconnect() failed between 'loadFinished' and 'unislot'
619b566 Remove unnecessary inspection.
023964b Fix nonexistent wizard_dialog.get_exposure_layer
1aa81f0 PEP8.
079895f Merge branch 'aifdr_develop' into split_IF
3a2a61a Fix all failed unit tests related to IF split.
1018f18 Merge pull request 1693 from akbargumbira/master
4481567 Fix more unit tests related to split IF.
a1951cc Split to flood_vector_OSM_building_impact.py
605a86b Fix PEP8
b4955b5 Fix failing tests.
1f50021 Fix Earthquake Building IF Issues 1686
1cebaee Merge pull request 1691 from akbargumbira/develop
3d570bc Fix PEP8
0c119a6 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_layer_uri_normalization
b26724b Merge branch 'develop' of github.com:AIFDR/inasafe into develop
2396554 Merge pull request 1684 from timlinux/fix-1533
f6ebc4a Fix failing tests.
43d34b0 Fix Earthquake Building IF Issues 1686
b1ddf97 Merge pull request 1682 from akbargumbira/master
d3a9891 Merge pull request 1676 from Gustry/fix-1648
621e863 Fix unit test due to IF splitting.
d4b9aa5 [BACKPORT] Fix 1533 - logo is squashed in dock
00b7eb4 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_layer_uri_normalization
8b8ba86 Merge pull request 1637 from lucernae/fix_keywords_editor
e446d1d Merge branch 'develop' of github.com:AIFDR/inasafe into fix_keywords_editor
f794eee Merge pull request 1646 from lucernae/change_dock_message
2052919 Issue 1642: change the description to toolbar instead of plugins
672c3de Split Flood OSM building IF.
c704dda Merge branch 'develop' of github.com:AIFDR/inasafe into change_dock_message
b6f248f Merge pull request 1683 from lucernae/pep8

================================

19bbe17 (HEAD, upstream/develop, origin/v3.1-prep, v3.1-prep) Merge pull request 1908 from akbargumbira/develop
b9afd37 Merge pull request 1907 from timlinux/docker
b2d512e Update and compile translations.
fe8970d Merge pull request 1906 from akbargumbira/develop
f6fa836 Standardize nan warning.
218e1df (origin/docker, docker) Rather use hosted docker repo for test builds
28c47ce Merge pull request 1905 from timlinux/docker
c9098ec Merge pull request 1904 from AIFDR/pylint
59f7b4b Fix typo nan warning.
3787fc6 Merge pull request 1903 from timlinux/pep8
a02f1f5 (upstream/pylint, pylint) Fix pylint errors
4cb8396 Fix for python path in docker
135f08d (origin/pep8, pep8) PEP8 fixes and removed some redundant code / vars
142c1b3 Merge pull request 1902 from ismailsunni/update_translation
78d15d7 Update translation.
9c0a640 (develop) Merge pull request 1898 from cchristelis/feature/1800_nan_handling
fa3b845 Merge pull request 1901 from timlinux/pylint
0e3a6c9 Merge pull request 1900 from timlinux/docker
d14cbaa (origin/pylint) Pylint fixes for release
b3d9f2f In progress work to support running tests under docker for a homogenous testing environment
9394133 Merge pull request 1895 from timlinux/ui-tweaks
f984361 (origin/ui-tweaks, ui-tweaks) Test items are equal in registry list, not lists themselves (fixes failing test)
11be6c4 Merge remote-tracking branch 'upstream/develop' into ui-tweaks
8b1d931 Merge pull request 1896 from timlinux/pep8
29432d2 Merge pull request 1899 from akbargumbira/develop
61494ee Ensure all IF's on population have ZeroImpact handle.
c120edb Merge with develop
6fa783c Better NaN handling classified_raster_population.
9a56cdc Merge branch 'develop' of github.com:AIFDR/inasafe into feature/1800_nan_handling
5789421 PEP8 fixes
6ca0133 Small tweaks for extent selector and osm downloader dialogs so they look better on osx
03d6011 Merge remote-tracking branch 'upstream/develop' into develop
7f6254e Better NaN handling - flood_polygon_population.
ea7f156 Better NaN handling - classified_raster_population.
56017f8 Better NaN handling - continuous_hazard_population.
37a4542 Better NaN handling - tsunami_population_evacuation.
b1f2a33 Merge pull request 1865 from lucernae/fix_parameters_reset_after_run
a406a39 Merge pull request 1875 from timlinux/inasafe-1861
16fb8ab Merge pull request 1891 from akbargumbira/develop
8a5ce97 Merge pull request 1894 from Jannes123/clean_resources
0cb06a2 remove duplicate text from resource file
25bedab Add ZeroImpact handle.
f235591 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/1800_nan_handling
dc334cb Fix failing tests.
40e0cce Better NaN handling - volcano_point_population.
7b9d418 Better NaN handling - volcano_polygon_popuolation.
14c1108 Update the style and metadata.
d263e60 Better NaN handling - flood raster popuolation.
d37cfd5 Fix the logic in classified hazard on population IF.
a66b70d Merge pull request 1881 from Jannes123/min_needs_precision
6b105f5 Merge upstream changes
efe1107 revert
d382f01 (jannes/min_needs_precision, min_needs_precision) docstring
8289fb7 Merge pull request 1886 from akbargumbira/develop
1cad197 Merge remote-tracking branch 'upstream/develop' into develop
8c9805b Merge pull request 1880 from timlinux/fix-1843
bec7751 Fix failing test for 1843
ffa4689 Change how we intersect the extents if the hazard is point data.
e2ed972 Resolve clipping problem by adjusting the extent in the case of vector on raster.
f8a784f Merge branch 'develop' of github.com:AIFDR/inasafe into develop
5d3a89f docstrings update
275eb8b docstrings update
655bf0a Merge pull request 1884 from akbargumbira/develop
4250206 Tweak nodata statement in other 3 IF's
f79fe79 Tweak the nodata statement in this IF.
30bf290 Rearrange the report tabulation for this IF.
3be079c (origin/fix-1843, fix-1843) Fix failing test for 1843
a003796 Fix failing test for 1843
8847c90 rollback previous precision mistake
55445ca clean out logger
e3b8973 Merge branch 'develop' into min_needs_precision
9295407 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
197cd88 added tests
adc60c6 min needs options tab floating point precision fix
b32eb62 NaN handling
4bc03b5 Resolved final comments from Charlotte
5847d33 dynamic floating point for minimumneeds profile
185f73a Fix reference to IF names in test list based on tweaks for 1843
2be3a2f Resolved merge conflicts with master
3bd26cf Merge pull request 1871 from akbargumbira/generic_polygon
5b107a8 Handle NaN in these 4 IF's.
0889889 (rizky/fix_parameters_reset_after_run) Merge branch 'develop' of github.com:AIFDR/inasafe into fix_parameters_reset_after_run
efb371d Update Classified Polygon Pops IF, Volcano Point Pops IF, Volcano Polygon Pops IF.
d3e84f5 Change interpolation polygon raster and update Flood Polygon on Pops IF.
55ff0b0 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
1ae6455 Merge branch 'develop' of github.com:AIFDR/inasafe into generic_polygon
ebdb7e3 Merge pull request 1876 from akbargumbira/develop
343b3c5 Handle NaN in the Flood Polygon on Population IF.
ebee51e Improvements to metadata based on Charlotte's suggestions. See 1843
7b0615f Merge branch 'develop' of github.com:AIFDR/inasafe into generic_polygon
13bf8eb Merge pull request 1873 from akbargumbira/flood_polygon_population
12cca0a Remove debugging lines.
7b65ee5 Add ZeroImpactException in the IF.
2a06e63 (origin/inasafe-1861, inasafe-1861) Tweaks for legend no active layer handline (1861) and roll back changes in 1811 - I have a better implementation for that coming post 3.1 release
d8942c1 Merge pull request 1874 from akbargumbira/unicode
0f47c83 Cast to unicode. The value could be other than str object.
ce8f1b2 [Unicode] Remove casting QgsMapLayer source to string.
872c9bd Improve Flood Polygon on Population to not use hardcoded attribute.
5263882 Only round total affected for presentation.
4c30971 Update Volcano Point on Population to use the new interpolation method.
7e4519e Update Volcano Polygon on Population to return exposure layer as the impact layer.
a8c4738 Fix failing test.
dc316a9 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_parameters_reset_after_run
18e112a Finalise Classified Polygon on Population IF.
0a78d76 Much faster create_classes utilising the power of numpy.
8daf921 Change the interpolation for polygon on raster
635240e Merge branch 'develop' of github.com:AIFDR/inasafe into generic_polygon
afd6b9e (jannes/develop) Merge branch 'develop' of github.com:AIFDR/inasafe into develop
dab65f5 floating point precision fix 1851
a5290f7 Merge pull request 1866 from lucernae/develop
04e7c38 (rizky/develop) Update Translations
621c2e4 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_parameters_reset_after_run
fdbdec1 Merge pull request 1864 from lucernae/fix_generic_if_postprocessors
1e9eb2c (rizky/fix_generic_if_postprocessors) Modify false logic. Fixing tests where show_intermediate_layer is enabled
7fedfe7 Fix 1863: Rerun function with the same param
7c53d68 Fix 1854: Modified aggregation to use impact layer extent if aggregation layer is not provided
e04c252 Merge pull request 1848 from timlinux/fix-1843
91662a7 More standardization on IF package name.
7c94095 More standardization on IF name. Fix failing tests.
a8cd085 Initial implementation of returning the impact based on exposure.
4efc04b Resolved merge conflicts
d9bc46a Merge pull request 1834 from timlinux/fix-1830
2c5524f Merge pull request 1858 from timlinux/fix-1857
409e7d4 (origin/fix-1857, fix-1857) Further fix for 1857 - support on the fly projection for flood on roads and flood on buildings
a6c7124 (origin/fix-1830, fix-1830) Merge remote-tracking branch 'upstream/develop' into fix-1830
2774ca7 Fix 1857 - support OTFP for flood vector building impact
25fe425 Merge pull request 1822 from timlinux/v3.1-prep
bc63a34 Merge pull request 1855 from cchristelis/develop
7daa2fc Fixing newly added pylint. Pylintpolice
a0e2475 merged upstream changes
bbc7fec Merge remote-tracking branch 'upstream/develop' into fix-1830
29497c2 Address comments for cchristellis for 1843
9ae424b Merge remote-tracking branch 'upstream/develop' into fix-1843
b1b4782 (etienne/develop) Merge pull request 1850 from timlinux/pep8
14b9c99 Merge pull request 1635 from timlinux/develop
2a67e35 Merge pull request 1760 from timlinux/fix-1484
48fceb0 Mreged changes from upstream
0060342 Merge pull request 1852 from timlinux/fix-1792
bc0b443 (origin/fix-1792, fix-1792) Further fixes for 1792
c3e7697 In progress cleanups for age based postprocessors. See 1792
c7bb24d PEP8 fixes
086002c Merge pull request 1793 from Jannes123/develop
ad906ac Merge pull request 1847 from cchristelis/develop
f6a1d95 Fix 1843 We need to review the text for all impact function metadata.py files.
b4eee74 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
a24fc25 Suppressing the buggy pylint error on Jenkins (caused by an astroid bug).
b93bfc9 Merge pull request 1844 from akbargumbira/develop
d15bc68 Change the exception message to a layman term.
6e6558b minor pylint
acee5fb in progress work for 1843 We need to review the text for all impact function metadata.py files. Also fix 1828 (don't call impact functions experimental).
4559b29 merged with upstream
20f2581 Merge pull request 1846 from cchristelis/timlinux-fix-1820
30eaa67 Validate if the IF has exactly 3 values of thresholds
9ba5907 refactor
76b0e94 alice in wonderland scrollbars fixed
557b28e Udating improvined menu layout.
9a557ef Merge branch 'develop' of github.com:AIFDR/inasafe into develop
6afc88a Fix unstyled impact layer of Continuous Raster Hazard on Population IF.
66e5c5b Merge upstream changes
b4c58af Merge pull request 1842 from timlinux/inasafe-1811
60b600e Merge branch 'fix-1820' of https://github.com/timlinux/inasafe into timlinux-fix-1820
9c5b599 Merge pull request 1841 from akbargumbira/develop
5594065 Implementation for 1811 and pep8 fix in wizard code
e59a084 Fix failing tests and PEP8.
1c38ac8 Change the name of Generic IF's for more clarity.
9b8d49a Merge pull request 1840 from akbargumbira/develop
f827677 Postprocessors are always list of Generic Parameter. Simplify the summary step in wizard.
5516b0a Merge pull request 1839 from lucernae/fix_wizard
e24dc4d (rizky/fix_wizard) Fix pep8 errors
6bfd61f Merge pull request 1837 from lucernae/fix_wizard
dc79b4e Merge pull request 1838 from cchristelis/develop
2215842 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
422b901 Suppressing unneeded errors.
108cbd7 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_wizard
43732ab Merge pull request 1835 from cchristelis/develop
efe793d revert defaults.py
37bdc4d remove default descriptions
6db3865 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ed93065 hardcode options for earthquake_fatality
588a9a5 Fix localization string and presentation error. Fix 1810 about rounding minimum needs to 1 decimal place in IF Wizard Summary. Add possible UI presentation fix for postprocessor summary
cd3ba95 Merge pull request 1833 from lucernae/test_fix
5e5dd6a correcting isinstance second argument to tupple.
e3f9bda Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ee9d5b6 Fixing pylint
9ea5f75 Fix 1830 Options dialog raises unhandled error
b359092 Removing new pylint violations
df5eb4e (rizky/test_fix) Merge branch 'develop' of github.com:AIFDR/inasafe into test_fix
ef594e2 Fix strange test caused by busy signal doesn't reset. Issue 1829
4e4e88a Merge pull request 1832 from akbargumbira/generic_polygon
21fb9f6 Remove unused variables.
6ed44cf Remove cumulative tabulation in the report.
f1ff9ec Merge pull request 1831 from ismailsunni/fix_1827
aaa19d3 PEP8.
e1614e3 Merge branch 'aifdr_develop' into fix_1827
7697e1f Update translation.
010fd37 resolved merge conflicts
41f53ae Merge remote-tracking branch 'upstream/develop' into develop
b1b11d3 Add question for [hazard]_classes_question.
1542dc1 Merge pull request 1825 from akbargumbira/develop
89551cb Merge branch 'develop' of github.com:AIFDR/inasafe into develop
d06a86e Merge pull request 1826 from akbargumbira/generic_polygon
828233f Change the default value of the hazard zone attribute to KRB for classified polygon IF on building.
7b142a2 Adding missing shx
627a2f1 Fixing broken tests.
713476f Fixed unexpected indent
cdfa909 Applied item per line convention on changes
a2fd9e5 suppress where pylint errors make no sense
8133c43 pylint merge
70a8a3e updating missing files
c60613f Fixing all pylint to establish a clean baseline - continued 2
12b54b7 Don't include Not Affected category in the total of each breakdown by building type.
215d530 Fixing all pylint to establish a clean baseline - continued 2
e792d74 Fixing all pylint to establish a clean baseline - continued 1
7229c5d Fixing all pylint to establish a clean baseline - continued
57a7b31 Fixing all pylint to establish a clean baseline
4a8a6e7 Made behaviour between jenkins and make identical
fd1d67a merging pylint changes
b33aa76 Merge pull request 1814 from akbargumbira/generic_polygon
f761e67 Fix failing tests caused by changing the question.
5d1a3db Change the question for classified polygon on building and population as the hazard is not an 'event'.
f197500 Change the color_ramp to use HSV model
feea9a4 Fix failing tests.
00fd4b1 In progess updating changelog and metadata for 3.1 release
325c496 In progess updating changelog and metadata for 3.1 release
540f343 (origin/fix-1820, fix-1820) Partial implementation for 1820 - tidy up plugin menu entries.
0975aca (inasafe-1819) Merge pull request 1818 from lucernae/develop
c2bb007 Update Translations
1be82e6 Remove the minimum needs report in the IF.
26a9bc2 Fix bugs to the total building affected + not affected
d28d7ae Add classified polygon IF on population.
235c0b9 Update metadata for classified polygon
4a6048c Add classified generic polygon hazard data.
f6400f2 Add Generic Polygon on Building IF.
8b3a5a4 Merge pull request 1806 from akbargumbira/inasafe_1795
3dec8f6 Merge pull request 1804 from akbargumbira/inasafe_1727
c245a5b Update scenario file for batch dialog test.
f4ef5cf Don't enable load standard layers tool if it's not final release.
95f055a Fix failing test after removing the old flood IF.
2158d5d Remove Flood Polygon on Building IF using the old style.
b38e3bc Merge pull request 1801 from akbargumbira/develop
fe6b033 Add volcano point on population in test_registry.
fd42c16 Fix Ole and Ismail in VolcanoPolygon on Building. Get the hazard zone value from the layer itself.
e38e8e4 Fix wording.
8af0c2c Separate volcano IF on population between point and polygon hazard.
c2cf01d Merge pull request 1794 from lucernae/develop
7044275 Bugfix related to 1675: when we have errors in the IF run method, the cursor still displayed as busy.
410e0e7 Update translations
ac3e6be Merge branch 'develop' of github.com:AIFDR/inasafe into develop
c8ddd91 Merge pull request 1791 from ismailsunni/translation_update
2341707 Translation update.
f0b9dd1 Merge pull request 1790 from lucernae/develop
95847de Update translations
0bbc05e Merge pull request 1789 from lucernae/develop
5996c89 Add Indonesian translation
5538fbf fix unused import
460f29c Merge branch 'develop' of github.com:AIFDR/inasafe into develop
659dc60 Merge pull request 1787 from lucernae/develop
6729011 PEP8 fixes and remove unnecessary key-value pair in metadata
a2886e8 Merge pull request 1786 from lucernae/develop
ca4f2cf Bugfix Issue 1784 : Add file exist and zero heights checks
1981370 parameter descriptions
342921a Resolved merge conflicts
b104832 Merge pull request 1783 from akbargumbira/develop
8185001 (akbar/develop) Add French translation.
085806b Merge pull request 1782 from akbargumbira/develop
36156af Remove unused test data.
dc1b15a Merge pull request 1780 from akbargumbira/test
d1c5d83 (akbar/test) Address Pylint violation.
1d563de Use local test data for test_wizard_dialog
2c166a5 Merge pull request 1779 from akbargumbira/develop
690bb44 Update translations.
7a2e49a Update config file for transifex pointing to the new project for inasafe.
4b9bc9c Merge pull request 1778 from akbargumbira/develop
6e83a85 Remove 'disable_for_entire_area_aggregation_param' postprocessor parameter.
56efd0d Merge pull request 1756 from akbargumbira/IF_OOP
6f95503 (akbar/IF_OOP) Address PEP8 and Pylint Violation.
1692edc Merge pull request 1771 from Gustry/fix-1770
c93f70e Fix failing test caused by new building report for some IFs.
a8cf8a5 Remove _tabulate method in IF dealing on buildings.
8cdd4b2 Add building centroids in the load_standard_layers method.
eabda00 Merge pull request 7 from cchristelis/IF_OOP
430185e Only use the formatted building type name for the report.
2adbd12 Restore original state of test data
182d243 Adding test cases for buildings specific ReportMixin
07cd9da Tests covering the Report Mixin base class
83dc512 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
42f2ca0 Tests covering the Report Mixin base class
f8ab7e0 Fix failing test in safe.impact_functions.
5492db7 Merge branch 'develop' of github.com:AIFDR/inasafe into IF_OOP
6bcc4a0 Merge pull request 1773 from akbargumbira/develop
295debd It's more sensible to load defaults minimum needs if there are more than one profile exist with the same locale.
12122eb Move volcano point test data so that it overlaps with other exposure.
c692362 Fix the error raised in case of the building data is centroid.
8720861 Add building centroids test data.
dbcddb0 Code compliance housekeeping
82baba3 Updated Volcano point IF to work with now ReportMixin
1a2810f Update Volcano Building IF to use new ReportMixin
11e0efc Update Vector Flood OSM building IF to latest ReportMixin
1335b99 Updated flood vector qgis IF to work with Reports Mixin
e333cac Give default locale if locale from QGIS returns None
d9164f9 Fixed typo
a6a869f Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
e623a08 Mixin cleanups
dd88894 Updated flood raster osm IF to use report mixin
eb9e587 updated Earth Quake function to use class attributes as the means of passing impact breakdowns
b83ecf9 PEP8 issue fix
9d45c78 Use QGIS app test configuration for this impact function.
5ed4d96 Fix sor_by_locale of sorting needs profile in case locale passed is None.
d38c935 Fix the wrong logic of disabling running a postprocessor via param 'disable_for_entire_area_aggregation'
20ff50b Use instances rather than passing the same properties all around.
b8f163e Updated to work with generic IF
07d48c5 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
34c3e90 Emit function combobox changed from needs manager dialog to update the minimum needs in option.
90e2306 Updating Mixin/Earthquake IF to allow for building value breakdown+
404dc85 Remove get_question and use .question property from IF base class.
7e377f8 Update the minimum needs parameter for IF dealing with population.
8b00ca3 Merge branch 'develop' of github.com:AIFDR/inasafe into IF_OOP
2e3efec Merge pull request 1772 from akbargumbira/develop
086e436 Update loading the needs profile.
d179e4f Fix minimum needs not loaded. We mustn't declare the type to get the value from QSettings anymore.
6ca0765 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
60daed3 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
3af2dda Create mixin base class
769493f Update the IF filter by constraints and add rule when registering IF that it needs to have a unique ID.
515eaea Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
3cbe77d Smallfix for tests. Rename padang_tsunami_mw8 to tsunami_wgs84
e82a5fa Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
96e6dea fix 1770 check if the map canvas is using 4326 and enable OTF if necessary
39b8682 Review Jannes work on Postprocessor parameter.
4472086 Merge pull request 8 from Jannes123/fix_tests
a8b8a31 Merge branch 'develop' of github.com:AIFDR/inasafe into IF_OOP
56ba09a (jannes/fix_tests) clean code
5e785eb merged new-style IFs and parameters and develop
c375bdc Merge branch 'develop' of github.com:AIFDR/inasafe into develop
d58cd28 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into fix_tests
1945fd0 opt dialog tests updated
b416aa4 merge new-style IF_OOP
3c37190 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
5e00139 Add tsunami tests data.
96f016e Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
517f08c Fix test: test_dock.test_issue160
71beb77 Add test for PAG Earthquake Fatality Model.
660cbeb Add test for ITB Earthquake Fatality IF. Clip EQ test data for a faster test.
ad63a2e stash commit
13fe43b Merge pull request 1768 from Gustry/fix-unicode
7838b78 Merge pull request 1766 from Gustry/fix-1764
60a19e3 Add tests for EQ on Building IF.
86e7b23 Fix failing tests.
49056db Fix other tests.
141d18f Fixing tests data using the new standard layers.
6d72086 updated IFs work but not unittest
037c7ea 'Housekeeping' on IF docstring
8fd8e5f Refactor ImpactFunctionRegistry's get, and get_by_id methods
8251ae0 Merge branch 'develop' of github.com:AIFDR/inasafe into IF_OOP
cb9113d FIx all failing tests in local.
1fc8620 Update load_standard_layers to the new test data and add a qgs project.
ee07d39 Update test data and update all tests in safe.impact_function package.
e6e02b5 new-style params for all inundation ifs
448017d fix 1764 update documentation and fix typo
0347b18 Update all the tests in safe.impact_function to use the new test data.
96c85fc fix unicode using get_string
3eeecad Merge pull request 1761 from timlinux/coding-standards
8084366 Add buildings in region_b
a0ab308 Add tests data for region_a (JKT), region_b (Jogja), region_c (around merapi)
0bf2cd1 floodraster gdal road postp update
bf161bf Remove keywords_id in units metadata. Will introduce more failing tests.
cdf3f95 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
8839f63 AddVOlcano Vector On Population and its tests. Add population data in region_c.
74f8547 fix unicode in file path
15c0298 raster flood road postp
672b9f5 Fixing most of the tests
040f645 OSM building rastre flood postp
ab28bd6 stash commiit
f5863fd stash commit
46c72ac fix 1764 : fix test
d8ecee4 fix 1764 : allow a user to select the area with a bookmark
3ca1bf2 stash commit
49b24aa merge commit
a6aa4cf Merge branch 'develop' of github.com:AIFDR/inasafe into IF_OOP
6cac66d Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
16a80a8 Add VolcanoPolygonBuilding IF and its tests. Also add merapi KRB to region_c test package.
2b4a095 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
bd90dc2 Using mixin in flood_vector_osm_building_impact
a0f934e Merge pull request 1759 from timlinux/fix-1758
0068780 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
3ebc8dc Add Earthquake IFs
7951024 Report standardization
5f96f1e clean comments
6b83bc6 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
a722f2d Building Reports Mixins
513c831 (origin/coding-standards) Coding stadnards cleanups for gender postprocessor.
93f3153 Small code conventions cleanup in messaging text.py
8d0bb8f Small clode convention cleanups made while giving Etienne a coding standards walk through.
270531e Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
c711fe4 Add VolcanoPointBuilding IF and its tests. Add data for region_c.
8d6ccbe Add ContinuousHazardPopulation IF with tests
a984184 dialog box scrollbar fixed
0898c00 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
dae6981 Add ClassifiedHazardPopulation IF with tests"
0e62d21 Remove run method in base class. For now, most likely we need to override the validate and prepare layers.
56f3053 Add Generic ClassifiedHazardBuilding IF, with tests
88bca84 cleanout logger and previous commit mistake
731ddf2 establish 1726 reason for bug
029c7fe (origin/fix-1484) Fix 1484 - wizard is not resizable on hidpi screens
84274e9 Resolved merge conflicts
93f2016 (origin/fix-1758) [BACKPORT] fix 1758 - IF options dialog lacks top level layout.
a4109ef Remove old inundation test package.
c2d7597 Run super method 'run' in each IF's run method.
e239305 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
cc39ea8 Change the run method in base class.
ea88cc6 Import cleanup and function rename
3f10b07 Update impact function base class.
283afb6 Merge pull request 1751 from Gustry/fix1679
bfb1492 git commit
e547387 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
87acfc4 Give example on how to deal with IF manager to query IF.
3129c18 Optimize imports
01d2fb8 Add TsunamiPopulationEvacuationRaster IF with tests
3b13e80 Add FloodRasterRoadsGDAL IF with tests
e7c6bb9 Add FloodRasterRoadQgis IF with tests
4b31700 multiple new-style parameters concept
6a55e68 Add FloodRasterOSMBuilding IF, with tests
4523c3a Add FloodPopulationEvacuationRasterHazard IF, also with tests
84e2791 Add FloodPopulationEvacuationPolygonHazard IF, with tests. I guess tests not yet using the valid data.
0e94f53 Review Rizky's work for flood_polygon_roads.
781a890 Add FloodVectorPolygonRoad IF. Modify qgis test
ff1adb8 new-style multiple boolean params
f5dff49 Pass an instance of IF among dock and wizard to analysis, impact calculator, impact calculator thread, calculate impact.
e2c23c5 proof of concept new-style boolparam
55c0084 Use ID of the IF instead of its class name to register it on the combo in the dock.
1fabd06 Changed function_type as classmethod and have it loaded from metadata
da7ee83 Remove get_safe_impact_function_type in favor of IFManager.get_function_type()
87a6fa2 Remove get_safe_impact_functions and its usage in favor of IFManager.get_by_id()
c80fcae Remove unused code in safe.impact_functions.core
3744904 Remove safe.impact_function.utilities module.
60ef8a4 Instantiate IF manager once and use it in the necessary places.
659fd21 Use its own property to get the impact functions.
3cfe080 More streamlining for things that can be done by Impact Function Manager.
344432c More improvement on Registry and Impact Function Manager.
f2110db Add some test in test_registry.py
ffe0bab Create Registry unit test. Modifying impact function manager test module, commenting unavailable one at the momen. Add some functions in registry and impact function manager.
dfeec72 Remove unused codes after streamlining utilities function related to IF.
b59beed Streamlining the way to get IF. Removing get_plugins for good.
1c97281 Streamlining getting the IF - Lessen the usage of get_plugins.
4926fd4 Remove unused codes related to getting plugins.
53f5c97 Streamlining Registry and Impact Function Manager.
de63d74 Utilise Registry singleton to get the IFs.
ffbe723 Review Rizky's work on flood_building_impact_qgis.
d8f36eb Change the term 'legacy' to 'old-style' for IF style.
a44a9b3 Merge branch 'IF_OOP' of github.com:akbargumbira/inasafe into IF_OOP
c3edf83 Merge branch 'develop' of github.com:AIFDR/inasafe into IF_OOP
e3a70c3 Add 'flood building impact qgis' IF using Qgis Wrapper in the new arch style
860bdd8 Remove unused codes e.g collecting IF requirements from docstrings.
6dc5cfb Make wizard work with the new style of IF.
0667031 Change get_metadata to as_dict in ImpactFunctionMetadata class and make metadata() class method in IF base class.
00a4127 Fix filtering impact functions in registry.
4208824 IF parameters is working but not in a nice way.
10db9e9 Use the old IF parameters.
cab5b72 default extent bug 1775
5e35341 Use registry for getting the IFs. A working example in dock for flood vector on buildings.
67dd1c1 Add a working example of the impact function using the new IF architecture.
0ee1f5d (etienne/fix1679) fix 1679 : fix docstrings and previous shapefile if exists
16bfaaf Merge pull request 1754 from akbargumbira/develop
f68bd99 Fix classname typo.
f1f2a71 Fix failed unittests.
85c3346 [Volcano on Building] Separate the IF between the point and the polygon hazard.
f1a37dc fix 1679 typo, docstring
e53973f fix 1679 : change how the zip is extracted, allow the user to overwrite or not
36e73d3 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
8e15f78 Merge pull request 1749 from ismailsunni/fix_1745
6e3c69e Don't allow users to set the target field in Volcano Building IF.
13ad903 Merge pull request 1743 from Gustry/refact
2cc26ab Fix 1475
4e63b44 fix quoted strings, qmessagebox
6665be4 Merge pull request 1736 from Gustry/fix-1735
4e5e92a Merge pull request 1740 from Gustry/unicode
ad63f45 Merge pull request 1741 from ismailsunni/backport_master
f50b024 PEP8.
54a3d56 Fix typo in metadata.txt

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

a25ab6b Merge pull request 9 from ismailsunni/gustry_analysis
2a33d92 Merge pull request 2649 from Gustry/staging-osm
e3d48d5 (ismail/gustry_analysis) Import get_qgis_app for fixing test in IF package.
39ec83a Merge branch 'analysis' of https://github.com/Gustry/inasafe into gustry_analysis
907a11b Fix problem : QPixmap: Must construct a QApplication before a QPaintDevice.
d90f77a move postprocessor_manager in IF
16e6bec move setup aggregator
dee5df5 use staging osm-reporter if developer mode is ON and if it is not a final release
2790c49 Merge pull request 2584 from Gustry/optimal_clip
7807275 Merge pull request 2593 from Gustry/class-count
2223e92 fix test
5fc6324 Merge pull request 2646 from Gustry/multipolygons-osm
a895543 Merge remote-tracking branch 'upstream/develop' into optimal_clip
331d082 add South Africa and France to the OSM downloader
3595320 add multipolygons support in the OSM Downloader
3b3850c develop: add feature
57e684b Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
48bf35e Add celery deployment for realtime-flood
21f5a71 remove aggregation_test_impact_vector_class_count.xml
3ccdc70 Merge branch 'develop' into class-count
e94dde3 remove test about class_count and test data
1f377fb fix test tsunami_raster_building
b44b8e8 Merge branch 'develop' into class-count
6521e9e remove statistics in test files
5cd173f remove statistics_type in python
e61df6d move optimal_clip

2513c3e Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
efe9b1c fix empty environment variable cases
ba89edc fix test
8182d77 Change single to once, and reformat Tanzani minimum needs to be more readable.
093420a Add values to map legend. Fix 2612
0ba6fb9 Merge pull request 2611 from ismailsunni/fix_2609_target_field
56c6484 PEP8
f263dd2 Add missing keyword in IF Raster Tsunami 2609.
cd7c751 Merge pull request 2606 from ismailsunni/fix_2605
6f775c6 fix 2588 remove the URL request if we get the data
e73b809 Merged ismailsunni:Samweli-develop
53ee3fe returned test data state
38ddf93 returned deleted exposure.sqlite file
4ab8bd9 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
8bc5d19 Fix typo that make the calculation weird.
98fafa2 Update test control.
73b2668 Merge remote-tracking branch 'ismail/Samweli-develop' into Samweli-develop
310c58e Update unit test.
3a9c82e Add Null value in the data test.
4e4ff92 Merge branch 'develop' of https://github.com/Samweli/inasafe into develop
a3435e4 Changed population to people
cdd472c Fix 2605. Read from xml first then from keywords.
d578633 Add invalid .keywords file for testing 2605. It will fail on test_dock.py:test_validate.
ed3b8f6 Fix misleading exception message.
0453e33 More change from population to people.
d7ae9bc For 2554 - explicitly test with resampling enabled and disabled
040ecb1 Merge branch 'develop' of github.com:ismailsunni/inasafe into develop
e8d1869 resolving conflicts
a9355d5 Working test for 2553 when resampling is off
dbec594 (inasafe-2553) Fix error trying to compare message in test because it is not text
c2570ad Added also test to check that keywords have not been sideloaded from another layer
b64f9f0 Merge remote-tracking branch 'upstream/develop' into inasafe-2553
669ab24 Updated test datasets to fix keywords and ensure allow resampling and not allow resampling are set properly
fab9718 Update test file metadata, add read iso metadata tasks
dee103c Change population to people.
86fbdac Add notes in the report about Null value
29bdf6b Add Null value in the data test.
6a3940f Accept Null as zero.
b2828e3 Merge branch 'develop' of github.com:inasafe/inasafe into Samweli-develop
ec0cd70 Merge pull request 2602 from Gustry/tr
b563201 remove translation in the OSM downloader test file