sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-02 00:02:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,135 Commits 82 Branches 277 Tags
Commit Graph

22135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pcav
7138c7aaf0 Merge branch 'master' of github.com:qgis/QGIS 2014-02-18 11:45:48 +01:00
pcav
43af9eaf54 Minor improvements to IT translation 2014-02-18 11:45:22 +01:00
Martin Dobias
6364f1399c Merge pull request #1188 from 3nids/addpointleftclick 
only add point with left click
 2014-02-18 17:43:13 +07:00
Denis Rouzaud
865ab28d0e only add point with left click 2014-02-18 10:08:11 +01:00
Matthias Kuhn
5e21c55d2b [relations] Preview expression from relation reference field config dialog 
Fix #9538
 2014-02-18 08:01:15 +01:00
Martin Dobias
bc07486982 Re-enable geometry simplification while rendering 2014-02-18 12:51:45 +07:00
Nathan Woodrow
517b85937e Faster listing of tables for MS SQL 2014-02-18 14:39:16 +10:00
Martin Dobias
a3af93394e Merge branch 'master' into threading-revival 
Some features are still disabled - will be fixed later

Conflicts:
	python/core/composer/qgscomposition.sip
	python/core/diagram/qgsdiagram.sip
	python/core/diagram/qgshistogramdiagram.sip
	python/core/diagram/qgspiediagram.sip
	python/core/diagram/qgstextdiagram.sip
	python/core/qgsdiagramrendererv2.sip
	python/core/qgsfield.sip
	python/core/qgslabelsearchtree.sip
	python/core/qgsmaprenderer.sip
	python/core/qgsrenderchecker.sip
	python/core/symbology-ng/qgssymbollayerv2.sip
	python/gui/qgsmapcanvas.sip
	src/app/composer/qgscomposerlegendwidget.cpp
	src/app/qgisapp.cpp
	src/core/composer/qgsatlascomposition.cpp
	src/core/composer/qgscomposerattributetable.cpp
	src/core/composer/qgscomposermap.cpp
	src/core/composer/qgscomposition.cpp
	src/core/composer/qgscomposition.h
	src/core/diagram/qgsdiagram.h
	src/core/diagram/qgshistogramdiagram.cpp
	src/core/diagram/qgshistogramdiagram.h
	src/core/diagram/qgspiediagram.cpp
	src/core/diagram/qgspiediagram.h
	src/core/diagram/qgstextdiagram.cpp
	src/core/diagram/qgstextdiagram.h
	src/core/qgsdiagramrendererv2.cpp
	src/core/qgsdiagramrendererv2.h
	src/core/qgsmaprenderer.cpp
	src/core/qgsmaprenderer.h
	src/core/qgsnetworkaccessmanager.h
	src/core/qgspallabeling.cpp
	src/core/qgsrenderchecker.h
	src/core/qgsvectorlayer.cpp
	src/core/qgsvectorlayer.h
	src/core/qgsvectorlayerfeatureiterator.cpp
	src/core/qgsvectorlayerfeatureiterator.h
	src/core/raster/qgsrasterlayer.cpp
	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.h
	src/core/symbology-ng/qgssymbolv2.cpp
	src/gui/qgshighlight.cpp
	src/gui/qgsmapcanvas.cpp
	src/gui/qgsmapcanvas.h
	src/gui/qgsmapcanvasitem.cpp
	src/gui/qgsmaptoolidentify.cpp
	src/plugins/georeferencer/qgsgeorefplugingui.cpp
	src/providers/memory/qgsmemoryfeatureiterator.cpp
	src/providers/ogr/qgsogrfeatureiterator.cpp
	src/providers/ogr/qgsogrfeatureiterator.h
	src/providers/ogr/qgsogrprovider.cpp
	src/providers/oracle/qgsoraclefeatureiterator.cpp
	src/providers/oracle/qgsoracleprovider.cpp
	src/providers/postgres/qgspostgresconn.cpp
	src/providers/postgres/qgspostgresfeatureiterator.cpp
	src/providers/postgres/qgspostgresfeatureiterator.h
	src/providers/wfs/qgswfsfeatureiterator.cpp
	src/providers/wms/qgswmsprovider.cpp
	src/providers/wms/qgswmsprovider.h
	src/ui/qgsoptionsbase.ui
	tests/src/core/CMakeLists.txt
	tests/src/core/testqgscomposereffects.cpp
	tests/src/core/testqgscomposerhtml.cpp
	tests/src/core/testqgscomposerscalebar.cpp
	tests/src/core/testqgscomposershapes.cpp
 2014-02-18 11:28:46 +07:00
Martin Dobias
dc50304f52 Merge pull request #1186 from ahuarte47/Issue_9360R2 
Bug #9360: Whole layer not rendered (when simplify geometry activated)
 2014-02-18 10:12:59 +07:00
Werner Macho
49fbfbadc9 Merge pull request #1187 from Cracert/i18n 
[TRANSUP] pl
 2014-02-18 09:47:12 +07:00
Robert Szczepanek
0f58a10757 [TRANSUP] pl 2014-02-17 21:45:01 -05:00
Werner Macho
fcf1119a45 [TRANSUP] es by Carlos, nl by Richard 
Signed-off-by: Werner Macho <werner.macho@gmail.com>
 2014-02-18 09:13:55 +07:00
