sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
29,319 Commits 80 Branches 277 Tags
Commit Graph

29319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen E. Fischer
b36cd1f002 better fix for phantom labels: consider rules out of visibility range as inactive (followup d6f66ee) 2015-10-23 17:51:23 +02:00
Jürgen Fischer
44590e9a71 Merge pull request #2395 from medspx/dbmanager_oracle_timestamp 
DBManager: support timestamp values for Oracle
 2015-10-23 17:03:29 +02:00
Juergen E. Fischer
d6f66ee488 fix phantom labels for (actually not) rendered feature (refs #13631) 2015-10-23 16:04:30 +02:00
rldhont
f7ce8b9434 [BUGFIX] Set default units to mm in GetStyles 
The default units in QgsMapRenderer is Millimeters. The default units in SLD
 is Pixel but exportSld does not convert all millimeters in pixels.

We notes this bug by comparing default QGS Server rendering and rendering with
 the SLD generated by QGIS.

To resolve it, we just have to add units to the document element.
 2015-10-23 15:54:55 +02:00
Matthias Kuhn
2e8505378e Only highlight feature of active attribute dialog 
Fix #13634
 2015-10-23 14:27:48 +02:00
Matthias Kuhn
b9b0865ec2 Automatically reload project templates when a new template is added 2015-10-23 14:27:48 +02:00
Matthias Kuhn
0f2dfdb19b Reload data when subsetString changes. 2015-10-23 14:27:48 +02:00
rldhont
b54b1598a6 [BUGFIX] Set default units to mm in exportSld 
The default units in QgsMapRenderer is Millimeters. The default units in SLD
 is Pixel but exportSld does not convert all millimeters in pixels.

We notes this bug by comparing default QGS Server rendering and rendering with
 the SLD generated by QGIS.

To resolve it, we just have to add units to the document element.
 2015-10-23 14:23:42 +02:00
Juergen E. Fischer
1a9aec4adf Bump version to 2.13 2015-10-23 14:11:22 +02:00
Juergen E. Fischer
c69f33988d changelog update for 2.12 2015-10-23 14:10:37 +02:00
Juergen E. Fischer
660af94d9b translation update for 2.12 from transifex 2015-10-23 14:10:23 +02:00
Médéric Ribreux
0aa0b4c804 DBManager: support timestamp values for Oracle 2015-10-23 14:04:40 +02:00
Larry Shaffer
c5cbd6d68b Partial fix for #13143; fix Mac exports for composer with HTML labels 
- Does not work with Print dialogs (still non functional)
 2015-10-23 05:58:55 -06:00
Juergen E. Fischer
d8303a76d4 pass through default values when merging features (followup 099a40b, refs #12842) 2015-10-23 11:28:14 +02:00
Larry Shaffer
220affbf9c Fix #11399; fix up Mac OS X 10.10+ dropped file URLs 2015-10-23 02:26:20 -06:00
Salvatore Larosa
70687729cf [pyqgis-console] APIs file update 2015-10-23 09:44:56 +02:00
Larry Shaffer
dfb476a527 [auth] Fix #13568; disable auth system after 5 wrong password attempts 2015-10-23 01:25:18 -06:00
Juergen E. Fischer
b65b59596a make python error handling translatable 2015-10-23 08:29:46 +02:00
Martin Dobias
e5ad57b7ae Notes about new labeling API not being public yet in 2.12 2015-10-23 14:10:08 +08:00
Nyall Dawson
d56dcdb02f Fix composer scale bar when crs units are non-meters and OTF is off (fix #13610) 2015-10-23 17:03:34 +11:00
Radim Blazek
68f11d4532 Merge pull request #2393 from PedroVenancio/grass7_plugin 
Include v.to.3d in QGIS-GRASS in three different modules: v.to.3d.fix…
 2015-10-23 03:38:10 +02:00
Nathan Woodrow
18df00375e Use front window to show python error if there is message bar 2015-10-23 09:36:07 +10:00
PedroVenancio
b33ab1af66 Include v.to.3d in QGIS-GRASS in three different modules: v.to.3d.fixed (fixed height for 3D vector features), v.to.3d.attr (attribute column used for height) and v.to.2d (reverse transformation) 2015-10-23 00:35:44 +01:00
Nathan Woodrow
c7eef14d62 Remove default QGIS rocks text 2015-10-23 08:52:42 +10:00
Juergen E. Fischer
76ba841853 update debian changelog 2015-10-22 23:16:09 +02:00
Bas Couwenberg
fd6bec43fe Also install MIME type icon in hicolor theme. 
Additionally the Shared MIME-info configuration is updated to reference the icon by name (without extension) like the desktop files.
 2015-10-22 23:16:09 +02:00
Bas Couwenberg
b730fa0c78 Fix desktop-file-valide issues. 
The desktop-file-valide utility reported the following issues:
```
debian/qbrowser.desktop: hint: value "Qt;Education;Science;Geography;" for key "Categories" in group "Desktop Entry" contains more than one main category; application might appear more than once in the application menu
debian/qbrowser.desktop: error: value "map;globe;postgis;wms;wfs;ogc;osgeo" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character

debian/qgis.desktop: hint: value "Qt;Education;Science;Geography;" for key "Categories" in group "Desktop Entry" contains more than one main category; application might appear more than once in the application menu
debian/qgis.desktop: error: value "map;globe;postgis;wms;wfs;ogc;osgeo" for locale string list key "Keywords" in group "Desktop Entry" does not have a semicolon (';') as trailing character
```

Only the Keywords syntax error is addressed, the Categories hint is left as-is.
 2015-10-22 23:16:09 +02:00
Bas Couwenberg
7102c522d4 Drop menu files in favor of desktop files. 
The menu files are no longer required for the Debian packages since
[CTTE #741573 Debian Menu System](https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html)
which advised:

>  2. In addition to those changes, the Technical Committee resolves that
>     packages providing a .desktop file shall not also provide a menu
>     file for the same application.
 2015-10-22 23:16:09 +02:00
Nyall Dawson
dc6c12b6c3 [composer] Fix scalebar widgets not updated when changing units (fix #13572) 2015-10-23 08:04:44 +11:00
Nyall Dawson
71d88a753f [composer] Fix wording of scalebar widget controls (fix #12063) 
Also add some tooltips to clarify meaning of various controls
 2015-10-23 08:04:44 +11:00
Nyall Dawson
0886e98023 Standardise naming of border/outline in symbol GUI 
Now for markers it's always "outline", and for fills it's
always "border"
 2015-10-23 08:04:44 +11:00
Juergen E. Fischer
bf64f8d0a0 spelling fixes and indentation update 2015-10-22 21:56:54 +02:00
Giuseppe Sucameli
339fd75655 DBManager: merge PR2342 by medspx (fix #13650) 2015-10-22 21:28:02 +02:00
Giuseppe Sucameli
9419a44537 DBManager: revert commit 87675f8ab 
Maybe I was drunk...
 2015-10-22 21:17:56 +02:00
Giuseppe Sucameli
87657f8ab4 DBManager: fix #13650 2015-10-22 19:27:33 +02:00
Giuseppe Sucameli
2a57b17068 DBManager: avoid loading a query as layer with missing fields (fix #11037), 
restore combo style and label when multiple unique fields for view are not supported (follow 8e45da9d7e)
 2015-10-22 19:23:42 +02:00
Giuseppe Sucameli
ef8f3d3843 Merge pull request #2382 from SebDieBln/MultiColumnPK_DbManagerQuery 
[DB_Manager] allows to specify multiple columns as the primary for a query to PostGIS (follow a4124da)
 2015-10-22 19:21:39 +02:00
Radim Blazek
54e2a5112a [GRASS] hide db driver window on Windows 2015-10-22 16:52:52 +02:00
volaya
f5b0dbe902 [processing] allow translating algorithm dialog title 
fixes #13652
 2015-10-22 16:50:05 +02:00
Radim Blazek
e8cb8c1a99 [GRASS] disable multiple vector editing on Linux/Mac 2015-10-22 14:25:41 +02:00
Radim Blazek
ca70491363 [GRASS] try to get off_t from Make/platform.h 2015-10-22 11:01:07 +02:00
DelazJ
f7f8d7e497 Restore "Add result to canvas" option as default 
fixes #13647
 2015-10-22 10:32:38 +02:00
Matthias Kuhn
457c76d964 [sip] QgsMapCanvasSnappingUtils 2015-10-22 10:32:05 +02:00
Matthias Kuhn
ef2528bf02 Allow usage of QgsMapToolAdvancedDigitizing from python code 2015-10-22 10:32:05 +02:00
Nyall Dawson
7b9bcffb87 [composer] prevent application freeze upon opening composer due to qt/cups bug 
Credit to nirvn
 2015-10-22 17:02:53 +11:00
Nyall Dawson
87e11cb2d7 Fix a crash in filtered legends 2015-10-22 16:20:34 +11:00
Nyall Dawson
b4b7017068 Add tooltips to advanced digitizing dock 2015-10-22 16:20:27 +11:00
Nyall Dawson
307b1b92a3 [pal] Fix regression in placement for free/horizontal polygon labels 2015-10-22 11:37:20 +11:00
Juergen E. Fischer
0559939725 partly revert 3e0badc (fixes #13645 and #13646) 2015-10-22 01:14:42 +02:00
Juergen E. Fischer
ea0ce4ec1e rule based renderer: keep skip else rule if an inactive rule matches, but still return if the feature was actually rendered so that only rendered features are labeled (fixes #13631) 2015-10-21 21:45:39 +02:00