Changelog for version 3.5.0
================================

087ed0c (HEAD -> release, upstream/develop, origin/develop, origin/HEAD, develop) Add changelog for 3.5 (#3125)
b10bb47 Translation 3.5 (#3134)
631bf88 Merge pull request #3133 from ismailsunni/fix_3405_logo_for_place
392ef03 Merge pull request #3052 from lucernae/realtime_ash
ed449e0 Fix tests
3bc42e5 Better formating svg.
02d306d Add logo for place and image credit #3405.
8197712 Update earthquake template
f089f3e Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime_ash
b14aab1 Translation 3.5 (#3130)
ba1bf81 Merge pull request #3128 from ismailsunni/fix_2750_same_field_name_problem
fea77d7 Merge pull request #3127 from Charlotte-Morgan/develop
3fd278c Elaborate comment.
66c6bb3 PEP8.
457eaff Merge branch 'develop' of github.com:inasafe/inasafe into fix_2750_same_field_name_problem
85e9012 Fix #2750 by storing the non conflicting attribute name.
c523c7f add new concepts for affected_people, killed_people, injured_people
2b0e35f add citations for concepts
b02449d Translation 3.5 (#3124)
9fa38a6 Merge branch 'realtime-flood' into realtime_ash
9d059be Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
ff6def4 upgrade inasafe requirement
15992c8 Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime_ash
c3905be Add unit test to catch the bug.
208a9fa Merge pull request #3123 from ismailsunni/fix_3122_question_mark
de25478 Add question mark for fixing #3122
150f6e8 Merge pull request #3119 from ismailsunni/fix_3118_total_mistery
e00ec68 Merge pull request #3121 from ismailsunni/typo-3.5
ce02669 Typo.
47e9469 Small typo and coding standards for translation.
ef54d5e Merge pull request #3120 from timlinux/inasafe-3117
5180eea Support more granular definition of notes  (#3110)
38b37ad (origin/inasafe-3117, inasafe-3117) fix #3117 - Add citations to concept definitions in definitions.py
9f7dc06 Fix for #2998 - show correct attribution for each earthquake IF (#3116)
99f2853 Do not show total if it is Age, Gender, or MinimumNeeds. Fix #3118
9611b06 Merge pull request #3115 from ismailsunni/fix_2847_no_aggregation_table
42f6080 PEP8.
7a991a1 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2847_no_aggregation_table
ae9ed27 Tidy up code.
0cd4fe8 Fix failed unit test.
bb4ee48 Merge pull request #3112 from ismailsunni/fix_2798_attribute_error
831e262 Updates to SPHERE standards - see #3065 (#3081)
e079be0 Implementation for standardised map titles and layer names. (#3114)
a9514bb Merge branch 'develop' of github.com:inasafe/inasafe into fix_2847_no_aggregation_table
36d33fe Better setup for postprocessor and checker.
d718d05 Merge pull request #3105 from ismailsunni/fix_3089_thousand_separator
f9a09cb Merge pull request #3111 from ismailsunni/fix_3108_no_wet
84d6d29 Merge pull request #3113 from ismailsunni/fix_2430_tick_bullet
e5becec Use tick for action checklist. Fix #2430.
436943c Add custom bullet list.
63f91b2 By pass Unknown geometry type.
bcd7ca2 More zero impact exception on the other IFs.
a18f432 Add zero impact exception if no wet in value mapping. Fix #3108
7c6581d Merge pull request #3107 from ismailsunni/fix_3076_datetime_format
8542ec7 Add more format for datetime per #3076
0f98032 add notes for all hazards (#3104)
01fdf79 Add thousands separator per #3089.
965bcfc fix #2804 - make checking the analysis environment more efficient by not reading the full raster each time you pan or zoom (#3102)
afbcc34 Merge pull request #3100 from Charlotte-Morgan/develop
9dbb7ff Merge pull request #3056 from ismailsunni/paper_cut
717b038 update test text string
babc9f9 Fix population thousand separator.
3c0f2bb fix volcano notes
e57f946 fix volcano notes
97c35d4 PEP8.
8645818 Merge branch 'develop' of github.com:inasafe/inasafe into paper_cut
0f1faf3 Fix volcano names in volcano polygon IF.
da4c641 Fix radii sorting in volcano point.
5999a53 Fix volcano names in volcano point.
d204d04 Minor text tweaks added single and multi event notes for volcano
747dfba Minor fixes (#3096)
96eeeea incorporated Tim's brain dump for roads, volcano, tsunami and places. (#3093)
dc75670 Reporting standards (#3078)
729e657 fix #3071 (#3094)
f5ae0c5 Merge pull request #3092 from Charlotte-Morgan/develop
03fed25 Merge pull request #3077 from easmetz/definitions
b8e7875 removed "the" before "people in buildings"
6d48556 Merge branch 'develop' of https://github.com/inasafe/inasafe into definitions
8765e37 replace areas with zones fix capitalisation replace moderate with medium
fc5c15a changed "persons" to "people" according to feedback from Charlotte
82efb92 Merge pull request #3087 from easmetz/EQ-IF
38b9beb Merge pull request #3088 from easmetz/population
12de12b removed statement about the "people_in_buildings" dataset being experimental
da0ff7e removed statement "there are no InaSAFE Impact Functions that use this exposure data yet"
c1eecb6 removed markdown "affected"
fefdaaf improved definitions of 'count' and 'density' to help users in wizard
aea6453 shortened description of ITB Bayesian EQ IF to fit into wizard window
8b29440 added definition for concept "affected"
3aaa12f inserted new concepts: displace, evacuated
c3f69e0 changed focus from exposure_people_in_buildings to exposure_population.
8cd6d65 Merge branch 'develop' of https://github.com/inasafe/inasafe into definitions
3268506 Added a make command so nightlies can be triggered locally (#3074)
c7454b5 changing "persons" to "people"
c507a70 removing rogue comma
d9acc84 changes to correct how the citations are done - I did them incorrectly the first time
4dc15a4 Inserted definitions of displaced and evacuated into population in buildings/population notes (as they are the same). I am not completely sure if I have cited correctly as the link is too long for the space available. The definitions are slightly inconsistent in their wording as I have used the exact UNISDR definitions. I think it would be wise to edit them for consistency of wording (ie persons vs people, etc) but I'm open to comment.
f8556bf Update ash report styling
5e2bd14 Fix plugin load error (#3075)
a5721b2 Reporting standards (#3027)
6dc6be6 Minor text tweaks (#3066)
3cd3d6f Refactor report generation for Realtime Ash: - Create templating system for population, nearby and landcover table - Display overview map and collation - Add environment variable for additional layer context - Fix AshRasterPlaces and AshRasterLandCover so it calculates Unaffected exposure correctly
c837549 PEP8.
fbbf261 Only show unique volcano names.
15ef03f Move version compatibilities to definitions.py
8406770 Merge pull request #3053 from Gustry/place-value-mapping
453deaa remove clear_further_steps in exposure places classify
e04c7d3 fix zoom layer
4fa3e22 Merge pull request #3050 from Gustry/total-road-report
e5c3ab9 disable inset layer
56b6c10 Add nearby-table calculation
4e5f7ff Let there be citations. Added forma citation structures to definitions and all impact function metadata. Not exposed in any reports yet. (#3049)
8d4cf8d Add name and population fields to the wizard about place exposure (#3047)
dd158fb (rizky/realtime_ash) Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime_ash
718b75c Add Realtime Ash functionality
1384412 add total line to the road impact table
3082b59 Merge pull request #3051 from Gustry/headings
4f9c562 add headings for roads/places/buildingsin the impact summary
b925fd4 Merge pull request #3048 from Gustry/metadate_exposure
cb9ab92 fix #2911 - PetaJakarta layer style not working (#3044)
b8ba37f Metadata definition cleanups from @easmetz (#3046)
6b5e881 Merge pull request #3039 from ismailsunni/fix_2746_remove_entire_area
8ba30ae update exposure layers with new keywords
3047ea2 Small pep8.
4f0e2b6 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2746_remove_entire_area
01d767d Revert back changes.
5f66469 Fix #2746. Skip post processor for road and structure if entire area.
b233e6b Merge pull request #3043 from Gustry/reports-units
4bcbce0 More dirty hack.
9de71c9 add units in roads/places reports and refactoring
459626f fix #3034 - remove duplication of hazard and exposure concepts in def… (#3035)
d289b54 Merge pull request #3041 from Gustry/ash-places
7183458 Fix #2966 - support more formats than just png for custom map north arrow and organsiation logo (#3040)
b272869 Merge branch 'ash-places' of https://github.com/Gustry/inasafe into realtime_ash
560a80c Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime_ash
e4b221c Add backend celery infrastructure for Ash Realtime
ce10c83 add airports dataset
6bdad15 ash on places
dd5fb62 Merge pull request #3033 from ismailsunni/ash_people_if
5bc861b (realtime_ash) uncomment logo path calculations
1855392 Update Ash template
8750116 Removed the impact merge tool. fix #2909. (#3036)
a41c4fa Fix failing test.
05110c4 Merge branch 'develop' of github.com:inasafe/inasafe into ash_people_if
82da242 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2746_remove_entire_area
0381c0e Merge pull request #3038 from inasafe/update-pycharm-logo
27032be Fix #2746, remove Entire area.
f769a72 More appropriate URL
2781cc4 Merge pull request #3011 from Gustry/memory-error
ae31a4f Update PyCharm logo
842412c Add pdf generation tests. Fix tests.
7d25272 Impact data should be in raw format.
4316978 Code standarads.
a6f69bb Another fix failing test.
addc65b PEP8.
677a5a1 Merge branch 'develop' of github.com:inasafe/inasafe into ash_people_if
3c369eb Fix failed test on travis.
2e89716 Replace people with population.
3e5c163 Merge pull request #2995 from lucernae/develop_functionality
51b7e89 Merge branch 'develop' of github.com:inasafe/inasafe into ash_people_if
6c9ea59 Make test.
d48df20 refactoring report templates,merging child class buildings and roads (#3029)
a74440c Refactor how notes are handled (#3023)
b04125d Cleaner approach.
98d8a6c Merge pull request #3032 from Gustry/data
c23e097 It works but not good result.
d205a5a update dataset to 3.5
23a5dda Ash raster on population is running, but need to check the result.
a6883d9 Initial commit for realtime ash report test
93bbf9f Add initial commit for Ash Raster Population IF.
c35eda5 Add ash raster IF to loader.
05177a5 Update keyword version.
de17325 Merge pull request #3005 from ismailsunni/fix_2913_peta_jakarta
a334e4f Fix docs
045164e (rizky/develop_functionality) Merge branch 'develop' of github.com:AIFDR/inasafe into develop_functionality
fda53e2 Move metadata definitions one level up.
b30586b Merge pull request #3021 from ismailsunni/fix_2926_missing_keyword
a68ac1f Fix merged conflict.
40cd1a2 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2926_missing_keyword
2d251c3 Update string for message.
a04ae55 (rizky/develop) Merge pull request #3003 from ismailsunni/fix_old_keyword_problem
dd6e3f0 Use suggestion style instead of info style
73ee39d Merge pull request #3025 from Gustry/fix-2921-minimum-needs
f0d53bb Merge pull request #3000 from Gustry/layer-visibility
8f58ef4 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2926_missing_keyword
0e15cf8 Merge pull request #3024 from Gustry/road-report-summary
7c283c3 minimum needs : add a button to restore defaults
f842a44 fix tests
663d52b reverse the impact summary for roads report #2950
2d5ebe9 Add more comment and add more catcher.
f08a60b Add header.
f7aa865 PEP8.
6c18546 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2926_missing_keyword
1638e1b Add message for missing keywords #2926.
502024d Merge pull request #3008 from Gustry/clean-reports
e1fef25 Merge pull request #3017 from Gustry/missing-translations
d2bcf05 add missing translations in notes
ccf555b add missing translations in the road/building report
3f9ddca Merge pull request #3016 from Gustry/remove-threshold
71629de Merge pull request #3015 from Gustry/translation
c60b182 Remove print and add clearer comment.
c17efb4 fix tests about threshold
5fc288b Remove the building threshold fix #2932
ad1ce2f fix translated legend and attribute table
2b4cbe0 Merge pull request #3013 from Gustry/fix-2858-not-affected
d59008e fix #2858 not affected legend in classified raster building IF
c69daba display a nice error message if MemoryError
8da9426 fix landcover imported twice
c60c11c fix the question inheritance
58e0f00 use more POO in reports
ca5d1c0 Call Report constructor in each IF
d21fd11 Merge pull request #3010 from Gustry/data
96cf7e6 remove potential-idp, add grid jakarta and landcover to the test layers
e47aae3 Merge pull request #3009 from Gustry/fix-travis
bac97d8 fix failed tests in qgis_testrunner.sh
45fd12d Merge branch 'develop_functionality' of github.com:lucernae/inasafe into develop_functionality
0c0289a fix imports
5de3b16 (inasafe-2804) Merge pull request #2979 from Gustry/travis-docker
339a232 Add missing keyword data test.
bd0d5bd Show proper message when there is invalid keyword.
ce57b10 Merge pull request #3004 from Gustry/tr-osm-downloader
63d04d2 Merge pull request #3002 from Gustry/unicode
3cd12fd add translations for countries
b165c73 Do not read impact layer's report when there is zero impact.
8321521 Fix #2913 for key error classified polygon population IF.
3db7717 use unicode if the layer name has some accents
9f80443 Better handling in wizard for MetadataError from old xml keywords.
7b29978 Merge branch 'develop' of github.com:inasafe/inasafe into fix_old_keyword_problem
0814e82 Merge pull request #2999 from ismailsunni/fix_2969_minus_number
fa3cc9f Fix tests
01e7323 Fix failed test.
098370a Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
77be0c4 Fix failed test.
cb442cb Fix #2969
611f930 copy the dock behaviour to the wizard when the analysis is finished
be7eb21 Show if we are running slow tests
8f18921 Merge remote-tracking branch 'upstream/develop' into travis-docker
e26d7c5 Fix test data.
2dd29ba make the exposure/hazard visible when we add them from IFCW
8009329 Merge pull request #2685 from ismailsunni/not_slow_test
30a8c7f Small pep8.
718fbe7 Skip slow test only on travis.
64e8183 Get rid off X in test name.
3bed92e Merge branch 'develop' of github.com:inasafe/inasafe into not_slow_test
fffdb5d Merge branch 'develop' of github.com:inasafe/inasafe into fix_2969_minus_number
9968edd Update keywords.
fca5aa0 Better unit test.
9c44536 Better unit test and fix small issue.
ea71aeb Add index column in test data.
ea1f922 Remove categorical IF parameter.
85aa367 Add more comments
b038f0f Convert unicode to string when store in vector.
7893e92 Use value map for classified raster hazard.
5dffedf Smaller test data.
b56c5bd Merge pull request #2997 from Gustry/labels-2925
2efbf52 Merge pull request #2996 from Gustry/logs-in-tests
450d22a improve labels in settings about layer visible
97709cf remove print or logs in tests
5ac3f26 use unittest.skip instead of renaming the test
c71c08b Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
31790d0 Modify land cover report mixin to include impact summary
6cbfa8b Add data test for #2969
e0ba802 Remove slow = false for consistency.
92edf2e Merge branch 'develop' into not_slow_test
0e9d79f Replace mark as slow with skip test.
f5f3e3c Merge remote-tracking branch 'upstream/develop' into travis-docker
dc76c8c Merge pull request #2988 from Gustry/change_test
12301fb do not put test in a function name if it is not a test
586679f rename tests
b76a015 fix how we launch the test suite
b83b0fe disable QGIS 2.8
81fe0a9 enable QGIS 2.8
936eaf8 travis config
7c2aa13 fix qgis_testrunner output
451b9fb tests disabled in docker qgis
d7252e3 Merge pull request #2981 from ismailsunni/fix_1128_update_provenance
de99d36 Removed duplicated show_osm_downloader method in plugin.py (#2978)
7854d12 fix #1317 - add minimum needs for SPHERE (#2983)
4ab3149 Add old invalid keyword test file.
0131d44 Pass when the metadata is outdated on loading to combo box. (#2976)
90b118a add qgis 2.8 and qgis 2.14 to travis
c95c317 fix tty
c57551b travis
614e08e disable clip raster because of the prompt in the UI
0ac3a30 Merge pull request #2982 from Gustry/qgis-testing-improvments
371c3ba Update test on metadata.
e4eb15f add qgis version in the test log
be4dfae fix if the real iface did not find the dock
ac75a3b add test utilities package
cd9f381 fix import Dock in tests
ce216e7 Update metadata
84b4599 Merge branch 'develop' of github.com:inasafe/inasafe into fix_2945_metadata_error
208b042 Add more information in impact layer provenance.
7ecdf06 Merge pull request #2974 from Gustry/test-menu
ae42829 Merge pull request #2837 from lucernae/develop-ash-raster-landcover
7e980f9 Pass when the metadata is outdated on loading to combo box.
425eab8 (rizky/develop-ash-raster-landcover, develop-ash-raster-landcover) Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
7b40aeb select test package
81031b1 Merge pull request #2960 from Gustry/travis-docker
a9c6d9d fix tests
d856656 Fix issue when running tests that required you to manually open the console first
8e2b766 fix import UI in tests
e8fe560 clean code
6154eed revert travis.yml
d2e121d Merge remote-tracking branch 'upstream/develop' into travis-docker
d23b743 Added button to launch tests when in developer mode
e761bd3 Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
d1a2364 make travis happy
ab2be38 travis tests dock
f99234d Merge pull request #2965 from ismailsunni/experimental_travis_test
348d3e8 Run full tests again. Make travis great again.
f666901 remove all gdal use exceptions.
14589a3 Fix wrong path to coverage.
25c5011 Modify coverage.
01f01b4 Revert back to run full tests.
c34ce83 Remove gdal exceptions.
406e837 Move up get_qgis_app.
67e39ae Use gdal again.
87f2509 Revert back QGIS App retrieving.
e807563 Remove gdal completely.
7c77e6e Revert logger and experimental things
fff97d7 Fix test.
40017b7 Put back gdal, but not the gdal exceptions.
e379290 Comment out gdal.
2107370 Verbos logger.
193e4a0 Comment out the code.
0b1155b Replace .click with actual function.
21c77e7 Wrong path to batch package.
a580a74 Remove .click from the test.
32c07fe Disable test run single scenario.
77246e8 Ignore test all scenario.
e319334 Only test tool package.
e31e4c1 Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
c053d6b Add new test data for ash raster landcover
22b24d8 test travis docker
c8f309d Merge pull request #2954 from Gustry/work-2385
1bf59e8 Merge pull request #2903 from lucernae/fix-2896
25183d8 Merge pull request #2950 from timlinux/faster-impact-on-roads
5f63d30 #2385 legend order in classified raster building IF
0f5e46c Merge pull request #2952 from Gustry/nodata-flood
aaa2965 Changelog updates for 3.4.1
c740a3a Merge pull request #2943 from ismailsunni/fix_failed_test_osx
bcba8d2 Changelog updates for 3.4.1
5aade10 Fix comments from Gustry for #2950
ec88d40 faster impact flood on roads
691c715 Fix failing tsunnami impact on roads tests
991887e Remove impact length test
3ba583e Remove debug and use <= 0 for dry
42ada46 Use gdal to get nodata and exclude dry cells too.
227b074 Merge pull request #2949 from Gustry/fix-2948-legend
6777518 Merged changes from upstream
5b4a4e0 Improvement for tsunami on roads IF performance - don't vectorise nodata raster cells
485bcd3 fix legend order when the layer is None
ad56ad7 Merge pull request #2904 from Gustry/empty-line-2318
7211b05 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
2fbdce5 fix sentence about no data in the report
47f2992 add missing thousands separator
4698c72 fix tests
56745b5 update notes about no data and 0
8f54c25 remove empty lines from postprocessing outputs #2318
03c56f3 Merge pull request #2931 from Gustry/fix-2915-building-report
05998ae Merge pull request #2929 from Gustry/fix-2927
4efb4cd Merge pull request #2935 from Gustry/fix-2925-display-layers
7804718 Merge branch 'develop' of github.com:inasafe/inasafe into fix_failed_test_osx
9437d72 Merge pull request #2939 from Gustry/test-data
c9831a7 Remove print statement.
5d85708 Fix failed test in test_shake_grid.py
f0acf88 Update metadata to 3.5
fcf99f6 update test data after running tests with 3.5
6d10597 add setLayerVisible to the fake qgis legend interface
bc89e4f Merge branch 'develop' of github.com:inasafe/inasafe into not_slow_test
bd7cb04 fix #2925 set the layer visible when we add it the map canvas
1706a6e fix tests value mapping
dab93a3 Merge pull request #2905 from Gustry/layer-order-2899
f7f9b51 Merge pull request #2901 from lucernae/fix-2684
0f3612c Merge pull request #2923 from timlinux/develop
8ffdc93 Merge pull request #2919 from ismailsunni/fix_2908_shakemap_converter_error
eb65d82 Merge pull request #2924 from borysiasty/develop
e855790 add tests about the JSON in the generic polygon on buildings
c846af7 add categorized rendering to test buildings
28e66f4 fix #2927 enable lineEdit if the checkbox is toggled in settings
d884e25 [Wizard] Follow up the previous commit
0d329da [Wizard] Fix compatibility with recent QGIS versions. Fixes #2906.
cf3941b Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
5568f00 Merge pull request #2914 from Gustry/styles
1c317ce Merge pull request #2918 from ismailsunni/fix_2898_xml_character_handling
f63e7b8 [BACKPORT] Fix failing dock test on QGIS 2.15 (and possibly earlier versions).
3c812fa add missing map_title in EQ IF
623af40 Fix #2908, handle KeyError in keywords.
f12b9d7 Add test with special character.
121c74e Fix #2898. Handle special character in xml.
a1a7a09 fix tests
7635a04 make these legend parameters compulsory
a556385 add missing IF to automatic testing
3c884a6 move layer name and map parameters to metadata in earthquake IF
a7c21a7 move layer name and map parameters to metadata in inundation IF
61313a4 move layer name and map parameters to metadata in volcano IF
2984a5f move layer name and map parameters to metadata in generic IF
7d9e88e add get key in IF metadata
cf59886 remove "by each hazard zone"
d6ab3af fix #2899 impact layer should draw over the hazard layer
5549d1c (rizky/fix-2896) fix #2896
2f7b689 (rizky/fix-2684) fix #2684
c5e475c Merge pull request #2893 from ismailsunni/fix_2676_minimum_needs
0af1c7f Merge pull request #2894 from Gustry/typo-minimum-needs
57e41b2 Merge pull request #2891 from ismailsunni/fix_2773_remove.keywords
3a71c33 Add back test_vector.py but set keyword to empty.
e331006 typo
9d3e15c PEP8.
8a09c06 Compile translation strings.
cc586e5 Update translation.
e06f1ac Fix failing test in travis.
c378bbd Change data test keyword version to 3.5
f92abe8 Less code, less maintaining overhead.
9819026 Remove dead code and test.
e751d01 Fix failed test.
f2e4403 Removing dead code.
ac2c1bb Remove dead code on core.py and test related.
16f4eae Remove unused code in keyword.io
d661bdc Remove .keywords related part 2.
fd6601e Remove .keywords related part 1.
1017f23 Merge pull request #2888 from Gustry/fix-2884
1040ce6 Update keyword version in test data.
0f8ce37 Delete .keywords file
f685428 Set version to 3.5
39ecbb9 Merge pull request #2889 from ismailsunni/backport_3.4
b54e646 Merge branch 'develop' of github.com:inasafe/inasafe into backport_3.4
cef74e3 fix #2884 mistake in the tsunami legend
1c30d25 partial commit
73466f0 Merge pull request #2882 from ismailsunni/backport_fix_2880
828bb75 Fix #2880
ffc26f1 Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
550a6d1 fix tests
d5c70ed Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
a8d2e45 fix tests
0ea0224 Merge branch 'develop' of github.com:AIFDR/inasafe into develop-ash-raster-landcover
9d44ecc tidying up code
bb15b21 Add Ash Raster Landcover Polygon Impact Function Move register_impact_function to new module called loader (to avoid get_qgis_app deadlock when running individual tests of impact_functions)
9c94e15 (rizky/realtime-flood) Add HTML frame based report for impact summary
e71e59b Tweak IF report generation: Revise symbol counting method
4181dd5 Tweak IF report generation
d77a471 Update reporting code from InaSAFE 3.4 migration
580a88a Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
faec393 InaSAFE Headless: Add more information for filter_impact_function
52615af (ismail/not_slow_test) Remove not slow filter in travis.
167cf64 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
7d6f648 include qml files for uploading
807bda1 modify headless tasks: read keywords

Changelog for version 3.4.0
================================

0864ba5 (HEAD -> master, origin/master) Merged in changes from develop branch
2ac0e5b (origin/develop, origin/HEAD) Merge pull request #2786 from ismailsunni/fix_missing_note
9ad3885 Add missing note in post processing table.
baeb749 Merge pull request #2771 from borysiasty/develop
d9e397b pylint fixes
ec82e72 [Wizard test] Use default assertion messages
ea87623 [Wizard test] Put the Dock object inside the class
6e97cd8 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
2c3d626 Merge pull request #2776 from ismailsunni/backport_2724
2467791 Update metadata's changelog.
bbd6fb1 Fix #2724.
6a8ccb1 Merge pull request #2767 from ismailsunni/land_cover_impact_data
3fa1d7a Fix failed test in travis.
31b10f2 Cleaning up code.
8392ac1 Add LandCover Report template.
eab45ca Add impact data to LandCover IF.
879d871 Add land cover report/data mixin.
baeb52c [Wizard] split test file into two smaller
89e2fe3 [Wizard] Improve test coverage
104d4a5 Pylint
68c1c51 [Wizard] Bugfixes
e1ed6c7 Make FlatTable converter to dict.
155283d Add read and write to json for FlatTable.
f750174 Fix merge conflict.
eb054e6 [Wizard] Improve test coverage
1185405 Merge pull request #2766 from timlinux/develop
0dd43a8 Merge pull request #2768 from timlinux/fix-2704
d795e1c PEP8. Merely triggering the travis.
c4e9ee9 Merge branch 'develop' of github.com:inasafe/inasafe into land_cover_impact_data
1224a2e Cleaning up code.
a10b608 (origin/fix-2704, fix-2704) Fix pep8
7a2f7d7 Minor formatting tweaks to help doc modules
ce07bd5 Merge remote-tracking branch 'upstream/develop' into fix-2704
87f3990 Merge pull request #2757 from Gustry/raster
765196b Remove unused code, update test in impact report.
2f625d7 Remove generate html and report from report mixin.
5fa75f7 Add json data sample for land cover IF.
d3bd0ae Resolved merge conflicts, backported fix for #2759
bfdc0e9 Fix for missing keyword in layer raising error
f49189f Merge pull request #2763 from Gustry/if-refactoring
e25316b fix test
11ebd31 small changes
9bc129e merge analysis_workflow in calculate_impact
c781712 add docstrings
23722ec add reclassify methods using GDAL
4f393ca add a polygonize function with GDAL
4974ec0 Merge pull request #2758 from ismailsunni/travis_cache
e02a8c3 Cache directory
544db4e Add cache in travis configuration.
c5067c0 Merge pull request #2756 from ismailsunni/fix_2754_error_aggregation_keywords
4582b8d Fix #2754, failed to set keyword for aggregation layer.
8af918f Merge pull request #2742 from ismailsunni/json_impact_data
55a2296 Mark some test as slow. I propose a unit test should be less than 10s.
ea7292d Change flood event to use json impact data.
dc20a65 Merge branch 'develop' of github.com:inasafe/inasafe into json_impact_data
eee2e79 PEP8.
b48ff05 Format generated json file.
6b76b6d Merge pull request #2753 from Gustry/metadata
6bb695c remove duplicate metadata in the wizard
c327ad2 Fix typo in file name.
1c73426 Fix merged conflict.
47e8001 Make test works on test_dock_regressions.
d45c311 Cleaning up code.
e5f5613 Update wrong test control.
0ab1f6f Merge pull request #2747 from borysiasty/wizard2
5c7ef08 Fix test save scenario.
5b1b28d Fix test minimum needs.
661f32e Fix test in test engine
b55bdd6 Fix failed test in test impact report.
0df7cbc Fix post processing report in dock and wizard.
fc03099 Merge branch 'develop' of github.com:AIFDR/inasafe into wizard2
fa4c1d3 Fix merged conflict.
38fb59b Impact Data for PostProcessing works.
0970a30 Able to generate json for postprocessing.
4a051a1 Merge pull request #2745 from ismailsunni/fix_2744_regression_people_polygon
dcf5ab4 Add sample of post processing.
4b0e903 Fix test impact function for land cover.
581adb3 Merge branch 'develop' of github.com:inasafe/inasafe into json_impact_data
b1d5c1c Merge pull request #2709 from wonder-sk/landcover_impact_function
50e7210 [Wizard] Try to fix the failing test
0683270 [Wizard] Make the test yet more verbose
66279ae [Wizard] More verbose test
39fb9d6 Better code style, PEP8.
95c44b4 Merge branch 'develop' of github.com:inasafe/inasafe into json_impact_data
b2a279d Fix another failure in refactor.
01f1523 Fix typo.
82d755b Add test for polygon people template.
c95ca2f Rename all to polygon people
48653a7 Add Impact Data for polygon population.
8fef48e Merge pull request #2748 from Gustry/grid-jakarta
e7f56ba (etienne/grid-jakarta) add licence files for test data
7903c32 add aggregation grid on Jakarta
abbabfb Impact Data in ClassifiedPolygonPeople IF.
e3824d0 Add impact data people polygon sample.
096c90b Format minimum needs.
45578ae Format impact breakdown for people polygon.
3524115 Format impact summary for people polygon.
da59567 More pep8 fixes
601051d [Wizard] Update tests
4012dd7 [Wizard] bugfixes
fe5944d Separate impact summary and breakdown
488b974 Fix merge conflict.
bb90872 Impact Data for FloodRasterRoadsFunction and TsunamiRasterRoadsFunction
bb94c75 Add test for generate data road IF.
066dd0a Add impact data for FloodPolygonRoadsFunction.
5bb7c7b Add template for road.
a5d283d Add impact data to road report mixin.
ad8d8cc Merge branch 'develop' of github.com:AIFDR/inasafe into wizard2
e3e21d6 Refactored wizard cleanups
e73073a Merge pull request #2741 from ismailsunni/fix_2740_update_exposure_map
96bbafa Add residence and reformat dictionary
b8fec15 Add road sample impact data
d49713c Add asMultiPolygon in checker. Fix #2744.
8da9206 Merge pull request #2716 from Gustry/volcano
5640b78 Merge pull request #2732 from Gustry/helper
60a9b62 Update expected result in test for #2744
23949ac Update data test to make it the regression clearer.
b8094a7 (martin/landcover_impact_function) Replaced Processing routines with own intersection implementation
c0e1f95 Better code style.
4f41178 Reproject aggregation layer before doing intersection with exposure
60e0ea6 Support also single event hazards in land cover IF
ac0c87f Docs for pivot table + fix if not all columns are present in data
807c0e2 Fix small typo to make Travis passing.
7a13c9f Fail early - raise exceptions where necessary
204bad4 Fix failed test in batch runner.
6c864ee Remove debug statements
657d257 Update control file to make the test pass.
dfcb905 Impact Data for ClassifiedPolygonHazardPopulationFunction.
430d498 Impact Data for ContinuousHazardPopulationFunction.
883186f Impact Data for ClassifiedRasterHazardPopulationFunction.
4c83788 Impact Data for FloodEvacuationVectorHazardFunction.
4e4d9e4 Impact Data for FloodEvacuationRasterHazardFunction.
132f404 Impact Data for TsunamiEvacuationFunction
6d11835 Impact Data for VolcanoPointPopulationFunction.
409ae55 Impact Data for VolcanoPolygonPopulationFunction.
5cc8502 Remove calculate impact.
7cb71fa Move calculate impact to IF base.
e6bd43c Merge branch 'develop' of github.com:inasafe/inasafe into json_impact_data
fb3bbb3 Better naming. Coding standard.
47b497b Add unit test for generate data for population.
67bb468 Fix failed unit test.
641ec01 Add unit test for population report template.
6f097b6 update the landcover in Jakarta instead of London
da3f666 fix pep8
36c39aa Impact Data work for Population IF.
ee92e97 Merge pull request #2733 from Gustry/timeout
8c2be9a Merge pull request #2726 from Gustry/osm-downloader
0448a67 Add proxy method to get proper template object.
27e2079 Add generate data for population IF
b098ead Backport recent changes in wizard to the refactored version
af5f92c Merge branch 'develop' into wizard2
cf02534 Fix merge conflict in test_wizard.
4cf1b04 Impact Data for VolcanoPolygonBuildingFunction.
fda6115 Impact Data for VolcanoPointBuildingFunction.
8a50c75 Hot fix for failed test in wizard.
945d3c7 Better path for test files.
3a2197f JSON file for testing impact report.
135736a Impact Data for TsunamiRasterBuildingFunction.
e041e90 Impact Data for FloodRasterBuildingFunction.
a56a845 Impact Data for FloodPolygonBuildingFunction.
4980b4f Impact Data for ClassifiedRasterHazardBuildingFunction
f0f4458 Remove html report generation from IF.
543ddd0 Impact Data for ClassifiedPolygonHazardBuildingFunction
b364c5f Fix PEP8 in wizard dialog.
2cccaaf Move wizard metadata to definitions.
d4c4846 Update structure and road value mapping.
d620d5b Fix failed to run the test in test dock.
145a779 Add method to handle template from layer, not json only.
071bc48 pep8
63557a3 Merge pull request #2721 from borysiasty/develop
f1583c2 Maybe this will make nosetests show the debug output
baeb372 use stderr to hopefully get the output shown in travis
6b04257 Fix tests, add debugging statement
1987e38 improve test buffer
4cf3d31 fix if the request is cancelled, the http response is none
23cd8d7 handle HTTP 509 if the overpass is busy
16badaf manage a timeout error from the overpass in the OSM Downloader
78f2b75 add debug helper functions
4041e5e comment
b3d6681 add some unit tests
a46cd75 Merge remote-tracking branch 'upstream/develop' into landcover_impact_function
754e498 Remove landcover IF parameter (replaced by exposure's keyword)
3f654ae Merge pull request #2730 from ismailsunni/fix_2720_develop
bc4ab16 Fix issue #2720
3f96a41 Create HTML from JSON for EQ building works in Dock.
1f62d7b Make template able to read from JSON file directly.
1c9f3fe Return html and message object. Add unit test also.
2f9f606 remove deprecated functions from QGIS
0d94b81 fix pep8
3716c53 minor changes in the OSM Downloader UI
25ae17c First unit test for generating report.
5ef3bfa Add report templating package.
085af3a Typo fix
ca987af Merge branch 'develop' of github.com:AIFDR/inasafe into develop
731c7c1 Write json on EQ building IF.
292774f Fix test in test_core
f4e814f Generate data for building IF.
995962e Rename exposure's value_map to value_mapping
44716b9 Add name and description placeholders to the wizard's temporary metadata
830327a Action list for polygon population.
1cb636e Action List and Notes for road IF.
b185ced Remove not needed variable.
709b78e Merge pull request #2710 from wonder-sk/metadata_changes_after_tests
4794f8f Merge pull request #2712 from Gustry/fix-network
d24b75e Wizard v2
92c1edf Add road and structure mapping
112f2c1 Fix test
6509640 Experimental bar chart for each land cover class in report
dae7f6d Reporting of impact per each aggregation zone, improved pivot table
ebad04d Initial implementation of pivot tables for IF reports
481dfca Helper class for calculation of aggregates of tabular data
e3bdbf4 Land cover report in two steps (1. get data, 2. format) without mixin
9cd71bf Use QGIS intersection alg for interestion of exposure vs aggregation layer
966e061 Initial support for aggregation for new-style IF
241b2f9 fix tests
b95e6eb Merge pull request #2659 from lucernae/realtime-flood
6a524e1 fix tests
3a2305a Fix failed test.
7f9b894 remove unused var
c4e70d3 Better code formatting.
e3442ae fix tests about volcanos
818f083 Fix failed test.
98a8d05 Separating format and data in IF population.
23ad31d removing geodesy module
20f5080 polygonize volcanos point, use QGIS api in buffering
7f14932 fix issues in shake template with new placename
a11742f Move action list and notes formating to base mixin class.
962b6e7 Move action checklist and impact summary for population mixin
bd8c963 Tidy up code.
e2da44c Fix failed test on building breakdown.
73dff97 Add value for fields.
8dfbb33 Fix test due to typos.
693d120 Fix QPaint device error.
0dab81d Separate building breakdown formating and the data.
94bc208 Styling for impact layer - high/medium/low
e8f4ef4 Take into hazard classes into account
8944d42 Separate impact_summary formating and the data.
c9b1209 Add classes to godzilla hazard
ee82204 Change format notes to notes method in IF building.
0e87e2c Fix tests
2f080f7 fix delete network reply after a download
d6f6ed1 Fixed report generation for land cover
121fe86 Update metadata of landcover exposure
e6c35b1 Update metadata of test landcover hazard layer
bdb2d83 (martin/metadata_changes_after_tests) These are automatic changes to files after tests are run
3e29add Make action list in better structure.
f62e987 Fix unit tests
22b44bc Add percentage of affected area for each land cover type
7c4352e Unit test fixes after addition of new impact function
425d647 Added unit test data for land cover impact function
960baa0 Added classified hazard vs land cover impact function
a1c91e0 Refactor method name in impact report.
b9000ef Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
a8a85f3 Merge pull request #2707 from easmetz/develop
ab00d75 (libby/develop) Merge remote-tracking branch 'upstream/develop' into develop
1816ffe ###Problem Peta Jakarta delivering python error
d2146c3 (libby/fix-2704) Changed name of help topic to match icon and gui title.
f43d5c9 ###Problem
8b1e7b5 Major feature Add:
1f8c453 First half of dock help being polished. In progress.
de0f1cd - Corrected capitalisation of "questions", "results" and "buttons" in Dock Help. - Bolded "questions", "results" and "buttons" in Dock Help.
5fb3c76 Corrected capitalisation of "Impact Function"
f755684 Corrected capitalisation of "Impact Function"
8c529c7 Fix import icon. Changed order of options in Analysis Area window.
c5d96fe Merge pull request #2705 from Gustry/if-refactoring
c3eb02d Reviewed extent selector help. Still in progress v3. Added information about bookmarks and Toggle Scenario Outlines
60b4ada Reviewed extent selector help. Still in progress v2.
d131d7a (etienne/if-refactoring) moving call to set_if_provenance in base.py
a1408f8 fix IF refactoring
d85339a Reviewed extent selector help. Still in progress.
9fa6e47 set the aggregation layer from the aggregator
c72664a Reviewed dock help. Still in progress.
10f84f0 removing check user_extent, clip_parameters will set the value
c43eda9 fix catch exceptions in IF
3b601c3 Merge pull request #2703 from easmetz/fix-2702
89b38b3 (libby/fix-2702) fix #2702 Review context help for OSM downloader dialog. Added new information about Political boundaries.
be9c3ee Merge pull request #2661 from Gustry/refactoring-if
19139e4 update tsunami on roads IF
38351f5 Merge remote-tracking branch 'upstream/develop' into refactoring-if
dabb8b2 Merge pull request #2695 from Gustry/tsunami-if-develop
87b14d3 revert refactoring intersect_lines_with_vector_cells
afadf04 revert refactoring flood_cells_map
f6063c4 add missing translations
13136d7 add translation about meter
a37d398 fix tests
4096e12 fix metadata tsunami on roads IF
3d132d5 moving call methods in tsunami if
6c115c7 refactoring tsunami IF (roads and buildings)
009cdce unit in road postprocessor
e2e4d71 add units on each rows, not on columns in the road report
8ce4df1 call mixin init in IF
8207092 add flag for add unaffected column in the road report
9fd02ea disable Flood On Raster IF for a tsunami hazard
354ce4f fix tests tsunami on roads IF
3c2f62d fix roads which intersect partially the hazard raster
7fe4c98 commit to the output every 1000 features
3ce82f3 impact report tsunami IF
1339811 update tsunami on buildings IF
ee91870 add tsunami IF init
46d0e56 Merge pull request #2690 from timlinux/fix-2689
4024dcc (origin/fix-2689) Fix PetaJakarta flood style to be consistent with PJ website
9b29875 Merge pull request #2668 from Gustry/fix-2361-roads-postprocessing
9f26536 update to "total affected" in the road type postprocessor
90ee863 fix hide exposure layer after an IF in develop
e554000 Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
144e4ba Merge pull request #2655 from Gustry/unicode
ab79f89 fix #2361 count roads length in post processing instead of features
a80eda3 (rizky/realtime-flood) Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
4702407 fix tests
46623c9 add small comments
dba7c81 revert builds.dbf to the previous commit 611d7b6
1a0373e refactoring the way we launch the IF
dfd799d cleaning some comments
001796f fix analysis in wizard
f6637c3 fix extent in IF setting
38094d1 (borys/develop) Merge pull request #2647 from Gustry/mistakes
cd98a1f pep8 and fix tests
7943239 remove import Analysis
7377395 Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
fb1bdf5 Major feature addition:
46f29bc remove analysis.py
af4f104 move setup_analysis
23348b3 Merge pull request #2656 from Gustry/aggregator
dcf0f1b Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
0686ed5 fix #2652: fix impact function addition over NaN values
3e2dc95 add realtime flood template
e7fd1f9 move run_analyse into IF
936fef2 create run_analysis method in base.py
bb942db Merge pull request #2658 from timlinux/develop
1f6d96a Fix issue if bookmark cannot be reprojected in extent selector
452cfd9 move setup_impact_function in IF
ad0f759 check if the excpetion got an exception parameter
5b88a33 move aggregator in IF
397c4b1 (rizky/develop) Merge pull request #2654 from Gustry/osm-buildings
935ed67 Merge pull request #2650 from Gustry/analysis
7db617d fix tests
b164727 unicode error if layers do not overlap in French
f321bf4 buildings 2.5D if qgis >= 2.14
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

Changelog for version 3.3.2
================================

afed399 (HEAD -> master, upstream/master) Merge pull request #2727 from Gustry/timeout
9645fef Merge pull request #2729 from ismailsunni/fix_2720
45eae08 Fix issue #2720
96f3c24 fix if the request is cancelled, the http response is none
8b44d90 handle HTTP 509 if the overpass is busy
e820ad7 manage a timeout error from the overpass in the OSM Downloader
431c4a4 Merge pull request #2722 from Gustry/fix-network-master
bafaca7 fix delete network reply after a download
9f610ef Merge pull request #2708 from timlinux/master
24b79c3 (libby/master) Merge pull request #2701 from timlinux/master

Changelog for version 3.3.1
================================

c3211e6 (HEAD -> master) ###Problem Peta Jakarta delivering python error

Changelog for version 3.3.0
================================

28318d2 (HEAD -> master, origin/master) Updated changelog for 3.3.0 to include tsunami on roads changes
988a12b (upstream/master) Merge pull request #2694 from Gustry/unit-master
2894f66 fix metadata tsunami on roads IF
9fc441c Merge pull request #2693 from timlinux/master
0b3fa7a unit in road postprocessor
6981387 Fix PetaJakarta flood style to be consistent with PJ website
c9697b2 Merge pull request #2692 from ismailsunni/translation-3.3.1
c6d9649 compile translation.
654c50c Update translation from transifex.
5f6bda5 Merge pull request #2680 from Gustry/tsunami-if
4351c9c Merge branch 'master' into tsunami-if
56a7ef1 add units on each rows, not on columns in the road report
c412d06 Merge pull request #2688 from Gustry/backport-2361
9686bf0 update to "total affected" in the road type postprocessor
a7a734d fix #2361 count roads length in post processing instead of features
2db13f1 call mixin init in IF
bcc8508 add flag for add unaffected column in the road report
0df0558 disable Flood On Raster IF for a tsunami hazard
a7a1b0d fix tests tsunami on roads IF
d85be58 fix roads which intersect partially the hazard raster
92459fc Merge pull request #2683 from Gustry/fix-exposure-layer
3e272d6 commit to the output every 1000 features
fd59cc5 fix hide exposure layer after an IF
f4533b7 impact report tsunami IF
6d6df96 update tsunami on buildings IF
b8d057b Merge pull request #2678 from Gustry/fix-unicode-exceptions
5a13373 add tsunami IF init
1e322e5 check if the excpetion got an exception parameter
c2abaf8 fix tests
333765d unicode error if layers do not overlap in French
5e58529 Merge pull request #2665 from Gustry/mistakes
ecaf13d Merge pull request #2667 from Gustry/fix-master-2663
30eb5aa fix 2663 in master
9b377e4 Typographicals errors
4e6d0e2 add missing bullets
cb21121 fix spaces in help
1a3d02f mistake
b695b9d mistakes in wizard dialog
91dc508 Merge pull request #2645 from timlinux/master
311820d Merge remote-tracking branch 'upstream/develop'
ab7f485 Merge pull request #2644 from ismailsunni/translation-3.3
3e3e866 Updated metadata.txt to final
748e78f Resolved merge conflicts with develop
ffe878a Compile translation strings.
0258e92 Update translation.
6941c8b Merge branch 'develop' of github.com:inasafe/inasafe into translation-3.3
a897f46 (develop) Merge pull request #2641 from ismailsunni/remove_death_code
169b645 Update string.
a777b48 Update translation from transifex.
d27bf4e Merge branch 'develop' of github.com:inasafe/inasafe into translation-3.3
5ea1cb3 Remove dead code. Styles.py.
a13105f Merge pull request #2640 from timlinux/develop
e4fb933 Small typo fix in petajakarta help
9c9e1e1 Fix issue with styles for flood on polygon pop when class field is an int
b4715a1 Merge pull request #2638 from timlinux/develop
21f77c0 Merge pull request #2639 from ismailsunni/update_data_test
3c1d3f5 Remove unused method. Trigerring travis.
a8c7f5e Update strings.
f37c3de Update translation from transifex
c32f659 Merge branch 'develop' of github.com:inasafe/inasafe into translation-3.3
2cdf084 Use FloatTuple for resolution in data test metadata xml.
d5a8f4f Merge pull request #2472 from timlinux/fix-2471
91771f1 (origin/fix-2471, fix-2471) Updated style and XML template for PetaJakarta
602577a Fixups for petajakarta flood styles
f1b8c82 Revert changes diverging from upstream
b01c57c Merge changes from upstream
4b9428d Metadata updates
b7b4d19 Update strings.
d1b6886 Update translation from transifex.
c2ed2c6 Merge remote-tracking branch 'inasafe/develop' into translation-3.3
6c30014 Merge pull request #2551 from Samweli/develop
8694c26 Merge pull request #2634 from ismailsunni/fix_2553_hair_loss
5656613 Fix docstring for classes.
4bdd1f5 Remove misleading comments.
3b3d1a4 Merge pull request #2635 from inasafe/issue-template-2
2d53e23 (upstream/issue-template-2) Create ISSUE_TEMPLATE.md
b208e96 PEP8
df05ca7 Add FloatTuple property for resolutions.
9c8c029 Update data test from tuple to float (resolution)
24d0880 Fix merged conflict.
3e7f60b Use resolution as float, not tuple.
40f8260 Add project for the issue.
1c84f91 Fix expected values.
4c67b81 Move test dock regression to separated file.
b2f20bb Remove unused test data.
5b3cc26 Merge pull request #2627 from Gustry/type-error
1afc59e Updated PJ downloader to work with new API. Removed date and area level options
9f75b4e Resolved merge conflicts
37d2e6e Resolved merge conflicts
e38f5da A little formatting change to wizard
5e70990 Merge pull request #2633 from ismailsunni/fix_2623_json_seriazible
d5db6ed Remove unused code.
81ab832 Move encoder to different file and pep8.
22bbf48 Add more cases for encoder.
a4b6c37 Make the metadata json work for date.
d2eb7ea Add case for QUrl for json metadata writing.
b261b60 Make metadata able to read datetime from json.
3cd36c2 Add more case for json write.
7ddb2ca Merge pull request #2601 from lucernae/develop_functionality
defefad Add special encoder class for inasafe metadata
121d57d Add url and date in the xml
6012e3c Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
c20625b fix #2626 be sure that we have unicode for unique values from a layer
6c7379b Merge pull request #2621 from Gustry/extent
d4cff80 Merge pull request #2622 from ismailsunni/fix_legend
2b80262 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
121010f Major configuration update:
fdf22c9 Add Readme for InaSAFE-Headless
e0097f1 Uses python requests to download file
c0775e4 check if user_extent is None
7cdb135 Add more suitable data test.
56f94ac Fix legend to use greater number than preious range.
ccc0474 fix #2604 check if the user_extent is well defined
14c1fa0 Merge pull request #2620 from Gustry/osm
a3af306 Merge branch 'develop' into osm
1e6d414 Move celeryconfig declaration
9956c57 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
0c188d4 Merge pull request #2616 from ismailsunni/fix_2603_update_LanguageCode
f61b724 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
478a8c7 update keywords for the OSM tile layer
6806b19 updated test with new changes
eaf3e92 Merge pull request #2619 from Gustry/fix-2618-extent
0d5f06b fix 2618 : x min and x max in GUI
3585976 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
1dafc0d impact layer now showing YES zone only
6b26997 Merge pull request #2608 from Gustry/network
a69537d (origin/inasafe-2553) Merge remote-tracking branch 'upstream/develop' into inasafe-2553
e178a69 Update string.
e361bb4 Update from transifex.
9f2110c Merge branch 'develop' of github.com:inasafe/inasafe into translation-3.3
00efde9 Merge pull request #2614 from ismailsunni/fix_2612
6815434 Merge pull request #2617 from ismailsunni/develop
940a74b Merge branch 'develop' of github.com:inasafe/inasafe into develop
1418f67 Fix typo.
f7d2a0b Update translation.
28481f5 Update translation from transifex.
da5980b Merge branch 'develop' of github.com:inasafe/inasafe into translation-3.3
24ad164 Add new end line if not exist in metadata.
c89a6f1 removed no zone featurea in impact layer
9d871d6 Merge pull request #2615 from Gustry/qgis_version
f81ea1c Update LanguageCode to English
a01e238 qgis version and language in osm downloader url
5da9d0e fix test for <2.11
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
a6868b7 refactor analysis changes of inasafe 3.3
41549b0 Updated tests for 2553
0deea81 Merge pull request #2444 from lucernae/develop_functionality
df2ac50 Fix tests: update keyword file read tests
7c052e4 PEP8 in wizard.
8ca7245 Refactor variable name.
536f73f Add new string for wizard per #2596
7e087d1 Add more explanation for extra keywords.
de7d7b6 For #2596, fix missing constant question and add area in population.
0014ab6 Use title case for layer name.
e9e8f2f Merge branch 'develop' of https://github.com/Samweli/inasafe into Samweli-develop
60a9cf2 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
ce9d08e Merge pull request #2536 from lucernae/realtime-flood
351ccd2 Merge branch 'realtime-flood' of github.com:lucernae/inasafe into realtime-flood
6c6d6e0 Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
0a0fe6e Merge pull request #2492 from timlinux/standards
da77d6c (origin/standards) Fix unintended indent
840f0de Fixed indentation error
0259dca Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop_functionality
1e694c7 develop headless celery based task
7321b56 (standards) Merge remote-tracking branch 'upstream/develop' into standards
4c8c9aa Small typo fix
f0bc833 Merge remote-tracking branch 'upstream/develop' into inasafe-2553
b90ec4f Merge pull request #2597 from timlinux/develop
498856e Updates inasafe_data sha to use qmls tagged as version 2.8.1 Wien
476a9b6 Fix formatting in metadata.txt
313ffd2 Standardise style version in all qmls
2b16341 Merged changes from develop and resolved conflicts
759fde8 Merge pull request #2595 from ismailsunni/fix_failing_test
8485a67 PEP8
51bc9d8 Fix failed test.
42b4463 Merge pull request #2564 from Gustry/fix-2468
8ef57db (ismail/translation-3.3) Update translation strings.
6ffaa94 Update translation from transifex on 25 Jan 2016.
af41f83 (rizky/realtime-flood) Merge branch 'develop' of github.com:AIFDR/inasafe into realtime-flood
4de0caa Update keyword version to 3.3, and uses .xml keywords file
63e3696 (etienne/develop) Merge pull request #2542 from ismailsunni/tsunami_raster_building_if
b1dcf1c Merge pull request #2591 from ismailsunni/fix_2410_error_report
083c2b9 (ismail/tsunami_raster_building_if) Merge branch 'develop' of github.com:inasafe/inasafe into tsunami_raster_building_if
af9d701 (ismail/fix_2410_error_report) Better building usage count. Add categories as parameter.
791e402 Merge pull request #2590 from ismailsunni/fix_2235_huge_difference
4fe001e (ismail/fix_2235_huge_difference) Add more detail in unit test
1a6ef37 Add the matrix not the number of displacement. Fix #2235
9d904a0 Tidy up code.
320c0bc Moved #2553 test to dock
3aeef46 Merge remote-tracking branch 'upstream/develop' into inasafe-2553
0ba5f8f (ismail/develop) Merge pull request #2580 from ismailsunni/fix_2529_zero_transparent
35442b6 (ismail/fix_2529_zero_transparent) Merge branch 'develop' of github.com:inasafe/inasafe into fix_2529_zero_transparent
bfd5ef0 Merge pull request #2586 from ismailsunni/fix_2585_qdate
58803ea Fix typo that makes the problem before.
1a7ee4e (ismail/fix_2585_qdate) Show only date in keyword wizard date selection.
7806efa Show proper format of date in dock and wizard.
485d354 Add notify REST API when new shakemap is pushed
c438037 Add error checker for incomplete grid.xml
2cc1bc3 Merge branch 'realtime-flood' of github.com:lucernae/inasafe into realtime-flood
4672133 Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
868d5e5 issue #2438: add tests for issue
71ed12d Merge branch 'develop' of github.com:AIFDR/inasafe into develop
2a6692f corrected values in impact layer style
efda664 Fix merged conflict.
16b2ecf Merge pull request #2582 from Gustry/clip_parameters
e913246 changed the way of creating impact layer style
cbfc4e3 (etienne/clip_parameters) pep8
53a1fe6 store the viewport extent instead of the map canvas
58f8b8d Merge branch 'develop' of github.com:inasafe/inasafe into fix_2529_zero_transparent
67fe710 PEP8
faf9cfa Set all transparency to 0 if not value = 0
27d04f7 (etienne/fix-2468) add threshold to earthquake
4eacdb6 move var in base.py
bcf789d fix clip_parameters in analysis_handler
2a3331d Merge branch 'develop' of github.com:AIFDR/inasafe into develop
de7d7e3 changed impact layer style creation
6962546 revert wrong commit on test data
ea580ca fix aggregation layer setter
31c9616 fix errors
a34c7e0 move clip_parameters
bf69f4b Merge pull request #2581 from ismailsunni/fix_2530_no_unaffected
8ba064d added checker for population number
125395e fix DOCK test init
a70108e disable building threshold in earthquake
a14a6cb Merge branch 'develop' of github.com:AIFDR/inasafe into develop
358100f updated comment on the new function
f65cb35 fixed logic for querying hazard levels
7080c04 fix docstring and typo
16ed41a Merge pull request #2579 from Gustry/crs
d20904e Merge branch 'develop' of github.com:inasafe/inasafe into tsunami_raster_building_if
a3ff9d8 Update data test.
817a5b5 Fix failed test.
0fc7cb8 (ismail/fix_2530_no_unaffected) Add unaffected population in report in IF Flood polygon poppulation
394c622 Set transparent for raster value = 0. Per #2529.
c6cd621 move clip_parameters function in IF
1b47004 use QgsCoordinateReferenceSystem instead of integer EPSG code
a95bc0f Merge branch 'develop' of github.com:AIFDR/inasafe into develop
c55f123 refactored code in the new IF
4383b98 Merge pull request #2578 from Gustry/message
7faaeb8 move message prerun
4f54274 Merge pull request #2577 from ismailsunni/fix_2569_url_field
987a145 Merge pull request #2574 from Gustry/safelayers
f9c7879 (ismail/fix_2569_url_field) Clean up unused code in keyword_io.
9c6771e Only handle for QUrl object.
94186d3 Merge remote-tracking branch 'inasafe/develop' into fix_2569_url_field
cef1a5f fix test, change AggregationCategorical to BuildingType postprocessing
139a696 add building_report_threshold in every IF using building mixin
63506e4 add maximum value
66d2423 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
88d555b changed new IF exposure unit to count
0d9e9fa Merge branch 'develop' into fix-2468
94f508f fix text : set self.building.report_threshold
62db93d use SafeLayer in Analysis
61a00a1 Merge pull request #2575 from ismailsunni/fix_2570_format_int
829acda Fix URL extra 'code' in keyword in dock.
9f67ced Merge pull request #2573 from ismailsunni/fix_apostrof
e68febc Merge pull request #2568 from ismailsunni/fix_2545_report_order_consistency
c6069f1 (ismail/fix_2570_format_int) Format number of pop in action list.
37411e7 setup IF function before layers
e30ff1d (ismail/fix_apostrof) Fix apostrof.
74306c4 Tidy up code.
5c35d43 Merge pull request #2566 from Gustry/self
2684934 (ismail/fix_2545_report_order_consistency) Reorder impact report in population IF .
6bdc67f use self.exposure and self.hazard in analysis
199b170 rename hazard, exposure and aggregation in Analysis.py
2859c86 add threshold parameter to the building postprocessor
28af506 set the threshold in self
707b667 Merge pull request #2563 from Gustry/space
ea4c0d5 fix missing space
d10d4d2 Merge pull request #2557 from Gustry/safe-layers
6852bef Update strings.
f011732 Pull translation from transifex.
3015911 fix missing spaces
5d861db downgrade versionadded in safe_layer
d5ae660 Merge pull request #2559 from Gustry/clip-param
2892bd7 Merge pull request #2556 from Gustry/tr
8fb7a82 Merge pull request #2561 from ismailsunni/value_mapping_key
ab7dfca (ismail/value_mapping_key) Fix test.
3b1e574 Use definition's key as key in value_map keyword not definition's name.
6f5745e clip_parameters : replace the list by a dictionary
661c68f Use unaligned clips for test data for 2553
39f90cd add docstrings to generate_insufficient_overlap_message
a763fac add methods to safeLayer
01c315e refactoring signals in safe
2879139 added minimum needs function in the IF
6e59f43 refactoring signals
5d059d7 use safe.utilities.i18n.tr() instead self.tr
df04100 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
e5d3d91 removed usage of area_type in IF analysis
a06019a Merge pull request #2554 from Gustry/etienne
9dc1b85 add myself to travis
28fead4 fixed test_run in new IF
971a021 updated the test for IFCW
5db8f80 Merge pull request #2550 from ismailsunni/revert_deleted
d4fd93b (ismail/revert_deleted) Update data test.
7e460c3 Update data test.
68dbe88 Revert accidentally delete.
a8d0c81 fixed 5 travis fails
45da907 fixed conflicts with develop branch
4edc8e7 changes according to #2543
08960bc Merge pull request #2546 from ismailsunni/fix_2385_sorting_hazard_classification
d91ab1f (ismail/fix_2385_sorting_hazard_classification) Fix failed test in test_wizard_dialog.
edf8442 Change to High, Medium, Low Hazard Zone
c06291f PEP8
3c82cb8 Re-order tsunami depth in impact report in tsunami IF population.
d15f36a Use value mapping in volcano polygon IF population to sort the result.
e88ca1f Update test to make it pass.
1b01752 Update name to more human friendly.
c0a0121 Use value mapping in volcano IF building to sort the result.
230636a Fix merged conflict.
99ca67b Merge pull request #2548 from ismailsunni/backport_from_master_2527
7e34526 Merge pull request #2539 from ismailsunni/iso_keywords_3
c403903 Fix order by using Vector Classification in classified polygon population IF.
f31ecf8 Add get_qgis_app to avoid error running one test.
8424cb8 Fix failed test.
7974568 (ismail/backport_from_master_2527) Remove some more unneeded files from plugin installer and fix version number reference in release.sh script.
4e1d509 Small fix to nsis plugin exe generator logic
13de436 Use Vector Classification to sort the hazard level in report.
8eee33c Fix wrong refactor.
ddaf518 Pull out definition method from KeywordIO class.
2b207f5 Put the hazard order from high to low in flood and tsunami IF
44fcd7b Merge pull request #2544 from ismailsunni/fix_2425_IF_volcano_unit
9dc5063 (ismail/fix_2425_IF_volcano_unit) Move population breakdown to above total affected.
2e9f1fa Use radius in IF Volcano.
31c247c Set maximum number of distances to 8
f644853 PEP8
d0aebdf Use proper km in Volcano Point IF Population.
0dfa119 Use kilometers in Volcano IF Building.
9876400 Fix failed test.
7b9f196 Add a better notes and coding style.
e126a60 Update color and add dry zone.
01a110e (ismail/iso_keywords_3) Change keywrod version data test to 3.3
b37c63c Add better color style for impact layer and help in IF parameter.
ffda2a1 Fix failed test and remove tsunami from flood raster IF.
f759eba New IF works in test suite but not in QGIS (crash).
de2714b Add notes for tsunami raster building IF.
6280ea2 Merge pull request #2541 from ismailsunni/revert_modify_test_data
4cafeaf Add low, moderate, high threshold for tsunami raster building IF.
611d7b6 (ismail/revert_modify_test_data) Revert test data.
1cf6c99 Merge branch 'develop' of github.com:inasafe/inasafe into tsunami_raster_building_if
1a19e42 Merge pull request #2540 from ismailsunni/fix_2384_unaffected_column
e68429c Fix failed test.
19060c3 Register tsunami raster building IF.
281a8fb Add tsunami raster building IF based on flood one.
0fe1e91 (ismail/fix_2384_unaffected_column) Fix failed test.
1b6f260 Add unexpected column for IF road.
ca33fc0 If IF use custom affected categories, do not show unaffected column.
9b3cf79 Remove not affected handling from IF volcano point.
4513745 Remove not affected handling from IF volcano polygon.
61f02d4 Remove not affected handling from IF Eq
0596e37 Put handling for not affected building in mixin.
d330a34 Add unaffected column in earthquake_building IF.
790e50f Add unaffected column in volcano_polygon_building.
7f476be Add allow_resampling properties
f24a1b5 (ismail/fix_2384) Update gitignore
106219b Update gitignore
5e4f051 Fix set IF provenance order.
6e34250 (ismail/if_provenance) Add proper start_time.
751ecaa Put set_if_provenance before generating keywords for impact layer.
bf6e136 Add new keywords to classified polygon people IF.
36200ad Add IF provenance in all IF.
4ba700b Read also IF Provenance for ImpactLayerMetadata.
e42c31f Add test_core.py
26fc7ad Add provenance to impact layer in EQ IF before returning result.
8a3a4dc Make metadata able to write and read provenance in json and xml.
0298f65 Make metadata able to write IF provenance.
d4c46f6 Fix test due to update if provenance.
637ed81 Adding method to save provenance to metadata object from dictionary.
8dfd8d2 issue #2438: add tests for issue
f03600c issue #2438: fix location source to come from BMKG
5e8d555 Merge branch 'realtime-flood' of github.com:lucernae/inasafe into realtime-flood
0c3e8b7 fix tests and refactoring
6e81b69 Adding if provenance step.
2aeeb1b Merge branch 'iso_keywords_2' into if_provenance
6e9a9a3 Merge branch 'develop' of github.com:inasafe/inasafe into iso_keywords_2
ef0fd19 Merge branch 'iso_keywords_2' into if_provenance
8b12b37 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime-flood
6dab88c Use clone layer also for another failed test.
3ee8147 Add new xml file for data test.
4c39bb9 Use clone layer to avoid modifying test data.
7205a47 (rizky/develop) Merge pull request #2535 from ismailsunni/fix_2532
15de8de (ismail/fix_2532) Fix #2532
cc4c9e3 Use clone layer to avoid failing test unexpectedly.
a8640bd Merge pull request #2525 from ismailsunni/fix_2523
92c5fc1 Alway set keyword version to the latest version.
7168ee4 Use different keyword version, not taking from metadata.txt
7e7ed0d Update test after updating version.
b01fb76 Change version to 3.3
8244279 Delete no longer needed compare_version method.
1c5052e Use is_keyword_version_supported in wizard.py
87a825a Use is_keyword_version_supported in dock.py
5b5e961 Add is_keyword_version_supported method.
6bad151 Merge branch 'develop' of github.com:inasafe/inasafe into iso_keywords_2
20ace8b Merge pull request #2534 from Gustry/fix-2532
f953ae6 (etienne/fix-2532) fix var name #2532
90d9eef Add provenance for EarthquakeBuildingFunction
14f71df Enable adding data to provenance step.
a6a4f15 Remove duplicate ignored directory
06f0218 Merge branch 'develop' of github.com:inasafe/inasafe into iso_keywords_2
374e111 Merge pull request #2526 from ismailsunni/tx_configuration
1811233 (ismail/tx_configuration) Merge branch 'develop' of github.com:inasafe/inasafe into tx_configuration
ca8ffa6 Update transifex configuration to match with new projects
0314803 Delete unused file
661aa8f Merge pull request #2524 from Gustry/analysis
7215857 (ismail/fix_2523) Fix some test so that it's able to run individually.
b68c2ce Use get_unicode for output path pdf.
77e6627 fix indent
c52bf68 Merge pull request #2522 from Gustry/style
7e218f0 move setup_IF inside setup_analysis
1243315 fix test
88df6df analysis refactoring : moving optimal_extent and insufficient_overlap_message
e0adfa0 set the floodprone in blue
1955610 Merge pull request #2516 from Gustry/proxy
3eb5730 Update hash value for inasafe_data
a676b53 Merge pull request #2520 from Gustry/network
0a18144 fix error message if the server is down
b7a70de (rizky/develop_functionality) add generate report function
a9d69b5 Skip test since it's not used anymore in the new metadata.
c8963a6 Merge branch 'develop' of github.com:inasafe/inasafe into iso_keywords_2
8ca8508 Merge pull request #2518 from ismailsunni/Charlotte-Morgan-develop
3570e18 Update xml after running tests.
248c318 Remove old xml metadata code.
0f9c87d Fix failed test after fixing template.
7e3663e more fixes
846b74e remove file not used
d9feee7 ISO template fixes first pass
2c4d918 Merge branch 'develop' of github.com:AIFDR/inasafe into develop_functionality
9cb1233 PEP8.
1970d54 (ismail/Charlotte-Morgan-develop) Update test for @Charlotte-Morgan's PR.
b02e1da Merge branch 'develop' of https://github.com/Charlotte-Morgan/inasafe into Charlotte-Morgan-develop
46f3364 Skip no longer needed test.
c7f5e39 Update json control file for test.
14c3fa7 Update date time format.
d77537a Add datetime to date property
510a89d update docstring versionchanged
b351e97 add styles to flood test data and fix data audit for censur
2ec2042 Convert to String for source URL (QUrl)
30f415a Fix merge conflict
35a7581 Merge pull request #2517 from borysiasty/develop
55720ed Update hash value for inasafe_data.
ec9c841 Un skip a test (previously done for testing).
b60c7a1 Update keyword version and layer_purpose for test data.
88e5cf6 Fix weak extenstion slicer.
4cfc9bb Add patch for aggregation keywords.
103a9e5 Update test regarding layer_purpose.
b03c12e Fix test regarding generated xml file.
6ff3a7c Update test data keywords.
60a0659 Fix test in test_message_viewer.py
96b8717 Fix failed test in test wizard.
0ab02ee Remove missleading error message.
639ee76 Add keyword version for data test.
74e1089 Add some new keywords to for census metadata.
6f775b9 Add prob_fatality_mag to new metadata.
188ece8 (borys/develop) [Wizard] Yet another fix for repeated use.
f70155c [Wizard] Use standard QDateTimeEdit instead of QgsDateTimeEdit. Fixes #2515
85cb82b Ensure the 'non-matching keywords' table uses strings imported from definitions. Fixes #2349.
fa0fbb9 Fix serializing classified raster values
b2e3b0d [Wizard] Clear old inputs on repeated use. Fixes #2514 and #2467
4b0c659 #667 Use the network manager provided by QGIS and move it to the file_downloader file
35b9b66 Fix merge conflict.
c857e8a Update hash value for inasafe_data
f7705ca Update file control for metadata test.
a1632b2 Update test keywords.
675cbc7 Revert changes related to new key for aggregation metadata.
4cf9fac Update expected value to make test pass.
3e384cc Update test keywords.
1490431 Update keyword path in test.
22b6cc8 (charlotte/develop) Update default road action checklist
42e920d Update default population action checklist
f906ec5 Update default buildings action checklist
8687961 Update keywords for datatest.
6208683 Add tuple property
a999120 Update keywords path.
cd5375a Set keyword to generate file because it's never been saved.
1a7aec1 Read keywords again after saving to a file.
1f84a73 Fix keywords version and exception
5bd5dda Update test data keywords
c07596c Update test data keywords
b69d529 Update test data keywords.
647536c Add ListProperty
8844920 Add layer_purpose and keyword_version.
9b4e06c Add layer_purpose for generated aggregation layer.
b879727 Add keyword version to metadata if not found.
cc8d440 Add duct type to for aggregation attribute to return None.
5ff7094 Use default value in metadata as None.
3191a00 Merge pull request #2512 from timlinux/less-noisy
0924aa2 Merge branch 'develop' of http://github.com/AIFDR/inasafe into realtime-flood
9e08a6a develop #2476: Update tests and push flood logic
c80b5e8 Merge pull request #2511 from Gustry/network
d8802d5 (origin/less-noisy, less-noisy) Comment out many debug messages that don't contribute much and add a lot of noise to travis logs
889a742 Update keyword for aggregation.
9a359e3 Fix keyword_io copy keywords method.
bf8c553 Use additional type of exception.
c2e8733 Use old aggregation key.
faf5a6d Add more verbose exception.
b2d3349 use read_iso19115 for reading metadata
5fec957 Update data test metadata.
503fd98 Use read_iso19115_metadata to read metadata.
2c2022e inform the user about the network status in the OSM downloader
69c18e4 Merge pull request #2510 from Gustry/evacuation-center
cceff90 Fix for changing key in aggregation.
71482d9 Add test for old .keywords.
5c0b317 Change key for aggregation keywords.
5805081 Update metadata for aggregstion layer.
14b3d90 Add FloatProperty for metadata.
2f68c30 Update keywords for aggregation.
9b94c60 Resolved merge conflicts
3db5354 replace potential IDP by evacuation center
04cee5d Merge remote-tracking branch 'origin/develop' into standards
0745de6 Added note about using date picker for date in keywords editor.
bbe7182 Merge pull request #2509 from borysiasty/develop
cef742d Added flood prone areas change to metadata
0fd0703 Merge pull request #2501 from Gustry/floodprone
e51122a Merge branch 'develop' of github.com:AIFDR/inasafe into realtime-flood
9219279 Resolved merge conflicts with master
da783ea Change key for metadata in test.
8ec2bce Add boolean property
3a03795 Merge branch 'develop' into standards
47e2099 Merge pull request #2498 from timlinux/develop
69ce4a5 Update data test keyword
6327e0a update metadata
3b2f212 Update test data.
0a82135 Update test data's metadata
5a3c676 Automatically add keyword version
b28012b Fix failing test in impact function manager tests caused by introduction of bayes EQ IF
b4de3aa [Wizard] Get rid of rest of eval() statements. Fixes #2329
8597c0e [Wizard] Replace evals with KeywordIO.definition
1022c91 Merge remote-tracking branch 'upstream/develop' into develop
bfccb16 Merge branch 'develop' into floodprone
d80a5e7 [KeywordWizard] Use QDateTimeEdit for date keyword. Fixes #2499
77300a4 Revert commit eb489403bf
9f560fd Merge branch 'develop' of github.com:AIFDR/inasafe into develop
5d9d5b3 Merge pull request #2508 from timlinux/fix-2504
e9f87db (origin/fix-2504, fix-2504) fix #2504 - exception raised when messaging cell contains nested table or bullet list due to slashes param not being accepted by table class to_html() method.
2e090c9 raise error if no xml for file based layer.
c477db4 Update rule to catch invalid xml metadata file.
6d8b182 Push tags to upstream rather than origin
969ef5b Add more verbose exception message.
b9fb102 Fix test_update_keywords in test_keyword_io
8e57bcf Remove custom failed test message.
9b138a6 Merge branch 'iso_keywords_2' of github.com:ismailsunni/inasafe into iso_keywords_2
160ffb4 Update keyword to make pass test in test_io.
7ecd164 Fix for test in test reports.
1c49d85 Add keyword version in test data
955f4c3 Add more verbose Exception message.
69220b2 Add obtain specific keyword.
c150fe2 Add integer property.
afe12ce Add layer_purpose value to old data test.
7fd251b Update test data in metadata module.
236fca1 Add .xml to clone method.
543b887 Add target_field to impact layer metadata.
1f7122f Add volcano_name_field to hazard layer metadata.
75e1819 Add road_class_field to exposure metadata.
c7eef29 Add generate impact layer's keywords function.
a8db253 Add more versose error message
eb48940 Fix #2504
d43d148 Merged master changes to develop
c7ed150 fix typo in OSM downloader
5914bb7 add flood prone to the OSM downloader
bebaee0 Add more versose error message
ebecbff Update metadata.
b5468e5 Use .xml instead of .keywords.
e83c6a4 Update metadata.
68f3f2a Add date to metadata migration verificaiton
e3b00c5 Remove date in keywords (for now).
355c812 Forget about date for now.
98cc63a Add better tester when migrating a metadata.
41064ca Add Dictionary Property in Metadata.
7733079 Add better message to find missing keywords.
ed9b0cd Update xml file to iso 19115 if not found.
bc28009 Fix for failing test with ITB Bayes eq function introduction
68235e3 Try to read .keywords file if the xml file is not compatible.
31eb225 Migrate to use ISO 19115 metadata.
6cffa60 Added ITB Bayesian IF to registry and changelog
9adae3a Refactor metadata utilities location.
7c2c56d Merge pull request #2350 from dynaryu/develop
2f21e24 Update keywords file.
de1f217 Merge pull request #2493 from ismailsunni/changelog-3.2.4
4739796 Fix unicode reading.
d4ee522 Nicer asserts for wizard dialog
3bdd18f Dont use message param for unittest builtins as you get better diagnostics if you leave it out
26ebea9 (ismail/changelog-3.2.4) Fix travis and pypi link in README.
cd29284 Add changelog: add new IF Classified polygon hazard on polygon people
3c3bed5 develop #2476: major proper refactor and add realtime flood
e29fb0e Formatting cleanups to wizard
fd68360 Merge pull request #2487 from borysiasty/develop
2cabd21 Merge pull request #2483 from timlinux/keywords
148acd5 Temporary skip unit test.
38aa237 Merge pull request #2442 from Samweli/develop
a7613d9 Fix unicode frustation.
4fd6416 Remove trailing space. Use Cmd+Alt+L to reformat the json file in PyCharm.
2e45b2e changed more methods accordingly to the standards
49c53c7 Change keyword version to string.
98637ed added comments on unit test
b3c3f6b Add datatype to iso metadata. Need to be reviewed later.
ad0b951 Update test file for test metadata.
f14ea0a Fix missing space in json file.
b90196b Change document_date to date.
f805cc7 Update existing_impact.json after changing document_date to date.
fb9fd86 Always return keyword version as string.
3e2b354 Omit None value in ISO metadata from dictionary representation.
24515dc Add read_iso19115_metadata method and test.
221f82a Add create_iso19115_metadata methods.
548edb5 Add update_from_dict method for metadata.
95254f1 Fix unit test.
31a1db5 Add unit test
0d1f4be develop #2476: refactor realtime
3839486 Comment --with-id that makes the problem in ubuntu nosetests.
9b1951d Fix tests for test_clip_vector_with_unicode
d67bac1 Fix failed test: test_read_keywordless_layer.
2c4b37d fixed accidentally edited test
51194c2 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
9de3dcc formatted code accordingly to the standards
897f584 Merge branch 'develop' of github.com:inasafe/inasafe into develop
22c1fe1 Remove old xml metadata.
0459e99 Merge pull request #2486 from ismailsunni/wizard_additional_keywords
b4c711c develop #2476: support for PetaJakarta Floodmap
797aec1 [IFCW] After registering keywords in the KW sub-thread, don't display again the step from where it was called. Fixes #2347
0e1ba07 pep8 and Pylint fixes
6660f30 [Wizard] Add Keywords Creation Wizard confirmation step. Fixes #2422
ca08c97 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
c3a093d passed pep8
db1d325 Dont crash PJ downloader when @charlotte-morgan says she does not wish to create the non-existing download directory.
e3dfead Refactor PetaJakarta downloader to accommodate requests from @charlotte-morgan. See https://github.com/inasafe/inasafe/pull/2472
bb849bf (ismail/wizard_additional_keywords) Merge branch 'develop' of github.com:inasafe/inasafe into wizard_additional_keywords
069fa03 Resolved merge conflicts
8c3ed16 Add test for additional keywords.
f611e13 Merge pull request #2478 from timlinux/fix-2475
fa49b9f (origin/keywords, keywords) Fix for failing keywords tests
fced60c Use wrap_slash for filename cells
b9e7942 Added wrap slash functions in messaging so that long filename cells can be wrapped
827771f Resolved merge conflicts
4a3e818 Updated metadata.txt
964917d Working implementation of on the fly projection for polygon flood on building points/polys. fix #2475
2d87c4d Merge branch 'develop' into fix-2475
fd925f9 Initial implementation for #2475 - support On the fly projection in IF
0acd4d5 Added an entry for PetaJakarta downloader to metadata.txt
a38e216 Implementation for #2471 - add support for loading PetaJakarta data in QGIS
c471a96 First order implementation prototype for adding petajakarta data to InaSAFE
dc2433e refactored run function in the new IF
489bbad added icon for area
1aead6b (ismail/master) Merge pull request #2466 from timlinux/master
9303622 Merge pull request #2465 from timlinux/fix-2464
ba88e79 (origin/fix-2464, fix-2464) Fixed failing test for #2464
922bc87 fix #2464 - support point buildings when doing polygon flood analysis
f81091f checked for None type geometry object
c6dcd77 modified analysis only from selected extent
a48b212 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
36296e7 created new color symbology
97c0fbe Merge pull request #2447 from timlinux/inasafe-2446
4166ebf (origin/inasafe-2446) Merge branch 'develop' into inasafe-2446
fe3afdc Sort out more conflicts with master that were not merged properly
817fe82 Sort out more conflicts with master that were not merged properly
9d2df1f Merge remote-tracking branch 'origin/develop' into develop
754373e Resolved merge conflicts from master so develop is now in sync with master
13a6985 Merge pull request #2456 from lucernae/translation-3.2.2
5487cf1 Merge pull request #2458 from lucernae/update-raven
526ac85 (rizky/translation-3.2.2) Recompile and re add qm translation files
c6f2a5a Fix file attributes for qm files
c671446 (rizky/update-raven) Update sentry dsn for InaSAFE desktop and Realtime
e26efd5 Update translations
9248f6d Update strings.
21ab9f5 Update translation
2070618 Update translation strings.
1f1776d Exclude untranslatable strings from tr function.
973d0c8 Set version to alpha 3.2.2
ad1fafe Update strings translation.
de81ae4 Fix strings issues.
df5f474 Update translation.
7ac7137 Update strings.
c7f4ecc Merge branch 'develop' of github.com:AIFDR/inasafe into translation-3.2.2
cb81a44 Fix returning IF ids in list-function in inasafe
fe9c8c0 Modify inasafe-cli to return filtered IF list
6f40753 edited tests to comply with travis
95a53e1 a fix for one travis failure
c29bceb added check for area geometry before any calculation
355ff06 removed unused imports
6ff8aed Merge pull request #2454 from Charlotte-Morgan/develop
4513c5e using generic polygon for testing the new IF
8afe6fd modified new IF to use single and multiple events
c55ff94 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
8f8887c intersected census with the current flood data
ab3b634 fixed the s
8bd0c2a tweaks to context help
4dde811 tweaks to context help
058829d refactored methods in area report mixing
6c2f40a Add test-translation for fr, es_ES, af
b59b27a Update strings.
be5b0b6 Update translation from transifex.
4a54602 set develop metadata to alpha mode
a1f3ada Merge branch 'master' into develop
558f0d6 Merge pull request #2450 from timlinux/gource
07b8ce7 (origin/gource) Updates for gource
adcff11 added % symbol to all percentages in report
b52fcc3 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
56750c1 (inasafe-2446) Put the OSM layer always to the bottom of the legend.
00bd2e6 Added option to add OSM tile layer
f71c7e7 Move misplaced import
ed5340c Wrap function to read keyword file in KeywordIO
1c090af change on test layer legend index on dock
eb5cb4b updated test_run on the new IF
bfc2cef added licences for sample data
adbbe6b added realistic test data
c6d3229 Merge branch 'develop' of https://github.com/Samweli/inasafe into develop
54b8413 started code formatting
06e9228 Merge pull request #1 from timlinux/samweli-develop
ca48fcb (origin/samweli-develop) Code formatting and style tweaks
080bc65 cleared unwanted comment in test wizard
09b869d fixing classification failure
1e15abc a fix in test wizard
f2db14f fixed 1 error
a1c8656 fixed 2 failures in travis
c6297b9 fixed 6 failures
0886391 intergrated mixin usage in the new IF
0d95f25 Added area report mixin
d188b5f removed a large unwanted file
4e4d66d fixed merge conflicts after pulling from upstream/develop
df50234 fixed merge conflicts
ce9f0ef taking id & population from keywords
482a48d added the new IF
5ec6cca correct typo
a58dda6 change npy to csv for input
90c718b Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
d375b4f add itb bayesian fatality model

Changelog for version 3.2.0
================================

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.
d334ea9 Revert back to use QGIS 2.8.1
e3075b3 Merge pull request #1929 from timlinux/inasafe-1811
5d9dede Skip problematic-test.
4f16edb PEP8.
729050e Put dock in setupclass method.
c952e84 Move DOCK to class attribute.
1e42144 Uncomment test. Safe to merge again.
685625b Mark test as slow to avoid Error in Travis.
dca9ed5 Add make test_suite_all [PACKAGE=name] for easier testing.
ab025b7 Comment out failed test in Travis. Don't merge it yet.
c08ac88 PEP8.
d3187db Add --force-yes.
c25081e Fix merge conflict.
344becc Merge pull request #2186 from lucernae/realtime
297f212 scrutinizer fix
d75d130 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime
d5c67d9 fix timezone issues in realtime
6395514 Merge pull request #2176 from ismailsunni/scrutinizer
01e8e21 (ismail/scrutinizer) Merge branch 'develop' of git://github.com/AIFDR/inasafe into scrutinizer
db9a32b Merge pull request #2178 from dynaryu/develop
eaece00 Add scrutinizer badge.
6b3983c Fix bug, which breaks on vector floods with float flood values.
24b4e6b Fixing inundated / wet category swap.
98c99ba modify test code to reflect the change in zero fatality condition
0fabb3c remove coverage.
f9ac662 added prettify_xml
85fced1 added all KW with the temporary mappings
0b6dc7e added IF processing step
de40bdf added more kw
9c4e8da removed monkeypatching cdata it is already defined somewhere else
63dd1a0 added more documentation
faefca7 renamed json to dict in provenance
f3af3fa removed xml_type from the properties as it is redundant
d973dbc adding documentation
cd5b85f added support for non file based metadata
ad1e4f4 added read from db framework
6556fe2 Super clever way to auto generate properties. Getters and setters are dynamically generated from _standard_properties
eacd6b6 allow reading and writing of provenance in XML
f3ecfa0 big refactoring, removed xml_type and allow None. the xml type is now inferred from the path all properties allow NoneType inserting xml nodes is now possible at any place new node parents are automatically generated
55b309b some refactoring
c5f2b57 removed layer_id  from exported files and more refactoring
2ad987a added xml read and write
e2efff6 added ability to read and write JSON
aa06da2 another big chunck of  refactoring
97f21f7 factored metadata to use subclasses
33afa17 added more properties and json write
ce32eb5 added some mandatory properties
0da1367 replaced use of BaseProperty in the tests
e2317a0 Full rewrite of the metadata stuff
b7f035e Add .scrutinizer.yml and update travis.yml
893f90f re fix test code to reflect the change in the zero fatality
d633de2 Revert "fix test code to reflect the change in the zero fatality condition"
3dc65c9 fix test code to reflect the change in the zero fatality condition
3cb434e revive zero fatality condition
dd7cdb2 add description for parameter x
5cdd93d Change the two impact functions for fatality estimation and test files
002060e Update travis.yml for qgis 2.8.3
9c98e8d (origin/menus, menus) Merge remote-tracking branch 'upstream/develop' into menus
66627ea (origin/inasafe-2189, inasafe-2189) More syntax error fixes
d129da5 Fix syntax error in dock
87df887 (origin/inasafe-2171, inasafe-2171) Cleanup some overzealous refactoring for #2171
fdb9972 fix #2171 - disable organisation logos in dock by default
a18cb90 Merge remote-tracking branch 'origin/develop' into develop
efae992 Another small fix for #2189
6dd33d4 fix #2189 - unicode object has no attribute 'to_html'
4e46600 Put dock toggle menu option first.
0d98f2e Merge branch 'develop' into menus
55d4ab6 Remove unused import
9ef4e37 Adjusted menus to have spacers - fix #1820
97694ec (origin/inasafe-1811, inasafe-1811) fix #2077 - confusing message saying we are ready if extents are not correct
db14df0 Reinstate unicode in test file
3a5e45c scrutinizer fix
ce1d61a fix timezone issues in realtime
4cd1e3d Add scrutinizer badge.
eb0d977 modify test code to reflect the change in zero fatality condition
dbc8d93 remove coverage.
d86f912 Add .scrutinizer.yml and update travis.yml
a542360 re fix test code to reflect the change in the zero fatality
58e6325 Revert "fix test code to reflect the change in the zero fatality condition"
a51e641 Small tweak to ready message
de81844 Merge branch 'develop' into inasafe-1811
42e4501 Fixes for last failing tests for #1811 - extent selector
8fda2a2 Fixed issue with run button not being disabled when notifications are unchecked in extent selector. Fixes another failing test in #1811
44b95c5 Fixes for failing test - remove unicode text in control file
5d7edde Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
097b873 merged
dd7e9ae Interaction fixes for extent selector - ensure run button state is set correctly after using extemt selector dialog
114ba06 Fix for another failing test in 1811 extent selector branch
a32148e Fix for #1811 behaviour - only show ready / warning if analysis is in a runnable states. Fixes failing test test_issue_71 and improves usability
c22385e Resolved merge conflicts with develop
354a31e Merge branch 'develop' into inasafe-1811
9a2f8e3 Merge pull request #2164 from ismailsunni/pylint
8e5783c (ismail/pylint) Pylint.
b9dd0fb Merge pull request #2161 from ismailsunni/IF_uses_layer_keywords
88fe1e0 (ismail/IF_uses_layer_keywords) Small docstring fix.
3ae233e Remove setup_layer in IF base classes.
b84fd09 Use self.hazard_class_mapping for classified vector hazard IF.
6cca47b Use self.hazard_class_attribute for classified vector hazard IF.
1bb8574 Merge branch 'develop' of git://github.com/AIFDR/inasafe into IF_uses_layer_keywords
8c567dc Fix failed tests because using attribute from IF base class.
8f8b2ce Use attribute from base class for building IF.
0a74874 Merge pull request #2158 from ismailsunni/IF_uses_layer_keywords
7339ca2 Volcano polygon building uses layer's keywords.
b1b7ecf Volcano point building uses layer's keywords.
93dad72 Classified raster building uses layer's keywords.
18b7a8f Classified polygon building uses layer's keywords.
165aaca Fixing pylint.
3b77067 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
57085c8 Added tests for population mixin.
68940be Fix multiple volcano name problem.
04156ad Fix broken test.
eacf44d Merge pull request #2155 from ismailsunni/develop
b591474 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
3121926 Wizard wording - tweak for fixing #2084.
b33d5b8 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
3eb22d3 Fix flood polygon population report.
3fd2472 Fixing pylint and pep 8 violations introduced by merge.
bb721c9 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin - Lots of conflicts review
0ba4add Merge pull request #2149 from ismailsunni/develop
349208a Fix #2082
ef4523c Merge pull request #2145 from cchristelis/volcano_sprint/2105
e76a6f6 Merge branch 'develop' of github.com:AIFDR/inasafe into volcano_sprint/2105
357bbd4 Merge pull request #2130 from cchristelis/volcano_sprint/2090
4e4fb9b Merge branch 'develop' of github.com:AIFDR/inasafe into volcano_sprint/2090
a124848 Updated Changelog
611b198 Add test to verify correct adding of totals
45825c4 Fixing calculate total logic.
81c7160 Updated changelog
4b9c757 Add building type postprocessor to volcanic ash impact function (i.e. Generic)
d9a2997 Merge pull request #2137 from cchristelis/volcano_sprint/2103
dce6b81 Updated changelog
97b096d Merge branch 'develop' of github.com:AIFDR/inasafe into volcano_sprint/2103
e49d17b Updated changelog
2a1267d Updating changelog
ba61252 Merge branch 'develop' of github.com:AIFDR/inasafe into volcano_sprint/2090
7871fe2 Fixing breaking test
13c037c Adding regression test to new building type postprocessor.
2823beb Merge pull request #2127 from ismailsunni/safe_layer_migration
fecb499 Fix merged conflicts.
15471a5 Merge pull request #2031 from wonder-sk/qgis_api_classified_polygon_building
cb1d173 Merge pull request #2116 from mbernasocchi/develop
63c66de Merge pull request #2113 from gitter-badger/gitter-badge-1
82cf23c Merge pull request #2121 from timlinux/metadata
c415def Merge pull request #2138 from ismailsunni/develop
684c8eb Set dept in update-test-data to 15.
1a2714f Merge branch 'develop' of github.com:AIFDR/inasafe into volcano_sprint/2103
5548183 Adding building type postprocessor to volcano polygon building impact function.
851842b Improving building type post processor to allow non integer affected states.
6246ed9 Merge pull request #2131 from timlinux/3.2-papercuts
e1ef4b1 (origin/3.2-papercuts, 3.2-papercuts) Better docstring for continouse generic IF
414bcc2 Minor refactoring
d23ed99 Adding building post processing to volcano point IF.
c89dc40 slightly better code structure.
9c5be36 Merge pull request #2101 from cchristelis/develop
2159efb Adding test cases to assert new functionality.
5fc1119 Volcano bugfix - #2090 - prevent hazard attribute names from masking exposure attribute names
baaeb40 Merge branch 'develop' of git://github.com/AIFDR/inasafe into safe_layer_migration
cc2967e Merge pull request #2122 from ismailsunni/fix_2111
ef10b7e Tim's review for PR safe_layer_migration.
80256af Merge branch 'develop' of git://github.com/AIFDR/inasafe into fix_2111
f3542fe Merge branch 'develop' of github.com:AIFDR/inasafe into volcano_sprint/2090
1bd2ed8 updating tests
0c816ff Merge branch 'develop' of git://github.com/AIFDR/inasafe into safe_layer_migration
456c94f Remove QGIS Layer Wrapper.
7b17a0a Merge remote-tracking branch 'upstream/develop' into inasafe-1811
4625209 Wrap QgsMapLayer and Layer in IF's layer.
24bde41 Fixes for extent selector based tests
76c8889 Merge pull request #2126 from lucernae/realtime
2bce086 Fixes for failing extent selector tests - disable messageBar useage in tests
e1c1b52 Migrate Inundation IF to use SafeLayer.
0d6edcf Migrate Generic IF to use SafeLayer.
6b431ef Migrate Earthquake IF to use SafeLayer.
4baa47a Migrate volcano IF to use SafeLayer.
a8bb685 Migrate volcano IF to use SafeLayer.
7dd1b15 Migrate volcano polygon population to use SafeLayer.
2de88bb Add SafeLayer
952ea9a Improving text consistency.
dfdba34 Merge branch 'realtime' of github.com:lucernae/inasafe into realtime
e6b0b8f Add source env for realtime testing. Modify realtime/script to execute without automatically sourcing an env. This will let the caller decide which env to use. Fix minor bug in shake_event.py, when skipping calculation without calculating nearest city. This will make realtime push nearest city description correctly
f576333 Insuring ints are used as total imapcted population.
365e8cd Population rounding wording update.
c12f027 updating tests
0b92879 Merge branch 'develop' into inasafe-1811
40ff1a6 Add source env for realtime testing.
a3dda3e Merge pull request #2123 from Gustry/sroll
6dfc2d2 Pylint
10bfff5 add scroll area to the osm downloader
b54fb14 Use get_unicode.
0f65655 Merge branch 'develop' of git://github.com/AIFDR/inasafe into fix_1991
3bcaece PEP8.
0c829b4 Fix #2111.
71ca10e (origin/metadata) Added about in metadata.txt since it is now mandatory for QGIS plugin repo.
a467bf3 Merge pull request #2118 from lucernae/realtime
fe5f161 Make Realtime push fails silently if the REST server is down.
165150d Merge pull request #2110 from lucernae/realtime
a18e4c3 Merge pull request #2098 from lucernae/fix_unit_definition
50100f8 allow passing a PACKAGE arg to test_suite_quick usage: make test_suite_quick PACKAGE=common
5a88745 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
7f8945f Adding population mixin to VolcanoPolygonPopulationFunction
4cfb781 Merge pull request #2109 from Gustry/travis
503471e Added Gitter badge
b6081b8 Merge remote-tracking branch 'origin/develop' into develop
d47e0ef Merge remote-tracking branch 'origin/develop' into develop
c1168a2 Adding population mixin to VolcanoPointPopulationFunction
f90b5ae Merge branch 'develop' of github.com:AIFDR/inasafe into fix_unit_definition
98b4b76 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime
10c0fc0 add experimental branch to travis
ae74c78 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
ef102dc Adding population mixin to TsunamiEvacuationFunction
86bfb9e Bug fixes for make all shakemaps script
3fdf3de code cleanup
5ec5750 Remove poorly committed test line
e0e75bb fix #1173: make realtime fetch the latest map available if the shake maps doesn't occur in the minute.
1f95937 fix #1173: Process all the possible shake maps in one minute cron
7e97c27 Add realtime methods to push to Realtime server
56e1626 Adding population mixin to FloodEvacuationVectorHazardFunction
cb24131 Fixing tests
063fad9 Merge pull request #2102 from Charlotte-Morgan/Language_fixes
cff9a75 Ratio wording update
15d285f Ratio wording update
c27d07a Fix merge conflict.
10c28e7 Ratio wording update
b87f0b2 Ratio wording update
1feb04a Ratio wording update
197438a Ratio wording update
a30b0be Use all building totals in building breakdown, not just affected.
0f2bc4d Merge pull request #2100 from Charlotte-Morgan/develop
faa9b98 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
5bd9459 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
f5b318a Merge pull request #2095 from ismailsunni/fix_2085
ce20e88 text tweaks for volcano poly population report
6bb421c text tweaks for volcano poly population report
074a37e Merge branch 'develop' of git://github.com/AIFDR/inasafe into fix_2085
f7360bf Merge pull request #2097 from ismailsunni/fix_2091_volcano
4817e87 Refactor unit definitions
add1667 Merge pull request #2088 from Charlotte-Morgan/develop
f173f20 Merge branch 'develop' of git://github.com/AIFDR/inasafe into fix_2091_volcano
9a42fae Remove hazard_keywords volcano_vector_hazard_classes in Volcano point for #2091.
cd537a4 Adding population table mixin to ContinuousHazardPopulationFunction
e1a6098 Merge pull request #2096 from Gustry/pylint
e24b0a8 fix pylint
5eadc96 Adding population table mixin to classified raster population impact function
728361d Enable single_event hazard mode for volcano point IF. Fix #2085.
14f4b14 Updated Classified Polygon Population IF
ad2e225 minor updates to definitions.py
94bd45c Correct formatting.
d04db60 Correcting indent.
fae2f4a Use different method to retrieve value from keywords.
132593a Add notes about the pager model, when this is used to estimate fatalities.
1d86c86 Updated earthquake fitality impact function to use population report mixin
d8642be Code cleaning up.
0a5db4c Use layer's keyword property to retrieve a value of a key.
5aa07ba Add property for layer's keywords.
bb9c8e8 Clean unused code.
e131f84 Completed continuous flood if on population report mixin integration.
e756525 PEP8 and Naming.
fc19b6f Replace IF parameter to use layer's keyword in flood_vector_building_impact.
8562055 Replace IF parameter to use layer's keyword in flood_polygon_roads.
1299b86 Replace IF parameter to use layer's keyword in flood_polygon_population.
be3506a Population mixin class baseline.
c11632f Continued prototyping
b785921 Population Mixin implementation
1e4030a Replace IF parameter to use layer's keyword in  flood_raster_road
911a423 Fix Test Framework quit unexpectedly.
9fc87d8  Replace IF parameter to use layer's keyword in flood_raster_osm_building_impact.
95b5c72 Merge branch 'develop' of github.com:AIFDR/inasafe into feature/report_mixin
8c0c7b6 Use utilities function to retrieve value from layer's keyword.
b76fee2 Replace IF parameter to use layer's keyword in EQ and generic IF
820042b Replace IF parameter to use layer's keyword in volcano IF.
057ecbe Merge remote-tracking branch 'origin/develop' into develop
057f86b Merge pull request #2073 from timlinux/fix-1985
e160a2f Merge pull request #2072 from ismailsunni/develop
9ac9ab7 Update hash for inasafe_data
3d27c1c Update keyword version number to 3.2
a604720 (origin/fix-1985, fix-1985) Updated icons as to Fix #1985
677d182 PEP8 and pylint.
bc6a4cd Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
dcca87f Sort keywords when write to keywords files to get less changes after running the test.
0741cfe Merge pull request #2071 from borysiasty/develop
b0b3606 [KWizard] Save the allow_resampling keyword as string. Fixes #2068.
8796718 Revert unwanted automatic changes in ts files.
101455c [KWizard] Fix the allow_resampling keyword. Fixes #2068.
9349eab [IFCWizard] Temporarily hide aggregation icon until we have one suitable (as requested in a comment to PR #2060)
96a6dfb Update layer keywords again to fix some tests.
cee6fa4 Merge pull request #1988 from Jannes123/cli
e0eb275 versoinadded tags
3b9bf35 Add keywords version for test data in boundary, control, hazard, idp.
9dbd6c3 downloader function update
40be896 Update keyword versions of some of datatest to make all tests pass.
77afcbd Merge branch 'develop' of github.com:AIFDR/inasafe into cli
683afe3 Merge pull request #2067 from Gustry/progress-osm
c0666e4 change docstring in the osm downloader
e329070 Add keyword version.
1d0ba23 fix pep8 and moving function
7a0915c Merge develop
92d0be1 new downloading function without qt gui
c82fba9 Merge pull request #2066 from ismailsunni/develop
4596849 PEP8.
4b7f7e3 Remove default class.
b9b741b Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
22de161 add validate geographic extent to utilities/gis.py
7f007da Merge pull request #2063 from Gustry/add-idp-layer
a7a0fff fix make data_audit fr buildings and flood
a6738e4 Merge pull request #2064 from lucernae/sync_parameters_package
167e835 Synchronize safe_extras parameters with parameters repo
8c43420 fix data audit for potential idp
b7aba22 add IDP layer to test data
b2607df Merge pull request #2061 from borysiasty/develop
dc8339c Merge branch 'develop' of github.com:AIFDR/inasafe into develop
79c42ff [Wizard] Hide aggregation icon until we have one suitable
46c0065 Merge pull request #2043 from Gustry/version
3077662 Merge pull request #2060 from borysiasty/develop
78578d6 [Wizard] Fix mode label if an aggregation layer is registered within IFCWizard context.
6f4828c [Wizard] When KW wizard runs in IF wizard context, use presets based on user's selections in the IF process.
0ed5550 [IFCWizard] Add hazard and exposure icons to labels. Fixes #1466.
2433530 [KW Wizard] Generic icon for Generic hazard
7cc5685 [KW Wizard] Fallback to generic layer_purpose icon if specific not found
66a5dcf [KW Wizard] Many improvements in the upper labels of the wizard
a400322 [Wizard] Keep things simple - always display layer.name() in the header
f3cacd8 Merge pull request #2056 from ismailsunni/develop
3e34b9b PEP8.
3343bbd Merge pull request #2055 from ismailsunni/develop
0ccd021 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
ef57443 Remove resources_rc from UI files. Fix #2045.
fd75740 Merge pull request #2054 from borysiasty/develop
f094e1c [Wizard] Better wizard mode label
d9b7f1f [Wizard] Better wizard mode label
5700e4b [KWizard] Center icons
528190d [KWizard] Include selections from previous steps to next questions.
b74c7c0 Typo fixes
8fcc161 Merge pull request #2052 from borysiasty/develop
c879937 [IFCWizard] Fix test for layer overlap. Fixes #1957
63dd070 Fixing bad commit
8035b22 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
4185504 population mixin
dbb84de fix test osm downloader
511d60e Merge pull request #2039 from borysiasty/develop
7f69fe1 add inasafe version to the osm downloader
184736f Merge branch 'develop' of github.com:AIFDR/inasafe into cli
e30f5bc Update tests to recent kw changes
329204e pep8
0b68aec [IFCW] More descriptions formatted as invisible tables
966960a Merge branch 'develop' of github.com:AIFDR/inasafe into develop
ccc1e85 Merge remote-tracking branch 'upstream/develop' into inasafe-1811
0d9e8d2 Merge pull request #2035 from Charlotte-Morgan/develop
2d84f63 Merge pull request #2040 from akbargumbira/streamline_analysis
37060a4 pep8 fixes
81ba3cb merge definition changes from Rizky
8fcf115 Move user and host name to IF base class.
04a9308 [KW Wizard] Update tests
ba33f26 pylint
0e7beb8 [KW Wizard] Put the Classifications step before the Field
2488bc4 [IFCW] Update settings summary to the new GroupParameter
326ebb9 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
84cc986 pep8
42ffd64 [IFCW] Fix postprocessors settings summary
b349314 Merge pull request #2025 from lucernae/develop_if_options_revisions
ae02c35 Fixes for extent selector with point hazard. Green dot cleanups for pycharm
1fa2181 fix pylint and test
bfc89ac [KW Wizard] Set allow_resample checkbox with the current value from the layer's kewyword file
d72f577 Merge branch 'develop' of github.com:AIFDR/inasafe into develop_if_options_revisions
16e51a0 IF options parameter review and bugfix:
2c2017c Merge pull request #2034 from ismailsunni/develop
1536445 Capitalize and use single event for generic continuous IF.
000eb67 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
11f19e9 Remove single event from generic IF.
39192d9 Merge pull request #2032 from ismailsunni/develop
4add7f3 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
311d5eb Update description for layer mode classified and continuous.
ba9a5a3 Merge branch 'develop' of github.com:AIFDR/inasafe into develop_if_options_revisions
0c18542 Merge pull request #2017 from ismailsunni/develop
cbc8de3 Pylint.
f8cbec7 debug extent setting for download
6063ff0 Handle building categories correctly with QGIS layers
ad9ff68 changes in safe broke cli
10c10ed Added unit test for interpolate_polygon_polygon() based on QGIS
30b2df0 Merge branch 'develop' of github.com:AIFDR/inasafe into cli
99e3b2e osm download function
e309844 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
04a476f Converted classified polygon vs building IF to use QGIS API
8074326 Merge branch 'develop' into inasafe-1811
18afe0f Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
69e6dd4 Merge branch 'develop' of github.com:AIFDR/inasafe into develop_if_options_revisions
f86d6fe Change in IF Options for ContinuousHazardPopulation:
bd23eb5 Fix unit test due to capitalizing.
9bf3556 Revert wrong changes.
ffe58f3 Merge pull request #2011 from akbargumbira/streamline_analysis
1ea05be Capitalize names in definitions.py
191be4a Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
e6a989a Update message error.
39bc578 Pylint.
ac11d89 Merge branch 'develop' of github.com:AIFDR/inasafe into develop_if_options_revisions
dc6950b Update message error for easier debugging.
79faf7d Merge pull request #2023 from Charlotte-Morgan/1975
a3c9d50 Merge pull request #2027 from timlinux/pep8
e98fd38 (pep8) PEP8 fix for api builder
ac989c2 unittest refactor
7b466c7 Wohoo. Remove impact calculator thread class.
6c3357c (rizky/develop_if_options_revisions, develop_if_options_revisions) Merge branch 'develop' of github.com:AIFDR/inasafe into develop_if_options_revisions
694c50e develop #2018: add descriptions for IF options
cec64d7 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
f56e920 Fix test_state
308ff68 (rizky/develop, faster_flood_raster_roads) Merge pull request #2024 from Gustry/fix-space
80ff88a fix test osm downloader
ebe5678 Merge pull request #2020 from Gustry/fix-space
8e1dbb5 Fix test_issue71 due to IF metadata keywords.
144f860 Merge pull request #2016 from wonder-sk/faster_flood_vector_building
9c8e651 In progress updates for definitions.py
8d0ae06 Remove check_integrity parameter from the calculate_impact method.
3a8c03f test from desktop
75ddbc3 Wohoo! Remove ImpactCalculator class.
98d9ce2 Remove unused function accessor.
594ff2c Move requires_clipping as IF property
82c6bbe Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
aef4b3f Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
4e3564b fix space and comma
e2bd3a9 Merge pull request #2019 from Gustry/fix-space
dcffb56 delete space in the OSM downloader
6210647 PEP8.
96364cb Skipped failed test in wizard.
a707665 Update test data keywords to match the tests.
34cc2e1 Only use generic unit / classes for generic IFs.
9e6049f Merge pull request #2015 from ismailsunni/develop
9e8e364 Make flood vector-building impact function faster
432ad02 Merge pull request #1655 from timlinux/api-docs
171004e Merge pull request #1913 from lucernae/fix_impact_merge_race_condition
6f8cf8f Update layer's keywords in test data due to new wizards.
4e6f948 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_impact_merge_race_condition
322986b Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
2739051 Merge pull request #2012 from lucernae/small_bugfix
a3d247b Merge pull request #2013 from borysiasty/develop
1b7b331 Merge branch 'develop' of github.com:AIFDR/inasafe into small_bugfix
e4e2375 Merge pull request #2000 from timlinux/fix-1999
a4722ae Merge pull request #2007 from wonder-sk/faster_flood_raster_roads
aa0d918 [KW Wizard] Remove dummy debug prints
b006b43 [KW Wizard] Fix support for numerical fields in categorical value mapping
679fde3 [KW Wizard] Put the hazard/exposure type step before the hazard category step
3d40942 [Wizard] Update the keyword wizard
242cd2b Merge pull request #2009 from Gustry/gui-osm-downloader
98c3611 More changes to improve code style
13357d5 Remove unused method split_by_polygon_in_out()
ba80962 Added unit test for the new functions
b7edd72 Drop "gdal" from test's name for flood raster/roads
b30ee24 Code style improvements
6c85a64 Updated fload raster road impact function to demonstrate expected coding standards
fcc6ade Fix test
b5138a3 Removed the extra flood raster/roads IF and dropped _qgis_gdal suffix
a2779a2 Add support for reprojection in flood raster/road impact function
d3f12e5 PEP8 / PyLint fixes. no functional changes
85312b5 Optimize flooding raster/road impact function
57bc645 Merge branch 'small_bugfix' of github.com:lucernae/inasafe into small_bugfix
3e98601 Merge branch 'small_bugfix' of github.com:lucernae/inasafe into small_bugfix
dcc6fc1 Merge branch 'small_bugfix' of github.com:lucernae/inasafe into small_bugfix
6946ca9 Bugfix for minimum needs:
662b124 (origin/fix-1999) Rename Xml to XML
34be7cc Bugfix for minimum needs:
2fb93ea Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
48cae94 add probability for PAGER fatality model
fb4c80a refactor
1d82a1a refactor
8bc3b90 Merge pull request #1924 from lucernae/add_intermediate_if_class
e797973 Remove the input layers validation to the IF base class.
fab2e4e fix pylint
17ef2ad correcting PAGER fatality model
0e6e29a Fix tests
8337522 Merge branch 'develop' of github.com:AIFDR/inasafe into add_intermediate_if_class
bfea0cb cleaned up
cecb259 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
538e252 merged
ff13004 Merge branch 'develop' of github.com:AIFDR/inasafe into cli
23f6baf clean
339b900 extent selection functioning
dc25dd0 add bbox to countries and try to detect the country in the OSM downloader
6acdfd4 improve UI about the boundary export
13cfc4f Change layer_mode_none to layer_mode_classified
d4eccb6 Merge pull request #1971 from akbargumbira/streamline_analysis
c6d83ee changed computing no of fatalities and displaced
57413e2 Merge branch 'develop' of github.com:AIFDR/inasafe into add_intermediate_if_class
7d7e4f6 Merge pull request #1925 from Jannes123/cherries
0448d27 Fix pylint
9e2cc57 Set extent to the impact function instance.
5d4fed4 fix pep8 and pylint
8a9a76d Merge branch 'develop' of github.com:AIFDR/inasafe into cherries
64c21f7 Fix tests
33763fa Merge pull request #2008 from akbargumbira/develop
307e909 Merge branch 'develop' of github.com:AIFDR/inasafe into cherries
d076567 Update function category based on the new metadata.
34f634b Remove safe.engine.utilities
0f943ba Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
4608390 Set exposure and hazard from the impact function instance
5215485 (martin/develop) Merge pull request #2006 from ismailsunni/ultra_fixing
60aa350 Merge branch 'develop' of github.com:AIFDR/inasafe into cherries
3620a7a PEP8
c737dff [IF API] exposure_class_fields
6f8109e Use population for scenario to avoid failed test.
d1f2507 PEP8.
8834d3a Fix failed test in jenkins: test_issue160
051636d Add structure_class_field and road_class_field.
750baa7 Introduce exposure_field_class.
4f610a5 Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
bcaebbb Use clone_shp for testing
d5ac4d6 Merge branch 'develop' of git://github.com/AIFDR/inasafe into ultra_fixing
c070467 Remove unused additional_keywords
131716c Skip failed tests in wizard due to none removal.
9c9bc74 Revert none to classified in test data.
981a763 Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
23eaccf Merge pull request #1923 from Gustry/gui-osm-downloader
a75aed6 Remove layer_mode_none from Impact Functions.
39129ed Move layer conversion depending on IF type in the IF base class.
04d1ebd Remove extract_layers method.
52996a6 fix tests
544f2ff Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
640cb06 Merge pull request #2002 from akbargumbira/develop
f1dd41f Update keywords of the tif output from the shakemap converter tool with new metadata.
f4d1e4c Merge branch 'develop' of github.com:AIFDR/inasafe into cherries
a9bef3a Merge pull request #2001 from akbargumbira/develop
984c277 Remove unused code.
0ccb409 [Unicode] Fix unicode problem in Shakemap converter tool.
62e4c45 (fix-1999) Fix #1999 - Grid.xml convertor not working. Improved menu action label to make it clearer what the tool does. Zoom to layer if user asked to add it to the map canvas.
2827294 Merge remote-tracking branch 'upstream/develop' into inasafe-1811
861770f Pass the hazard and exposure layers to impact function instance to aim our IF design.
ef8f25d Remove packing unpacking exposure and hazard layers and use them directly.
7d24855 Merge branch 'develop' of github.com:AIFDR/inasafe into cli
457c784 Merge branch 'develop' of github.com:AIFDR/inasafe into add_intermediate_if_class
2cbd62f Add tests for base class. Change layer check constraint to match metadata
6802d88 Update all IF's prepare method.
bf3a243 pylint fixes
b9b322b Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
597a397 Merge pull request #1970 from akbargumbira/if_parameters
b6b40f5 Remove the wrong docstring.
9bdcb4d Add some more non-conflicting attribute check when assigning exposure layer.
563f4f3 code cleanup: delete unused files, add additional attribute for vector exposure mixin
b351435 Remove non-conflicting attribute checking in the volcano polygon population IF.
3a78dc5 Remove checking non-conflicting attribute in the concrete classes.
4d10307 Add validation for non-conflicting target field in the IF base class.
ef3c20b unittests
83c7870 added shorthands v and l
ebbb984 fix docstring
d25b4de fix pep8 and pylint
65c4d98 deleting unused file from git
976e2e5 code cleanup
0c2fd80 Merge branch 'develop' of github.com:AIFDR/inasafe into add_intermediate_if_class
13b635f Merge branch 'develop' of github.com:AIFDR/inasafe into cli
e2b2402 refactor parsing of optional args
7831a7d Resolved merge conflicts
61aa948 Working example on volcano polygon on building to use layers from IF base fields.
cb31d7d Merge pull request #1987 from lucernae/fix_pylint
8707643 (rizky/fix_pylint) fix pylint
52c80ea Merge branch 'develop' of github.com:AIFDR/inasafe into if_parameters
80e3db6 Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
8bb6f89 Merge pull request #1979 from lucernae/move_provenance_to_minimum_needs
1229b7b Merge branch 'develop' of github.com:AIFDR/inasafe into move_provenance_to_minimum_needs
0a1c637 Merge pull request #1984 from borysiasty/develop
2a7a10d Merge branch 'develop' of github.com:AIFDR/inasafe into streamline_analysis
374f2e5 refactor
89a9927 [Wizard] pep8
4fee72d [Wizard] Update wizard test
183789b [Wizard] Make Pylint less complaining
fccf7cb [Wizard] Support for additional_keywords
4aee87e Add relations to additional_keywords, so _value can be related to _field
912723f Merge pull request #1983 from ismailsunni/develop
9bf219e PEP8.
b2dbed0 Merge pull request #1982 from ismailsunni/develop
fac62f0 Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
9d2be3d Update sha for inasafe_data.
d7864df Deeper refactor, changing the key for single event and multiple event.
e50a3ad Refactor variable name.
64df3a8 IF API for additional_keywords.
36c632e Introduce 'additional_keywords' in metadata.
d3037b9 Merge pull request #1981 from lucernae/fix_if_metadata
22525a4 fix tests
9a46e56 Merge branch 'develop' of github.com:AIFDR/inasafe into move_provenance_to_minimum_needs
1d81b72 fix volcano polygon population metadata to not accept hazard point layer
6e63569 fix tests
21e94b1 Remove typo.
f1877c4 Merge pull request #1978 from borysiasty/develop
1743f72 develop #1958: move provenance from IF option to minimum needs tab
082d560 pep8
e13944c [Wizard] Update test
0d7c0f4 [Wizard] Support for layer_mode_none. Make unit mandatory for mode_continous, classification mandatory for mode_classified and field mandatory for both modes. Minor ui and text fixes
c5bdfaa Merge remote-tracking branch 'upstream/develop' into inasafe-1811
386783e Merge remote-tracking branch 'origin/develop' into develop
20caa2b Dont pass iface around
917dade Merge branch 'develop' of git://github.com/AIFDR/inasafe into develop
911bf17 Use layer_mode_none to all previously classified exposure.
6bbe2a6 Merge pull request #1976 from borysiasty/develop
7f11a2e (borys/develop) Merge branch 'develop' of github.com:AIFDR/inasafe into develop
169d490 Fix description
1a0e355 Merge pull request #1974 from ismailsunni/develop
1d4063c Add some descriptions in definitions.py
aa5060d Merge pull request #1973 from ismailsunni/IF_API
718f13b Update hazard_categories_for_layer
dc7070b Update hazards_for_layer.
053eaf7 Merge pull request #1972 from ismailsunni/metadata_update
469c7a2 Fix failed test related to road.
3787611 Merge branch 'PR_1967' into metadata_update
9fd50a7 Introduce layer_mode_none and use single event and multiple event.
753035a move files and debug path calculations
5938167 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
360a991 Merge branch 'develop' of github.com:AIFDR/inasafe into cli
ea918e2 Vector/Raster file autodetect
2c9c7e4 docstrings
a3b9f5b refactoring globals into passed arguments
4953278 (akbar/streamline_analysis) In work progress for removing packing and unpacking layers.
bfca58d (akbar/if_parameters) Use target field and not affected value from base class.
1db115d Merge branch 'develop' of github.com:AIFDR/inasafe into if_parameters
7850814 Merge pull request #1969 from akbargumbira/develop
569b1e2 (akbar/develop) Fix metadata for Classified Polygon on Population.
57522c0 Merge branch 'develop' of github.com:AIFDR/inasafe into if_parameters
d3088f1 Merge pull request #1968 from akbargumbira/develop
6b44914 Fix failing tests.
58fe1a7 Moving target field and not affected value to base class.
9d0c82f Merge pull request #1966 from lucernae/fix_if_metadata
75a9417 [Wizard] Dynamic layer_mode from API. Always create the layer_geometry keyword
8a629f5 [IF API] Fix names
be74201 change generic IF metadata
9c0a3b5 Additional metadata checks and other base class which currently doesn't have IF inheritor
671e057 pep8 and pylint
c73fa13 Merge branch 'develop' of github.com:AIFDR/inasafe into add_intermediate_if_class
8dc764f report function debug
2c6028e assigning base classes to IFs
316b80b Merge pull request #1963 from ismailsunni/IF_API
e5e7fc4 Merge branch 'develop' of git://github.com/AIFDR/inasafe into IF_API
6ff9ae6 [IF API] Update API.
8615d4b Merge pull request #1962 from ismailsunni/IF_API
cec59e5 [IF API] Add available_layer_mode API.
d8c0ee6 Fix merged conflict.
cf2d03f Remove unused class field.
d5b0e6f Merge branch 'develop' of github.com:AIFDR/inasafe into add_intermediate_if_class
639d19f Merge pull request #1809 from ismailsunni/new_metadata_keywords
d969acb wip first report gen in pdf
2f7b31d PEP8.
5ca100c Remove deprecated code.
f9e1dc6 Fix test in safe/gui/tools. All test pass.
296e84a Fix test in safe/impact_statistics
02322e0 Fix test in safe/impact_functions.
791bd02 Replace (old) definitions.py to new_definitions.py.
06e5e49 Remove old metadata (definitions.py).
ceb3bcf Fix test in test_impact_function_metadata.
84c9895 added docstring
9f737d5 switch back to mmi 2 to 10 and adding displacement rate function
8f2f767 Fix merged conflicts.
fade5ee Merge branch 'develop' of https://github.com/AIFDR/inasafe into develop
3d166e6 Fix failed test in test_aggregator.
d8b3131 compliance with PEP8
c07fd7b Fix issue in plugin due to keyword dialog removing.
e4cb51e Fix several failed test.
d749f5b Fix test in test_registry.py
c2071da Remove keywords dialog from InaSAFE.
abe785a Remove keywords dialog usage from dock.py and show message box instead.
f3a3d9d cleanup and remove test data
fb7d6a2 Merge branch 'develop' of github.com:AIFDR/inasafe into cli
71dbf3b usage install text update
4f66dca Remove deprecated API in IF Metadata.
8eb0554 Remove deprecated API in IF Manager.
708002a update usage
1a87414 remove test data
c819079 refactor for bash command installation
79a299a cli test data
9646e86 change mmi range and augment test
7dd9554 git merge
f2eca5a path calculation debug
7ffa1b8 Merge pull request #2 from borysiasty/new_metadata_keywords
e708b96 (borys/new_metadata_keywords) pep8
9c0d994 [Wizard] Fix messages
1a85a7f Update the wizard test to the new keywords
198c80d Update the wizard to the new keywords
aa5e98f Update test data to the new keywords
a69c64a vector or raster inputs
5563074 vector or raster inputs
4a3084c refactoring
3e7661b Merge pull request #1948 from akbargumbira/realtime_bugfix
c3f291d (akbar/realtime_bugfix) Address Pylint violation.
da3c667 Merge pull request #1950 from lucernae/fix_minimum_needs_window
77b40e4 Some fixes to ITB IF for EQ Realtime.
2dfaf0a refactor and cleaning
e84b4a3 Merge branch 'new_metadata_keywords' of https://github.com/ismailsunni/inasafe into new_metadata_keywords
230e5e6 fix import statement
43d0ac9 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_bugfix
2ebc6ff [IF API] Fix always returns all unit in the API.
6d7e6bb [IF API] Update function_for_constraints with default arguments.
6aefbdb Merge branch 'develop' of github.com:AIFDR/inasafe into fix_minimum_needs_window
1d58063 Fix display warning message bar.
7565da3 Merge branch 'develop' of github.com:AIFDR/inasafe into inasafe-1811
576d427 Update wizard test to new keywords
e405128 Update wizard to new keywords
b52e426 Minor fixes in impact_function_metadata.py
b483e07 Minor fixes in new_definitions
1da263b Merge pull request #1955 from lucernae/fix_minimum_needs_calculator
349076d cleanup wrong import
ebab214 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_minimum_needs_window
2ab8450 First attempt to update keywords dialog. Don't merge it yet.
64294bc Merge branch 'develop' of github.com:AIFDR/inasafe into fix_minimum_needs_calculator
dd261ef fix #1947: fix weird bug. change the dialog to modal dialog (previously model-less dialog)
122c5e4 first analysis success
f7a51e3 work in progress commit
3608977 analysis runs impact layer created
56347ae analysis runs without errors no output
aff02c2 Change hazard scenario and hazard zone to single hazard and multi hazard.
2372a91 Refactor hazard categories.
00dfedf Rename API.
0b1c7e0 PEP8.
bf20988 [IF_API] Add get_available_exposure_constraints.
3fb038c [IF_API] Add get_available_hazard_constraints.
44111da Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_bugfix
212b1c2 [IF_API] Add get_functions_for_constraint.
7e8692d Merge pull request #1 from borysiasty/new_metadata_keywords
f5f1ac1 [IF API] Fix names
9666c74 Merge branch 'new_metadata_keywords' of https://github.com/ismailsunni/inasafe into new_metadata_keywords
163b73e [IF API] Add get_available_exposures
aa23ca4 [IF API] Add get_available_hazards
a2a3065 [IF API] Add raster_hazards_classifications_for_layer and vector_hazards_classifications_for_layer.
34b67ea [IF API] Add hazards_classification_for_layer.
29345d0 [IF API] Add exposure_units_for_layer.
97d45f4 [IF API] Add exposures_for_layer.
b2a1817 [IF API] Add hazard_for_layer.
3817f4c [IF API] Add hazard_categories_for_layer.
c80e2c1 Skip failed test and add purposes_for_layer.
2ad2d2e wip commit /usr env problem
10dad44 Merge pull request #1953 from akbargumbira/fix_1936
e0f0d63 (akbar/fix_1936) Fix failing test.
d6c4cff Use algorithm name flag to avoid original xml overwritten by the xml keywords.
adaef49 Remove pydevd debugger.
edb479a Update keywords assigned for tif output of the shakemap grid converter.
533c924 Make some string translate-able
cae5a98 fix #1946: Change the accept terminology in import as "Open"
460d6c0 fix #1945: hide close button in resource editor and handle reject changes
a8c6088 this closes #1926 #1930 1933
8db38c5 fix #1944: allows a scrollbar so the user doesn't have to resize window when it exceeds the OS windows
3236a6c cli debug commit
1b05bf3 cant create Layer objects
30c1ec3 buggy commit
de9a2a9 Merge branch 'develop' of github.com:AIFDR/inasafe into cli
ddfba7f Fixes for failing tests for #1811
f373be2 Remove static provenance in the IF.
6093200 Merge branch 'develop' of github.com:AIFDR/inasafe into realtime_bugfix
b23c03b Merge pull request #1934 from akbargumbira/develop
298b63d Update metadata for develop branch.
3f2e89f Fix wizard resizing bug
6a7abe6 Change the status to alpha again for develop branch.
27b6984 (jannes/cherries) new-style parameter dict widget
e6856e8 Merge upstream changes from develop
837a799 Further implementation work for #1811
50560ce Reduce noise by clearing message queue when a new warning is pushed to the message bar
2d4d6d4 URL dynamically generated in the OSM downloader
275db43 debug new-style parameters
bb60c17 new-style parameter debug
d53f28a add moe tests to OSM downloader about boundaries
20c7c4b add more countries to OSM downloader
05b6605 git mistake
65db240 remove git mistake
8891075 new-style parameters update
3d7193d debug new-style parameters
83d56e5 develop #1914: add ContinuousVHContinuousVE
1feffd6 develop #1914: add ClassifiedVHContinuousVE
b93292c develop #1914: add ClassifiedVHClassifiedVE
a671aea develop #1914: add ContinuousVHClassifiedVE
e1fcaae develop #1914: add helper classes
f022685 add boundaries
9c9e96a new-style parameters update
fbf8c0c add IDP camp export and improve GUI
c519301 (jannes/cli) cli start
74fe5dc this closes #1893
6606eef merged
4e2d841 Merge branch 'develop' of https://github.com/AIFDR/inasafe into fix_impact_merge_race_condition
299827e Fix #1862: Avoid race condition when removing the temporary report files
f033bba Merge remote-tracking branch 'upstream/develop' into develop
392b356 Merge remote-tracking branch 'upstream/develop' into develop
705af5e merged with develop
f54ece9 In progress implementation for #1811
00262ed Fixes for #1811 and #1861 - improve messaging when user has invalid extents or no active layer
9fa1a88 Migrate some usage of definitions to new_definitions in wizard_dialog.
6bae55c Migrate definitions to new_definitions in keywords_dialog.
807d60d Remove converter_dict.
e13b5c0 Move constant from definitions to new_definitions.
1e6b23a Refactor keywords dialog.
e303cd8 Update hash to match with updated keywords in inasafe_data.
3e1e4c9 PEP8 and some pylint.
001dfb4 Make all pass in test_keyword_io and test_utilities.
c30640b Make all test pass in impact_statistics.
aae2604 Fix all test in test_engine.
2897800 Update wetdry to flood to fix all test in test_dock.
e10d79d Add more unit to generic IF.
8c75894 Fix almost all failed test in test_dock. Two left.
af50646 Change wetdry to flood in vector classification key.
76c85b3 Update keyword's layer in test data.
81ea5f8 Update test_filter in inundation IFs.
87ee5de Update test_filter in volcano IFs.
278b57f Update test_filter in earthquake and generic IFs.
e552f4d Fix logic in filter_by_keywords.
6e2b012 Update filter method in registry and change the IF's layer_requirements.
f7af51f Update filter_by_keyword_string function.
ca2b34c Remove old metadata definitions from IFs.
85a5fb1 Add get_layer_requirements method and generate all IFs'
b4785e4 Fix wrong import.
203ba22 Small fix for unimported metadata.
f091d39 Recheck applied new metadata keywords to all IFs.
639f70d PEP8.
ec7fb94 Apply new metadata keywords to flood IF.
5e7c382 Apply new metadata keywords to earthquake IF.
e2ddc65 Apply new metadata keywords to generic IFs.
18350f3 Apply new metadata keywords to volcano IF.
405a8b5 Write all new metadata keyword.
e187ad4 (origin/api-docs) Added api docs scripts from docs repo
34c3208 Merge remote-tracking branch 'aifdr/develop' into develop


Changelog for version 3.1.0
================================

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
1166157 Revert metadata.txt to version 3.1
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
2f189f3 PEP8 fix for version 1.6.2
075e4f1 Merge branch 'develop' of github.com:AIFDR/inasafe into change_dock_message
fadcb23 Fix #1662
c55edf4 Fix #1661 Update volcano hazard zone classification in our definitions.
72ea9d6 Merge branch 'develop' of github.com:timlinux/inasafe into develop
916a3df Merge pull request #1680 from ismailsunni/inner_metadata
fc5ce5d Merge branch 'aifdr_develop' into jaran
f2c2505 Pep8.
6c32d26 Fix failed unit test due to moving metadata.
5c9d56c Move add_to_list to safe.common.utilities.
033a6f2 fix #1225 : change docstrings
015aa5b fix #1225 : add UI improvements in the OSM downloader
833283f fix #1225 : allow the user to select an area by drawing a rectangle in the OSM downloader
f8ea8ff Merge branch 'develop' of github.com:AIFDR/inasafe into unicode
fd00aaa Merge pull request #1677 from akbargumbira/develop
fc6c74a Update hash of the test data.
ba6d326 Use aggregator "global default" and "don't use" strings from safe.definitions
07530e2 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_keywords_editor
b045302 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_layer_uri_normalization
0782b44 Merge branch 'develop' of github.com:AIFDR/inasafe into change_dock_message
6222b7b [Unicode] Fix problems in Keywords Editor
a14dc71 [Unicode] Stringify all the objects other than unicode before making it as unicode.
f575ff5 Remove pydev for remote debugging purpose.
8d41ea6 [Unicode] Support unicode in Impact Merge Tools
a85c4cc [Unicode] Make OSM Downloader work when we save it to output path with non ASCII chars.
e900f4d fix #1648 fix settings if no key
d5ecc00 [Unicode] Support unicode in Save Current Scenario tools.
288866f [Unicode] Support Unicode in Needs Calculator Dialog and Shakemap Importer
e92b358 [Unicode] Making InaSAFE Keywords Editor (the old one)  work with Unicode.
767bdd8 [Unicode] Don't cast to string when adding item to combobox.
3f3e848 fix #1648 : remove accent and settings after test
17f2a04 fix #1648 allow the user to save results to their own designated directory
a4be0d0 Merge pull request #1673 from Gustry/accentuated
efa4022 fix new line
52b15f3 Remove remote debugging code.
e7e9d19 [Unicode] Support InaSAFE to use Unicode
3932fa6 add function to replace accentuated characters
0f847f4 Merge pull request #1654 from Gustry/fix-896
e500730 Merge pull request #1669 from akbargumbira/volcano
1be5a12 (akbar/volcano) Fix #1661 Update volcano hazard zone classification in our definitions.
b0e4622 Fix #1662
c4fc8e8 Merge pull request #1652 from Gustry/fix-1650
f8bbefd Merge pull request #1660 from Gustry/gitattributes
c81e515 Merge branch 'develop' into fix-896
c413fd3 Merge branch 'develop' into fix-1650
51560b6 Merge pull request #1653 from Gustry/fix-1423-with-1650
306273f add more binaries files to .gitattribute
60f8aad fix #1423 pep8
1028034 fix #896 remove an useless line
44e740a Merge branch 'fix-1650' of github.com:Gustry/inasafe into fix-1650
becdf10 fix #1650 qgis version and variables
f200e40 Merge branch 'develop' into fix-1650
4924e09 Add richer validator for inner class.
fd96485 Pep8.
a3b7fd7 Move IFs metadata to inner class.
0731f39 Merge pull request #1644 from Gustry/fix-1630
7de8e4a Remove some IFs metadata to inner class.
6f253aa Merge pull request #1656 from ismailsunni/update_parameters
a1094cc Merge branch 'aifdr_develop' into update_parameters
4ad1b22 Revert accidental changes.
b078792 fix #896 remove pydevd lines
a588b10 fix 1423 with new QgsMessageBar if exception
2254b07 Merge branch 'fix-1423' into fix-1423-with-1650
c636f57 fix #1650 typo
860e60f fix #1650 : add QMessageBox
a362fad #1650 : add QgsMessageBar
58a65f0 Merge pull request #1649 from akbargumbira/develop
77806e5 Merge branch 'develop' of github.com:AIFDR/inasafe into develop
cf93824 fix #1423 : small fix  about typos and add exception handling
43b08a1 fix #896, merge utilities/custom_logging.py in common/custom_logging.py, enable LOGGER in top level
91f0fee Merge pull request #1647 from ismailsunni/update_parameters
bfb79da Update parameters and remove parameter test.
f725216 Remove a friendly message.
61064f5 Merge pull request #1645 from akbargumbira/develop
cd7f387 Issue #1642 Update in getting started message to point out user to use keywords creation wizard in the Plugins > Inasafe menu
fc9c5a5 Use auto server number of xvfb for jenkins script.
46cf85a add the new icon about adding test layers fix #1630
d612e92 Add a new button when developer mode is on about test layers #1630
4a45e42 fix #1423 save .xml and .keywords when using 'saved as'
6b7f625 fix pep8 issues
b79de49 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_keywords_editor
cfc8a4e Issue #1570: fix layer uri normalization for postgres and delimitedtext
b26f63e Merge pull request #1640 from akbargumbira/develop
91adb0f Update jenkins script to checkout its own inasafe_data in the workspace.
6e290b9 Merge pull request #1638 from cchristelis/develop
9f0aa2d Merge pull request #1639 from akbargumbira/master
37d00a5 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_keywords_editor
104d6c5 Issue #1281: Change priority so the xml file be read first
b820f36 Update the name of the plugin in master to InaSAFE
8139858 Merge pull request #1636 from akbargumbira/develop
df191f7 Fix pep8 issues
1da659e Merge remote-tracking branch 'upstream/develop' into develop
f1a8846 Issue #1621. Fix pep8 use conventional function definition rather than lambdas
8457712 Merge branch 'develop' of github.com:AIFDR/inasafe into fix_keywords_editor
e4129f8 Issue #1281: Bugs on Keywords Editor. Switch to xml iso metadata if .keywords file didn't exist
5e481f3 [Travis] No need to clean the working dir.
92bee5a Merge pull request #1634 from akbargumbira/develop
ccb5091 Small code conventions cleanup in messaging text.py
3216885 Small clode convention cleanups made while giving Etienne a coding standards walk through.
fc42b52 Put a friendly message to highlight the importance of importing qgis in 2 places.
b1d0f42 Remove importing qgis in __init__ of safe's submodules.
e0de139 Don't set the SIP API V2 manually anymore.
deedab1 Merge pull request #1633 from ismailsunni/fix_1625_1620
30b0cf9 Pep8 and pylint.
2d3b749 Fix #1625
928c91b Fix #1620
6f51e98 Merge pull request #1608 from lucernae/normalize_line_ending
527cae2 Merge branch 'develop' into normalize_line_ending
a54a5e8 Merge pull request #1623 from timlinux/master
f63d1db Merge pull request #1622 from timlinux/develop
d3fcb33 Merge pull request #1619 from timlinux/master
ef8e56c Pre line endings normalization
ac9c29c Merge pull request #1501 from timlinux/master

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
