Python-safe

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

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

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

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

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

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

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

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