Skip to content
Permalink
Browse files

Merge branch 'master' into wmts

  • Loading branch information
jef-n committed Jun 4, 2012
2 parents 08a712a + dab4758 commit 18bafb370a785a2067d655399f495699d18505fb
Showing with 95,133 additions and 98,153 deletions.
  1. +13 −0 .mailmap
  2. +154 −98 NEWS
  3. +1 −0 debian/libqgis-dev.install
  4. +0 −3 debian/libqgis{QGIS_ABI}-dev.install
  5. +14 −3 debian/rules
  6. +47 −47 doc/TRANSLATORS
  7. +199 −140 doc/news.html
  8. +54 −0 doc/news.t2t
  9. +2,004 −1,958 i18n/qgis_af.ts
  10. +2,005 −1,963 i18n/qgis_ar.ts
  11. +2,006 −1,956 i18n/qgis_bg.ts
  12. +2,002 −1,967 i18n/qgis_ca_ES.ts
  13. +1,303 −1,216 i18n/qgis_cs_CZ.ts
  14. +1,999 −1,957 i18n/qgis_da_DK.ts
  15. +2,025 −2,169 i18n/qgis_de.ts
  16. +2,017 −1,948 i18n/qgis_el_GR.ts
  17. +415 −237 i18n/qgis_es.ts
  18. +2,045 −1,853 i18n/qgis_et_EE.ts
  19. +2,006 −1,955 i18n/qgis_fa.ts
  20. +2,027 −1,907 i18n/qgis_fi.ts
  21. +1,201 −1,076 i18n/qgis_fr.ts
  22. +2,750 −2,668 i18n/qgis_gl_ES.ts
  23. +2,003 −1,950 i18n/qgis_he.ts
  24. +2,034 −1,914 i18n/qgis_hr_HR.ts
  25. +2,383 −2,157 i18n/qgis_hu.ts
  26. +2,040 −1,856 i18n/qgis_id.ts
  27. +2,023 −1,903 i18n/qgis_is.ts
  28. +2,022 −8,150 i18n/qgis_it.ts
  29. +3,722 −3,439 i18n/qgis_ja.ts
  30. +2,014 −1,926 i18n/qgis_ka_GE.ts
  31. +2,044 −1,859 i18n/qgis_ko_KR.ts
  32. +2,013 −1,932 i18n/qgis_lo.ts
  33. +2,006 −1,949 i18n/qgis_lt.ts
  34. +796 −689 i18n/qgis_lv.ts
  35. +2,024 −1,919 i18n/qgis_mn.ts
  36. +1,129 −935 i18n/qgis_nl.ts
  37. +2,002 −1,960 i18n/qgis_no.ts
  38. +1,276 −1,189 i18n/qgis_pl_PL.ts
  39. +3,779 −3,469 i18n/qgis_pt_BR.ts
  40. +2,036 −1,872 i18n/qgis_pt_PT.ts
  41. +2,007 −1,946 i18n/qgis_ro.ts
  42. +1,091 −3,644 i18n/qgis_ru.ts
  43. +2,014 −1,926 i18n/qgis_sk.ts
  44. +1,495 −1,336 i18n/qgis_sl_SI.ts
  45. +2,013 −1,932 i18n/qgis_sq_AL.ts
  46. +2,038 −1,900 i18n/qgis_sr_CS-Latn.ts
  47. +2,022 −1,922 i18n/qgis_sv.ts
  48. +2,002 −1,960 i18n/qgis_ta.ts
  49. +2,038 −1,870 i18n/qgis_th.ts
  50. +2,021 −1,914 i18n/qgis_tr.ts
  51. +2,033 −1,873 i18n/qgis_uk.ts
  52. +2,021 −1,913 i18n/qgis_vi.ts
  53. +2,002 −1,959 i18n/qgis_xh.ts
  54. +2,010 −1,941 i18n/qgis_zh_CN.ts
  55. +2,025 −1,896 i18n/qgis_zh_TW.ts
  56. BIN images/icons/qgis-icon-60x60.png
  57. +2 −2 mac/cmake/1qt.cmake.in
  58. +15 −0 python/core/qgscoordinatereferencesystem.sip
  59. +2 −0 python/core/qgsexpression.sip
  60. +1 −1 python/gui/qgsmapcanvas.sip
  61. +1 −0 python/plugins/fTools/fTools.py
  62. +115 −48 python/plugins/fTools/tools/doGeometry.py
  63. +126 −55 python/plugins/fTools/tools/doGeoprocessing.py
  64. +2 −2 python/plugins/fTools/tools/doMeanCoords.py
  65. +171 −69 python/plugins/fTools/tools/doPointsInPolygon.py
  66. +7 −6 python/plugins/fTools/tools/doRandPoints.py
  67. +1 −1 python/plugins/fTools/tools/doSelectByLocation.py
  68. +49 −27 python/plugins/fTools/tools/doValidate.py
  69. +4 −6 python/plugins/fTools/tools/doVectorGrid.py
  70. +63 −68 python/plugins/fTools/tools/frmPointsInPolygon.ui
  71. +68 −77 python/plugins/fTools/tools/frmSpatialJoin.ui
  72. +66 −65 python/plugins/fTools/tools/frmVectorSplit.ui
  73. +18 −0 python/plugins/fTools/tools/ftools_utils.py
  74. +634 −327 resources/customization.xml
  75. +125 −95 scripts/tsstat.pl
  76. +5 −0 scripts/update_ts_files.sh
  77. +2 −0 src/app/composer/qgscomposer.cpp
  78. +122 −142 src/app/nodetool/qgsmaptoolnodetool.cpp
  79. +7 −9 src/app/nodetool/qgsmaptoolnodetool.h
  80. +55 −31 src/app/nodetool/qgsselectedfeature.cpp
  81. +2 −3 src/app/nodetool/qgsselectedfeature.h
  82. +0 −6 src/app/nodetool/qgsvertexentry.cpp
  83. +0 −1 src/app/nodetool/qgsvertexentry.h
  84. +8 −6 src/app/qgisapp.cpp
  85. +2 −2 src/app/qgsbrowserdockwidget.cpp
  86. +9 −9 src/app/qgscustomprojectiondialog.cpp
  87. +0 −15 src/app/qgshighlight.cpp
  88. +3 −3 src/app/qgsoptions.cpp
  89. +3 −0 src/core/qgis.h
  90. +3 −1 src/core/qgsapplication.cpp
  91. +64 −14 src/core/qgscoordinatereferencesystem.cpp
  92. +26 −0 src/core/qgscoordinatereferencesystem.h
  93. +2 −0 src/core/qgsdataitem.h
  94. +1 −1 src/core/qgsdistancearea.cpp
  95. +2 −0 src/core/qgsexpression.h
  96. +43 −38 src/core/qgsgeometry.cpp
  97. +2 −1 src/core/qgsgeometry.h
  98. +36 −27 src/core/qgsgeometryvalidator.cpp
  99. +2 −2 src/core/qgsmaplayer.cpp
  100. +1 −1 src/core/qgsmaplayer.h
  101. +10 −7 src/core/qgsmessageoutput.cpp
  102. +1 −0 src/core/qgsmessageoutput.h
  103. +1 −1 src/core/qgsmimedatautils.cpp
  104. +2 −2 src/core/qgspoint.cpp
  105. +3 −1 src/core/qgspoint.h
  106. +10 −5 src/core/qgsvectorfilewriter.cpp
  107. +24 −4 src/core/qgsvectorlayer.cpp
  108. +21 −3 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  109. +3 −0 src/crssync/main.cpp
  110. +42 −67 src/gui/qgsmaptip.cpp
  111. +6 −0 src/gui/qgsmessagelogviewer.cpp
  112. +1 −0 src/gui/qgsmessagelogviewer.h
  113. +16 −7 src/gui/qgsprojectionselector.cpp
  114. +3 −0 src/gui/qgsprojectionselector.h
  115. +14 −17 src/gui/qgsquerybuilder.cpp
  116. +2 −2 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  117. +10 −4 src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  118. +1 −1 src/helpviewer/qgshelpviewer.cpp
  119. +10 −1 src/mapserver/qgswmsserver.cpp
  120. +1 −1 src/plugins/grass/locations.gml
  121. +8 −0 src/plugins/grass/qgsgrassnewmapset.cpp
  122. +0 −3 src/plugins/sqlanywhere/CMakeLists.txt
  123. +0 −63 src/plugins/sqlanywhere/sadbfilterproxymodel.cpp
  124. +0 −47 src/plugins/sqlanywhere/sadbfilterproxymodel.h
  125. +0 −331 src/plugins/sqlanywhere/saquerybuilder.cpp
  126. +0 −148 src/plugins/sqlanywhere/saquerybuilder.h
  127. +2 −2 src/plugins/sqlanywhere/sasourceselect.cpp
  128. +2 −2 src/plugins/sqlanywhere/sasourceselect.h
  129. +32 −16 src/providers/gdal/qgsgdaldataitems.cpp
  130. +1 −0 src/providers/gdal/qgsgdaldataitems.h
  131. +128 −2 src/providers/mssql/qgsmssqlprovider.cpp
  132. +30 −0 src/providers/mssql/qgsmssqlprovider.h
  133. +39 −17 src/providers/ogr/qgsogrdataitems.cpp
  134. +1 −0 src/providers/ogr/qgsogrdataitems.h
  135. +16 −9 src/providers/ogr/qgsogrprovider.cpp
  136. +2 −0 src/providers/ogr/qgsogrprovider.h
  137. +0 −53 src/providers/postgres/qgsdbfilterproxymodel.cpp
  138. +0 −39 src/providers/postgres/qgsdbfilterproxymodel.h
  139. +5 −2 src/providers/wms/qgswmsconnection.cpp
  140. +2 −2 src/providers/wms/qgswmsprovider.cpp
  141. +1 −1 src/ui/qgsprojectionselectorbase.ui
  142. +1 −0 tests/src/core/CMakeLists.txt
  143. +136 −5 tests/src/core/testqgscoordinatereferencesystem.cpp
  144. +168 −0 tests/src/core/testqgsdataitem.cpp
  145. +37 −6 tests/src/core/testziplayer.cpp
  146. BIN tests/testdata/bug5598.dbf
  147. +1 −0 tests/testdata/bug5598.prj
  148. BIN tests/testdata/bug5598.shp
  149. BIN tests/testdata/bug5598.shx
  150. BIN tests/testdata/control_images/expected_continuous/windows_continuous_anomaly.png
  151. BIN tests/testdata/control_images/expected_graduated/windows_graduated_anomaly.png
  152. BIN tests/testdata/control_images/expected_landsat_875/windows_landsat875_anomaly.png
  153. BIN tests/testdata/control_images/expected_rgbwcmyk01_YeGeo.jp2/windows_rgbwcmyk01_YeGeo_anomaly.png
  154. BIN tests/testdata/control_images/expected_single/windows_single_anomaly.png
  155. BIN tests/testdata/control_images/expected_uniquevalue/windows_anomaly.png
  156. +5 −0 tests/testdata/points.vrt
  157. BIN tests/testdata/testzip.zip
@@ -0,0 +1,13 @@
Juergen E. Fischer <fischer@linux-buechse.de>
Juergen E. Fischer <jef@norbit.de>
Nathan Woodrow <madmanwoo@gmail.com>
Nathan Woodrow <woodrow.nathan@gmail.com>
Nathan Woodrow <woo@woo-mint.(none)>
Marco Hugentobler <marco@marco-laptop.(none)>
Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Marco Bernasocchi <marco@bernawebdesign.ch>
Marco Bernasocchi <<marco@placebo.(none)>
Marco Bernasocchi <marco@bernawebdesign.ch>
Marco Bernasocchi <marco@bernawebdesign.ch>
Gary Sherman <gsherman@geoapt.com>
Gary Sherman <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>

0 comments on commit 18bafb3

Please sign in to comment.
You can’t perform that action at this time.