18379 Commits

Author SHA1 Message Date
Emilio Loi
c499df74a3 Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
Conflicts:
	python/console/console_editor.py
2013-04-29 11:19:44 +02:00
Salvatore Larosa
195918293c [pyqgis-console] small fix for show/hide editor action 2013-04-29 01:22:45 +02:00
Nathan Woodrow
8565ef95d9 Merge pull request #565 from nyalldawson/new_functions
New color functions (from hsl, hsv and cmyk), new regexp_match function
2013-04-28 16:16:23 -07:00
nyalldawson
533030f80e Add regexp_match function, improve help for regexp_replace function 2013-04-29 09:10:57 +10:00
nyalldawson
6e5221cd6d Add color_cmyk and color_cmyka functions 2013-04-29 09:10:48 +10:00
nyalldawson
c038374e41 Add color_hsv and color_hsva functions 2013-04-29 09:10:39 +10:00
nyalldawson
d52e007de8 Add color_hsl and color_hsla functions 2013-04-29 09:10:33 +10:00
Salvatore Larosa
71c9d96f44 [pyqgis-console ] adds more options to settings dialog:
- reorganized settings dialog
- added option autosave script before running
- added options for autocompletion code (from Document, from APIs, from Doc and API)
- minor fixes
2013-04-28 23:56:52 +02:00
Werner Macho
a8af82e4e3 translation update: fr by JRM 2013-04-28 23:26:22 +02:00
Matthias Kuhn
1a19947ea1 Merge pull request #564 from vinayan/fixRubberband
[Fix #7728] - QgsRubberband addGeometry does not add multipart geometries to existing points
2013-04-28 12:47:21 -07:00
Werner Macho
6b9bc64e32 translation update: Danish by Jacob 2013-04-28 21:20:08 +02:00
Matthias Kuhn
d90f167be9 Allow adding QToolButton's to the toolbars
* iface.addToolBarWidget()
 * iface.addRasterToolBarWidget()
 * iface.addVectorToolBarWidget()
 * iface.addDatabaseToolBarWidget()
 * iface.addWebToolBarWidget()
2013-04-28 21:17:21 +02:00
Etienne Tourigny
ddbfb2e8ea restore zip raster layer style test - still needs a test for vector layers 2013-04-28 11:55:45 -03:00
Etienne Tourigny
785f614a4e remove invalid layers from zip test files 2013-04-28 11:19:14 -03:00
vinayan
9d935148e5 fix QgsRubberband.addGeometry when adding multipart geometries 2013-04-28 13:54:46 +05:30
Borys Jurgiel
c47fbbe25b Plugin installer: add ?qgis=[QGIS_VERSION] GET parameter to each repository URL to allow filtering also on reposiotory side 2013-04-28 00:16:01 +02:00
Borys Jurgiel
dfd8444383 Plugin installer: fix support for qgisMaximumVersion tag. 2013-04-28 00:08:51 +02:00
Juergen E. Fischer
fdc4138b95 german translation update 2013-04-27 21:37:34 +02:00
Werner Macho
9b43d73ce3 translation update: gl_ES by Xan 2013-04-27 20:57:43 +02:00
Werner Macho
370828c2c7 Merge pull request #472 from jdugge/master
Interface elements for specifying raster resolution in GDAL Rasterize plugin
2013-04-27 10:37:31 -07:00
Werner Macho
83f3fc6fb5 translation update da_DK by Jacob 2013-04-27 17:49:13 +02:00
Victor Olaya
345c14505e [sextante] added OTB algorithms to simplified list 2013-04-27 16:36:55 +02:00
Juergen E. Fischer
6fc81e8376 osgeo4w: rename executables to ...-bin.exe to solve clash with .bat 2013-04-27 11:10:30 +02:00
Victor Olaya
c635578d9f [sextante] Improvements in commander 2013-04-27 00:34:57 +02:00
Victor Olaya
4065d57235 [sextante] fixed problem in otb with filepaths containing whitespaces.
Removed outdated otb descriptions
2013-04-26 23:48:07 +02:00
Emilio Loi
723ad4c7ec [FEATURE] Load and Save SLD & QML styles to DB
Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
merge with master f3842775a5147b7a8da1639a4bec667a769b7fac
2013-04-26 17:39:47 +02:00
Emilio Loi
0fa9527a50 pre merge with master
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db

Conflicts:
	python/console/console_editor.py
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorfilewriter.cpp
2013-04-26 17:37:34 +02:00
Borys Jurgiel
f3842775a5 Merge pull request #561 from minorua/create_shape
set SHAPE_ENCODING to "" when creating new shapefile
2013-04-26 08:22:22 -07:00
Etienne Tourigny
02fa7292c6 add temporary output for zip test 2013-04-26 09:01:33 -03:00
Minoru Akagi
f7cce9c676 set SHAPE_ENCODING to "" when creating new shapefile (follows up 4fb9879) 2013-04-26 20:33:29 +09:00
Emilio Loi
7219fb73ac [FEATURE] Load and Save SLD & QML styles to DB
Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
(bug fixes and rollback on doc files)
2013-04-26 12:03:24 +02:00
Emilio Loi
280922a383 [FEATURE] Load and Save SLD & QML styles to DB
Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
2013-04-26 11:56:22 +02:00
Alexander Bruy
5616cfaeaf [sextante] add missed CMakeLists 2013-04-26 12:42:13 +04:00
Victor Olaya
fd4cf96e0a [sextante] fixed error due to wrong import 2013-04-26 08:42:07 +02:00
Larry Shaffer
4aa013d717 Fix for #3743, georeferencer: can't set map coords from map canvas on Mac 2013-04-25 19:11:57 -06:00
Larry Shaffer
bab91637b6 Small cleanup for e0838b0 2013-04-25 19:10:41 -06:00
Nathan Woodrow
b57841fb5c Merge pull request #531 from ccrook/colour_functions
Colour functions
2013-04-25 16:49:17 -07:00
Chris Crook
fd57ffa571 Merge branch 'master' into colour_functions 2013-04-26 11:35:32 +12:00
Victor Olaya
21fd0f242d [sextante] added commander 2013-04-26 00:36:34 +02:00
Borys Jurgiel
4fb9879dca Set the ENCODING layer creation option when creating a new empty Shapefile. Thanks to Minoru Akagi. 2013-04-25 22:51:47 +02:00
Borys Jurgiel
320d90a20b Always set "SHAPE_ENCODING" GDAL config option to "" in QgsVectorFileWriter (follows up commit:c0551a6) 2013-04-25 22:43:13 +02:00
Etienne Tourigny
89f34b20b4 fix cpt-city loading of invalid (non-existent) ramps in Seleections 2013-04-25 16:34:49 -03:00
Etienne Tourigny
4f41de8343 add simple help to cpt-city dialog 2013-04-25 16:34:49 -03:00
Etienne Tourigny
43c2805ecf add ramp count to selection info label 2013-04-25 16:34:49 -03:00
Etienne Tourigny
8218baf9a6 change QGis to QGIS 2013-04-25 16:34:49 -03:00
Etienne Tourigny
30e48771ac add cpt-city selections to distribution 2013-04-25 16:34:48 -03:00
Juergen E. Fischer
44921e194a osgeo4w: make batch files location independant 2013-04-25 21:06:29 +02:00
Salvatore Larosa
5cbf42b084 [pyqgis-console] fix object inspector on windows 7
- minor fixes
2013-04-25 18:17:50 +02:00
vinayan
345a0aef87 Merge pull request #556 from vinayan/splitVector
[Fix #7618] - split vector layer does not work in master
2013-04-25 08:32:09 -07:00
vinayan
4f54664900 ftools-fix split vector layer 2013-04-25 20:53:23 +05:30