forked from inasafe/inasafe
-
Notifications
You must be signed in to change notification settings - Fork 0
/
CHANGELOG
3819 lines (3807 loc) · 213 KB
/
CHANGELOG
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Changelog for version 3.3.0
================================
759fde8 (HEAD -> develop, upstream/develop, origin/develop, origin/HEAD) Merge pull request #2595 from ismailsunni/fix_failing_test
8485a67 PEP8
51bc9d8 Fix failed test.
42b4463 Merge pull request #2564 from Gustry/fix-2468
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.
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.
efda664 Fix merged conflict.
16b2ecf Merge pull request #2582 from Gustry/clip_parameters
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
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
125395e fix DOCK test init
a70108e disable building threshold in earthquake
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
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
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
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
39f90cd add docstrings to generate_insufficient_overlap_message
a763fac add methods to safeLayer
01c315e refactoring signals in safe
6e59f43 refactoring signals
5d059d7 use safe.utilities.i18n.tr() instead self.tr
a06019a Merge pull request #2554 from Gustry/etienne
9dc1b85 add myself to travis
5db8f80 Merge pull request #2550 from ismailsunni/revert_deleted
d4fd93b (ismail/revert_deleted) Update data test.
7e460c3 Update data test.
68dbe88 Revert accidentally delete.
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.
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
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
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
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
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.
3db5354 replace potential IDP by evacuation center
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
da783ea Change key for metadata in test.
8ec2bce Add boolean property
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.
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
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
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
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
bb849bf (ismail/wizard_additional_keywords) Merge branch 'develop' of github.com:inasafe/inasafe into wizard_additional_keywords
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
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
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
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