Showing with 2,397 additions and 753 deletions.
  1. +1 −1 CMakeLists.txt
  2. +561 −0 ChangeLog
  3. +14 −0 debian/changelog
  4. +1 −1 debian/compat.in
  5. +65 −47 debian/control.in
  6. +0 −4 debian/qgis-plugin-grass.install.in
  7. +0 −12 debian/qgis-plugin-grass.postrm
  8. +0 −13 debian/qgis-plugin-grass.preinst
  9. +4 −0 debian/qgis-provider-grass.install.in
  10. +2 −0 debian/qgis-provider-grass.lintian-overrides
  11. +12 −0 debian/qgis-provider-grass.postrm
  12. +13 −0 debian/qgis-provider-grass.preinst
  13. +43 −16 debian/rules
  14. +1 −1 i18n/qgis_ar.ts
  15. +1 −1 i18n/qgis_bs.ts
  16. +1 −1 i18n/qgis_ca.ts
  17. +1 −1 i18n/qgis_cs.ts
  18. +1 −1 i18n/qgis_da.ts
  19. +1 −1 i18n/qgis_de.ts
  20. +1 −1 i18n/qgis_el.ts
  21. +2 −2 i18n/qgis_en.ts
  22. +1 −1 i18n/qgis_es.ts
  23. +1 −1 i18n/qgis_et.ts
  24. +1 −1 i18n/qgis_eu.ts
  25. +1 −1 i18n/qgis_fa.ts
  26. +1 −1 i18n/qgis_fi.ts
  27. +1 −1 i18n/qgis_fr.ts
  28. +1 −1 i18n/qgis_gl.ts
  29. +1 −1 i18n/qgis_hi.ts
  30. +1 −1 i18n/qgis_hr.ts
  31. +1 −1 i18n/qgis_hu.ts
  32. +1 −1 i18n/qgis_id.ts
  33. +1 −1 i18n/qgis_is.ts
  34. +1 −1 i18n/qgis_it.ts
  35. +1 −1 i18n/qgis_ja.ts
  36. +1 −1 i18n/qgis_km.ts
  37. +1 −1 i18n/qgis_ko.ts
  38. +1 −1 i18n/qgis_lt.ts
  39. +1 −1 i18n/qgis_lv.ts
  40. +1 −1 i18n/qgis_mn.ts
  41. +1 −1 i18n/qgis_nb.ts
  42. +1 −1 i18n/qgis_nl.ts
  43. +1 −1 i18n/qgis_pl.ts
  44. +1 −1 i18n/qgis_pt_BR.ts
  45. +1 −1 i18n/qgis_pt_PT.ts
  46. +1 −1 i18n/qgis_ro.ts
  47. +1 −1 i18n/qgis_ru.ts
  48. +1 −1 i18n/qgis_sk.ts
  49. +1 −1 i18n/qgis_sl.ts
  50. +1 −1 i18n/qgis_sr.ts
  51. +1 −1 i18n/qgis_sr@latin.ts
  52. +1 −1 i18n/qgis_sv.ts
  53. +1 −1 i18n/qgis_th.ts
  54. +1 −1 i18n/qgis_tr.ts
  55. +1 −1 i18n/qgis_uk.ts
  56. +1 −1 i18n/qgis_vi.ts
  57. +1 −1 i18n/qgis_zh-Hans.ts
  58. +1 −1 i18n/qgis_zh_CN.ts
  59. +1 −1 i18n/qgis_zh_TW.ts
  60. +5 −1 python/core/__init__.py
  61. +15 −1 python/core/qgsdistancearea.sip
  62. +1 −1 python/core/qgserror.sip
  63. +1 −1 python/core/qgsfeaturestore.sip
  64. +13 −3 python/core/qgsfield.sip
  65. +14 −2 python/core/qgsmapunitscale.sip
  66. +4 −2 python/core/qgsvectorlayer.sip
  67. +3 −1 python/core/qgsvectorlayereditutils.sip
  68. +4 −4 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  69. +1 −1 python/core/symbology-ng/qgslinesymbollayerv2.sip
  70. +5 −1 python/core/symbology-ng/qgssvgcache.sip
  71. +15 −2 python/core/symbology-ng/qgsvectorcolorrampv2.sip
  72. +268 −225 python/plugins/db_manager/db_plugins/postgis/plugin.py
  73. +1 −1 python/plugins/processing/algs/qgis/VectorGrid.py
  74. +15 −18 python/plugins/processing/algs/saga/description/2.1.2/OrdinaryKriging(Global).txt
  75. +5 −5 python/plugins/processing/algs/saga/description/2.1.2/OrdinaryKriging.txt
  76. +16 −18 python/plugins/processing/algs/saga/description/2.1.2/UniversalKriging(Global).txt
  77. +23 −22 python/plugins/processing/algs/saga/description/2.1.2/UniversalKriging.txt
  78. +2 −2 resources/function_help/lpad
  79. +2 −2 resources/function_help/rpad
  80. +4 −2 scripts/release.pl
  81. +41 −27 src/app/composer/qgscomposer.cpp
  82. +5 −0 src/app/composer/qgscomposerscalebarwidget.cpp
  83. +3 −1 src/app/ogr/qgsopenvectorlayerdialog.cpp
  84. +63 −15 src/app/qgisapp.cpp
  85. +6 −0 src/app/qgisapp.h
  86. +1 −2 src/app/qgsattributetabledialog.cpp
  87. +1 −1 src/app/qgsidentifyresultsdialog.cpp
  88. +7 −0 src/app/qgsmaptoolcapture.cpp
  89. +13 −23 src/app/qgsmaptoolfillring.cpp
  90. +23 −3 src/app/qgsmergeattributesdialog.cpp
  91. +5 −0 src/app/qgsmergeattributesdialog.h
  92. +6 −2 src/app/qgsprojectproperties.cpp
  93. +1 −0 src/app/qgssnappingdialog.cpp
  94. +1 −1 src/app/qgstipfactory.cpp
  95. +17 −7 src/core/composer/qgscomposerscalebar.cpp
  96. +19 −16 src/core/composer/qgscomposition.cpp
  97. +8 −0 src/core/qgis.h
  98. +8 −0 src/core/qgsdistancearea.cpp
  99. +15 −1 src/core/qgsdistancearea.h
  100. +1 −1 src/core/qgserror.h
  101. +30 −38 src/core/qgsexpression.cpp
  102. +3 −2 src/core/qgsfeaturestore.cpp
  103. +1 −1 src/core/qgsfeaturestore.h
  104. +32 −2 src/core/qgsfield.cpp
  105. +2 −2 src/core/qgsfield.h
  106. +1 −0 src/core/qgsmaplayer.cpp
  107. +20 −2 src/core/qgsmapunitscale.h
  108. +2 −0 src/core/qgspallabeling.cpp
  109. +14 −8 src/core/qgsvectorfilewriter.cpp
  110. +1 −0 src/core/qgsvectorfilewriter.h
  111. +14 −2 src/core/qgsvectorlayer.cpp
  112. +4 −2 src/core/qgsvectorlayer.h
  113. +20 −20 src/core/qgsvectorlayereditbuffer.cpp
  114. +3 −2 src/core/qgsvectorlayereditutils.cpp
  115. +3 −1 src/core/qgsvectorlayereditutils.h
  116. +8 −7 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  117. +2 −3 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  118. +7 −7 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  119. +3 −3 src/core/symbology-ng/qgsfillsymbollayerv2.h
  120. +6 −6 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  121. +2 −3 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  122. +1 −1 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  123. +1 −1 src/core/symbology-ng/qgsrulebasedrendererv2.h
  124. +7 −3 src/core/symbology-ng/qgssvgcache.cpp
  125. +5 −1 src/core/symbology-ng/qgssvgcache.h
  126. +10 −5 src/core/symbology-ng/qgssymbollayerv2.cpp
  127. +5 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  128. +6 −6 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  129. +4 −2 src/core/symbology-ng/qgsvectorcolorrampv2.h
  130. +2 −1 src/gui/attributetable/qgsattributetablefiltermodel.cpp
  131. +4 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  132. +4 −1 src/gui/qgsattributeform.cpp
  133. +1 −0 src/gui/qgsmapoverviewcanvas.cpp
  134. +11 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  135. +3 −1 src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
  136. +3 −2 src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
  137. +4 −0 src/plugins/grass/qgsgrassmodule.cpp
  138. +4 −4 src/plugins/heatmap/heatmap.cpp
  139. +2 −2 src/plugins/heatmap/heatmap.h
  140. +10 −10 src/plugins/heatmap/heatmapgui.cpp
  141. +4 −4 src/plugins/heatmap/heatmapgui.h
  142. +2 −2 src/plugins/heatmap/heatmapguibase.ui
  143. +1 −1 src/providers/ogr/qgsogrprovider.cpp
  144. +1 −1 src/providers/oracle/qgsoracleprovider.cpp
  145. +7 −0 src/providers/postgres/qgspostgresprovider.cpp
  146. +0 −1 src/server/qgshttprequesthandler.cpp
  147. +32 −1 src/server/qgsserverprojectparser.cpp
  148. +12 −9 src/server/qgswfsserver.cpp
  149. +13 −3 src/server/qgswmsconfigparser.cpp
  150. +5 −3 src/server/qgswmsprojectparser.cpp
  151. +5 −3 src/server/qgswmsserver.cpp
  152. +42 −5 src/ui/qgsadvanceddigitizingdockwidgetbase.ui
  153. +1 −0 tests/src/core/CMakeLists.txt
  154. +17 −6 tests/src/core/testqgscomposermap.cpp
  155. +26 −5 tests/src/core/testqgsdistancearea.cpp
  156. +154 −0 tests/src/core/testqgsmarkerlinesymbol.cpp
  157. +1 −0 tests/src/python/CMakeLists.txt
  158. +101 −0 tests/src/python/test_qgsmapunitscale.py
  159. BIN tests/testdata/control_images/markerlinesymbol/expected_line_offset/expected_line_offset.png
  160. +284 −0 tests/testdata/marker_line_offset.qml
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
SET(CPACK_PACKAGE_VERSION_PATCH "3")
SET(CPACK_PACKAGE_VERSION_PATCH "4")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Wien")
IF (POLICY CMP0048) # in CMake 3.0.0+
Expand Down
Loading