Werner Macho
b95e14158d fixing typo in source 2014-02-18 09:13:28 +07:00
ahuarte47
f4f450f379 #9360: More safely calculate the simplification transform factor 2014-02-17 22:38:39 +01:00
Juergen E. Fischer
b9b9bc31b3 geometry validation: don't consider touching lines as intersection (fixes #3851, fixes #7501, fixes #9580) 2014-02-17 21:40:57 +01:00
Juergen E. Fischer
7c4c7e897e network authentication: don't crash if a network request is closed while the credentials dialog is open (fixes #9379) 2014-02-17 21:05:23 +01:00
Juergen E. Fischer
7becd761af osm: transform extents to EPSG:4326 (fixes #8709) 2014-02-17 17:52:57 +01:00
Werner Macho
ebdcaa7f37 Merge pull request #1184 from marcelosoaressouza/translation_pt_BR 
Some translations (pt_BR) for Monday...
 2014-02-17 23:42:32 +07:00
Marco Hugentobler
e6e0614641 Fix crash if adding sublayers via plugin interface 2014-02-17 17:32:09 +01:00
Marcelo Soares Souza
45dc4a5cf1 Some translations (pt_BR) for Monday... 2014-02-17 13:17:21 -03:00
Paolo
d39d2a7e7c IT translation completed 2014-02-17 16:12:23 +01:00
Werner Macho
7f3304b388 [TRANSUP] da by Jacob, fi by Kari, lv by Peteris 
Signed-off-by: Werner Macho <werner.macho@gmail.com>
 2014-02-17 21:58:25 +07:00
Werner Macho
c0f2b1e19b [TRANSUP] nb by James 2014-02-17 21:50:54 +07:00
Werner Macho
5c4899a3f9 typo in description 2014-02-17 21:50:54 +07:00
Nathan Woodrow
ef5ede1690 Merge pull request #1180 from nirvn/legend_spacing_fix2 
[composer] fix vertical spacing of hidden layer title in legend items (fix #9498)
 2014-02-17 20:30:19 +10:00
thomas
d31b5950a0 5239_v1 2014-02-17 09:03:25 +01:00
Werner Macho
4e3738a24f Merge pull request #1183 from Cracert/i18n 
[TRANSUP] pl: QObject
 2014-02-17 08:34:11 +07:00
Robert Szczepanek
337792bf0c [TRANSUP] pl: QObject 2014-02-16 20:28:45 -05:00
Juergen E. Fischer
24b3ed171b postgres provider: fix detection of character fields (related to #8481) 2014-02-17 02:07:02 +01:00
Werner Macho
68660acf12 Merge pull request #1182 from SrNetoChan/master 
[TRANSUP] pt_PT GUI Translations
 2014-02-17 07:41:53 +07:00
Alexandre Neto
e0e5f71f77 pt_PT GUI Translations 
PT_pt GUI Translation (QObject)

PT_pt GUI Translations
 2014-02-17 00:17:52 +00:00
Borys Jurgiel
26f8be9286 [Plugin Manager] Fix window title update 2014-02-16 21:36:24 +01:00
Juergen E. Fischer
e0c761ccd5 main: fix installation of qt translator 2014-02-16 21:33:35 +01:00
Juergen E. Fischer
7f9a755f27 network manager: support system proxy settings on windows (fixes #8600) 2014-02-16 16:20:58 +01:00
Martin Dobias
ba47c9feb6 Fix #9520 (bbox filter doesn't work applied on a WFS datasource) 
Currently the bbox must have syntax bbox($geometry, geomFromWKT('...'))
 2014-02-16 16:32:54 +07:00
Mathieu Pellerin (nirvn)
d102a79aa9 [composer] fix vertical spacing of hidden layer title in legend items (fix #9498) 2014-02-16 09:22:57 +07:00
Werner Macho
1607759cf9 ² 
Signed-off-by: Werner Macho <werner.macho@gmail.com>
 2014-02-16 08:30:11 +07:00
Werner Macho
af7b133ebc Merge pull request #1179 from asiersarasua/master 
Basque translation update
 2014-02-16 08:11:20 +07:00
Werner Macho
e91580fc9f Merge pull request #1178 from Cracert/i18n 
[TRANSUP] pl: QObject
 2014-02-16 08:11:11 +07:00
Werner Macho
c809a8221a Merge pull request #1177 from marcelosoaressouza/translation_pt_BR 
Some translations (pt_BR) for the weekend.
 2014-02-16 08:10:51 +07:00
Werner Macho
0d304a268d Merge pull request #1176 from tomass/master 
Lithuanian translation update
 2014-02-16 08:10:13 +07:00
Gary Sherman
be67e6a9ab Merge pull request #1174 from anitagraser/master 
added new splash for 2.2
 2014-02-15 12:42:21 -08:00
asiersarasua
9b651a5086 Basque translation update 2014-02-15 20:46:09 +01:00
Robert Szczepanek
60813ce782 [TRANSUP] pl: QObject 2014-02-15 12:33:23 -05:00
Juergen E. Fischer
675746c2d7 wms: use titles in layer name (fixes #4002) 2014-02-15 17:31:51 +01:00
Juergen E. Fischer
edfce6897d wmts: use title instead of identifier (fixes #9391) 2014-02-15 17:31:51 +01:00
Marcelo Soares Souza
2168cac11b Some translations (pt_BR) for the weekend. 2014-02-15 13:25:23 -02:00
Martin Dobias
b5897c7f7a Fix switched axes problem in WMS 1.3 with non-projected CRS 2014-02-15 22:06:18 +07:00
Tomas
f094cf9dad Lithuanian translation update 2014-02-15 16:48:39 +02:00
Alexander Bruy
51afb50741 russian translation update 2014-02-15 14:06:41 +02:00