diff --git a/ChangeLog b/ChangeLog index ef420cb705f..4768d6f99fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,66330 @@ +Juergen E. Fischer 2018-02-23 + + translation update for 3.0 from transifex + +Martin Dobias 2018-02-23 + + Do not auto-close vertex editor on any mouse click (ref #17243) + + This is a partial fix for #17243 to improve usability of vertex editor panel. + Until now the vertex editor would get closed on any mouse click in mouse canvas, + making it quite annoying to work with it. + + With this change, the vertex editor stays open until is is explicitly closed. + +Merge: f93dc908fa 4c95b6bf38 +Alexander Bruy 2018-02-23 + + Merge pull request #6367 from slarosa/fix_saga_osx + + [processing] fix execution of SAGA algorithms under macos + +Merge: 9a62305786 7823025b8d +Alexander Bruy 2018-02-23 + + Merge pull request #6434 from alexbruy/python-console + + [python console] remove 'u' prefixes from strings (fix #18171) + +Merge: 2d9ee3dcb0 5cfe278481 +Salvatore Larosa 2018-02-23 + + Merge pull request #5861 from signedav/bugFixSH01 + + Widget size handling in status bar + +Salvatore Larosa 2018-02-23 + + [pyqgis-coonsole] APIs file updated + +Alexander Bruy 2018-02-23 + + indentation + +Merge: a554409ede 7203574439 +Borys Jurgiel 2018-02-23 + + Merge pull request #6427 from Cracert/trans + + [TRANSUP] pl: new translator + +Alexander Bruy 2018-02-23 + + [python console] remove 'u' prefixes from strings (fix #18171) + +Alexander Bruy 2018-02-23 + + [processing] don't use scandir() to get directory contents (fix #18180) + +Merge: 67a578f3dc e59c264bfd +Alexander Bruy 2018-02-23 + + Merge pull request #6433 from alexbruy/hide-modeler-tools + + [processing] hide 'Rename layer' and 'Load layer' algs from toolbox + +Alexander Bruy 2018-02-23 + + [processing] hide 'Rename layer' and 'Load layer' algs from toolbox + +Juergen E. Fischer 2018-02-23 + + fix df76bfc1 + +Merge: a5399def03 62cd1edbb3 +Alexander Bruy 2018-02-23 + + Merge pull request #6423 from nyalldawson/proc_auto_select_alg + + [processing] Some toolbox ux tweaks + +Merge: 08b75ec0f5 75a9150a41 +Alexander Bruy 2018-02-23 + + Merge pull request #6429 from nyalldawson/fix_18179 + + [processing] Fix config exception with INT/FLOAT settings + +Nyall Dawson 2018-02-23 + + [layouts][needs-docs] Replace layout and report icons + + The previous layout icon (a blank page) was too difficult to + distinguish from actions relating to pages themselves. + + Also fix incorrect tooltips in report designer + +Martin Dobias 2018-02-23 + + Respect selection in layers in vertex tool (fixes #17782) (#6421) + + This fixes issues in situations when there are multiple vertices in one location: + + 1. when clicking a location, if there are selected features, + the closest vertex from a selected feature will be used with priority. + + 2. when dragging a rectangle, if there is a selected feature, + only vertices from selected features will be used. + + If there is selection in any editable layers, but away from the location where + user clicked to pick vertex (or dragged rectangle to pick multiple vertices), + the existing vertex tool behavior is not affected (so it cannot happen that + vertex tool suddenly appears to have stopped working just because there is + selection somewhere possibly outside of the current map view). + +Nyall Dawson 2018-02-23 + + [layouts] Fix mouse event handling on rulers + +Merge: 5f66494446 4f4de3799e +Nyall Dawson 2018-02-23 + + Merge pull request #6425 from nyalldawson/ui_default + + Update default toolbar arrangement to move short layer toolbar from left to top + +Nyall Dawson 2018-02-23 + + [needs-docs] Remove " Panel" suffixes from panel titles + + This extra text adds a lot of visual clutter to the interface, + and makes tabbed dock's tab bars take up a lot of room. + + Instead only show the "panel" suffix in the menus. + +Nyall Dawson 2018-02-23 + + [reports] Add more descriptive tooltips to widgets + + Also + - fix widget tab orders + - tweak widget layouts for UI clarity + +Nyall Dawson 2018-02-23 + + [needs-docs][reports] Tweak strings for clarity, add tooltips + + Rename 'Single section' to 'Static layout section' + +Nyall Dawson 2018-02-23 + + [reports] Hide redundant edit header/footer buttons for + fixed layout sections + + These have no real meaning for fixed layout sections. + +Nyall Dawson 2018-02-23 + + Update default toolbar arrangement to move short layer toolbar from left to top + + Now that the layer toolbar is very short (following the data source + manager changes), there's a LOT of wasted space by placing this + toolbar vertically on the left. Instead move it to the top and + gain a centimetre or two extra canvas space in the default arrangement. + +Nyall Dawson 2018-02-23 + + [processing] Fix config exception with INT/FLOAT settings + + Fixes #18179 + +Merge: af8ca3eddb 5d5927aca4 +Nyall Dawson 2018-02-23 + + Merge pull request #6395 from lbartoletti/advanced_shape_digitize_toolbar + + Make Regular Shape Digitizing Toolbar disabled by default / renamed Shape Digitizing Toolbar + +Merge: e6331e42e9 e0fa2c2700 +Nyall Dawson 2018-02-23 + + Merge pull request #6409 from nyalldawson/fix_18065 + + Revert "fix and bring back scroll area into custom widgets" + +Nyall Dawson 2018-02-22 + + Partially revert "fix and bring back scroll area into custom widgets" + + This reverts commit 5dce8edb95fc2432dedcac3d860bd5d46b16a436. + + The custom widget is still causing isseus - refs #18065 + +Robert Szczepanek 2018-02-23 + + [TRANSUP] pl: new translator + +Nyall Dawson 2018-02-23 + + [layouts] Fix grids are not visible on restoring projects + + Fixes #18177 + +arnaud.morvan@camptocamp.com 2018-02-22 + + Increase snapping tolerance maximum in advanced mode. Fix #18133 + +Merge: e155522871 3283afd33d +Nyall Dawson 2018-02-23 + + Merge pull request #6404 from slarosa/cursor_size_fix + + Fixes #18043: Zoom and identify tools very small on MacOSX with retina display + +Nyall Dawson 2018-02-23 + + [processing] Pressing enter in search box executes the selected algorithm + +Nyall Dawson 2018-02-23 + + [processing] When searching in toolbox, automatically select + the first visible algorithm if the previously selected item + was hidden + + Avoids hidden selections in the toolbox + +Merge: 23951f3f10 92060a887a +Borys Jurgiel 2018-02-22 + + Merge pull request #6422 from borysiasty/nicer_manager + + [Plugin manager] A little bit nicer details view + +Borys Jurgiel 2018-02-22 + + [Plugin manager][needs-doc] Follows up 454a93606a: Improved plugin details display style. Doesn't really needs doc, just for better screenshots + +Borys Jurgiel 2018-02-22 + + [Plugin manager] Tabular layout for the details view + +Borys Jurgiel 2018-02-22 + + [Plugin manager] Slightly polished style of the details view + +Werner Macho 2018-02-22 + + Update tsstat.pl + + correct arry + +Merge: 81d8625f73 99e437ce0a +Werner Macho 2018-02-22 + + Merge pull request #6416 from SrNetoChan/patch-4 + + Adds Portuguese translator + +Alexandre Neto 2018-02-22 + + Adds Portuguese translator + +Merge: e06e95c255 31df608498 +Alessandro Pasotti 2018-02-22 + + Merge pull request #6407 from elpaso/bugfix-18099-wfs-operations-xref-2 + + [bugfix] Support Distributed Computing Platform (DCP) for WFS + +Merge: 5eb3e6b099 5e70e962f7 +Hugo Mercier 2018-02-22 + + Merge pull request #6413 from mhugo/master + + Fix call to representValue in identifydialog (refs #17175) + +Alessandro Pasotti 2018-02-22 + + Also use DCP for transaction (if available) + + Also QgsDebugMsg->Level + +Nathan Woodrow 2018-02-22 + + Save variables are key value in settings (#6411) + + * Save variables are key value in settings + + This allows variables to be set in qgis_global_settings.ini correctly. + + This used to be a list of names and then a list of values making it + impossible to set and override. + +Alessandro Pasotti 2018-02-22 + + Fix port for WFS server integration tests + +Hugo Mercier 2018-02-22 + + Fix call to representValue in identifydialog (refs #17175) + + This should fix the problem of queries with WHERE (id = 'NULL') when the + string 'NULL' cannot be converted to integer / uuid, as seen with + relation reference widgets. + +Merge: 2973e85f1d 86a48e4762 +Borys Jurgiel 2018-02-22 + + Merge pull request #6406 from borysiasty/master + + [Plugin manager] Display available and installed version origins in tooltips + +Nyall Dawson 2018-02-22 + + "Fix" crash in attribute table field calculator + +Merge: 6b2d3eea03 78c79a9243 +Nyall Dawson 2018-02-22 + + Merge pull request #6383 from Fanevanjanahary/key + + [dbmanager] fix shortcut execute query + +Nyall Dawson 2018-02-22 + + String fix + +Juergen E. Fischer 2018-02-22 + + fix translation strings + +Merge: 1eea857915 5af792c1f8 +Nyall Dawson 2018-02-22 + + Merge pull request #6408 from arnaud-morvan/processing_reload_fix + + Processing reload fixes + +Nyall Dawson 2018-02-20 + + Remove use of deprecated trUtf8 method + + This method was deprecated in Qt 5.0 - we need to remove + its use so that we can turn off the remaining Qt4 compatibility + switches. + +Merge: 835cca7cae 43350a9a3e +Nyall Dawson 2018-02-22 + + Merge pull request #6399 from nyalldawson/hide_dupe + + Hide 'duplicate features' actions by default + +David 2018-02-21 + + calculate mTwoCharSize + +arnaud.morvan@camptocamp.com 2018-02-21 + + [processing] Call toolbox.deleteLater to avoid slot calls after unload + +arnaud.morvan@camptocamp.com 2018-02-21 + + [processing] Properly load basic providers + + Processing module should only register it's own basic providers. + Note that when reloading a plugin, subclasses of ProcessingProvider remains and new ones are added, + so in such cases QgsProcessingProvider.__subclasses__() return same provider class many times. + +arnaud.morvan@camptocamp.com 2018-02-21 + + [processing] Fix slot prototype in ModelerAlgorithmProvider. Fix #18162 + +Loïc Bartoletti 2018-02-21 + + Add shapeDigitizeToolbar to acceptable missing doc + +Alessandro Pasotti 2018-02-21 + + Cosmetic fixes + +Alessandro Pasotti 2018-02-21 + + [bugfix] Support Distributed Computing Platform (DCP) for WFS + + Implement the possibility to specify different endpoints + for different WFS operations. + + With tests. + + Fixes #18099 WFS Capabilities handling problem + +David 2018-02-21 + + only decrease when larger than two signs + + and increase always. but decrease again only when more than the size of "00" difference. + +Borys Jurgiel 2018-02-21 + + [Plugin manager] Display origins of the available and installed version in a tooltip rather than inline' + +Loïc Bartoletti 2018-02-21 + + - Rename "Advanced Shape Digitize Toolbar" -> "Shape Digitize Toolbar" + - Rewrite ui_defaults.h + +Nyall Dawson 2018-02-21 + + [processing] More string HIG fixes + +Nyall Dawson 2018-02-21 + + More dialog title HIG fixes + +Nyall Dawson 2018-02-21 + + [processing] Add direct action to open an existing model in editor + +Nyall Dawson 2018-02-21 + + [processing] Fix some message box titles + +David 2018-02-21 + + fix indentation + +Salvatore Larosa 2018-02-21 + + Fixes #18043: Zoom and identify tools very small on MacOSX with retina display + +David 2018-02-21 + + only change size when difference > 4 + + to avoid the flickering + +Nyall Dawson 2018-02-21 + + [processing] Fix dependency calculation for model child algs + +Felis Pimeja 2018-02-21 + + Updated and vectorized several icons (#6382) + +Merge: bb08b64a03 6759993742 +Chris Crook 2018-02-21 + + Merge pull request #6400 from ccrook/delim_text_ui_crs + + Delim text ui crs + +Chris Crook 2018-02-21 + + Fixing up code indentation and removing spacer in dialog + +Merge: 6573eb30e7 ed99ba9d08 +Nyall Dawson 2018-02-21 + + Merge pull request #6398 from DelazJ/QMessageBoxTitles + + Updating some dialogs caption + +nirvn 2018-02-21 + + [processing] small fix in the MultipleLayerWidgetWrapper wrapper + +Nyall Dawson 2018-02-21 + + Hide 'duplicate features' actions by default + + Since there's a number of serious outstanding issues with these + tools, hide them by default and show them only if a QgsSettings + flag is set ("tools\showDuplicateFeatureActions"). + + This allows the tools to be reworked for 3.2, while still + making them accessible for users who require their functionality. + +Harrissou Sant-anna 2018-02-21 + + Updating some dialogs caption + +Nyall Dawson 2018-02-21 + + [processing] Split multiparts and explode are feature based algorithms + +Nyall Dawson 2018-02-21 + + [processing] Tweak api for QgsProcessingFeatureBasedAlgorithm + + Instead of returning a single QgsFeature from processFeature, we now + return a list of features. + + This allows feature based algorithms which return multiple features + per input feature, e.g. "explode" type algorithms which split a + single input feature into multiple output features. + +Juergen E. Fischer 2018-02-20 + + fix warning + +Merge: 348b0cf884 2dece58b67 +Jürgen Fischer 2018-02-20 + + Merge pull request #6394 from neteler/patch-75 + + Add grass74 support + +Chris Crook 2018-02-20 + + Clear delimited text source fields after adding to show something has happened + +Chris Crook 2018-02-19 + + Add CRS to delimited text source select. Fixes #11520 + +Martin Dobias 2018-02-20 + + Warn user when trying to move or delete selected features outside of map view (#6092) + + Sometimes users may inadvertently move/delete features they are not aware + of being selected. If that is the case, extra warning message box will be shown + for confirmation. + + Does not apply for deletion from attribute table - it is assumed that features + do not need to be visible when deleting from attribute table. + + In QgisApp::deleteSelected() method the last argument was not used anymore, + so I have replaced it by the "checkFeaturesVisible" argument. + +Loïc Bartoletti 2018-02-20 + + - Rename Regular Shape Digitize Toolbar to Advanced Shape Digitize + Toolbar + - Homogenize this toolbar like the others + - Not enabled by default + +rldhont 2018-02-20 + + [BUGFIX][Server] WFS GetFeature GML: segfault with geometry null + +Denis Rouzaud 2018-02-20 + + Qt 5.7 dropped pyqtWrapperType (#6393) + + version would need double check though + +Markus Neteler 2018-02-20 + + Add grass74 support + + GRASS GIS 7.4 is the current stable version, support added + +Denis Rouzaud 2018-02-20 + + add Q_ENUM for QgsRasterProjector::Precision + +Denis Rouzaud 2018-02-20 + + Revert "fix build with grass" + + This reverts commit e5c9092a4cc5f4ddc0e424294a6e8b3fc44ed589. + +Nyall Dawson 2018-02-20 + + Fix memory leak in task manager widget + +Merge: e3fbb4cbe8 7980f307eb +Nyall Dawson 2018-02-20 + + Merge pull request #6370 from nyalldawson/afs + + ArcGIS feature server: implement provider test suite and fix issues + +Nyall Dawson 2018-02-20 + + Spelling + +Nyall Dawson 2018-02-20 + + [afs] Add unit test for metadata + +Nyall Dawson 2018-02-20 + + [afs] Auto populate layer metadata from provider metadata + +Nyall Dawson 2018-02-20 + + Fix links are doubled in metadata widget + +Nyall Dawson 2018-02-20 + + [afs] Use faster bounding box checks where possible + +Nyall Dawson 2018-02-20 + + Add a bounding box intersection test to QgsGeometry + + We only previously had methods for exact intersections - this + commit adds a new QgsGeometry.boundingBoxIntersects() method + which can be used to test if just the bounding boxes of + geometries/rectangles intersect. + + It's fast, and doesn't care about invalid geometries (unlike + the exact intersects checks) + +Nyall Dawson 2018-02-20 + + [afs] More responsive cancelation for feature requests + +Nyall Dawson 2018-02-20 + + Avoid redundant error + +Nyall Dawson 2018-02-20 + + [afs] Don't request intersecting features from server if all + features are already locally cached + +Nyall Dawson 2018-02-19 + + [afs] Correctly advertise SelectAtId capability + + Big speedup for attribute table loading with provider + +Nyall Dawson 2018-02-19 + + [afs] Support interruption requests on feature iterator + + Results in a huge increase in responsiveness when working with + large AFS layers + +Nyall Dawson 2018-02-19 + + [afs] Add unit test for non OBJECTID named id fields + +Nyall Dawson 2018-02-15 + + [afs] Handle layers where the id field is not named "objectid" + +Nyall Dawson 2018-02-15 + + [afs] Don't list layers with no Query capability in AFS source select + + Since these layers cannot be queried or added to the map and should + be added as mapserver layers instead. + +Nyall Dawson 2018-02-19 + + [afs] Fix/optimise handling of filter rect feature requests + + Before a filter rect request would usually force fetching every + single feature from the server before the request could be + complete. + + Instead, if a filter rect is passed we first obtain a list + from the server of matching features within this rect, and + then iterate only over those. + + Fixes broken (multi-minute hang) identify tool use on AFS + layers. + +Nyall Dawson 2018-02-19 + + Try to fix test which fails only on Travis + +Nyall Dawson 2018-02-19 + + [afs] Don't lock shared data whilst fetching remote data + + Since the fetch can be slow, there's no need to lock other + afs threads while we wait for a particular set of results to + be fetched. + +Nyall Dawson 2018-02-19 + + Fix accidental test change + +Nyall Dawson 2018-02-18 + + More provider check handling of extra fields + +Nyall Dawson 2018-02-18 + + [afs] Ensure that null attributes are correctly mapped for PyQGIS + +Nyall Dawson 2018-02-18 + + Make feature source/provider test handle additional fields + +Nyall Dawson 2018-02-18 + + [afs] Fix crash when requesting invalid feature ID + +Nyall Dawson 2018-02-18 + + [afs] Fix provider ignores FilterFids requests and returns + incorrect features + +Nyall Dawson 2018-02-18 + + [afs] Remove unused code + +Nyall Dawson 2018-02-18 + + Better geometry memory management for afs provider + +Nyall Dawson 2018-02-18 + + [afs] Correctly convert attribute values to field type + + Avoids AFS provider returning double values for integer + and long field types + +Nyall Dawson 2018-02-18 + + Avoid some detaches in AFS iterator + +Nyall Dawson 2018-02-18 + + Don't try to run provider tests which require subsetStrings on providers which don't support them + +Nyall Dawson 2018-02-18 + + Simplify QgsVectorDataProvider::fillMinMaxCache() + +Nyall Dawson 2018-02-18 + + Exempt AFS provider from certain provider tests + +Nyall Dawson 2018-02-17 + + [afs] Correctly return an invalid feature from closed iterators + +Nyall Dawson 2018-02-17 + + Start implementing the provider test suite for ArcGIS Feature Server provider + +Nyall Dawson 2018-02-16 + + [afs] Fix provider incorrectly overrides provider name and description + with layer name and description + +Merge: 2571de37bb 1da2da219a +Nyall Dawson 2018-02-20 + + Merge pull request #6390 from nyalldawson/provider_metadata + + Support reading layer metadata from data provider + +Nyall Dawson 2018-02-20 + + Fix build + +Nyall Dawson 2018-02-20 + + Followup 0548f4, fixes to layer metadata and metadata widget + + Address outstanding review requests so that this PR can be merged + +mj10777 2018-02-05 + + Added QgsLayerMetadata logic to QgsDataProvider. Added setMetadata in QgsVector/RasterLayer::setDataProvider. Corrections in QgsMetadataWidget with added get/setMetadata and hasChanged functions plus checking for set mLayer pointer before use. + +Nyall Dawson 2018-02-16 + + Fix some undersized widgets on hidpi win builds + +Nyall Dawson 2018-02-20 + + [processing] Fix algorithm help link in modeler + + Fixes #18147 + +Nyall Dawson 2018-02-20 + + [processing] Fix raster layers shown as inputs for certain vector algs + + Fixes #18148, #18149 + +Nyall Dawson 2018-02-20 + + [processing] Select by expression/attribute can run on geometryless layers + +Merge: 39cb0fbfd0 4b5fc40379 +Nyall Dawson 2018-02-20 + + Merge pull request #6369 from slarosa/fix_18118_crash + + [welcomepage] fixes #18118 remove last item causes a crash + +Juergen E. Fischer 2018-02-19 + + proj5: show proj version qgis was built with and the version it's running with + +Juergen E. Fischer 2018-02-19 + + fix build with grass + +Juergen E. Fischer 2018-02-19 + + fix some references to PROJ.4 + +Nyall Dawson 2018-02-19 + + Use first feature in layer to generate symbol preview icon in widget + + Uses the first feature found in a layer in order to create a better + preview for the symbol in the symbol selector dialog. This allows + data defined settings to be evaluated correctly (at least, for the + first feature) and avoids missing previews due to missing + attribute values when data defined settings are present. + + Fixes #17061 + +Denis Rouzaud 2018-02-19 + + [delete part] use snapping index to find part + +Denis Rouzaud 2018-02-19 + + Qt 5.5 prefers Q_FLAG over Q_FLAGS + + this also allow to use QMetaEnum for flags + +Denis Rouzaud 2018-02-19 + + use Qgsettins::enumSettingValue where possible + +Denis Rouzaud 2018-02-19 + + extend QgsSettings::enumSettingValue to handle flags (with test) + +Denis Rouzaud 2018-02-19 + + [sipify] fix Q_FLAG declaration + +Juergen E. Fischer 2018-02-19 + + api doc: 2.18 is also LTR + +Juergen E. Fischer 2018-02-19 + + api doc: add link to python version + +Denis Rouzaud 2018-02-19 + + [offset] warn user when layer has Z/M geometries + +Denis Rouzaud 2018-02-19 + + [offset] meter limit min to 1, quadrant segments min to 1 + +Merge: a7ca742d30 ea9480ef0a +Sandro Mani 2018-02-19 + + Merge pull request #6301 from manisandro/qt5.10 + + Initial workaround for Qt5.10 instability + +Faneva 2018-02-19 + + [dbmanager] fix shortcut execute query + +Sandro Mani 2018-02-09 + + Don't set focusProxy in QgsCollapsibleGroupBoxBasic when compiled against Qt5.10+, it causes crashes + +Denis Rouzaud 2018-02-18 + + fix double/int comparison + +Denis Rouzaud 2018-02-18 + + tweak match from nearestEdge to return an Area type + + also make that VisitorArea return the given point as the match point + +Denis Rouzaud 2018-02-18 + + add test for QgsPointLocator::nearestArea + +Denis Rouzaud 2018-02-18 + + snapToCurrentLayer correctly handles Area type + +Denis Rouzaud 2018-02-18 + + revert adding tolerance to QgsSnappingUtils::snapToCurrentLayer + + since it already uses digitizing settings + +Merge: a303ef5ab7 19328dda92 +Nathan Woodrow 2018-02-19 + + Merge pull request #6379 from NathanW2/browser_sort_order + + Better sort order for browser node + +Nathan Woodrow 2018-02-19 + + Change order of XYZ tiles + +nirvn 2018-02-07 + + fix disabled map unit widgets when opening project prop. dialog + (fixes #17208) + +nirvn 2018-02-19 + + [layouts] improve default window state for reports + +nirvn 2018-02-19 + + [layouts] hide atlas/report items in the window right-click menu + +nirvn 2018-02-19 + + [layouts] add missing items in the toolbars sub-menu + +nirvn 2018-02-19 + + [layouts] sort panels and toolbars sub-menus + +nirvn 2018-02-19 + + [layouts] improve right-click popup menu + - as with the main window, show bold titles + - sort toolbars and panels alphabetically + +Merge: d7edf6c58a 3a6eac233c +Alessandro Pasotti 2018-02-19 + + Merge pull request #6187 from DelazJ/rulebaseDialog + + Show "Edit rule" dialog instead of widget when in Layer properties dialog + +Juergen E. Fischer 2018-02-19 + + fix e606b795d + +Merge: 89259e85f7 3e0b6a3c1b +Alessandro Pasotti 2018-02-19 + + Merge pull request #6167 from DelazJ/DBManagerQueryDialog + + [DB Manager]Allow preset query combobox to expand + +Nyall Dawson 2018-02-19 + + [layouts] Move responsibility for matching map colors to project + background color to app + + This fits better in app - the silent auto setting of background + colors should not apply to scripts manually creating QgsLayoutItemMap + items. + +Nyall Dawson 2018-02-19 + + [layouts] Remove use of QStyleOptionGraphicsItem from QgsLayoutItem API + + Turns out the useful methods in QStyleOptionGraphicsItem were deprecated + in Qt 5.10. To future protect our API this replaces all public + use of QStyleOptionGraphicsItem, so that we're free to revise + the internals of how we use QStyleOptionGraphicsItem without breaking + the public QGIS API. + +Merge: 627a590c9b d830821b13 +Nyall Dawson 2018-02-19 + + Merge pull request #6375 from nyalldawson/interupt + + Remove QgsInterruptionChecker and replace with QgsFeedback + +Nyall Dawson 2018-02-19 + + Fix geometry checker cannot export errors to gpkg + + Fixes #18128 + + Also exposes other format choices in dialog + +Nathan Woodrow 2018-02-19 + + Better sort order for browser node + +Nyall Dawson 2018-02-19 + + Fix uuid() function returns the same uuid + + Fixes #18130 + +Nyall Dawson 2018-02-19 + + Prepare expression for faster field calculation in attribute table dialog + +Nathan Woodrow 2018-02-19 + + [FIX] Fix loading projects with . in name + + At least on Windows 2.18.qgs is a valid name for a file. + +Nyall Dawson 2018-02-19 + + Remove QgsInterruptionChecker and replace with QgsFeedback use + + There's little need for two classes with similar goals here. + +Nyall Dawson 2018-02-19 + + Remove unused QgsVectorLayerInterruptionCheckerDuringCountSymbolFeatures class + +Juergen E. Fischer 2018-02-18 + + add missing copyright headers + +Juergen E. Fischer 2018-02-18 + + update_ts.sh: fix selective download of translations + +Juergen E. Fischer 2018-02-18 + + update translation strings + +Merge: 03354eea09 28e282ac02 +Jürgen Fischer 2018-02-18 + + Merge pull request #6373 from DelazJ/QMessageBoxTitles + + Fix message box title + +Juergen E. Fischer 2018-02-18 + + INSTALL is a output file (followup 1dd6db384f) + +Harrissou Sant-anna 2018-02-17 + + Fix message box title + +Webmaster 2018-02-18 + + [needs-docs][layout] rename command history to undo history + +Webmaster 2018-02-18 + + [layout] use nicer default state and geometry + +Webmaster 2018-02-18 + + [ui] update default windows state and geometry + +Webmaster 2018-02-18 + + [ui] update mkuidefaults.py script + +Merge: 6c64c5a586 53aafb4803 +Blottiere Paul 2018-02-18 + + Merge pull request #5823 from pblottiere/bugfix_curvedstrings_z + + [bugfix] Fixes #17576 and #17574 Add Z support and fixes crashes + +Salvatore Larosa 2018-02-17 + + [welcomepage] fixes #18118 remove last item causes a crash + +Denis Rouzaud 2018-02-17 + + fix spelling + +Denis Rouzaud 2018-02-17 + + [offset tool] fix #18115 improved offset calculation + + * use QgsGeometry::contains for polygons (contains => negative offset) + * use the geometry part and not the whole geometry to find closest segment + +Denis Rouzaud 2018-02-17 + + test geometry validity before applying offset + +Denis Rouzaud 2018-02-17 + + improve test for QgsSettings::enumSettingValue + +Denis Rouzaud 2018-02-17 + + make QgsTolerance a Q_GADGET + + to use Q_ENUM + +Denis Rouzaud 2018-02-16 + + [offset tool] handle rings and allow selecting by area + + * correctly handles rings and parts + * allow to select polygon by area (not only edge) + +Juergen E. Fischer 2018-02-17 + + drastically speedup update_ts.sh with Qt5's lupdate + +Merge: a8a449f8c1 91e98ef5a5 +Denis Rouzaud 2018-02-17 + + Merge pull request #6365 from 3nids/geom_gadget + + make QgsGeometry a Q_GADGET + +Salvatore Larosa 2018-02-17 + + [processing] fix variable name + +Salvatore Larosa 2018-02-17 + + [processing] fix execution of SAGA algorithms under macos + +Merge: 125370076f bda67ada90 +Denis Rouzaud 2018-02-17 + + Merge pull request #6364 from 3nids/setting_enum_value + + [settings] add method to get value for a setting associated to an enum + +Denis Rouzaud 2018-02-17 + + run sip_include.sh + +Denis Rouzaud 2018-02-17 + + add test for QgsSettings::enumSettingValue + +Juergen E. Fischer 2018-02-17 + + string truncations now uses ellipses (followup c3573b163) + +Juergen E. Fischer 2018-02-17 + + more translation string fixes and updates + +Merge: dedfb5ccb6 b3b17b6557 +Jürgen Fischer 2018-02-17 + + Merge pull request #6329 from DelazJ/QMessageBoxTitles + + Fix some message boxes titles + +Felis Pimeja 2018-02-17 + + Updated and vectorized several icons (#6362) + + mActionFileExit + repositoryUnavailable + repositoryDisabled + repositoryConnected + mActionRefresh + mIconDelete + mActionRemoveSelectedFeature + mActionFromSelectedFeature + +Harrissou Sant-anna 2018-02-17 + + More message box fixes + +Nyall Dawson 2018-02-16 + + Update test + +Nyall Dawson 2018-02-16 + + [processing] Always report errors if features cannot be written + to a destination + + Before we silently ignored these - now algorithms will automatically + push errors to the log if a feature cannot be written to a sink (no + changes to algorithms or special handling required) + +Nyall Dawson 2018-02-17 + + Try to fix postgres provider handling of missing attributes + +Nyall Dawson 2018-02-17 + + Correct test + +Nyall Dawson 2018-02-17 + + Add test that providers always accept features with null geometry + +Nyall Dawson 2018-02-17 + + Rollback rejection of features with too many attributes + + Turns out editable joins rely on this situation. Instead change + the providers to warn on this occurance, and make the memory + provider alone truncate the extra attributes (since it doesn't + have an external backend or disk based format which natively + applies this truncation) + +Nyall Dawson 2018-02-17 + + Fix test + +Nyall Dawson 2018-02-17 + + Fix adding features with geometry to geometryless memory layer + +Nyall Dawson 2018-02-17 + + Add provider test to ensure providers reject adding features + with geometry type mismatch + +Nyall Dawson 2018-02-17 + + Ensure ogr, postgis and memory providers reject features + with too many attributes + +Nyall Dawson 2018-02-17 + + Add provider test to ensure that adding features to a provider + with MORE attributes than expected results in a failure + + We need to flag these and not silently discard the extra + attributes resulting in loss of information -- if thisi + situation occurs there's a deeper bug present whic + needs to be addressed. + +Juergen E. Fischer 2018-02-17 + + Adapt packaging to c988dd291 + +Denis Rouzaud 2018-02-16 + + make QgsGeometry a Q_GADGET + + so Q_ENUM can be used + +Denis Rouzaud 2018-02-16 + + [settings] add method to get value for a setting associated to an enum + + this will make sure the returned value is actually an existing entry of the enum + +Alessandro Pasotti 2018-02-16 + + Fix raster layer names in geopackage browser data items + +Blottiere Paul 2018-02-16 + + Z value from snapped point is kept + +Nyall Dawson 2018-02-16 + + Fix memory provider handling of missing attributes when adding features + + Ensure that features added to a memory provider (and returned when + fetching features from a memory provider) always have the correct + number of attributes present. + + Fixes many random behavior bugs when working with memory providers. + +Nyall Dawson 2018-02-16 + + Add provider test to ensure that features added with missing attributes + are transparently padded out with NULL attributes to the required fields + length + + Currently the behavior is inconsistent - some providers reject these + features, others pad them out, and worse -- some add them with + missing attributes (memory provider), causing ALL sorts of flow-on, + difficult to debug issues. + +Merge: 0310c1d253 f3349616fa +Alessandro Pasotti 2018-02-16 + + Merge pull request #6356 from elpaso/bugfix-17721-color-picker + + [bugfix] Restore color picker from layer styling panel + +Blottiere Paul 2018-01-29 + + Fixes build + +Blottiere Paul 2018-01-15 + + Fix spelling check and sip binding + +Blottiere Paul 2018-01-15 + + Drop z dimension in case of circle from tangential points + +Blottiere Paul 2018-01-15 + + Update documentation + +Blottiere Paul 2018-01-15 + + Take into account z dimension from center points + +Blottiere Paul 2018-01-05 + + Some clean + +Blottiere Paul 2018-01-05 + + The first point in 3D is used to propagate Z dimension + +Blottiere Paul 2018-01-05 + + Add some tests for regular polygon map tools + +Blottiere Paul 2018-01-05 + + Add some tests for ellipse map tools + +Blottiere Paul 2018-01-05 + + Add some tests for ellipse map tools + +Blottiere Paul 2018-01-05 + + Add some tests for circle map tools + +Blottiere Paul 2018-01-05 + + Add some tests for circular string map tools + +Blottiere Paul 2018-01-05 + + Fixes variables' names + +Blottiere Paul 2018-01-04 + + Add test for z values on QgsMapToolAddFeature with LineStringZ + +Blottiere Paul 2017-12-07 + + Add Z support to AddRegularPolygon map tools + +Blottiere Paul 2017-12-07 + + Add Z support for AddRectangle map tools + +Blottiere Paul 2017-12-07 + + Add Z support for AddEllipse map tools + +Blottiere Paul 2017-12-07 + + Rename pointFromPointXY to fromPointXY + +Blottiere Paul 2017-12-07 + + Fixes crash in map tool + +Blottiere Paul 2017-12-07 + + Add Z support for AddCircle map tools + +Blottiere Paul 2017-12-07 + + Fixes #17574 Add Z support in AddCircularString map tools + +Blottiere Paul 2017-12-07 + + Fixes #17576 Avoid crash during node editor cleanup + +Alessandro Pasotti 2018-02-16 + + Change button color when picking around + + So that we have a consistent behavior with the + Sample Color action. + +Merge: 14787ffb32 26edd8ac8e +Alessandro Pasotti 2018-02-16 + + Merge pull request #6354 from elpaso/NathanW2-settings_17670 + + Nathan w2 settings 17670 + +Nyall Dawson 2018-02-16 + + [processing] Add easy method to retrieve layers from context + + Allows python algorithms to call + + layer = context.getMapLayer(other_alg_results['OUTPUT'] ) + +Juergen E. Fischer 2018-02-16 + + debian nightlies: ignore dash submission errors + +Alessandro Pasotti 2018-02-16 + + Check for application instance before calling init + +nirvn 2018-02-16 + + followup 6dfedc3, fix processing tests + +Merge: 838bde33ab 2c6100ea20 +Nyall Dawson 2018-02-16 + + Merge pull request #6316 from nyalldawson/locator_thread + + Make QgsLocator more thread safe + +Nyall Dawson 2018-02-14 + + [dbmanager] Workaround Python error when vacuuming spatialite table + + Workaround https://bugs.python.org/issue28518 + + Fixes #18079 + +Merge: b6111d296e 5c40975fe7 +Nyall Dawson 2018-02-16 + + Merge pull request #6353 from nyalldawson/proc_normalize + + [processing] Don't replace " with ' when handling layer paths + +Juergen E. Fischer 2018-02-16 + + fix 6dfedc38 + +Juergen E. Fischer 2018-02-15 + + translation string fixes and cleanups + +Alessandro Pasotti 2018-02-15 + + [bugfix] Restore color picker from layer styling panel + + Fixes #17721 + + Successfully tested on Windows 10 and Linux with Qt 5.10 + +Alessandro Pasotti 2018-02-15 + + [server] Stop messing with app initialization paths + +Alessandro Pasotti 2018-02-15 + + Remove debug output from stdout + +Alessandro Pasotti 2018-02-15 + + Add init() to QGSTEST_MAIN + + Now that it's not called from ctor anymore + +Marco Hugentobler 2018-02-15 + + Fix warning + +nirvn 2018-02-15 + + [processing] fix python error with OSM vector layers + +Merge: 19ab0c86ec 0e14a46ec8 +Alessandro Pasotti 2018-02-15 + + Merge pull request #6344 from elpaso/bugfix-18084-save-as-titles + + [bugfix] Homogenize the vector and raster dialog titles + +Alessandro Pasotti 2018-02-15 + + Spelling and docs + +Merge: aa8b629682 dd5448f8bf +Werner Macho 2018-02-15 + + Merge pull request #6352 from OSGeo-jp/tr30 + + [tr] Add a Japanese translator + +Juergen E. Fischer 2018-02-15 + + osgeo4w: remove explicit setting of QGISDEBUG + +Alessandro Pasotti 2018-02-15 + + ... -> Ellipsis + +Nyall Dawson 2018-02-15 + + [processing] Avoid losing static, user-entered parameter values + in model child algorithms + + Prior to this change if you edited an algorithm in a model and + tried to enter a preset string for certain parameter types, this + string would get silently discarded on closing the dialog. E.g. + with a dissolve algorithm it was not possible to have a fixed + field name within the model to dissolve by. + + This was caused by WidgetWrapper.comboValue returning the customData + for these manually entered values in the parameters combo box, + yet manually entered values never have custom data. + + To work around this we only return the custom data if its + set for the selected item - otherwise we return the text unchanged. + In order to handle the "[not set]" options, a new static custom + data value of WidgetWrapper.NOT_SET_OPTION is added to that + comboValue can detect this and return the appropriate None value. + +Nyall Dawson 2018-02-15 + + [processing] Ensure algorithms which add attributes to features + always add a consistent amount of attributes regardless of the + code paths taken + + Some algorithms were adding features to data providers with + different number of attributes vs the layer's fields - this is + not supported and depending on the data provider will have + different (bad) results. + +Nyall Dawson 2018-02-15 + + [processing] Don't replace " with ' when handling layer paths + + Since netcdf, and possibly other gdal drivers, use layer uris + of the format NETCDF:"/tmp/test.nc":var1 we can't safely + remove or reformat these quotations. + +Minoru Akagi 2018-02-15 + + Add a Japanese translator + +Nyall Dawson 2018-02-15 + + [processing] Don't throw an exception if an expression cannot + be prepared + + There's cases where this happens without reflecting an invalid + expression. So we can try to prepare, but not abort if the + preparation fails. + + Fixes #18103 + +nirvn 2018-02-15 + + [ui] sort items in the view > panels sub-menu + +nirvn 2018-02-15 + + [needs-docs][ui] harmonize title of panels + +Nyall Dawson 2018-02-15 + + Ensure QgsMapLayer private QObject members are correctly parented + to the layer + +Nyall Dawson 2018-02-15 + + [processing] Much faster random points in polygon by using + prepared geometries + +Nyall Dawson 2018-02-15 + + [processing] Misc fixes and improvements to Random Points in Polygons + + - Fix missing format call for string when calculated number + of points is 0 + - Fix incorrect progress reports which were spamming the dialog + and causing UI hangs, and slow algorithm execution + +Nyall Dawson 2018-02-15 + + [processing] Add some missing sources to expression contexts + +Nyall Dawson 2018-02-15 + + Fix Python exception in Random Points in Polygon alg + + Fixes #18103 + +Alessandro Pasotti 2018-02-14 + + [bugfix] Homogenize the vector and raster dialog titles + + Fixes #18084 + +Juergen E. Fischer 2018-02-14 + + nightlies: also submit build errors to dash + +Mathieu Pellerin 2018-02-14 + + [attribute table] fix long UI freeze when resizing columns for large filtered datasets (#6341) + +Merge: b664f12ed6 256e4419b2 +mhugent 2018-02-14 + + Merge pull request #6334 from mhugent/dxf_mtext_escape_spaces + + Escape blanks in MTEXT and add unit test + +Merge: 5cd452a64d 8ceb6fc007 +Alexander Bruy 2018-02-14 + + Merge pull request #6340 from nyalldawson/batch_layer_name + + [processing] In batch dialog, use layer names for input layers + +Nyall Dawson 2018-02-14 + + [processing] In batch dialog, use layer names for input layers + if they are unique in the current project + + Instead of always using the layer id, which is generally + gibberish and meaningless for users, instead prefer to use + the layer name as an input in the batch processing dialog. This + is done only if the name is unique within the current project's + loaded layers. + + This change makes the dialog more user-friendly, but more importantly + it means that autofilling output values based on an input layer + parameter generates more meaningful automatic output file names. + +Nyall Dawson 2018-02-14 + + Slightly shift default outline back toward black + + Original commit shifted it a bit too light + +Nyall Dawson 2018-02-14 + + [needs-docs] Rework arrangement of buttons in categories tab in + metadata editor to make their operation more self-explanatory + for users. + + Also add tooltips to the buttons describing their function, and + allow the buttons to operate on multiple selected rows at once. + + Fixes #18090 + +nirvn 2018-02-13 + + [needs-docs][processing] update raster calculator help to reflect updated logic + +Merge: 231dae3124 abeef2573c +Salvatore Larosa 2018-02-13 + + Merge pull request #6192 from slarosa/fix_shortcut_macos + + Fix displaying keyboard shortcut under macos + +Salvatore Larosa 2018-02-13 + + macOS: fix shortcut even for processing tool button + +Salvatore Larosa 2018-01-28 + + shortcut config. dialog: display correctly keysequence on macOS + +Salvatore Larosa 2018-01-28 + + display correctly keyboard shortcut in toolbar tooltip under macOS + +Marco Hugentobler 2018-02-13 + + Escape blanks in MTEXT and add unit test + +Denis Rouzaud 2018-02-13 + + various fixes to rotation map tool + + * do not go through the user input to do the rotation (avoid rounding in spin box, except when magnet is on) + * allow to escape the tool by pressing ESC even when user input lost focus + +Denis Rouzaud 2018-02-13 + + fix offset side for polygons + +Denis Rouzaud 2018-02-12 + + fix invalid value for offset_join_style in main options + +Denis Rouzaud 2018-02-12 + + add advanced config to offset map tool widget + + fix #14750 + +Denis Rouzaud 2018-02-12 + + various fixes to the offset map tool + + code has been refactored, hopefully things are clearer now + fix #17367 + fix #14751 + +nirvn 2018-02-13 + + [ui] resize statistical summary columns to content + +Merge: fc51b82f5c c996c61789 +mhugent 2018-02-13 + + Merge pull request #6331 from mhugent/dxf_label_layers_v3 + + Fix dxf export for label layers and add unit test + +Harrissou Sant-anna 2018-02-13 + + [save as vector] use the save/restore geomtry API + +Nyall Dawson 2018-02-13 + + More capitalization homogenization + +Nyall Dawson 2018-02-13 + + [dbmanager] Fix python error when scrolling postgis results + + Fixes #17835 + +Nyall Dawson 2018-02-13 + + Fix python error when trying to export db manager table + +Nyall Dawson 2018-02-13 + + [dbmanager] Fix inconsistent capitalization, HIG violations, + and unprofessional strings + +Nyall Dawson 2018-02-13 + + Fix invalid (deprecated) escape strings in db manager + +Nyall Dawson 2018-02-13 + + Fix undo stack does not correctly roll back geometry edits + in a granular manner + + Fixes #17658 + +Merge: 5c3a7554de 66b9b435b6 +mhugent 2018-02-13 + + Merge branch 'master' into dxf_label_layers_v3 + +Marco Hugentobler 2018-02-13 + + Fix dxf export for label layers and add unit test + +Harrissou Sant-anna 2018-02-13 + + Revert arg simplification attempt + +Harrissou Sant-anna 2018-02-13 + + Fix message boxes titles + +Nyall Dawson 2018-02-13 + + [processing] Fix destination files are silently ignored when relaunching + algorithms from the history panel + +nirvn 2018-02-13 + + [processing] harmonize results viewer action behavior + +Merge: 0c6f22386b bbf3ed9d4e +Nyall Dawson 2018-02-13 + + Merge pull request #6221 from nyalldawson/var_leak + + Fix massive memory leak in PyQGIS, pt 1 + +Nyall Dawson 2018-02-13 + + Drop some legacy sip conversion code + +Merge: 94b644e94a 2a7aeafb75 +Denis Rouzaud 2018-02-12 + + Merge pull request #6321 from 3nids/dxf_addlayers + + [dxf] use a struct instead of QPair for layers + +Denis Rouzaud 2018-02-12 + + doxygen, init in header + +Merge: ec86fcb168 03e49f1f65 +Alessandro Pasotti 2018-02-12 + + Merge pull request #6324 from qgis/revert-6320-try-to-fix-collapsible-crash-on-qt510 + + Revert "Try to fix QgsCollapsibleGroupBox crash on Qt 5.10" + +Alessandro Pasotti 2018-02-12 + + Revert "Try to fix QgsCollapsibleGroupBox crash on Qt 5.10" + +Denis Rouzaud 2018-02-12 + + [dxf] followup 31e93aecae fix server + +Denis Rouzaud 2018-02-12 + + [sip] remove unused QPair conversion + +Denis Rouzaud 2018-02-12 + + [dxf] use a struct instead of QPair for layers + + there was a crash in Python in QgsDxfExport.addLayers due to a bad conversion + +Merge: 9e79d8a7ad 3fac2aa391 +Jürgen Fischer 2018-02-12 + + Merge pull request #6169 from landryb/fix/desktopfile + + Don't hardcode the path to qgis binary in .desktop file + +Merge: 4ada4989e5 d4063e8b67 +Alessandro Pasotti 2018-02-12 + + Merge pull request #6320 from elpaso/try-to-fix-collapsible-crash-on-qt510 + + Try to fix QgsCollapsibleGroupBox crash on Qt 5.10 + +nirvn 2018-02-12 + + [processing] automatically open results viewer panel when items added + +nirvn 2018-02-12 + + [processing] offer hyperlink to file path in the results viewer + because users don't always get that there is a dbl-click action + against the tree view items. + +Alessandro Pasotti 2018-02-12 + + Try to fix QgsCollapsibleGroupBox crash on Qt 5.10 + + Automatic memory management: prevent button to be + deleted too early. + +Nyall Dawson 2018-02-12 + + Doxygen + +Nyall Dawson 2018-02-12 + + Simplify code + +Nyall Dawson 2018-02-12 + + Allow certain locator filters to operate on the main thread + + Some filters are fast enough to return results that it's overkill + to run them in a background thread - add a flag to these filters + to allow them to run (blocking) in the main thread instead. + +Nyall Dawson 2018-02-12 + + Fix error when running gdal algorithms through locator + +Nyall Dawson 2018-02-12 + + Add missing docs + +Nyall Dawson 2018-02-12 + + Make QgsLocator more thread safe + + - add a clone() method to filters, and always search using the + clone instead of the original filter + - add a prepare() method to filters, which is always run in the + main thread and can be used to prepare the filter for safe + background execution (e.g. creating feature iterators in advance) + - don't use QtConcurrent to perform searches in background threads, + since it is not safe to use with QObjects + - instead manually create threads and ensure that cloned objects + are always moved to the thread that they will run in, to ensure + that they correctly have thread affinity with the thread in which + they are executed + +Merge: 6096e5c25d fbc6e4d11d +rldhont 2018-02-12 + + Merge pull request #6285 from tudorbarascu/dpi + + fix server issue for double devicePixelRatio leading to DPI requests with decimals + +Martin Dobias 2018-02-10 + + Fix crash after running GDAL alg from processing (fixes #18004) + + This was happening only with GDAL trunk + + Processing first tries to load output as a vector, then as a raster + and output from raster algs would crash in OGR provider constructor + due to null pointer + +Merge: a7870afab1 3207600958 +Alessandro Pasotti 2018-02-12 + + Merge branch 'settings_17670' of https://github.com/NathanW2/QGIS into NathanW2-settings_17670 + +Tudor Bărăscu 2018-02-12 + + add Server DPI test + +Merge: e5d7733bfc 52f83b3409 +Alexander Bruy 2018-02-12 + + Merge pull request #6303 from alexbruy/help-logging + + log requested help URLs + +nirvn 2018-02-12 + + [processing] harmonize order of result panel (latest first) and add timestamp + +Nathan Woodrow 2018-02-12 + + Don't call init in QgsApplication + +Nathan Woodrow 2018-02-12 + + FIx + +Nathan Woodrow 2018-02-12 + + Move settings to resource folder + +Nathan Woodrow 2018-02-12 + + Lets try fix this + +nirvn 2018-02-12 + + partial revert of 5dc91b4 to fix regression (fixes #18073) + + setMaximumHeight() stays, so hopefully we are still protected + from infinit canvas redraw loop. + +Nyall Dawson 2018-02-12 + + Fix crash when repairing zero length linestring geometry + + Fixes #18077 + +Nyall Dawson 2018-02-12 + + Fix loss of checkbox widget settings when a default expression is set + + Fixes #18076 + +Merge: ac28714a40 9dca6da060 +Nyall Dawson 2018-02-12 + + Merge pull request #6312 from nyalldawson/field_exp_null + + Don't silently discard requests to set QgsFieldExpressionWidget to an empty expression + +Nyall Dawson 2018-02-12 + + Fix data defined properties in cluster/displacement renderer + do not evaluate for isolated features + + Fixes #18074 + +Nyall Dawson 2018-02-12 + + Don't silently discard requests to set QgsFieldExpressionWidget + to an empty expression + + This causes issues in lots of places - e.g. a field constraint + is always set to the first field in a layer, and cannot be + removed. + + I've looked at all calls to setField and without exception + they should accept that setting the field to an empty string + results in an empty expression. + + Fixes #14325 + +Merge: 2cbcf74ef2 24fb28f7bb +Nyall Dawson 2018-02-12 + + Merge pull request #6300 from nyalldawson/opts + + Misc optimizations for everything + +Nyall Dawson 2018-02-09 + + Avoid unused expression context updates in more places + +Nyall Dawson 2018-02-09 + + Don't generate symbol expression context scope when it's not + being used + + Refs #17809 + +Nyall Dawson 2018-02-09 + + Much more efficient QgsRectangle->QgsGeometry conversion + +Nyall Dawson 2018-02-09 + + More efficiency improvements for map to pixel simplification + + Refs #17809 + +Nyall Dawson 2018-02-09 + + Avoid cloning in QgsGeometry::convertToMultiType where possible + + Refs #17809 + +Nyall Dawson 2018-02-09 + + More efficient simplification of linestring geometries during rendering + + Refs #17809 + +Nyall Dawson 2018-02-09 + + Remove inefficient method for creating empty geometry of same + WKB type, and use optimized method instead + + Refs #17809 + +Nyall Dawson 2018-02-09 + + Provide an optimised constructor for a null QgsRectangle + + This is used a lot, yet the current constructor calls the + normalize() method which does a bunch of operations for no + result. + + So instead provide a simple optimised null QgsRectangle + constructor and save a lot of cycles. + + Refs #17809 + +Merge: c3a4b1170a bfe35c26ea +Denis Rouzaud 2018-02-11 + + Merge pull request #6304 from 3nids/pg_domain + + [postgres] fix domain not in public schema + +Denis Rouzaud 2018-02-11 + + [postgres] use pg_type rather than information_schema.domain_constraints to retrieve domain + + otherwise there is no warranty to retrieve the correct constraint as its name is not unique + +Merge: 367aba1766 178509347a +Alexander Bruy 2018-02-11 + + Merge pull request #6309 from alexbruy/processing-enums + + [processing] add enums support for fields and feature source parameters + +Alexander Bruy 2018-02-11 + + [processing] add enums support for fields and feature source parameters + (follow up 068d74d5) + +Alexander Bruy 2018-02-11 + + write to log when help location is not configured + +Merge: dd3ba34235 414c3a4bfe +Nyall Dawson 2018-02-11 + + Merge pull request #6308 from nyalldawson/multi_out + + [processing] Add explicit output type for multiple layers + +Alexander Bruy 2018-02-10 + + also log help "key" used to construct URI + +Alexander Bruy 2018-02-10 + + fix typos + +Alexander Bruy 2018-02-10 + + add default help location to the global settings (refs #17670) + +Alexander Bruy 2018-02-10 + + log requested help URLs + +Nyall Dawson 2018-02-11 + + Fix ui build warning + +Nyall Dawson 2018-02-11 + + Fix undefined behavior when closing layout designer + +Nyall Dawson 2018-02-11 + + Fix unavailable layer inputs for multi-layer inputs set to any map layer type + +Nyall Dawson 2018-02-11 + + [processing] Add multi layer outputs to Package Layers and Vector Split algorithms + +Nyall Dawson 2018-02-11 + + [processing] Add explicit output type for multiple layers + + This was a missing capability in the processing API - while algorithms + could declare multiple layer input parameters, there was no corresponding + multi-layer output. This meant that algorithms (such as Package Layers, + Vector Split) which create a set of layers which cannot be determined + in advance had no way to pass these generated layers on for further model + processing steps. + + It's also useful for algorithms which operate on a specified folder, + processing all layers found there, and allowing these generated + outputs to be utilised in other model steps (e.g. packaging + all of them, merging them, etc) + +Denis Rouzaud 2018-02-10 + + add test for postgres domains + +Denis Rouzaud 2018-02-10 + + [postgres] fix domain not in public schema + + fix #18053 + correctly set enumeration widget in case the domain is not in public schema + also fixes an issue if two domain with the same are present in two schemas + +Salvatore Larosa 2018-02-10 + + set name to feature action when shortName is not available + +Nyall Dawson 2018-02-10 + + Fix windows build warnings + +Nyall Dawson 2018-02-09 + + Show stacktrace in debug when hitting a GEOS exception + +Nyall Dawson 2018-02-09 + + Don't show group type layers in AFS source select + + These layers cause an error if you try to add them to QGIS. + + TODO: change source select to use a nested tree and correctly + add group layers as a parent for child layers. + +Nyall Dawson 2018-02-09 + + Fix qt warning throw by AFS provider due to invalid QString arg usage + + And make debug message about unsupported field types more useful + +Nyall Dawson 2018-02-09 + + Fix layer id sorting in ArcGIS rest source select dialogs + +Nyall Dawson 2018-02-09 + + Quieten some overlay debug noisy methods + +Merge: 6dbd0b950e e435d79d6c +Alessandro Pasotti 2018-02-09 + + Merge pull request #6294 from elpaso/bugfix-17845-take2 + + [bugfix] Try harder to fix raster properties color picker + +Alessandro Pasotti 2018-02-09 + + [mxe] Better packaging and fix Qt5 plugins path + +Nyall Dawson 2018-02-09 + + Fix incorrect layer type icons for some geopackage layers (e.g. curve types) + +Alessandro Pasotti 2018-02-08 + + Fixes #17845 tested on Linux KDE and Win 10 + +Nyall Dawson 2018-02-09 + + Implement manual locks on QgsSpatialIndex + + Since libspatialindex is not thread safe on all platforms, and + have expressed desire to remove the thread safety that they DO + have on remaining platforms, it's safer and easier for us + to manually add locks to QgsSpatialIndex and be gauranteed that + this class is thread safe on all platforms and libspatialindex + versions. + + Also improve docs for the class. + +Nyall Dawson 2018-02-06 + + Avoid deep copy of spatial index when features are fetched on + main thread + +Nyall Dawson 2018-02-06 + + Include job preparation time in layer rendering timer + + This prevents layers which are slow to prepare from rendering + in map preview jobs + +Nyall Dawson 2018-02-06 + + Fix memory layers with spatial index crash when rendering + + Fixes #17705 + +Nyall Dawson 2018-02-06 + + Add method to force a detach for QgsSpatialIndex + + Since the underlying libspatialindex is not thread safe + on some platforms (e.g. Windows), manual calls to detach() + must be made if a QgsSpatialIndex is to be accessed across + multiple threads. + + Note that for platforms on which libspatialindex is thread + safe, calling detach() has no effect and does not force the + deep copy. + +Nyall Dawson 2018-02-06 + + Fix deep copy of QgsSpatialIndexData + +Merge: 9302613f28 4bd385ff39 +Alessandro Pasotti 2018-02-09 + + Merge pull request #6292 from elpaso/mxe + + Scripts for cross build QGIS for windows on Linux with mxe + +Juergen E. Fischer 2018-02-09 + + fix #18066 + +Merge: 90cc17b934 068d74d51a +Alexander Bruy 2018-02-09 + + Merge pull request #6293 from alexbruy/processing-enums + + [processing] allow enums values to be used in description files + +Merge: bcb68dda54 2d1e9188f1 +Alexander Bruy 2018-02-09 + + Merge pull request #6298 from nyalldawson/fix_17231 + + [processing] Allow providers to return a different helpId() vs their unique id() + +nirvn 2018-02-09 + + [processing] fix batch input selection panel for multiple layers parameter + +nirvn 2018-02-09 + + [processing] only pass needed raster entries in QgsRasterCalculator constructor + +nirvn 2018-02-09 + + [raster calculator] use feedback when reprojecting raster block + +nirvn 2018-02-09 + + [processing] make output crs optional in the raster calculator + +nirvn 2018-02-09 + + [processing] use feedback object in raster calculator + +nirvn 2018-02-09 + + [processing] ressurect raster calculator and add CRS parameter + +Nyall Dawson 2018-02-09 + + [delimited] Don't reset geometry type from "No geometry" when + changing other settings + + Fixes #17971 + +Nyall Dawson 2018-02-09 + + [processing] Allow providers to return a different helpId() vs + their unique id() + + This is used when generating the QgsHelp url for algorithms + attached to the providers. + + Implement helpId overrides for the native and 3d providers so + that they return 'qgis' helpIds, meaning that all QGIS processing + algorithm documentation can be kept within the same url path + regardless of which QGIS provider library it sits within. + + This also allows us to freely move algorithms from the Python + 'qgis' provider to c++ 'native' provider in future releases + without breaking the help URLs. + + Fixes #17231 + +Nyall Dawson 2018-02-08 + + Always save newly created features, even if no attributes are + modified in the form popup after feature creation + + Fixes #18056 + +Alessandro Pasotti 2018-02-08 + + [mxe] autopep8 + +Alessandro Pasotti 2018-02-08 + + [mxe] Fix typos and qt.conf + +Alexander Bruy 2018-02-08 + + [processing] allow enums values to be used in description files + +Alessandro Pasotti 2018-02-08 + + [mxe] Add install instructions for mxe + +Alessandro Pasotti 2018-02-01 + + [mxe] Restore build + +Alexander Bruy 2018-02-08 + + Revert "[processing] throw error if no layers selected in raster calculator" + + This reverts commit c09c3018035eb7a4f47acbde7f3dae405ba444db. + +nirvn 2018-02-08 + + [raster calc] make use of qgsfilewidget and fix some labels + +nirvn 2018-02-08 + + [raster calc] use active layer to setup dialog to harmonize + the behavior with that of processing + +nirvn 2018-02-08 + + [raster calc] use new API to save/restore geometry + +nirvn 2018-02-08 + + [raster calc] use a monospace font for the expression editor (fixes #17556) + +nirvn 2018-02-08 + + [raster calc] cancelling the process should cancel the process + +Alessandro Pasotti 2018-02-01 + + [cmake] MXE build changes + +Juergen E. Fischer 2018-02-08 + + fix xenial build + +nirvn 2018-02-08 + + [attribute table] fix crash when adding creating a field on field-less layers + +Nyall Dawson 2018-02-08 + + Make tooltip capitalization consistent + +Nyall Dawson 2018-02-08 + + Add some separators to identify results toolbar + +Nyall Dawson 2018-02-08 + + [needs-docs] Use correct open form icon in identify results toolbar + + Before we used a different (non obvious) icon for "open form" + in the toolbar. This changes the toolbar icon to reuse the + same (clearer) icon which is used when expanding out the + tree and finding the "show feature form" action. + + I've also moved the Open Form action to be first in the + toolbar, since it's the most frequently used action. + +nirvn 2018-02-08 + + [raster] prevent pseudocolor auto-classify following color customization in tree + +nirvn 2018-02-07 + + [attribute table] fix crash when removing layer with show selected features + +Tudor Bărăscu 2018-02-07 + + fix server issue for devicePixelRatio leading to DPI requests with decimals + + Some requests send the DPI parameters with decimals due to + devicePixelRatio and the Server doesn't cope with that. This fixes it. + +nirvn 2018-02-07 + + [ui] save vertical space for the delimited text add layer dialog + (fixes #17972) + +nirvn 2018-02-06 + + document api break + +nirvn 2018-02-06 + + update the stats gatherer to use qgstask + +nirvn 2018-02-06 + + move getValues, getDoubleValues to vector layer utils source file + +nirvn 2018-02-05 + + [stats] gather field/expression values in a thread to prevent long UI freeze + +Alexander Bruy 2018-02-06 + + [processing] remove obsolete script tests + +Alexander Bruy 2018-02-06 + + [processing] fix file permissions + +Merge: 8f2c857e55 3dc3d9d1b2 +Denis Rouzaud 2018-02-06 + + Merge pull request #6275 from 3nids/messagelevel + + unite QgsMessageLog::Level and QgsMessageBar::MessageLevel in Qgis::MessageLevel + +Merge: cbd3042b5e 90f1d7b7e7 +Denis Rouzaud 2018-02-06 + + Merge pull request #6258 from 3nids/options_better_3 + + Allow adding custom highlight widget to custom pages in option + +Denis Rouzaud 2018-02-05 + + unite QgsMessageLog::Level and QgsMessageBar::MessageLevel in Qgis::MessageLevel + + make enum items lower case + remove unused QgsMessageLog::None and All + +Denis Rouzaud 2018-02-06 + + [options search] expand item when found in a tree + +Denis Rouzaud 2018-02-06 + + [processing] search also show children in config + +Nyall Dawson 2018-02-06 + + Fix build with MODELTEST enabled + +Nyall Dawson 2018-02-06 + + Remove some outdated Python api files + +Nyall Dawson 2018-02-06 + + Remove some qt4 references + +Nyall Dawson 2018-02-06 + + Remove more unused Qt4 cmake code + +Nyall Dawson 2018-02-06 + + Remove a bunch of Qt4 compatibility code + +Nyall Dawson 2018-02-06 + + Remove a bunch of unused Qt4 compatibility code + +Alessandro Pasotti 2018-02-06 + + Set first run dialog window title + +Nyall Dawson 2018-02-06 + + Update sip bindings + +Nyall Dawson 2018-02-06 + + Use QMessageBox::question instead of information when asking a question + + And where appropriate use Yes/No choices instead of Ok/Cancel + +Nyall Dawson 2018-02-06 + + Use question messagebox for layer rollback/cancel/save dialog + + ...since this messagebox is asking a question. Also change + confusing OK/Cancel option to clearer Yes/No options. + +Nyall Dawson 2018-02-06 + + Fix missing verification dialog on "all layer" save/rollback/cancel + + Fixes #17490 + +Denis Rouzaud 2018-02-05 + + remove PyQt4 leftovers in mac cmake config + +Nyall Dawson 2018-02-06 + + Minor speed boost to identify highlight + + Unfortunately this whole identify highlight class is very inefficient, + resulting in multiple large image redraws at every paint event + and slow iteration over every pixel in these images. + + TODO This needs to be completely reworked in future. + +Nyall Dawson 2018-02-06 + + Set the correct expression context for QgsHighlight + + Fixes #17896 + +Denis Rouzaud 2018-02-05 + + processing search: also search in group items and fix return value + +Denis Rouzaud 2018-02-05 + + do not search for less than 3 letters + +Juergen E. Fischer 2018-02-05 + + fix #18050 (followup f6269c41d) + +Denis Rouzaud 2018-02-05 + + remove ownesrhip transfer + +Nyall Dawson 2018-02-05 + + Fix hang in options search widget + +Denis Rouzaud 2018-02-02 + + Allow adding custom highlight widget to custom pages in option + +Nyall Dawson 2018-02-05 + + [options] Hide non-matching items in tree widgets when searching children + + Makes the search more useful for the advanced panel + +Nyall Dawson 2018-02-05 + + Put search icon on left of QgsFilterLineEdit + +lbartoletti 2018-02-05 + + Standardize shebangs (was Usr bin env) (#6229) + + * Use portable /usr/bin/env/{perl,python} instead of /usr/bin/{perl,python} + + * fix perl;add bash + + * Fix indentation using modified scripts + + * Revert "fix perl;add bash" + + This reverts commit be8b9113c25f7c2fb9c8c9bad556fbca2f0c0ba2. + + * python3 everywhere + + * more bash + + * rebase + change perl + + * Linux perl; missing from last PR + + * fix doxygen_space + + * Use portable /usr/bin/env/{perl,python} instead of /usr/bin/{perl,python} + + * fix perl;add bash + + * Fix indentation using modified scripts + + * Revert "fix perl;add bash" + + This reverts commit be8b9113c25f7c2fb9c8c9bad556fbca2f0c0ba2. + + * python3 everywhere + + * more bash + + * rebase + change perl + + * fix doxygen_space + +nirvn 2018-02-05 + + Do not refresh stats when opening the stat summary field combo box + Without this change, stats are calculated when users simply + open the combo box to select a new field. With large datasets, + it freezes QGIS for a long time, and the combo box end up + never opening. + +Merge: b6c2de48fa e3b054bf9d +Alessandro Pasotti 2018-02-05 + + Merge pull request #6251 from elpaso/bugfix-17975-server-layer-groups-order + + [bugfix][server] WMS respect order of grouped layers + +Merge: 6841c52210 567ebb9dd0 +Alexander Bruy 2018-02-05 + + Merge pull request #6225 from alexbruy/processing-algs + + [processing][needs-docs] use native syntax for Processing scripts + +Alexander Bruy 2018-02-05 + + [processing] fixes after rebasing + +Alexander Bruy 2018-02-04 + + [processing] turn keep n biggest parts script into normal algorithm + +Alexander Bruy 2018-02-02 + + fix indentation + +Alexander Bruy 2018-02-02 + + [processing] remove obsolete code and disable exporting models as script + until we update it so support new scripts format + +Alexander Bruy 2018-02-02 + + [processing] scripts also can be feature-based algorithms + +Alexander Bruy 2018-02-01 + + [processing] class name is not needed anymore to load scripts + +Alexander Bruy 2018-01-30 + + [processing] remove tests for old scripts + +Alexander Bruy 2018-01-30 + + [processing] use custom editor class, as QgsCodeEditor is not available + on some platforms + +Alexander Bruy 2018-01-30 + + [processing] remove unused files + +Alexander Bruy 2018-01-30 + + [processing] completely restore support for script execution from editor + +Alexander Bruy 2018-01-30 + + [processing] ressurect script execution from editor (work in progress) + +Alexander Bruy 2018-01-29 + + [processing] temporarily disable fetch actions for scripts and models + +Alexander Bruy 2018-01-29 + + [processing] ressurect 'new script' action + +Alexander Bruy 2018-01-29 + + [processing] ressurect 'add from file' action + +Alexander Bruy 2018-01-29 + + [processing] ressurect delete and edit actions for scripts + +Alexander Bruy 2018-01-29 + + [processing] update script provider to use QgsProcessingAlgorithm + subclasses instead of custom script code + +Alexander Bruy 2018-01-29 + + [processing] remove not needed trAction method + +Alexander Bruy 2018-01-29 + + [processing] move script provider stuff into provider directory + +Merge: e44c3606e5 87e55ba3c7 +Alexander Bruy 2018-02-05 + + Merge pull request #6257 from alexbruy/processing-sharing + + [processing][needs-docs] remove Get scripts and models functionality + +Nyall Dawson 2018-02-05 + + [layouts] Fix map grids not correctly respecting grid annotation + settings + + Fixes #18036 + +Nyall Dawson 2018-02-05 + + [layouts] Fix rotated items move when refreshing layout + + Fixes #18037 + +Nyall Dawson 2018-02-05 + + [layouts] Fix items disappear in designer with 90 or 270 degree + rotation + + Caused by Qt bug 66185 + + Fixes #18027 + +Juergen E. Fischer 2018-02-05 + + update INSTALL on release + +Nyall Dawson 2018-01-31 + + Ensure member QObjects for QgsMapLayer (and subclasses) are correctly + parented to their owner QgsMapLayer. + + This ensures that if the layer is moved to a different thread with + QObject::moveToThread(), then those children are also considered + by QObject::moveToThread() and correctly also moved to the new + target thread. This fixes broken connections (and likely other + issues) caused when moving layers between threads (such as is + done when a background processing algorithm completes). + + Fixes #18005 + +Nyall Dawson 2018-01-31 + + Modernize paste to memory layer code + +Nyall Dawson 2018-02-05 + + [processing] Fix invalid parameter definitions for spatialite algs + +Alexander Bruy 2018-02-04 + + [processing] remove Get scripts and models functionality + + Users should use Resource Sharing plugin instead + +Denis Rouzaud 2018-02-03 + + fix doxygen + +Denis Rouzaud 2018-02-03 + + [sipify] fix QMap/Qlist with init in header + +Denis Rouzaud 2018-02-02 + + [options search] API refactoring + + * avoid using lambdas and use dedicate class and subclasses for each widget type (lable, groupbox, tree, etc) + * this makes the code much more clearer + * allow creating custom highlight widgets with API + +Nyall Dawson 2018-02-04 + + Disable edit section buttons in reports if the section is disabled + +Nyall Dawson 2018-02-04 + + [reports] Fix crash in designer when no layout selected + + Fixes #18019 + +Nyall Dawson 2018-02-03 + + Make sure we use get uniquely seeded random numbers to generate + random symbol colors + + Since qsrand is thread-specific, we can't rely on qrand() to return + uniquely seeded random numbers when not in the main thread. + + Instead, just use the c++11 random number generators to get better + quality random colors for new layers. + + Fixes processing outputs always have the same (yuck) brown color. + +Nyall Dawson 2018-02-04 + + Avoid spell checker errors + +Martin Dobias 2018-02-03 + + pyqgis: add conversion to subclasses for QgsAbstractVectorLayerLabeling + +Juergen E. Fischer 2018-02-03 + + * revive update-news.pl + * osgeo4w: drop globe plugin + +Merge: 639d310da8 68b7bf6aa8 +Luigi Pirelli 2018-02-03 + + Merge pull request #6255 from slarosa/fix_16476 + + [dbmanager] porting of dae921c to 3: fixes #16476 + +Salvatore Larosa 2018-02-03 + + [dbmanager] porting of dae921c to 3: fixes #16476 + +Mathieu Pellerin 2018-02-03 + + use sane number of decimals for the extent groupbox widget + +Mathieu Pellerin 2018-02-03 + + use a QMimeData clipboard object to paste features as HTML table (#6243) + +Denis Rouzaud 2018-02-02 + + make sipify_all.sh much faster by using background processes + +Salvatore Larosa 2018-02-03 + + fix resizing columns in the identify results dialog + +Juergen E. Fischer 2018-02-02 + + INSTALL: use meta package to install osgeo4w build dependencies + +Merge: 5c5ef3b6de f6269c41da +Jürgen Fischer 2018-02-02 + + Merge pull request #6213 from nyalldawson/interrupt_console + + [console] Allow breaking execution of scripts via Ctrl-C + +Merge: b7e19d8243 31de32420d +Alessandro Pasotti 2018-02-02 + + Merge pull request #6246 from elpaso/rangeformatter + + [bugfix] Range formatter for doubles and ints + +Alessandro Pasotti 2018-02-02 + + Tests for range field formatter + +Alessandro Pasotti 2018-02-02 + + Get config from arguments instead of querying fields + +Alessandro Pasotti 2018-02-02 + + Use insert 0 instead of a reverse iterator + + Because it was introduced in Qt 5.6 ... + +Alessandro Pasotti 2018-02-02 + + Update tests for WMS grouped layers order + +Alessandro Pasotti 2018-02-02 + + [bugfix][server] WMS respect order of SLD grouped layers + +Alessandro Pasotti 2018-02-02 + + [bugfix][server] WMS respect order of grouped layers + + Fixes #17975 - QGIS server 2.99 reverses the layer order for layer groups + +Nyall Dawson 2018-02-02 + + Style updates + +Nyall Dawson 2018-02-02 + + Style fixes + +Nyall Dawson 2018-02-02 + + Fix clazy missing Q_OBJECT macro warnings + +Nyall Dawson 2018-02-02 + + Fix clazy return void warnings + +Nyall Dawson 2018-02-02 + + Fix clazy invalid slot warning + +Nyall Dawson 2018-02-02 + + Fix clazy pass big type by ref, small by value warnings + +Nyall Dawson 2018-02-02 + + Fix clazy 3 argument lamda connect warnings + +Nyall Dawson 2018-02-02 + + Fix clazy overridden signal warning + + Results in no warning when closing missing layers dialog + +Nyall Dawson 2018-02-02 + + Fix clazy missing/invalid emit warnings + +Nyall Dawson 2018-02-02 + + Fix clazy overridden signal warnings + +Nyall Dawson 2018-02-02 + + Fix clazy skipped-base-method warnings + +Nyall Dawson 2018-02-02 + + Fix clazy container detach warnings + +Nyall Dawson 2018-02-02 + + Fix another clazy fully qualified moc type warning + +Nyall Dawson 2018-02-02 + + Fix clazy case insensitive check warning + +Nyall Dawson 2018-02-02 + + Fix clazy use QHash for container with pointer keys warnings + +Nyall Dawson 2018-02-02 + + Fix clazy autoconnect slot name warnings + +Nyall Dawson 2018-02-02 + + Remove unused variable + +Nyall Dawson 2018-02-02 + + Fix clazy unused lambda capture warnings + +Nyall Dawson 2018-02-02 + + Fix clazy mixed const/non-const iterator warnings + +Nyall Dawson 2018-02-02 + + Fix clazy unnecessary unnecessary container allocation warnings + +Nyall Dawson 2018-02-02 + + Fix clazy QString multi-arg warnings + +Nyall Dawson 2018-02-02 + + Fix clazy fully-qualified-moc-types warnings + + From the clazy docs: + + "Warns when a signal, slot or invokable declaration is not using fully-qualified + type names, which will break old-style connects and interacting with QML." + +Nyall Dawson 2018-02-02 + + Fix clazy QFileInfo::exists warnings + +Mathieu Pellerin 2018-02-02 + + alternative approach to hide progress bar when unchecking render + +Merge: 4895c2c3f6 0eda3bee94 +Jürgen Fischer 2018-02-02 + + Merge pull request #6247 from kant/patch-1 + + Minor fixes + +Alessandro Pasotti 2018-02-02 + + Code cleaning: move duplicated code to lambda + +Alessandro Pasotti 2018-02-02 + + Add method to set line edit alignment in Qgs(Double)SpinBox + +Alessandro Pasotti 2018-02-02 + + Add QgsRangeFieldFormatter to bindings + +Merge: 7fb8de9648 37fa41b03a +Alessandro Pasotti 2018-02-02 + + Merge pull request #6191 from dgoedkoop/attributeformonchanged + + [bugfix] Add dirty bit to attribute form + +Merge: 5b9be7a966 16e98f205a +Nyall Dawson 2018-02-02 + + Merge pull request #6242 from nyalldawson/black + + Default to a dark gray instead of black for symbol outlines + +Nyall Dawson 2018-02-01 + + Default to a dark gray instead of black for symbol outlines + + Avoiding the very high constrast pure black results in cartographically + more pleasing styles, so it's nice to do this by default. + + This should result in nicer looking maps being created in QGIS + when users don't do any manual style tweaks. + +Darío Hereñú 2018-02-01 + + Minor fixes + +Salvatore Larosa 2018-02-01 + + apply enableAutoGeometryRestore to feature form dialog + +Alessandro Pasotti 2018-02-01 + + [bugfix] Range formatter for doubles and ints + + Double and ints are now formatted according + to chosen locale (in user settings) and precision + (from the widget field config) + + Numbers are also right aligned in the form + and not only in the table. + + IMHO a bugfix since the numbers looked very + different in the form and the table + when the system locale used decimal + separator and group separator which were not + the same than system locale. + +Juergen E. Fischer 2018-02-01 + + add disambiguation comment to translation string 'in' + +Merge: f3f0eb0035 cc1625c83e +Alessandro Pasotti 2018-02-01 + + Merge pull request #6237 from elpaso/commas-dots-fieldvalidator + + [bugfix][attrtable] Convert comma to dot for floating point input + +Merge: cc9210735f 2263237d20 +Alessandro Pasotti 2018-02-01 + + Merge pull request #6236 from elpaso/double-linedit-default-widget + + [bugfix] Lower priority of range widget for doubles + +Merge: 3ab6e5c399 55759a4cee +Alexander Bruy 2018-02-01 + + Merge pull request #6244 from alexbruy/processing-cleanup + + [processing] remove unused icons and use SVG icon for Heatmap algorithm + +Alexander Bruy 2018-02-01 + + [processing] remove unused icons and use SVG icon for Heatmap algorithm + +Merge: f845e02767 c3fc560fef +Alexander Bruy 2018-02-01 + + Merge pull request #6238 from alexbruy/saga-icon + + [processing] SVG icon for SAGA provider + +Mathieu Pellerin 2018-02-01 + + [ui] stop busy indicator when render widget is unchecked + +nirvn 2018-01-30 + + document API change + +nirvn 2018-01-30 + + add transform context to the map overview + +Nyall Dawson 2018-02-01 + + Update tests + +Nyall Dawson 2018-02-01 + + Fix test + +Nyall Dawson 2018-02-01 + + Fix double registration of model outputs + +Nyall Dawson 2018-02-01 + + [processing] Warn on duplicate output and provider registration + + And fix associated memory leaks + +Nyall Dawson 2018-02-01 + + Fix value map search widget doesn't work for null/not null searches + before an initial value is picked + + Refs #17986 + +Juergen E. Fischer 2018-02-01 + + run crssync on install (fixes #17993) + +Nyall Dawson 2018-02-01 + + Add missing directories to dox + +Juergen E. Fischer 2018-01-31 + + osgeo4w: fix postinstall scripts (fixes #17993) + +Nyall Dawson 2018-01-29 + + Spelling + +Nyall Dawson 2018-01-29 + + [processing] Use QgsMessageLog to put duplicate name warnings in Processing log + +Nyall Dawson 2018-01-29 + + [processing][grass] Remove duplicate parameter from r.stats + +Nyall Dawson 2018-01-29 + + [processing][grass] Fix incorrect name for i.albedo parameter + +Nyall Dawson 2018-01-29 + + [processing] Allow case-different duplicate parameter names + + But always prefer case-exact matches for parameter names. Turns + out the grass provider requires use of parameters with the same + name but different case, so we need to be able to handle this. + +Alexander Bruy 2018-01-31 + + [processing] SVG icon for SAGA provider + +Alessandro Pasotti 2018-01-31 + + [bugfix][attrtable] Convert comma to dot for floating point input + + This fixes an unreported bug that without detecting an + invalid input when using a comma as a decimal separator + silently converts the entered value to NULL. + + Since locale support in QGIS is in its early stages + we convert commas to dots within the validator, + this is common practice in almost all web applications + where you can enter a comma instead of a dot and + the conversion appears while you digit. + + This comes with brand new tests for QgsFieldValidator. + + Bonus: small fix in sipify. + +Alessandro Pasotti 2018-01-31 + + Support comma in annotations when merging inline + +nirvn 2018-01-31 + + [needs-docs][attribute table] UX improvements to cut/copy/paste actions + +Alessandro Pasotti 2018-01-31 + + Update test for editorwidgetregistry + +Merge: a9c6267332 3316d1ba86 +Mathieu Pellerin 2018-01-31 + + Merge pull request #6140 from DelazJ/nodeEditor + +Alessandro Pasotti 2018-01-31 + + [bugfix] Lower priority of range widget for doubles + + This was the root cause of several critical bugs with + data corruption in the attribute table and forms: + SpinBox has a fixed number of decimal places, which + makes it not ideal for floating points because most + of the times it rounds the number changing it when + in edit mode even if the user has not really modified + the value by writing in the spin box or using the + controls. + + So, the defult is now back to the line edit (which has + bugs in the validator, but that's another less + critical and separate issue). + + Partially fixes #17861 + Partially fixes #18007 + +Nyall Dawson 2018-01-31 + + Fix virtual layers using a where filter which has field names which + must be quoted + + E.g. field names with special characters or which duplicate a + QGIS expression function name + +Merge: bb6e275ef0 63d063f37d +Alessandro Pasotti 2018-01-31 + + Merge pull request #6209 from elpaso/double-range-precision + + [bugfix] Allow precision config for doubles in range widget + +Nyall Dawson 2018-01-31 + + Don't show non-spatial layers as disabled in layer tree + +Harrissou Sant-anna 2018-01-31 + + [needs-docs] Update label in Options dialog, replacing node by vertex + +Harrissou Sant-anna 2018-01-31 + + More node -> vertex moves + +Nyall Dawson 2018-01-31 + + Make map renderer less debug noisy + +Nyall Dawson 2018-01-31 + + [layouts] Correctly restore dpi from 2.x compositions + +Harrissou Sant-anna 2018-01-29 + + Fully replace node* by vertex* + +Harrissou Sant-anna 2018-01-23 + + [needs-docs]Rename Node Editor and Node Tool (fixes #17807) + +Merge: 9fff5f0ca7 1194c78495 +Harrissou Sant-anna 2018-01-30 + + Merge branch 'master' into rulebaseDialog + +Merge: bf3d60c941 26a51bada0 +Alessandro Pasotti 2018-01-30 + + Merge pull request #6228 from elpaso/server-wfs-epsg-bbox + + [server][bugfix][wfs] Allow CRS in BBOX + +Alessandro Pasotti 2018-01-30 + + Strip timeStamp from reference XML for tests + +Alessandro Pasotti 2018-01-30 + + [server][bugfix][wfs] Allow CRS in BBOX + + Fixes #17977 - QGIS server 2.99 doesn't handles BBOX parameter on WFS request + +Merge: 18a399a81a 26f8f165c4 +Jürgen Fischer 2018-01-30 + + Merge pull request #6171 from landryb/fix/find-gdal-geos-postgres-libs-on-openbsd + + Use FIND_LIBRARY to find GDAL, GEOS and Postgres libraries + +Merge: 02bfe0a20c f6a2c0a955 +Jürgen Fischer 2018-01-30 + + Merge pull request #6224 from rkanavath/master + + enable --no-undefined only for linux + +Rashad Kanavath 2018-01-30 + + enable --no-undefined only for linux + +Alessandro Pasotti 2018-01-30 + + Update the tests with QgsField precision values + + Now that they are honored + +Alessandro Pasotti 2018-01-30 + + Always use the QgsField precision value as a default for the reange widget + + Instead of interpreting a 0 like a default and get a 2 as the precision. + + But now you can set the precision you like just configuring the widget. + +Nyall Dawson 2018-01-30 + + Drop default snap tolerance to 12 px + +Nyall Dawson 2018-01-30 + + Set default snapping tolerance to 15 pixels + + Because 0 meter default is bad UX. Also update global_settings + ini with snapping settings. + +Nyall Dawson 2018-01-30 + + Fix snapping default unit set to pixels is not respected + +Mathieu Pellerin 2018-01-30 + + add trandform context to QgsBearingUtils::bearingTrueNorth + +Nyall Dawson 2018-01-30 + + Fix massive memory leak in PyQGIS, pt 1 + +Nyall Dawson 2018-01-30 + + Indentation + +Mathieu Pellerin 2018-01-30 + + [ui] use the expression icon for the rule-based renderer's rule panel + +Nyall Dawson 2018-01-30 + + Spelling + +Nyall Dawson 2018-01-30 + + Unify behavior of Stats and Bookmark dock actions with other + actions for toggling dock visibility + +Nyall Dawson 2018-01-30 + + [console] Make console action checkable, and bring behaviour into + line with style dock/processing toolbox + + Where the action is checked only if the dock is open and user visible, + and checking the action brings hidden tabs to the foreground instead + of closing them. + +Nyall Dawson 2018-01-30 + + Fix non-map items show in layout 'reference map' widget + +Nyall Dawson 2018-01-30 + + Fix QgsRasterFileWriter::driverForExtension and extensionsForFormat + were skipping non-creatable datasets + + And indicate in the docs that read-only datasets are also considered + +Nyall Dawson 2018-01-30 + + Revert "[needs-qa]Usr bin env" + +Nyall Dawson 2018-01-30 + + Revert "Linux perl; missing from last PR" + + This reverts commit d2244b4a79311b4f0d56b68bc2d0a0108cc0fca4. + +Nyall Dawson 2018-01-30 + + [console] Allow breaking execution of scripts via Ctrl-C + + This allows (in some circumstances) scripts running in the console + to be halted via the Ctrl (or Meta) + C shortcut. + + (It's only possible to catch and abort when the script is printing + outputs to the console - because this triggers + QCoreApplication.processEvents() calls. Without these calls the + whole QGIS application is unresponsive during script execution + and there's no ability to even catch a shortcut in order to + halt the execution. + + Still, even with this limitation it's handy to be able to + break out of lengthy: + + for f in iface.activeLayer().getFeatures(): + print(f.attributes()) + + loops!) + +Loïc Bartoletti 2018-01-29 + + Linux perl; missing from last PR + +Nyall Dawson 2018-01-29 + + Simplify and optimise python list->QgsAttributes conversion + +Nyall Dawson 2018-01-29 + + [processing] Correctly supress CRS selector dialog when testing + input layer validity + + TODO: we NEED a non-hacky way to supress this dialog and allow + invalid CRS for layers! + + Fixes #17948 + +Nyall Dawson 2018-01-29 + + [layouts] Fix crash when using maps containing AMS layers + + Implement a similar hack to what the canvas uses to workaround + the badly behaved AMS and WCS providers + + Fixes #17959 + +Alessandro Pasotti 2018-01-29 + + [bugfix] Allow precision config for doubles in range widget + + Fixes #17878 followup for PR https://github.com/qgis/QGIS/pull/6185 + + This commit adds a configuration option for precision to + double field types in range widget. + +Alexander Bruy 2018-01-29 + + [processing] add missed parameter to warp algorithm + +Merge: 998c67d3ff 1ce7dbad94 +Denis Rouzaud 2018-01-29 + + Merge pull request #6072 from lbartoletti/usr_bin_env + + [needs-qa]Usr bin env + +lbartoletti 2018-01-20 + + Improve find of grass on FreeBSD + +lbartoletti 2018-01-19 + + OpenBSD patch for PyQt5 + +lbartoletti 2018-01-19 + + - Little modification to programmatically find grass version +Add + FreeBSD locale path + - Add missing includes in kpty + +Loïc Bartoletti 2018-01-14 + + Fix pathes for FreeBSD + +Mathieu Pellerin 2018-01-29 + + [processing] nodes -> vertices algorithm renaming + + - "Extract nodes" renamed to "Extract vertices" + - "Extract specific nodes" renamed to "Extract specific vertices" + +Merge: d5126110b9 741dddb4a7 +Alessandro Pasotti 2018-01-29 + + Merge pull request #6185 from elpaso/bugfix-17878-range-widgets-nulls + + [bugfix] Fix minimum values for range widgets + +Merge: 59c2ab45a0 d5126110b9 +lbartoletti 2018-01-29 + + Merge branch 'master' of https://github.com/qgis/QGIS into usr_bin_env + +Alessandro Pasotti 2018-01-29 + + Spelling + +Ismail Sunni 2018-01-29 + + Fix order in XYZ connect dialog (fixes #17983) + +Nyall Dawson 2018-01-29 + + Correctly resolve paths for raster image fill symbol layers + +Nyall Dawson 2018-01-29 + + Expose project QgsPathResolver to render context + + So that it can be used when resolving paths to data defined + file-based settings, e.g. svg marker paths. + + Fixes #17364 + +Nyall Dawson 2018-01-29 + + Fix QgsPathResolver resolving older style relative links (without + any ./ or ../ prefix) + +Alessandro Pasotti 2018-01-29 + + [bugfix] Tests for double range widget limits + +Merge: 3b39dcf401 aec399e785 +pcav 2018-01-29 + + Merge branch 'master' of github.com:qgis/QGIS + +pcav 2018-01-29 + + Changed in in DB Manager + +Merge: cdf697d951 e24b6bb119 +Blottiere Paul 2018-01-29 + + Merge pull request #6142 from pblottiere/bugfix_transaction_constraints + + Update all attributes in a single transaction + +Merge: e2fcf704a7 eeaca6891b +Alessandro Pasotti 2018-01-29 + + Merge pull request #6068 from elpaso/bugfix-17845-raster-transparency-from-display + + [bugfix] Transfer focus to canvas when selecting transparency + +Merge: aed5090cba 0e2995c5b6 +Alessandro Pasotti 2018-01-29 + + Merge pull request #6174 from elpaso/bugfix-17958 + + [bugfix] Fix crash in node editor + +Salvatore Larosa 2018-01-29 + + fix iconsize for toolbars in georeferencer plugin + +nirvn 2018-01-29 + + [raster] don't auto-classify upon customizing values tree (fixes #17102) + +Blottiere Paul 2018-01-25 + + Update sip binding + +Blottiere Paul 2018-01-25 + + Fix typo in doc + +Blottiere Paul 2018-01-25 + + Add test + +Blottiere Paul 2018-01-23 + + Update all attributes in a single transaction + + Fixes #17869 + +Salvatore Larosa 2018-01-29 + + [processing] fix toggle advanced mode button in batch panel (#6193) + +Nyall Dawson 2018-01-29 + + [processing] Default to allowing background execution of algorithms + + Since the underlying issues with the Python bindings are now fixed, + in most cases we can safely default to allowing an algorithm to + run in a background thread!! + + So now we make this the default, and require individual algorithms + which are NOT thread safe to declare this. This includes algorithms + which directly manipulate the current project or layers (such as + setting layer styles), alter the selections in layers, or which + rely on 3rd party libraries (for now, SAGA and GRASS algorithms + are marked as not thread safe... TODO - someone more familiar with + these libraries can investigate and remove the flag if appropriate). + + Also models are marked as non-thread safe. TODO: only flag an + individual model as thread-unsafe if any of its child algorithms + report this flag. + +Nyall Dawson 2018-01-29 + + Update config format in search widget test + +Nyall Dawson 2018-01-29 + + Fix value map widget broken when used as search widget + + Fixes #17986 + +Salvatore Larosa 2018-01-29 + + fix build on macos + +Merge: 5ab5d095e4 0f963dfadf +Alexander Bruy 2018-01-29 + + Merge pull request #6200 from nyalldawson/non_file_default + + [processing] Default to supporting non-file based outputs for providers + +Nyall Dawson 2018-01-05 + + Attempt to fix #17783, window not activated on OSX after font dialog + displayed + +Nyall Dawson 2018-01-05 + + Attempt to fix #17784, shortcuts in layouts are applied + in child widgets on OSX + +Nyall Dawson 2018-01-29 + + [processing] Default to supporting non-file based outputs for providers + + And make this support opt-out, since the vast majority of providers + are based on QGIS API and don't have external dependencies which would + restrict use of memory layers/etc. + + Plus, I'd rather see non-compliant providers expose this support when + they can't use non-file-based-outputs (and make this the bug which + needs fixing) then have to rely on plugin providers to discover and + explicitly expose this support. + +Webmaster 2018-01-27 + + fix saving interface customization to .ini (fixes #17979) + +Nyall Dawson 2018-01-29 + + [layouts] Fix restoration of rotated item positions + + Fixes #17982 + +Nathan Woodrow 2018-01-29 + + [Win] Show error message if mainwin fails to load exe + + Currently it will just die quietly which is no good for the user. + +Nyall Dawson 2018-01-29 + + [layouts] Don't force open item properties when undoing/redoing + +Harrissou Sant-anna 2018-01-25 + + Running check_spelling.sh + +Harrissou Sant-anna 2018-01-25 + + Fix typo (fix #17946) + +Nyall Dawson 2018-01-29 + + [layouts] Use correct transform context for map grids + + Fixes #17984 + +Nyall Dawson 2018-01-29 + + Fix some leaks and errors in sip conversions + +Salvatore Larosa 2018-01-28 + + [processing] create widget correctly from wrapper when in batch mode + +Salvatore Larosa 2018-01-28 + + [processing] fix wrong getter + +Salvatore Larosa 2018-01-28 + + apply enableAutoGeometryRestore to config shortcut dialog + +Nyall Dawson 2018-01-27 + + Fix possible GIL deadlock when iterating features in python + and an exception is thrown + +Daan Goedkoop 2018-01-28 + + [bugfix] Add dirty bit to attribute form + In some cases it is difficult to prevent that an edit widget doesn't + return the original value, even if the user didn't change anything. + So rather than just comparing values to check if they have been + modified, a dirty bit has been added which is set whenever the user + actually edits the data in an edit widget. This is part of the fix + for #17878. + +Nyall Dawson 2018-01-29 + + [processing] Fix duplicate parameter + + And throw warnings when other duplicate parameters are registered. + + GRASS has a lot. + +Juergen E. Fischer 2018-01-27 + + make converting to multi geometries to fullfil provider geometry + constraints the last step and use earlier conversions (fixes #17643) + +Harrissou Sant-anna 2018-01-25 + + Update some button labels + +Harrissou Sant-anna 2018-01-28 + + Set tab order + +Harrissou Sant-anna 2018-01-27 + + Add help button and connect to user manual + +Harrissou Sant-anna 2018-01-27 + + Add scrollbar to only dialog-display mode + + and not in widget mode + Sur la branche rulebaseDialog + modifié : src/app/nodetool/qgsnodetool.h + aucune modification n'a été ajoutée à la validation (utilisez "git add" ou + +Harrissou Sant-anna 2018-01-26 + + Enable rule-based dialog instead of widget all time + +Merge: 54cd01ac7d 9fcfafdfda +Salvatore Larosa 2018-01-27 + + Merge pull request #6164 from slarosa/fix_ml_issue + + update min/max values for singlebandgray raster renderer + +Alessandro Pasotti 2018-01-27 + + [bugfix] Fix minimum values for range widgets + + Fixes #17878 QGIS 3 Vector Layer Fields Garbled when Clicking the Toggle Editing Icon + +Denis Rouzaud 2018-01-26 + + use blue font for highlighted tree items + +Denis Rouzaud 2018-01-25 + + [options search] fix search not available in option tree + +Merge: a265073344 b3256ad2c3 +Nyall Dawson 2018-01-27 + + Merge pull request #6176 from nyalldawson/gil + + [python] Always release the GIL before calling PyQGIS c++ methods + +Juergen E. Fischer 2018-01-26 + + update package*.cmd for 3 and GRASS 7.x + +Juergen E. Fischer 2018-01-26 + + fix typo + +Alexander Bruy 2018-01-26 + + [processing] fix wrong variable name + +nirvn 2018-01-26 + + avoid startup warning, do not look for empty setting value + +Merge: ac4be1b30f d4e8f63315 +Alessandro Pasotti 2018-01-26 + + Merge pull request #6181 from elpaso/check-for-size-before-adding-to-model + + Check for model items size before removing rows + +Alessandro Pasotti 2018-01-26 + + Check for model items size before removing rows + + This was hitting an assert in Qt core libraries 5.9.3 + +nirvn 2018-01-26 + + update the brasil flag svg to get rid of console warnings + +Merge: b1a97e1736 698befa9dd +Alessandro Pasotti 2018-01-26 + + Merge pull request #6173 from elpaso/bugfix-17863-wrong-ogr-extent + + [bugfix][ogr][spatialite] Update extent when subsetstring is set in the ctor + +nirvn 2018-01-26 + + fix stylesheet string for the qgsdatetimeedit widget + +nirvn 2018-01-26 + + remove png flags + +nirvn 2018-01-26 + + add two missing locale flags + +nirvn 2018-01-26 + + [processing] properly size toolbar button for provider actions + +Nyall Dawson 2018-01-26 + + [python] Always release the GIL before calling PyQGIS c++ methods + + Switches on the sip "-g" switch, which forces sip to release the + Python Global Interpreter Lock before calling a qgis c++ method, + and reacquire it after. + + While this flag is not a default sip flag, it is used when building + the PyQt API, so can't forsee any issues from enabling it. + + The benefit however is extreme for PyQGIS based scripts which + rely on threads, potentially resulting in massive performance + boosts. + + Without this switch, calling an expensive c++ method (say, + building a QgsSpatialIndex using a QgsFeatureIterator) would lock + the Python GIL for the duration of the c++ call... which could + potentially take minutes or more. With the switch, the lock + is released before all calls, so other Python threads are free + to merrily grab the lock and do other processing while the + original thread chugs away in c++ land. + + Benchtests of worst-case scenarios (single thread calling + thousands of very inexpensive PyQGIS methods (simple getters)) + regressed from mean of 154 seconds to 158 with this flag. But + that's worst case (and as Intel have recently demonstrated... + we can't take yesterday's computing speed as the benchmark + for todays ;). Given that best case scenarious (multi-threaded + operations calling slow c++ methods) will benefit so greatly + from this change, I think it's an acceptable trade off. + + *This is a step toward potentially re-enabling background + execution of python based Processing algorithms, and also + should greatly improve QGIS responsiveness when using + python based renderers/symbols. + +Salvatore Larosa 2018-01-25 + + [processing] resurrects matrix parameter + +Merge: 8b682dad1a e77658fc2e +Werner Macho 2018-01-25 + + Merge pull request #6175 from zsiki/master + + Hungarian translators list extended + +Zoltan Siki 2018-01-25 + + Hungarian translators list extended + +Alessandro Pasotti 2018-01-25 + + [bugfix] Fix crash in node editor + + Fixes #17958 Node tool crashes QGIS when changing a value + +Alessandro Pasotti 2018-01-25 + + [gpkg] Add test for gpkg subsetstring don't unlock mutex twice + + I wanted to add the test for gpkg subsetstring even if + it was not bugged, while testing that, I hit an assert + in Qt core that pointed me to double unlocked locks. + +Alessandro Pasotti 2018-01-25 + + [bugfix][spatialite] Update extent when subsetstring is set in the ctor + + Fixes #17863 - Zoom to layer has inconsistent behavior with filter + +Alessandro Pasotti 2018-01-25 + + [bugfix][ogr] Update extent when subsetstring is set in the ctor + + Fixes #17863 - Zoom to layer has inconsistent behavior with filter + +Merge: 6424ceb113 0d1ef01850 +Sandro Mani 2018-01-25 + + Merge pull request #6172 from manisandro/master + + [Globe] Adapt for API changes + +Sandro Mani 2018-01-25 + + [Globe] Adapt for API changes + +Denis Rouzaud 2018-01-24 + + [options search] move Message bar items check to QgsSearchHighlightOptionWidget constructor + +Denis Rouzaud 2018-01-24 + + [options search] use lambda method to search text in widgets + +Mathieu Pellerin 2018-01-25 + + [processing] add actions when provider is registered / activated + +Landry Breuil 2018-01-25 + + Use FIND_LIBRARY to find GDAL, GEOS and Postgres libraries + + On OpenBSD, there's no libgdal.so symlink, only a versioned library (ie + libgdal.so.X.Y where X.Y changes over time so is never constant) + Using cmake's FIND_LIBRARY allows to let cmake find the library. + + Without this, the build would fail on OpenBSD: + ninja: error: '/usr/local/lib/libgdal.so', needed by 'output/lib/libqgis_core.so.18.0', missing and no known rule to make it + +Landry Breuil 2018-01-25 + + Don't hardcode the path to qgis binary in .desktop file + +Merge: 30043dbeb8 37cd401e48 +Alessandro Pasotti 2018-01-25 + + Merge pull request #6162 from elpaso/bugfix-17263-clip-double-show + + [bugfix] Fixes Clip features to canvas extent displayed twice + +Merge: f0e01d81f0 b64444720c +Alessandro Pasotti 2018-01-25 + + Merge pull request #6163 from elpaso/bugfix-17927-themes-group-visibility + + [bugfix] Ensure parent group visibility when apply theme + +Harrissou Sant-anna 2018-01-25 + + Better widget's alignment + +Harrissou Sant-anna 2018-01-25 + + [DB Manager]Allow preset query combobox expansion + + Fixes #17933 + Also add some window title capitalisation + +Nyall Dawson 2018-01-25 + + Fix crash + +Nyall Dawson 2018-01-25 + + [processing] Non-filed based outputs (e.g. postgis, geopackage) + options should be available for certain model outputs and script + algorithm outputs + + We do this by swapping the test for non-file based output support + from checking only the algorithm's provider to instead checking + on a parameter-by-parameter basis. + + This is done in order to support models. For models, depending + on what child algorithm a model output is based off, an individual + model may or may not have support for non-file based outputs. E.g + a model may generate outputs from a native qgis alg (supporting + these outputs) AND an output from a GDAL alg (with no support + for these outputs). In this case we need to enable or disable + the ui controls for non-file based outputs on an individual + output basis. + + For scripts (for now) we blindly just say all outputs support + non-file based formats. This is going to be the case most of + the time, since scripts will usually be written using PyQGIS + API. For the exceptions (e.g. scripts which call other algs + like GDAL algs) we probably should add some way for the script + to indicate whether an individual output supports this, but + for now we just say they all do. + + Fixes #17949 + +Nyall Dawson 2018-01-25 + + Make saving ogr layers less debug noisy + +Andrea Giudiceandrea 2018-01-24 + + Fixes a typo in syncDb() + + Fixes a typo in QgsCoordinateReferenceSystem::syncDb() that improperly set "Imported from GDAL" as name for all geographical coordinate systems imported from GDAL/PROJ definitions during postintall CRS database synch. + + Fixes #17941 + +Nyall Dawson 2018-01-24 + + Show field type in tooltip in attribute table header + +Nyall Dawson 2018-01-24 + + Fix relation table shows some cells disabled (when they should + be enabled, but just not editable) + +Nyall Dawson 2018-01-24 + + Use same relation parent/child order in list as in new relation dialog + + Fixes #17939 + +Juergen E. Fischer 2018-01-24 + + fix layer tooltip display + +Salvatore Larosa 2018-01-24 + + update min/max values for singlebandgray raster renderer + +Alessandro Pasotti 2018-01-24 + + [bugfix] Ensure parent group visibility when apply theme + + Fixes #17927 Group Layers not activating when Theme is selected. + +Juergen E. Fischer 2018-01-24 + + fix detection of 2.x project crs (followup f2b5a595) + +Alessandro Pasotti 2018-01-24 + + [bugfix] Fixes Clip features to canvas extent displayed twice + + Fixes #17263 + +Mathieu Pellerin 2018-01-24 + + remove risky qApp->processEvents() call (#6161) + +Denis Rouzaud 2018-01-24 + + [options search] correctly remove event filter + +Denis Rouzaud 2018-01-23 + + QgsGeometryUtils: rename 2 methods + + - projPointOnSegment has been renamed to projectPointOnSegment + - getSelfIntersections has been renamed to selfIntersections + +nirvn 2018-01-24 + + [processing] don't modify output filename in build virtual raster + +nirvn 2018-01-24 + + [processing] add default extension to empty filter when available + +Etienne Trimaille 2018-01-24 + + update XSD and XML according to #36bf093 + +Nyall Dawson 2018-01-24 + + Fix metadata address element doubles with each project write + + elementsByTagName can be dangerous, because it returns children + recursively. In this case the contact "address" element contained + a child element for the street address, also named "address". + + So when restoring a project with contact addresses in the metadata, + each address was created twice... + + Fixes #17940 + +Alessandro Pasotti 2018-01-24 + + [bugfix] Fix crash on bad raster layers, fixes #17938 + +Nyall Dawson 2018-01-24 + + [processing] Fix missing outputs in modeler for grass algs (fixes #17703) + +Nyall Dawson 2018-01-24 + + [processing] Fix error on win when grass path isn't set correctly + +Nyall Dawson 2018-01-24 + + Fix gui handling of NULL/None default values in processing script algorithms + +Nyall Dawson 2018-01-24 + + Fix crashes in layout manager tests + +Nyall Dawson 2018-01-23 + + [layouts] Handle duplicated composer names when upgrading 2.x + projects + + Somehow 2.x projects could end up with compositions with duplicate + names. This is strictly forbidden in 3.x, so we autogenerate a + new unique name if we encounter any duplicate composer names when + upgrading a 2.x project. + + Fixes #17924 + +Nyall Dawson 2018-01-23 + + Fix leak when a layout cannot be added + +Nyall Dawson 2018-01-23 + + [layouts] Fix remaining composers are not restored after hitting + a composer which could not be added + + Refs #17924 + +Merge: c5d9830db2 ccb4c80f8a +Alessandro Pasotti 2018-01-24 + + Merge pull request #6145 from elpaso/bugfix-17872-wfs2-typenames + + [bugfix][wfs] Expand support for 2.0.0 TYPENAMES + +Mathieu Pellerin 2018-01-24 + + [needs-docs][processing] move providers actions into the processing + + panel toolbar (#6150) + +Merge: 54f9846eda 77a6bbbb0a +Alexander Bruy 2018-01-24 + + Merge pull request #6141 from alexbruy/processing-gdal + + [processing] restore GDAL rasterize algorithm + +Nyall Dawson 2018-01-24 + + Fix executing processing scripts through script editor + +Denis Rouzaud 2018-01-23 + + reformulate doxymentation + +Nyall Dawson 2018-01-24 + + [processing] Add Toolbox action to the main window toolbar + + I realise this adds another toolbar button... but I'd strongly + argue that the toolbox is used FAR FAR more often than many of the + other toolbar actions! + +Nyall Dawson 2018-01-24 + + Don't re-register an already registered action in QgsShortcutsManager + + Avoids incorrect warnings about duplicate shortcuts on startup. + + What's happening here is: + - on QGIS startup, plugins are loaded, adding their actions to + the interface via iface.registerMainWindowAction() + - after ALL plugins and qgis native menus and actions are created, + the shortcut manager registers ALL children from the main window. + This includes the actions and widgets created by plugins, which + have already been registered to the manager. + - There's no way to avoid this duplicate registration - we could + move the child shortcut registration to occur before plugin + initialization, but it's actually nice to have this "catch-all" + occur after plugins are loaded (so that plugins which don't + correctly register actions still have them included in the shortcut + manager). Similarly, plugins MUST use the registerMainWindowAction + call instead of just relying on the Qt QAction.setShortcut method + because otherwise the shortcuts manager is unaware of actions + created after QGIS load - e.g. enabling a plugin after startup. + + So we avoid this by just refusing to re-register a shortcut + that the manager is already aware of... no more startup warnings! + +Nyall Dawson 2018-01-24 + + [processing] Improve main window Toolbox action + + Brings the behaviour into line with the styling dock, where + the action is checkable and checked only when the toolbox + is open AND user visible (i.e. not hidden behind another tab). If + the toolbox is open but hidden, then hitting the Toolbox action + brings it to the front tab. + + Otherwise it's often necessary to hit to Toolbox shortcut twice - + once to close a hidden toolbox tab, and a second time to open + and raise it. + +Merge: 6a2a626926 b49c3964bb +Nyall Dawson 2018-01-24 + + Merge pull request #6147 from slarosa/processing_toolbar + + [processing][needs-docs] add toolbar to processing toolbox + +Denis Rouzaud 2018-01-23 + + move QgsCadUtils::lineCircleIntersection to QgsGeometryUtils + + also add a test + +Salvatore Larosa 2018-01-23 + + [processing] set icon size to toolbar + +Salvatore Larosa 2018-01-23 + + [processing] change icon for options action in toolbar + +Salvatore Larosa 2018-01-23 + + [processing] followup: 9c400324e2 - restore ellipses in menu actions + +Salvatore Larosa 2018-01-23 + + [processing] add toolbar to toolbox + +Alessandro Pasotti 2018-01-23 + + [bugfix][wfs] Expand support for 2.0.0 TYPENAMES + + Fixes #17872 - WFS 2.0.0 DescribeFeatureType : TypeNames vs TypeName + + This PR introduces the plural form of TYPENAME for + 2.0.0 WFS servers, with some additional logic to + allow for 2.0.0 servers that only support TYPENAME + for DescribeFeatureType: in this case, the singular + form is also tried in case the plural one fails. + + There is still some work to do for transactional + support but at least the read-only client part + should now be ok. + + Tests have been added to check that: + + - TYPENAME form still works with old 2.0.0 + - TYPENAMES form works with compliant 2.0.0 + - choice geometry types are handled by calling + GetFeature and examining the result + +Denis Rouzaud 2018-01-23 + + fix Project Snapping Settings dialog doesn't save the dialog size + + fix #17343 + +Denis Rouzaud 2018-01-23 + + fix case + +Denis Rouzaud 2018-01-23 + + topological editing should always be available + + fix #17620 + regression from 2.x + +Denis Rouzaud 2018-01-23 + + correctly register shortcuts for snapping toolbar + + fix #17037 + +Mathieu Pellerin 2018-01-23 + + [reports] allow header and footer sections to always be included + +Denis Rouzaud 2018-01-23 + + astyle 3.1 allows format of lambdas on a single line + +Denis Rouzaud 2018-01-22 + + run astyle + +Denis Rouzaud 2018-01-18 + + update astyle to 3.1 + +Alexander Bruy 2018-01-23 + + [processing] restore GDAL rasterize algorithm + +Alexander Bruy 2018-01-23 + + [raster calculator] don't crash if output file has illegal size, e.g. 0x0 + +Alexander Bruy 2018-01-23 + + [processing] throw error if no layers selected in raster calculator + algorithm (refs #17920) + +Alexander Bruy 2018-01-23 + + [processing] make items hidden after adding them to the view (fix #17881) + +Mathieu Pellerin 2018-01-23 + + [needs-docs][processing] merge grid algorithms and add point grid type + +Nyall Dawson 2018-01-23 + + [reports] Tweak sub-section logic for multi-layer reports + + Instead of requiring a single layer for use with nested field group + sections, allow use of different layers. In this case the child + layers are filtered so that any fields with names matching their + parent groups are filtered to match the parent section's value. + + Also only include headers and footers for child field group sections + if the child has matching features found. + +Nyall Dawson 2018-01-18 + + Drop composer + + It's been a great journey, but your time has come... + +Nyall Dawson 2018-01-23 + + Tweak some report designer strings + +Nyall Dawson 2018-01-23 + + Remove header for report organizer tree + +Nyall Dawson 2018-01-23 + + Initially select report section when opening a report designer + +Harrissou Sant-anna 2018-01-22 + + Switch SpatiaLite and PostgreSQL place in Datasource + + Manager dialog + Moves up SpatiaLite tab near GeoPackage's as they are both simple file databases and their dialog look alike. + +Nyall Dawson 2018-01-23 + + [processing] Fix extent and CRS parameters do not evaluate in + models when linked to a layer parameter/output value + + References discussion on dev mailing list + +Nyall Dawson 2018-01-23 + + [processing] Fix misleading errors in grid algorithms + +Nyall Dawson 2018-01-23 + + Fix build + +Nyall Dawson 2018-01-23 + + Silence warning + +Nyall Dawson 2018-01-23 + + [processing] Port 'Add unique value index field' to c++ + + And implement some fixes/improvements (refs discussion on the dev mailing list): + - allow user to specify created field name + - allow optional creation of a summary table showing new class value vs original + value + +Nyall Dawson 2018-01-23 + + [processing] Fix creating tests when alg has optional outputs + +Nyall Dawson 2018-01-23 + + [processing] Fix error when dragging alg group in modeler + +Nyall Dawson 2018-01-23 + + Fix incorrect tooltips + +Nyall Dawson 2018-01-22 + + Fix crash on exit + + Since the snapping widget is destroyed *after* the project instance, + we need to avoid referring to the project after it's deleted. + +Mathieu Pellerin 2018-01-23 + + [ui] fix status bar's message item resizing window on long string + + (Fixes #17913) + +Denis Rouzaud 2018-01-19 + + move poly2tri to external libs directory + +Merge: 7a2ab1cc7c 08255f7ba0 +Borys Jurgiel 2018-01-22 + + Merge pull request #6129 from alexbruy/plugins-rating + + [plugin manager] fix sending plugin votes + +Nyall Dawson 2018-01-22 + + [layouts] Fix multiframe items (tables, html) cannot be pasted + + Fixes #10456, #17882 + +Nyall Dawson 2018-01-22 + + Fix invalid read when closing layout designers + + Child widget was referring to its parent in the destructor - at + this stage the parent may no longer be in a usable state (if the + child's destruction was caused by the parent's destruction) + +Nyall Dawson 2018-01-22 + + Fix handling of multiframe objects in layout templates + +Nyall Dawson 2018-01-22 + + Add missing sip casting for layout multiframe objects + +Nyall Dawson 2018-01-22 + + Add a debug assert relating to multiframe item crashes + +Nyall Dawson 2018-01-22 + + [layouts] Fix some linked map items not correctly restored when + loading projects. + + Also remove some outdated TODOs + + Fixes #17892, #17891 + +Merge: 50161421a8 f235e93570 +Alessandro Pasotti 2018-01-22 + + Merge pull request #6130 from elpaso/bugfix-17915-geopackage-delete-wrong-layer + + [bugfix] Fixes 17915 geopackage delete wrong layer + +Alexander Bruy 2018-01-22 + + fix indentation + +Merge: 282f240d72 0114927149 +Borys Jurgiel 2018-01-22 + + Merge pull request #6117 from borysiasty/manager_stars + + [Plugin manager] SVG voting stars + +Alessandro Pasotti 2018-01-22 + + [bugfix] Fixes deleting geopackage layer from browser delete a wrong layer + + Fixes 17915 + +Alessandro Pasotti 2018-01-22 + + Cosmetic: comment formatting + +Denis Rouzaud 2018-01-19 + + add missing INCLUDE_DIRECTORY + +Denis Rouzaud 2018-01-19 + + update debian/copyright + +Denis Rouzaud 2018-01-19 + + move nmea + +Denis Rouzaud 2018-01-19 + + move qspatialite + +Denis Rouzaud 2018-01-19 + + move qwtpolar + +Denis Rouzaud 2018-01-19 + + move QExtSerialPort to external libs directory + +Nyall Dawson 2018-01-21 + + Fix rotation widget disappears after ctrl-clicking to set anchor point + + Fixes #17232 + +Nyall Dawson 2018-01-21 + + Escape should cancel rotation map tool + +Nyall Dawson 2018-01-21 + + Fix user input widget sometimes hidden below canvas + +Nyall Dawson 2018-01-21 + + Fix incorrect cursor used for rotate map tool + +Denis Rouzaud 2018-01-19 + + fix Chained filters crash QGIS when switching between ui tabs + + fix #17736 + +Denis Rouzaud 2018-01-19 + + use QgsMapLayer::isSpatial() + +Denis Rouzaud 2018-01-19 + + do not list non spatial in custom layer order widget + + fix #17887 + +Alexander Bruy 2018-01-22 + + fix sending plugin votes + +David 2018-01-18 + + fixed indentation in python + + fixed indentation in python unittest + +David 2018-01-18 + + take list instead of map for test + + in unittest it needs to take a list instaed of the map as a test of valuemap + +David 2018-01-17 + + store valuemap as QList instead of QMap + + because with QMap it loses the order. the two values (key and value) are in an one dimensional QMap stored. + this because QPair is not a QVariant. we desided not to stor it as DataStream, because then less powerfull platforms couldn't use it from the configuration. + +David 2018-01-17 + + store valuemap as QList + + instead of QMap because with QMap it loses the order + actually it's currently stored in config['map'] as QDataStream + +Denis Rouzaud 2018-01-22 + + sip fix include directory + +Nyall Dawson 2018-01-22 + + Fix layout items with non-top left reference move when exporting + + Fixes #17910 + +Nyall Dawson 2018-01-22 + + Fix crash when executing background threadable processing algorithms on Windows + + Yet again processEvents() comes around to bite us in the butt. + +Nyall Dawson 2018-01-22 + + [layouts] Fix designer windows is always-on-top on Windows 10 + + Fixes #17801 + +Daan Goedkoop 2018-01-20 + + Set missing expression context in some filters + In some filters the expression context was not set, so that references to + variables would only work in the preview, but not when actually using them. + +Nyall Dawson 2018-01-21 + + Fix behavior of import/export predefined scales in options + + Fixes #17796 + +Harrissou Sant-anna 2018-01-14 + + Add book title capitalization to panels + +Harrissou Sant-anna 2018-01-14 + + Add more book title capitalization + +Harrissou Sant-anna 2018-01-14 + + Add title case to some dialog title + +Borys Jurgiel 2018-01-20 + + [Plugin manager] SVG voting stars + +nirvn 2018-01-17 + + [map themes] avoid projection version debug msg spam by default + +nirvn 2018-01-17 + + [map themes] avoid writing empty style to layer + +Nyall Dawson 2018-01-20 + + unique ptr improvements + +Nyall Dawson 2018-01-19 + + Fix documentation + +Nyall Dawson 2018-01-19 + + Use snap indicator for measure angle tool + + Fixes #14954 + +Nyall Dawson 2018-01-19 + + Show a snap indicator for measure tool + +Nyall Dawson 2018-01-19 + + Escape cancels move tool + +Nyall Dawson 2018-01-19 + + Enable snapping for select by radius tool + +Nyall Dawson 2018-01-19 + + Documentation++ + +Nyall Dawson 2018-01-19 + + Select by radius spin box needs more decimals to work for geographic CRS + +Nyall Dawson 2018-01-19 + + Make select by radius rubber band smoother + +Denis Rouzaud 2018-01-19 + + use a dedicated button to show the table + +Denis Rouzaud 2018-01-18 + + use widgetAction rather than floating widget + +Denis Rouzaud 2018-01-13 + + [snapping widget] add advanced config widget in toolbar fix #16596 + +Denis Rouzaud 2018-01-18 + + initilize in header + +Denis Rouzaud 2018-01-18 + + switch freehand selection map tool to click-click + + to be coherent with other map tools + add-ons: possible map move/zoom while selecting, and operation canceling (right-click or ESC) + +Nyall Dawson 2018-01-19 + + Fix crash when deleting layout items + + Fixes #17876, #17770 + +Nyall Dawson 2018-01-19 + + Keep label settings when changing between rulebased/simple labeling + + Fixes #17734 + +Nyall Dawson 2018-01-19 + + Add separate bool for controlling whether vector layer labels + are enabled + + Instead of clearing the labeling configuration in order to + disable labels, we need a way to disable them without + losing the configuration. Labels are oftern temporarily + switched on/off as an analysis tool, and we don't want the + settings to be lost as a result + + Refs #17656 + +Denis Rouzaud 2018-01-19 + + move libdxfrw to external lib directory + +Martin Dobias 2018-01-19 + + [cad] Fix precision issues with angle constraint (fixes #17685) + +Nyall Dawson 2018-01-19 + + [needs-docs] Allow adding and remove nodes from node tool selection + + Holding shift while clicking and dragging adds nodes to selection, + holding ctrl removes nodes from selection. + + Additionally, this commit: + - fixes the current 'select node but don't start moving' shortcut, + but changes it from ctrl-click on a node to shift-click on a node + (since it's 'adding' to the selection) + - makes ctrl-click on a single node remove just that node from + the selection + + Fixes #17259 + +Merge: c6608c086c 5162c46871 +Alexander Bruy 2018-01-19 + + Merge pull request #6097 from alexbruy/rule-editor-ui + + make rule editor dialog resizeable (fix #17709) + +Nyall Dawson 2018-01-19 + + Fix memory leak + +Denis Rouzaud 2018-01-18 + + fix prepare-commit for sipify + +Mathieu Pellerin 2018-01-19 + + [ui] prevent infinite canvas redraw due to (#6098) + + progress bar changing status bar height when + shown/hidden. + + Yes, it's as bad as it sounds. + +Nyall Dawson 2018-01-18 + + Fully refresh map items when clicking 'update preview' button + +Nyall Dawson 2018-01-18 + + [layout] Cache map item theme preset lookups + + Since theme style override lookups are expensive, cache them + to avoid unnecessary duplicate calls + + Fixes #17027 + +Nyall Dawson 2018-01-18 + + [layouts] Don't needlessly calculate layer sets for maps linked + to a map theme + + This is very expensive to do, so avoid calculating it as much + as possible + + Refs #17027 + +Denis Rouzaud 2018-01-18 + + fix typo and missing disconnect + +Denis Rouzaud 2018-01-18 + + cancel select by radius by pressing ESC + +Denis Rouzaud 2018-01-17 + + switch select by radius map tool to click-click + + fix #17868 + + this is seen as a bugfix and will be merged in 3.0 to have coherent map tools changes + also add a user input (also features keyboard modifiers) + +Alessandro Pasotti 2018-01-18 + + QgsDebugMsg -> QgsDebugMsgLevel in getcapabilities download + +Merge: dd039813f1 ac27347a9e +Blottiere Paul 2018-01-18 + + Merge pull request #5899 from peppsac/fix_17668 + + [server] Fix layers group handling + +Alexander Bruy 2018-01-18 + + put rule editor widgest inside a QScrollArea to make dialog resizeable + (fix #17709) + +Harrissou Sant-anna 2018-01-09 + + Update lpad and rpad functions description + +Nyall Dawson 2018-01-18 + + Fix virtual layers fail if table field names have special characters + + Fixes #16943 + +Nyall Dawson 2018-01-18 + + Add test mask + +Nyall Dawson 2018-01-18 + + Add test for hiding partial labels with rotated canvas + +Nyall Dawson 2018-01-18 + + Fix doxygen warning + +Nyall Dawson 2018-01-17 + + Fix labeling hide partial labels setting when map is rotated + + Previously partially hidden labels would be shown when a map is + rotated, even if the project was set to hide partial labels. + + To achieve this pal has been refactored to allow an arbitrary + QgsGeometry specifying the map boundary (instead of the previous + rectangular only extents). The good news is that this paves the + way for a future release to have non-rectangular layout map items, + where the actual map item shape will be correctly handled by + the labeling engine... + +Nyall Dawson 2018-01-17 + + Add some more geometry relationship methods to LabelPosition + +Nyall Dawson 2018-01-17 + + Safer memory management for some pal routines + +Nyall Dawson 2018-01-17 + + Drop an unused messy pal function + +Nyall Dawson 2018-01-17 + + Remove composer from more code, port georeferencer reports to layouts + +Nyall Dawson 2018-01-17 + + Port more tests to layouts, drop more QgsCompositions use + +Nyall Dawson 2018-01-17 + + Fix crash with undo/redo and layout multiframes, restore test + +lbartoletti 2018-01-17 + + more bash + +lbartoletti 2018-01-17 + + python3 everywhere + +Merge: ccd98f5d6c bdb572781b +Alessandro Pasotti 2018-01-17 + + Merge pull request #6089 from elpaso/server-exception-on-image-overflow + + Server exception on image overflow + +Martin Dobias 2018-01-17 + + Added test + +Martin Dobias 2018-01-08 + + Fix retrieval of 4D geometries (XYZM) from postgres (fixes #17814) + +Alessandro Pasotti 2018-01-17 + + [server] Use std::numeric_limits instead of INT_MAX + +Denis Rouzaud 2018-01-16 + + fix .gitignore to add missing sip files + +Denis Rouzaud 2018-01-16 + + fix variable used for configuration + +Denis Rouzaud 2018-01-16 + + version compare is not strict + + also fix sipify test + +Denis Rouzaud 2018-01-16 + + run sipify + +Denis Rouzaud 2018-01-16 + + [sipify] remove space before semi-column + +Denis Rouzaud 2018-01-16 + + rename *.sip to *.sip.in for the auto generated sip files + +Denis Rouzaud 2018-01-16 + + [sipify] use configuration file for SIP sources (*.sip.in) + + to allow preprocessing the files to handle version specific features such as template based classes documentation in 4.19.7+ + +Denis Rouzaud 2018-01-15 + + SIP 4.19.7+ allows to document template based classes + +Alessandro Pasotti 2018-01-17 + + [server] Check image size for overflow and throw if null + + Because we don't wont a broken image in the output + when a null image is created. + + This introduces an additional check for null images + and a check for image size taken verbatim from QImage + internal checks. + + This fixes an unreported bug that produced a broken image + instead of a proper exception in case of size overflow + due to QImage internal checks or to out of memory conditions. + +Alessandro Pasotti 2018-01-17 + + [server][test] Add protocol and host:port to path in the test server + +pierre-eric 2017-12-18 + + [server] Fix layers group handling + + Load layers groups from project file to be able to use them in queries. + + Fixes #17668 + +nirvn 2018-01-17 + + fix type in map layer's exportNamedStyle() for min scale value + +nirvn 2018-01-17 + + use native separators for message bar hyperlinks + +nirvn 2018-01-17 + + [ui] add hyperlink to saved vector/raster in the message bar + +Nyall Dawson 2018-01-17 + + Avoid creating undo commands when converting compositions + +Etienne Trimaille 2018-01-16 + + fix missing QLabel python import + +Nyall Dawson 2018-01-16 + + Rename QgsApplication::composerTemplatePaths to layoutTemplatePaths + +Nyall Dawson 2018-01-16 + + Fix layout designer does not respect layout settings + +Denis Rouzaud 2018-01-16 + + fix QAction constr call + +Denis Rouzaud 2018-01-15 + + [QgsFilterLineEdit] use QLineEdit::addAction instead of hacking paintEvent + + this gets much more simple + +Denis Rouzaud 2018-01-16 + + let's build python API for server.... + + is it just me or it was never built? + +Nyall Dawson 2018-01-15 + + Add tags to buffer algorithm + +Nyall Dawson 2018-01-15 + + [processing][needs-docs] Hide variable distance buffer from toolbox + + This algorithm has become a model-only algorithm, since it's + functionality is now present in the native c++ buffer algorithm + (which can now buffer by field or expression). + + Ideally we'd remove this algorithm entirely, but data defined + parameters are not yet supported by the modeler gui, so we need + to keep it around for use in models for now. + +Nyall Dawson 2018-01-15 + + Fix modeler dialog doesn't respect hide from modeler flag + +Nyall Dawson 2018-01-15 + + [processing][needs-docs] Drop Fixed Distance Buffer algorithm + + Since it's functionality is a subset of the native c++ "buffer" + algorithm, it's no longer required. + +nirvn 2018-01-16 + + [processing] fix gdal's ogrinfo algorithm + +Mathieu Pellerin 2018-01-16 + + [processing] use combined vector and raster filters for map layer file picker + +Nyall Dawson 2018-01-16 + + Fix possible infinite recursion in layer tree model + +Mathieu Pellerin 2018-01-16 + + [ui] use a combobox for bool values in advanced settings tree (#6078) + +Nyall Dawson 2018-01-15 + + [needs-docs][processing] Add tooltips to input types in modeler + + ...to help clarify for users what the different input types mean. + + Fixes #17671, which is a result of unclear distinction between + the uses of vector features vs vector layer inputs. + + Tagged as needs-docs, as it may help with documentation for 3.0 + +Nyall Dawson 2018-01-15 + + [needs-docs] Rename some processing input types in modeler for clarity + + Refs #17671 + +Nyall Dawson 2018-01-15 + + Sort input types in processing modeler dialog + +Nyall Dawson 2018-01-16 + + Sipify + +Nyall Dawson 2018-01-16 + + Fix build + +Nyall Dawson 2018-01-16 + + Improved memory managment of algorithm dialogs + + Ensure that dialogs are always correctly deleted when appropriate. + + Also, if an algorithm is running in a background task and hits + an error, we automatically re-show the algorithm dialog and the + associated log for debugging. + + Fixes #16858 + +Nyall Dawson 2018-01-16 + + Show display name, not id, for background algorithm tasks + +Nyall Dawson 2018-01-16 + + Rename QgsTaskManager::triggered to taskTriggered + +Nyall Dawson 2018-01-09 + + When processing tasks are clicked in task manager, reopen the + algorithm dialog + +Nyall Dawson 2018-01-09 + + Add method to 'trigger' QgsTasks + + Triggering occurs when a task is clicked in the task manager + widget, and this can be used to e.g. open a dialog showing + detailed task progress (or reopen a closed dialog which started + the task) + +Nyall Dawson 2018-01-16 + + Drop fields in correct position in drag and drop designer + + Instead of always dropping fields at the end of the container, + insert them at the dropped location. Otherwise the drop indicator + line is misleading. + +nirvn 2018-01-16 + + move the iconsize setting into the qgis group, part 2 + +Nyall Dawson 2018-01-16 + + Fix default value 'apply on update' setting not correctly restored + + Fixes #17712 + +Nyall Dawson 2018-01-16 + + Hey, this isn't pal or openoffice... comments in English please! + +Nyall Dawson 2018-01-16 + + Save/restore form "editable" and "label on top" settings + + Fixes #17860 + +Nyall Dawson 2018-01-16 + + Remove unused variable + +Nyall Dawson 2018-01-16 + + Fix invalid connection in offline editing plugin + +Etienne Trimaille 2018-01-14 + + return empty CRS instead of 4326 if the XML is empty + +Nyall Dawson 2018-01-16 + + Fix layers cannot be individually deselected in offline editing plugin + + Fixes #16163 + +Nyall Dawson 2018-01-16 + + Sipify + +Nyall Dawson 2018-01-16 + + Indentation + +Nyall Dawson 2018-01-15 + + Add test for indexed memory provider thread safety + + Refs #17705 + +Nyall Dawson 2018-01-15 + + Add provider suite test for thread safety of provider getFeatures() + + Hammers providers by iterating through features from multiple threads + +nirvn 2018-01-16 + + place the iconsize setting inside the qgis group + +Nyall Dawson 2018-01-16 + + Fix initial positioning of floating widgets + +Denis Rouzaud 2018-01-13 + + add missing since and complete API brea doc + +Denis Rouzaud 2018-01-13 + + [user input widget] use a floating widget rather than a dock + + fix #15177 + +Harrissou Sant-anna 2018-01-13 + + Use a clearer variable name for settings + +Harrissou Sant-anna 2018-01-13 + + Add qgsfilewidget to dxf export dialog + +Harrissou Sant-anna 2018-01-13 + + Auto restore dialog geometry + fix help include + +Harrissou Sant-anna 2018-01-12 + + [ui] Update spacing in the scale widget + + for consistency with other widgets + +Harrissou Sant-anna 2018-01-11 + + Move map theme combobox near list of layers + + Because the map theme option may impact checked layers in the list, better have them close. + +Alexander Bruy 2018-01-15 + + [processing] add missed imports (fix #17843) + +Alexander Bruy 2018-01-15 + + [processing] improve layout of the raster calculator dialog + +Alexander Bruy 2018-01-15 + + [processing] quote layer names in raster calculator (fix #17847) + +Denis Rouzaud 2018-01-15 + + rmove entry from acceptable missing doc + +Denis Rouzaud 2018-01-15 + + also fix method capitalization + +Denis Rouzaud 2018-01-15 + + fix NMEA capitalization and doxygen + +Matthias Kuhn 2018-01-14 + + Rename QgsGPS prefixed classes to QgsGps + +Alessandro Pasotti 2018-01-15 + + Do not initialize unique_ptr to nullptr + +lbartoletti 2018-01-15 + + Revert "fix perl;add bash" + + This reverts commit be8b9113c25f7c2fb9c8c9bad556fbca2f0c0ba2. + +Merge: dc99b8b2f0 418d58752f +Alexander Bruy 2018-01-15 + + Merge pull request #6069 from volaya/fix_field_calculator + + [processing] added missing method to custom field calculator dialog + +lbartoletti 2018-01-15 + + Fix indentation using modified scripts + +Merge: 7064704868 61c704733c +lbartoletti 2018-01-15 + + Merge branch 'usr_bin_env' of https://github.com/lbartoletti/QGIS into usr_bin_env + +volaya 2018-01-15 + + [processing] added missing method to custom field calculator dialog + + A much better way of doing this would be to have the dialog extend qgsprocessingalgorithmdialogbase, or to take an approach like the one used in the raster calculator, with wrapper widgets. + This is just a patch, since that option might require a larger amount of work. + +Alessandro Pasotti 2018-01-15 + + [bugfix] Transfer focus to canvas when selecting transparency + + This is an attempt to fix #17845 Setting Raster Transparency + using "Add values from display" doesn't work + + Fixes #17845 + +Alexander Bruy 2018-01-15 + + [processing] add missed return statement (fix #17821) + +Alexander Bruy 2018-01-15 + + [processing] rename QGISAlgorithmProvider to QgisAlgorithmProvider to be + consistent with our guidelines + +Alexander Bruy 2018-01-15 + + [processing] update script collection metadata and homogenize quotes + +Alexander Bruy 2018-01-15 + + [processing] correctly retrieve icon for script collection (fix #17780) + +Merge: afb1bce661 ebed93f1bb +Borys Jurgiel 2018-01-15 + + Merge pull request #6055 from borysiasty/browser-geopackage-v2 + + A simpler way to Fix broken Geopackage paths with spaces + +Merge: b8518aef9c 5505202002 +Blottiere Paul 2018-01-15 + + Merge pull request #5663 from pblottiere/bugfix-transaction-name + + [FEATURE] Add a name for transactions created from executeSql + +Alexander Bruy 2018-01-15 + + remove duplicated parameter from r.in.wms module (fix #17815) + +Blottiere Paul 2017-12-01 + + Update documentation + +Blottiere Paul 2017-11-10 + + Add test + +Blottiere Paul 2017-11-10 + + Add a name to transaction command + +Harrissou Sant-anna 2018-01-15 + + Add missing translatable strings + +Mathieu Pellerin 2018-01-15 + + [gui] do not automatically format name of added layers (fixes #17741) + + (users wanting to re-enable that behavior can do so by switching + qgis/formatLayerName to true) + +Steven Mizuno 2017-12-22 + + run sipify + +Steven Mizuno 2017-12-21 + + remove Windows OS specific event filter that eats context menu events + + fixes #17453 + +Nyall Dawson 2018-01-12 + + Drop color button/dialog live update option from API and UI + + This options is broken in QGIS 3.0, but in any case has been + mostly made redundant by the live styling dock, and the other + non blocking color pickers which are implemented in most areas + of qgis now. + +Harrissou Sant-anna 2018-01-15 + + Avoid 'geometry' field name being translated when creating new SpatiaLite layer (#6059) + +Nyall Dawson 2018-01-15 + + Rename QgsVectorLayer::pkAttributeList to primaryKeyAttributes() for consistency + +Nyall Dawson 2018-01-12 + + Drop QgsVectorLayer::pendingFeatureCount() + + Use QgsVectorLayer::featureCount() instead. + +Nyall Dawson 2018-01-12 + + Drop QgsVectorLayer::pendingAllAttributesList() + + Use QgsVectorLayer::allAttributes() instead. + +Nyall Dawson 2018-01-12 + + Drop QgsVectorLayer::pendingFields() + + Use QgsVectorLayer::fields() instead. + +Harrissou Sant-anna 2017-12-29 + + Add precision to message + +Juergen E. Fischer 2018-01-14 + + avoid including GDAL C++ api (fixes #17849) + +Harrissou Sant-anna 2018-01-14 + + Avoid translated name for fields when creating a new gpkg layer (#6058) + +Juergen E. Fischer 2018-01-13 + + debian packaging: add bionic + +Juergen E. Fischer 2018-01-13 + + translation string fix + +Borys Jurgiel 2018-01-13 + + Fix broken encoding of spaces in Geopackage file paths in the browser + +Denis Rouzaud 2018-01-12 + + [sipify] prevent creation of param list when not necessary + +Denis Rouzaud 2018-01-12 + + run sipify + +Denis Rouzaud 2018-01-12 + + [sipify] fix multiline note or warning + +David 2018-01-12 + + write correct tooltip + +David 2018-01-12 + + tooltip for cardinality in relationedit + + write tooltip in the attributesformproperties on cardinality in relationedit that the user gets more info about many to many relation. + +David 2018-01-11 + + relation cardinality bugfix + + relation cardinality was handled with it's name as QString instead of it's value as QVector and this leaded to problems in the attribute form. + + Fix #17805 + +Denis Rouzaud 2018-01-12 + + [options search] do not show widget when text is found (#6052) + + fix #17812 + +Etienne Trimaille 2018-01-12 + + make link clickable in metadata widget + +Mathieu Pellerin 2018-01-12 + + [snapping] fix missing layers in snapping config dialog (fixes #17792) (#6026) + +Mathieu Pellerin 2018-01-12 + + improve sorting of field values for the query builder (#6046) + +Merge: d6ef2b60c1 ff96e1d3b0 +Matthias Kuhn 2018-01-12 + + Merge pull request #6040 from signedav/crashfix + + mapLayerActions as members - avoiding crash on closing QGIS + + Fix #17839 + +David 2018-01-12 + + not passing parent to duplicate actions + + and removed the QString + +Mathieu Pellerin 2018-01-12 + + [need-docs] reduce width of the meters (at map scale) unit label (#6034) + +Mathieu Pellerin 2018-01-12 + + sort 10 sample / all unique values list in the expression builder widget (#6045) + +Merge: 545ac27e33 92739453f2 +Matthias Kuhn 2018-01-12 + + Merge pull request #6035 from m-kuhn/uxfixcomment + + Fix long comments clutter in form configuration + +Alessandro Pasotti 2018-01-11 + + [layout] Import guides from 2.x composition + +Merge: 90c07ef045 0bc3d68162 +rldhont 2018-01-11 + + Merge pull request #6038 from rldhont/server-qgis3-imagequality + + [BUGFIX][Server] imageQuality has to be used for JPEG images not PNG + +Alessandro Pasotti 2018-01-11 + + [layout][need-docs] Renamed GUI elements from composer to layouts + + Also renamed some .ui variables + +rldhont 2018-01-11 + + [BUGFIX][Server] imageQuality has to be used for JPEG images not PNG + + During the server refactoring, the imageQuality has been applied to all format even if this option has been defined only for JPEG. + + This bugfix respects the initial proposition https://github.com/qgis/QGIS/pull/1403 + QGIS Server - new project option imageQuality used for JPEG images #1403 + +David 2018-01-11 + + mapLayerActions as members - avoiding crash + + mDuplicateFeatureAction and mDuplicateFeatureDigitizeAction are member pointers now. + Means they are deleted when the object QgisApp is destructed (when going out of scope) and there is no crash anymore on closing QGIS. + +Merge: 3f55bba535 d63f4c7658 +Alessandro Pasotti 2018-01-11 + + Merge pull request #6036 from elpaso/server-getprint-two-maps-test + + [server][test] GetPrint test with two maps template + +Alessandro Pasotti 2018-01-11 + + [server][test] GetPrint test with two maps template + + This is to test that map0 and map1 actually refer to the + correct maps + +Matthias Kuhn 2018-01-11 + + Linebreaks on long comments + +Matthias Kuhn 2018-01-11 + + Remove leftover file + +Alexander Bruy 2018-01-11 + + [processing] don't close algorithm dialog after execution + +Merge: e137ea8a9d bb40de3919 +Matthias Kuhn 2018-01-11 + + Merge pull request #5900 from m-kuhn/layerPropsStyleInTitle + + Show style name in layer properties dialog title + +Harrissou Sant-anna 2018-01-11 + + Add lpad truncate test (#5947) + +Nyall Dawson 2018-01-11 + + [layouts] Middle mouse click in pan tool should recenter view + + Port missing functionality from composer + +Nyall Dawson 2018-01-11 + + Drop composer class from gui library + +Merge: 880d853e9f f61a5f2f63 +Alessandro Pasotti 2018-01-10 + + Merge pull request #6031 from elpaso/layouts-server + + [layouts][server] Composition -> layout + +Alessandro Pasotti 2018-01-10 + + [layout][server] Rename some vars composer->layout + +Alessandro Pasotti 2018-01-10 + + [layout][server] Const correctnes and typos + +Alessandro Pasotti 2018-01-10 + + [layout][server] Update tests and mask images + +Alessandro Pasotti 2018-01-10 + + [layout][server] Get layout size in mm + +Alessandro Pasotti 2018-01-10 + + Disable diff image encoded output + +Alessandro Pasotti 2018-01-10 + + [layout][server] Re-enable WMS server tests + +Alessandro Pasotti 2018-01-10 + + [layout][server] composer -> layout in getprint + +Alessandro Pasotti 2018-01-10 + + [layout][server] composer -> layout in getcapabilities + +Alessandro Pasotti 2018-01-10 + + [layout] Fix setKeepLayerSet in map composer import + +Alessandro Pasotti 2018-01-10 + + [layout] Add printLayouts to return all print layouts contained in the manager + +Denis Rouzaud 2018-01-10 + + detect SIP version to add DefaultDocstringSignature directive (#6030) + + * detect SIP version to add DefaultDocstringSignature directive + + SIP doesn't handle any kind of preprocessing, so there's no better solution than configuring the SIP files from CMake. + SIP 4.19.7+ supports %DefaultDocstringSignature to prepend auto-generated Python signature to existing Docstrings + +Mathieu Pellerin 2018-01-10 + + [layouts] fix layout designer restore window state / geometry + +Nyall Dawson 2018-01-10 + + Fix mouse cursor size on lo-dpi Windows builds + +Nyall Dawson 2018-01-10 + + Show item size in status bar when creating a new item + +Nyall Dawson 2018-01-10 + + Drop composer from app + +Denis Rouzaud 2018-01-09 + + [sipify] fix bad handling of \see within sentences + + and other docstrings improvements + +Merge: 6894c8e1cd 240c52a4c0 +Nyall Dawson 2018-01-10 + + Merge pull request #5807 from nyalldawson/alg_background + + [processing] Add flag to indicate whether an algorithm is safe + +Denis Rouzaud 2018-01-09 + + get me out of Europe + +Merge: df3f663c14 70cb249595 +Nathan Woodrow 2018-01-10 + + Merge pull request #5522 from gacarrillor/developersmap + + Developers Map: show more descriptive info + +Mathieu Pellerin 2018-01-10 + + [authentification manager] fix auth exec error (#6020) + +Nyall Dawson 2018-01-10 + + Fix build warning on windows + +Nyall Dawson 2018-01-10 + + [processing] Show a modal progress dialog when running algorithms + which cannot run in background tasks + + This is not fantastic UX, but we have lots of constraints here: + + - The algorithm dialog itself cannot be made modal. There's child + widgets (such as the point and extent parameter widgets) which + interact with the main QGIS window. + - There is no reliable way in Qt to make a dialog modal after + it's shown (e.g. make it modal only when the algorithm is + running). Trust me - I've tried everything, and all approaches + break with some corner case. + - For non-background algorithms, we must have processEvents calls + in order to show the algorithm feedback and progress to users, + and detect cancel button clicks. Yet these processEvents calls + means that users can interact with other parts of QGIS, e.g. + removing layers from a project, and other operations which + could cause the algorithm to crash. So we MUST have some modal + dialog in order to block interactions outside of allowing + the cancel button clicks/progress repainting. + + I've tried many approaches, but this is the only one which + works reliably... + +Nyall Dawson 2018-01-10 + + When an algorithm can run in the background, show this in the alg dialog + +Nyall Dawson 2018-01-10 + + Fix task manager UI sizes on hidpi displays + +Merge: 5babec5e07 6332fc6454 +Alessandro Pasotti 2018-01-09 + + Merge pull request #5913 from elpaso/layouts-import-from-2 + + [layouts] import from 2.x + +Alessandro Pasotti 2018-01-09 + + [layout] Temporarily disable WMS server tests + + Until the composition -> layout transition is done + +Nyall Dawson 2017-12-05 + + Most c++ algorithms can run safely in background threads + +Nyall Dawson 2017-12-05 + + Fix a possible crash in network analyser + +Nyall Dawson 2017-12-05 + + [processing] When running non-background enabled algorithms, use + processEvents to allow progress updates and cancelation clicks + +Nyall Dawson 2017-12-05 + + [processing] Add flag to indicate whether an algorithm is safe + to run in a background thread + +Denis Rouzaud 2018-01-09 + + run sipify + +Denis Rouzaud 2018-01-09 + + [sipify] fix SIP new restrictions on Docstrings + + class members, operators cannot be documented anymore + +Alessandro Pasotti 2018-01-09 + + [layout] Address PR comments and add test for layoutObjects template + +Alessandro Pasotti 2018-01-09 + + [layout] Update reference images + +Alessandro Pasotti 2018-01-09 + + [layout] Remove legacy import + +Alessandro Pasotti 2018-01-09 + + [layout] Added template method to retrieve QgsLayoutObjects + +Merge: 90fc756bf1 8b60b4c3c7 +Matthias Kuhn 2018-01-09 + + Merge pull request #5979 from m-kuhn/lrelease-silent + + [server] Fix unused variable + +Merge: 97c005a544 c3f4fcb1b4 +Matthias Kuhn 2018-01-09 + + Merge pull request #6019 from DelazJ/dxf-map-theme + + Rename command line dxf-preset option to dxf-map-theme + +Harrissou Sant-anna 2018-01-09 + + Rename command line dxf-preset option into dxf-map-theme + +Alessandro Pasotti 2018-01-09 + + Fix test after composition bindings removal + +Alessandro Pasotti 2018-01-09 + + Add print template to spell ignore + +Alessandro Pasotti 2018-01-08 + + [layout] Import attribute table from composition + +Alessandro Pasotti 2018-01-08 + + [layout] Import HTML and atlas from 2.x composition + +Alessandro Pasotti 2018-01-03 + + [layout] Fix title from name when converting a composition + +Alessandro Pasotti 2018-01-03 + + [layout] Add map rendering to tests + +Alessandro Pasotti 2018-01-03 + + [layout] Check for pointer as bool instead of compare + + Travis does not like the second. + +Alessandro Pasotti 2018-01-02 + + [layout] Added tests for uuid linked maps + + Also updated the control images + +Alessandro Pasotti 2018-01-02 + + [layout] Use uuids for map references in items + + Implemented: + + - picture + - legend + - overview + - scalebar + +Alessandro Pasotti 2018-01-02 + + [layout] Fixed relative paths for test resources + +Alessandro Pasotti 2017-12-20 + + [layouts] test masks for rendering tests + +Alessandro Pasotti 2017-12-20 + + [test] Do not check the unique_ptr but get + + Because std::unique_ptr is not implicitly convertible to bool + (why it works locally remains a mistery to me) + +Alessandro Pasotti 2017-12-20 + + [layouts] Removed diff images and adapted tests + + to use QGIS font + + Also addressed comments in the PR + +Alessandro Pasotti 2017-12-19 + + Typos + +Alessandro Pasotti 2017-12-19 + + Added diff images for tests + +Alessandro Pasotti 2017-12-19 + + Updated test for imported compositions + +Alessandro Pasotti 2017-12-19 + + Removed docs for private members + +Alessandro Pasotti 2017-12-19 + + Sipify + +Alessandro Pasotti 2017-12-19 + + [layout] connect converted to loader code + +Alessandro Pasotti 2017-12-19 + + Remove SIP annotation + +Alessandro Pasotti 2017-12-19 + + Ignore spell check for qgs project + +Alessandro Pasotti 2017-12-19 + + [layout] Disable ref images generation and added docs + +Alessandro Pasotti 2017-12-19 + + Removed some TODOs + +Alessandro Pasotti 2017-12-19 + + [layout] Convert scalebar and legent from 2.x + +Alessandro Pasotti 2017-12-18 + + [layout] Import some more items: map, poly* and arrow + +Alessandro Pasotti 2017-12-18 + + Added test composer templates for import test + +Alessandro Pasotti 2017-12-18 + + Added optional argument to create reference layout images + +Alessandro Pasotti 2017-12-18 + + Renamed some private vars to follow coding guidelines + +Alessandro Pasotti 2017-12-16 + + [layout] Converter: fix frame fill in shapes + +Alessandro Pasotti 2017-12-16 + + [layout] Converter: shapes + +Alessandro Pasotti 2017-12-15 + + [layout] Converter: initial implementation + +Merge: 566704a720 57c2f1d3da +Alexander Bruy 2018-01-09 + + Merge pull request #6017 from nyalldawson/algs + + [processing] Fix some numeric parameters which should be doubles + +Merge: a934060d4c 712093731a +Alexander Bruy 2018-01-09 + + Merge pull request #5968 from medspx/ProcessingGrassFixExt + + [Processing] GRASS fix all ext scripts + +Nyall Dawson 2018-01-09 + + Refine algorithm name and tags + +Nyall Dawson 2018-01-09 + + Fix some numeric parameters which should be doubles + +Nathan Woodrow 2018-01-09 + + Fix Windows build warnings + +Nyall Dawson 2018-01-09 + + Use svg version of python console icon, courtesy of @pkinglinz (#6016) + +Nyall Dawson 2017-12-10 + + Slightly decrease contrast on field type icons to avoid too-visually + heavy icons + +Nathan Woodrow 2018-01-09 + + Crashhandler allthreads (#6013) + + * [CrashHandler] Suspend all threads on crash + +Nyall Dawson 2018-01-09 + + Followup 897f900, remove other incorrect declarations + +Tom Elwertowski 2018-01-08 + + Remove orphan prototype. 3b3d304 removed method and remaing prototype shadows actual method elsewhere causing GRASS plugin link failure from qgsgrassaddfeature.cpp. + +Merge: 9e704ebceb 2eaf4de2ca +Matthias Kuhn 2018-01-08 + + Merge pull request #5961 from signedav/work_contextmenu + + Contextmenu with individual actions + +David 2017-12-29 + + Contextmenu with individual actions + + Individual actions in the contextmenu of the attributetable and the relationeditorwidget. + It's unlink and delete feature in the relationeditorwidget. + It's delete feature in the attributetable (form view) + +Merge: 2b8143a206 0d1557c271 +Matthias Kuhn 2018-01-08 + + Merge pull request #5922 from signedav/work_duplicategeom + + [FEATURE] "Duplicate feature redigitized" in MapLayerActions + +Merge: 9ba5324b67 2b8143a206 +Matthias Kuhn 2018-01-08 + + Merge branch 'master' into work_duplicategeom + +Merge: 5e7865ca10 2b8143a206 +Matthias Kuhn 2018-01-08 + + Merge branch 'master' into work_duplicategeom + +Nyall Dawson 2018-01-08 + + Fix a TODO, restore correct variable handling for layouts + +Merge: 8dfb17d5d5 7d4290d924 +Matthias Kuhn 2018-01-08 + + Merge pull request #5925 from signedav/duplicateChildsRelation + + [FEATURE] Duplicate child feature in releationwidget of attributeform + +Borys Jurgiel 2018-01-08 + + Store QGISCUSTOMIZATION3.ini next to QGIS3.ini in the profile directory. Fixes #17794. (#5999) + +Nathan Woodrow 2018-01-08 + + Enable composition mode for advanced drawing (#6009) + + * Enable composition mode for advanced drawing + + Makes the lines pop off the map more and not get lost in the background. + + Also adjusts the line size up to 1 as .7 it really small. + +Nyall Dawson 2018-01-08 + + Code shuffle + +Nyall Dawson 2018-01-08 + + Drop all composer classes from Python bindings + +Nyall Dawson 2018-01-08 + + Update test masks + +Nyall Dawson 2018-01-08 + + Port pal composer test to labels + +Nyall Dawson 2018-01-08 + + Remove some more redundant tests, add sip subclassing + +Nyall Dawson 2018-01-08 + + More composer->layout action swapping + + Compositions are now only accessible via the composer manager + in the projects menu. This will be removed when the converter + work is merged. + +Nyall Dawson 2018-01-08 + + Swap composers menu to show layouts instead + +Nyall Dawson 2018-01-08 + + Remove some old composer theme related code + +Nyall Dawson 2018-01-08 + + Flip layout locator filter to use layouts, not composers + +Nyall Dawson 2018-01-08 + + Remove all interface methods and UI for creating new composers + +Nyall Dawson 2018-01-07 + + Remove a redundant test + +Nyall Dawson 2018-01-07 + + Fix storing/reading multiframe items (TODO fix undo/redo support) + +Nyall Dawson 2018-01-07 + + Fix crash when deleting multiframe item child frames + +Juergen E. Fischer 2018-01-07 + + translation string fix + +Nyall Dawson 2018-01-07 + + Add missing break + +Merge: 0f1cb25085 7a2e6a476f +Médéric RIBREUX 2018-01-07 + + Merge branch 'ProcessingGrassFixExt' of https://github.com/medspx/qgis into ProcessingGrassFixExt + +Médéric RIBREUX 2018-01-07 + + Fix v.external default configuration and handling + +Matthias Kuhn 2018-01-03 + + Remove unused variable + +Nyall Dawson 2018-01-07 + + Standardise some layout api method naming/behavior + +Nyall Dawson 2018-01-07 + + Remove another redundant composer test + +Nyall Dawson 2018-01-07 + + Remove composer tests relating to template substitution maps + + This API feature was not used anywhere in master, and is no + longer available in the layouts engine. + + Better to use expression variables to meet the same use case. + +Tim Sutton 2018-01-07 + + Fix metadata qmd restore issues described here: https://github.com/qgis/QGIS/pull/5379#issuecomment-355410105 + +Etienne Trimaille 2018-01-02 + + load and save metadata to a QMD file + +Merge: 7605fde911 248ad5f763 +Alessandro Pasotti 2018-01-06 + + Merge pull request #6000 from elpaso/bugfix-17795-ogr-filtered-readonly + + [bugfix][ogr] Recompute capabilities when subsetfilter is set + +Alessandro Pasotti 2018-01-06 + + Get rid of the connect for capabilities update + +Matthias Kuhn 2018-01-03 + + [travis]Do not fold build + +Matthias Kuhn 2018-01-03 + + Make lrelease silent + +Nyall Dawson 2018-01-06 + + Update test masks + +Nyall Dawson 2018-01-06 + + Fix build + +Nyall Dawson 2018-01-06 + + Drop some python composer tests + +Nyall Dawson 2018-01-06 + + Port some more tests to layouts, drop composer tests which + have been ported to layouts + +Merge: d300310d9c 89884e8a0c +Nyall Dawson 2018-01-06 + + Merge pull request #5997 from nyalldawson/report_label + + Show a label in layout designer for report sections + +Nyall Dawson 2018-01-06 + + Fix default filename for atlas pdf outputs + +Nyall Dawson 2018-01-06 + + Show section label for atlas preview too + +Nyall Dawson 2018-01-06 + + Avoid drawing clipped section labels + +Nyall Dawson 2018-01-06 + + Tweak section descriptions + +Alessandro Pasotti 2018-01-05 + + Lambda indentation + +Merge: 337cc70037 d7b4bffdc8 +Denis Rouzaud 2018-01-05 + + Merge pull request #5993 from 3nids/test_datetimeedit + + add test for date/time edit + +Alessandro Pasotti 2018-01-05 + + [bugfix][ogr] Tests for capabilities update on filter changes + + Fixes #17795 + +Alessandro Pasotti 2018-01-05 + + [bugfix][ogr] Recompute capabilities when subsetfilter is set + + Need to re-open in rw mode if mDynamicWriteAccess + +Matthias Kuhn 2018-01-05 + + Normalize cursor size + +Merge: ed2f0563eb 42976df82e +Denis Rouzaud 2018-01-05 + + Merge pull request #5992 from 3nids/fix17790 + + fix NULL constraint on date/time widget with allow NULL + +Denis Rouzaud 2018-01-04 + + add test for date/time edit + +Matthias Kuhn 2018-01-05 + + Document API break + +Matthias Kuhn 2018-01-05 + + Fix old-style connect + +Matthias Kuhn 2018-01-05 + + Cleanup misleading QgsEditorWidgetWrapper::valueChanged signals + +Matthias Kuhn 2018-01-05 + + Remove double import; Followup ab05bfb + +Juergen E. Fischer 2018-01-05 + + packaging updates + +Alessandro Pasotti 2018-01-05 + + [bugfix] Add failing test for OGR setSubsetString + + Fails to revert to rw after a subset string is set and cleared + +Nyall Dawson 2018-01-05 + + Show a label in layout designer for report sections + +Merge: 63cc1246df bf6c95d575 +Nyall Dawson 2018-01-05 + + Merge pull request #5966 from nyalldawson/layout_next + + [layouts] Atlas and reporting framework + +Nyall Dawson 2018-01-05 + + Add icons for report section types, and show pencil 'editing' + icon in report organizer for section currently being edited in + the designer + + This should help indicate to users which section is currently being + edited and give more visual hints as to exactly what's happening + in the ui. + +Nyall Dawson 2018-01-05 + + Show section name in layout designer title + + To make it clearer which section is currently being edited + +Nyall Dawson 2018-01-05 + + Use correct QgsSettings keys for layouts + +Nyall Dawson 2018-01-05 + + Rename some test methods + +Nyall Dawson 2018-01-05 + + Fix atlas actions not immediately available for map items + when toggling atlas enabled + +Nyall Dawson 2018-01-05 + + Make some actions apply to reports when a report designer is open + +Nyall Dawson 2018-01-05 + + Auto generated names for reports are 'Report #' + +Nyall Dawson 2018-01-05 + + Explicitly disable remove button if no child report section is selected + +Nyall Dawson 2018-01-05 + + Fix crash on report designer close + +Nyall Dawson 2018-01-05 + + If no section is selected, add new sections to report itself + +Nyall Dawson 2018-01-05 + + Don't tabify report settings with item properties + +Nyall Dawson 2018-01-05 + + Make report/atlas settings actions checkable, so they can also hide the panels + +Nyall Dawson 2018-01-05 + + Ensure report dock is visible when opening a report designer + +Nyall Dawson 2018-01-05 + + Use correct layout type (report/print layout) in new title dialog + +Denis Rouzaud 2018-01-04 + + do not override QDateTimeEdit::dateTimeChanged + + see https://github.com/KDE/clazy/commit/de031867458c6ebf144feaec4df246d93c2f6dbd#diff-f135574df9edcdda660e1bc4320a053e + +Denis Rouzaud 2018-01-04 + + doxymentattion + +Merge: df95536715 164c439af9 +Nyall Dawson 2018-01-05 + + Merge pull request #5986 from nyalldawson/geometry_equals + + Refine geometry equals checks + +Nyall Dawson 2018-01-02 + + Fix failing unit test + +Nyall Dawson 2018-01-02 + + Nicer ui widgets for sections, add missing control for + disabling body sections + +Nyall Dawson 2018-01-02 + + Use 'report' text instead of 'atlas' when inside a report designer + +Nyall Dawson 2018-01-02 + + Fix missing feature contexts for report section header/footers + + and expand unit tests + +Nyall Dawson 2018-01-02 + + Restore direct print actions + +Nyall Dawson 2018-01-01 + + Swap 'set atlas feature' action from compositions to layouts + + Time to start making a permenant switch... + +Nyall Dawson 2018-01-01 + + Add method to seek atlas directly to a QgsFeature + +Nyall Dawson 2018-01-01 + + Add new icon for atlas exports (courtesy of @nirvn) + +Nyall Dawson 2018-01-01 + + Fix crash on close project with layout designer open + +Nyall Dawson 2018-01-01 + + Ensure main canvas is refreshed when atlas preview feature changes + +Nyall Dawson 2017-12-31 + + Add test mask + +Nyall Dawson 2017-12-31 + + Dox and spelling + +Nyall Dawson 2017-12-31 + + Auto select new report sections after adding them + +Nyall Dawson 2017-12-31 + + Fix missing Report top level item in organizer widget + +Nyall Dawson 2017-12-30 + + Expand report sections by default + +Nyall Dawson 2017-12-30 + + Fix progress bar with report export + +Nyall Dawson 2017-12-30 + + More UI work on reports + +Nyall Dawson 2017-12-30 + + Add buttons for exporting reports + +Nyall Dawson 2017-12-30 + + Start on ui for configuring reports + +Nyall Dawson 2017-12-30 + + Fix project retrieval for QgsReport + +Nyall Dawson 2017-12-30 + + Add a row method to QgsAbstractReportSection + +Nyall Dawson 2017-12-30 + + Fix clashing inherited methods + +Nyall Dawson 2017-12-30 + + Sort layouts in layout manager + +Nyall Dawson 2017-12-30 + + Add crappy inappropriate icons for layout types + +Nyall Dawson 2017-12-30 + + Cleaner way to hide atlas controls when not using a print layout + +Nyall Dawson 2017-12-30 + + Disable layout designer actions when no layout is set + +Nyall Dawson 2017-12-30 + + Add button in layout manager dialog to create a new report + +Nyall Dawson 2017-12-30 + + Fix multiple empty layouts created when reloading project + + In related news... I find it frustrating that there's no + way in Qt to restrict elementsByTagName to direct descendants + only, and that all other available API calls for searching + only direct descendants are much more fiddly... + +Nyall Dawson 2017-12-30 + + Protect layout view against null layouts + +Nyall Dawson 2017-12-29 + + Implement sort order customisation for field groups + +Nyall Dawson 2017-12-29 + + Implement serialization of reports + +Nyall Dawson 2017-12-29 + + Add a common base class for print layouts and reports, and adapt + QgsLayoutManager to suit + +Nyall Dawson 2017-12-29 + + Code shuffle and cleanup + +Nyall Dawson 2017-12-29 + + Implement QgsReportSectionFieldGroup + +Nyall Dawson 2017-12-29 + + Correct project and parent handling for report sections + +Nyall Dawson 2017-12-29 + + Add a unit test for exporting reports + +Nyall Dawson 2017-12-29 + + Hookup filename generation for reports + +Nyall Dawson 2017-12-29 + + Add reprt iteration test + +Nyall Dawson 2017-12-29 + + Add report section subclass with single layout as body + +Nyall Dawson 2017-12-29 + + Add missing factory annotation + +Nyall Dawson 2017-12-29 + + [FEATURE] Reporting framework + + Reports are based on the new layouts engine. They consist of multiple + nested sections. Each individual section (and the report itself) + can have an optional header and footer (which are themselves layouts, + and can consist of multiple pages!). + + Two different types of sections are implemented so far: + - a standard section, which has a single, static body layout. This + can be used to embed static layouts mid way through a report + - a "field group" section, which repeats its body layout for + every feature in a layer. The features are sorted by the selected + grouping feature (with an option for ascending/descending sort). + If a field group section has child sections (e.g. another field + group section with a different field, then only features + with unique values for the group feature are iterated over. + This allows nested reports, e.g. + + Report + - Country: Australia + - State: NSW + - Town: Sydney + - Town: Woolongong + - State: QLD + - Town: Beerburrum + - Town: Brisbane + - Town: Emerald + - Country: NZ + - State: ... etc + + In this example country, state or town groups can have their + own headers and footers which will be inserted in the report. + + Reports are configured through a new panel in the layout designer + dialog, which is shown when editing a report (created through + the Layout Manager Dialog). The organizer allows for adding + (and removing) sections to the report, and for selecting which + layout (e.g. headers, footers, bodies) to edit within the + layout designer. + +Nyall Dawson 2017-12-29 + + Remove const from count method + +Nyall Dawson 2017-12-29 + + Add a clone method to QgsLayout + +Nyall Dawson 2017-12-28 + + Refactor layout context + + Split render context from reporting context + +Nyall Dawson 2017-12-28 + + Ensure that every iteration through a layout iterator only + references the current iteration layout + +Nyall Dawson 2017-12-28 + + Expand exporter tests + +Nyall Dawson 2017-12-28 + + Try (and fail) to avoid a qApp->processEvents() call + + I just can't find any other reliable way to wait until javascript + execution in a web page has completed. + +Nyall Dawson 2017-12-28 + + Restore more unit tests + +Nyall Dawson 2017-12-28 + + Restore more atlas tests + +Nyall Dawson 2017-12-28 + + Restore some more atlas related tests + +Nyall Dawson 2017-12-28 + + Fix some layout expression context handling, restore some tests + +Nyall Dawson 2017-12-28 + + Fix broken atlas handling of z/m layer types + +Nyall Dawson 2017-12-23 + + Force a refresh after disabling view updates + +Nyall Dawson 2017-12-23 + + Restore atlas multiple pdf exports + +Nyall Dawson 2017-12-23 + + Restore atlas single file pdf export + +Nyall Dawson 2017-12-23 + + Restore svg atlas export + +Nyall Dawson 2017-12-23 + + Restore atlas raster format handling + +Nyall Dawson 2017-12-23 + + Hookup raster atlas export in gui + +Nyall Dawson 2017-12-23 + + Add api to export layout atlas as images + +Nyall Dawson 2017-12-23 + + Flesh out QgsAbstractLayoutIterator interface + +Nyall Dawson 2017-12-23 + + Tighten QgsAbstractLayoutIterator interface + +Nyall Dawson 2017-12-23 + + Restore atlas map handling + +Nyall Dawson 2017-12-23 + + Port predefined scale handling to layouts + +Nyall Dawson 2017-12-23 + + Fix some map item todos + +Nyall Dawson 2017-12-23 + + Remove outdated icon support for item metadata + + Now handled in QgsLayoutItem directly + +Nyall Dawson 2017-12-23 + + Fix some untranslatable strings + +Nyall Dawson 2017-12-23 + + Remove some outdated todos + +Nyall Dawson 2017-12-23 + + Restore legend atlas behavior + +Nyall Dawson 2017-12-23 + + Port current geometry from atlas to layouts + +Nyall Dawson 2017-12-23 + + Code shuffle, to make QgsLayoutContext aware of parent QgsLayout + +Nyall Dawson 2017-12-23 + + Restore picture atlas handling + +Nyall Dawson 2017-12-23 + + Restore HTML item atlas functionality + +Nyall Dawson 2017-12-20 + + Restore some more atlas style related UI + +Nyall Dawson 2017-12-20 + + Restore some more atlas handling + +Nyall Dawson 2017-12-20 + + Restore shape atlas handling + +Nyall Dawson 2017-12-20 + + Restore attribute table atlas handling + +Nyall Dawson 2017-12-20 + + Working label updates on atlas feature change + +Nyall Dawson 2017-12-20 + + Add atlas expression context scope to layouts + +Nyall Dawson 2017-12-20 + + Restore atlas based autogenerated filenames + +Nyall Dawson 2017-12-20 + + Add some unit tests + +Nyall Dawson 2017-12-20 + + Use messagebar for atlas messages instead of message box + +Nyall Dawson 2017-12-20 + + Remove outdated TODO + +Nyall Dawson 2017-12-20 + + Atlas sort can be an expression + +Nyall Dawson 2017-12-19 + + More work on atlas GUI + +Nyall Dawson 2017-12-19 + + Work on modernizing atlas + +Nyall Dawson 2017-12-19 + + Undo/redo for atlas settings changes + +Nyall Dawson 2017-12-19 + + Start porting atlas GUI + +Nyall Dawson 2017-12-19 + + Serialize atlas settings + +Nyall Dawson 2017-12-19 + + The layouts currently stored with a project are QgsPrintLayouts + + In future other layout types will be stored in projects, but + for now we only have print layouts + +Nyall Dawson 2017-12-19 + + Add QgsLayout subclass, QgsPrintLayout + + A print layout is a layout with an atlas + +Nyall Dawson 2017-12-19 + + Start working on restoring atlas + +Denis Rouzaud 2018-01-04 + + fix NULL constraint on date/time widget with allow NULL + + the issue was that widget wrapper was using parent QDateTimeEdit::dateTimeChanged signal. It was connected both internally to QgsDateTimeEdit::changed and in the form to detect changes. When QgsAttributeForm was recreating the updated feature it was calling QgsDateTimeEdit::value() before changed() could update the value (i.e. setting mIsNull to false). + + fix #17790 + +Nyall Dawson 2018-01-05 + + Add missing docs + +Nyall Dawson 2018-01-05 + + Swap some geometry equality checks to topological checks + +Nyall Dawson 2018-01-04 + + Refine behavior of QgsGeometry equals tests + + Before we had two checks - equals() and isGeosEqual() which + performed the exact same check (since equals() called the geos + equality test) + + Since the geos equality test is a slow, topological test, which + considers two geometries equal if their component edges overlap, + but disregards ordering of vertices this is not always what we + want. There's also the issue that geos cannot consider m values + when testing the geometries, so two geometries with different + m values would be reported equal. + + So, now calling QgsGeometry::equals performs a very fast, strict + equality test where geometries are only equal if the have exactly + the same vertices, type, and order. + + And swap most code which was calling the slow geos test to instead + use the fast strict native test. + +Nyall Dawson 2018-01-04 + + Expand equality operators for QgsAbstractGeometry subclasses + +Nyall Dawson 2018-01-05 + + Fix build warnings + +Martin Dobias 2018-01-05 + + [3d] Fix a crash when restoring a project with bad layer ref (fixes #17687) + +Juergen E. Fischer 2018-01-04 + + oracle provider: adapt to ab05bfb1 + +Juergen E. Fischer 2018-01-04 + + translation string updates (incl. better translatable date time widget + help) + +Denis Rouzaud 2018-01-04 + + use appropriate field type in date time edit widget wrapper + +Matthias Kuhn 2018-01-04 + + Move QGISDEBUG definition to header + + Because having it as a compiler flag means that when compiling a dependant application we need to have extra knowledge of this setting at compile time of the dependant application. + + If this is not guaranteed (and the dependant application is compiled without QGISDEBUG while libqgis_core.so is compiled with QGISDEBUG) will result in different class definitions being found in header and library. For example for the optional QgsCoordinateTransform::mHasContext member. This in turn leads to crashes with funky traces and no chance to find out what's going on. + +Juergen E. Fischer 2018-01-04 + + fix translation text + +Mathieu Pellerin 2018-01-04 + + [ui] add consistent spacing in the symbol list widget (#5987) + +Harrissou Sant-anna 2018-01-04 + + [needs-docs] Organize tab sequence in options dialog (#5964) + +Nyall Dawson 2018-01-04 + + Fix tracing still active when snapping is turned off + + Otherwise tracing is disabled in the snapping toolbar, yet still + active on the canvas. + +Alexander Bruy 2018-01-04 + + fix spelling + +Harrissou Sant-anna 2017-12-22 + + eplace Line by LineString + +Harrissou Sant-anna 2017-12-15 + + List more geometry types in New Memory Layer dialog + + Fixes 17594 + +Harrissou Sant-anna 2018-01-04 + + [needs-docs] Reorganize project properties tabs order (#5970) + +Harrissou Sant-anna 2018-01-04 + + [needs-docs] Organize raster/vector properties tabs order (#5965) + +Nyall Dawson 2018-01-04 + + Respect transform context in point locator + +Nyall Dawson 2018-01-04 + + Respect transform contexts when tracing + +Mathieu Pellerin 2018-01-04 + + fix an options dialog search crasher (#5978) + +Nyall Dawson 2018-01-04 + + Reformat code + +Nyall Dawson 2018-01-04 + + Fix QgsVectorLayer::updateFeature cannot add geometry to feature + with no existing geometry + + Fixes #17678 + +Nyall Dawson 2018-01-04 + + Fix QgsVectorLayer::updateFeature returns true when errors occur + + Refs #17678 + +Nyall Dawson 2018-01-04 + + Doxygen++ + +Nyall Dawson 2018-01-03 + + Fix pasting features to new layer doesn't paste fields + + Fixes #17702 + +Denis Rouzaud 2018-01-03 + + also use bool fieldIsoFormat in search widget wrapper + +Merge: cef2db9ae3 69cfdc4fcf +Denis Rouzaud 2018-01-03 + + Merge pull request #5960 from 3nids/fix16657 + + fix date/time widget for field with time zones + +Merge: df547e1231 51bb631b2a +Borys Jurgiel 2018-01-03 + + Merge pull request #5904 from borysiasty/pyQgisVersion + + Make QGIS 2.99 compatible with 3.0 plugins by introducing PyQGIS API version + +Denis Rouzaud 2018-01-03 + + rename static variables + + since they're not really default values + +Denis Rouzaud 2018-01-03 + + add a bool in config to determine if it uses Qt::ISODate for field format + + also fixes the fact that the display format of QDateTimeEdit only accepts string formats, so in case of Qt::ISODate use a default date/time with zmne zone + +Denis Rouzaud 2017-12-29 + + fix search widget wrapper + +Denis Rouzaud 2017-12-28 + + fix date/time widget for field with time zones + + this adds a new format of date/time to use Qt::ISODate format + the issue is that QDate::fromString does not recognize the t letter for the timezone in format + this a hack since any field_format needs to be tested if it corresponds to QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT and in such case replace by Qt::ISODate instead of a format string + +Mathieu Pellerin 2018-01-03 + + Don't crash the projection selection widget when world_map.shp fails to load (#5977) + + * initiate mExpressionFieldBuffer in the constructor + +Merge: d047bc8dd5 cdbb0df8d7 +Matthias Kuhn 2018-01-03 + + Merge pull request #5946 from DelazJ/nullMinMax + + [needs-docs] Update min and max functions + +Merge: 7cb8d1a9bf d1e83b5453 +Nyall Dawson 2018-01-03 + + Merge pull request #5957 from nyalldawson/wkb_handling + + Fix some handling of wkb types which is broken for z/m type geometries + +Harrissou Sant-anna 2018-01-03 + + Add example with NULL value + +Nyall Dawson 2018-01-03 + + Fix position of Oracle entry in data source manager + + Fixes #17755 + +Nyall Dawson 2018-01-03 + + Fix invisble annotations are still rendered + + Fixes #17763 + +Denis Rouzaud 2018-01-02 + + [date time widget] do not use minimumDateTime for NULL values + + fixes issue when setting min and max values for the widget + +Nyall Dawson 2018-01-03 + + Link metadata widget to canvas + + So that child widgets which can take properties from canvas + can have full functionality + +Nyall Dawson 2018-01-03 + + Fix stored spatial extent not showing in metadata tab + +Nyall Dawson 2018-01-03 + + Fix missing 'canvas extent' button in extent widget + +Alexander Bruy 2018-01-02 + + add Ukrainian translators + +Denis Rouzaud 2018-01-01 + + remove include and forward declarations left-overs + +Denis Rouzaud 2018-01-01 + + [QDateTimeEdit] use QLineEdit::addAction + + instead of custom tool button + this seems to solve many issues :) + kudos to @nyalldawson for pointing to it + and a happy new year! + +Denis Rouzaud 2017-12-29 + + [QgsDateTimeEdit] use special value text to handle NULL values + + the widget now uses a special value text to display NULL rather than painting a QLineEdit on top + + a press on the spinbox buttons (non-calendar mode) is catch to set to current date to avoid starting at the minimum date + +Denis Rouzaud 2017-12-27 + + [date widget] fix current date can't be picked + + fix #16579 + +Martin Dobias 2017-12-30 + + [3d] Fix tessellator crash with nearly collinear points (fixes #17745) + +Martin Dobias 2017-12-30 + + [3d] Fix tilting of camera in docked 3D view with Shift (fixes #17337) + + This reverts a6b0c44 + + Map canvas was stealing keyboard focus from the docked 3D view and the key presses + of modifiers were not passed to the 3D view. + +luzpaz 2017-12-30 + + Typo fixes + + + added word to spelling.dat + +Médéric RIBREUX 2017-12-30 + + Remove broken algorithms and clean code + +Martin Dobias 2017-12-30 + + [3d] Allow Shift+up/down/left/right keys to rotate/tilt camera + + Just like user can drag map with mouse or move it with up/down/left/right keys, + for consistency with Shift+drag we have now also support for arrow keys. + +Médéric RIBREUX 2017-12-29 + + Fix all i.* ext scripts + +Mathieu Pellerin 2017-12-29 + + [georeferencer] improve ui layout, use qgsfilewidget + +Ismail Sunni 2017-12-26 + + Put X field above Y field in Delimited Text dialog. Fix #11746. + +Médéric RIBREUX 2017-12-28 + + Fix v.net.report descriptions' + +Médéric RIBREUX 2017-12-28 + + Fix nearly all v. ext scripts + +Merge: a650a03f19 671b772270 +Borys Jurgiel 2017-12-28 + + Merge pull request #5952 from borysiasty/plugin-notification + + [Plugin installer][needs-docs] Display notifications as an icon rather than a text + +Borys Jurgiel 2017-12-28 + + [Plugin manager] New plugin notification icon slightly adjusted + +Merge: 99abc8dfb5 375daf1879 +Matthias Kuhn 2017-12-28 + + Merge pull request #5853 from m-kuhn/valueRelationReadonly + + Value relation widget: respect readonly state + +Matthias Kuhn 2017-12-28 + + PEP8 + +Harrissou Sant-anna 2017-12-28 + + Revert QVERIFY change + +Nyall Dawson 2017-12-28 + + Fix some handling of wkb types which is broken for z/m type geometries + +Matthias Kuhn 2017-12-27 + + Make ValueRelation test more stable + +Borys Jurgiel 2017-12-27 + + [Plugin installer] Desaturate toolbar icons + +Matthias Kuhn 2017-12-12 + + Add test for enabled state of relation value widget + +Matthias Kuhn 2017-12-12 + + Value relation widget respects read only mode + + Fix #17592 + +Matthias Kuhn 2017-12-27 + + Add some more min/max tests + +Matthias Kuhn 2017-12-27 + + Improve test output + +Matthias Kuhn 2017-12-27 + + Min/max exp functions have custom Null handler + +Harrissou Sant-anna 2017-12-23 + + Add more tests + +Harrissou Sant-anna 2017-12-23 + + Adding tests to min and max functions + +Harrissou Sant-anna 2017-12-23 + + [needs-docs] Update min and max functions + + In case of a null value, these functions will not always return null + +Merge: e552b9b2de d01f94f7ef +Matthias Kuhn 2017-12-27 + + Merge pull request #5955 from m-kuhn/noCacheEvalErrors + + Expressions: do not cache results when there is an eval error + +Matthias Kuhn 2017-12-27 + + Avoid crash with represent_value exp function + + represent_value would crash when it was called via evaluate without any context specified. + +Médéric RIBREUX 2017-12-27 + + Fix all r algorithms ext scripts! + +Matthias Kuhn 2017-12-27 + + Expression tests: change Q_ASSERT to QVERIFY + +Matthias Kuhn 2017-12-27 + + Do not cache expression nodes with eval errors + + When there is an evaluation error in an expression, there is no need to cache results. + With the previous approach, sometimes eval errors were not reported because the error was set to false (Null), evaluation triggered again but it didn't report any more eval errors because it was relying on cached values. + +Matthias Kuhn 2017-12-27 + + Replace Q_ASSERT with QVERIFY in tests + + Q_ASSERT's are only evaluated in debug mode. However, tests should trigger in debug or release mode. + +Médéric RIBREUX 2017-12-27 + + Handle raster files wihtout extension as GTiff + fix some ext scripts + +David 2017-12-27 + + Renaming stuff + + Duplicate feature + Duplicate feature and digitize + Duplicate selected features + +Médéric RIBREUX 2017-12-27 + + Fix r.li.* description files and ext scripts + +Merge: d58053d486 b25681cc43 +Nyall Dawson 2017-12-27 + + Merge pull request #5926 from nyalldawson/proc_dialog + + [processing] Add api to show algorithm dialog, use dialog for history + +Médéric RIBREUX 2017-12-27 + + Hidden output parameters are not used in the main command anymore + +Médéric RIBREUX 2017-12-27 + + Fix multiple ParameterField handling + +Médéric RIBREUX 2017-12-27 + + Fix multiple enum parameters handling and some ext scripts + +Alexander Bruy 2017-12-27 + + [processing] restore script collection creator (fix #17649) + +Médéric RIBREUX 2017-12-27 + + Fix QgsProcessingParameterFile bad descriptions + +Borys Jurgiel 2017-12-27 + + [Plugin installer] Move the status bar label to the right and make it less verbose + +Mathieu Pellerin 2017-12-27 + + [processing] harmonize and improve UI spacing + +Borys Jurgiel 2017-12-26 + + [Plugin installer][needs-docs] Display an icon rather than a text in the status bar when new a plugin or plugin upgrade is available + +Médéric RIBREUX 2017-12-26 + + Fix optional None input parameters handling + +Médéric RIBREUX 2017-12-26 + + Update TODO list + +Merge: 156869379f a540a93e24 +Alexander Bruy 2017-12-25 + + Merge pull request #5945 from medspx/ProcessingGrassFixDescV + + [Processing] Fix description files for GRASS provider + +Matthias Kuhn 2017-12-21 + + Instructions for QgsCoordinateTransform::initialize API break + +Merge: 2872f69e20 63cf7ae603 +Alessandro Pasotti 2017-12-23 + + Merge pull request #5941 from elpaso/bugfix-17673-bookmarks--crash-when-docked + + [bugfix] Bookmarks fix crash on exit when docked + +Alessandro Pasotti 2017-12-22 + + [bugfix] Bookmrks fix crash on exit when docked + + Order of destruction does matter + + Fixes #17673 + +Médéric RIBREUX 2017-12-23 + + Fix i.modis.qc description file + +Nyall Dawson 2017-12-23 + + Reluctantly participate in the Americanization of the world + +Nyall Dawson 2017-12-23 + + [sipify] Correctly convert doxygen warning blocks to sphinx warnings + +Nyall Dawson 2017-12-23 + + Expand QgsCoordinateTransform docs + +Merge: 6ac6939bf8 c0b56a3a65 +Alexander Bruy 2017-12-23 + + Merge pull request #5943 from borysiasty/zip-reloading + + [Plugin Manager] Reload manager contents after installing a plugin from zip. + +Nyall Dawson 2017-12-23 + + Sipify + +Merge: f149730e43 04b18f4d43 +Tom Kralidis 2017-12-22 + + Merge pull request #5942 from tomkralidis/metasearch-explicit-crs + + [bugfix] [MetaSearch] make gml:Envelope CRS explicit for spatial queries (fixes #17739) + +Merge: e16dfe4ff0 aace710ebb +Mathieu Pellerin 2017-12-23 + + Merge pull request #5940 from nirvn/messagebar_link_color + +Borys Jurgiel 2017-12-22 + + [Plugin Manager] Reload manager contents after installing a plugin from zip. Fixes #17626 + +Tom Kralidis 2017-12-22 + + [bugfix] [MetaSearch] make gml:Envelope CRS explicit for spatial queries + (fixes #17739) + +Tom Kralidis 2017-12-22 + + MetaSearch: remove duplicate field + +Webmaster 2017-12-22 + + fix success icon for message bar items + +Webmaster 2017-12-22 + + [layouts] use a success message bar item when exporting + +Webmaster 2017-12-22 + + [ui] style message bar hyperlinks based on type + +Merge: 36c4ac4668 313417ddf1 +Nyall Dawson 2017-12-22 + + Merge pull request #5858 from lbartoletti/segment_intersection + + Segment intersection + +Mathieu Pellerin 2017-12-22 + + [ui] add hyperlink to saved image/PDF in the message bar + +Mathieu Pellerin 2017-12-22 + + [layouts] fix overview map combobox filter + +Merge: 02152ac8f3 8fb147f802 +Alessandro Pasotti 2017-12-22 + + Merge pull request #5935 from elpaso/bugfix-17728-source-select-buttons + + Use standard buttons for unified add layer dialog + +Merge: 224dcd0f0b 385d0ef94b +Alessandro Pasotti 2017-12-22 + + Merge pull request #5936 from elpaso/bugfix-17724-virtuallayer-crash + + [bugfix] Fix crash in virtual layers dlg when adding + +Mathieu Pellerin 2017-12-22 + + [layouts] improve lock item(s) / unlock all toolbar icons (#5929) + +Nyall Dawson 2017-12-21 + + Fix some issues with to_interval expression function + + - incorrect regex for handling values with decimal point + - fix overflow with large intervals + +Alessandro Pasotti 2017-12-21 + + [bugfix] Fix crash in virtual layers dlg when adding + + Fixes #17724 Crash on clicking ADD in Virtual Layer + dialogue without defining a layer + + A proper implementation should handle the Add button + state when a virtual layer definition is available. + +Trashmonk 2017-12-21 + + Update Rasterize.py + +Trashmonk 2017-12-21 + + Update Rasterize.py + +Trashmonk 2017-12-20 + + Added transparency to areas with no vector data. + + Originally the background colour defaulted to white with no transparency for areas without vector data. I have added an alpha channel to the geotiff and set it zero (full transparency) for areas with no vector data. This could be optional, in case the user wants a solid background. + +Merge: 5daf33a578 15ffcb4345 +Alessandro Pasotti 2017-12-21 + + Merge pull request #5934 from elpaso/bookmarks-tiny-fixes + + [bookmarks] Case insensitive sorting + +Alessandro Pasotti 2017-12-21 + + Use standard buttons for unified add layer dialog + + Fixes #17728 by setting the standard buttons in the + button box instead of manually adding them by code. + + This way the buttons should honor the platform-specific + position and look&feel. + +Alessandro Pasotti 2017-12-21 + + [bookmarks] Case insensitive sorting + + Fixes #17005 + +Merge: 2f19d62997 dc51dbf88e +Matthias Kuhn 2017-12-21 + + Merge pull request #5931 from signedav/fieldtypeprop + + Make QgsField::type a Q_PROPERTY + +Martin Dobias 2017-12-17 + + [3d] Respect no-data values from DEMs in terrain generator (fixes #17558) + +David 2017-12-21 + + Q_PROPERTY of QVariant::Type to use exernally + +Mathieu Pellerin 2017-12-21 + + [3d] missing piece of the jigsaw: save 3d canvas as image (#5927) + +Merge: 1f6d1a6eb0 3dc5211715 +Mathieu Pellerin 2017-12-21 + + Merge pull request #5921 from nirvn/layout_item_icon + +nirvn 2017-12-21 + + [layouts] use gray icons for the items panel + +nirvn 2017-12-20 + + [layouts] add icons for items and use those in the items panel + +Nyall Dawson 2017-12-21 + + [needs-docs][processing] Double clicking a history entry shows + the algorithm dialog instead of immediately executing same alg + + This allows users to edit the parameters before re-running, + which is a more common user-operation (e.g. changing the + input layer, changing a parameter value "oops, that buffer + was a bit too big...."). + + If someone wants to exactly re-run the algorithm without changes + it's only one extra click anyway... + +Nyall Dawson 2017-12-21 + + [needs-docs][processing] Add methods to show algorithm dialog + + Adds processing.createAlgorithmDialog and + processing.execAlgorithmDialog. These methods can be used + to create and execute algorithm dialogs for a specified algorithm, + optionally pre-populated with a given set of (non-default) parameter + values. + +Nyall Dawson 2017-12-21 + + Fix algorithm dialog window geometry save/restore + +Nyall Dawson 2017-12-21 + + Save algorithm results to dialog + +Nyall Dawson 2017-12-21 + + [processing] Add a setParameters method to AlgorithmDialog + + Allows pre-populating the dialog with non-default parameter + values. + +Nyall Dawson 2017-12-21 + + [processing] Implement a todo (set layer param's wrapper values) + +Nyall Dawson 2017-12-21 + + Fix ui build warning + +Merge: 45859beec4 97018cf2e6 +Borys Jurgiel 2017-12-20 + + Merge pull request #5916 from borysiasty/no_colon + + [Plugin installer] Remove trailing colon if it's a very end of the message + +David 2017-12-20 + + duplicate child feature in relationwidget + + beside add and delete child in the relationwidget of an attributeform, there is the new functionality duplicate feature. this duplicates the selected child feature and (if the child has a relation with the strength composition too) the grad child features. + +Merge: f5a650f978 ecb9611b00 +Alexander Bruy 2017-12-20 + + Merge pull request #5923 from borysiasty/processing_groups + + [processing] Fix group id of GDAL algorithms. + +Matthias Kuhn 2017-12-20 + + Followup 9a5435f: Fix sip files + +Borys Jurgiel 2017-12-20 + + Fix group id of GDAL algorithms. Follows up 53bc147dca00 + +David 2017-12-20 + + New feature duplicate in MapLayerAction with redigitize and removed obsolete python action + + Duplicate feature and with redigitizing - splitting of digitizefeature and addfeature - so we can use digitizefeature indebendantly + The partwise obsolete duplicate feature action in python is removed from canvas and feature scope (still in layer scope) + +David 2017-12-19 + + changed requests + +David 2017-12-18 + + improved signal/slot and flexible layer handling + + two signals now digitizingCompleted and digitizingFinished using deleteLater() for no conflicts + the addFeature is using the currentLayer. when the duplicatedigitized-action has a given layer it uses the given. otherwise the current. the given will be set as current and on decativation of the digitizing it's set back. + +David 2017-12-13 + + add the new icons for duplication + + for duplicate feature and duplicate feature digitize there are new icons. they are added to the project now. + +David 2017-12-13 + + add new svgs for duplicate and duplicate digitized feature + +David 2017-12-11 + + working upload - new signals in digitizefeature + + digitizingFinished -> digitizing made - feature can be duplicated now + digitizingFinalized -> and everything else done - MapTool can be deactivated + digitizingAborted -> it's deactivated (because of cancel or everything done does not matter) - object can be deleted + +David 2017-12-07 + + initialize map tool in function + +David 2017-12-07 + + redigitize on feature duplication + + there are two actions duplication and duplication redigitize. in redigitize you can set a new geometry for the duplication. + +David 2017-12-04 + + action mapping for duplicate feature + +Etienne Trimaille 2017-12-20 + + Crs (#5908) + + * fix display of CRS if invalid CRS + + * fix #17455 set an empty CRS if the read CRS from XML is wrong + + * add warning about empty CRS node when reading XML + +Etienne Trimaille 2017-12-20 + + remove CRS picker and allow only layer CRS or provider CRS in metadata editor (#5915) + +Merge: bf8570920f 4643712a1e +Nyall Dawson 2017-12-20 + + Merge pull request #5919 from nyalldawson/iter_datum + + Use transform context in feature requests with destination crs set + +Nyall Dawson 2017-12-20 + + Fix missing transform contexts for QgsDistanceArea + + QgsDistanceArea.setSourceCrs() now requires a QgsTransformContext + argument. + +Mathieu Pellerin 2017-12-20 + + Use qgsfilewidget for the delimited text prodivder source select (#5920) + +Nyall Dawson 2017-12-20 + + Require a transform context when setting the destination crs for + a feature request + + Forces correct datum handling for these requests, and removes + a few more uses of the deprecated/datum unaware transforms. + +Nyall Dawson 2017-12-20 + + Add transform context to processing context + +Denis Rouzaud 2017-12-19 + + [doxygen] add test to ensure code snippet use \code command + +Denis Rouzaud 2017-12-19 + + fix empty lines with spaces + +Denis Rouzaud 2017-12-19 + + fix code descriptor + +Denis Rouzaud 2017-12-19 + + add cpp to code type + +Denis Rouzaud 2017-12-19 + + fix code snippet and do not display cpp code in sip files + +Denis Rouzaud 2017-12-19 + + run sipify for code snippets + +Denis Rouzaud 2017-12-19 + + [sipify] habndle python code snippets + +Denis Rouzaud 2017-12-19 + + run sipify + +Denis Rouzaud 2017-12-19 + + do not create link for current class + +Denis Rouzaud 2017-12-16 + + [sipify] also create links in docstrings + +Sandro Santilli 2017-12-19 + + Allow age expression to represent time intervals above 130 years (#5914) + + Uses a 64bit integer instead of 32bit one for seconds, + meaning about 584 billions of years rather than 136... + + Closes #17681 + + Includes test + +Borys Jurgiel 2017-12-19 + + [Plugin installer] Remove trailing colon if it's a very end of the message. + +Mathieu Pellerin 2017-12-19 + + [layouts] avoid adding too much bleeding pixels for page items (#5910) + +Mathieu Pellerin 2017-12-19 + + [3d] attach transform context in QgsTerrainTextureGenerator (#5911) + +Sandro Santilli 2017-12-19 + + Fix typo in documentation (missing quote) + +Nyall Dawson 2017-12-19 + + [layouts] Fix crash on svg warning dialog close + +Merge: 41baaad0b8 4054a2bb9a +Nyall Dawson 2017-12-19 + + Merge pull request #5909 from nyalldawson/layout_next + + Layout SVG exports + +Nyall Dawson 2017-12-19 + + Fix ui weirdness when editing guide positions via widget + +Nyall Dawson 2017-12-19 + + Fix repositioning guides on pages > 1 + +Nyall Dawson 2017-12-19 + + Fix missing page shadows + +Nyall Dawson 2017-12-19 + + Indentation + +Denis Rouzaud 2017-12-18 + + fix after rebase + +Denis Rouzaud 2017-12-18 + + allow to have single dest/source transform in dialog + +Denis Rouzaud 2017-12-18 + + give more room to proj selection widget + +Denis Rouzaud 2017-12-18 + + use table widget instead of tree for better column display + +Denis Rouzaud 2017-12-18 + + fix datum transform dialog shown when option is disabled + +Nyall Dawson 2017-12-19 + + Restore layered svg export option + +Nyall Dawson 2017-12-19 + + Add unit test for svg export + +Nyall Dawson 2017-12-19 + + [layouts] Allow double-clicking to add layer to legend + + Fixes #14410 + +Nyall Dawson 2017-12-19 + + [layouts] Suggest export file names based on layout name (fix #9476) + +Nyall Dawson 2017-12-19 + + Add method to ensure file name string is safe + +Nathan Woodrow 2017-12-18 + + Don't copy default themes to user folder + + It's just wasting space in the profile folder, and now with profiles you + will get extra copies which you don't need. Also makes it hard for us + to update "core" themes if they are in the users profile folder. + +Nyall Dawson 2017-12-19 + + Add tooltip for legend auto update checkbox (fix #13576) + +Nyall Dawson 2017-12-18 + + Start restoring SVG export + +Nyall Dawson 2017-12-18 + + Fix unbalanced painter save/restore for map items + +Nyall Dawson 2017-12-18 + + Fix extensions not automatically added to new filenames in QgsFileWidget + + Fixes a UX regression introduced by swapping dialogs to use + QgsFileWidget, where on some platforms the extension is not + automatically added for selected file names + +Nyall Dawson 2017-12-18 + + Add some extension and filter handling functions to QgsFileUtils + +Merge: 13a888d2f8 a77b5b6517 +Nyall Dawson 2017-12-19 + + Merge pull request #5906 from nyalldawson/datum + + Datum fixes and cleanups + +Nyall Dawson 2017-12-19 + + [ogr] Fix ExactIntersection flag should be ignored if filter rect + is not set + + And add provider test case to ensure no other providers have this + issue + +Nyall Dawson 2017-12-19 + + Fix copy/paste error, update unit tests + +Nyall Dawson 2017-12-19 + + Doxygen + +Nyall Dawson 2017-12-19 + + Move all datum transform related methods to QgsDatumTransform + +Denis Rouzaud 2017-12-18 + + use cmake 3.10 in Docker dependency image + + this should make Travis log nicer to read + thanks to @m-kuhn patch to cmake + see https://gitlab.kitware.com/cmake/cmake/merge_requests/1133 + +Merge: 7c01b7e647 198486f0e9 +Nyall Dawson 2017-12-19 + + Merge pull request #5898 from nyalldawson/datum + + Datum transform fixes, header reworking + +Borys Jurgiel 2017-12-18 + + Also use the pyQgisVersion approach in QgsPluginRegistry + +Matthias Kuhn 2017-12-18 + + Add missing sip bindings + +Matthias Kuhn 2017-12-18 + + Show style name also in raster properties dialog title + +Borys Jurgiel 2017-12-18 + + Bump up core plugins' qgisMinimumVersion. Do not merge without b43386605fc298f or other alternative. + +Borys Jurgiel 2017-12-18 + + [Plugin installer] Make QGIS x.99 only compatible with plugins for the next major release. Introduce 'pyQgisVersion' that usually sticks to QGIS_VERSION, but bumps up to the next release for all the .99 versions + +Matthias Kuhn 2017-11-24 + + Show style name in layer properties dialog title + +Borys Jurgiel 2017-12-18 + + [Plugin installer] Follow up 54f312fa7f5b1ff and temporarily hardcode plugin compatibility as 3.0 + +Denis Rouzaud 2017-12-18 + + add missing ovverride in macos build + +Nyall Dawson 2017-12-18 + + Avoid including private header + +Nyall Dawson 2017-12-18 + + Fix bad merge + +Nyall Dawson 2017-12-18 + + Don't cache context along with QgsCoordinateTransforms + + This information should not be restored from the cache, since + it's project specific yet the cache is not + +Nyall Dawson 2017-12-18 + + Move datum transform structs out to their own header, to avoid + need to include private header file + +Nyall Dawson 2017-12-18 + + Fix transform context not copied with render context copies + +Etienne Trimaille 2017-12-18 + + fix unknown mQgis variable on macos + +Merge: a5f7f410a1 a8a252626d +Nyall Dawson 2017-12-18 + + Merge pull request #5583 from m-kuhn/disableLocatorTest + + [travis] Disable PyQgsLocator test + +David 2017-12-18 + + functionality to duplicate features + +Merge: 332c57d0f6 200669aefa +Nyall Dawson 2017-12-18 + + Merge pull request #5897 from nyalldawson/layout_next + + Misc layout fixes + +Matthias Kuhn 2017-12-18 + + Follow the rules + +Matthias Kuhn 2017-12-18 + + No sip bindings for private headers + +Matthias Kuhn 2017-12-18 + + Revert "Add missing sip file" + + This reverts commit c487ee6be0992931031ae930f698c19344f06061. + +Matthias Kuhn 2017-12-18 + + Add missing sip file + +Merge: 00dbc73d43 adb7af9933 +Blottiere Paul 2017-12-18 + + Merge pull request #5876 from peppsac/fix_17694 + + Fix parameter name decoding when using POST + urlencoded + +Nyall Dawson 2017-12-18 + + Fix guide positioning when multiple pages are present + +Nyall Dawson 2017-12-18 + + Hide guides from layout exports + +Nyall Dawson 2017-12-18 + + Add unit test for pdf exports + +Nathan Woodrow 2017-12-18 + + Setup QgsSettings in the correct order + + We don't have the location of QGIS.ini until we know the profile + so we can't use QgsSettings to get the global settings before this. + +Nyall Dawson 2017-12-18 + + Open folder rather than file when clicking message bar after export + +Nyall Dawson 2017-12-18 + + Fix coverity uninitialized member warning + +Merge: 0a6eb127b5 2e6386e691 +Nyall Dawson 2017-12-18 + + Merge pull request #5892 from nyalldawson/fix_17254 + + Fix creation of QgsCoordinateReferenceSystem from "user:xxxx" strings + +Nathan Woodrow 2017-12-18 + + Fix drag and drop for qgz files. List in browser + +Juergen E. Fischer 2017-12-17 + + include qgscoordinatetransformcontext_p.h in install + +Nathan Woodrow 2017-12-18 + + enableAutoGeometryRestore dialog updates + +Nathan Woodrow 2017-12-18 + + Generate safe widget name in QgsWidgetStateHelper + + Assert is a bit rough here so just warn devs + +Nathan Woodrow 2017-12-18 + + Fix #17579 - Use guid to make temp file name for zip file + + QTemporaryFile doesn't work here with QgsZipUtils on Windows for some + reason but is fine on Linux. Yay development! + +Nyall Dawson 2017-12-18 + + Use more performant QRegularExpression for matching + +Nyall Dawson 2017-12-18 + + Fix creation of QgsCoordinateReferenceSystem from "user:xxxx" strings + + Fixes #17254 + +Merge: b630a407b5 492f9ea18c +Nyall Dawson 2017-12-18 + + Merge pull request #5837 from nyalldawson/layout_next + + Layout raster image exports + +Denis Rouzaud 2017-12-17 + + missing SIP_OUT + +Nyall Dawson 2017-12-16 + + Update test mask images + +Nyall Dawson 2017-12-16 + + Sipify + +Nyall Dawson 2017-12-15 + + Use unique_ptr over raw array + +Nyall Dawson 2017-12-15 + + Guard QgsLayoutExporter against nullptrs + +Nyall Dawson 2017-12-15 + + Better memory management + +Nyall Dawson 2017-12-15 + + Add missing parents to message boxes + +Nyall Dawson 2017-12-15 + + Fix pdf export page sizes + +Nyall Dawson 2017-12-15 + + Fix some multiple updates from gui, squash some undo commands + +Nyall Dawson 2017-12-15 + + Restore data defined page orientation control + +Nyall Dawson 2017-12-15 + + Restore data defined page orientation + +Nyall Dawson 2017-12-15 + + Port orientation decoding code from composer + +Nyall Dawson 2017-12-15 + + Fix items moving after altering page size or inserting/deleting pages + +Nyall Dawson 2017-12-15 + + [layouts][needs-docs] Add control for whether pages should be + exported, including data defined setting + + This replaces the 2.x data-defined "number of pages" setting. + Instead of requiring users to develop an expression to return + the number of pages, instead we allow individual pages to have + a data defined control of whether that page should be included + in the export. + + This is more flexible, and works correctly with the mixed page + size model for layouts. + +Nyall Dawson 2017-12-15 + + Add links to open exported images in message bar + +Nyall Dawson 2017-12-15 + + Add some layout related actions to app toolbar + +Nyall Dawson 2017-12-15 + + Add new page icon to toolbar + +Nyall Dawson 2017-12-13 + + Fix drawing of map items (grids, overviews) when rendering map item as a raster item + +Nyall Dawson 2017-12-13 + + Fix incorrect detection of grids with advanced effects + +Nyall Dawson 2017-12-13 + + Fix crash in ui while working with map grids + +Nyall Dawson 2017-12-13 + + Update test masks + +Nyall Dawson 2017-12-13 + + Tweak logic regarding page item margins following forced re-render + of layout items when exporting (i.e. disabling of cached item render) + + The old issue of semi-transparent pixels around the edge of the page + had reared again. This is caused by the antialiasing while rendering + the page symbol. In order to avoid this, we cater to the most common + use case of having pages with a solid, borderless fill and slightly + extend the fill symbol polygon outside the page by 2 pixels + (determined by trial-and-error). The less common use case of having + a page symbol containing a border suffers by this border being + clipped by a couple of pixels, but we must address the much more + common use case over this. + +Nyall Dawson 2017-12-13 + + Tweak logic regarding when a map item forces the whole layout + to be rasterised + +Nyall Dawson 2017-12-12 + + Add a messagebar to layout designer + +Nyall Dawson 2017-12-12 + + [layouts][FEATURE] Don't force the whole layout to be rasterized + when exporting to PDF + + If an individual layout item needs rasterisation in order to + be exported correctly, it can now be individually rasterised + without forcing every other item to also be rasterised. + + This allows exports to PDF keeping as much as possible as vectors, + e.g. a map with layer opacity won't force labels, scalebars, etc + to be rasterised too. + + To accompany this, a new "Always export as vectors" checkbox + was added to layout properties. If checked, this will force + the export to keep items as vectors, even when it causes the + output to look different to layouts. + + Fixes #7885 + +Nyall Dawson 2017-12-12 + + Work on PDF export + +Nyall Dawson 2017-12-12 + + Move containsAdvancedEffects test to QgsLayoutItem + + And start a generic test library for all item types to ensure + correct behavior for QgsLayoutItem subclasses + + Currently justs tests to ensure that overriden + containsAdvancedEffects methods also call the base class + test + +Nyall Dawson 2017-12-11 + + Update tests masks + +Nyall Dawson 2017-12-11 + + Make QgsLayoutExporter::generateFileName virtual, so exporter + subclasses can be made which customise the generated file names + +Nyall Dawson 2017-12-11 + + Spelling + +Nyall Dawson 2017-12-11 + + Expose antialiasing option in image export dialog + + Allows for creating non-antialiased images from layouts. Note that + some layout item types do not correctly respect this setting, but + at least map items do and the API is in place for them to be + fixed later. + + Fixes #9281 + +Nyall Dawson 2017-12-11 + + Expose world file option in image settings dialog + +Nyall Dawson 2017-12-11 + + [layouts] Resurrect action for exporting to raster images + + ...this time, without all the useful code locked away in app! + +Nyall Dawson 2017-12-11 + + Port method for pausing layout view updates + +Nyall Dawson 2017-12-11 + + Add method to determine file path for exports which encountered errors + +Nyall Dawson 2017-12-11 + + Add method to detect whether layout has uniform page sizes + +Nyall Dawson 2017-12-11 + + Expose some more export related settings to GUI + +Nyall Dawson 2017-12-11 + + Port some more world file generation related code + +Nyall Dawson 2017-12-11 + + Port world file generation code to layouts + +Nyall Dawson 2017-12-11 + + Port georeferencing from compositions + +Nyall Dawson 2017-12-11 + + Fix updating gui after undoing layout settings change + +Nyall Dawson 2017-12-11 + + Add some masks for scalebar tests + +Nyall Dawson 2017-12-11 + + Port reference map functionality from composer + +Nyall Dawson 2017-12-11 + + Implement methods for exporting layouts as raster, add tests + +Nyall Dawson 2017-12-06 + + Expand docs + +Nyall Dawson 2017-12-06 + + Add method to determine largest page size + +Nyall Dawson 2017-12-06 + + Port pageItemBounds method from composer + +Nyall Dawson 2017-12-06 + + Add unit test for resizing pages + +Nyall Dawson 2017-12-06 + + Fix unit test + +Nyall Dawson 2017-12-06 + + Work on resizing layouts to item bounds + +Nyall Dawson 2017-12-06 + + Remove incorrect TransferThis annotation + +Nyall Dawson 2017-12-06 + + Avoid Qt warning + +Nyall Dawson 2017-12-05 + + Port method to determine whether page should be exported + +Nyall Dawson 2017-12-05 + + Port method to retrieve items of a set type on a page + +Nyall Dawson 2017-12-05 + + Remember window position + +Nyall Dawson 2017-12-05 + + Forward declare some classes + +Nyall Dawson 2017-12-05 + + Decouple QgsLayoutExporter from QgsLayout + +Denis Rouzaud 2017-12-16 + + run sipify + +Denis Rouzaud 2017-12-16 + + [doxygen] fix badly placed \returns + +Denis Rouzaud 2017-12-16 + + add a test to check that returns are placed before since and note in Doxygen + +Denis Rouzaud 2017-12-16 + + make sipfiles test macos compatible + +Médéric RIBREUX 2017-12-16 + + Fix also i.* description files + +Médéric RIBREUX 2017-12-06 + + Review ParameterNumber for r.* description files + +Médéric RIBREUX 2017-12-04 + + Review optional ParameterNumbers + +Médéric RIBREUX 2017-12-03 + + Fix v.buffer + +Médéric RIBREUX 2017-12-03 + + Fix parameters and support empty default values for Enums + +Médéric RIBREUX 2017-12-03 + + First fixes before tests + +Nyall Dawson 2017-12-16 + + Show full path in tooltip for qgs project files in browser + +Nyall Dawson 2017-12-16 + + Hide file extensions for qpt, python and qgs files in the browser + + These have distinct icons identifying them, and the full file name + with extension shown in the tooltip + +Nyall Dawson 2017-12-16 + + New icons for QPT files and Python files in the browser + + Python icon thanks to @pkinglinz + +lbartoletti 2017-12-16 + + Stop conflicts + +Merge: c5d9663191 252f0802b1 +lbartoletti 2017-12-16 + + Merge branch 'master' into segment_intersection + +Nyall Dawson 2017-12-16 + + Follow up 647bd25 + +Denis Rouzaud 2017-12-15 + + fix sipify test + +Denis Rouzaud 2017-12-15 + + fix missing new line before first param + +Denis Rouzaud 2017-12-15 + + run sipify + +Denis Rouzaud 2017-12-15 + + [sipify] avoid printing empty Docstrings + +Denis Rouzaud 2017-12-15 + + fix sipify test + +Denis Rouzaud 2017-12-15 + + remove rtype from docstring + +Nyall Dawson 2017-12-16 + + [processing] Use a more unique separator for log file + + Fixes #17704 + +Merge: 978d9277cf 71a39cbce4 +Nyall Dawson 2017-12-16 + + Merge pull request #5870 from nyalldawson/virtual + + Drop redundant virtual keywords on overrides + +Denis Rouzaud 2017-12-15 + + better argument names for QgsGeometryUtils::lineIntersection + +Etienne Trimaille 2017-12-15 + + call the correct function to retrieve CRS from an extent in Processing + +Nyall Dawson 2017-12-16 + + Sipify + +Nyall Dawson 2017-12-15 + + Remove redundant overridden default destructor implementations + +Nyall Dawson 2017-12-15 + + Drop redundant virtual keywords on overrides + + Run clang-tidy modernize-use-override to remove all the redundant + virtual keywords from overridden methods, and add some missing + overrides. + + Another benefit is that this has also added the overrides + on destructors, which will cause a build failure if a base + class is missing a virtual destructor. + +Merge: 72f5adf368 39521c7656 +lbartoletti 2017-12-15 + + Merge branch 'master' into segment_intersection + +lbartoletti 2017-12-15 + + Add default value to epsilon. + Change example for python. + +Etienne Trimaille 2017-12-15 + + fix contact table in metadata (#5881) + + * fix contact table in metadata + + * fix datetime picker in temporal extent + +Denis Rouzaud 2017-12-15 + + fix sipify test + +Denis Rouzaud 2017-12-15 + + run sipify + +Denis Rouzaud 2017-12-15 + + remove extra spaces + +Denis Rouzaud 2017-12-09 + + fix doxygen layout + +Denis Rouzaud 2017-12-06 + + [sipify] transform \param xxx to :param xxx: + +Denis Rouzaud 2017-12-06 + + [sipify] place :rtype: at the correct place + + also add space before other paragraph-level markups + +Etienne Trimaille 2017-12-15 + + add missing metadata fields about contacts and extent (#5878) + +Merge: e9feeaacc6 1217e59563 +Nyall Dawson 2017-12-15 + + Merge pull request #5535 from nyalldawson/datum + + Datum transform handling rework, pt 1 + +pierre-eric 2017-12-14 + + Fix parameter name decoding when using POST + urlencoded + + This is a followup of dfe48d13c85cbae559a7a09a1bd62140cf11848b which solved + the issue for parameter values. + + Fixes #17694 + +Merge: 4f570cef9c 5016c21ed3 +Alexander Bruy 2017-12-15 + + Merge pull request #5875 from alexbruy/processing-editor + + [FEATURE][processing][needs-docs] add find and replace functionality to script editor + +nirvn 2017-12-15 + + [ui] fix toggle panel visibility action + Prior to this fix, the action would have to be triggered + twice before panels were actually hidden. + +Alexander Bruy 2017-12-15 + + [processing] use groupId when constructing help URL + +Alexander Bruy 2017-12-15 + + [FEATURE][processing][needs-docs] add find and replace functionality to + Processing script editor (forward-port from 2.18 branch) + +Nyall Dawson 2017-12-15 + + Add a unit test for missing datum transforms + +Merge: ac6d251859 b8f708ff1b +rldhont 2017-12-15 + + Merge pull request #5561 from pvalsecc/wms_ogc_filters + + [FEATURE][needs-docs] Add OGC filters to WMS + +lbartoletti 2017-12-15 + + comment the code instead of apply an useless equality... + +Nyall Dawson 2017-12-15 + + Show a warning when loading a project with a transform not available locally + +David 2017-12-14 + + sort the values in query builder + + after filling the values into the model, they are sorted ascending. + +Nyall Dawson 2017-12-15 + + Use proj strings to serialize datum transforms IDs + + Since datum transforms IDs are local only, and can even change + when underlying library versions are updated, we can't use them + to safely store and retrieve datum transforms. + + Instead we use the proj strings and recover the local session + transform ID from that. + +Nyall Dawson 2017-12-15 + + Add method to retrieve datum transform ID from a proj string + +Nyall Dawson 2017-12-15 + + Update unit test + +nirvn 2017-12-15 + + [ui] add some spacing for the projection selection widget + +Nyall Dawson 2017-12-14 + + [processing] List unique values improvements + + - allow running on non-spatial tables + - allow choice of more than one field + +Merge: f2b70ffdc6 1fa7d453ee +Mathieu Pellerin 2017-12-15 + + Merge pull request #5874 from nirvn/arcgis_providers_icon + + Smallt tweaks for add and create layer icons + +nirvn 2017-12-15 + + [ui] fix node size of the create vector layer icon + +Nyall Dawson 2017-12-15 + + Sipify + +Nyall Dawson 2017-12-04 + + Fix warning + +Denis Rouzaud 2017-12-02 + + fix transform context test + +Denis Rouzaud 2017-12-01 + + missing const ref, remove extra argument + +Denis Rouzaud 2017-12-01 + + use const_iterator + +Denis Rouzaud 2017-12-01 + + ask for datum transform update on layer or project crs change + + in the case of project crs change, if several transforms are available, pop up a message rather than showing multiple dialogs + +Denis Rouzaud 2017-12-01 + + address remaining memory leaks + +Nyall Dawson 2017-12-01 + + Add some more datum related unit tests + +Nyall Dawson 2017-12-01 + + Nicer API for datum transforms + + Instead of using QPairs of ints, use more descriptive structs, also + rename a lot of datum related methods for clarity and add docs + +Denis Rouzaud 2017-11-30 + + missing const ref + +Denis Rouzaud 2017-11-30 + + use alternate row colors and a slightly reduced font size in datum table + +Denis Rouzaud 2017-11-30 + + address missing const and memory leaks + + kudos @nyalldawson + +Denis Rouzaud 2017-11-29 + + fix indentation + +Denis Rouzaud 2017-11-29 + + apply default transform to newly created project + +Denis Rouzaud 2017-11-29 + + create a QgsDatumTransformTableWidget to avoid code duplication + + this contains the table view and the 3 buttons (add/remove/edit) + +Denis Rouzaud 2017-11-28 + + define default transforms in global options + + adds QgsCoordinateTransformContext::readSettings()/writeSettings to read/write from settings + +Denis Rouzaud 2017-11-28 + + allow editing transform in project properties + +Denis Rouzaud 2017-11-28 + + use QgsProjectionSelectionWidget rather than buttons + +Denis Rouzaud 2017-11-28 + + fix context was not correctly set on project opening + +Denis Rouzaud 2017-11-28 + + datum transforms have reversible source/dest + +Denis Rouzaud 2017-11-27 + + fix destination transform not showing + +Denis Rouzaud 2017-11-27 + + add missing refresh + +Nyall Dawson 2017-11-28 + + Add method to determine whether transform context has a valid transform + for a specific src/dest CRS pair + +Nyall Dawson 2017-11-28 + + Update unit tests + +Nyall Dawson 2017-11-28 + + Fix some transforms missing transform context + +Nyall Dawson 2017-11-28 + + Update layout map to use transform context + +Nyall Dawson 2017-11-28 + + Fix ui build warnings + +Denis Rouzaud 2017-11-27 + + todos for layout after rebase (some more) + +Denis Rouzaud 2017-11-27 + + replace datum in qgsoptionsbase after rebase + +Denis Rouzaud 2017-11-25 + + added method in QgisApp to ask for datum + +Denis Rouzaud 2017-11-25 + + ifdef 0 single source/destination transforms + +Denis Rouzaud 2017-11-25 + + saving datums transform in projet, removing in dialog ok + +Denis Rouzaud 2017-11-24 + + added some options + +Denis Rouzaud 2017-11-24 + + adding datum transform works + +Denis Rouzaud 2017-11-23 + + modification to QgsDatumTransformationDialog to allow interaction with CRSs + +Denis Rouzaud 2017-11-23 + + started datum UI refactoring + +Nyall Dawson 2017-11-07 + + Fix handling of transform-not-required in QgsCoordinateTransformContext + +Nyall Dawson 2017-11-07 + + Fix failing test + +Nyall Dawson 2017-11-06 + + Improve caching of transforms + +Nyall Dawson 2017-11-06 + + Fix build + +Nyall Dawson 2017-11-06 + + Move caching to QgsCoordinateTransform + + and remove no longer required QgsCoordinateTransformCache singleton + +Nyall Dawson 2017-11-06 + + Prepare for removal of QgsCoordinateTransformCache + +Nyall Dawson 2017-11-06 + + Remove QgsDatumTransformStore + + and port usage over to QgsCoordinateTransformContext instead + +Nyall Dawson 2017-11-06 + + Tweak transform logic (only remove src/dest transforms when both transforms are -1) + +Nyall Dawson 2017-11-06 + + Add transform context to QgsMapSettings and QgsRenderContext + + And also throw warnings when the context isn't set for these objects + +Nyall Dawson 2017-11-06 + + Move warning to better location + +Nyall Dawson 2017-11-06 + + Add explicit setter for project's transform context + + And add transformContextChanged signal, so that we can detect + when the context is changed. + +Nyall Dawson 2017-11-05 + + In debug builds, throw a warning when transforming coordinates + and no coordinate transform context has been set. + +Nyall Dawson 2017-11-05 + + Remove context-unaware QgsCoordinateTransform constructors from Python bindings + + This forces Python code and plugins to become datum transform + aware, and given that upgrading python code is easy (just + add QgsProject.instance() as a new argument to the constructor) + it's relatively painless to force this on PyQGIS users. + + Also fix upgrade the easy QgsCoordinateTransform c++ constructors + where the project is available, or where using QgsProject::instance() + is safe to do. + + For others, just avoid the deprecated warnings until we can + get access to the correct project instance where the transform + is being constructed. + +Nyall Dawson 2017-11-05 + + Add QgsCoordinateTransformContext arguments to QgsCoordinateTransform constructor + + And automatically retrieve correct datum transforms for the + transform, based on the information in the context. + + Also add a convenience constructor which takes a QgsProject + instance instead of a QgsCoordinateTransformContext and which + automatically retrieves the project's transform context and uses + that. This is designed to make it easy to upgrade existing + Python code (by adding just QgsProject.instance() to the transform + constructors). + +Nyall Dawson 2017-11-05 + + Remove unused QgsCoordinateTransform::readXml/writeXml methods + + These methods are not used in master and are of questionable + value. Better to serialise the source and dest crs separately + and create the transform when required + +Nyall Dawson 2017-11-05 + + Add a QgsCoordinateTransformContext member to QgsProject + +Nyall Dawson 2017-11-05 + + Add support for serializing transform contexts + +Nyall Dawson 2017-11-05 + + Implement logic for calculating datum transforms to use + +Nyall Dawson 2017-11-05 + + QgsCoordinateTransformContext must be thread safe + +Nyall Dawson 2017-11-05 + + QgsCoordinateTransformContext is implicitly shared + +Nyall Dawson 2017-11-05 + + Doxygen + +Nyall Dawson 2017-11-05 + + Allow removing existing transforms from context + +Nyall Dawson 2017-11-05 + + Start on QgsCoordinateTransformContext + + Stores settings related to the correct datum transforms to use + when performing a coordinate transform. + +Nyall Dawson 2017-12-15 + + Allow clickable links in message bar text + + Links are opened using QDesktopServices::openUrl, i.e. the + default OS handler for that link type + +nirvn 2017-12-15 + + [ui] add vector layer icon color improvement + +nirvn 2017-12-15 + + [ui] harmonize asf & asm providers icon color + +Harrissou Sant-anna 2017-12-14 + + Use getThemeIcon instead of building each icon + +Harrissou Sant-anna 2017-12-09 + + Replace "Non spatial" type by "No geometry" + +Harrissou Sant-anna 2017-12-09 + + Fix icon file + +Harrissou Sant-anna 2017-12-09 + + Add icon to SpatiaLite geometry type combobox items + +Harrissou Sant-anna 2017-12-09 + + Add icon to field type combobox items + +Harrissou Sant-anna 2017-12-09 + + Add icon to geometry combobox items + +Merge: abdd8759a0 2674022b6c +Nyall Dawson 2017-12-15 + + Merge pull request #5867 from alexbruy/processing-group + + [processing] add groupId() method to get untranslated algorithm group + +Etienne Trimaille 2017-12-15 + + add constructor to QgsBox3d with a QgsRectangle + +Nyall Dawson 2017-12-15 + + Travis doesn't like me fixing him + +Nyall Dawson 2017-12-15 + + Fix build warning + +Nyall Dawson 2017-12-15 + + Fix failing unit test + + Wow... how did that test ever work? Very odd... + +Etienne Trimaille 2017-12-15 + + getter for the output crs in QgsExtentGroupBox + +Nyall Dawson 2017-12-14 + + [processing] Don't sort field names in multi-field input dialog + + Field names should always be listed in the order that the layer + defines them + +Merge: 49990b840a 12e44b2016 +Nyall Dawson 2017-12-15 + + Merge pull request #5864 from nyalldawson/favorites + + [browser] Allow renaming favorite items + +Etienne Trimaille 2017-12-14 + + hide the extent from canvas button if the canvas is not set + +Matthias Kuhn 2017-10-27 + + [attributetable] Adjust the edit selection when the filter changes + + Make sure that we always have a feature on the form that matches the current filter condition + +Alexander Bruy 2017-12-14 + + [processing] add group id to scripts + +Alexander Bruy 2017-12-14 + + [processing] add group id to QGIS algorithms + +Alexander Bruy 2017-12-14 + + [processing] add group id to GDAL algorithms + +Alexander Bruy 2017-12-14 + + [processing] add group id to SAGA algorithms + +Alexander Bruy 2017-12-14 + + [processing] add group id to GRASS algorithms + +lbartoletti 2017-12-14 + + - init variables + - fix equality + - add tests + +David 2017-12-14 + + first import + +Alexander Bruy 2017-12-11 + + [processing] add groupId() method to algorithms to get unique ID of the + algorithm group. + + Adapt native algorithms + +nirvn 2017-12-14 + + [ui] harmonize geopackage icon size + +nirvn 2017-12-14 + + [ui] harmonize geonode icon color and size + +Matthias Kuhn 2017-12-12 + + Refactor fields configuration in the modeler does not insist on layer + + Inside the modeler, there is not enough knowledge about the layer on + which the refactor fields algorithm will run. + Let's be graceful with error messages here therefore. + +Matthias Kuhn 2017-12-12 + + Add allowEvalError flag to QgsExpression widgets + + Some expression functions insist on a complete context which we + sometimes are not able to provide. The user might still have enough + knowledge that the expression is valid and an error will still be shown. + +Matthias Kuhn 2017-12-12 + + Make string translatable + +Matthias Kuhn 2017-12-11 + + Fix file mode + +Nyall Dawson 2017-12-14 + + Notify model of changes when renaming data items + +Nyall Dawson 2017-12-14 + + [needs-docs][browser] Allow renaming favorite items + + Otherwise favorites can be useless if you're trying to favorite + a long path + + Fixes #6780 + +Merge: 457abe7bbf cf25b3ea83 +Nyall Dawson 2017-12-14 + + Merge pull request #5715 from nyalldawson/3d_ctrl + + [3d] Holding ctrl results in finer view adjustments + +Nyall Dawson 2017-11-24 + + [3d] Holding ctrl results in finer mouse wheel zooming + + To match behaviour of canvas and composer + + Fixes #17527 + +Merge: ea49c8276c 79c180a77e +Nyall Dawson 2017-12-14 + + Merge pull request #5859 from nyalldawson/project_icon + + Use qgs project icon derivative for project home in browser + +Nyall Dawson 2017-12-14 + + Fix doxygen warning + +Nyall Dawson 2017-12-13 + + Fix actions on model items in browser + +Nyall Dawson 2017-12-13 + + Consistent capitalization + +Nyall Dawson 2017-12-13 + + Use qgs project icon derivative for project home in browser + +David 2017-12-13 + + improvement in statusbar widget size handling + + only the scale line edit has the minimum size instead of the whole scale widget + coordinates line edit size is now dynamic depending on the coordinate value + +volaya 2017-12-13 + + [processing] Set value of unused optional layer parameters to None instead of empty string + +volaya 2017-12-13 + + [processing] fixed parsing of integer parameters + +volaya 2017-12-13 + + [Processing] correctly report missing layers in postprocessing task + +volaya 2017-12-13 + + [processing] fixed saga algs descriptions + +lbartoletti 2017-12-13 + + - Update api_break.dox + - rename isIntersect to isIntersection + - rename inter to intersectionPoint + +Borys Jurgiel 2017-12-13 + + Add comments to unlcear translatable strings + +Etienne Trimaille 2017-12-13 + + update HTML data provider metadata (#5700) + + * update HTML data provider metadata for grass, gdal and ams + + * update HTML data provider metadata for WMS and WCS + + * move HTML bullet list to QgsHtmlUtils + +Merge: 28a61e1e1d fec31f8da2 +Nyall Dawson 2017-12-13 + + Merge pull request #5856 from nyalldawson/sort_browser + + Correctly sort browser items + +lbartoletti 2017-12-13 + + Update doc + +lbartoletti 2017-12-13 + + Fix missing cases and push + +Alessandro Pasotti 2017-12-13 + + [bugfix] Bookmarks fix export SRID and refresh on import + + Fixes #17674 - Export and Import problems after recent fixes + +lbartoletti 2017-12-13 + + Apply segmentIntersection on some tools with tests. + +Mathieu Pellerin 2017-12-13 + + Tiny spatialite-related improvement & fix (#5857) + + * [spatialite provider] when creating an empty layer, primary key should be autoincrement + * [processing] fix import into spatialite's primary key parameter + * [spatialite provider] case insensitive search for table names + +Matthias Kuhn 2017-12-12 + + Embedded relref widget: less functionality + +nirvn 2017-12-13 + + [spatialite provider] take into account possible quotation marks for primary key column + +Mathieu Pellerin 2017-12-13 + + [spatialite provider] auto-generate auto-incrementing primary keys (#5849) + +Nyall Dawson 2017-12-13 + + Sort browser items + + Implements a sort key for browser items, allowing them to be + correctly sorted. + + Fixes #17591 + +Juergen E. Fischer 2017-12-12 + + spelling fixes + +lbartoletti 2017-12-12 + + improve segmentIntersection + +Nyall Dawson 2017-12-12 + + Better boolean support detection for GDAL >= 2.3 + +Nyall Dawson 2017-12-12 + + Expose boolean field creation support for other OGR supported drivers + +Nyall Dawson 2017-12-11 + + [ogr] Advertise boolean field support for GPKG layers + + Likely other drivers also support this, so the list should be + extended for these + +Matthias Kuhn 2017-12-12 + + Fix crash with error on autocreate savepoint + + member variables are initialized in the order they are defined in the + header. We cannot use mError to initialize mSavePointId if the former is + declared after in the header. + + References #17535 + +Martin Dobias 2017-12-10 + + [3d] Allow the user to invert calculated normals of faces + + It seems that some data sources / formats with 3D polygons order vertices + in clockwise order for the front side of the polygons, while others use + counter-clockwise order of vertices. While culling mode configuration fixes + some problems with rendering (e.g. only back walls are rendered instead of + front walls), there still may be issues with shading if the normals + are pointing the other way than the polygon was supposed to. + +Martin Dobias 2017-12-08 + + [3d] Show feedback when loading tiles for 3D view (fixes #17565) + + There was no indication whether something is going on behind the scenes, + leaving user to wonder whether there is something to wait for or the scene + is already loaded in full detail. + +Merge: f5cd856531 78554dd319 +Alessandro Pasotti 2017-12-12 + + Merge pull request #5852 from elpaso/bugfix-bookmarks-take2 + + [bugfix] bookmarks sorting and multiple deletion + +Sandro Santilli 2017-12-05 + + Refresh virtual fields editing button state based on field selection + + Allows removing virtual fields defined on read-only PostgreSQL tables. + Closes #17593 + +Alessandro Pasotti 2017-12-12 + + [bugfix] Bookmarks fix deleting multiple items + + Also fix sorting enabled. + +Alessandro Pasotti 2017-12-12 + + Fix asserts when beginRemoveRows has no rows + + This was hitting an assert in Qt Core + +Alexander Bruy 2017-12-12 + + Revert "use 443 (HTTPS) port when testing help URLs" + + This reverts commit 678758c9baf6db386aff205301c037c67b5247e9. + +Nathan Woodrow 2017-12-12 + + Add first run and settings migration screen (#5838) + +Nyall Dawson 2017-12-12 + + Swap missing 0->nullptr and add missing overrides + +Mathieu Pellerin 2017-12-12 + + [spatialite provider] implement to do: show geometryless layers in browser (#5850) + + This is in essence a "fix" to the QgsSpatialiteConnection's table fetching + which used to return system tables. + +Nyall Dawson 2017-12-11 + + Default to showing calendar popup for date time widgets + +Nyall Dawson 2017-12-12 + + Spelling + +David 2017-11-16 + + Use title from template as default in layout manager + + use the template name (if empty or not) as default value in the dialog. user can edit it. + if it is already existing, the user has to change it. + +Nyall Dawson 2017-12-12 + + [needs-docs] Double clicking a layout in the layout manager opens + the layout, instead of renaming it + + Because there's already a dedicated rename button, and opening + is a far more common operation than renaming. + + Signed off by @nirvn + +Nyall Dawson 2017-12-11 + + Fix a crash on exit + +Denis Rouzaud 2017-12-11 + + [docker] allow updating dependencies + + this is triggered by a commit message: + [docker] update dependencies + +Nyall Dawson 2017-12-12 + + Fix leak in unit test + +Merge: 3da5ab6996 891d954bdf +Nyall Dawson 2017-12-12 + + Merge pull request #5846 from nyalldawson/spatialite + + Spatialite geometry conversion fixes + +Nyall Dawson 2017-12-12 + + Remove unreachable code + +Nyall Dawson 2017-12-12 + + Fix build warnings in spatialite provider + +Borys Jurgiel 2017-12-11 + + [Plugin installer] Properly handle 301 Redirection + +Alexander Bruy 2017-12-11 + + use 443 (HTTPS) port when testing help URLs + +Alexander Bruy 2017-12-11 + + use https for help + +Merge: 6b73f78198 50aa6fea91 +Alexander Bruy 2017-12-11 + + Merge pull request #5844 from rduivenvoorde/docs_moved + + find redirected/301 doc url + +Merge: 61db97f73f 33fdf8f219 +Alexander Bruy 2017-12-11 + + Merge pull request #5839 from alexbruy/raster-extensions + + Add methods to get supported raster formats and extensions to QgsRasterFileWriter + +Merge: 8302fc3fd1 bfa857bb97 +Alessandro Pasotti 2017-12-11 + + Merge pull request #5843 from elpaso/bugfix-17600-coordinatetransform-rectangle + + [bugfix] Restore binding for QgsCoordinateTransform + +Alexander Bruy 2017-12-11 + + add tests for new methods + +Richard Duivenvoorde 2017-12-11 + + find redirected/301 doc url + +Alessandro Pasotti 2017-12-11 + + [bugfix] Restore binding for QgsCoordinateTransform + + Fixes #17600 + + Binding was lost in commit 10d34ece02bb765f5d9d88bb0524c909235fb0d7 + +Mathieu Pellerin 2017-12-11 + + [spatialite provider] further zm support fixes + +Merge: b1db8daeec 02b69763ff +Alessandro Pasotti 2017-12-11 + + Merge pull request #5817 from m-kuhn/noQtScript + + Remove dependency on deprecated QtScript library + +nirvn 2017-12-11 + + Add non spatial option to create spatialite layer dialog + +Nyall Dawson 2017-12-11 + + Use GDAL metadata to determine feature styles support + + GDAL >= 2.3 only + +Nyall Dawson 2017-12-11 + + Use GDAL metadata to determine non-spatial formats (gdal >=2.3 only) + +Merge: 7037c2936b e479b71594 +Alessandro Pasotti 2017-12-11 + + Merge pull request #5831 from elpaso/bugfix-17636-attrtable-progress + + [bugfix] Do not crash when layer is destroyed while loading + +Alexander Bruy 2017-12-07 + + [processing] use core methods for raster and vector extensions handling + +Alexander Bruy 2017-12-07 + + add supportedFormatExtensions() method to QgsRasterFileWriter + +Alexander Bruy 2017-12-07 + + add supportedFiltersAndFormats() method to QgsRasterFileWriter + +Nathan Woodrow 2017-12-11 + + Add PWD to prepare-commit + + Running using non Cygwin git (Faster on Win) will return a differnt path format + to cygwin style. So just make sure scripts is in path so everything else + works. + +Merge: 2ec1a0f679 1da0f8e543 +Mathieu Pellerin 2017-12-11 + + Merge pull request #5827 from nirvn/spatialite_zm + + [spatialite provider] Fix ZM support + +nirvn 2017-12-11 + + [spatialite provider] refresh connections when creating a db and/or layer + +nirvn 2017-12-11 + + Add Z/M test case to the spatialite provider + +nirvn 2017-12-08 + + [spatialite provider] Fix ZM support + +Merge: aed128ee4e 7aab0c7522 +Nyall Dawson 2017-12-11 + + Merge pull request #5529 from DelazJ/chkgeom_format + + [Geometry Checker] Use a more readable file format list + +Merge: 6c9a75fb27 fa8e655b67 +Nyall Dawson 2017-12-11 + + Merge pull request #5801 from DelazJ/metadataCatPus + + Some tweaks on Metadata-->Category dialog + +Merge: 6e182107d7 d281b448af +Nyall Dawson 2017-12-11 + + Merge pull request #5732 from DelazJ/colorDialogTitle + + Some general tweaks to dialogs + +Merge: 163a1f92c1 62bd37762d +Nyall Dawson 2017-12-11 + + Merge pull request #5657 from DelazJ/patch-2 + + [Bugfix] Snapping widget: Ensure layer column is fully visible + +Merge: 010cb1567b 591150d7cc +Nyall Dawson 2017-12-11 + + Merge pull request #5473 from DelazJ/saveas-symbology + + Hide symbology export options when not compatible + +Harrissou Sant-anna 2017-12-10 + + (Re)move #include "qgshelp.h" from .h files + +Matthias Kuhn 2017-12-10 + + Port WCS test away from QScript + +Matthias Kuhn 2017-12-10 + + Remove dependency on QtScript + +Merge: fb28adfb4a a603a3d756 +Nyall Dawson 2017-12-10 + + Merge pull request #5819 from nyalldawson/dialogs + + New layer dialog improvements + +Nyall Dawson 2017-12-10 + + Use standard names for geometry types + +Nyall Dawson 2017-12-10 + + Fix ui merge + +Nyall Dawson 2017-12-07 + + Add missing 'm values' checkbox to create shapefile dialog + +Nyall Dawson 2017-12-07 + + Fix and update mapping of ogr wkt types to QGIS wkb types + +Nyall Dawson 2017-12-07 + + Correctly set initial state of new memory dialog + +Nyall Dawson 2017-12-07 + + Align CRS selector with geometry widgets in new layer dialogs + + Since it's directly related to the geometry settings, and is + only enabled when the geometry is selected, it should be + more closely visually linked with this widget + +Nyall Dawson 2017-12-07 + + Use standard names for multi* geometry types + +Merge: 53ebe050bd e4cf0655bd +Alessandro Pasotti 2017-12-09 + + Merge pull request #5820 from elpaso/colorramp-hidpi + + Adjust colorramp height on HiDPI screens + +Alessandro Pasotti 2017-12-09 + + [bugfix] Do not crash when layer is destroyed while loading + + Fixes #17636 QGIS crashes when a layer is removed + while loading the attribute table + +Alessandro Pasotti 2017-12-09 + + Fix insert rows when there are no rows + + This condition was hitting an assert in Qt core. + +Alessandro Pasotti 2017-12-09 + + [hidpi] Apply UI_SCALE_FACTOR multiplier to font metrics + + On windows too. + +Merge: 297138f14f b578f8af35 +Nyall Dawson 2017-12-09 + + Merge pull request #5825 from nyalldawson/gdal + + [processing] Some GDAL algorithm fixes + +Harrissou Sant-anna 2017-11-26 + + Add Title and Help button to "Symbol levels" dialog + +Harrissou Sant-anna 2017-11-26 + + Add Cancel button to "Size Legend" dialog + + because it's easier than hitting the cross button if you want to leave the dialog + +Harrissou Sant-anna 2017-11-26 + + Enable help button and title in color dialogs + +Nyall Dawson 2017-12-08 + + Fix ui build warnings + +Nyall Dawson 2017-12-08 + + Ensure canvas is refreshed after triggering Select All + +Mathieu Pellerin 2017-12-08 + + Allow appending layers to existing spatialite in its create layer dialog + +Nyall Dawson 2017-12-08 + + Fix layer handling in import to postgis algs + +Nyall Dawson 2017-12-08 + + [processing][gdal] Spatial extent filter for import to postgis + should be optional + +Nyall Dawson 2017-12-08 + + Resurrect GDAL import to PostGIS (available connections) alg + + Fixes #17605 + +Mathieu Pellerin 2017-12-08 + + [need-docs] reorganize the new spatialite layer dialog (#5824) + +Nyall Dawson 2017-12-08 + + Add missing proxy calls for QgsProcessingFeatureSource, causing + inefficient base class methods to be used instead. + +Nyall Dawson 2017-12-08 + + Faster command generation in gdal algorithm dialog, by skipping forced incompatible layer exports + +Nyall Dawson 2017-12-08 + + [processing][gdal] Cleanup some code, add method to customise + generated command based on whether the algorithm is actually + executing or just being displayed in the UI as a command + +Nyall Dawson 2017-12-08 + + Hide "whats this" buttons on all dialogs on Windows + + Since it's totally useless and does nothing at all. + + *Requires Qt >= 5.10 + +Nyall Dawson 2017-12-08 + + Enable geometry restore for annotation config dialogs + +Merge: 1305cccbd9 9ace5e3ae4 +Nyall Dawson 2017-12-08 + + Merge pull request #5822 from Gustry/fix_build_macos + + add missing include for macos + +Etienne Trimaille 2017-12-07 + + add missing include for macos + +nirvn 2017-12-07 + + Fix new geopackage layer test + +Merge: bac80aa93a de0ac14ae1 +Mathieu Pellerin 2017-12-07 + + Merge pull request #5818 from nirvn/filewidget_fest + + Use QgsFileWidget in several dialogs + +nirvn 2017-12-07 + + [ui] use qgsfilewidget in the save raster as dialog + +nirvn 2017-12-07 + + [ui] use qgsfilewidget in the save vector as dialog + +nirvn 2017-12-07 + + [ui] use qgsfilewidget in the create geopackage layer dialog + +Alessandro Pasotti 2017-12-07 + + Adjust colorramp height on HiDPI screens + +nirvn 2017-12-07 + + [ui] use qgsfilewidget in the create shapefile layer dialog + +nirvn 2017-12-07 + + [file widget] add a save file mode to allow file creation + +Harrissou Sant-anna 2017-12-07 + + [need-docs] Reorganize the new memory layer (#5804) + +Harrissou Sant-anna 2017-12-07 + + [needs-docs] Refactor the New Shapefile dialog to mimic the GeoPackage sequence (#5803) + +Merge: ca75e8c0a5 8e77701288 +Nyall Dawson 2017-12-07 + + Merge pull request #5794 from nyalldawson/layout_next2 + + [layouts] Copy/paste, templates, etc + +Matthias Kuhn 2017-12-07 + + Make deprecated QtScript library optional + +Nyall Dawson 2017-12-07 + + Fix warning + +Nyall Dawson 2017-12-05 + + Sipify + +Nyall Dawson 2017-12-05 + + Pasting items from layout context menu pastes them at menu origin + instead of final cursor position + +Nyall Dawson 2017-12-05 + + Fix crash when reopening existing layouts + +Nyall Dawson 2017-12-05 + + [needs-docs] Add "delete layout" action to layout designer menu + + Fixes #10436 + +Nyall Dawson 2017-12-05 + + [needs-docs] Add rename layout action to layout designer dialog + + Fixes #10435 + +Nyall Dawson 2017-12-05 + + Save and restore layouts with project + +Nyall Dawson 2017-12-05 + + [needs-docs] Use a QgsFileWidget for template file selector + + Rename "Add" button to "Create" + +Nyall Dawson 2017-12-05 + + Port composer manager dialog to layouts + + Not exposed via GUI yet, but can be shown by entering + + iface.showLayoutManager() + + in the Python console + +Nyall Dawson 2017-12-04 + + Try to fix issues with sip casting collisions between layout and + compositions + +Nyall Dawson 2017-12-04 + + Indentation + +Nyall Dawson 2017-12-04 + + #ifdef out dummy test item + +Nyall Dawson 2017-12-04 + + Fix layout designer window title + +Nyall Dawson 2017-12-04 + + Port a few file related actions to layouts + +Nyall Dawson 2017-12-04 + + Port a bunch of QgsLayoutManager methods to use QgsLayouts + +Nyall Dawson 2017-12-04 + + Port duplicate layout functionality + +Nyall Dawson 2017-12-04 + + [FEATURE][layouts] Support drag and drop of QPT templates onto layout windows + + To add contents of template onto layout + +Nyall Dawson 2017-12-04 + + Add custom drop handlers for layout windows + +Nyall Dawson 2017-12-04 + + Fix pages are incorrectly loaded from templates when adding items + +Nyall Dawson 2017-12-04 + + Handle linking items when adding from templates + +Nyall Dawson 2017-12-04 + + Restore ability to save layouts to templates and add items from template + +Nyall Dawson 2017-12-04 + + Add a method to clear an existing layout + +Nyall Dawson 2017-12-04 + + Add method to clear page collections for layouts + +Nyall Dawson 2017-12-04 + + Restore paste in place functionality + +Nyall Dawson 2017-12-04 + + Add test for pasting items at set position + +Nyall Dawson 2017-12-04 + + Fix pasting items to the top or left of first page + +Nyall Dawson 2017-12-01 + + Fix crashes when rapidly deleting/undeleting objects + + Also fix some leaks + +Nyall Dawson 2017-12-01 + + Deduplicate code relating to shifting item positions in layout units + +Nyall Dawson 2017-12-01 + + [layouts] Add context menu entries for "copy" and "delete" item to + items list panel right click menu + + Refs #11581 + +Nyall Dawson 2017-12-01 + + Remove outdated TODO + +Nyall Dawson 2017-12-01 + + [layout] Add context menu entries for cutting/copying, and pasting items + + Fixes #1830 + +Nyall Dawson 2017-12-01 + + Start restoring copy/paste functionality + +Nyall Dawson 2017-11-30 + + Add some unit tests + +Nyall Dawson 2017-11-30 + + Work on layout and layout item serialization and restoration + +Nyall Dawson 2017-12-06 + + Remove obsolete python alg, add unit tests + +Nyall Dawson 2017-12-06 + + Add option to control CRS for merge algorithm (fixes #9652) + + The default behaviour of auto selecting the first layer's CRS + can be unpredictable, especially in models + +Nyall Dawson 2017-12-06 + + [processing] Fix merge vectors algorithm fails when encountering + layers with different dimensions or single/multi part types + + and port algorithm to c++ + +Merge: ab859c9bdf 3bbda6cf68 +Matthias Kuhn 2017-12-06 + + Merge pull request #5814 from m-kuhn/fixMultiLayerOfflineEditing + + [offline] Apply attribute changes on multiple layers + +Matthias Kuhn 2017-12-06 + + [offline] Apply attribute changes on multiple layers + + Fix #17647 + +Juergen E. Fischer 2017-12-06 + + use 'close' on last tab of message log viewer to clear it + +Denis Rouzaud 2017-12-06 + + [doxygen] remove useless @brief + +Denis Rouzaud 2017-12-06 + + [doxygen] replace @param by \param + +Denis Rouzaud 2017-12-06 + + [doxygen] replace @see by \see + +Merge: ed5076201a b7fe407f55 +Blottiere Paul 2017-12-06 + + Merge pull request #5780 from pblottiere/bugfix_reshape2 + + [bugfix] Do not add binding line in both side in reshape map tool + +Denis Rouzaud 2017-12-05 + + [doxygen] \see must be placed after params + +Denis Rouzaud 2017-12-05 + + run sipify + +Denis Rouzaud 2017-12-05 + + [sipify] creates links in seealso + +Martin Dobias 2017-12-05 + + [3d] Have 3D View tab in vector layer properties (fixes #17595) + + (only when 3D support is enabled) + +Blottiere Paul 2017-12-06 + + Update tests + +Alessandro Pasotti 2017-12-06 + + [bugfix] Bookmarks fix zoom to with coordinate transform + + Forward port of an unreported bug introduced + by me when I changed the display value to + EPSG:xxxx + +Blottiere Paul 2017-12-01 + + Add some tests + +Blottiere Paul 2017-12-01 + + Update sip binding + +Blottiere Paul 2017-12-01 + + [bugfix] Do no add binding line in both side in reshape map tool + +Merge: 1cd8b9481c 7c2732d1ad +Blottiere Paul 2017-12-05 + + Merge pull request #5774 from pblottiere/bugfix_ref_rel_null + + [bugfix] Fixes crash in QgsRelationReferenceWidget + +Blottiere Paul 2017-11-30 + + Fixes crash in QgsRelationReferenceWidget + +Borys Jurgiel 2017-12-05 + + Fix a tooltip + +Frank Dekervel 2017-11-29 + + Fix missing signal/slot connection resulting in non-woring autocompleter for value relation fields (fixes #16676). + + This oneliner introduces the missing signal/slot connection, and fixes the bug. + +Nyall Dawson 2017-12-05 + + Consistent capitalisation + +Nyall Dawson 2017-12-05 + + Fix missing delete action for gpkg layers in browser + +Nyall Dawson 2017-12-05 + + Fix use of QWidgets from non-gui thread + +Merge: ba9e19954b 95e40c2499 +Alessandro Pasotti 2017-12-05 + + Merge pull request #5773 from SrNetoChan/add_missing_tooltips + + Adds missing tooltips + +Merge: db9fc285f7 1f6cd31fab +Martin Dobias 2017-12-05 + + Merge pull request #5798 from wonder-sk/polygon-3d-fixes + + [3d] Tessellator fixes + culling mode configuration for 3D polygons + +Alessandro Pasotti 2017-12-05 + + Add documentation for new overridden constructors + +Merge: 011e254e8a efad2f6a1f +Alessandro Pasotti 2017-12-05 + + Merge pull request #5795 from elpaso/delegate-leaks + + Fix Some Delegate leaks + +Alessandro Pasotti 2017-12-04 + + Don't leak memory in qgsnodeeditor delegates + +Alessandro Pasotti 2017-12-04 + + Don't leak in metadatawidget delegates + +Martin Dobias 2017-12-05 + + Fixes after review + +Martin Dobias 2017-12-04 + + [3d] Read/write camera position of the 3D map view in project + +Mathieu Pellerin 2017-12-05 + + [processing] list native QGIS algorithms first in modeler dialog + +Nyall Dawson 2017-12-05 + + Fix initial extent of map canvas is loaded incorrectly from projects + +Nyall Dawson 2017-12-05 + + Fix crash in standalone apps when no QgsApplication available + +Nyall Dawson 2017-12-05 + + Fix coverity unreachable code warning + + Was preventing conditional formatting decorations from showing + in relation widgets + +Nyall Dawson 2017-12-05 + + Fix coverity uninitialized member warnings + +Nyall Dawson 2017-12-05 + + Fix coverity null pointer dereference warnings + +Nyall Dawson 2017-12-05 + + Fix coverity ignored return value warnings + +Merge: b26c14ef04 38cca6ca7e +Nyall Dawson 2017-12-05 + + Merge pull request #5789 from nyalldawson/render_jobs + + [Rendering] Only render in preview jobs layers that are fast enough + +Merge: 32ba5bf23f 4689537842 +Nyall Dawson 2017-12-05 + + Merge pull request #5799 from nyalldawson/mingw + + Mingw build fixes and windows build warning fixes + +Nyall Dawson 2017-12-05 + + Tweak API + +Nyall Dawson 2017-12-04 + + Always show WMTS/XYZ layers in preview jobs (to pre-warm cache) + +Nyall Dawson 2017-12-04 + + Rename layerRenderingTime()->perLayerRenderingTime() + +Nyall Dawson 2017-12-02 + + Update docs + +Nyall Dawson 2017-12-02 + + Run canvas preview jobs sequentially + + Only start the next job when the previous one has completely finished. + Avoids flooding connection pools with too many quick requests. + +Nyall Dawson 2017-12-02 + + More flexible API for preview job determination + +Nyall Dawson 2017-12-02 + + Store previous layer rendering time in canvas, not map layer + +Even Rouault 2017-11-15 + + [Rendering] Only render in preview jobs layers that are fast enough + + This implements the improvements discussed in the mailing list thread + https://lists.osgeo.org/pipermail/qgis-developer/2017-November/050524.html + to avoid rendering layers in preview jobs that take too much time to render. + +Merge: f180ea4454 5a818707c7 +Nyall Dawson 2017-12-05 + + Merge pull request #5791 from nyalldawson/geom_snapper_vertices + + Fix geometry snapper sometimes creates unwanted overlapping segments when snapping line layers + +Nyall Dawson 2017-12-05 + + Fix build warning + +Martin Dobias 2017-12-04 + + [3d] Tessellator fixes + culling mode configuration for 3D polygons + + - missing vertical walls since a recent tessellator crash fix (fixes #17604) + - choice of the culling mode - no culling / back face / front face (fixes #17619) + - more unit tests for tessellator + +Nyall Dawson 2017-12-05 + + Readability fix + +Nyall Dawson 2017-12-05 + + Fix build using mingw + + Credit to t-hey + +Borys Jurgiel 2017-12-04 + + [Plugin manager] Use raw string for zip file path to avoid escaping '\U' in C:\Users. Fixes #17624 + +Borys Jurgiel 2017-12-04 + + Fix untranstatable strings + +Matthias Kuhn 2017-12-04 + + Fix build warning + +Matthias Kuhn 2017-12-04 + + Hide aggregate button in non-aggregate context + +Alessandro Pasotti 2017-12-04 + + Don't leak memory in bookmarks delegate + +Nathan Woodrow 2017-12-04 + + Add API to ease saving and restoring widget geometry. (#5615) + + Usage: + - QgsGui::instance()->enableAutoGeometryRestore( this ); just + after setupUi in your widgets to enable. + - Remove any calls to saveGeometry() and restoreGeometry() in your + widgets. + +Nyall Dawson 2017-12-04 + + Sipify + +Nyall Dawson 2017-12-04 + + Fix build warning + +Harrissou Sant-anna 2017-12-03 + + Some tweaks on Metadata-->Category dialog + + Use the + button and add new tooltips + +Nyall Dawson 2017-12-03 + + Update tests + +Nyall Dawson 2017-12-03 + + Set default method for check validity alg + +Nyall Dawson 2017-12-03 + + Less debug noise in geometry validator + +Nyall Dawson 2017-12-03 + + [geometry snapper] Don't create invalid geometries with duplicate nodes + + Fixes #15247 + +Nyall Dawson 2017-12-03 + + Show cell values in tooltips in attribute table + + Otherwise long values can be truncated and hard to read + +Nyall Dawson 2017-12-03 + + Add some tags to check validity algorithm + +Nyall Dawson 2017-12-03 + + Add API method to remove duplicate nodes from geometries + + Removes duplicate nodes from the geometry, wherever removing the + nodes does not result in a degenerate geometry. + + By default, z values are not considered when detecting duplicate + nodes. E.g. two nodes with the same x and y coordinate but + different z values will still be considered duplicate and one + will be removed. If useZValues is true, then the z values are + also tested and nodes with the same x and y but different z + will be maintained. + + Note that duplicate nodes are not tested between different + parts of a multipart geometry. E.g. a multipoint geometry + with overlapping points will not be changed by this method. + + The function will return true if nodes were removed, or false + if no duplicate nodes were found. + + Includes unit tests and a processing algorithm which exposes + this functionality. + +Nyall Dawson 2017-12-03 + + Spelling + +Nyall Dawson 2017-12-03 + + Fix geometry snapper sometimes creates unwanted overlapping segments + when snapping line layers + + Because the default behavior of the snapper is to insert extra + vertices into the snapped geometry in order to make it 'follow' + the reference geometries exactly, this can result in unwanted + results for line layers where the resultant snapped layer + has overlapping line segments. + + Since we can't always know what the desired result is that the + user wants (maybe they do want overlapping lines), instead + give them control over the result by exposing extra enum + options which never insert extra vertices. + +Mathieu Pellerin 2017-12-02 + + Fix rubber band handing of curved geometries (#5790) + +Martin Dobias 2017-12-01 + + [3d] Fix style copy/paste for 3D renderer (fixes #17540) + +Martin Dobias 2017-12-01 + + [3d] Disable 3D view for unprojected (lat/lon) CRS + + The fact that the map units are in degrees instead of meters means that various bits of the code + (e.g. tolerances) are not behaving correctly due to changes in coordinate values being several + orders of magnitude lower. So for the time being it is safer to disable 3D view for unprojected + CRS and just let the user choose a projected CRS for the project. + +nirvn 2017-12-02 + + Enable preview jobs to improve projection map UX when dragging around + +Mathieu Pellerin 2017-12-02 + + Fix displayed extent for US National Atlas CRS (and others) on projection map (#5738) + +Merge: 65a0c069b9 9378f392c8 +Nyall Dawson 2017-12-02 + + Merge pull request #5729 from nyalldawson/proc_dyanmic + + [processing] Expose dynamic ("data defined") numeric parameters to gui + +Merge: 6b23e1f299 5f77a48e10 +Nyall Dawson 2017-12-02 + + Merge pull request #5430 from nyalldawson/raster_formats + + [FEATURE] More output format choices in raster save as dialog + +Nyall Dawson 2017-11-27 + + Show closest vertex attributes in identify tool for multipoint layers + +Nyall Dawson 2017-11-27 + + Disable direct parameter value input when data defined override is set + +Nyall Dawson 2017-11-27 + + [processing] Make set m value accept dynamic m values + +Nyall Dawson 2017-11-27 + + Cache field lookup when evaluating field-based property values + +Nyall Dawson 2017-11-27 + + Update algorithms for new API + +Nyall Dawson 2017-11-27 + + Tweak processing API to better handle dynamic properties + +Nyall Dawson 2017-11-27 + + Fix failing test + +Nyall Dawson 2017-11-26 + + [processing] Allow data defined z value for "set z value" algorithm + + Allows easy setting of z from an existing height attribute! + +Nyall Dawson 2017-11-26 + + [processing] Make buffer distance a dynamic property + + Data defined buffer distance through the processing toolbox! + +Nyall Dawson 2017-11-26 + + [processing] Expose data defined button for dynamic numeric parameters + + When running algorithms through the toolbox, which have dynamic + numeric parameters, add a data defined property override button + next to the widget so that users can set the overrides for these + parameters. + + Previously this was available only in the backend, but not + exposed anywhere in the GUI. + + Note that currently no algorithms support dynamic parameters, + so don't expect to see this everywhere. It's also only available + in toolbox/batch processing modes, not in models. + +Nyall Dawson 2017-11-26 + + [processing] Some more framework for dynamic (data defined) parameters + +Nyall Dawson 2017-11-26 + + Small refactor of QgsPropertyOverrideButton + +Nyall Dawson 2017-10-24 + + Remember window geometry for raster save dialog + +Nyall Dawson 2017-10-24 + + [FEATURE] More output format choices in raster save as dialog + + Previously only geotiff format was available, even though the + underlying QgsRasterFileWriter/GDAL libraries support other + formats. + + This commit exposes those other formats to the dialog so that + users can directly save rasters to them (including everyone's + new BFF, geopackage). + +Merge: b8b8c1ae93 133051a174 +Nyall Dawson 2017-12-02 + + Merge pull request #5600 from Gustry/sortby + + add order by expression algorithm + +Merge: 31c79da523 aaa18e0b89 +Nyall Dawson 2017-12-02 + + Merge pull request #5787 from nyalldawson/index + + Fix OGR provider cannot create attribute or spatial indexes for GeoPackage/SQLite layers + +Nyall Dawson 2017-12-02 + + Address review comments + +Nyall Dawson 2017-12-02 + + Fix OGR provider cannot create attribute or spatial indexes for + GeoPackage/SQLite layers + + Previously this capability was only exposed for shapefiles, + but was available in the spatialite provider. We don't use that + for GeoPackages, so I've ported the functionality across to + the OGR provider for these data sources. + + Includes unit tests + +Alessandro Pasotti 2017-12-01 + + Don't crash when project has no layers + + This only crashes when Qt is built in + debug mode because there is an assert + in the item model class that checks for + index range validity. + +Merge: b22825a41d 88054a3744 +Alessandro Pasotti 2017-12-01 + + Merge pull request #5766 from Gustry/file_downloader + + Display the downloaded size in QgsFileDownloaderDialog + +Merge: 0e2207ab3c 6c897b6b1e +Alessandro Pasotti 2017-12-01 + + Merge pull request #5779 from elpaso/bugfix-17003-16350-bookmarks + + [bugfix] Bookmarks: fix a crash and show 6 digits + +Alessandro Pasotti 2017-12-01 + + [bugfix] Bookmarks: fix a crash and show 6 digits + + Fixes #17003 Spatial bookmarks keyboard navigation: + right-arrow causes a row to appear below the current + one and looks like a tree expansion (actually crashes + master) + + Fixes #16350 Spatial Bookmark Panel: precision gets + trimmed + +Merge: 1c1de3a88b 8233a8fbdc +Alessandro Pasotti 2017-12-01 + + Merge pull request #5776 from elpaso/bugfix-17005-bookmarks-sorting + + [bugfix] Bookmarks sorting with a proxy model + +Nyall Dawson 2017-12-01 + + [processing] Fix optional numeric parameters cannot be cleared + + Without this change optional numeric parameters have no way to + be cleared in the GUI - they are always forced to have a value + + Fixes #17471 - but I've noticed that many optional numeric + GRASS parameters have a non-null default value. These may + need to be investigated and manually changed to None defaults + in the description files. + +Nyall Dawson 2017-12-01 + + Fix not-set defaults for numeric parameters were converted to 0 + +Nyall Dawson 2017-12-01 + + Bump lowest possible min for numeric parameters to -DBL_MAX + 1 + + We need to reserve -DBL_MAX as a special value, to allow it to + work correctly in QDoubleSpinBoxes (limitation of QDoubleSpinBox) + +Nyall Dawson 2017-12-01 + + Show nicer tooltips for numeric processing parameters + + With min/max and default values (when set) + +Nyall Dawson 2017-12-01 + + [processing] Fix optional layer parameters are filled by default + + Refs #17471 + + Not a full fix for 17471 - that requires handling of optional + numeric values too + +Nyall Dawson 2017-12-01 + + Add missing qHash for older Qt versions + +Nyall Dawson 2017-12-01 + + [processing] group option for autoincrement field algorithm + +Merge: f6e63d7f4c 656de62e70 +Alessandro Pasotti 2017-12-01 + + Merge pull request #5737 from elpaso/hidpi-cursors + + [bugfix][hidpi] Scalable SVG theme cursors + +Nyall Dawson 2017-11-29 + + Fixes and cleanups to algorithm dialogs + +Nyall Dawson 2017-11-29 + + Start moving processing algorithm dialog to c++ + + In an attempt to avoid Python global interpreter locks which + block the UI thread. + +Nyall Dawson 2017-12-01 + + Add missing overrides + +Merge: c12770d041 cc29f0ee36 +Nyall Dawson 2017-12-01 + + Merge pull request #5717 from nyalldawson/layout_next4 + + [layouts] Port/adapt all remaining item types + +Nyall Dawson 2017-12-01 + + Indentation + +Nyall Dawson 2017-11-30 + + Standardise some algorithm names + +Nyall Dawson 2017-11-30 + + Show algorithm ID in tooltip in toolbox + +Alessandro Pasotti 2017-11-30 + + [bugfix] Bookmarks sorting with a proxy model + + Fixes #17005 spatial bookmarks can't be sorted + + I believe that this has been broken since https://github.com/qgis/QGIS/pull/2661 + +Martin Dobias 2017-11-30 + + [3d] Rename "Reset view" to "Zoom Full" (fixes #17568) + +Merge: 8aa05735de 042fd33db7 +Alessandro Pasotti 2017-11-30 + + Merge pull request #5772 from elpaso/bugfix-17584-bookmarks-sync + + [bugfix] Bookmark project sync + +Merge: ded892eaee 997286fe42 +Martin Dobias 2017-11-30 + + Merge pull request #5768 from wonder-sk/fix-17514-crs-change + + Fix 3D view if terrain DEM is in different CRS + +Alexandre Neto 2017-11-30 + + Adds missing tooltips + +Etienne Trimaille 2017-11-30 + + add warning about sort algorithm might not work as expected + +Etienne Trimaille 2017-11-28 + + add some notes in processing test readme + +Etienne Trimaille 2017-11-10 + + add sort by expression algorithm + +Etienne Trimaille 2017-11-29 + + display the downloaded size in QgsFileDownloaderDialog + +Nyall Dawson 2017-11-30 + + [needs-docs] Add some shortcuts for opening the attribute table + + Adds: + - shift + f6: show table filtered to selected features + - ctrl + f6: show table filtered to visible features + + (These are alongside the existing 'f6' shortcut which opens the + table using the default mode set via the options dialog) + +Richard Duivenvoorde 2017-11-27 + + fix #17562 broken legend uris + +Matthias Kuhn 2017-11-28 + + Move "Add circular string" to regular shapes toolbar + + It's not a basic digitizing tool + +Alessandro Pasotti 2017-11-30 + + [bugfix] Bookmark project sync + + Fixes #17584 Spatial Bookmarks checkbox is not synced with project status + +Merge: f6acf37637 6d87c2b28f +Blottiere Paul 2017-11-30 + + Merge pull request #5762 from pblottiere/fix_typo_as + + Fixes typos in auxiliary storage documentation + +Tim Sutton 2017-11-30 + + Fix processing errors on startup and execution on MacOS (#5769) + +nirvn 2017-11-30 + + [processing] fix DlgModeler.ui layout warnings + +Alessandro Pasotti 2017-11-29 + + Use screen to grab instead of deprecated grabWidget + +Martin Dobias 2017-11-29 + + Fix doc coverage test + +Salvatore Larosa 2017-11-29 + + [pyqgis-console] fix strings in options tooltips + +Martin Dobias 2017-11-29 + + [3d] Reproject DEM for terrain if the DEM has different CRS (fixes #17514) + +Matteo Ghetta 2017-11-29 + + processing test for difference algorithm (#5764) + +Merge: de3aa0c9f8 77f5959a7a +Salvatore Larosa 2017-11-29 + + Merge pull request #5757 from slarosa/pyconsole_ui_improvements + + [pyqgis-console][ui] move find text tools to toolbar widget + +Merge: 30fad6ef33 6378332c01 +Matthias Kuhn 2017-11-29 + + Merge pull request #5767 from rduivenvoorde/fix_#17580_missing_flags + + flags apparently converted from png to svg + + Fix #17580 + +Richard Duivenvoorde 2017-11-29 + + flags apparently converted from png to svg + +Merge: 2c65dbcd3b 7e711f1380 +Alessandro Pasotti 2017-11-29 + + Merge pull request #5765 from elpaso/bugfix-17539-bookmarks + + [bugfix] Fix broken bookmarks + +Alessandro Pasotti 2017-11-28 + + [bugfix] Fix broken bookmarks + + Fixes #17539 I can only create one spatial Bookmark in current master + + In fact there were other bugs (like loosing SRID when converting + to "in project"). + +Martin Dobias 2017-11-29 + + [3d] Cleaned up code for camera translation + tests + +Mathieu Pellerin 2017-11-29 + + [offset curve tool] fix two serious issues (#5760) + + - broken polygon support (fixes #15222) + - lost of parts when using tool with mutlipart features + +Merge: 29bfb10f62 d65c036781 +Alexander Bruy 2017-11-29 + + Merge pull request #5745 from alexbruy/processing-cleanup + + Processing cleanup + +Blottiere Paul 2017-11-29 + + Update sip binding + +Blottiere Paul 2017-11-29 + + Fix typos in auxiliary storage doc + +Nyall Dawson 2017-11-29 + + Ensure ellipsoid is correctly set for new projects + +Merge: 62dbf4ce26 b8a62f4f4d +Nyall Dawson 2017-11-29 + + Merge pull request #5758 from nyalldawson/leftof + + Geometry "leftOf" improvements + +Nyall Dawson 2017-11-29 + + GML is too fragile, but shapefiles, you've never let me down... + +Nyall Dawson 2017-11-29 + + [processing] Make split with lines output single part features + instead of keeping parts collected into a single multipart feature + +Nyall Dawson 2017-11-29 + + [processing] Fix Geometries algorithm should only keep results + with the same geometry type as the original features + + Otherwise it's inserting points into line features when the + geometry repair results in a point geometry only + +Nyall Dawson 2017-11-29 + + Fix network analysis routing fails in some cases (refs #11687) + +Nyall Dawson 2017-11-29 + + More tweaks to leftOf logic + +Nyall Dawson 2017-11-29 + + Update API breaks docs + +Nyall Dawson 2017-11-29 + + Unify behavior of various geometry API leftOf tests + + Now instead of mixing bools/numeric returns, we always use + ints, where: + -1 = left + 0 = test failed, e.g. point on line + 1 = right + + Also fix a bunch of extra issues identified with left of tests + as a result of these changes + +Richard Duivenvoorde 2017-11-28 + + Fix #17573 inconsistency of icons in layer trees + +Etienne Trimaille 2017-11-28 + + display apple cmd symbol instead of ctrl in the legend + +Radim Blazek 2017-11-28 + + closestSegmentWithContext() doc and test fix + +Radim Blazek 2017-11-28 + + fixed closestSegmentWithContext() paramas in Python + +Salvatore Larosa 2017-11-28 + + [pyqgis-console][ui] move find text tools to toolbar widget + +Alessandro Pasotti 2017-11-28 + + [hidpi] New icons and bigger cursors + + Cursors are now approximately 24x24 pixels on 96dpi + +Salvatore Larosa 2017-11-28 + + [pyqgis-console] update api files and qsci_apis/generate_console_pap.py script + +Salvatore Larosa 2017-11-28 + + [pyqgis-console] fix missing import for pap file compiler + +Etienne Trimaille 2017-11-28 + + Fix plural modeler tool -> modeler toolS + +Nyall Dawson 2017-11-28 + + Fix left of test for linestrings + + The test was returning invalid results for certain geometries + +Salvatore Larosa 2017-11-28 + + [pyqgis-console] prepared APIs file updated + + included APIs are: + * PyQGIS3 + * PyQt5 + * Python3.6 + * GDAL-2.2.3 + * GEOS-3.6.3 + +Merge: 658474988b 7ff6470df7 +Blottiere Paul 2017-11-28 + + Merge pull request #5744 from pblottiere/refrel_crash + + [bugfix] Fixes a crash in QgsRelationReferenceWidgetWrapper + +Alexander Bruy 2017-11-28 + + remove extra quotes from map tips (fix #17491) + +Alexander Bruy 2017-11-27 + + [processing] remove old params from wrappers + +Alexander Bruy 2017-11-27 + + [processing] cleanup files from unused code and remove some files + +Alexander Bruy 2017-11-27 + + [processing] remove unused files + +Alexander Bruy 2017-11-27 + + [processing] remove Python 2 compatibility layer + +Merge: d31f60baa5 3c702c07a0 +Hugo Mercier 2017-11-28 + + Merge pull request #5743 from m-kuhn/fix17564 + + Fix crash with constraint results and custom .ui + +Alessandro Pasotti 2017-11-28 + + [hidpi] New cursor icons for identify and sampler + + Thanks Alexandre Neto! + +Patrick Valsecchi 2017-10-26 + + [FEATURE][needs-docs] Add OGC filters to WMS + + Implement https://github.com/qgis/QGIS-Enhancement-Proposals/issues/104 + +Mathieu Pellerin 2017-11-28 + + Show unknown feature count instead of misleading 0 in sublayer dialog + +Merge: 2156e89c1a a95aecafd6 +Nyall Dawson 2017-11-28 + + Merge pull request #5727 from nyalldawson/sublayer + + Fix ogr sublayer handling of names containing ":" + +Merge: 721551f8b6 5c66526c7d +Nyall Dawson 2017-11-28 + + Merge pull request #5748 from nyalldawson/offset_tool + + Fix offset curve tool offsets curves in opposite direction to mouse + +Nyall Dawson 2017-11-28 + + Pressing escape cancels offset tool + +Nyall Dawson 2017-11-28 + + [offset tool] Also check for ctrl modifier on final click + + Otherwise copies are only made if ctrl was held on the first click, + but holding ctrl on the second click is also a natural behavior + +Nyall Dawson 2017-11-28 + + Use QgsGeometry API for offset tool instead of raw geos calls + +Nyall Dawson 2017-11-28 + + Cleanup some offset tool code + +Nyall Dawson 2017-11-28 + + Fix offset curve tool offsets curves in opposite direction to mouse + +Martin Dobias 2017-11-27 + + Introduce QgsVector3D for 3D vectors with double precision + + QVector3D with single precision is not always enough (it has only ~7 significant digits) + +Matthias Kuhn 2017-11-27 + + Fix crash with constraint results and custom .ui + + Fix #17564 + +Blottiere Paul 2017-11-27 + + Add test + +Blottiere Paul 2017-11-27 + + Fixes relation reference widget crash when no relation + +Martin Dobias 2017-11-27 + + qDebug -> QgsMessageLog + +Martin Dobias 2017-11-23 + + [3d] Fix crash in tessellator with near coords (fixes #17286, fixes #17515) + + As the readme of poly2tri library says: "Poly2Tri does not support repeat points within epsilon." + + When the coordinates are very near to each other, we get crashes in triangulation code. + To prevent that, we try to simplify geometries to hopefully fix the problem automatically, + if that fails we just skip the polygon as the last resort. + + Usually this happens if user tries to use 3D renderer on unprojected lat/lon coordinates. + +Alessandro Pasotti 2017-11-27 + + [hidpi] Auto-scale cursors based on DPIs + + This should work well on different DPI screens. + + Still needs some testing on the various platforms. + +Alessandro Pasotti 2017-11-24 + + [bugfix][hidpi] Scalable SVG theme cursors + + Add support for SVG cursor: + + ZoomIn, + ZoomOut, + Identify, + CrossHair, + CapturePoint, + Select, + Sampler, + + Icons are provisional: they need some love from + a decent graphics designer. + + Fixes #12671 + +Merge: 9bfb3f31ee 4aa97d865d +Blottiere Paul 2017-11-27 + + Merge pull request #5697 from pblottiere/server_bugfix_getprojectsettings + + [server][bugfix] Fixes #17519 by fixing GetProjectSettings response + +Blottiere Paul 2017-11-22 + + Add a test + +Blottiere Paul 2017-11-22 + + Fixes #17519 by fixing GetProjectSettings response + +Nyall Dawson 2017-11-27 + + Fix regexp_substr expression function returning whole match instead of captured group + +Nathan Woodrow 2017-11-27 + + Update API break docs + +Nathan Woodrow 2017-11-27 + + Fix #17510 - Better scoping of QgsProjectionSelectionDialog inside QgsProjectionSelectionWidget + +Nathan Woodrow 2017-11-27 + + Remove bound sync from crssync. Not longer needed + +Nathan Woodrow 2017-11-27 + + Update srs.db with new bounds + +Nathan Woodrow 2017-11-27 + + Update bounds srs.db in source from epsg db + +Nyall Dawson 2017-11-27 + + Fix data defined button icon size on hidpi screens + +Nyall Dawson 2017-11-27 + + Fix slightly oversized filter clear icons + + And make sure on low-dpi screens the icon size is 16px for + pixel-snapped rendering of the svg + +Larry Shaffer 2017-11-09 + + Fix macOS Qt 5.9+ close boxes do not show on document mode tab bar tabs + + Setting any stylesheet makes the default close button disappear. + Setting a custom close button temporarily works around issue. + + See: https://bugreports.qt.io/browse/QTBUG-61092 + https://bugreports.qt.io/browse/QTBUG-61742 + +Harrissou Sant-anna 2017-11-25 + + Do not change property widget status if the dialog is rejected + + refs #16766 + +Harrissou Sant-anna 2017-11-23 + + Add Cancel and Help buttons to Property assistant dialog + + because sometimes opening this dialog is a mistake and you want to close it + Also enable the Help capability + +Harrissou Sant-anna 2017-11-26 + + Make frames expandable and cover needed space + +Harrissou Sant-anna 2017-11-16 + + Set a title to the 3D config widget + +Nyall Dawson 2017-11-27 + + Add spell check variants for tessellate + +Nyall Dawson 2017-11-25 + + Move conversion of tesselation to multipolygon to QgsTessellator + + Also + - add unit test + - fix bad tesselation due to missing origins + +Nyall Dawson 2017-11-25 + + [processing] Add QGIS 3d provider + + Adds a new QGIS processing provider for 3d algorithms, available + only when QGIS is built WITH_3D + + Currently includes only a single algorithm for tesselating geometries, + which exposes the functionality of QgsTesselator to processing. + + Like the native c++ algorithm provider, algorithms in the 3d + provider are transparently merged with the other QGIS providers + (i.e. they aren't separated into their own group) + +Nyall Dawson 2017-11-26 + + Fix failing doc test + +Nyall Dawson 2017-11-26 + + [processing] Add a model-only "load layer to project" algorithm + + This can be used to force loading a layer into the current project. + The primary use case here is to load a preset layer as part of a + model, but it's also useful for loading results from the + 'package layers' algorithm into the project. + +Nyall Dawson 2017-11-26 + + Add missing output from package algorithm + +Nyall Dawson 2017-11-26 + + [processing] Add a model-only algorithm for renaming layers + + This is required for algorithms with behaviour which depends on the + layer names (e.g. the package algorithm uses the layer name as + the table name in the geopackage). + + We need a way for models to be able to explicitly specify a layer + name for this algorithm to be useful in models, otherwise the + auto-generated temporary layer names are used (which are not + very nice!) + +Nyall Dawson 2017-11-26 + + Fix definition of output file parameters + +Nyall Dawson 2017-11-26 + + [processing] Add a generic map layer output type + + For occasions when an algorithm creates a map layer, but the type + is not known in advance (i.e. could be raster OR vector) + +Nyall Dawson 2017-11-26 + + Improve name of memory layers output from processing + +Nyall Dawson 2017-11-26 + + Fix tests + +Nyall Dawson 2017-11-26 + + Update tests, add new test for complex layer name + +Nyall Dawson 2017-11-26 + + Fix some inefficient QString replace calls + +Nyall Dawson 2017-11-26 + + Fix inefficient QString splitting + + QString::split with single characters is about 10x faster than + QString::split using QStrings + +Nyall Dawson 2017-11-26 + + Fix handling of ogr sublayers with ':' in their name + + Unlikely to happen, but it does occur with some layers coming + from processing models. In any case we want QGIS to be super-tolerant + of corner cases like this! + +Nyall Dawson 2017-11-26 + + Fix package layers algorithm can't take the outputs from models + + Fixes #17544 + +Nyall Dawson 2017-11-24 + + Fix crash when a geopackage layer is open in QGIS, and then is overwritten + with another layer with different field definitions + +Borys Jurgiel 2017-11-25 + + Follow up 248bc5db032cf + +Alexander Bruy 2017-11-25 + + fix en_US locale handling in QgsHelp + +Merge: 916c9c4cdb 58f559690e +Alessandro Pasotti 2017-11-24 + + Merge pull request #5710 from elpaso/api-code-cleaning-int-2-enums + + QgsVectorLayer code cleaning use enums instead of int + +Matthias Kuhn 2017-11-24 + + Open heart surgery on expression context for processing sources + +Matthias Kuhn 2017-11-24 + + Add test for QgsExpressionContextScope::takeScopes + +Matthias Kuhn 2017-11-24 + + Expression context creation for processing improvements + + Hiding away the implementation directly in QgsProcessingFeatureSource + + See discussion https://github.com/qgis/QGIS/pull/5709/files/ec97102bc687cdd3aace40359b67c9e45913b726#r152903378 + +Matthias Kuhn 2017-11-24 + + Fix file mode + +Etienne Trimaille 2017-11-24 + + add missing import operator (#5724) + +Alessandro Pasotti 2017-11-24 + + Add changed return values to api break + +Merge: 97f749e6b4 b786ed03b2 +Nyall Dawson 2017-11-24 + + Merge pull request #5719 from nyalldawson/translate_z + + geometries: translate Z/M + +Mathieu Pellerin 2017-11-24 + + [processing] fix error when adding refactor fields alg in empty model + + (fixes #17421) + +Mathieu Pellerin 2017-11-24 + + [processing] order 3rd party provider groups (#5723) + +Alessandro Pasotti 2017-11-24 + + Add return cases to the docs and fully qualified enums + +nirvn 2017-11-24 + + [processing] move grass & saga version number to tooltips + +rldhont 2017-11-16 + + [BUGFIX][Spatialite] Setting default value in loadFields with the right index + + Because Geomtry field is not added to fields list, the index do not respect the index in the table. It's necessary to have a realFieldIndex. + +Merge: 8b15c73d2b 29abd9d3f9 +Alessandro Pasotti 2017-11-24 + + Merge pull request #5720 from elpaso/bugfix-17442-null-categories + + [bugfix] Categorized style issue using numeric fields with NULL values + +Alessandro Pasotti 2017-11-24 + + [bugfix] Categorized style issue using numeric fields with NULL values + + Fixes #17442 + +Merge: 1fcadb72ff 89914821df +Nyall Dawson 2017-11-24 + + Merge pull request #5680 from DelazJ/hidefields + + [Save As] Set fields export options visible only when compatible + +Nyall Dawson 2017-11-24 + + Add a unit test + +Nyall Dawson 2017-11-24 + + Fix some doxygen warnings + +Nyall Dawson 2017-11-24 + + Fix closest vertex z/m doesn't show in identify tool for multiline + geometries, remove duplicate closest M value attribute + +Nyall Dawson 2017-11-24 + + [processing] Make translate algorithm native + + And add option to translate z/m values + +Nyall Dawson 2017-11-24 + + Sipify + +Nyall Dawson 2017-11-24 + + Update test masks + +Nyall Dawson 2017-11-24 + + Fix z order stacking of guides + +Nyall Dawson 2017-11-24 + + Allow transform methods in QgsAbstractGeometry/QgsGeometry to also + transform z/m values via scale/translate arguments + +Mathieu Pellerin 2017-11-24 + + [processing] fix for import into spatialite and execute sql algorithms + +Merge: 2b5aca5518 f8d839519f +Nyall Dawson 2017-11-24 + + Merge pull request #5702 from nyalldawson/dxf_improve + + [dxf] Add option to export labels as text elements, instead of mtext + +Nyall Dawson 2017-11-24 + + Update indentation + +Nyall Dawson 2017-11-24 + + [layouts][FEATURE] Port arrow functionality to polyline item + + Instead of a separate (badly behaved) item type for arrows, instead + add the arrowhead options to the much nicer polyline item. + + There's still a dedicated toolbar action for creating arrows, but + all this does is create a polyline with the arrowhead enabled + by default. + +Nyall Dawson 2017-11-22 + + Port ui for attribute table + +Merge: 6278245949 5b66ea7674 +Nyall Dawson 2017-11-24 + + Merge pull request #5689 from nyalldawson/gpkg_alg + + [processing] Fixes to non flat-file exports + +Nyall Dawson 2017-11-22 + + Start hooking up tables to app + +Nyall Dawson 2017-11-22 + + Port and fix unit tests + +Nyall Dawson 2017-11-22 + + Port table subclasses + +Nyall Dawson 2017-11-21 + + Port text table + +Nyall Dawson 2017-11-21 + + Start porting table items + +Nyall Dawson 2017-11-21 + + Make scalebars auto selected between m/km and ft/miles when newly added + + Based on current linked map scale and linked map CRS + +Nyall Dawson 2017-11-21 + + Fix map item tooltips + +Nyall Dawson 2017-11-21 + + Also link new legends to selected map item + +Nyall Dawson 2017-11-21 + + [layouts] Link new scalebars to selected map item, if there is one + + Fixes #13851 + +Nyall Dawson 2017-11-21 + + [layouts] Simplify scalebar unit handling + + Instead of auto setting the units to meters/feet, and then using + the label multiplier setting to obtain a scalebar in km/miles, + instead we always keep auto-set label multipliers at 1 and just + always keep the users explicitly set scale bar units. + + This should help avoid the complexity of layout scale bars, while + still keeping flexibility if someone does need custom units. + +Nyall Dawson 2017-11-21 + + Simplify some code, cleanup UI + +Nyall Dawson 2017-11-20 + + [layouts] Add more unit choices to scalebars + + Explicitly add options for kilometers, miles, etc as the current + UX for setting these is too confusing! + + Fixes #16921 + +Nyall Dawson 2017-11-20 + + Readd tests for scalebars + +Nyall Dawson 2017-11-20 + + Port more scalebar functionality + +Nyall Dawson 2017-11-20 + + Fix incorrect render context scaling for scale bar rendering + +Nyall Dawson 2017-11-20 + + Begin porting scalebar item + +Nyall Dawson 2017-11-20 + + Restore some tests + +Nyall Dawson 2017-11-20 + + More work on layout multiframe undo/redo + +Nyall Dawson 2017-11-20 + + Modernize code + +Nyall Dawson 2017-11-20 + + Remove some processEvents usage + +Nyall Dawson 2017-11-14 + + more attempts to fix multiframe undo + +Nyall Dawson 2017-11-07 + + Some undo/redo fixes for multiframe items + +Nyall Dawson 2017-11-14 + + Update test masks + +Nyall Dawson 2017-11-06 + + Update sip + +Nyall Dawson 2017-11-06 + + Add ui for configuring html items + +Nyall Dawson 2017-11-06 + + Fix test failure + +Nyall Dawson 2017-10-31 + + More work on porting multiframe items + +Nyall Dawson 2017-10-31 + + Resurrect tests for html item + +Nyall Dawson 2017-10-31 + + Sip is p****** me off, by refusing to build for unrelated reasons + + Block a bunch of classes from Python bindings for now until sip + gets over itself + +Nyall Dawson 2017-10-27 + + Begin port of HTML item + +Nyall Dawson 2017-10-27 + + Fix a number of multiframe methods + +Nyall Dawson 2017-10-27 + + Add page number selection to new item dialog + +Nyall Dawson 2017-10-27 + + Restore api for handling layout item page numbers + +Nyall Dawson 2017-10-27 + + Start of multiframe porting + +Merge: cd0ba918ba 13cb8e4e0b +Nyall Dawson 2017-11-24 + + Merge pull request #5713 from lejedi76/fix_remove_fromOldWkbType + + [db_manager] remove fromOldWkbType (api_break) from vlayer + +Nyall Dawson 2017-11-24 + + Rename some static variables to use 's' prefix + + To match QGIS code conventions + +Even Rouault 2017-11-23 + + [OGR provider] When creating a new layer with createEmptyLayer(), make sure the opened datasets do not get reused + +Nyall Dawson 2017-11-23 + + [processing] Throw an exception when sinks cannot be created + + Gives users debugging information messages on why the layers could + not be created + + Also allow overwriting existing layers in geopackage outputs + +Nyall Dawson 2017-11-23 + + Fix some memory leaks + +Nyall Dawson 2017-11-23 + + Fix running processing tests multiple times + +Nyall Dawson 2017-11-23 + + Fix ui build warnings + +Nyall Dawson 2017-11-22 + + [processing] Change save as spatialite option to save as GeoPackage + + Since it's much more useful. Also add a prompt for layer name, so that + you can save the results of an algorithm into an existing geopackage + without wiping existing layers. + +Nyall Dawson 2017-11-22 + + [ogr] Fix cannot create layers for geopackage datasets when + the database does not yet exist + +Nyall Dawson 2017-11-22 + + Fix error in Geometry by Expression + + We can't depend on preparing the expression, as we may not have + enough context to do this during the algorithm preparation step + +Nyall Dawson 2017-11-22 + + [processing] Ensure correct sublayer is loaded when saving output + to destination with multiple sublayers + +Nyall Dawson 2017-11-22 + + [processing] Fix saving outputs to non-file formats + +JD LOMENEDE 2017-11-24 + + remove fromOldWkbType (api_break) + +Matthias Kuhn 2017-11-23 + + Use layer context in RefactorFields algorithm + + Fix #17533 + +Matthias Kuhn 2017-11-22 + + Allow adding sources to processing expression context + +Alexander Bruy 2017-11-23 + + [processing] restore Help button functionality in modeler (fix #17483) + +Alexander Bruy 2017-11-23 + + [processing] don't throw error if GRASS not found on Mac (fix #17443) + +Alexander Bruy 2017-11-23 + + [processing] detect GRASS 7.4 on Mac + +Martin Dobias 2017-11-23 + + Fix tessellation of polygons that are not horizontal + + Discovered by Nyall while working on PR #5708 + + Tessellation would shift coordinates because when points got reprojected + to the new base, the Z coordinates were considered zero (which worked only + when all points were on the same plane). + +Alessandro Pasotti 2017-11-23 + + Update tests + +Alessandro Pasotti 2017-11-23 + + QgsVectorLayer code cleaning use enums instead of int + + It was one of the TODOs for QGIS 3 + +Merge: 5206bf0f76 a7ffde6c95 +Alessandro Pasotti 2017-11-23 + + Merge pull request #5707 from elpaso/bugfix-17262-lineedit-x-button + + [ui][bugfix] lineedit add margin for X icon + +Nyall Dawson 2017-11-23 + + [3d] Fix creation of extruded walls in vertex binding mode + + Previously the walls always had horizontal top/bottom, but + in vertex binding mode the walls need to have different z values + at the start and end coordinate + + Note that the unit test exposes a different bug in the tesselator, + which should also be fixed... + +nirvn 2017-11-23 + + [node editor] fix crash when editor is open and feature deleted + +Borys Jurgiel 2017-11-23 + + Fix #15627: missing plugin icons in Plugin Manager + +Alessandro Pasotti 2017-11-23 + + [ui][bugfix] lineedit add margin for X icon + + Fixes #17262 + + Needs backporting + +Alessandro Pasotti 2017-11-23 + + [ui][hidpi] Form line edit: compute icon size instead of hardcoding + +Merge: 9d8a39fac0 b448826d5b +Matthias Kuhn 2017-11-23 + + Merge pull request #5699 from m-kuhn/valueRelationMultiSelect + + Fixes for Value relation widget, multi select + +Merge: 060b3e3a54 9f56878d88 +Alessandro Pasotti 2017-11-23 + + Merge pull request #5694 from elpaso/bugfix-17518-pg-import--without-schema + + [bugfix][postgres] Browser panel D&D a layer onto a postgresql connection tree … + +Nyall Dawson 2017-11-23 + + Fix indentation + +Mathieu Pellerin 2017-11-23 + + [ArcGIS REST] fix fallback feature id value (followup to f32791e) + +Nyall Dawson 2017-11-16 + + Add some unit tests for DXF export + +Mathieu Pellerin 2017-11-23 + + [ArcGIS REST] fix caching logic for extent filtered requests + +Nyall Dawson 2017-11-16 + + [dxf][feature] Add option to export labels as text elements, instead of mtext + + Sponsored by SMEC + +Merge: b288a5f5fa 0a18b1fdd0 +Nyall Dawson 2017-11-23 + + Merge pull request #5650 from nyalldawson/proc_gpkg + + [FEATURE][processing] Package layers algorithm + +Nyall Dawson 2017-11-23 + + Update sip + +Nyall Dawson 2017-11-23 + + Add unit test for package algorithm + +Nyall Dawson 2017-11-16 + + [FEATURE][processing] Package layers algorithm + + Allows multiple vector layers to be collected together into a + geopackage database output + + Previously all existing methods avilable in QGIS rely on adding + layers one-at-a-time, which is tedious for large numbers of layers. + + Sponsored by SMEC + +Nyall Dawson 2017-11-16 + + [processing] Generalise modeler multi-step feedback proxy for use + outside of modeler + + This can be useful too for individual algorithms + +Martin Dobias 2017-11-22 + + Set initial extent of a new 3D view to extent of the main canvas + +Martin Dobias 2017-11-22 + + Fix world origin and camera position on terrain change (fixes #17514) + + This makes "zoom full" in 3D view working again after modification of terrain generator. + Also we update the camera position so it looks at the same spot as it was before. + +Borys Jurgiel 2017-11-22 + + Update icon path + +Borys Jurgiel 2017-11-22 + + Install missing icon + +Alessandro Pasotti 2017-11-22 + + [bugfix][wms] Fix GetFeatureInfo + + Fixes #17498 WMS GetFeatureInfo requests not working + + Use the right variable instead of an + unitialized one ( followup b119744 ) + +Matthias Kuhn 2017-11-22 + + Fix reading of multi selection ValueRelation widgets + +Matthias Kuhn 2017-11-22 + + Avoid recursion in ValueRelation widget + + Fix #17521 + +Alessandro Pasotti 2017-11-22 + + [bugfix] Add some more logic to get the schema name if empty + +Merge: ade6b60955 98d2dcbf7a +Vincent Mora 2017-11-22 + + Merge pull request #5696 from elpaso/bugfix-17517-singlebandgrey-crash + + [bugfix] Crash on raster layer render change from python + + Everything looks good to me, thanks @elpaso + +Merge: 880af67627 a374ebe965 +Matthias Kuhn 2017-11-22 + + Merge pull request #5688 from m-kuhn/fix17496 + + Relation reference widget: apply conditional styles + +Richard Duivenvoorde 2017-11-22 + + add inforce to spelling.dat + +Richard Duivenvoorde 2017-11-21 + + typo: inforced->enforced + +Merge: d6d4097036 3563298988 +Blottiere Paul 2017-11-22 + + Merge pull request #5693 from pblottiere/wms_flaky2 + + [server] Enable all WMS tests (GetMap, GetPrint, GetLegendGraphics) + +Alessandro Pasotti 2017-11-22 + + [bugfix] Crash on raster layer render change from python + + Fixes #17517 + + Requires backporting + +Alessandro Pasotti 2017-11-22 + + [bugfix] Browser panel D&D a layer onto a postgresql connection tree node icon fails without notice + + Fixes #17518 by defaulting to "public" if no schema is given + +Merge: db3c93c3a6 e9309eec70 +Sandro Mani 2017-11-22 + + Merge pull request #5692 from manisandro/afsshareddata_mutex + + [ArcGIS REST] Add missing mutex to QgsAfsProvider (fixes #17513) + +Blottiere Paul 2017-11-22 + + Enable all WMS tests (GetMap, GetPrint, GetLegendGraphics) + +Sandro Mani 2017-11-22 + + [ArcGIS REST] Also protect mCache.clear() by mutex + +Sandro Mani 2017-11-22 + + [ArcGIS REST] Add missing mutex to QgsAfsProvider (fixes #17513) + +Merge: 059c997766 d775a0d97a +Alessandro Pasotti 2017-11-22 + + Merge pull request #5691 from elpaso/bugfix-17507-gpkg-filtered-edit + + [app][bugfix] Update layer editable state when filter is changed + +Merge: 58bfbd51cc 5f6c1bac61 +Alessandro Pasotti 2017-11-22 + + Merge pull request #5687 from elpaso/bugfix-16753-offline-editing-wfs-warning + + [offline-editing] Add a warning icon and tooltip to WFS sources + +Alessandro Pasotti 2017-11-22 + + Rewording of warning message for WFS unstable pk + +Matthias Kuhn 2017-11-22 + + Relation referenc widget: apply conditional styles + + Fix #17496 + +Matthias Kuhn 2017-11-22 + + Add QString operator to QgsExpression + +Merge: 7e727fd88f a416f4e30c +Blottiere Paul 2017-11-22 + + Merge pull request #5658 from pblottiere/qurl_obsolete + + [server] Fix obsolete QUrl method + +Merge: 5945a84d21 fd1539f502 +Matthias Kuhn 2017-11-22 + + Merge pull request #5640 from pblottiere/wms_flaky + + [server] WIP: detect WMS flaky tests + +Blottiere Paul 2017-11-16 + + Fix obsolete call of addQueryItem on QUrl in server + +Merge: b058df7d1d 333a8e9e94 +Blottiere Paul 2017-11-22 + + Merge pull request #5638 from pblottiere/bugfix_joins + + [bugfix] Fixes #17450 by correctly setting the join info ordered list + +Alessandro Pasotti 2017-11-22 + + [app][bugfix] Update layer editable state when filter is changed + + Fixes #17507 + +Alessandro Pasotti 2017-11-22 + + Initialize some more vars to make Valgrind happy + +Blottiere Paul 2017-11-22 + + Skip test instead of commenting + +Blottiere Paul 2017-11-22 + + Add some masks and set a higher threshold for comparing images + +Blottiere Paul 2017-11-15 + + Disable a test + +Blottiere Paul 2017-11-15 + + Split some WMS tests + +Blottiere Paul 2017-11-15 + + Fixes #17450 by correctly setting the join info ordered list + +Merge: d62b4e9760 b97c6a8d88 +Nyall Dawson 2017-11-22 + + Merge pull request #5686 from nyalldawson/encoding + + [processing] Don't use crappy Qt file picker dialog + +Nyall Dawson 2017-11-22 + + Use native file picker for spatialite export option also + +Merge: 5be5c1e6b9 59cc5434b8 +Nyall Dawson 2017-11-22 + + Merge pull request #5683 from Gustry/metadata_crs + + fix #17456 improve CRS display in the metadata tab + +Alessandro Pasotti 2017-11-21 + + Initialize some vars to make Valgrind happy + +Etienne Trimaille 2017-11-21 + + switch display between identification section and provider in the metadata tab + +Etienne Trimaille 2017-11-21 + + fix #17456 improve CRS display in the metadata tab + +Alessandro Pasotti 2017-11-21 + + [ogr] Re-compute capabilities when a subset string is changed + +Alessandro Pasotti 2017-11-21 + + [app] Don't trigger repaint twice + +Alessandro Pasotti 2017-11-21 + + [app] Use unique pointer for query builder + +Alessandro Pasotti 2017-11-21 + + [grass] Fix build for metadata->htmlMetadata + +Alessandro Pasotti 2017-11-21 + + [offline-editing] Add a warning icon and tooltip to WFS sources + + Fixes #16753 off-line editing synchronization cripples + the original datasource if this is a WFS-T Layer + +Salvatore Larosa 2017-11-16 + + [dbmanager] fixes #17476: QGIS master: update SQL layer error if name contains uppercase chars + +Merge: a29fad4408 a12939d380 +Alessandro Pasotti 2017-11-21 + + Merge pull request #5679 from elpaso/bugfix-16935-gpkg-split-features + + [bugfix] Editing a GPKG layer added by d&d leads + +Merge: 4bc4494e12 373471214f +Nyall Dawson 2017-11-21 + + Merge pull request #5684 from Gustry/provider_metadata + + rename metadata() to htmlMetadata() in QgsRasterDataProvider + +Nyall Dawson 2017-11-21 + + [processing] Move destination encoding option to separate menu action + + ...instead of embedding in output destination file selector. Otherwise + Qt downgrades the file picker to the Qt basic file picker, instead of + the native OS file picker. Which is a huge downgrade and barely + functional for users. + + Also remember last selected file format + +Mathieu Pellerin 2017-11-21 + + [ui] split Z/M values checkbox in new memory layer dialog (#5685) + +Etienne Trimaille 2017-11-21 + + rename metadata() to htmlMetadata() in QgsRasterDataProvider + +Nyall Dawson 2017-11-21 + + Add a new dialog for selecting file encoding, QgsEncodingSelectionDialog + + Can be used to prompt users for a file encoding choice + +Mathieu Pellerin 2017-11-21 + + [ui] improve new geopackage layer dialog (#5682) + + - move a number of options under a collapsible group + - rework wording for Z dimension and M values + - disable z and m checkboxes when geometry type is non spatial + +Alessandro Pasotti 2017-11-21 + + [bugfix][auth] 2to3 settings migrate authcfg for WMS/WFS + + Fixes #17402 Authentication settings for WMS/WFS etc. are not migrated from 2 to 3 + +Merge: 153c83a3d4 81b475d21c +Matthias Kuhn 2017-11-21 + + Merge pull request #5510 from m-kuhn/relationsearch + + [FEATURE] Search widget for relations using aggregates + +Alessandro Pasotti 2017-11-21 + + [ogr] Implement skipConstraintsCheck for fid + + With test. + +nirvn 2017-11-21 + + Add @nirvn to AUTHORS, fix missing tab for Paul B. + +Matthias Kuhn 2017-11-21 + + Adjust version number + +Matthias Kuhn 2017-11-21 + + Add missing api documentation + +nirvn 2017-11-21 + + @nirvn is a committer + +Nyall Dawson 2017-11-21 + + Followup c9b8ddc, add unit test + +Matthias Kuhn 2017-11-20 + + Allow min/max aggregate search for double fields + +Matthias Kuhn 2017-11-20 + + Show group box for aggregate search + +Matthias Kuhn 2017-11-20 + + Hide search widget tool button for aggregate search + +Alessandro Pasotti 2017-11-20 + + [ogr] Pass default value (-1) for fid columns + +Matthias Kuhn 2017-11-05 + + Add dummy canvas to test + +Matthias Kuhn 2017-11-03 + + Add missing param to docstring + +Matthias Kuhn 2017-11-03 + + Fix failing tests + +Matthias Kuhn 2017-11-03 + + Remove unnneeded method + +Matthias Kuhn 2017-11-03 + + SipConvertToSubClass code for QgsSearchWidgetToolButton + +Matthias Kuhn 2017-11-02 + + Add missing doxymentation + +Matthias Kuhn 2017-11-02 + + Avoid crash with invalid relation + +Matthias Kuhn 2017-11-02 + + API documentation all over + +Matthias Kuhn 2017-11-02 + + Qt 5.5 compatibility + +Matthias Kuhn 2017-11-01 + + [FEATURE] Search widget for relations using aggregates + + For each child relations, the subform is visible. + + Each attribute of the children has a tool button option to define to which + aggregate the specified value should be compared. This allows for searching + things like + + * Each city where the highest building is more than 300 m + * Each sensor where the median value is lower than 50 ppm + * Each feature with a child with a missing value + * ... + +Matthias Kuhn 2017-11-01 + + Add QgsAttributeFormWidget + +Matthias Kuhn 2017-11-20 + + Fix memory leaks by using sqlite3_close_v2 + +Alessandro Pasotti 2017-11-20 + + Fix test for primary key constraints + +Harrissou Sant-anna 2017-11-20 + + [Save As] Set fields export options visible only when compatible + + with the destination format, instead of simply disabling it. + +Alessandro Pasotti 2017-11-20 + + [bugfix] Editing a GPKG layer added by d&d leads + + ... to error and data corruption + + Fixes #16935 for GPKG (OGR), still needs to check spatialite + + Thanks to Matthias Kuhn for pointing me into the right direction + +luzpaz 2017-11-14 + + Trivial typo fix + + Your spellcheck missed it. + + updated spelling.dat to catch it next time + +Merge: 06bae21d51 06017b9242 +Matthias Kuhn 2017-11-20 + + Merge pull request #5661 from DelazJ/patch-3 + + Ask confirmation before removing a map theme + +Merge: c9b8ddce7f 9481067f4d +Matthias Kuhn 2017-11-20 + + Merge pull request #5579 from DelazJ/logmessages + + Clarify where and what Log Messages is + +Harrissou Sant-anna 2017-11-20 + + Fix indentation + +Nyall Dawson 2017-11-20 + + Fix crash in ogr provider when loading layers with subset strings + +Nyall Dawson 2017-11-20 + + Fix memory leak + +Harrissou Sant-anna 2017-11-20 + + Fix message box logic + +Merge: e9ce901adc b3e3bcd176 +Alessandro Pasotti 2017-11-20 + + Merge pull request #5674 from elpaso/bugfix-17489-virtual-layer-test-crash + + [bugfix] virtual layer test crash + +Alessandro Pasotti 2017-11-20 + + Modernize code (remove "on" from slots) + +Alessandro Pasotti 2017-11-20 + + [bugfix] Do not crash when testing empty virtual layers + + Fixes #17489 + + Require backporting + +Merge: 67b68a841d b02133f89c +Matthias Kuhn 2017-11-20 + + Merge pull request #5617 from signedav/longrelationids + + Autogenerated relation names in dialog instead of ids + +Merge: 970a723655 a00ce9e1cc +Matthias Kuhn 2017-11-20 + + Merge pull request #5578 from gacarrillor/iface_copy_paste_features + + Expose through iface methods to copy/paste features between given layers + +Merge: 30ed315392 adc408f82c +Matthias Kuhn 2017-11-20 + + Merge pull request #5666 from signedav/tooltiprelation + + Tooltip of relationstrength in project properties + +Merge: eb2ef6a681 995003153a +Matthias Kuhn 2017-11-20 + + Merge pull request #5614 from signedav/constraintindicators + + Constraint result not displayed in non editable mode + +Merge: af5b2a750a 8243598ff0 +Nyall Dawson 2017-11-20 + + Merge pull request #5672 from nyalldawson/provider_fixes2 + + Add tests/fixes for some provider issues + +Nyall Dawson 2017-11-20 + + Even more memory safety for ogr layers + +Nyall Dawson 2017-11-20 + + [ogr] Safer layer memory management + + Use unique_ptr with custom deleter to ensure that + QgsOgrProviderUtils::release is called + +Nyall Dawson 2017-11-20 + + [ogr] Fix incorrect feature counts after removing subset string, fix leak + +Nyall Dawson 2017-11-14 + + Add some debugging asserts to ensure that layer renderers + are used in a thread safe way + +Nyall Dawson 2017-11-12 + + Spelling + +Nyall Dawson 2017-11-12 + + Play it safe and work with clones of symbol renderers + + This fixes some definite crashes, e.g. saving a vector layer + with symbology, which is caused by accessing the same + layer renderer across different threads. + + But I've also swapped a lot of non-threaded code to use + clones of the renderers for extra safety. + +Nyall Dawson 2017-11-12 + + Improve documentation + +Nyall Dawson 2017-11-16 + + Fix broken export of DXF labels + +Nyall Dawson 2017-11-16 + + Fix DXF export issue when an empty layer is selected + +Nyall Dawson 2017-11-16 + + Fix combining extent of valid rectangle with invalid rectangle results + in invalid rectangle + +Matthias Kuhn 2017-11-19 + + Disable WMS server test + +Nyall Dawson 2017-11-19 + + Update WFS tests + +Nyall Dawson 2017-11-19 + + Modernise code + +Nyall Dawson 2017-11-19 + + Fix unnecessarily fussy close() for QgsMsSqlFeatureIterator + +Nyall Dawson 2017-11-19 + + Safer iterator closing, by always calling ::close() instead of + directly manipulating mClosed + + Fixes a crash in the memory data provider (also likely fixes + issues in other providers) + +Nyall Dawson 2017-11-19 + + Add a bit of tolerance to WFS provider test + + Was failing on Fedora 27 + +Nyall Dawson 2017-11-19 + + More consistent exception throwing in QgsCoordinateTransform::transformBoundingBox + + Depending on the os and proj versions, we weren't always getting an + exception when a bad bounding box transform was made. So now we + explicitly check the result, and if everything was invalid + then we also throw an exception. + + This makes the behavior consistent across different platforms, + and fixes running the provider tests on non Travis platforms + (highly likely also fixes various issues encountered while running + QGIS) + +Nyall Dawson 2017-11-19 + + Add some more provider tests for feature count when subset string is added/removed + +Nyall Dawson 2017-11-19 + + Fix incorrect extents returned by memory provider when subset string set + +Nyall Dawson 2017-11-19 + + Add provider test to ensure that extent is correctly calculated + for layers with 1 point and also no features + + The first scenario should return an 'empty' rectangle with x/y + min/max matching just the single point's coordinate, the + second scenario must return a null rectangle (not an empty 0,0 + rectangle!) + +Harrissou Sant-anna 2017-11-16 + + Allow better resizing of Projection selector widget tree + +Harrissou Sant-anna 2017-11-18 + + Tweak some dialog titles + +Harrissou Sant-anna 2017-11-18 + + Add more translatable strings + +Harrissou Sant-anna 2017-11-18 + + Ask confirmation before removing a map theme + +Harrissou Sant-anna 2017-11-18 + + Remove unused code + +Harrissou Sant-anna 2017-11-18 + + [Geometry Checker] Use a more readable file format list + +Merge: 1dab575b10 3ea8b74e18 +Tom Kralidis 2017-11-17 + + Merge pull request #5671 from tomkralidis/issue-17347 + + [bugfix] [MetaSearch] fix Esri ArcGIS service chaining (fixes #17347) + +Tom Kralidis 2017-11-17 + + [bugfix] [MetaSearch] fix Esri ArcGIS service chaining (fixes #17347) + +Merge: 7cc7375184 1b79177bc9 +Tom Kralidis 2017-11-17 + + Merge pull request #5669 from elpaso/bugfix-17347-metasearch + + [bugfix] MetaSearch: Add WMS/WMTS data button broken + +Daniele Viganò 2017-11-16 + + Fedora 26 now provides Qt 5.9, enable 3D in rpm spec for it + +Alessandro Pasotti 2017-11-17 + + [bugfix] Fix WFS in metasearch + + Fixes #17347 + +Alessandro Pasotti 2017-11-17 + + [bugfix] Fix WMS in metasearch + +Merge: 48c320beb0 861987daa3 +rldhont 2017-11-17 + + Merge pull request #5664 from rldhont/server-getfeatureinfo-raster-display + + [BUGFIX][Server] GetFeaturInfo: do not identify raster data if point … + +Merge: d590e98c3f ca8d82ff4c +Even Rouault 2017-11-16 + + Merge pull request #5649 from rouault/settings_main_canvas_preview_jobs + + Add a setting to be able to disable preview jobs in main canvas + +Merge: 29c8f7ceb2 6f0659742b +Alessandro Pasotti 2017-11-16 + + Merge pull request #5644 from boundlessgeo/bd-2648-auth-thread-safety + + [auth] Thread safe auth methods with recursive mutex + +David 2017-11-16 + + tooltip of relationstrength in project properties + + improvement of the tooltip. more info, how to activate the duplicate button. + +rldhont 2017-11-16 + + [BUGFIX][Server] GetFeaturInfo: do not identify raster data if point not contains + + Manual forwardporting with enhancement for raster data values displayed + +Alessandro Pasotti 2017-11-16 + + [auth] Morph the mutex from a pointer to a member var + +Alessandro Pasotti 2017-11-15 + + [auth] Thread safe auth methods with recursive mutex + + Add a mutex to the base class and use that + mutex to protect all public methods of the + authentication methods. + +Merge: 7c08b7155b 618ada7fc1 +Alexander Bruy 2017-11-16 + + Merge pull request #5641 from NaturalGIS/master + + [processing] add support for GRASS 7.4 + +Harrissou Sant-anna 2017-11-16 + + [Bugfix]Fix Bookmarks xmax and ymin columns inversion (#5643) + + (fix #16987) + +David 2017-11-16 + + member variable for constraint result visability + + ...as we had it for for constraint result (status). + now the setter are called when setting the editable mode changes. + and the getter to have the current visibility status. + +Mathieu Pellerin 2017-11-16 + + [processing] add vertex id details to extract nodes algorithms + +Alexander Bruy 2017-11-16 + + [processing] boolean fieds support in the Refactor Fields algorithm (fix #17168) + +David 2017-11-16 + + select the new features after duplication + + when duplicating features with the default action "duplicate" the new features are selected and additionally the childrens on the childrenlayers too. + +David 2017-11-16 + + return ids of the new child features on duplication + + when duplicating a feature in QgsVectorLayerUtils::duplicateFeature and this feature has over a relation the child features, we return now the ids of the new created child features in the respone object QgsDuplicateFeatureContext. + +Salvatore Larosa 2017-11-16 + + truncate only last extension in oper recent project menu + +Merge: 15c32c22c5 c6b054ed4d +Blottiere Paul 2017-11-16 + + Merge pull request #5628 from pblottiere/bugfix-transaction-tuple + + executeSql in transaction does not return an error on tuple + +Merge: dfc0305420 9283b26762 +Blottiere Paul 2017-11-16 + + Merge pull request #5566 from pblottiere/bugfix-ogc-getcapa-abstract + + [server][bugfix] Fix OGC test recommendations + +Blottiere Paul 2017-11-16 + + Update tests + +Blottiere Paul 2017-11-15 + + Update for loop + +Blottiere Paul 2017-11-15 + + Keep name and add metadata and keywordlist for root layer + +Blottiere Paul 2017-11-08 + + Update tests + +Blottiere Paul 2017-11-08 + + Replace Name entry by Abstract in GetCapabilities for root layer + +Merge: 8dd70c1dab 2a8ea5dc30 +Alessandro Pasotti 2017-11-16 + + Merge pull request #5631 from boundlessgeo/bd-2437-certs-format-sniffing + + [auth] Moved the PEM/DER sniffing to a common private function + +Blottiere Paul 2017-11-14 + + Add test + +Blottiere Paul 2017-11-14 + + Update doc + +Blottiere Paul 2017-11-09 + + Do not consider a tuple response as an error in transaction + +Merge: 0bd5107e82 72af1a00da +Alessandro Pasotti 2017-11-16 + + Merge pull request #5526 from boundlessgeo/ogr_authconfig_2 + + [auth][needs-docs] Authentication configuration support in OGR provider + +Merge: 05d38b3d1d 5e2564cf4c +Blottiere Paul 2017-11-16 + + Merge pull request #5647 from pblottiere/contributor + + Update contributors + +Mathieu Pellerin 2017-11-16 + + [processing] preserve field length and precision for temporary outputs (#5654) + + + + * add test case to cover length and precision through uri + +Matthias Kuhn 2017-11-15 + + Bump minimum spatialite version to 4.2 + +nirvn 2017-11-16 + + Save non-pinned recent projects below pinned ones + +nirvn 2017-11-16 + + Update recent project menu upon pin/unpin/remove actions + +Kent Porter 2017-11-15 + + Improved mActionDataSourceManager.svg icon (#5618) + +Nyall Dawson 2017-11-16 + + Fix error when running postgis algs + +Larry Shaffer 2017-11-15 + + [auth][ogr] Add missing PyQGIS auth manager OGR test + +Even Rouault 2017-11-16 + + Add a setting to be able to disable preview jobs in main canvas + + Can be used by power users to disable preview jobs, for very slow datasources + (especially when network bandwidth is saturated), where it decreases performance. + + More clever approaches have been discussed per https://github.com/qgis/QGIS/pull/5645 + and https://lists.osgeo.org/pipermail/qgis-developer/2017-November/050524.html, + but at least offer this setting for now, pending further improvements. + +Nyall Dawson 2017-11-16 + + Nicer UX when adding a layer to an existing gpkg through the browser + +Nyall Dawson 2017-11-16 + + Don't require a connection to a geopackage for data item + 'create new layer' to function + +Even Rouault 2017-11-15 + + [Spatialite provider] Properly destroy QgsSpatiaLiteConnPool singleton at provider unloading. Should fix frequent crash in PyQgsServerWMS on Travis (fixes #17447) + +Merge: 31299b0c3b 670764d14c +Even Rouault 2017-11-15 + + Merge pull request #5632 from rouault/gdal_shared_instance + + [GDAL provider] Use same underlying GDAL dataset for clone() (fixes #16006) + +Merge: bc90210e4f 4ce1752157 +Even Rouault 2017-11-15 + + Merge pull request #5646 from rouault/fix_16966 + + [QgsAuthManager] Protect all methods that do SQL queries with mutex (fixes #16966) + +Blottiere Paul 2017-11-15 + + Update contributors + +Merge: f1c3692f6a 76635894bd +Blottiere Paul 2017-11-15 + + Merge pull request #5620 from pblottiere/bugfix_gpkg_bool + + [bugfix] Fixes #17070 by considering bool fields as OGR integer fields with boolean subtype + +Even Rouault 2017-11-15 + + [QgsAuthManager] Protect all methods that do SQL queries with mutex (fixes #16966) + +gacarrillor 2017-11-15 + + Rename editCopy/editPaste to copySelectionToClipboard/pasteFromClipboard + +Salvatore Larosa 2017-11-15 + + [dbmanager] Fixes #16533 and #16506 + +Even Rouault 2017-11-15 + + [GDAL provider] Improve UI responsiveness affected by 3b2b98b012fdfda14761914f01318d079aeaa409 + + The consequence of sharing the same GDAL object and protecting them under mutex is that + instanciating a new pipeline for job preview background can actually be blocked for + a long time, and thus causing the UI to be totally non-responsive + + So change the strategy to use a global cache of GDAL datasets that can be reused by + cloned GDAL providers, while still maintaining the number of opened datasets to + a reasonable amount. + +Merge: bd30e12cf9 b5317c57e3 +Blottiere Paul 2017-11-15 + + Merge pull request #5554 from pblottiere/bugfix_virtuallayer + + [bugfix] Fixes #16798 FilterFid feature requests with virtual layers + +Merge: db5b1df7a9 96e597a8e2 +Blottiere Paul 2017-11-15 + + Merge pull request #5597 from pblottiere/bugfix-clickxy + + [bugfix] Fixes #16852 by adding click_x and click_y variables to resolve actions + +Blottiere Paul 2017-11-14 + + Update test with Bool type instead of Int type + +Blottiere Paul 2017-11-14 + + Add boolean support in OGR provider + +Blottiere Paul 2017-11-13 + + Call OGR_Fld_SetSubType before OGR_L_CreateField + +Blottiere Paul 2017-11-13 + + Add test + +Blottiere Paul 2017-11-13 + + Fixes #17070 by considering bool fields as OGR integer fields with boolean subtype + +Matthias Kuhn 2017-11-15 + + Remove direct usage of sqlite3 handles in core + +Giovanni Manghi 2017-11-15 + + add support for GRASS 7.4 + +Denis Rouzaud 2017-11-15 + + Increase git depth to avoid issues in code layout build + + On Travis + When on large pr with many commits + +gacarrillor 2017-11-15 + + Make names from QgisApp and QgisInterface match + +Merge: ac574e231a 3734a0d677 +Nyall Dawson 2017-11-15 + + Merge pull request #2586 from nyalldawson/coordinate_formatter + + Initial implementation of QgsCoordinateFormatter + +Blottiere Paul 2017-11-14 + + Fix test + +Blottiere Paul 2017-11-14 + + Use QString::number + +Blottiere Paul 2017-11-14 + + Group conditions + +Blottiere Paul 2017-11-14 + + Never return a feature if the fid is negative + +Blottiere Paul 2017-11-07 + + Add some tests with cross join + +Blottiere Paul 2017-11-07 + + Fixes #16798 FilterFid feature requests with virtual layers + +David 2017-11-14 + + Use id in gui if name is empty and crop layerid-part in the generated id + + The name can be empty, so use the id instead in the combo box. To avoid so long ids, the part taken from the layerid in the relation id is cropped to 10 signs. They are unique anyway because there is used a suffix counting up. + +David 2017-11-13 + + Autogenerated relation names in dialog instead of ids + + The autogenerated ids are quite long and this leads that they where very unconfortable to use in the configuration of relation reference in the attribute type widget of layer properties - attribute form. So now the names are used in the combo instead of the ids. This effects only the GUI. + + Fix: #17441 + +Nyall Dawson 2017-11-15 + + Fix build + +Nyall Dawson 2017-11-15 + + Fix tests + +Nyall Dawson 2017-11-15 + + Rename various WKT/WKB/GeoJSON/GML methods for consistency + and consistent capitalisation + +Nyall Dawson 2017-11-15 + + Remove coordinate formatting methods from QgsPointXY + + Use QgsCoordinateFormatter instead + +Nyall Dawson 2017-11-15 + + Update code, formatting + +Nyall Dawson 2017-11-15 + + Update sip bindings + +Nyall Dawson 2015-12-16 + + Initial implementation of QgsCoordinateFormatter + +Sandro Mani 2017-11-15 + + [Geometry checker] Remove unused include + +Alessandro Pasotti 2017-11-15 + + [auth] Simplify code and add a *.* filter for certs and keys selection + +Merge: 364ddc1de4 5a4ace10e9 +Alessandro Pasotti 2017-11-15 + + Merge pull request #5633 from slarosa/fix_17466 + + Fixes #17466: DB Manager does not refresh correctly map in layer preview + +Tim Sutton 2017-11-15 + + Fix #17444 : GeoNode data provider completely ignores authentication (#5634) + + * Fix #17444 : GeoNode data provider completely ignores authentication - hide the authentication group until GeoNode API supports authentication. + +Borys Jurgiel 2017-11-15 + + Fix missing toolbar tooltips + +Matthias Kuhn 2017-11-15 + + Destroy spatialite context after closing database + + According to instructions in https://groups.google.com/forum/#!msg/spatialite-users/83SOajOJ2JU/sgi5fuYAVVkJ + +Matthias Kuhn 2017-11-15 + + delete spatialite_database_unique_ptr::reset( sqlite3 * ) + +Matthias Kuhn 2017-11-15 + + Code improvement + +Matthias Kuhn 2017-11-15 + + Avoid recreating spatialite handles + +Matthias Kuhn 2017-11-14 + + Use member functions over sqlite3 api + +Matthias Kuhn 2017-11-14 + + Prevent memory leaks + +Matthias Kuhn 2017-11-14 + + Improve chances for copy elision + +Matthias Kuhn 2017-11-14 + + Move spatialite context management to deleter + +Matthias Kuhn 2017-11-14 + + Const correctness for sqlite_database_unique_ptr + +Matthias Kuhn 2017-11-14 + + Switch geopackage dataitem to RAII sqlite3 + +Matthias Kuhn 2017-11-14 + + Switch QgsStyle to RAII sqlite3 + +Matthias Kuhn 2017-11-14 + + Switch map layer to RAII sqlite3 + +Matthias Kuhn 2017-11-14 + + Switch new spatialite layer dialog to RAII spatialite + +Matthias Kuhn 2017-11-14 + + Release spatialite context when a spatialite_database_unique_ptr scopes out + +Matthias Kuhn 2017-11-14 + + Use sq/spatialite unique_ptrs in QgsMapLayer and QgsOfflineEditing + +Matthias Kuhn 2017-11-14 + + Switch more places to using spatialite_database_unique_ptr + +Matthias Kuhn 2017-11-14 + + Use std::unique_ptr with custom deleter for spatialite and sqlite + +Merge: b95588cf58 f177ba3141 +Alessandro Pasotti 2017-11-15 + + Merge pull request #5616 from boundlessgeo/datasource-manager-add-close + + [gui] Datasource manager remove Ok and add Close + +Salvatore Larosa 2017-11-15 + + [dbmanager] defines correctly super class + +Merge: c321700ada 662c2cf801 +Alexander Bruy 2017-11-15 + + Merge pull request #5603 from medspx/ProcessingGrassFixDescR + + [processing] GRASS7 provider: review and update all r.* description files. + +matteo 2017-11-14 + + [processing] test for union algorithm + +matteo 2017-11-14 + + processing Union fix + +Nyall Dawson 2017-11-15 + + Fix exception in find projection algorithm + +Nyall Dawson 2017-11-15 + + Cleanup layer options arrangement + +Nyall Dawson 2017-11-12 + + [needs-docs] Remove option to show raster preview icons in layer tree + + This option is not safe - see #16803, and generally undesirable + due to how slow generating the preview icons are + +Salvatore Larosa 2017-11-14 + + Fixes #17466: DB Manager does not refresh correctly map in layer preview + +Even Rouault 2017-11-14 + + [GDAL provider] Use same underlying GDAL dataset for clone() (fixes #16006) + + This will improve efficiency of GDAL block cache during raster rendering, + since the cached blocks are only valid during GDALDataset instance lifetime. + +Alessandro Pasotti 2017-11-14 + + [auth] Moved the PEM/DER sniffing to a common private function + +Alexander Bruy 2017-11-14 + + correctly create new function file (fix #16752) + +Alessandro Pasotti 2017-11-14 + + Disable PG test + +Alessandro Pasotti 2017-11-14 + + [auth][ogr] Added test cases for all supported drivers + +Alessandro Pasotti 2017-11-14 + + [ogr][auth] Add geojson username/password test + +Alessandro Pasotti 2017-11-03 + + [auth] Add tests for Basic auth CAs on OGR and PG + + providers + +Alessandro Pasotti 2017-11-03 + + [auth] Add trusted root CAs to OGR PG connnections + +Alessandro Pasotti 2017-11-02 + + Always use expanded URI for connection pooling + +Even Rouault 2017-11-14 + + Raster renderer: fix so that raster in projected CRS is not rendered in geographic CRS if the extent exceeds -180,-90,180,90 (fixes #14229) + +Even Rouault 2017-11-14 + + Fix compilation error likely due to 5d476e51dfcbf9a2d3634cf6b7a6d5b12e93f406 + +Borys Jurgiel 2017-11-14 + + [Plugin manager] Don't truncate long names. Fixes #17451. + +Even Rouault 2017-11-14 + + [Raster] Do not crash when displaying a raster with complex datatype (fixes #16405) + + That said, complex datatypes are not handled, so QGIS cannot do anything useful + with such datasets. + +Nyall Dawson 2017-11-12 + + Tweaks to automatic layer name logic + +Nyall Dawson 2017-11-12 + + Show vector layer wkb types in tooltip in layer tree and layer combo boxes + + This is very useful information to have readily visible (esp. + to see if a layer is multi* type, has z/m, when choosing it + as a source for a processing algorithm) + + Remove redundant geometry type display from default layer name + +Nyall Dawson 2017-11-14 + + [needs-docs] Remove option to capitalize layer names, and make it always on + + Doing this removes some work from our users - giving layers + a nicely generated name by default + +Nyall Dawson 2017-11-12 + + Remove QgsMapLayer::originalName() + + Now QgsMapLayer::name() is guaranteed to return the same string + +Nyall Dawson 2017-11-12 + + Cleanup fragile 'capitalize layer names' option + + This option was being applied in the wrong place - within the + map layer classes themselves. This meant that depending on the + user's setting for this option, a plugin calling QgsMapLayer::setName + would not be guaranteed the same behaviour across installs. + (and the same with setDataSource) + + Similarly, the option was re-applied on project load, so + moving projects between installs with different values for + this setting would affect the project layer names, breaking + expressions which relied on these... + + Instead, move the formatting and capitalization of layer + names to the QgisApp add*Layer methods instead, so this option + only applies on adding new layers to a project. + +Nyall Dawson 2017-11-14 + + More efficient distance to vertex calculation in extract nodes alg + + Instead of calculating the whole distance from the start of the + geometry to the vertex for EVERY vertex, we just keep a running + sum of the cumulative distance so far and add the length of + each segment as we go. + + Stats: + + Before: + - dataset 1: > 20 minutes, still going at 14%.... + - dataset 2: 92 seconds + + After: + - dataset 1: 3 seconds + - dataset 2: 1.7 seconds + + BAM! + +Nyall Dawson 2017-11-14 + + Fix calculation of distance to vertex for multi part, multi ring + and curved geometries + +Nyall Dawson 2017-11-14 + + Use QVector where possible in geometry classes + +Nyall Dawson 2017-11-14 + + Drop the cached coordinate sequence from abstract geometries + + This cache was added to speed up expensive QgsAbstractGeometry::coordinateSequence + calls, when we were relying on coordinateSequence() for a whole + bunch of stuff like counting the number of points in a geometry. + + Now it's used almost no-where in the code, so this cache is unlikely + to get filled and just makes geometries more memory heavy than + they need to be. + +Matthias Kuhn 2017-11-14 + + N:M Relations, support for linking table with default values + +Matthias Kuhn 2017-11-14 + + Update buttons on referenced layer edit state change in N:M + + Fix #16635 + +Nyall Dawson 2017-11-14 + + Fix broken sip casting of nested QVectors + + Old code was always forcing casting to QgsPointXY, regardless + of actual type + +Alexander Bruy 2017-11-14 + + another typo + +Alexander Bruy 2017-11-14 + + Fix typo + +Merge: 3c8d50d525 91e2353067 +Nyall Dawson 2017-11-14 + + Merge pull request #5609 from nyalldawson/remove_options + + [needs-docs] Remove options for making layer names and groups bold + +Merge: 6dbdbead0c b7d05829ce +Nyall Dawson 2017-11-14 + + Merge pull request #5612 from nirvn/native_nodes + + Optimize extract nodes algorithm + +Nyall Dawson 2017-11-14 + + Handle null values in processing attribute tests + +Even Rouault 2017-11-13 + + [WFS provider] Add NAMESPACES= parameter to GetFeature requests when needed (fixes #14685) + +Alessandro Pasotti 2017-11-02 + + Overridden dataSourceUri for OGR + +Alessandro Pasotti 2017-11-02 + + [auth][feature][ogr] Hide credentials from URI, use authcfg + +Alessandro Pasotti 2017-11-02 + + Fix QGIS server test HTTP Basic auth with streaming + +Alessandro Pasotti 2017-11-02 + + [auth][ogr][feature] Add basic authentication to selected OGR sources + + - Protocol + - DB (integration with QGIS auth system) + +Merge: 2c49631bc9 822a123ebd +Alessandro Pasotti 2017-11-13 + + Merge pull request #5563 from boundlessgeo/BD-2469-pem-key-encoding + + [auth][bugfix] Import pvt keys with unknown file extension + +Even Rouault 2017-11-13 + + [OGR provider] Support 64bit FID (partially implemented per 8f3d44d4e9321efc035a6080b161f5dd48d4f230 in master) (fixes #16404) + +Alessandro Pasotti 2017-11-13 + + Remove unused code + +nirvn 2017-11-13 + + try to make travis happy + +Alessandro Pasotti 2017-11-13 + + Remove OK button and add CLOSE + + Yes, it's one more click to quit, but more intuitive UI + +Alessandro Pasotti 2017-11-13 + + Iterate over const + +nirvn 2017-11-13 + + Use vertex iterator + +David 2017-11-12 + + background color on constraint fields reset on toggle edit + + if editable, the backgroundcolor should be set according the constraint result + if not editable, the backgroundcolor should be empty anyway + so it has to be reseted when synchronizeEditableState... + +David 2017-11-09 + + Constraint Result Indicator invisible when not in editable mode + + The icon for the constraint result indicator cross/tipp disappears when not in editable mode + this is made by the new method setconstraintresult. + +Harrissou Sant-anna 2017-11-12 + + Add tab order and enable help button + +Alessandro Pasotti 2017-11-13 + + Add extra checks to PEM encoding test + + Not really necessary but for extra safety + +Alessandro Pasotti 2017-11-13 + + Added various line endings PEM tests + +Merge: fd18c3bc69 be8bad8e39 +Nyall Dawson 2017-11-13 + + Merge pull request #5613 from nyalldawson/custom_crs_fixes + + Custom crs fixes + +Merge: 702dfdab5d 8ae1b62431 +Nyall Dawson 2017-11-13 + + Merge pull request #5559 from nyalldawson/custom_crs + + Fix issues with custom CRS dialog + +Nathan Woodrow 2017-11-13 + + Tweak crash message + +Harrissou Sant-anna 2017-11-11 + + Fix typos + +Nyall Dawson 2017-11-13 + + Fix crash when clearing all nodes using node tool + +Nathan Woodrow 2017-11-13 + + Fix #12932 - Send and show layer load errors to user + +Nyall Dawson 2017-11-13 + + Fix duplicate crsChanged signal emitted when loading projects + +Nyall Dawson 2017-11-13 + + Fix loading 2.x projects with custom CRS + + Fixes #17257 + +nirvn 2017-11-13 + + Optimize extract nodes algorithm + +Nyall Dawson 2017-11-13 + + Fix incorrect authid and description after saving a user crs + +Nyall Dawson 2017-11-13 + + Invalidate crs cache after adding a new user CRS + + Refs #17257 + +Nathan Woodrow 2017-11-13 + + [MSSQL] Don't add constraints for identity columns + + These are generated server side and will block the form if we set + this client side + +Nyall Dawson 2017-11-13 + + Fix return type for QgsCoordinateReferenceSystem::saveAsUserCrs + +Nathan Woodrow 2017-11-13 + + uh oh ;) + +Kristian Thy 2017-11-13 + + [bugfix] Issue #17387: MSSQL provider fails to load UNIQUEIDENTIFIER fields (#5521) + + * Fix #17387: MSSQL provider fails to load UNIQUEIDENTIFIER fields + +Juergen E. Fischer 2017-11-12 + + fix warnings and translation strings + +Even Rouault 2017-11-12 + + Attempt at fixing warning 'case value ‘2147483648’ not in enumerated type OGRwkbGeometryType' caused by 97020ff17d21fcdad8a51a5177d9c1da2bce9e81 fix + +Even Rouault 2017-11-12 + + GDALDataItems / OGRDataItems: avoid listing .map and .dat files of a .tab + +Even Rouault 2017-11-12 + + QgsOgrLayerItem(): avoid useless dataset opening + +Merge: 3ff0f69794 97020ff17d +Jürgen Fischer 2017-11-12 + + Merge pull request #5610 from landryb/fix/32-bits-build + + Remove useless cast breaking build on 32-bits os + +Even Rouault 2017-11-12 + + [OGR provider] Make extent() return a isNull() rectangle on empty layer (fixes #16721) + +Alexander Bruy 2017-11-11 + + improve layout in Python init function editor (fix #17428) + +Nathan Woodrow 2017-11-12 + + Fix windows build + +Nathan Woodrow 2017-11-11 + + Add local symbols to stack trace in crash + +Landry Breuil 2017-11-12 + + Remove useless cast breaking build on 32-bits os + + error: case value evaluates to 2147483655, which cannot be narrowed to type 'long' [-Wc++11-narrowing] + +Nyall Dawson 2017-11-12 + + [needs-docs] Remove options for making layer names and groups bold + + Either these options are desirable, in which case they should + be the default settings, or not, in which case we don't need + an extra user option to control this. + +Merge: 0fa9041c4e 9269200afb +Nyall Dawson 2017-11-12 + + Merge pull request #5530 from DelazJ/chkgeom_messages + + [Geometry Checker] Improve displayed message by indicating the layer… + +Merge: c1b683b51e fbd11ca93b +Nyall Dawson 2017-11-12 + + Merge pull request #5528 from DelazJ/geometrycheck + + [Geometry Checker] Better handling of the geometry checker dialog + +Merge: 66518eb9ee 19b1b7992d +Nyall Dawson 2017-11-12 + + Merge pull request #5595 from alexbruy/fix-north-arrow + + [north arrow] prevent crash if project CRS is not defined + +Médéric RIBREUX 2017-11-11 + + Review all r.* description files + +Even Rouault 2017-11-11 + + [GML parser/WFS provider] Fix crash when typename and geometry field name are identical (fixes #15942) + +Merge: 8c6e029688 5a6c222e87 +Nyall Dawson 2017-11-11 + + Merge pull request #5602 from nyalldawson/modernize2 + + Apply some more clang-tidy modernizations + +Nyall Dawson 2017-11-11 + + Fix Coverity null pointer dereference issues + +Nyall Dawson 2017-11-11 + + Avoid Coverity unchecked return value warnings + +Nyall Dawson 2017-11-11 + + Fix Coverity uninitialized member warnings + +Nyall Dawson 2017-11-11 + + Fix documentation test + +Nyall Dawson 2017-11-11 + + Use =default, =delete where possible + +Nyall Dawson 2017-11-11 + + Run clang-tidy code readability fixits + +Nyall Dawson 2017-11-11 + + Cleanup some constructors + +Nyall Dawson 2017-11-11 + + Use clang-tidy modernize-use-default-member-init to modernize initializers + +Merge: a65f072b71 95feb87d3b +Even Rouault 2017-11-10 + + Merge pull request #5601 from rouault/unblacklist_PyQgsDBManagerGpkg + + Fix DBManager + PyQgsDBManagerGpkg and unblack list it for Travis-CI + +Even Rouault 2017-11-10 + + Fix DBManager + PyQgsDBManagerGpkg and unblack list it for Travis-CI + +Merge: f97a011f96 0ba03e59ee +Even Rouault 2017-11-10 + + Merge pull request #5598 from rouault/gdal_ogr_extensions + + [GDAL/OGR providers] Improve list of extensions, remove duplicates, support netCDF vector (fixes #17000) + +Borys Jurgiel 2017-11-10 + + [Plugin manager] Remember last visited tab. Fixes #8786 + +Merge: fb205b1aec c13dadf7ad +Nyall Dawson 2017-11-11 + + Merge pull request #5587 from nyalldawson/3d + + Fix 3d renderer does not work with multi-point layers + +Even Rouault 2017-11-10 + + [GDAL/OGR providers] Improve list of extensions, remove duplicates, support netCDF vector (fixes #17000) + + - Read GDAL 2.0 GDAL_DMD_EXTENSIONS metadata item to retrieve a list of extensions + - Remove 'duplicated' drivers from list (such as KML/LIBKML, DGN/DGNv8) + - Support netCDF as a vector format (in addition to raster) + - For OGR formats, dynamically build list for unknown drivers ('static' list kept for now) + +Merge: 67f846548a 612f51601a +Nyall Dawson 2017-11-11 + + Merge pull request #5589 from nyalldawson/remote_proc_exp + + [processing] Remove expression buttons from parameters outside modeler + +Merge: ecacb3b07f 2a7f23fd4c +Blottiere Paul 2017-11-10 + + Merge pull request #5520 from pblottiere/server_bugfix_width_height + + [server][bugfix] Fixes #17399 WIDTH and HEIGHT parameters are not mandatory for GetPrint + +Blottiere Paul 2017-11-09 + + Update tests + +Blottiere Paul 2017-11-09 + + Fixes #17399 GetPrint doesn't need a proper image with width/height + +Merge: fe5653101a 534e1e811e +Blottiere Paul 2017-11-10 + + Merge pull request #5519 from pblottiere/server_bugfix_layernotfoud + + [server][bugfix] Fixes #17400 by returning an empty response instead of an exception + +Alessandro Pasotti 2017-11-10 + + [bugfix][postgresql] Fix crashes on featureCount() + + Fixes #17388 + + Needs backporting + +Blottiere Paul 2017-11-09 + + Add test + +Blottiere Paul 2017-11-09 + + Fixes #17400 by returning an empty response if a layer is ignored due to configuration + +Blottiere Paul 2017-11-10 + + Add some tests + +Blottiere Paul 2017-11-10 + + Fixes #16852 by adding click_x and click_y variables to resolve actions + +Alessandro Pasotti 2017-11-10 + + [auth] New test cases for EC SSL Keys and encodings + +Alessandro Pasotti 2017-11-10 + + [auth] Also parse EC keys and get encoding from content + +Merge: f8cbc42dca f2abcf2deb +Jürgen Fischer 2017-11-10 + + Merge pull request #5596 from boundlessgeo/bugfix-5212-ogr-proxy + + [bugfix] Apply proxy configuration to OGR connections + +Alessandro Pasotti 2017-11-10 + + Spelling + +Alessandro Pasotti 2017-11-10 + + [tests] Brand new C++ test and new py test case for ogr proxy + +Alessandro Pasotti 2017-11-10 + + Skip proxy auth settings if proxy is disabled + + This does not really change anything but it makes more sense + +Alessandro Pasotti 2017-11-10 + + [bugfix] Apply proxy configuration to OGR connections + + Fixes #5212 Proxy settings ignored for layers + +Alexander Bruy 2017-11-10 + + prevent crash from north arrow if project CRS is not defined (fix #16874) + +Merge: 6de3980e45 2ed2248827 +Nyall Dawson 2017-11-10 + + Merge pull request #5594 from nyalldawson/batch_lazy + + [processing] Fix issues with batch processing and large count of layers + +Nyall Dawson 2017-11-10 + + Fix issues in vector layers properties dialog + + - remove frames from new pages + - fix cramped widgets on hidpi screens + - fix broken aux storage layout + - standardise margins across pages + +Nyall Dawson 2017-11-10 + + [processing] Add option whether to load batch output layers on completion + + By always trying to load all layers, we severely limit the usefulness + of batch processing. E.g. try clipping 200 layers - and then + get ready to punch something as you wait for all the results to load. + +Nyall Dawson 2017-11-10 + + [processing] Only load layers when absolutely required + + This change avoids holding onto resources and layers from earlier iterations, + and allows batch processing of many more items then is possible + if we hold on to these layers + +Merge: 9b85e5b7f5 bd9945ffe3 +Alexander Bruy 2017-11-10 + + Merge pull request #5593 from nyalldawson/batch_rows + + [processing] Change min rows in batch processing to 1 + +Merge: 019a4d2a78 feacb76300 +Alexander Bruy 2017-11-10 + + Merge pull request #5592 from nyalldawson/batch + + [processing] Fixes for batch processing + +Merge: e7a1c0440a bd0b499810 +Alexander Bruy 2017-11-10 + + Merge pull request #5155 from alexbruy/processing-saga + + [processing] port SAGA to new API + +Mathieu Pellerin 2017-11-10 + + Trigger layer repaint when adding field-less features (fixes #17426) + +Nyall Dawson 2017-11-10 + + [processing] Change min rows in batch processing to 1 + + While no-one is likely to use the batch dialog to run a single + operation, it's a bit unexpected to see two empty rows, which + can't be removed, when first opening this dialog + +Nyall Dawson 2017-11-10 + + Fix python error + +Nyall Dawson 2017-11-10 + + Fix error when double clicking destination param in batch dialog + +Nyall Dawson 2017-11-10 + + Fix saving/load batch processing models + +Nyall Dawson 2017-11-10 + + Remember last used folder for processing batch save/load + + Fixes #16310 + +Nyall Dawson 2017-11-10 + + Fix batch processing progress bar never hits 100%, also fix fragile + cursor handling + +Nyall Dawson 2017-11-10 + + [processing] Fix cannot resize columns in batch dialog + + Fixes #17227 + +Nyall Dawson 2017-11-10 + + Fix duplicate 'all files' entry in batch input file selection dialog + +Nyall Dawson 2017-11-10 + + [processing] Fix crash in batch processing dialog + + Fixes #17429 + +Larry Shaffer 2017-11-09 + + Fix astyle version check for macOS + + Hard to emulate natural version sorting on macOS. Just use numeric. + https://stackoverflow.com/questions/21394536 + +Nyall Dawson 2017-11-10 + + [processing] Remove expression buttons from parameters outside modeler + + Since these expressions were only evaluated immediately, it led to + confusing behavior for users who were expecting that the expression + would be applied per-feature. + + Given that expressions can be directly entered into spin boxes, we already + have a way of users evaluating simple calculations for numeric + parameters at least. + + I don't think there's a strong enough use case for needing to + calculate string results to leave the confusing expression builder + option in place. + + This should be re-evaluated when we add UI support for dynamic + parameters (which are already supported in the backend), where + expressions are evaluated per-feature. + + Fixes #17267 + +Merge: e1b76e01ca fef56184bc +Nyall Dawson 2017-11-10 + + Merge pull request #5588 from nyalldawson/acquire + + Workaround bug in Qt > 5.8 causing crashes in connection pools + +Nyall Dawson 2017-11-10 + + Workaround bug in Qt > 5.8 causing crashes in connection pools + + tryAcquire is broken on Qt > 5.8 with negative timeouts - see: + + http://bugreports.qt.io/browse/QTBUG-64413 + https://lists.osgeo.org/pipermail/qgis-developer/2017-November/050456.html + +Nathan Woodrow 2017-11-10 + + [FIX] Make the correct location for crash report + +Nyall Dawson 2017-11-10 + + Fix clear values for 3d spin boxes + +Nyall Dawson 2017-11-10 + + Fix 3d renderer does not work with multipoint layers + +Harrissou Sant-anna 2017-11-09 + + Clarify where and what Log Messages is + +Merge: 4c1ff1cdbd 29c71f43af +Larry Shaffer 2017-11-09 + + Merge pull request #5531 from boundlessgeo/fix-libpaths-update + + Fix updating QgsApplication::libraryPaths; load before any Qt plugin use + + Note: could possibly be moved to QgsApplication::init() + +Matthias Kuhn 2017-11-09 + + [travis] Trigger libSegFault on abrt + +Even Rouault 2017-11-09 + + [GDAL provider] reintroduce use of unique_ptr removed in d00efde2f0645918cabd4fc34b7c8b71933c6380 + +Werner Macho 2017-11-09 + + [tr] correcting flags + +Matthias Kuhn 2017-11-09 + + [travis] Disable PyQgsSpatialiteProvider + + It is flaky + +Matthias Kuhn 2017-11-09 + + [travis] Disable non-local file download tests + +Even Rouault 2017-11-09 + + [DB Manager / GPKG] Remove GDAL 1.x support + +Alexander Bruy 2017-11-09 + + add misssed import after rebase + +Even Rouault 2017-11-09 + + [DB Manager / GPKG] Fix COMMIT with GDAL 2 (fix #16174) + +Merge: d00efde2f0 decbde24ff +Alessandro Pasotti 2017-11-09 + + Merge pull request #5573 from boundlessgeo/BD-2238-auth-thread-safe + + [tests] Add XYX slippy map to test QGIS server + multi-threading + +Alexander Bruy 2017-11-09 + + disable SAGA test until we have SAGA support on Travis + +Matthias Kuhn 2017-11-09 + + [travis] Disable PyQgsLocator test + + It's acting flaky and timing out + +Alexander Bruy 2017-11-07 + + [processing] tests for SAGA provider and related fixes + +Alexander Bruy 2017-11-07 + + [processing] fix input rasters check + +Alexander Bruy 2017-11-06 + + [processing] adopt to changes in extensions handling + +Alexander Bruy 2017-11-06 + + [processing] fix not initialized variable + +Alexander Bruy 2017-09-05 + + [processing] fix integer numbers handling + +Alexander Bruy 2017-09-05 + + [processing] more raster handling fixes in SAGA provider + +Alexander Bruy 2017-09-05 + + [processing] fix rasters handling in checkParameterValues() + +Alexander Bruy 2017-09-05 + + [processing] infrastructure for SAGA tests + +Nyall Dawson 2017-08-18 + + Restore more saga functionality + +Nyall Dawson 2017-08-18 + + Convert SAGA ParameterTableField parameters + +Nyall Dawson 2017-08-18 + + Update SAGA ParameterMultipleInput parameters + +Nyall Dawson 2017-08-18 + + Update SAGA ParameterTable parameters + +Nyall Dawson 2017-08-18 + + Update SAGA ParameterVector params + +Nyall Dawson 2017-08-15 + + Update SAGA ParameterSelection parameters + +Nyall Dawson 2017-08-15 + + Fix SAGA boolean parameters + +Nyall Dawson 2017-08-15 + + More followups to SAGA raster parameter handling + +Nyall Dawson 2017-08-15 + + GeoAlgorithmExecutionException -> QgsProcessingException + +Nyall Dawson 2017-08-15 + + Fix excepthook handling in standalone scripts + +Nyall Dawson 2017-08-15 + + Fix parsing of saga params + +Nyall Dawson 2017-08-15 + + Update SAGA RasterOuput params + +Nyall Dawson 2017-08-15 + + Update SAGA ParameterNumber params + +Nyall Dawson 2017-08-15 + + Update SAGA ParameterRaster params + +Nyall Dawson 2017-08-15 + + Start porting saga algorithm base to new API + +Nyall Dawson 2017-08-15 + + Fix bad strings in saga description file + +Nyall Dawson 2017-08-15 + + Start bringing back saga algs - split RGB bands + +Merge: 022f6cfd21 c3e15f5228 +Even Rouault 2017-11-09 + + Merge pull request #5580 from rouault/fix_QgsRasterFileWriter_geopackage + + [GDAL provider] in create(), use newly create dataset handle to instanciate the provider (fix #17103) + +Merge: b9bde10759 7f37e70762 +Blottiere Paul 2017-11-09 + + Merge pull request #5515 from pblottiere/server_bugfix_plusspace + + [server][bugfix] Fixes #17401 by replacing '+' symbol by space + +Merge: d8a3c67fa5 426b8dbc46 +Even Rouault 2017-11-09 + + Merge pull request #5576 from rouault/wfst10_test_qt5 + + Re-enable testWFST10 + +Even Rouault 2017-11-09 + + [GDAL provider] in create(), use newly create dataset handle to instanciate the provider (fix #17103) + + Previously we created an empty file, close it and re-opened it immediately in open mode. + However for GeoPackage, if you create for example a 1 band or 3 band dataset, upon reopening + you get a 4 band RGBA dataset, due to the fact that GeoPackage doesn't explicitly store the + number of bands. Thus the 4th band (alpha) was never written by the QgsRasterFileWriter logic. + +Alessandro Pasotti 2017-11-09 + + Because spellchecker does not like slippy maps + +Harrissou Sant-anna 2017-11-09 + + Constrain the Help button placement + + by avoiding the buttonbox expand + +Merge: 8abc892ea2 b1ac56b5bc +Matthias Kuhn 2017-11-09 + + Merge pull request #5577 from m-kuhn/valuerelref + + Fix value() method of relation reference widget + +Matthias Kuhn 2017-11-09 + + Fix value() method of relation reference widget + +Matthias Kuhn 2017-11-09 + + Typo + +gacarrillor 2017-11-09 + + Expose through iface methods to copy/paste features between given layers + + That is, no need to load layers into the layer tree nor make them active. + +Alessandro Pasotti 2017-11-09 + + [tests] Add missing import when no auth is required + +Even Rouault 2017-11-09 + + Re-enable testWFST10 + +Even Rouault 2017-11-09 + + [WFS provider] Fix deadlock when adding WFS layer to project from Python console (fixes #17087) + +Alessandro Pasotti 2017-11-09 + + [tests] Add XYX slippy map to test QGIS server + + Plus: multi-threading server side (for speed) + + This is useful for testing various authentication + shemes on a slippy-map server (that uses multi-threading + in QGIS desktop) + +Merge: 1ff50fd59e 2daae54d16 +Matthias Kuhn 2017-11-09 + + Merge pull request #5572 from signedav/valuerelationwidget + + Value relation widget takes key again instead of value (in Attribute Form) + + Fix #17261 + +Blottiere Paul 2017-11-09 + + Add test + +Blottiere Paul 2017-11-09 + + Fixes #17401 by replacing '+' symbol by space + +Juergen E. Fischer 2017-11-09 + + fix TestQgsFileDownloader::testLacksWritePermissionsError (followup f06ea878) + +Alessandro Pasotti 2017-11-09 + + [auth] Remove unused accessor to mutex + +David 2017-11-09 + + Attribute Form - value relation widget takes key again instead of value + + Corrected: Value relation widget update incorrectly tries to use value instead of key + + The mapped key has to be set in the return value (not the input value). + In the release-2_18 the key was returned correctly but in another structure. So this is corrected now. + +Mathieu Pellerin 2017-11-09 + + Fix Z and M support for add point feature (fixes #17427) + +Nyall Dawson 2017-11-04 + + Make constructors for QgsVectorLayer and QgsRasterLayer more flexible + + ...by moving extra arguments to new LayerOptions structs. This allows + us to more easily add new layer constructor options without making + the API cumbersome to use. + +Matthias Kuhn 2017-11-08 + + Do not assume edit widget value changes on every signal + + Widgets may on initialisation send out a notification that the value changed (from invalid to something sensible). + + The attribute form should however only tell the rest of the world, that a value changed if the new value doesn't + correspond to the one in the cached QgsFeature. + + Fix #17425 + +Matthias Kuhn 2017-11-09 + + Fix crash when removing layers from running transactions + + qobject_cast no longer works when the QObject::destryed signal is being emitted + +Merge: cab807dc30 b18c891dfc +Matthias Kuhn 2017-11-09 + + Merge pull request #5568 from m-kuhn/postgresDefaultValues + + [postgres] Fix default value check if evaluated server side + +Matthias Kuhn 2017-11-09 + + [postgres] Fix default value check if evaluated server side + +Merge: e1ffb2826b da90477121 +Nyall Dawson 2017-11-09 + + Merge pull request #5426 from medspx/ProcessingPortGrass72 + + [Processing] Port GRASS 7.2 algorithm provider + +Matthias Kuhn 2017-11-08 + + QgsHighlight improvements + + * Doxygen improvements + * Fix unrequired casting + * Remove unrequired contructor + +Matthias Kuhn 2017-11-08 + + Fix build warning + +Merge: 7b427c6be5 0ba8f97979 +Matthias Kuhn 2017-11-08 + + Merge pull request #5467 from signedav/propertieslayout + + Propertieslayout Fields And Forms Redesign + +David 2017-11-08 + + no +/- buttons when not needed and some graphical finetuning + + scroll area for attribute type config, but no scroll area for whole tab + set attribute type config to invisible when a container box is selected + +Nathan Woodrow 2017-11-09 + + Don't quote symbol path in crash + +Merge: 17c7e2fbca fd937c3a86 +Matthias Kuhn 2017-11-08 + + Merge pull request #5556 from m-kuhn/crashOnHighlight + + No need to crash when a user wants a highlight + +Mathieu Pellerin 2017-11-08 + + [3D] Fix missing Z support for point layers (#5560) + +Matthias Kuhn 2017-11-08 + + Increase outline width + +Matthias Kuhn 2017-11-08 + + [test] Fix canvas size and background garbage + +Matthias Kuhn 2017-11-08 + + Add control images to highlight check + +Matthias Kuhn 2017-11-08 + + Add smoke test for QgsHighlight + +Matthias Kuhn 2017-11-07 + + No need to crash when a user wants a highlight + + Fix #17413 + +David 2017-11-08 + + Correct order of column headers in relationmanager + + The column headers of "Referenced Field" and "Referenced Layer" were switched with respect to their content. Changed to the correct order in GUI now. + + Fix #17409 + +Alessandro Pasotti 2017-11-08 + + [bugfix] Fixes QgsFileDownloader abort on error + + Abort reply on error. + + Fixes #171410 + + Requires backport + +Alessandro Pasotti 2017-11-08 + + Add a test case for unwriteable folders in file downloader + + Attempt to verify bug 17410 Identify tool->download in a not authorised folder block qgis + + The test passes, so let's push it in, I'll continue + to investigate if there is an issue in the GUI logic. + +Merge: 845310091d d11ea073c7 +Alessandro Pasotti 2017-11-08 + + Merge pull request #5558 from elpaso/project_use_rw_context + + [bugfix] Project use rw context + +Alessandro Pasotti 2017-11-08 + + Removed Q_UNUSED + +Alessandro Pasotti 2017-11-08 + + [auth][bugfix] Tests for the new SSL key loading logic + +Alessandro Pasotti 2017-11-08 + + [auth][bugfix] Import pvt keys with unknown file extension + + This fixes an unreported bug that prevent imports of + private keys with wrong/unknown extension. + + The old logic relied on the file extension, that is + not only weak but plain wrong because the same extension + can have different encodings. + + The new implementation is 100% robust because completely + ignores the file extentions and try to load the key with + all supported encodings and algorithms before giving up. + +Borys Jurgiel 2017-11-08 + + Fix histogram refreshig + +Merge: 940c4ed5c5 24f38aba12 +Blottiere Paul 2017-11-08 + + Merge pull request #5551 from pblottiere/reenable_wms_server_tests + + [travis] Re-enable WMS tests for server + +David 2017-11-08 + + Fix #17412 Sorting fixed, no troubles when editing after sorting + Issue was, that the cellchange is triggered at re-sorting - so we need to check the names + Following issue was, that when removing or renaming something in re-sorted table - so there was a bug that referenced to the row instead of the index + Thought about to remove mIndexedWidgets completely, but when renumbering after delete in unsorted table, we cannot reference to the row order. + +Blottiere Paul 2017-11-07 + + Update some images/masks + +Blottiere Paul 2017-11-07 + + Re enable WMS server tests + +Alessandro Pasotti 2017-11-08 + + Removed unused code + +Nyall Dawson 2017-11-08 + + Immediately set focus on name line edit after clicking "new projection" + + Since it's most likely the very next thing the user wants to edit + +Nyall Dawson 2017-11-08 + + When testing custom projections, show geographic results in degrees not radians + + Fixes #7036 + +Nyall Dawson 2017-11-08 + + Make custom projections dialog a bit more user friendly + + ...by updating the list immediately when changes are made to the + current projection's name or definition. Previously the list + was only updated when a new item in the list was clicked, but that + made it appear as though the current changes were not applied + immediately and left users looking for a "save" button to actually + lock-in their changes. + + By updating the list immediately we make it obvious that the + changes apply immediately and no further action is required (except + for hitting OK on the dialog!) + +Nyall Dawson 2017-11-08 + + Move 'copy crs' button to more logical place in dialog + + Since the copy is actually copying the definition OVER the + current crs definition (as opposed to adding a NEW custom + crs with the copied definition), it should sit next to the + definition box and not in the same space as the add crs + button. + +Nyall Dawson 2017-11-08 + + Fix bad logic in custom projections dialog (fixes #17258) + +Nyall Dawson 2017-11-08 + + More use of unique_ptrs to simplify sqlite3 memory management + +Juergen E. Fischer 2017-11-07 + + followup a1024905b + +Nyall Dawson 2017-11-08 + + Safer sqlite3 memory management using unique_ptr subclass + +Merge: 4677026c3e c315eb3f6a +Borys Jurgiel 2017-11-07 + + Merge pull request #5547 from borysiasty/stickytabs2 + + Make some QgsOptionsDialogBase's slots virtual + +Merge: cb8fc6860d a8f46652d4 +Borys Jurgiel 2017-11-07 + + Merge pull request #5532 from borysiasty/nopreloading + + [Plugin manager] [needs-doc] Don't preload all plugins for a test + +Nyall Dawson 2017-11-08 + + Minor cleanups + +Nyall Dawson 2017-11-08 + + More formatting standardisation + +Nyall Dawson 2017-11-08 + + This isn't Fischer-Price "my first c++ program" + +Nyall Dawson 2017-11-08 + + Fix gross indentation format + +Juergen E. Fischer 2017-11-07 + + about translators: grey background, centered flags, replace flag for german + +Juergen E. Fischer 2017-11-07 + + fix windows warnings + +Juergen E. Fischer 2017-11-07 + + fix override warning + +Alessandro Pasotti 2017-11-07 + + Typo + +Tom Elwertowski 2017-11-07 + + macOS needs to include spatialindex before geos. + + If both are on separate paths and geos is first, case-insensitive macOS will include (geos) spatialIndex.h instead of SpatialIndex.h + +Alessandro Pasotti 2017-11-07 + + Test for relative/absolute paths in projects + +Alessandro Pasotti 2017-11-07 + + [bugfix] Pass QgsReadWriteContext into project XML r/w + + Or we miss the path resolver and we do not read/write + relative paths correctly + + Fixes #17116 + +David 2017-11-07 + + References #17412 Fixes problem when changeing sort but not when renaming + When sort and then toggle edditing, the problem was that it wanted to rename all the fields + Whis is avoided now by checking the indexes + But still problems open when one wants to rename fields in unsorted layout + +Merge: 07cef67ead 80ea446d0e +Matthias Kuhn 2017-11-07 + + Merge pull request #5555 from m-kuhn/fixRepresentValue + + Fix represent value + +Matthias Kuhn 2017-11-07 + + Make text translatable + +Matthias Kuhn 2017-11-07 + + Add test + +Matthias Kuhn 2017-11-07 + + Fix single parameter version of represent_value + + Fix #17407 + +David 2017-11-07 + + editable and lable on top + fixes + in attribute form properties: editable and lable on top config to general + fix: in case that somebody deletes a field on sourcedata and then wants to change config on it in attribute - it's now disabled (but not updated) + fix: if adding new attribute after adding a virtual one, the display of the list was wrong (value of virtual in non-virtual row) - now it reloads the table correctly + +Matthias Kuhn 2017-05-12 + + Fix freeze when joining with table open + + Fix #16495 + +Matthias Kuhn 2017-11-07 + + Respect default values in N:M relations + +Merge: a22e565dc2 98f7508781 +Matthias Kuhn 2017-11-07 + + Merge pull request #5476 from tudorbarascu/move_feature + + Move Feature tooltip that guides the user towards Node Tool if s(h)e wants snapping + +Tudor Bărăscu 2017-11-07 + + better wording + +Merge: bb36fa7f48 2523d7351c +Alessandro Pasotti 2017-11-07 + + Merge pull request #5552 from elpaso/vector_layer_safe_cast + + [bugfix] Prevent a bad crash when provider is wrong + +Alessandro Pasotti 2017-11-07 + + [bugfix] Prevent a bad crash when provider is wrong + + Fixes #17155 + +Alessandro Pasotti 2017-11-07 + + [bugfix] Use QgsApplication.authManager() + + instead of the old singleton + +Merge: c000cb86ca b57ec46aa0 +Alessandro Pasotti 2017-11-07 + + Merge pull request #5546 from elpaso/auth_migrate + + [auth][bugfix] Auth DB migrate + +Merge: e9e7740db9 36b58a8cdd +Nyall Dawson 2017-11-07 + + Merge pull request #5434 from nyalldawson/layout_next2 + + [layouts] Port item type from composer + +Merge: edea38f7c7 bf75747f18 +Nyall Dawson 2017-11-07 + + Merge pull request #5544 from nyalldawson/proc_api + + [processing] Improve api handling for provider format support + +Nyall Dawson 2017-11-07 + + [processing] Use user-set default file formats if supported by + provider, otherwise fall back to a format which IS supported + by that provider + +Nyall Dawson 2017-11-07 + + Fix duplicated return + +Nyall Dawson 2017-11-07 + + Update for changes in API + +Nyall Dawson 2017-10-25 + + Fix more tests + +Nyall Dawson 2017-10-24 + + Fix doxygen warning + +Nyall Dawson 2017-10-24 + + Fix failing tests + +Nyall Dawson 2017-10-24 + + Add missing docs + +Nyall Dawson 2017-10-24 + + Add missing override + +Nyall Dawson 2017-10-24 + + Allow adding multiple layers to legend at once + +Nyall Dawson 2017-10-24 + + More command compression for legend items + +Nyall Dawson 2017-10-24 + + Serialization for legend items + +Nyall Dawson 2017-10-24 + + Port legend item + +Nyall Dawson 2017-10-24 + + Restore ui for configuring labels + +Nyall Dawson 2017-10-24 + + Start porting label item + +Nyall Dawson 2017-10-24 + + Fix undo/redo of newly added maps + +Nyall Dawson 2017-10-24 + + After a undo/redo action occurs, select the affected items + +Nyall Dawson 2017-10-24 + + Restore serialization for map items + +Nyall Dawson 2017-10-23 + + Restore serialization of picture items + +Nyall Dawson 2017-10-23 + + Add a unit test + +Nyall Dawson 2017-10-23 + + Port picture item + +Nyall Dawson 2017-10-23 + + Fix grid annotations, port tests + +Nyall Dawson 2017-10-23 + + Use symbol buttons for grid symbols + +Nyall Dawson 2017-10-23 + + Cleanup undo strings + +Nyall Dawson 2017-10-23 + + Start work on porting grid ui + +Nyall Dawson 2017-10-23 + + Fix crash on exit when layout designer open + +Nyall Dawson 2017-10-21 + + Tweak default symbol for overviews + +Nyall Dawson 2017-10-21 + + Use symbol button for overview frame symbol + +Nyall Dawson 2017-10-21 + + Update map overview when linked map rotation changes + +Nyall Dawson 2017-10-21 + + Expand unit tests for QgsLayoutItemComboBox + +Nyall Dawson 2017-10-21 + + Work on resurrecting overviews + +Nyall Dawson 2017-10-21 + + Start restoring grids/overviews + +Nyall Dawson 2017-10-21 + + Working move item content tool + +Nyall Dawson 2017-10-21 + + Fix map item widget properties updating + +Nyall Dawson 2017-10-21 + + Fix updating map extent on resize + +Nyall Dawson 2017-10-21 + + Add method to create QgsRectangle from center and size + +Nyall Dawson 2017-10-21 + + Fix regeneration of cached maps when zoom level changes + +Nyall Dawson 2017-10-21 + + Fix double ownership issue causing crash when deleting layouts + +Nyall Dawson 2017-10-20 + + Start hooking up map widget gui + +Nyall Dawson 2017-10-20 + + Start porting map item + +Nyall Dawson 2017-10-20 + + Add export layer settings to QgsLayoutContext + +Nyall Dawson 2017-10-18 + + Prepare for map item porting + +Nyall Dawson 2017-10-18 + + Allow cancelation of polygon/polyline creation + +Nyall Dawson 2017-10-18 + + [layouts] Fix polyline does not render purely horizontal/vertical lines + +Nyall Dawson 2017-10-18 + + Fix correct frame bounding rects for shapes and node items + +Nyall Dawson 2017-10-17 + + Exclude selected nodes item when snapping during node move + +Nyall Dawson 2017-10-17 + + Port more node tool actions + +Nyall Dawson 2017-10-17 + + Start work on node edit tool + +Nyall Dawson 2017-10-17 + + Add config widget for polygon/polyline items + +Nyall Dawson 2017-10-17 + + Add tools to create node based items + +Nyall Dawson 2017-10-17 + + Port snappedAngle from composer + +Nyall Dawson 2017-10-17 + + Port polygon and polyline items to layouts + +Nyall Dawson 2017-10-17 + + Fix layout items appear in random order in gui + +Nyall Dawson 2017-10-17 + + Add configuration widget for shapes + +Nyall Dawson 2017-10-16 + + Cleanup item xml read/write, save shape properties + +Nyall Dawson 2017-10-16 + + Fix tests + +Nyall Dawson 2017-10-16 + + Refactor layout item gui registry to allow metadata for duplicate item types + + This allows registration of item creation actions which create + items with an existing item type, but custom creation functions. + + E.g. allowing actions for creation of ellipse/triangles/etc + from a single layout item type. + +Nyall Dawson 2017-10-16 + + More shape porting + +Nyall Dawson 2017-10-16 + + Restore tests, add button to set page background in ui + +Nyall Dawson 2017-10-16 + + Revert automatic detection for preview renders + + Turns out there's no reliable way to differentiate widget + vs QImage based renders inside QGraphicsItems + +Nyall Dawson 2017-10-16 + + Start work on exporter for layouts + +Nyall Dawson 2017-10-16 + + [layouts] Nicer detection of rendering in a view + + In compositions, a flag must be explicitly set to indicate + whether the render occuring is for "previews" (i.e. + rendering in a graphics view) or outputs (i.e. rendering + to a image/pdf/other destination device) + + This isn't nice api. + + So we avoid this by checking the paint device type when + an item is being rendered. + +Nyall Dawson 2017-10-13 + + Fix resizing with mouse handles acts strangely when items have frames + +Nyall Dawson 2017-10-13 + + Work on functional rotation for items + +Nyall Dawson 2017-10-13 + + Add refresh action for layouts + +Nyall Dawson 2017-10-11 + + After creating an item with the add item tool, switch immediately to select tool + +Nyall Dawson 2017-10-11 + + Port item opacity handling from composer + +Nyall Dawson 2017-10-11 + + Port 'exclude from exports' functionality from composer + +Nyall Dawson 2017-10-11 + + Port item blend mode support to layouts + +Nyall Dawson 2017-10-11 + + Add a signal to QgsLayoutContext when flags change + +Nyall Dawson 2017-10-10 + + Add a shortcut menu to items panel, with option to show + item properties + + Refs #11581 + +Nyall Dawson 2017-10-10 + + Add item properties to context menu + +Nyall Dawson 2017-10-10 + + Small tweaks to selection behavior + +Nyall Dawson 2017-10-10 + + Fix resize of grouped items with non-top left reference points + +Nyall Dawson 2017-10-10 + + When selecting a different item, but the item is the same + type of item, just update the existing panel to show the new + item's properties + + This means that flicking between selecting items of the same + type will not create a new properties widget, so scroll + bar positions, focused widgets, etc are all maintained. + + Makes using layouts less annoying. + +Nyall Dawson 2017-10-10 + + Avoid temporary no-selection state when selecting a new item + in layouts using mouse interactions + +Nyall Dawson 2017-10-10 + + Fix resizing items with non-top-left reference point using mouse handles + +Nyall Dawson 2017-10-10 + + Handle position and size with units and ratio lock in item properties + +Nyall Dawson 2017-10-10 + + Allow reseting ratio manually for linked ratio lock buttons + +Nyall Dawson 2017-10-10 + + If the same item is reselected in a layout, don't create a new + properties widget for it + + Because if we do annoying things happen, like loss of focused + widget and scroll bar position + +Nyall Dawson 2017-10-10 + + Start porting item properties widget + +Nyall Dawson 2017-10-10 + + Move population of layout gui registry from GUI->app + + Since we don't want all the item type subclass config widgets + to have to reside in gui, we need to populate the registry + from app instead. + +Merge: e3f3499712 5b9283fcb9 +Nyall Dawson 2017-11-07 + + Merge pull request #5542 from nyalldawson/auth_manager_instance + + Fix crashes when no QgsApplication instance is available + +Merge: cc59ee448c 5ebd3983fd +Nyall Dawson 2017-11-07 + + Merge pull request #5541 from nyalldawson/thread_local + + Don't use thread_local on mingw or OpenBSD builds + +Nyall Dawson 2017-11-07 + + More build fixes + +Nyall Dawson 2017-11-07 + + Mingw fixes + +Nyall Dawson 2017-11-07 + + FreeBSD has thread_local support + +Nyall Dawson 2017-11-07 + + Fix build + +Nyall Dawson 2017-11-07 + + Use local statics + +Merge: ac1db7e605 71b9c77b90 +Nyall Dawson 2017-11-07 + + Merge pull request #5536 from lbartoletti/freebsd_build + + Fix FreeBSD build + +Juergen E. Fischer 2017-11-06 + + add SVG translation flags + +David 2017-11-06 + + item for source field fix + +David 2017-11-06 + + layout and remove fieldproperties + icons and made naming + inputs from the pull request + remove old fieldpropertie-stuff + +Borys Jurgiel 2017-11-06 + + Reimplement QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged in derived classes rather than duplicate it + +Borys Jurgiel 2017-11-06 + + Missing docstrings + +Alessandro Pasotti 2017-11-06 + + getter return not-const list of errors + +Borys Jurgiel 2017-11-06 + + Rename indx to index in some slots + +David 2017-11-06 + + help and suppress form + help from attributetypedialog is handled over the help of vectorlayerproperties + suppress form combo takes the default value from the settings + fixed troubles on loading gui + +Alessandro Pasotti 2017-11-06 + + const range loop iterators + +Borys Jurgiel 2017-11-06 + + Make QgsOptionsDialogBase's slots virtual for overriding in derived clases with non-standard tabs (fixes broken tab behaviour in Plugin manager) + +David 2017-11-06 + + fixed problem with saving first entry + +David 2017-11-06 + + some changes in attribute form properties and source data properties + changed style of layout, initcode and suppress-combo + display read only comment + fixed saving of wfs + improved layout + some tooltips + +Alessandro Pasotti 2017-11-06 + + Minor change: QString -> QStringLiteral in some debug messages + +Alessandro Pasotti 2017-11-06 + + [auth][bugfix] Migrate qgis-auth.db from QGIS 2 to 3 + + Fixes #17403 + +Alessandro Pasotti 2017-11-06 + + [auth][bugfix] Add a getter for error list on qgsmigrate + +Borys Jurgiel 2017-11-06 + + [Plugin manager] Fix window title + +Merge: ee59abf030 67dc3187f9 +Matthias Kuhn 2017-11-06 + + Merge pull request #5533 from DelazJ/pluginlist + + [bugfix]Remember the c++ plugins folders in Options dialog + +Nathan Woodrow 2017-11-06 + + Improved out of process crash handler (#5543) + + * Add out of process crash handler for better crash handling. + +Nyall Dawson 2017-11-06 + + Restrict available formats when running algorithms to those supported + by the provider + +Nyall Dawson 2017-11-06 + + [processing] Allow providers to determine default vector/raster file + to use for their algorithm's parameters + + Because some providers do not have support for all output types, + we need to give providers a way to restrict the default format + choices to those which are supported by the provider. + +Nyall Dawson 2017-11-06 + + Allow access to parent algorithm for processing parameters + +Nyall Dawson 2017-11-06 + + Add missing QCoreApplication for TestQgsNoApplication + +Nyall Dawson 2017-11-06 + + Fix crash when accessing QgsApplication::dataItemProviderRegistry() + without QgsApplication instance. + + Also add test to ensure that calling QgsApplication::initQgis() + is safe to do without QgsApplication instance. + +Nyall Dawson 2017-11-06 + + Fix crash when accessing auth manager when no QgsApplication is available + +Nyall Dawson 2017-11-06 + + Don't use thread_local on mingw or OpenBSD builds + + MingW has broken support for thread_local, so force disabling it + see + https://sourceforge.net/p/mingw-w64/bugs/445/ + https://sourceforge.net/p/mingw-w64/bugs/527/ + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80816 + + also OpenBSD has no thread_local support, see https://issues.qgis.org/issues/17351 + + So on these platforms we fall back to using QThreadStorage. + + Fixes #17351 + +Sandro Santilli 2017-11-05 + + Add Matrix as a way to get in touch with community for chat (#5147) + +Merge: bfe035536a 2df5332409 +Nyall Dawson 2017-11-06 + + Merge pull request #5534 from nyalldawson/format + + Add flags to QgsVectorFileWriter methods which return lists of drivers + +Matthias Kuhn 2017-11-05 + + Disable flaky PyQgsServerAccessControl test + +Theuns 2017-10-07 + + Fix build using mingw + + Changes many #if defined (Q_OS_WIN) to #ifdef _MSC_VER, where + they relate specifically to msvc compiler + +Nyall Dawson 2017-11-06 + + Optimise QString equality tests + +Matthias Kuhn 2017-11-05 + + Update for nose2 0.7.0 + +Harrissou Sant-anna 2017-11-05 + + Rename CONTRIBUTE.md to CONTRIBUTING.md + +Nyall Dawson 2017-11-06 + + Add option to hide non-spatial formats from driver lists + + And hide non-spatial formats from geometry checker available formats + +Harrissou Sant-anna 2017-11-05 + + [Bugfix] Enable adding color in Options->Color tab + +Nyall Dawson 2017-11-06 + + More QPair API removal + +Nyall Dawson 2017-11-06 + + Avoid use of QPair and instead use a struct + +Nyall Dawson 2017-11-05 + + Remove redundant '[OGR'] string from dialogs + +Nyall Dawson 2017-11-05 + + Add flags to QgsVectorFileWriter methods which return lists of drivers + + Initially only flag available is whether to sort drivers by + recommended order. The recommended order puts GPKG first and + SHP second, then leaves the rest alphabetical. + + This fixes a few instances in the QGIS gui where these recommended formats + are not listed first. + +Nyall Dawson 2017-11-06 + + Fix build + + Followup 24e6366, readd missing flag + +Juergen E. Fischer 2017-11-05 + + mod_spatialite added to osgeo4w + +lbartoletti 2017-11-05 + + Fix FreeBSD build + + On FreeBSD, I need to change `selectedFilter = fileDialog- + >selectedFilter();` to `selectedFilter = fileDialog- + >selectedNameFilter();` + + I think it's a reliquat of Qt4 since Qt5 doesn't have this method + anymore. + +Harrissou Sant-anna 2017-11-05 + + Add some const and renaming + +Larry Shaffer 2017-11-05 + + Update PyQtMacros module to handle removal of name option from pyrcc5 + +Harrissou Sant-anna 2017-11-05 + + Remove Q_FOREACH and 'my' prefix for variable + +Harrissou Sant-anna 2017-11-05 + + Remove some Q_FOREACH + +Médéric RIBREUX 2017-11-05 + + Improve input detection and add new algorithms + +Médéric RIBREUX 2017-11-05 + + Support multiple output file raster formats: + * A new createopt textbox has been added to the parameters dialog for algorithms which exports to raster files. + * A new metaopt textbox has also been added to the Algorithm parameters dialog. + * Raster file format is detected from output filename extension. + * GdalUtils has been improved to correctly detect raster formats supported for creation. + * QFileDialog for output rasters now display only file filters for supported output raster file formats. + +Nyall Dawson 2017-11-05 + + Silence warning + +Harrissou Sant-anna 2017-11-04 + + [bugfix]Remember the c++ plugins folder in Options dialog + + and enable the remove button + +Borys Jurgiel 2017-11-04 + + [Plugin manager] Remove dead code + +Borys Jurgiel 2017-11-04 + + [Plugin manager] [needs-doc] Don't preload plugins for a test if they are broken. That function slowed down QGIS startup + +Médéric RIBREUX 2017-11-04 + + * Add new GRASS 7.2 algorithms. + * Fix ParameterRange GUI. + * Fix Multiple values Enum support. + +Larry Shaffer 2017-11-04 + + Fix updating QgsApplication::libraryPaths; load before any Qt plugin use + + Previously, it was happening after setting the default window icon. + + For macOS, refactor libraryPaths update to ensure both QT_PLUGIN_PATH + and qt.conf are properly honored (fixes 4.5 year old bug), with + prioritization of qgis libs or libs shipped with .app bundle. + +Harrissou Sant-anna 2017-11-04 + + [Geometry Checker] Improve displayed messages by indicating the layer to fix + +Harrissou Sant-anna 2017-11-03 + + [Geometry Checker] Use a more readable format list + + and save file format in settings + +Médéric Ribreux 2017-10-26 + + Improve GRASS provider: + - Improve GRASS detection for all OS. + - Use GRASS --exec command. + - Unified GRASS batch job method for all OS (easier to maintain). + - Handle MS-Windows codepages (for data only, if you have a username with special characters, it will not work). + - Better support for filepath normalization. + - add -m option to r.out.gdal. + +Médéric RIBREUX 2017-10-25 + + Fix cz function + +Médéric RIBREUX 2017-10-25 + + Support directory output via QgsProcessingParameterFolderDestination + +Médéric RIBREUX 2017-10-23 + + Fix indentation + +Médéric RIBREUX 2017-10-22 + + Modify Grass7 detection + +Médéric RIBREUX 2017-10-22 + + Fix layers loading... + +Médéric RIBREUX 2017-10-22 + + Massive conversion + +Médéric Ribreux 2017-09-14 + + Improve ext scripts and support OutputFolder + +Médéric RIBREUX 2017-09-12 + + First work on ext mechanism factorisation + +Médéric Ribreux 2017-09-11 + + Improve cell size detection and FileDestinationOutput (but not perfect) + +Médéric Ribreux 2017-09-08 + + (WIP) better cellsize suport + +Médéric Ribreux 2017-09-07 + + Improve MultiLayers and FileDestination support + +Médéric Ribreux 2017-09-07 + + First working raster algorithm + +Médéric Ribreux 2017-09-06 + + First functional version (for single vector inputs/outputs) + +Médéric Ribreux 2017-09-05 + + Finish fixing description files (no more errors on startup) + +Médéric Ribreux 2017-09-05 + + Fix some other description files + +Médéric Ribreux 2017-09-04 + + (WIP) Grass algorithms can be opened and inputs are treated + +Médéric RIBREUX 2017-09-03 + + Handle parameters and update description files (WIP) + +Médéric Ribreux 2017-09-01 + + (WIP) enable Grass7 provider and start to work on QgsProcessing new framework + +Médéric Ribreux 2017-08-31 + + Update TODO list + +Matthias Kuhn 2017-11-04 + + Add missing import for test + +Matthias Kuhn 2017-11-04 + + Disable talkative wms server test + +Matthias Kuhn 2017-11-03 + + [travis] Enable server tests + +Matthias Kuhn 2017-11-04 + + Avoid using extended unicode in source files + + Hopefully fixes Windows issues with those + +Merge: 33d422b4de a2e306e563 +Alessandro Pasotti 2017-11-04 + + Merge pull request #5217 from KentPorter-Boundless/master + + New icon for Data Source Manager button + +Kent Porter 2017-11-03 + + Added approved icon for Data Source Manager. + +Merge: fb7f8f17f7 61fa8da82a +Nyall Dawson 2017-11-04 + + Merge pull request #5518 from nyalldawson/interp + + Start on unit tests for interpolation classes + +Borys Jurgiel 2017-11-03 + + [Plugin installer] Fix broken warning about outdated plugin updates in the user directory masking a newer core version + +Merge: c177995eb7 479970baf0 +Blottiere Paul 2017-11-03 + + Merge pull request #5414 from m-kuhn/transactionStack + + Deal with failure to create savepoint + +Matthias Kuhn 2017-10-20 + + Do not crash if there is no savepoint + +Alessandro Pasotti 2017-11-03 + + Disable PG auth tests + +gacarrillor 2017-11-03 + + Developers map: remove Name and Status terms + +Alessandro Pasotti 2017-11-03 + + [auth] Tests for Basic method uses trusted CAs + +Alessandro Pasotti 2017-11-03 + + [bugfix][auth] Basic method uses trusted CAs when connecting to DB + + Fixes #17392 + +gacarrillor 2017-11-03 + + Developers map: Link to GIT account for each dev + +gacarrillor 2017-11-03 + + Developers map: more descriptive status for each dev + +David 2017-11-01 + + duplicate feature default action if feature id given, then only copy one feature otherwise all selected on layer + +David 2017-10-31 + + visibility of the new duplicate selected feature default action + +David 2017-10-31 + + Default Action with Python to Duplicate selected features. Visible for canvas and layer scope. + +Alessandro Pasotti 2017-11-03 + + Added QgsApplication::authManager() to API break docs + +Juergen E. Fischer 2017-11-03 + + crash fix + +Juergen E. Fischer 2017-11-03 + + silence astyle version check + +Matthias Kuhn 2017-11-02 + + Fix crash with hidden dock widget + + Fixes #17357 + Fixes #17279 + Fixes #17317 + +Nyall Dawson 2017-11-03 + + Start on unit tests for interpolation classes + +Nyall Dawson 2017-11-03 + + Simplify interpolation API + + Don't require both pixel size and row/col count in constructor, + since we can calculate the pixel size from the extent and row/column + count. + +Merge: 151fb08734 b36dd121d3 +Nyall Dawson 2017-11-03 + + Merge pull request #5512 from nyalldawson/interp + + Cleanup and optimise interpolation code + +Nyall Dawson 2017-11-03 + + Fix build + +Nyall Dawson 2017-11-03 + + QgsTINInterpolator->QgsTinInterpolator + +Nyall Dawson 2017-11-03 + + Remove redundant interpolation classes + +Nyall Dawson 2017-11-03 + + Update Python code + +Nyall Dawson 2017-11-03 + + Tighten API + +Nyall Dawson 2017-11-03 + + Remove fragile and inefficient wkb re-parsing from TIN interpolator + +Nyall Dawson 2017-11-03 + + More flexible API for interpolation + + E.g. adds API support for interpolating by m value + +Nyall Dawson 2017-11-02 + + Update python code + +Nyall Dawson 2017-11-02 + + Update api break docs + +Nyall Dawson 2017-11-02 + + Cleanup interpolation code + +Nyall Dawson 2017-11-02 + + Greatly simplify and optimise interpolation code, correct handling of + Z/M dimensioned geometries + +Nyall Dawson 2017-11-02 + + Use QgsFeatureSources instead of QgsVectorLayer for interpolation + source layers + +Nyall Dawson 2017-11-02 + + Standardise enum capitalization and formatting + +Nyall Dawson 2017-11-02 + + Pass QgsFeedback to methods in interpolation for more responsive + cancelation and progress reports + +Merge: ac12258e11 4b6228d81e +Borys Jurgiel 2017-11-02 + + Merge pull request #5511 from borysiasty/settings + + Move plugin installer's settings to the [app] section + +Juergen E. Fischer 2017-11-02 + + * include python runtime dependencies in INSTALL (followup e9d2fd67) + * also update INSTALL.html (run t2tdoc target; followup 8dfa0217d) + +David 2017-11-02 + + basics of new dialog for the initcode python functionalities + means, some cosmetic changes should still be done in qgsattributesforminitcode.ui + +Régis Haubourg 2017-11-02 + + fixup ccache install instruction in doc files using txt2tags + +Matthias Kuhn 2017-11-02 + + Fix relation reference widget model out of sync + + Causes crashes in some situations + +David 2017-11-02 + + attribute editor layout selection etc. + +Juergen E. Fischer 2017-11-02 + + translation string fixes + +David 2017-11-01 + + set feature when starting action on attribute edit form + +Borys Jurgiel 2017-11-02 + + Move plugin installer's settings to the [app] section + +David 2017-11-02 + + final relation cardinality combobox + +Juergen E. Fischer 2017-11-02 + + disable translation of mime types in raster layer properties + +Matthias Kuhn 2017-10-20 + + Log when savepoint creation fails + +Werner Macho 2017-11-02 + + Update tsstat.pl + + fix small typo + +Merge: 5d2c39bbfb 2d30c1156f +Borys Jurgiel 2017-11-01 + + Merge pull request #5509 from borysiasty/settings + + Remove dead code + +Matthias Kuhn 2017-11-01 + + Add doxymentation + +Matthias Kuhn 2017-11-01 + + Fix abstract MOCed class generation + +Matthias Kuhn 2017-11-01 + + Const fixes for QgsSearchWidgetWrapper + +Matthias Kuhn 2017-11-01 + + MOC compatible SIP_ABSTRACT version + + New version supports the following notation + + class QgsOutClass : public QObject // SIP_ABSTRACT + + MOC does not like lines like the following one and silently refuses to build the meta object for such classes + + class QgsOutClass : public QObject SIP_ABSTRACT + +Matthias Kuhn 2017-11-01 + + Make text translatable + +Merge: ac6c598f32 a87cde271b +Nyall Dawson 2017-11-02 + + Merge pull request #5508 from DelazJ/message_spacing + + Fixing messages displayed in GUI + +Borys Jurgiel 2017-11-01 + + Remove dead code + +Merge: 77de9fc5ce e9d2fd676d +Borys Jurgiel 2017-11-01 + + Merge branch 'master' of github.com:qgis/QGIS + +Juergen E. Fischer 2017-11-01 + + add qt5-default to debian/ubuntu dependency list in INSTALL + +Nyall Dawson 2017-11-01 + + More unit tests + +Nyall Dawson 2017-11-01 + + [ogr] Also discard features with empty geometries + when feature request specifies a filter rect + + OGR sometimes returns a feature with empty geometry (e.g. + a multipolygon with a polygon child with no rings) even when + OGR_L_SetSpatialFilterRect has been set for the layer. + + Refs #17365 + +Nyall Dawson 2017-11-01 + + Fix crash when attempting to render multipolygon with missing exterior ring + + This commit fixes a possible crash when the vector layer renderer + attempts to render a multipolygon containing a polygon without + an exterior ring. + + The underlying cause of the creation of this invalid geometry is deeper, + but this commit hardens the renderer and makes it more robust for + handling bad geometries. + + Fixes #17365 + +Juergen E. Fischer 2017-10-29 + + remove remaining references to pyspatialite (followup 39816cf84) + +lbartoletti 2017-10-31 + + Fix issue 17355 + +Juergen E. Fischer 2017-11-01 + + fix windows build + +Mathieu Pellerin 2017-11-01 + + make use of the pin icon in recent projects menu + +Merge: 48d43d37ed d09331e483 +Nyall Dawson 2017-11-01 + + Merge pull request #5482 from rduivenvoorde/create_WITH_CLANG_TIDY-take2 + + adding WITH_CLANG_TIDY as advanced, so you can build without it even … + +Merge: 8b7fd5428f 0b2de85fe7 +Nyall Dawson 2017-11-01 + + Merge pull request #5497 from nyalldawson/svg_crash + + Fix crashes and issues with SVG rendering + +Sandro Mani 2017-10-31 + + [Globe] Port for QgsGeometry::constGet API changes + +Luigi Pirelli 2017-10-24 + + Update Attr Table after field calculation: fixes #17312 + +lbartoletti 2017-10-31 + + Fix connection + +Matthias Kuhn 2017-10-29 + + Harden taskmanager tests + + By using local variables and functions interdependency of the tests is decreased + +Merge: 9a1cd9dde7 05ad0bc04a +Nyall Dawson 2017-10-31 + + Merge pull request #5488 from nyalldawson/network + + [processing] Fix some issues with network analysis shortest path algs + +nirvn 2017-10-31 + + [welcome page] avoid vertical shift when pinning/unpinning projects + +Nyall Dawson 2017-10-31 + + Update API break dox + +Nyall Dawson 2017-10-31 + + Update copyright date + +Nyall Dawson 2017-10-30 + + More test tolerance + +Nyall Dawson 2017-10-30 + + Fix tests + +Nyall Dawson 2017-10-30 + + [processing] Misc fixes for network analysis tools + + Also maintain attributes in service area from layer alg, add test + + Fixes #17325 + +Nyall Dawson 2017-10-30 + + Fix QgsGraphAnalyzer::dijkstra traverses through edges backwards + + This means that it flips the direction of the graph edge, breaking + route restrictions. + + Refs #17325 + +Nyall Dawson 2017-10-30 + + Fix incorrect enum values in network analysis algs + + Didn't result in a bug, but made the code confusing to read + +Nyall Dawson 2017-10-30 + + Fix broken network analysis network tolerance option + + The tolerance option was not correctly calculated, resulting in + semi-random behavior for networks which relied on a non-zero + tolerance. + + Also possible speed boost for complex networks by using + proper spatial index instead of custom sorting/filtering code. + + Refs #17325 + +Nyall Dawson 2017-10-29 + + Optimise and simplify tie point calculation + +Nyall Dawson 2017-10-29 + + Simplify overly complex code + +Nyall Dawson 2017-10-29 + + Fix extremely confusing network graph API naming + + Since names of api calls were backwards to expectations + +Nyall Dawson 2017-10-29 + + Start unit tests for network analysis lib + +Nyall Dawson 2017-10-28 + + [processing] Shortest path handling for multipoint layers + + Fixes shortest path algorithms fail for multipoint source layers + or layers with null geometries + + Refs #17325 + +Nyall Dawson 2017-10-28 + + Better reporting of errors when paths cannot be found, also + output point but with no geometry and missing attributes so + that it's clear which points could not be linked + +Nyall Dawson 2017-10-28 + + [processing] Keep attributes from start/end points layer in + output layer for shortest path algorithms + + Otherwise the paths are nearly impossible to link back to + the source layer for further analysis + +Nyall Dawson 2017-10-28 + + Fix index out of range error in shortest path algs + +nirvn 2017-10-31 + + [welcome page] reverse chronological order for pinned projects + +Nyall Dawson 2017-10-31 + + Check file modified time when retrieving svg images from cache + + If file has been modified since the cache, regenerate a new cache + image. + + We don't want to check the file modified time too often though, + (e.g., we don't want to check for every point render in a 100k + point file), so use a hardcoded 30 second minimum time between + consecutive file modified checks. + + This means that file modifications occuring more often than + every 30 seconds won't be picked up till 30 seconds has elapsed + since the last modification. But at the same time it means that + if the render takes < 30 seconds we'll only check each svg + at most once (and if a render takes > 30 seconds, adding a few + more milliseconds won't hurt!). + + Fixes #13565 + +Nyall Dawson 2017-10-31 + + Cleanup QgsSvgCache API + + - Remove QgsSvgCacheEntry from public API (is an internal detail only) + - Modernize code + - Make protected QgsSvgCache members private, since this class is not + designed to be subclassed + +Nyall Dawson 2017-10-31 + + Fix crashes caused by concurrent rendering of cached QPictures from QgsSvgCache + + QgsSvgCache::svgAsPicture was rendering an implicitly shared copy when + the picture had already been cached. It turns out that rendering an + implicitly shared QPicture copy isn't thread safe, and rendering shared + copies simulataneously across different threads leads quickly to a crash. + + Accordingly we always detach the QPicture objects returned by + svgAsPicture, so that the returned QPicture is safe to use across threads. + + Also add unit tests for this, and a similar unit test to verify that + rendering of QImage based cached copies does *not* suffer the same + issue. + + Fixes #17089, #17077 + +Juergen E. Fischer 2017-10-30 + + translation string fixes + +Nyall Dawson 2017-10-30 + + Fix crash when rendering with SVG based symbols and SVG cache is filled + + When the svg cache was full, any attempt to render an svg from the + cache would crash QGIS. + + Fixes #16643 + +Nyall Dawson 2017-10-30 + + Fix use after free + +Nyall Dawson 2017-10-30 + + Remove unnecessary debug message + +Nyall Dawson 2017-10-30 + + Fix memory leaks + +Matthias Kuhn 2017-10-30 + + Fix building grass + +Matthias Kuhn 2017-10-30 + + Revert "Avoid recursion in feature filter model" + + This reverts commit a3eadd320f28249915db54a02bbde9140327c6e3. + +Matthias Kuhn 2017-10-30 + + Better typing for variables in configuration options + +Matthias Kuhn 2017-10-30 + + Fix proxy basic authentication setting + +Matthias Kuhn 2017-10-30 + + Avoid recursion in feature filter model + +Merge: 86d170be2e d2c1011a13 +Matthias Kuhn 2017-10-30 + + Merge pull request #5491 from m-kuhn/dropV2 + + Drop V2 suffix on all geometry classes + +Matthias Kuhn 2017-10-30 + + Convert missing from[Geometry]XY calls + +Matthias Kuhn 2017-10-30 + + Rename QgsGeometry::fromPoint to QgsGeometry::fromPointXY + + Also introduces the from[Geometry]XY for QgsGeometryFactory + +Matthias Kuhn 2017-10-30 + + Rename from[GeometryType] to from[GeometryType]XY + + - QgsGeometry::fromPoint() was renamed to fromPointXY() + - QgsGeometry::fromMultiPoint() was renamed to fromMultiPointXY() + - QgsGeometry::fromMultiPolyline() was renamed to fromMultiPolylineXY() + - QgsGeometry::fromPolygon() was renamed to fromPolygonXY() + - QgsGeometry::fromMultiPolygon() was renamed to fromMultiPolygonXY() + +Matthias Kuhn 2017-10-29 + + Adjust leftovers addPointsV2 to addPoints + +Matthias Kuhn 2017-10-29 + + Rename QgsGeometry.addPoints with XY / V2-less versions + +Matthias Kuhn 2017-10-29 + + More drop V2 suffix fixes + +Matthias Kuhn 2017-10-29 + + More V2 drop fixes + +Matthias Kuhn 2017-10-29 + + Various fixes to dropping V2 suffix + +Matthias Kuhn 2017-10-29 + + Document API breaks + +Matthias Kuhn 2017-10-29 + + Rename QgsMultiPolygonV2 to QgsMultiPolygon + +Matthias Kuhn 2017-10-29 + + Rename QgsMultiPointV2 to QgsMultiPoint + +Matthias Kuhn 2017-10-29 + + Rename QgsPolygonV2 to QgsPolygon + +Matthias Kuhn 2017-10-29 + + Optimize loop + +Matthias Kuhn 2017-10-29 + + Rename QgsMultiPolygon to QgsMultiPolygonXY + +Matthias Kuhn 2017-10-29 + + Rename QgsMultiPolyline to QgsMultiPolylineXY + +Matthias Kuhn 2017-10-29 + + Rename QgsMultiPoint to QgsMultiPointXY + +Matthias Kuhn 2017-10-29 + + Rename QgsPolygon to QgsPolygonXY + +Martin Dobias 2017-10-29 + + [server] Remove dead code + +Matthias Kuhn 2017-10-30 + + Fix astyle version check for 3.0 + +Harrissou Sant-anna 2017-10-30 + + Add configire to spelling check + +Harrissou Sant-anna 2017-09-29 + + Remove trusted status from Plugin Manager + +Matthias Kuhn 2017-10-28 + + Allow using system astyle + +David 2017-10-30 + + App doc and style changes + +Nyall Dawson 2017-10-30 + + Fix build + +Nyall Dawson 2017-10-30 + + Drop unused variable + +Juergen E. Fischer 2017-10-29 + + add loading of spatialite on windows and remove remaining references to + pyspatialite (followup 39816cf84) + +Borys Jurgiel 2017-10-29 + + [Plugin manager] remove depreciated and unused stuff + +Merge: cfba4c4d09 6415fad072 +Jürgen Fischer 2017-10-29 + + Merge pull request #5493 from gacarrillor/bye_pyspatialite + + Bye pyspatialite + +Juergen E. Fischer 2017-10-29 + + fix windows build + +gacarrillor 2017-10-29 + + Get rid of PySpatiaLite + +gacarrillor 2017-10-26 + + Use sqlite3 instead of pyspatialite for SpatiaLite connections + +Harrissou Sant-anna 2017-10-26 + + Remove the empty Description column from Interface Customization dialog + +Matthias Kuhn 2017-10-29 + + Remove unused include + +Matthias Kuhn 2017-10-29 + + Increase ccache size + +Matthias Kuhn 2017-10-29 + + Debug cache misses + +Matthias Kuhn 2017-10-29 + + Fix API typo + +Matthias Kuhn 2017-10-28 + + QgsTransaction.create expects layers, not ids + +Matthias Kuhn 2017-10-28 + + Decouple transaction handling from QgsProject + +Matthias Kuhn 2017-10-28 + + [postgres][test] Check QgsFeatureRequest.connectionTimeout flag + +Merge: 2c53ba9a0e e6e6189180 +Matthias Kuhn 2017-10-29 + + Merge pull request #5483 from m-kuhn/postgisEmptyValue + + [postgres] Distinguish empty and NULL values + +Matthias Kuhn 2017-10-29 + + We cannot test to insert NULL with NOT NULL constraints + +Matthias Kuhn 2017-10-28 + + [postgres][test] Assert NULL insert behavior + + 0 != '' != NULL + +Matthias Kuhn 2017-10-27 + + [postgres] Distinguish empty and NULL values + +Borys Jurgiel 2017-10-28 + + [Plugin manager][needs-docs] Update a tooltip to tell users they can also use file:// protocol for plugin repositories + +Even Rouault 2017-10-28 + + [askUserForOGRSublayers] Use layername= instead of layerid= when no ambiguity (#16135) + + Complementary fix to 1822b76c1a69418e44d7a1186e16f54d670267ad for the case + where a layer has mixed geometry types. + +David 2017-10-28 + + layout + +David 2017-10-28 + + style + +Merge: 88a80e6661 4b9898b662 +Larry Shaffer 2017-10-27 + + Merge pull request #5478 from boundlessgeo/auth-viable + + [auth][api] Remove deprecated QSslCertificate::isValid() + +Larry Shaffer 2017-10-27 + + [auth] Return immediate errors for null cert/key when validating bundle + +Larry Shaffer 2017-10-27 + + [auth] Integrate cert viable functions into auth system + +Larry Shaffer 2017-10-27 + + [auth][api] Remove deprecated QSslCertificate::isValid() + + Substitue QgsAuthCertUtils::certIsViable(cert), which checks similar + characteristics to old function, plus whether the cert is null. + +Martin Dobias 2017-10-27 + + [FEATURE] Range vertex selection in node tool + + This little feature makes it possible to select a range of vertices from one feature. + + It can be activated by pressing Shift+R - afterwards one needs to click start and final point + within a feature - this will selected all vertices between the two. + + The range selection can be cancelled anytime by right-click or by pressing Esc key. + + For closed curves (polygons), it is possible to switch to the "longer" way around the ring + by holding Ctrl while clicking the final point. + +Merge: 8ef715be15 b726ba2936 +Martin Dobias 2017-10-27 + + Merge pull request #5451 from wonder-sk/snap-indicators + + Snap indicators improvements + +Merge: 2fdf30c70d d64529f4ce +Alessandro Pasotti 2017-10-27 + + Merge pull request #5480 from boundlessgeo/auth_get_removal + + [api][auth] Removed get prefix from all getters in auth manager + +Merge: 4cde520248 bc982aee52 +Alessandro Pasotti 2017-10-27 + + Merge pull request #5232 from boundlessgeo/move_project_properties + + [needs-docs] KDE: Moved project properties menu item from settings into the projects menu + +Borys Jurgiel 2017-10-27 + + [Plugin manager][needs-doc] Read a CHANGELOG file in case the relevant metadata key is empty + +David 2017-10-27 + + spelling + +David 2017-10-27 + + Relation Combo + +David 2017-10-27 + + commit + +David 2017-10-27 + + commit + +David 2017-10-27 + + combobox for cardinality + +David 2017-10-27 + + Relation Cardinality config + +David 2017-10-27 + + relation properties + +Martin Dobias 2017-10-27 + + Change vertex marker to box and segment marker to double triangle + +Merge: 26bd6d722e 52896f5545 +mhugent 2017-10-27 + + Merge pull request #5466 from mhugent/maptip_geometry_optional + + [needs-docs] Make maptip and geometry attribute optional in featureinfo response + +Merge: dfaabdcf6e 1592cccf60 +mhugent 2017-10-27 + + Merge pull request #5435 from mhugent/wms_print_layers + + [needs-docs][feature] Wms print layers + +Merge: c9ca17560b 98c05ade42 +Blottiere Paul 2017-10-27 + + Merge pull request #5425 from pblottiere/server_getfeatureinfo + + [server][bugfix] Consider QUERY_LAYERS as valid layers in GetFeatureInfo + +Tudor Bărăscu 2017-10-27 + + Move Feature tooltip that guides towards Node Tool for snapping + +Merge: 0ec041d4cd c9ca17560b +lbartoletti 2017-10-27 + + Merge branch 'master' into usr_bin_env + +Merge: be8b9113c2 c9ca17560b +lbartoletti 2017-10-27 + + Merge branch 'master' into usr_bin_env + +Matthias Kuhn 2017-10-27 + + Less debug noise + +Marco Hugentobler 2017-10-27 + + Add test for maptip + +Matthias Kuhn 2017-10-27 + + Fix crash when accessing out of bounds field + +Richard Duivenvoorde 2017-10-27 + + adding WITH_CLANG_TIDY as advanced, so you can build without it even if installed + +Alessandro Pasotti 2017-10-27 + + [api][auth] Removed get prefix from all getters in auth manager + +Marco Hugentobler 2017-10-27 + + Try to make travis indentation check happy + +Blottiere Paul 2017-10-20 + + Add test + +Blottiere Paul 2017-10-20 + + Add QUERY_LAYERS to available layers in GetFeatureInfo request + +Merge: 6829a92e79 8562bfa9b9 +Blottiere Paul 2017-10-27 + + Merge pull request #5406 from pblottiere/bugfix_server_hex + + [server][bugfix] Fix parameter decoding with post method and urlencoded + +David 2017-10-27 + + Relation Cardinality without own gui + +Merge: b0ee642556 e38bd650cb +Matthias Kuhn 2017-10-27 + + Merge pull request #5468 from m-kuhn/unobtrusiveConstraints + + [FEATURE] Make constraint reporting less obtrusive + +nirvn 2017-10-25 + + [offset curve tool] fix tool only working once + +nirvn 2017-10-25 + + [offset curve tool] ensure snapping is enabled when selecting feature + +nirvn 2017-10-27 + + [welcome page] preserve pinned status when saving project + +David 2017-10-27 + + relationconfig + +Nathan Woodrow 2017-10-27 + + [FEATURE] Settings migration framework (#5080) + + Only run for default profile and only if + not run before. Moves settings and symbols from + QGIS 2.x to QGIS 3 default profile + + * --version-migration flag to force migration + +Marco Hugentobler 2017-10-27 + + Make code shorter + +Marco Hugentobler 2017-10-27 + + Use \ instead of @ in comment + +Merge: f6abdd5ec8 38a4eb48be +Matthias Kuhn 2017-10-27 + + Merge pull request #5440 from m-kuhn/relrefthreadingv2 + + [feature] Relation Reference Widget : Threaded Version + +Merge: 89f62821a0 a625e731e3 +Matthias Kuhn 2017-10-27 + + Merge pull request #5471 from daniviga/rpm-3d + + libqgis_3d.so missing in rpm spec + +Blottiere Paul 2017-10-19 + + Add some tests for GetPrint with OPACITIES + +Blottiere Paul 2017-10-19 + + Fix parameter decoding with post method and urlencoded + +Marco Hugentobler 2017-10-27 + + Intendention + +Matthias Kuhn 2017-10-27 + + Code improvements + +Alessandro Pasotti 2017-10-27 + + [auth] Added test cases for expired CAs and client certs + +Marco Hugentobler 2017-10-27 + + Intendention + +Merge: 68179e224c 869fc604b0 +Matthias Kuhn 2017-10-27 + + Merge pull request #5469 from m-kuhn/constraintsOnForms + + [FEATURE] Show comments as tooltips on form + +Merge: edecd49b00 4372ac2658 +Nyall Dawson 2017-10-27 + + Merge pull request #5475 from nyalldawson/snap_to_grid + + [FEATURE][processing] Native c++ snap to grid algorithm + +David 2017-10-27 + + alias field and fixed problem with storing + +Nyall Dawson 2017-10-27 + + [FEATURE][processing] Native c++ snap to grid algorithm + + With support for snapping Z/M values, keeping curves + +Nyall Dawson 2017-10-27 + + Improvements to QgsAbstractGeometry::snappedToGrid + + - Fix loss of coordinates when not rounding a particular dimension + - Don't segmentize curved geometries + - Add extra unit tests + - Make createEmptyWithSameType() protected and skip from Python bindings. + This method relies on low-level manipulation of the returned geometry + which we do not want to expose as public/fixed API + +Mathieu Pellerin 2017-10-27 + + [FEATURE][welcome page] Add pin/unpin to list actions (fixes #16394) + +Harrissou Sant-anna 2017-10-27 + + Allow double typed values in algorithm + + Also homogenize the output name + +Martí Angelats i Ribera 2017-08-31 + + Make asGridified and newSameType (helper function) + +Harrissou Sant-anna 2017-10-25 + + Show symbology export options only when compatible (fixes #11098) + +Harrissou Sant-anna 2017-10-25 + + Reword message + +Harrissou Sant-anna 2017-10-25 + + Full sentence should often begin by capitalized letter + + and end by a full stop. + +Harrissou Sant-anna 2017-10-25 + + Use a more appropriate dialog title for message boxes + + and capitalise first letters + +Harrissou Sant-anna 2017-10-25 + + Remove trailing spacing and punctuation in ui items + +Harrissou Sant-anna 2017-10-25 + + Add missing space for readability and fix punctuation + +Matthias Kuhn 2017-10-27 + + Leakyleak + +Larry Shaffer 2017-10-26 + + [auth] Update test certs/keys and add README + + * Add expired root/issuer CAs and client cert chains + * Add wildcard server *.qgis.test SSL cert + + [ci skip] + +Merge: b80160a628 d4e8470ad4 +Nyall Dawson 2017-10-27 + + Merge pull request #5472 from nyalldawson/grid_renderer + + Grid renderer + +Merge: 0a615b6022 a86800b7ff +Nyall Dawson 2017-10-27 + + Merge pull request #5464 from lbartoletti/improve_triangle + + Improve triangle + +Nyall Dawson 2017-10-27 + + Minor fixups, add tests + +myarjunar 2017-03-14 + + [FEATURE] add grid renderer for points displacement. funded by Kartoza + +Matthias Kuhn 2017-10-26 + + Adjust tests + +Matthias Kuhn 2017-10-26 + + Convert some Q_FOREACHes to for-in + +Matthias Kuhn 2017-10-26 + + Make constraint reporting less obtrusive + +Tim Sutton 2017-10-26 + + Update cmake contact to use info@qgis.org instead of my email (#5470) + +lbartoletti 2017-10-26 + + Fix tests forgotten in testqgsexpression.cpp + +Merge: 3210f8546a 11ce639a68 +Larry Shaffer 2017-10-26 + + Merge pull request #5463 from boundlessgeo/BD-2507-pki-bundle-validation + + [auth] PKI bundle validation utility function + +Marco Hugentobler 2017-10-26 + + Add Unit test + +Daniele Viganò 2017-10-26 + + Sync documentation about compilation on Fedora + +Daniele Viganò 2017-10-26 + + Track libqgis_3d.so in RPM spec file + +Merge: 1ae0857d4b ef7a29dc53 +Larry Shaffer 2017-10-26 + + Merge pull request #5401 from boundlessgeo/pkcs8-to-pkcs1 + + [auth] Convert PKCS8 to PKCS1 private keys (for macOS) + +Matthias Kuhn 2017-10-26 + + Fix chained filters and tests + +Matthias Kuhn 2017-10-26 + + Show comments as tooltips on form + + Let's face it, where we need the information is not in the layer + properties configuration, it's when we enter the data. + +Merge: d097de4d6e 1ae0857d4b +signedav 2017-10-26 + + Merge branch 'master' into propertieslayout + +Merge: 3a547dc5b9 1ae0857d4b +signedav 2017-10-26 + + Merge branch 'master' into propertieslayout + +Larry Shaffer 2017-10-26 + + [auth] Keep sensitive debug data commented out + +Alessandro Pasotti 2017-10-26 + + [auth] Access authmanager through application + +Alessandro Pasotti 2017-10-26 + + [auth] Remove Diffie Hellman from validated keys + + Because Qt does not support DH + +Alessandro Pasotti 2017-10-26 + + [auth] Add utility method to validate a PKI bundle + +Alessandro Pasotti 2017-10-26 + + [auth] Add validatePKIBundle + +Alessandro Pasotti 2017-10-26 + + [auth] Add test with client cert + +Alessandro Pasotti 2017-10-25 + + Typo in a comment + +Alessandro Pasotti 2017-10-25 + + Add documentation for the hostName argument + +Alessandro Pasotti 2017-10-25 + + [auth] Add tests for the certificate chain validation routine + +Alessandro Pasotti 2017-10-25 + + [auth] Add certificate chain validation routine + +Alessandro Pasotti 2017-10-25 + + [auth] Add PEM test certificate chain + +Merge: 92b3b5bcbc 40c0b0b353 +Matthias Kuhn 2017-10-26 + + Merge pull request #5458 from daniviga/rpm-3d + + Enable 3D support in RPM + +Matthias Kuhn 2017-10-26 + + Move private methods implementation to header + +Matthias Kuhn 2017-10-26 + + Fix build with Qt 5.5 + +Merge: d414822f47 c780ab9bd2 +Alessandro Pasotti 2017-10-26 + + Merge pull request #5446 from boundlessgeo/BD-2279-authmanager-singleton + + [auth] Authmanager singleton API removal + +David 2017-10-26 + + relations in list + alias comment in gui (not ready yet) + +Matthias Kuhn 2017-10-26 + + Load some entries by default in relation reference widget + +Matthias Kuhn 2017-10-26 + + Relation reference widget make current entry bold + +Merge: d40447e7d0 1c9f9df0ea +Blottiere Paul 2017-10-26 + + Merge pull request #5400 from pblottiere/server_bugfix_visible + + [server][bugfix] Fix regression by adding visible tag to layer's node in GetProjectSettings + +Matthias Kuhn 2017-10-26 + + QgsFeatureListComboBox GUI enhancements + +Matthias Kuhn 2017-10-26 + + NULL value is gray and italic + +Matthias Kuhn 2017-10-26 + + Fix build warning + +Matthias Kuhn 2017-10-26 + + Add a selectOnFocus property to QgsFilterLineEdit + +Matthias Kuhn 2017-10-26 + + fixup 7811f38e480aabae9a1c068f4da766da4dc7b0f8 + +Marco Hugentobler 2017-10-26 + + Add unittest for featureinfo request using the parameter with_geometry + +Marco Hugentobler 2017-10-26 + + Remove geometries from unit test output (is now only added if requested) + +Matthias Kuhn 2017-10-26 + + Fix todo + +Matthias Kuhn 2017-10-26 + + Allow using NULL values + +Matthias Kuhn 2017-10-25 + + Re-Enable chained filters + +Matthias Kuhn 2017-10-25 + + Only restore selection if it exists + +Matthias Kuhn 2017-10-25 + + No forced rendering on startup + +Matthias Kuhn 2017-10-25 + + [travis] fold docker information + +Matthias Kuhn 2017-10-25 + + Fix building tests + +Matthias Kuhn 2017-10-25 + + Doxyfixes + +Matthias Kuhn 2017-10-25 + + Fix build + +Matthias Kuhn 2017-10-25 + + Qt < 5.6 compatibility + +Matthias Kuhn 2017-10-25 + + Optimize request for QgsFeatureFilterModel + +Matthias Kuhn 2017-10-25 + + More doxymentation + +Matthias Kuhn 2017-10-25 + + Doxymentation + +Matthias Kuhn 2017-10-25 + + Make QgsRelationReferenceWidget background threaded + +Matthias Kuhn 2017-10-25 + + Add tests for QgsFeatureListComboBox and friends + +Matthias Kuhn 2017-10-25 + + [FEATURE] Add QgsFeatureListComboBox with live-filter-capabilities + +Blottiere Paul 2017-10-26 + + Add test + +Blottiere Paul 2017-10-18 + + Fixes regression by adding visible tag to layer's node + +lbartoletti 2017-10-26 + + more z/m test + +Mathieu Pellerin 2017-10-26 + + [FEATURE][welcome page] remove from list action (fixes #13722) + +lbartoletti 2017-10-26 + + - A triangle can have double points or colinear points, my bad. It is a + degenerate triangle + - remove duplicate tests (triangle2()) + +Daniele Viganò 2017-10-26 + + Force qca-qt5-ossl as a requirement for RPM + +Marco Hugentobler 2017-10-24 + + [FEATURE]: Fetch geometry and maptip in feature info only if requested by the client + +Mathieu Pellerin 2017-10-26 + + [property override btn] integer64 (instead of unknown type) for longlong + +Daniele Viganò 2017-10-26 + + Enable 3D support only for Fedora > 26 (waiting for Qt 5.9) + +Matthias Kuhn 2017-10-26 + + Update sip + +Martin Dobias 2017-10-26 + + Build and review fixes + +Merge: 8c325206fc 4a51c40821 +Nyall Dawson 2017-10-26 + + Merge pull request #5436 from alexbruy/processing-gdal-memory + + [processing] correctly handle layers without attributes in GDAL-based geoprocessing algorithms (fix #17287) + +Alessandro Pasotti 2017-10-26 + + [auth] Minor comment rewording + +Alessandro Pasotti 2017-10-26 + + [auth] bulletproof QgsAuthManager singleton to make server happy + +Martin Dobias 2017-10-26 + + Add skirts to hide cracks between adjacent terrain tiles + + This adds user configurable skirt height to DEM terrain generator. + Skirts are vertical walls at the edges of each terrain tile that make + cracks (discontinuities) much less apparent. + + If there are visible cracks in terrain in the 3D view, try increasing skirt height. + The ideal skirt height depends on the scale of the map and range of altitudes. + +Merge: dc5eefb588 ace8b064c9 +Matthias Kuhn 2017-10-26 + + Merge pull request #5443 from m-kuhn/iteratorTimeout + + [feature] Allow to specify timeout when requesting features + +Matthias Kuhn 2017-10-26 + + Add API doc + +Daniele Viganò 2017-10-26 + + Add 3D support in RPM build + +Merge: acbd9d18f5 3dbffb07a4 +Matthias Kuhn 2017-10-26 + + Merge pull request #5448 from signedav/relationshipstrength + + Duplication Feature and its relating Features + +David 2017-10-26 + + improved api doc + +Alessandro Pasotti 2017-10-26 + + [auth] Removed profile splash information for auth manager (now done in initQgis) + +Alessandro Pasotti 2017-10-26 + + [auth] Removed instance and ctor from bindings + +Alessandro Pasotti 2017-10-25 + + Clean auth DB path with cleanPath + +Alessandro Pasotti 2017-10-24 + + Add missing import + +Alessandro Pasotti 2017-10-24 + + [auth] Authmanager singleton removal from API + +Merge: ecf93e38ec fb4e84a052 +Nyall Dawson 2017-10-26 + + Merge pull request #5432 from Gustry/allow_pipe_filepath + + allow pipe character in filepath in processing + +Alessandro Pasotti 2017-10-26 + + Fix test after QgsFileDownloader move to core and API change + +David 2017-10-26 + + add relations into drag-tree + +Mathieu Pellerin 2017-10-26 + + fix WITH_3D=TRUE build + +Merge: 861e05b406 067774839e +Matthias Kuhn 2017-10-26 + + Merge pull request #5450 from daniviga/rpm-fix-epoch + + Fix 'epoch' management in rpm spec + +Merge: 611dca4a30 8a4382a473 +Blottiere Paul 2017-10-26 + + Merge pull request #5376 from pblottiere/dirty + + [FEATURE] Add a flag to dirty edit buffer when using executeSql in transactions + +David 2017-10-26 + + spelling stuff + +Merge: 4021c30005 387057a1b8 +Nyall Dawson 2017-10-26 + + Merge pull request #5100 from Gustry/crs_description + + add CRS description in the layer_property expression + +Merge: 089fa36169 2d7141996e +Nyall Dawson 2017-10-26 + + Merge pull request #5286 from DelazJ/toolswitch + + Enable display of selection tools in Attribute toolbar + +Merge: d8775fca55 892ec18ea6 +Nyall Dawson 2017-10-26 + + Merge pull request #5285 from DelazJ/patch-1 + + Add source files location + +Merge: 55203a0fc2 60d0db9ebd +Nyall Dawson 2017-10-26 + + Merge pull request #5398 from DelazJ/DelazJ-patch-1 + + [DB Manager] Set correct dialog alignment + +Merge: 93f8abecaa 3888192e43 +Nyall Dawson 2017-10-26 + + Merge pull request #5359 from nyalldawson/primitive + + Rename (and make safe) QgsGeometry::geometry() + +Merge: a2f380b2bd 5300f69c24 +Nyall Dawson 2017-10-26 + + Merge pull request #5423 from nyalldawson/gdal_ptr + + Implement scoped pointers for gdal handled objects + +Nyall Dawson 2017-10-26 + + Add missing override + +Nyall Dawson 2017-10-26 + + Fix doxygen warning + +Nyall Dawson 2017-10-26 + + Fix geometry checker relying on corrupting geometries to fix them + + Geometry checker was editing geometries in place, which potentially + was corrupting other implicitly shared copies of these geometries. + +Nyall Dawson 2017-10-26 + + Fix tests + +Nyall Dawson 2017-10-26 + + Safer GDAL delete and close of datasets, which doesn't leak + and works on Windows + + See + https://github.com/qgis/QGIS/commit/d024910490a39e65e671f2055c5b6543e06c7042#commitcomment-25194282 + +Nyall Dawson 2017-10-26 + + Explicitly close gdal dataset handles as early as possible + +Merge: a9f8e60064 62f2091383 +Matthias Kuhn 2017-10-26 + + Merge pull request #5437 from m-kuhn/pgquick + + [postgres] respect empty FilterFids list + +Nyall Dawson 2017-10-24 + + Fix crash when creating new rasters + +Nyall Dawson 2017-10-24 + + Fix build, tests + +Nyall Dawson 2017-10-24 + + More gdal scoped pointer types + +Nyall Dawson 2017-10-24 + + Fix build + +Nyall Dawson 2017-10-23 + + Implement scoped pointers for gdal handled objects + +Merge: a89dfde91b 650a1227b6 +Nyall Dawson 2017-10-26 + + Merge pull request #5428 from lbartoletti/triangleGML + + ADD GML export to QgsTriangle + +Nyall Dawson 2017-10-26 + + Fix build warning + +Nyall Dawson 2017-10-25 + + Update API break docs + +Nyall Dawson 2017-10-25 + + Update python code to new API + +Nyall Dawson 2017-10-25 + + Replace use of qt methods with std equivalents + +Nyall Dawson 2017-10-25 + + Remove use of QSharedPointer/QScopedPointer + +Nyall Dawson 2017-10-13 + + Rename QgsGeometry::geometry as QgsGeometry::get() + + Because feature.geometry().geometry() is confusing, and impossible + to search for in python code (e.g. is input.geometry() a QgsGeometry + or a QgsAbstractGeometry?) + + But more importantantly: also add a const version + QgsGeometry::constGet(). The non-const + version is slow, since it now forces a detach to avoid corrupting + geometries (since QgsGeometry is shared, it's not safe to directly + access its primitive QgsAbstractGeometry and start messing with + it without first detaching). This is a big risk in the 2.x API + which could potentially corrupt feature geometries with unexpected + outcomes. + + Update all uses to constGet where possible. + +lbartoletti 2017-10-25 + + Avoid crash when export as GML an empty geometry + +Nyall Dawson 2017-10-25 + + Remember whether project file exists and don't continually recheck + + Because that's slow for network paths. Instead only check once, + and add a menu option to refresh and force re-check + +Nyall Dawson 2017-10-25 + + [FEATURE] Add right click menu option to "open directory" to welcome page entries + + Allows easy opening of the folder containing a project from the welcome page, + e.g. to check if a newer version of the project is in the same folder. + +Borys Jurgiel 2017-10-25 + + [Plugin manager][needs-docs] follow up 87d087bbfdb0 + +David 2017-10-25 + + Add some api documentations for new functions + +Matthias Kuhn 2017-10-25 + + [postgres] Early exit iterator if there's nothing to fetch anyway + +David 2017-10-25 + + [FEATURE] Duplicate features including children (one level deep) when relation strength is competition - configuration for the relationsstrength in the relation GUI `[needs-docs]` + +Blottiere Paul 2017-10-17 + + Private attributes + +Blottiere Paul 2017-10-17 + + Replace dynamic_cast by qobject_cast + +Blottiere Paul 2017-10-17 + + Rename signal in dirtied + +Blottiere Paul 2017-10-17 + + Remove duplicated protected + +Blottiere Paul 2017-10-16 + + Add some tests + +Blottiere Paul 2017-10-16 + + [FEATURE] Add a flag to dirty edit buffer when using executeSql in transactions + +Merge: 7dbae64cc7 1eac450d54 +Matthias Kuhn 2017-10-25 + + Merge pull request #5452 from mach0/master + + [ts] adding kyrgyz translators + +Werner Macho 2017-10-25 + + [ts] adding kyrgyz translators + +lbartoletti 2017-10-25 + + Change the approach: returns an empty element + +Etienne Trimaille 2017-08-31 + + add CRS description in the layer_property expression + +Martin Dobias 2017-10-25 + + [FEATURE] Snapping feedback improvements + + - tooltips with name of the layer that has been snapped + - different markers for different snap types (cross for vertex, X for intersection, box for edge) + - snapping marker color can be customized in options (default: magenta - as before) + - whether to show tooltips can be customized in options (default: off) + +Matthias Kuhn 2017-10-24 + + Remove unrequired call to repaint map + + The addFeature() call before returns immeditely, so there isn't even + something around to justify a repaint. + +Merge: c728a35c4b 435fab1169 +Matthias Kuhn 2017-10-25 + + Merge pull request #5441 from m-kuhn/spinner + + [feature] Spinner icon on QgsFilterLineEdit + +Nyall Dawson 2017-10-25 + + Fix progress bar for file downloader alg + +Nyall Dawson 2017-10-25 + + Don't report the same download progress twice, report progress for unknown download sizes + +Nyall Dawson 2017-10-25 + + Don't throw exception when file downloader alg is canceled + +Nyall Dawson 2017-10-25 + + Add some more tags to file downloader alg + +Daniele Viganò 2017-10-25 + + Fix changelog date in rpm speci when build is 'stable' + +Merge: ceb31fa45b 4567e80867 +Matthias Kuhn 2017-10-25 + + Merge pull request #5444 from m-kuhn/shhhht + + Shhhht + +Daniele Viganò 2017-10-25 + + Fix epoch management in rpm spec 'Requires' + +Matthias Kuhn 2017-10-25 + + Add missing doc + +Matthias Kuhn 2017-10-25 + + Partially revert last commit + + See https://github.com/KDE/clazy/blob/master/src/checks/level0/README-container-anti-pattern.md + +Matthias Kuhn 2017-10-25 + + Remove unrequired include + +Matthias Kuhn 2017-10-25 + + Private classes should not be exported + +Matthias Kuhn 2017-10-25 + + Warning debug output when doing dangerous things + +Matthias Kuhn 2017-10-25 + + Less noisy debug output + +Matthias Kuhn 2017-10-25 + + [feature] Allow to specify timeout when requesting features + + This is potentially interesting for race conditions, but whenever it is specified, + iterators will need to be carefully checked for validity and error handling needs + to be taken care of. + +Etienne Trimaille 2017-10-24 + + allow pipe character in filepath in processing + +Matthias Kuhn 2017-10-25 + + sipify does not like copydoc + +Matthias Kuhn 2017-10-25 + + Show spinner in locator widget + +Matthias Kuhn 2017-10-25 + + Add a spinner icon to QgsFilterLineEdit + +Nyall Dawson 2017-10-25 + + Fix qt warnings on task manager test + +Matthias Kuhn 2017-10-24 + + Notify feature source when iterator is closed + +Etienne Trimaille 2017-10-24 + + new string concatenation algorithm in processing + +Etienne Trimaille 2017-10-24 + + reorder alphabetically imports for native algorithms + +Matthias Kuhn 2017-10-24 + + Speed up spatialite provider + + No need to iterate over all the features in the datasource only to find + out that there is no feature which is not in an empty list of feature + ids. + +Merge: 1c1ecf4cf5 821be45c4f +Borys Jurgiel 2017-10-24 + + Merge branch 'master' of github.com:qgis/QGIS + +Merge: d34c09b3fe ceab42e4b9 +Alessandro Pasotti 2017-10-24 + + Merge pull request #5429 from boundlessgeo/BD-2239-clear-access-cache + + [auth][needs-docs][feature] Clear access cache + +Matthias Kuhn 2017-10-24 + + [postgres] respect empty FilterFids list + + Considering this statement: + + layer.dataProvider().getFeatures(QgsFeatureRequest().setFilterFids([])) + + this resulted in an iteration over the whole postgres source. + Internally, this happened implicitly when iterating over a layer with + an active edit buffer but no edited features. In such a scenario, we are + now much faster. + +Matthias Kuhn 2017-10-24 + + [postgres] A bit less talky + +Merge: 5261a9a5df 04a8418a32 +Alexander Bruy 2017-10-24 + + Merge pull request #5427 from alexbruy/processing-distance + + [processing] keep column names in standard distance matrix (fix #17150) + +Alexander Bruy 2017-10-23 + + [processing] correctly handle layers without attributes in GDAL-based + geoprocessing algorithms (fix #17287) + +Alexander Bruy 2017-10-24 + + add tests for distance matrix algorithm + +Alexander Bruy 2017-10-24 + + [processing] keep column names in standard distance matrix (fix #17150) + +Marco Hugentobler 2017-10-24 + + Hide raster options for non-WMS/WMTS layers + +Matthias Kuhn 2017-10-17 + + Disable spell check in prepare-commit.sh + + The spell check slows down the pre-commit hook a lot. Spell checking + will still be done on travis. + +Merge: bb21395e3d c99388804a +mhugent 2017-10-24 + + Merge pull request #5396 from mhugent/server_wms_print_layers + + Server wms print layers + +Martin Dobias 2017-10-24 + + Move handling of snap indicators from map tools to a new class + +Merge: 87d087bbfd cff3569ca1 +Borys Jurgiel 2017-10-24 + + Merge branch 'master' of github.com:qgis/QGIS + +Sandro Mani 2017-10-24 + + Make QgsVScrollArea inherit QgsScrollArea + +Alessandro Pasotti 2017-10-24 + + [auth] Tooltip minor rewording + +Alessandro Pasotti 2017-10-24 + + [auth] translate menu actions + +Alessandro Pasotti 2017-10-24 + + [auth] Added recommended and tooltip + +Harrissou Sant-anna 2017-10-17 + + Typo fixes + +lbartoletti 2017-10-24 + + [needs-docs][feature] New button for empty the composer table (#5407) + + Adds a button to empty a composer table. Useful when you have a table + with a lot of columns and you want only a few. + + Also change table from SingleSelection to MultiSelection and allow to + delete selected rows and move selections up and down. + +Nyall Dawson 2017-10-24 + + Fix build warning + + In related news, Travis is no longer failing builds which + throw new warnings + +Borys Jurgiel 2017-10-23 + + [Plugin manager] Add a label for built-in plugins explaining they aren't uninstallable. + +Merge: 46a6f25d6f 8421a7e0d8 +Sandro Mani 2017-10-23 + + Merge pull request #5410 from manisandro/geomchecker + + [FEATURE][Geometry checker] Support checking multiple layers at once, add new checks + +Merge: 2f44de0e4f c4f3832af2 +Nyall Dawson 2017-10-24 + + Merge pull request #5418 from nyalldawson/from_polyline + + Rename QgsGeometry::fromPolyline as QgsGeometry::fromPolylineXY + +Etienne Trimaille 2017-10-23 + + [FEATURE] Download a file in Processing + +Sandro Mani 2017-10-23 + + [Geometry checker] Add some debug code + +Sandro Mani 2017-10-23 + + [Geometry checker] Remove unused includes + +lbartoletti 2017-10-23 + + Init z support and GML3 3D + +lbartoletti 2017-10-23 + + [FEATURE][processing]Transect processing + + Adds a C++ version of the "ststion lines" plugin as a + new processing algorithm for creating transect lines. + +Alessandro Pasotti 2017-10-23 + + [auth] Typo in comment + +Alessandro Pasotti 2017-10-23 + + [auth] Add connection cache clear options + + This fixes a bug that required to restart + QGIS after a connection failed due to SSL + errors (the connection auth was cached). + + Also: + + - added a tab for content and connection + auth cache configuration + - user feedback on (both) caches cleared + - changed icon for content cache clear to + a trash bin (after users enquiries about + what was that "back/undo" icon for) + +Gary Sherman 2017-10-23 + + Remove invalid decode statements from plugin installer + +Alessandro Pasotti 2017-10-23 + + [auth] Removed configuration checkbox for auto clear + +Alessandro Pasotti 2017-10-23 + + [auth] Reverted to previous GUI + +Sandro Mani 2017-10-23 + + [Geometry checker] Qt < 5.9 compatibility fix + +Sandro Mani 2017-10-23 + + [Geometry checker] Exclude from sip bindings + +Sandro Mani 2017-10-23 + + Add QgsVScrollArea sip bindings + +Sandro Mani 2017-10-19 + + Add missing QgsVScrollArea documentation + +Sandro Mani 2017-10-19 + + [Geometry checker] Try harder to match old errors to those found after a recheck + +Sandro Mani 2017-10-19 + + [Geometry checker] Don't recheck any features if fixed error resulted in no changes + +Sandro Mani 2017-10-19 + + [Geometry checker] Only add to feature pool spatial indices features which are to be processed + +Sandro Mani 2017-10-19 + + [Geometry checker] Fix possible crash in QgsGeometryCheckerFixSummaryDialog::addError + +Sandro Mani 2017-10-19 + + [Geometry checker] Disable sorting in QgsGeometryCheckerFixSummaryDialog::addError for better performance + +Sandro Mani 2017-10-19 + + [Geometry checker] Fix incomplete QgsGeometryOverlapCheckError::handleChanges + +Sandro Mani 2017-10-19 + + [Geometry checker] Don't make the layer-feature iterator return features without valid geometry + +Sandro Mani 2017-10-19 + + [Geometry checker] Don't recollect errors with empty recheck list + +Sandro Mani 2017-10-19 + + [Geometry checker] Fix incorrect change parametrization in QgsGeometryCheck::replaceFeatureGeometryPart + +Sandro Mani 2017-10-19 + + [Geometry checker] Use reduced tolerance when attempting to combine two geometries, and ensure that the output is a single-part geometry + +Sandro Mani 2017-10-19 + + Re-add QgsGeometryEngine::combine taking a list of QgsAbstractGeometries + +Sandro Mani 2017-10-19 + + [Geometry checker] Fix features not correctly removed from QgsFeaturePool spatial index + +Sandro Mani 2017-10-19 + + [Geometry checker] More change tracking tests + +Sandro Mani 2017-10-19 + + [Geometry checker] Remove debug print + +Sandro Mani 2017-10-17 + + [Geometry checker] Fix incorrect logic in QgsGeometryCheckError::handleChanges + +Sandro Mani 2017-10-17 + + [Geometry checker] Add more fixError tests + +Sandro Mani 2017-10-17 + + [Geometry checker] Fix crash in QgsGeometryCheckerResultTab::addError if layerId is empty + +Sandro Mani 2017-10-17 + + [Geometry checker] Fix incorrect ring index in QgsGeometrySelfIntersectionCheck::fixError + +Sandro Mani 2017-10-17 + + [Geometry checker] Use centroid of actual hole to report error in QgsGeometryHoleCheck + +Sandro Mani 2017-10-17 + + [Geometry checker] Fix crashes in QgsGeometryGapCheck::mergeWithNeighbor due to using wrong layerId + +Sandro Mani 2017-10-16 + + [Geometry checker] Add a first series of fixError tests + +Sandro Mani 2017-10-16 + + [Geometry checker] Fix wrong obsoletes test in QgsGeometryContainedCheck::fixError + +Sandro Mani 2017-10-14 + + [Geometry checker] Add TestQgsGeometryChecks::createTestContext variant which copies the testdata to a temporary dir + +Sandro Mani 2017-10-14 + + [Geometry checker] Make TestQgsGeometryChecks::searchCheckErrors return the list of matching errors instead of just the number of matches + +Sandro Mani 2017-10-12 + + [Geometry checker] Add follow boundaries check + +Sandro Mani 2017-10-12 + + [Geometry checker] Fix broken LayerFeature geometry transform + +Sandro Mani 2017-10-12 + + [Geometry checker] Fix type check factory + +Sandro Mani 2017-10-12 + + [Geometry checker] Finish gap check test + +Sandro Mani 2017-09-28 + + [Geometry checker] Add more tests + +Sandro Mani 2017-09-28 + + [Geometry checker] Fix incorrect free in gap check + +Sandro Mani 2017-09-28 + + [Geometry checker] Specify part in error parametrization in line and line-layer intersection checks + +Sandro Mani 2017-09-28 + + [Geometry checker] Don't report segment lengths smaller than checker precision, they are either duplicate nodes or degenerate geometries + +Sandro Mani 2017-09-28 + + [Geometry checker] Simplify point in polygon check + +Sandro Mani 2017-09-28 + + [Geometry checker] Uniformize error messages + +Sandro Mani 2017-09-28 + + [Geometry checker] Ensure overlap check returns on error for each overlap part + +Sandro Mani 2017-09-28 + + [Geometry checker] Report if geometry is invalid in overlap check + +Sandro Mani 2017-09-28 + + [Geometry checker] Ensure duplicate check ui is enabled also for lines + +Sandro Mani 2017-09-28 + + [Geometry checker] Make line intersection test and line layer intersection test also report multiple intersections for same line + +Sandro Mani 2017-09-28 + + [Geometry checker] Ensure line layer intersection test does not check a line layer against itself + +Sandro Mani 2017-09-28 + + [Geometry checker] Introduce QgsGeometryCheckerUtils::polygonRings + +Sandro Mani 2017-09-28 + + [Geometry checker] Don't make line intersection test report symmetric errors twice + +Sandro Mani 2017-09-27 + + [Geometry checker] Some initial tests + +Sandro Mani 2017-09-27 + + [Geometry checker] Make contained check work with all geometry types + +Sandro Mani 2017-09-27 + + [Geometry checker] Also check other parts of same feature in dangle check + +Sandro Mani 2017-09-27 + + [Geometry checker] Use symDifference for all geometry types to detect duplicates + +Sandro Mani 2017-09-26 + + [Geometry checker] Drop feature id update logic now handled by freezing repacking + +Sandro Mani 2017-09-26 + + [Geometry checker] Move core classes to qgis_analysis + +Sandro Mani 2017-09-25 + + [Geometry checker] Reorder some UI elements + +Sandro Mani 2017-09-25 + + [Geometry checker] Enter update mode when editing result layers + +Sandro Mani 2017-09-25 + + [Geometry checker] Add line layer intersection check + +Sandro Mani 2017-09-19 + + [Geometry checker] Update for QgsGeometryEngine API changes + +Sandro Mani 2017-07-06 + + [Geometry checker] Fix layerFeature comparison + +Sandro Mani 2017-07-06 + + [Geometry checker] Allow adding a prefix to output layer names + +Sandro Mani 2017-07-06 + + [Geometry checker] Fix logic to ensure that each pair of features is only compared once + +Sandro Mani 2017-07-06 + + [Geometry checker] Show layer names instead of ids in user-facing strings + +Sandro Mani 2017-07-06 + + [Geometry checker] Handle fid changes + +Sandro Mani 2017-06-29 + + [Geometry checker] Store feature pool directly in LayerFeature instead of copying layerToMapUnits and layerToMapTransform + +Sandro Mani 2017-06-29 + + [Geometry checker] Fix incorrect mapToLayerUnits -> layerToMapUntis + +Sandro Mani 2017-06-29 + + [Geometry checker] Add tooltip with data source to layers in setup tab + +Sandro Mani 2017-06-29 + + [Geometry checker] Only update layer list in setup tab after layers have been removed + +Sandro Mani 2017-06-29 + + [Geometry checker] Don't use QgsScrollArea... + +Sandro Mani 2017-06-29 + + [Geometry checker] Don't self-compare features in contained check + +Sandro Mani 2017-06-29 + + [Geometry checker] Run contained check in map crs + +Sandro Mani 2017-06-28 + + [Geometry checker] Various ui improvements + +Sandro Mani 2017-06-28 + + [Geometry checker] Add layer column to fix summary dialog tables + +Sandro Mani 2017-06-28 + + [Geometry checker] Introduce vertical-only scroll-areas + +Sandro Mani 2017-06-28 + + [Geometry checker] Fix some feature highlighting issues + +Sandro Mani 2017-06-28 + + [Geometry checker] Improve label + +Sandro Mani 2017-06-28 + + [Geometry checker] Add layer column to result table + +Sandro Mani 2017-06-28 + + [Geometry checker] Imporove logic for picking the output directory + +Sandro Mani 2017-06-28 + + [Geometry checker] Fix determining active layer geometry types + +Sandro Mani 2017-06-28 + + [Geometry checker] Fix updating and gathering of layers + +Sandro Mani 2017-06-28 + + [Geometry checker] Reduce icon size in setup layer list + +Sandro Mani 2017-06-28 + + [Geometry checker] Fix angle check possibly reporting end nodes of lines + +Sandro Mani 2017-06-28 + + [Geometry checker] Ensure all UI items are consistently enabled/disabled depending on type of layers to be checked + +Sandro Mani 2017-06-28 + + [Geometry checker] Set appropriate initial size for checker dialog + +Sandro Mani 2017-06-28 + + [Geometry checker] Rename tab: Settings -> Setup + +Sandro Mani 2017-06-28 + + [Geometry checker] Tweak logic for choosing which layers are selected in the setup tab + +Sandro Mani 2017-06-28 + + [Geometry checker] Fix LayerFeature iterator + +Sandro Mani 2017-06-27 + + [Geometry checker] Add point in polygon check + +Sandro Mani 2017-06-27 + + [Geometry checker] Add line intersection check + +Sandro Mani 2017-06-27 + + [Geometry checker] Simplify code + +Sandro Mani 2017-06-27 + + [Geometry checker] Extend duplicate check to also handle points + +Sandro Mani 2017-06-27 + + [Geometry checker] Add point must be covered by line check + +Sandro Mani 2017-06-27 + + [Geometry checker] Add dangle check + +Sandro Mani 2017-06-26 + + [Geometry checker] Use map crs for geometry and errorLocation in CheckErrors, overall code cleanup + +Sandro Mani 2017-06-15 + + [Geometry checker] Adapt for API changes + +Sandro Mani 2017-04-12 + + [Geometry checker] Introduce QgsGeometryCheckerUtils::LayerFeatures + +Sandro Mani 2017-04-05 + + [Geometry checker] Initial multilayer support for contained check + +Sandro Mani 2017-04-05 + + [Geometry checker] Initial multilayer support for duplicate check + +Sandro Mani 2017-04-05 + + [Geometry checker] Initial multilayer support for overlap check + +Sandro Mani 2017-04-04 + + [Geometry checker] Add multi-layer support to gap check + +Sandro Mani 2017-04-04 + + [Geometry checker] Store error values in map units, perform topology checks in map CRS + +Sandro Mani 2017-04-04 + + [Geometry checker] Ensure headers appear in project tree + +Sandro Mani 2017-03-30 + + [Geometry checker] Make checks report affected are in selected crs + +Sandro Mani 2017-03-30 + + [Geometry checker] Introduce QgsGeometryCheckerContext + +Sandro Mani 2017-03-30 + + [Geometry checker] Initial multi-layer support + +Marco Hugentobler 2017-10-23 + + Add the possibility to publish the url of WMS/WMTS layers and to advertize them as background layers for the webmap in GetProjectSettings + +Alessandro Pasotti 2017-10-23 + + [auth] Menu option and configuration for auto clear auth cache + +Alessandro Pasotti 2017-10-23 + + [auth] Clear network authentication cache on SSL errors + +Merge: a6964b51bc 1822b76c1a +Even Rouault 2017-10-23 + + Merge pull request #5415 from rouault/use_layername + + [OGR provider/askUserForOGRSublayers] Use layername= instead of layerid= when no ambiguity + +lbartoletti 2017-10-23 + + ADD GML export to QgsTriangle + +Merge: 1d043f3c5a 7bfd60ab78 +rldhont 2017-10-23 + + Merge pull request #5413 from rldhont/server-bugfix-display + + [Server][Bugfix] Test if the environ variable DISPLAY is defined + +Nyall Dawson 2017-10-23 + + Update test + +Nyall Dawson 2017-10-23 + + Make gpkg the first choice for processing vector outputs + +rldhont 2017-10-20 + + [Server][Bugfix] Test if the environ variable DISPLAY is defined + +Even Rouault 2017-10-20 + + [OGR provider/askUserForOGRSublayers] Use layername= instead of layerid= when no ambiguity (#16135) + + When composing URI, use layer names if layer names are unique. This will + be more stable in case the datasource get layers added/removed (for example for + GeoPackage) + +Merge: 5d675720bb 16cad4d14f +Nyall Dawson 2017-10-23 + + Merge pull request #4947 from lbartoletti/regularShape_gui + + [FEATURE][needs-docs] Add gui to draw Circle, Ellipse, Rectangle and Regular Polygon + +Nyall Dawson 2017-10-22 + + Optimise calculation of QgsGeometry::vertexNrFromVertexId + + By moving logic to abstract geometry subclasses so that they + can trivially retrieve the vertex number, instead of relying + on the inefficient coordinateSequence method. + + Has flow on speed boosts to many geometry operations like + calculation of closest points in a geometry, which will + benefit snapping related operations. + +Nyall Dawson 2017-10-22 + + Optimise determination of adjacent vertices and move to QgsAbstractGeometry + + Previously the method in QgsGeometryUtils was relying on + QgsAbstractGeometry::coordinateSequence, which is an absolute + performance killer. + + Instead move to optimised methods in the various abstract + geometry subclasses which rely only on trivial calculations. + +lbartoletti 2017-10-22 + + - Add Signals start/stopCapturing + - fix QSpinBox -> QgsSpinBox + +Nyall Dawson 2017-10-22 + + Fix QgsVectorFileWriter use of transactions while writing + + Previously the writer was only using transactions in some + cases (when calling the static writeAsVectorFormat method). + + This changes the writer to always use a transaction when + possible. + + Fixes the map renderer job test using gpkg from timing out after + taking forever to running twice the speed of the shapefile + version. Similar benefits across other parts of qgis, + which are writing files without using the static method, e.g. + processing. + +Nyall Dawson 2017-10-22 + + Rename QgsGeometry::fromPolyline as QgsGeometry::fromPolylineXY + and add new QgsGeometry::fromPolyline which uses QgsPoint + + We want to encourage people not to use the QgsPointXY method, as it drops + Z/M values. So it's moved across to a different name to make way + for a new QgsGeometry::fromPolyline which uses a QgsPoint list + instead of QgsPointXY, thus keeping Z/M values intact. + + Similarly, QgsPolyline now is a list of QgsPoint (keeping z/m values) + and the old 2d QgsPolyline type was renamed to QgsPolylineXY. + + Making the QgsPoint method the "preferred" method and making linestrings + just as easy to create from z/m dimensioned points as 2d points is + important to push people to write code which does not discard + these important dimensions. + + As a bonus, the QgsPoint methods are more efficient anyway, since + they don't require creation of a temporary list. + +Nyall Dawson 2017-10-22 + + Partially revert 28daa1a0 + + Using gpkg for this test is causing intermittent travis + timeouts. + + . + . + . + . + + Team Shapefile FTW ;) + +Nyall Dawson 2017-10-22 + + Fix QgsGeometry::angleAtVertex returned wrong angle for start/end + of closed linestrings + + The average angle of adjacent segments should be used in this case + +Juergen E. Fischer 2017-10-21 + + follow up f243b8448e2 + +Juergen E. Fischer 2017-10-21 + + postgres: add support for partitioned tables (implements #17302) + +Juergen E. Fischer 2017-10-21 + + postgres provider: queries have an unknown relation type + +Merge: 49071808ac 28daa1a0e0 +Matthias Kuhn 2017-10-21 + + Merge pull request #5385 from jachym/geopackage + + Put GeoPackage at first place in the menu + +Even Rouault 2017-10-21 + + [Browser] Fix invalid detection of OGR VRT by GDAL provider, and fix broken detection of OGR VRT (fixes #16806) + +Even Rouault 2017-10-20 + + [OGR/browser] More consistant use of GDAL API + +Even Rouault 2017-10-20 + + [OGR provider] subLayers(): avoid emitting error on a geometry less layer + +Even Rouault 2017-10-20 + + [OGR provider] Avoid (harmless) OGR errors when trying to convert GeoPackage from WAL to DELETE mode + +Richard Duivenvoorde 2017-10-20 + + fix tab clicks in plugin manager + +Merge: e59f1d5d48 c9b0a2b167 +Even Rouault 2017-10-20 + + Merge pull request #5409 from rouault/fix_gpkg_many_layers + + [OGR provider] Allow opening (GeoPackage) datasets with many layers + +Even Rouault 2017-10-20 + + [OGR provider] Speed-up layer addition to the canvas when selected from the data source manager + +Even Rouault 2017-10-19 + + [OGR provider] Allow opening (GeoPackage) datasets with many layers + + Currently each time you instanciate a QgsOgrProvider layer, a GDAL dataset is + created. In the case of GeoPackage, this means a SQLite connection and a file + handle. As GDAL enables Spatialite function on GeoPackage connections, we are + bound to Spatialite limits, and Spatialite has a hard limit on a maximum of + 64 simultaneous connections. Thus we cannot open more than 64 layers of the + same GeoPackage. + This commits enables sharing of the same GDALDataset object among several + QgsOgrProvider object. Care is made to reuse a GDALDataset object only if the + QgsOgrProvider do not point to the same layer. Mutexes are also taken to + allow safe instanciation and use of QgsOgrProvider objects from multiple + threads (but a same QgsOgrProvider should not be used by more than one thread + at a time) + +Even Rouault 2017-10-20 + + Move static variable to function scope + +Matthias Kuhn 2017-10-20 + + Revert "Avoid type quotation errors in value exists check" + + This reverts commit 6ce4b607c522d5db35227d2ae5f20259d4e384f0. + +Even Rouault 2017-10-20 + + Application termination: fix crash caused by 5288aed5503205948f3785590e3b27d325340afe when layers are still opened at exit + +Matthias Kuhn 2017-10-20 + + Avoid type quotation errors in value exists check + +Matthias Kuhn 2017-10-20 + + Feature validation should not spam the log + +Even Rouault 2017-10-20 + + QGisApp: fix potential crash at application closing linked to mDataSourceManagerDialog destruction closing GDAL datasets after GDAL has been shut down + +Marco Hugentobler 2017-10-20 + + Move creation of datasource uri for external wms layers to QgsWMSParameters + +Merge: efb84fd2ca 7b455d8700 +rldhont 2017-10-20 + + Merge pull request #5408 from rldhont/server-handlerequest-project + + [Server][FEATURE] Handle request from QgsServer with a QgsProject + +Merge: 13a00aae30 40b916c7a3 +rldhont 2017-10-20 + + Merge pull request #5337 from dmarteau/qgis_utils_refactoring + + Disable message hook and import override at runtime + +rldhont 2017-10-19 + + [Server][FEATURE] Handle request from QgsServer with a QgsProject + + With this commit, it's posssible to handle a request from a QgsProject without writing it to the disk. + + ```python + server = QgsServer() + project = QgsProject() + vlayer = QgsVectorLayer("/path/to/shapefile/file.shp", "layer_name_you_like", "ogr") + project.addMapLayer(vlayer) + + query_string = 'https://www.qgis.org/?SERVICE=WMS&VERSION=1.3&REQUEST=GetCapabilities' + request = QgsBufferServerRequest(query_string, QgsServerRequest.GetMethod, {}, data) + response = QgsBufferServerResponse() + server.handleRequest(request, response, project) + ``` + +Merge: 8d64e2e6ef 3c18232c34 +Matthias Kuhn 2017-10-20 + + Merge pull request #5399 from pblottiere/server_flaky_tests + + [server] WIP : reactivate flaky server tests for WMS requests + +Nyall Dawson 2017-10-20 + + Also add unique_ptrs for other geos classes + +Nyall Dawson 2017-10-20 + + Another attempt to avoid Travis warnings + +Nyall Dawson 2017-10-20 + + Fix warning if building without 3d + + (AKA hurry up Fedora 27, I want Qt 5.9 already) + +Merge: e7d7295a64 aa594f5397 +Alessandro Pasotti 2017-10-19 + + Merge pull request #5226 from aaime/rule_labels + + Also export rule based labelling in SLD. Follows up to ticket #8925 + +Blottiere Paul 2017-10-19 + + Unskip test_wms_getprint_srs (GetPrint has been refactored since) + +Blottiere Paul 2017-10-19 + + Add some tests to validate assertXMLEqual + +Blottiere Paul 2017-10-18 + + Split WMS tests to detect flaky behavior + +Merge: 79bc5d4bf7 dc6bdc2919 +rldhont 2017-10-19 + + Merge pull request #5405 from rldhont/server-wms-test-enhancement + + [Server][Tests] Fix WMS tests locally + +Jachym Cepicky 2017-10-18 + + Adding more default SHP->GPKG changes + +Andrea Aime 2017-09-20 + + Also export rule based labelling. Follow up to #8925 + +rldhont 2017-10-19 + + [Server][Tests] Fix WMS tests locally + +Marco Hugentobler 2017-10-19 + + Possibility to set a WMS print layer for WMS/WMTS layers in qgis server. This print layer is then advertized in the GetProjectSettings output + +Martin Dobias 2017-10-13 + + Save state of 3D map views in projects + restore them on project load + +Martin Dobias 2017-10-13 + + Move code useful for 3D view out of 2D map canvas dock code + +Nyall Dawson 2017-10-19 + + Revert "Fix build warnings on Travis" + + Hey clang - how about you don't through warnings if + fixing them breaks the build? + + This reverts commit e28a555497e9984d261c6a054502c875b6994a89. + +Harrissou Sant-anna 2017-10-19 + + [DB Manager]Set dialog alignment instead of adding trailing spaces to labels + +Nyall Dawson 2017-10-19 + + Fix build warnings on Travis + +Merge: 325168ee1f 4ce166241e +Nyall Dawson 2017-10-19 + + Merge pull request #5369 from nyalldawson/toolbox_order + + [processing] Always list native algorithms before 3rd party providers + +Nyall Dawson 2017-10-19 + + Allow processing providers to specify a long name, and show it in tooltips + + Add version number to gdal provider long name + +Nyall Dawson 2017-10-16 + + Drop version and count from algorithm item in tree view + +Nyall Dawson 2017-10-15 + + [processing] Always list native algorithms before 3rd party providers + + This change ensures that searching for algorithms always returns + native algorithms before matching 3rd party algorithms + + TODO: we really need to replace the toolbox tree with a proper + model and redo the sorting/filtering using a sort/filter proxy + model. + +Merge: b855ad1e72 406425d68a +Nyall Dawson 2017-10-19 + + Merge pull request #5392 from nyalldawson/file_downloader + + Split QgsFileDownloader into separate core/gui classes + +Merge: 8ca4a1a80f b6ed28b312 +Nyall Dawson 2017-10-19 + + Merge pull request #5366 from DelazJ/effectsalign + + Vertically align color widget in Effect properties dialog + +Nyall Dawson 2017-10-19 + + Fix windows build + +Merge: bb522b3660 432ef1a294 +Nyall Dawson 2017-10-19 + + Merge pull request #5371 from DelazJ/colorspace + + Optimize spacing in Color settings dialog + +Nyall Dawson 2017-10-18 + + More use of geos::unique_ptr + +Nyall Dawson 2017-10-18 + + Fix leak in QgsMultiSurface::asJSON + +Nyall Dawson 2017-10-17 + + Replace GEOSGeomScopedPtr with unique_ptr with custom deleter + + And make greater use of it through QgsGeos to avoid potential + memory leaks. + +Larry Shaffer 2017-10-18 + + [auth] Fix documentation error in QgsAuthCertUtils + +Larry Shaffer 2017-10-18 + + [auth] Add PKCS8 to PKCS1 key conversion for macOS (deps on libtasn1) + + See description of QgsAuthCertUtils::pkcs8PrivateKey. + + This fix may be needed on other platforms (untested at this point), + because Qt5 QSslkey class *still* does not directly support creation + using non-PKCS1 PEM- or DER-encoded data, though QCA, whose qca-ossl + plugin is linked to OpenSSL, does support PKCS1 and PKCS8. + +Larry Shaffer 2017-10-18 + + [auth] Move inline file reads to static func; add PKCS#8 sniffing func + +Larry Shaffer 2017-10-17 + + [auth] Add error trap and debug fixes for PKCS#12 auth method + +Nyall Dawson 2017-10-19 + + Rename method, docs and api breaks documentation + +Nyall Dawson 2017-10-19 + + Fix qt warnings thrown by QgsFileDownloader + +Nyall Dawson 2017-10-18 + + Split QgsFileDownloader into separate core/gui classes + + So that the guts of this class can be used from non-gui code + +Nyall Dawson 2017-10-18 + + Add render context flag to indicate canvas preview jobs + + In future we can use this to optimise the preview job and shortcut + by doing lower quality/faster renders. + + For now, use this flag to identify preview jobs and only apply + 'updated canvas' min/max to rasters for non-preview jobs + + Fixes #16988 + +Nyall Dawson 2017-10-18 + + Fix crash in QgsGeometry::splitGeometry + +Alexander Bruy 2017-10-18 + + [processing] update test data + +volaya 2017-10-18 + + [processing] allow reordering in multiple selection dialog + +Alexander Bruy 2017-10-18 + + [processing] retrieve dissolve parameter as boolean value + +lbartoletti 2017-10-18 + + manual resolve conflicts for qgisapp.ui + +Merge: df0d717f92 b1c45d57a6 +Alessandro Pasotti 2017-10-18 + + Merge pull request #5380 from boundlessgeo/bd_2272_pki_parsed_ca + + [auth] Allow to optionally add CAs from PKI bundle to the trusted CAs for the configured connection + +lbartoletti 2017-10-18 + + Enable tools using extent when map is rotated + +Jachym Cepicky 2017-10-16 + + Put GeoPackage at first place in the menu [FEATURE] [needs-docs] + +Nyall Dawson 2017-10-18 + + Fix disabled add button in ogr source select for valid protocols + + Fixes #17206 + +Nyall Dawson 2017-10-18 + + Remove empty item from plugin manager tabs + +Nyall Dawson 2017-10-18 + + Fix corrupted text in buttons + +Borys Jurgiel 2017-10-17 + + Plugin Manager: Disable focus by tab key for the 'Unistall' and 'Upgrade all' buttons to prevent from accidental execution + +Borys Jurgiel 2017-10-17 + + Plugin manager layout fixes + +Merge: 9fdd060322 92e5de9e9e +Tom Kralidis 2017-10-17 + + Merge pull request #5391 from tomkralidis/issue-11732 + + [MetaSearch] update plugin icon (fixes #11732) [needs-docs] + +Tom Kralidis 2017-10-17 + + [MetaSearch] update plugin icon (fixes #11732) [needs-docs] + +Even Rouault 2017-10-17 + + Remove useless use of binary or + +Alessandro Pasotti 2017-10-17 + + [auth] Use QGIS test certificates + +Marco Hugentobler 2017-10-17 + + Enable external WMS layers also for GetPrint + +Merge: c8495ea4e9 e4767e693f +signedav 2017-10-17 + + Merge pull request #1 from m-kuhn/propertieslayout + + Propertieslayout + +Marco Hugentobler 2017-10-17 + + Remove temporary layers (highlight layers and external wms layers) + +Merge: 4901f0af05 6447beefe8 +Blottiere Paul 2017-10-17 + + Merge pull request #5360 from pblottiere/server_bugfix_ogc_getmap_bbox + + [server][bugfix] Fix OGC test getmap bbox + +Merge: b77c11f4c6 a3971ee0cd +Blottiere Paul 2017-10-17 + + Merge pull request #5303 from pblottiere/server_bugfix_ogc_queryable_layer + + [server][bugfix] Fix OGC test getfeatureinfo:each-queryable-layer + +Merge: ab107d0e8c f69c9cc685 +Alessandro Pasotti 2017-10-17 + + Merge pull request #5387 from boundlessgeo/auth_fix_wfs_from_browser + + [auth][bugfix] Do not expand authentication URI in browser items + +Marco Hugentobler 2017-10-17 + + Support external WMS layers in GetPrint and GetMap requests + +Alessandro Pasotti 2017-10-17 + + WFS data items: add level to debug message + +Blottiere Paul 2017-10-17 + + Update unit tests + +Blottiere Paul 2017-10-04 + + Translate error message in exception + +Blottiere Paul 2017-10-04 + + Fix error code + +Blottiere Paul 2017-10-04 + + First layer level should not be set to queryable (only sublevels) + +Merge: db97e2772f 2f29e162d1 +rldhont 2017-10-17 + + Merge pull request #5297 from dmarteau/wfs_1_1_0 + + [Server][FEATURE][needs-docs] Support WFS 1.1.0 + +David Marteau 2017-10-10 + + Disable message hook and import override at runtime + +Merge: ba9e0437cc ec57d25a3f +Borys Jurgiel 2017-10-17 + + Merge pull request #5372 from borysiasty/plugman + + [needs-docs] Move the install-plugin-from-ZIP menu action to the plug… + +Alessandro Pasotti 2017-10-17 + + [auth][bugfix] Do not expand authentication URI in browser items + + This fixes an internally reported bug that affects all versions + >= 2.18. + + The bug was caused by too early expansion of the credentials + in the URI. + + Needs backporting. + +Merge: 7fbecd365b 9ff66936cd +Matthias Kuhn 2017-10-17 + + Merge pull request #5386 from m-kuhn/pylintFixes + + Pylint fixes + +Alessandro Pasotti 2017-10-17 + + [auth] Removed self-signed CAs from datasource uri items + +Nyall Dawson 2017-10-17 + + Lighter borders for projection selector map + +Nyall Dawson 2017-10-17 + + Sync canvas extent rect color and center marker color + +Nyall Dawson 2017-10-17 + + "Loosen" up acceptable parameter for model child inputs + + Previously we took a harsher approach to filtering which inputs + were acceptable for child algorithm parameters. E.g. a child algorithm + with a vector layer input would only show outputs from other algorithms + which generated a vector layer output. + + But this can needlessly restrict what's possible in models. E.g. + an algorithm which outputs a QgsProcessingOutputFile or + QgsProcessingOutputString could potentially be a valid source + to a vector layer. So we should allow these as possible + inputs for vector layer parameters too. + + This commit adds many extra acceptable input types for + child parameters. It will probably expose "corner cases" where + algorithms may get unexpected input types, but these will + not affect existing model stability and can be fixed when + identified. + + The payoff is a much more flexible modeler. + +Matthias Kuhn 2017-10-17 + + Add debug output to spatialite test + +Matthias Kuhn 2017-10-17 + + Fix too-many-format-args + +Matthias Kuhn 2017-10-17 + + Fix call to non-existent method + +Matthias Kuhn 2017-10-17 + + Add abstract base method + +Matthias Kuhn 2017-10-17 + + Fix super call + +Matthias Kuhn 2017-10-17 + + Fix typo in method name + +Matthias Kuhn 2017-10-17 + + Properly raise NotImplementedError + +Matthias Kuhn 2017-10-16 + + Remove broken and unused code + +Matthias Kuhn 2017-10-16 + + Fix access to member variable in classmethod + +Matthias Kuhn 2017-10-16 + + Fix typo in method call + +Matthias Kuhn 2017-10-16 + + Migrate processing help to new processing registry + +Matthias Kuhn 2017-10-16 + + Fix member access in postgis.py + +Merge: c33dbd96fe a3f7655030 +Borys Jurgiel 2017-10-16 + + Merge branch 'master' of github.com:qgis/QGIS into plugman + +Borys Jurgiel 2017-10-16 + + Plugin manager: Use QgsFileWidget for installing from zip files + +Matthias Kuhn 2017-10-16 + + Fix too-many-format-args + +Matthias Kuhn 2017-10-16 + + Fix typo in method name + +Matthias Kuhn 2017-10-16 + + Fix used-before-assignment + +Matthias Kuhn 2017-10-16 + + Fix broken error handling + +Matthias Kuhn 2017-10-16 + + Remove double-defined __init__ function + +Matthias Kuhn 2017-10-16 + + Fix file modes + +Matthias Kuhn 2017-10-16 + + Remove PyQt4 compatibility layer + +lbartoletti 2017-10-16 + + Fix remaining rubber band + +Daniele Viganò 2017-10-16 + + Fix a syntax error in dlg_sql_layer_window.py + +Merge: 11ec24f0fa 83212e760a +Borys Jurgiel 2017-10-16 + + Merge branch 'master' of github.com:qgis/QGIS into plugman + +Matthias Kuhn 2017-10-16 + + [travis] Stabilize spatialite tests + +Alessandro Pasotti 2017-10-16 + + [auth] Document cachain argument + +Martin Dobias 2017-10-12 + + Spin box: fix input of double values in locales with non-point decimal separator + +Alessandro Pasotti 2017-10-16 + + [auth] Sipify and doxify + +Alessandro Pasotti 2017-10-16 + + [auth] Pass by reference in const loop + +Alessandro Pasotti 2017-10-16 + + [auth] Removed oauth3 from cmake + +Nyall Dawson 2017-10-16 + + Fix processing tests + +Nyall Dawson 2017-10-16 + + Fix doxygen warning + +Nyall Dawson 2017-10-16 + + Move native c++ processing algorithms from core library to analysis + + And split into separate files for each algorithm + +Alessandro Pasotti 2017-10-16 + + [auth] Add checkbox to exclud root CAs from bundles on pkipkcs12 method + +Alessandro Pasotti 2017-10-16 + + [auth] Add checkbox to exclud root CAs from bundles on pkipath method + +Alessandro Pasotti 2017-10-16 + + [auth] Add method to exclude self-signed CAs from a list of certificates + +Merge: d4635d042d c6565da36f +Matthias Kuhn 2017-10-16 + + Merge pull request #5324 from DelazJ/locale + + Remove Locale tab from Options dialog + +Merge: afb2a6a098 562e9b442b +Matthias Kuhn 2017-10-16 + + Merge pull request #5317 from pblottiere/bugfix_style + + [bugfix] Fixes #17234 save/load styles from Postgres when a service file is used + +Merge: f579f1a449 fa1d299eeb +Matthias Kuhn 2017-10-16 + + Merge pull request #5333 from daniviga/better-rpm + + Improve buildrpms.sh for nightly builds + +Alessandro Pasotti 2017-10-13 + + [auth] Merge CAs added by PKI bundles to the trusted CAs + +Nyall Dawson 2017-10-16 + + Move bounds retrieval to QgsCoordinateReferenceSystem + + Allows reuse in scripts/plugins/etc + +Nyall Dawson 2017-10-16 + + Fix wheel events in map canvas are not accepted even after + a zoom actually occurs, causing the event to pass on to underlying + widgets (e.g scroll areas) + +Nyall Dawson 2017-10-16 + + Fix warnings + +Nathan Woodrow 2017-10-16 + + Fix build + + Something something Monday something... :) + +Nathan Woodrow 2017-10-16 + + [FEATURE][needs-docs] Show projection bounds in projection widget (#5356) + + - Script to pull bounds from EPSG.org Postgres dump + - Add resources/data/world_map.shp for reference + - Show canvas bounds for reference + +James Shaeffer 2017-10-15 + + Added new contributor (#5363) + +Borys Jurgiel 2017-10-16 + + [needs-docs] Move the install-plugin-from-ZIP menu action to the plugin manager. Also add a spacer to the left menu. + +Juergen E. Fischer 2017-10-15 + + query version from version.qgis.org instead of ubuntu.qgis.org + +Harrissou Sant-anna 2017-10-15 + + Optimize spacing in Color settings dialog + +Merge: d6a12e0ba0 277b508637 +Martin Dobias 2017-10-15 + + Merge pull request #5367 from wonder-sk/vertex-iterator-2 + + API for traversal of geometry's vertices using iterator pattern + +Juergen E. Fischer 2017-10-14 + + Fix 3D build on windows + +Harrissou Sant-anna 2017-10-14 + + Add source files location + +Martin Dobias 2017-10-14 + + Fix test + +Merge: b91b854a19 e6c64f69ce +rldhont 2017-10-14 + + Merge pull request #5316 from rldhont/db_manager_update_dblayer + + [FEATURE][needs-docs][DB Manager] Be able to update every Db layer from Postgres, Spatialite and Oracle + +Martin Dobias 2017-05-07 + + New API for traversal of geometry's vertices using iterator pattern + + Introducing: + 1. STL-style iterator: QgsAbstractGeometry::vertex_iterator + 2. Java-style iterator: QgsVertexIterator (built on top of STL-style) + + The iterators are modeled after Qt's STL-style and Java-style iterators, + the idea is to replace nextVertex() method and later introduce iterators + for other bits (e.g. part_iterator, ring_iterator). + +Harrissou Sant-anna 2017-10-14 + + Vertically align color widget in Effect properties dialog + +Merge: b250729e46 947b0cc49e +Nyall Dawson 2017-10-13 + + Merge pull request #5352 from nyalldawson/geom + + Geometry cleanups and modernization + +Alessandro Pasotti 2017-10-13 + + [auth] Add CAs to the connection for pkipkcs12 + +Alessandro Pasotti 2017-10-13 + + [auth] Add CAs to the connection for pkipaths + +Alessandro Pasotti 2017-10-13 + + [auth] Use utility method certsToPemText + +Alessandro Pasotti 2017-10-13 + + [auth] Port to QGIS3 and re-enable python test for QGIS auth system + +Alessandro Pasotti 2017-10-13 + + [auth] Add tests for CA utility methods + +Alessandro Pasotti 2017-10-13 + + [auth] Add CA utility methods + +Alessandro Pasotti 2017-10-13 + + [auth] Add CA chain to auth config + +Nyall Dawson 2017-10-13 + + Safer memory management in geos + + Also speed up avoid intersections by removing unnecessary geometry + cloning + +Nyall Dawson 2017-10-13 + + Some safer memory management for geos + +Nyall Dawson 2017-10-13 + + Rename detach methods in QgsGeometry for clarity + + Now we have: + + - detach (which clones the existing geometry) + and + - reset (which detaches without cloning and sets a new geometry) + +Nyall Dawson 2017-10-13 + + Even more memory safety in geometry internals by using qgis::make_unique + +Nyall Dawson 2017-10-13 + + 'Polyfill' std::make_unique to qgis::make_unique + +Nyall Dawson 2017-10-13 + + Move qgsAsConst to qgis::as_const + + So it's more inline with the std::as_const implementation which + it fills in for, and allows us to 'polyfill' other c++>11 + features into the qgis:: namespace. + +Mathieu Pellerin 2017-10-13 + + [3d] add show labels toggle, default to off (#5361) + +Nyall Dawson 2017-10-12 + + Fix travis build + +Nyall Dawson 2017-10-12 + + Cleanup some loops + +Nyall Dawson 2017-10-12 + + Rework internal geometry memory management + + Use unique_ptrs wherever possible, and cleanup geometry + detachments + +nirvn 2017-10-13 + + layer tree & 3d view toolbar panel size fix + +Martin Dobias 2017-10-12 + + [needs-docs] Remove OpenStreetMap integration in analysis lib + app + + - unmaintained and barely working anymore + - clunky GUI + - not supporting .pbf + - there are other python plugins doing the same thing better + - nobody is using it anymore + + https://lists.osgeo.org/pipermail/qgis-developer/2017-October/050103.html + +Martin Dobias 2017-10-12 + + Fix dragging 3D view with mouse when camera is far + + Before, when looking at a greater area (e.g. spanning 200km or more), + dragging 3D view with left mouse button would not work at all. Only + when zoomed in more it would start working again. + + This was cause by unproject() method in Qt having tolerance against division + by zero very high. Lowering the tolerance by few magnitudes fixed the problem (1e-5 to 1e-10) + +Blottiere Paul 2017-10-13 + + Add some tests + +Blottiere Paul 2017-10-13 + + [server][bugfix] Fixes OGC tests on getmap bbox + +James Shaeffer 2017-10-12 + + Updated the transparency widget to fix bug #16649 (#5358) + +nirvn 2017-10-13 + + [3d view] harmonize panel icon size + +Merge: f6ee7cb0a1 7b6156e445 +Nyall Dawson 2017-10-13 + + Merge pull request #5330 from nyalldawson/layout_next + + [layouts] Port group handling + +Merge: edf734677e d39427b827 +Nyall Dawson 2017-10-13 + + Merge pull request #5344 from nyalldawson/algs + + [processing] Port some algs to c++, minor improvements + +Nyall Dawson 2017-10-13 + + Fix build warning + +Nyall Dawson 2017-10-13 + + Port drop M/Z algorithm to c++ + +Nyall Dawson 2017-10-13 + + Port drop geometries to c++ + +Nyall Dawson 2017-10-13 + + Port boundary algorithm to c++ + + Also allow feature based algorithms to customise their appectable + input layers types and set suitable filters for all applicable + algorithms + +Nyall Dawson 2017-10-12 + + [FEATURE] Port autoincremental field to c++ + + Also add: + - support for setting initial value for field to start at + - support for user-set field names (instead of always using 'AUTO') + +Nyall Dawson 2017-10-11 + + [FEATURE][processing] New 'assign projection' algorithm + + This algorithm assigns a new projection to a vector layer. + It creates a new layer with the exact same features and + geometries as the input one, but assigned to a new CRS. + E.g. the geometries are not reprojected, they are just + assigned to a different CRS. + + This algorithm can be used to repair layers which have + been assigned an incorrect projection. + +Nyall Dawson 2017-10-11 + + Allow selection of a subset of fields to keep for hub lines algorithm + +Nyall Dawson 2017-10-11 + + Port hub lines algorithm to c++ + + Also: + - optimise a bit + - retain z/m values + - use point on surface for non-point layers, instead of + center of geometry bounding box + +Nyall Dawson 2017-10-11 + + Port Join Attributes to c++, add option to select subset of fields to copy + +lbartoletti 2017-10-12 + + Change QgsMapTool *mAddFeature to QgsMapToolAddFeature *mAddFeature and + remove dynamic_cast + +lbartoletti 2017-10-12 + + Avoid duplicate code for check if the layer is editable + +lbartoletti 2017-10-12 + + Use lambdas in the connect for tools (and circular tools) + +Mathieu Pellerin 2017-10-12 + + [processing] use a vector feature source for gdal clip raster by mask (#5351) + +Martin Dobias 2017-10-12 + + Fix numerical problems in the tessellator + + Due to the recent changes to allow non-horizontal surfaces, tessellator was loosing precision + in float math with large numbers, so there could be artefacts on extruded buildings between roof and walls + + Also clean up the code a bit - move stuff out of the main method + remove some duplicate code + +rldhont 2017-10-11 + + [Server][WFS] check const and indetation + +rldhont 2017-10-11 + + [Server][WFS] Update Transaction 1.1.0 + +rldhont 2017-10-05 + + [Server][WFS] Update GML GetFeature document + +rldhont 2017-10-05 + + [Server][WFS][Feature] Support resultType=hits from GetFeature 1.1.0 + +rldhont 2017-10-04 + + [Server][Tests] Update PyQgsServerWFS test for 1.1.0 + +rldhont 2017-10-04 + + [Server][Tests] Enhance assertXMLEqual + +rldhont 2017-09-28 + + [Server][WFS] Update GetFeature 1.1.0 + +rldhont 2017-09-28 + + [Server][WFS] Update QgsWfsParameters for GetFeature + +rldhont 2017-09-28 + + [Server] Request handler reads the document root attributes to expose parameters + +rldhont 2017-09-19 + + [Server][Tests] Add PyQgsServerWFS test + +rldhont 2017-09-19 + + [Server][WFS] Update DescribeFeatureType 1.1.0 + +rldhont 2017-09-14 + + [Server][WFS] add QgsWfsParameters + +rldhont 2017-09-14 + + [Server][WFS] Update GetCapabilities 1.1.0 + +rldhont 2017-09-14 + + [Server][WFS,1.1.0] Add layout for WFS supports + +Merge: 0028486a96 ea7ca58442 +Alexander Bruy 2017-10-12 + + Merge pull request #5243 from alexbruy/processing-gdal + + [processing] restore GDAL algorithms + +Merge: 5f401815c3 9d8854fc10 +Nyall Dawson 2017-10-12 + + Merge pull request #5185 from nyalldawson/materialize + + QgsFeatureSource::materialize experiment + +Harrissou Sant-anna 2017-10-11 + + Fix duplicate widget name + +Mathieu Pellerin 2017-10-12 + + [processing] use raster iterator in raster layer unique values report (#5343) + +Etienne Trimaille 2017-10-11 + + add helper to build a QgsRectangle from a WKT string + +Harrissou Sant-anna 2017-10-07 + + [needs-docs] Move Locale tab to General tab + +Martin Dobias 2017-10-11 + + [FEATURE] Data-defined extrusion and height for 3D polygon symbols + + ... because buildings with even heights are boring! + +Alexander Bruy 2017-10-11 + + [processing] add second hash for linear grid interpolation test + +Alexander Bruy 2017-10-11 + + [processing] disable test for script-based algorithms as GDAL scripts + are not available on Travis + +Alexander Bruy 2017-10-10 + + [processing] exclude location field from check + +Alexander Bruy 2017-10-10 + + [processing] disable clip by polygon tests as they pass locally but + fail on Travis with TopologyException + + ERROR 1: TopologyException: Input geom 1 is invalid: Self-intersection + at or near point 2 -1 at 2 -1 + +Alexander Bruy 2017-09-27 + + [processing][API]introduce QgsProcessingOutputFile output and fix gdal2xyz test + +Alexander Bruy 2017-09-27 + + [processing] fix execute sql test + +Alexander Bruy 2017-09-27 + + [processing] fix test for clip vector by mask algorithms + +Alexander Bruy 2017-09-27 + + [processing] fix clip by extent tests + +Alexander Bruy 2017-09-27 + + [processing] fix SQL-based geoprocessing tools and tests + +Alexander Bruy 2017-09-26 + + [processing] fix GDAL raster tests + +Alexander Bruy 2017-09-26 + + fix indentation + +Alexander Bruy 2017-09-26 + + [processing] tests for clipping (raster and vector) algorithms + +Alexander Bruy 2017-09-26 + + [processing] reproject extent into input CRS where possible + +Alexander Bruy 2017-09-26 + + [processing] use feature source in the interpolation algorithms + +Alexander Bruy 2017-09-26 + + [processing] fix copy-paste error in Execute SQL + +Alexander Bruy 2017-09-26 + + [processing] fix import + +Alexander Bruy 2017-09-19 + + [processing] tests for OGR-based algorithms + +Alexander Bruy 2017-09-19 + + [processing] restore gdal_merge algorithm + +Alexander Bruy 2017-09-19 + + [processing] restore Execure SQL algorithm + +Alexander Bruy 2017-09-19 + + [processing] restore dissolve algorithm + +Alexander Bruy 2017-09-18 + + [processing] restore ogr2ogr algorithm + +Alexander Bruy 2017-09-15 + + remove unused includes + +Alexander Bruy 2017-09-15 + + [processing] restore clip vector by mask algorithm + +Alexander Bruy 2017-09-15 + + [processing] restore clip vector by extent algorithm + +Alexander Bruy 2017-09-15 + + [processing] restore one side buffer algorithm + +Alexander Bruy 2017-09-15 + + [processing] homogenize and improve Points along lines + +Alexander Bruy 2017-09-15 + + [processing] restore buffer algorithm + +Alexander Bruy 2017-09-15 + + [processing] fixes to Offset curve algorithm + +Alexander Bruy 2017-09-14 + + fix typos and add tests for gdal algorithms + +Alexander Bruy 2017-09-08 + + [processing] restore offset curve algorithm + +Alexander Bruy 2017-09-08 + + [processing] restore ogrinfo algorithm + +Alexander Bruy 2017-09-08 + + [processing] rename some algorithms to avoid naming conflicts and + maintain consistency + +Alexander Bruy 2017-09-07 + + [processing] restore gdaladdo algorithm + +Alexander Bruy 2017-09-07 + + [processing] restore gdal2xyz algorithm + +Alexander Bruy 2017-09-07 + + [processing] restore retile algorithm + +Alexander Bruy 2017-09-07 + + fix optional CRS parameter handling + +Alexander Bruy 2017-09-07 + + [processing] restore gdal2tiles algorithm + +Alexander Bruy 2017-09-06 + + [processing] homogenize gdal algorithms + + -consistent parameters naming + -use additional creation options where possible + -remove duplicated functionality + +Alexander Bruy 2017-09-06 + + [processing] restore proximity algorithm + +Alexander Bruy 2017-09-06 + + [processing] restore clip raster by mask algorithm + +Alexander Bruy 2017-09-06 + + [processing] restore clip raster by extent algorithm + +Alexander Bruy 2017-09-05 + + [processing][FEATURE] add linear interpolation + +Alexander Bruy 2017-09-05 + + [processing][FEATURE] add IDW with neareast neighbor search + +Alexander Bruy 2017-09-05 + + [processing] restore nearest neighbor interpolation + +Alexander Bruy 2017-09-05 + + [processing] restore inverse distance to a power algorithm + +Alexander Bruy 2017-09-05 + + [processing] restore grid data metrics algorithm + +Alexander Bruy 2017-09-01 + + [processing] restore moving average interpolation + +Alexander Bruy 2017-09-01 + + [processing] restore gdaltindex algorithm and expose additional parameters + +Alexander Bruy 2017-09-01 + + [processing] minor fixes in rgb2pct algorithm + +Alexander Bruy 2017-08-31 + + [processing] restore fillnodata algorithm + +Alexander Bruy 2017-08-31 + + [processing] restore sieve algorithm + +Alexander Bruy 2017-08-31 + + [processing] restore contour algorithm + + Also expose new parameters and use custom widget for additional + creation options + +Alexander Bruy 2017-08-31 + + remove duplicate tests + +Alexander Bruy 2017-08-31 + + [processing] use native API to get GDAL driver name from filename + +Alexander Bruy 2017-08-31 + + [processing] restore roughness algorithm + +Alexander Bruy 2017-08-31 + + [processing] restore slope algorithm + +Alexander Bruy 2017-08-31 + + [processing] restore TPI algorithm + +Alexander Bruy 2017-08-31 + + [processing] restore polygonize algorithm + + Also expose band parameter + +Alexander Bruy 2017-08-31 + + fix permissions + +Alexander Bruy 2017-08-31 + + [processing] restore pct2rgb algorithm + +Merge: 33d23732e1 006352f128 +Martin Dobias 2017-10-11 + + Merge pull request #5342 from wonder-sk/tessellator-fixes + + Fixes to make tessellation of polygons without Z work again + +Merge: 2b742c7daf bf58e3d674 +Alessandro Pasotti 2017-10-11 + + Merge pull request #5338 from PeterPetrik/fix_build_gui_off + + fix build with -DWITH_GUI=FALSE + +Martin Dobias 2017-10-11 + + More tessellation fixes and more unit tests + +Etienne Trimaille 2017-10-10 + + bump to Qt 5.9 for the 3D + +Martin Dobias 2017-10-11 + + Improvements to tessellator unit test + death to qIsNaN() + +Merge: 0b5d07c243 057ddc2cee +Alessandro Pasotti 2017-10-11 + + Merge pull request #5332 from boundlessgeo/auth_mutex + + [auth] Add mutexes to protect access to authentication config cache from multiple threads + +Juergen E. Fischer 2017-10-11 + + debian packaging: server's schemaExtension.xsd moved + +Peter Petrik 2017-10-11 + + add missing header to GDAL_MOC_HDRS + +Blottiere Paul 2017-10-11 + + Add some const + +Martin Dobias 2017-10-11 + + Fixes to make tessellation of polygons without Z work again + + + initial work on unit testing of tessellator + +Peter Petrik 2017-10-10 + + fix build with -DWITH_GUI=FALSE + +Merge: 59fa541bc0 b2021e93b0 +Sandro Mani 2017-10-10 + + Merge pull request #5336 from manisandro/ogrsublayer_tinpolysurf + + [OGR] List TIN and PolyhedralSurface as Polygon when searching sublayers + +Sandro Mani 2017-10-10 + + [OGR] List TIN and PolyhedralSurface as Polygon when searching sublayers + + Sublayer geometry types are always single types + +Merge: 904a877aca 8eaa8c231f +Martin Dobias 2017-10-10 + + Merge pull request #5295 from liberostelios/3d-improve-triangulation + + Improve triangulation for QGIS 3D + +Merge: 9d8734c2b9 0b47ea8011 +Jürgen Fischer 2017-10-10 + + Merge pull request #5293 from nyalldawson/fix_dxf_reprojection + + Fix dxf export when CRS is not canvas CRS and not limiting to canvas extent + +Merge: 217c0e799a 863197f095 +Martin Dobias 2017-10-10 + + Merge pull request #5195 from wonder-sk/tracing-with-offset + + Tracing with offset + +Martin Dobias 2017-10-10 + + Code layout fixes after rebase + +Martin Dobias 2017-10-09 + + Fixes to initial unwanted segment when tracing with offset + unit tests! + +Martin Dobias 2017-09-14 + + Fix usability issues of tracing with offset + +Martin Dobias 2017-09-13 + + [FEATURE] Tracing with optional offset + + Tracing button in the snapping toolbar gets extra menu where it is possible to set + offset that will be applied to the traced line. Offset value can be either positive + (right side) or negative (left side). + +Merge: e6dcfa4e42 43bb3119e1 +Blottiere Paul 2017-10-10 + + Merge pull request #5145 from pblottiere/bugfix_ogc_getcapa_schemalocation + + [server][bugfix] Fix OGC test getcapabilities:validate-using-schemaLocation + +Blottiere Paul 2017-09-29 + + Add test + +Blottiere Paul 2017-09-29 + + Search schemaExtension.xsd in share directory + +Blottiere Paul 2017-09-29 + + schemaExtension.xsd is now installed in share directory + +Blottiere Paul 2017-09-06 + + Fix OGC test getcapabilities:validate-using-schemaLocation + +Merge: 61dcba4a81 fc876fe547 +Blottiere Paul 2017-10-10 + + Merge pull request #5287 from pblottiere/null + + [bugfix] Properly update filter comboboxes of relation reference widget + +Mathieu Pellerin 2017-10-10 + + [processing] add area to raster layer unique values report algorithm (#5334) + +Blottiere Paul 2017-10-03 + + Add some tests + +Blottiere Paul 2017-10-03 + + Filter comboboxes are reset when the widget is initialised and foreign key is deleted + +Nyall Dawson 2017-10-10 + + Set correct shortcut keys for undo/redo actions + +Nyall Dawson 2017-10-10 + + Better consistency for undo command text in layouts + +Nyall Dawson 2017-10-10 + + Add undo/redo to layout context menu + + Refs #1830 + +Nyall Dawson 2017-10-10 + + Use QUndoStack generated actions for undo/redo + + Benefits include correct icon text describing actual action + which will be undone/redone, automatic disabling/enabling of + action + +Nyall Dawson 2017-10-10 + + [FEATURE][layouts] Add group/ungroup action to layout context menu + + Group/ungroup actions show only when an appropriate selection + is present. I.e. "group" appears when a selection of at least + two items is present, and "ungroup" appears only when at least + one of the selected items is a group. + + Refs #1830 + +Nyall Dawson 2017-10-10 + + Fix redoing group visibility creates multiple new undo commands + +Nyall Dawson 2017-10-10 + + Fix handling of overlapping item commands + +lbartoletti 2017-10-09 + + remove setParentTool method in QgsMapToolAddCircularString + +lbartoletti 2017-10-09 + + - Increases the number of segments for QgsMapToolAddEllipse + +Nyall Dawson 2017-10-10 + + Fix doxygen test + +Nyall Dawson 2017-10-10 + + Fix tests + +Daniele Viganò 2017-10-09 + + Fix a typo in rpm/README.md + +lbartoletti 2017-10-09 + + Improve visibility of tangents tool on cadCanvasMoveEvent (compatible + when CADDockWidget is enabled) + +Merge: 19ee74b589 8759e7cd03 +Daniele Viganò 2017-10-09 + + Merge branch 'master' of https://github.com/qgis/QGIS into better-rpm + +lbartoletti 2017-10-09 + + Fix indent + +lbartoletti 2017-10-09 + + Use toCircularString instead of toPolygon for circle. + +Daniele Viganò 2017-10-09 + + Better RPM generation, add support for unstable builds + +Denis Rouzaud 2017-10-09 + + fix SIP_CONVERT_TO_SUBCLASS placement + +Matthias Kuhn 2017-10-09 + + Add ConvertToSubClass code to vertexmarker + +lbartoletti 2017-10-09 + + - Request for qgsmaptoolregularpolygoncentercorner.cpp and + qgsmaptoolregularpolygoncenterpoint.cpp + - Remove useless mNumberSidesSpinBox->setMinimum( 3 ); + +lbartoletti 2017-10-09 + + Typo for qgsmaptoolellipsecenter2points.{cpp,h} + +Stelios Vitalis 2017-10-09 + + Fix indentation in tesselator + +lbartoletti 2017-10-09 + + Requests for QgsMapToolCircle2TangentsPoint + +lbartoletti 2017-10-09 + + Requests for QgsMapToolAddRegularPolygon + +Nyall Dawson 2017-10-09 + + When moving/resizing grouped items, don't snap to selected + groups members + +Nyall Dawson 2017-10-09 + + Fix valgrind noise + +lbartoletti 2017-10-09 + + - mParentTool -> intialize to nullptr; + - =delete to explicit class; + - move clean() to private; + - remove unnecessary initializer; + +Denis Rouzaud 2017-10-09 + + replace vertexes by vertices + follow up 6b418decd6fe59a5a29716ff3014e476ec205091 + +Mathieu Pellerin 2017-10-09 + + [FEATURE][processing] raster layer unique values count algorithm (#5308) + +Nyall Dawson 2017-10-09 + + Fix undo/redo for groups + +Nyall Dawson 2017-10-09 + + Fix moving/resizing grouped items + +Nyall Dawson 2017-10-09 + + When a grouped item is selected, we only draw the individual item + bounds (not the group bounds) + +Nyall Dawson 2017-10-09 + + Grouped items are not selectable + +Nyall Dawson 2017-10-09 + + Port group actions from composer + +Nyall Dawson 2017-10-09 + + Start porting group handling from composer + +Nyall Dawson 2017-10-09 + + Don't create undo commands on destroying a layout + +Stelios Vitalis 2017-10-09 + + 3D tesselator fixes and refactoring to avoid leaks + +lbartoletti 2017-10-09 + + Requests for QgsMapToolAddCircle + +Matthias Kuhn 2017-10-09 + + Spelling: use vertices rather than vertexes + + ... because that's what's used almost consistently throughout the codebase. + +Merge: 8a8e2e3a14 9bbd0eacd1 +Blottiere Paul 2017-10-09 + + Merge pull request #5086 from pblottiere/pr_auxiliary_storage + + [Feature] Auxiliary Storage + +Denis Rouzaud 2017-10-09 + + fix sipify test + +Denis Rouzaud 2017-10-09 + + [sipify] remove redundant private sections + +Blottiere Paul 2017-10-09 + + Update sip binding + +Blottiere Paul 2017-10-09 + + Fix indentation + +Blottiere Paul 2017-10-04 + + Emit signal to update the style dock + +Blottiere Paul 2017-10-03 + + Ignore archive files given as layername in command line + +Blottiere Paul 2017-10-03 + + Auxiliary fields are linked to data defined for all subproviders + +Blottiere Paul 2017-10-02 + + Fix checkbox status for auxiliary field + +Blottiere Paul 2017-10-02 + + Check if join information is for auxiliary layer when filtering + +Blottiere Paul 2017-09-08 + + Expand documentation + +Blottiere Paul 2017-09-07 + + Update sip binding + +Blottiere Paul 2017-09-07 + + Add tests + +Blottiere Paul 2017-09-07 + + Some minor refactoring + +Blottiere Paul 2017-09-06 + + Actions are already initialized in header + +Blottiere Paul 2017-09-06 + + Remove Q_FOREACH + +Blottiere Paul 2017-09-06 + + Update information label + +Blottiere Paul 2017-09-06 + + Update documentation and sip binding + +Blottiere Paul 2017-09-06 + + Remove QgsAuxiliaryField class + +Blottiere Paul 2017-09-06 + + Allow user to create its own auxiliary field + +Blottiere Paul 2017-09-06 + + Add a custom name for symbol layers in property definition + +Blottiere Paul 2017-09-05 + + Properly update layer settings when an auxiliary field is deleted + +Blottiere Paul 2017-09-05 + + Auxiliary storage can be used on non spatial layer + +Blottiere Paul 2017-09-04 + + Fix join information in clone + +Blottiere Paul 2017-09-04 + + Revert a modification in diagram provider + +Blottiere Paul 2017-09-03 + + Add a safe guard + +Blottiere Paul 2017-09-03 + + Update documentation and sip binding + +Blottiere Paul 2017-09-03 + + Set editor widget setup to Hidden + +Blottiere Paul 2017-09-02 + + Auxiliary data is cloned too + +Blottiere Paul 2017-09-02 + + Auxiliary field creation is correctly managed for width in QgsSymbolsListWidget + +Blottiere Paul 2017-09-02 + + Do not activate auxiliary data button everywhere + +Blottiere Paul 2017-09-02 + + Fix auxiliary field creation for QgsSymbolListWidget + +Blottiere Paul 2017-09-02 + + A simple click is enough to create auxiliary layer and display "change label properties" window + +Blottiere Paul 2017-09-02 + + Automatically update the editor widget setup according to the standard template of the property newly created + +Blottiere Paul 2017-09-02 + + Hide auxiliary columns which can be edited by "change label properties" map tool + +Blottiere Paul 2017-09-02 + + Some cleanup in maptool + +Blottiere Paul 2017-09-01 + + Auxiliary fields for symbol layers + +Blottiere Paul 2017-09-01 + + Change label maptool is always available and underlying properties are created + +Blottiere Paul 2017-09-01 + + Move/rotate/hide/pin map tools are always available + +Blottiere Paul 2017-08-31 + + Remove default value for origin of property + +Blottiere Paul 2017-08-30 + + Rename name method to nameFromProperty + +Blottiere Paul 2017-08-30 + + Add explicit keyword + +Blottiere Paul 2017-08-30 + + Remove default in switch/case to rise warning if a new data type is added + +Blottiere Paul 2017-08-30 + + Move isAuxiliaryField to QgsVectorLayer + +Blottiere Paul 2017-08-30 + + Initialise pointers in header for QActions + +Blottiere Paul 2017-08-30 + + Add QStringLiteral + +Blottiere Paul 2017-08-30 + + Fix documentation + +Blottiere Paul 2017-08-30 + + Origin in QgsProperty is a string and pal is replaced by labeling + +Blottiere Paul 2017-08-30 + + Fix comment + +Blottiere Paul 2017-08-30 + + Always remove join info before resetting auxiliary layer + +Blottiere Paul 2017-08-30 + + Update sip binding + +Blottiere Paul 2017-08-30 + + Fix pointer initalization + +Blottiere Paul 2017-08-30 + + Expand documentation for QgsAuxiliaryLayer class + +Blottiere Paul 2017-08-30 + + Replace reset/release by std::move for unique_ptr + +Blottiere Paul 2017-08-30 + + Fix saveAs + +Blottiere Paul 2017-08-30 + + Expand documentation for QgsAuxiliaryStorage constructors + +Blottiere Paul 2017-08-30 + + Init bool value in header and do not init qstring attributes with empty value + +Blottiere Paul 2017-08-29 + + Fix enable state for change label map tool + +Blottiere Paul 2017-08-29 + + Button to store data in project activates the property if it exists in auxiliary layer + +Blottiere Paul 2017-08-29 + + Add a safe guard + +Blottiere Paul 2017-08-29 + + Update documentation and sip binding + +Blottiere Paul 2017-08-29 + + Rowid column from ogr provider is ignored thanks to a blacklist join option + +Blottiere Paul 2017-08-29 + + Implement delete field action + +Blottiere Paul 2017-08-29 + + Implement export action + +Blottiere Paul 2017-08-29 + + Implement delete action + +Blottiere Paul 2017-08-29 + + Implement clear action + +Blottiere Paul 2017-08-29 + + Do not show join configuration for auxiliary layer + +Blottiere Paul 2017-08-29 + + In case of a null variant, the default value is returned (otherwise moved labels/diagrams are not displayed on opening when show/hide DD are NULL) + +Blottiere Paul 2017-08-29 + + Update map tools to work with auxiliary fields in not editable mode + +Blottiere Paul 2017-08-29 + + Update auxiliary storage tab and data defined buttons according to auxiliary fields + +Blottiere Paul 2017-08-29 + + Implement action create auxiliary field + +Blottiere Paul 2017-08-29 + + [needs-doc] Add a new button in property menu to create auxiliary fields + +Blottiere Paul 2017-08-29 + + Add an origin (PAL or Diagram) to QgsProperty + +Blottiere Paul 2017-08-29 + + [needs-doc] Auxiliary layers can be created from the auxiliary storage tab + +Blottiere Paul 2017-08-29 + + Auxiliary layers may be created or loaded from auxiliary storage + +Blottiere Paul 2017-08-29 + + Add auxiliary storage mechanism in project + +Blottiere Paul 2017-08-28 + + [needs-doc] Add auxiliary storage tab + +Nyall Dawson 2017-10-09 + + Followup 1429f2c7, remove duplicate connections + +Ismail Sunni 2017-10-09 + + Add methods to remove variables from global/project scope + +Nyall Dawson 2017-10-09 + + Move some getters which are incorrectly marked as slots, + remove some unnecessary 'const's from signals + + Thanks to clazy const-signal-or-slot check + +Merge: 9aa6142bab e8634210f8 +Nyall Dawson 2017-10-09 + + Merge pull request #5326 from nyalldawson/frick_off_autoconnects + + Flip autoconnected slots to explicit connections + +Merge: 5d0f8cd871 3c87fe162a +Nyall Dawson 2017-10-09 + + Merge pull request #5291 from nyalldawson/layout_next + + [layouts] Port most interaction actions from composer + +Nyall Dawson 2017-10-09 + + Make more slots private + +Nyall Dawson 2017-10-09 + + Fix missing connection + +Nyall Dawson 2017-10-09 + + Remove all previously autoconnected slots from public API + + These are implementation details only, and should not be + part of the stable API. + + We need the flexibility to change these at any stage without + being bound by any API contract. + +Nyall Dawson 2017-10-09 + + Remove autoconnected slots, pt 2 + +Nyall Dawson 2017-10-08 + + Flip autoconnected slots to explicit connections, pt 1 + +Merge: b9dd23805b edda367598 +Matthias Kuhn 2017-10-08 + + Merge pull request #5323 from DelazJ/networkspacing + + Align items and reduce spacing in Options -> Network dialog + +Merge: b4f3055d02 5600236a28 +Matthias Kuhn 2017-10-08 + + Merge pull request #5325 from DelazJ/qgsoptions + + Clean QgsOptions class from on_m...clicked() calls + +Harrissou Sant-anna 2017-10-08 + + Fix again + +Harrissou Sant-anna 2017-10-08 + + Fix spelling + +Harrissou Sant-anna 2017-10-07 + + Align items and reduce spacing in Options -> Network dialog + +Matthias Kuhn 2017-10-07 + + [spatialite] Avoid the term "Error", saving style to DB is optional + +Matthias Kuhn 2017-10-07 + + Close file after write + +Matthias Kuhn 2017-10-07 + + Remove executable flag from test files + +Matthias Kuhn 2017-10-07 + + [travis] Add more color to output + +Matthias Kuhn 2017-10-07 + + [travis] Fold ccache statistics + +Matthias Kuhn 2017-10-07 + + [travis] Make section titles bold + +Matthias Kuhn 2017-10-07 + + [travis] Improve fold title for build section + +Matthias Kuhn 2017-10-07 + + [travis] Fold cmake output + +Matthias Kuhn 2017-10-07 + + [travis] Less noise for DB initialisation + +Matthias Kuhn 2017-10-07 + + [travis] Be quiet + +Stelios Vitalis 2017-10-07 + + Add information regarding polygon's normal calculation + +Matthias Kuhn 2017-10-07 + + Fix build warning + +Juergen E. Fischer 2017-10-07 + + fix build + +Harrissou Sant-anna 2017-10-07 + + Clean QgsOptions class from on_m...clicked() calls + +Marco Bernasocchi 2017-10-06 + + Added QgsFields::names method to get a list of all the names of fields + +Stelios Vitalis 2017-10-06 + + Refactoring on tesselator and other remarks applied + +Blottiere Paul 2017-10-06 + + Add tests + +Blottiere Paul 2017-10-06 + + Fixes #17234 save/load styles from Postgres when a service file is used + +Alessandro Pasotti 2017-10-06 + + [auth] Added mutex to protect cache for pkipkcs12 auth + +Alessandro Pasotti 2017-10-06 + + [auth] Added mutex to protect cache for pkipaths auth + +Alessandro Pasotti 2017-10-06 + + [auth] Added mutex to protect cache for identcert auth + +Alessandro Pasotti 2017-10-06 + + [auth] Added mutex to protect cache for basic auth + +rldhont 2017-10-06 + + [FEATURE][DB Manager] Be able to update every Db layer from Postgres, Spatialite and Oracle + +rldhont 2017-10-06 + + [BUGFIX][DB Manager] Fix update SQL Layer datasource + +Alessandro Pasotti 2017-10-06 + + [auth] Check for empty credentials instead of null + +Alessandro Pasotti 2017-10-06 + + Prevent duplicated tabs in message log panel + + by removing & when looping through existing tab names + +Denis Rouzaud 2017-10-06 + + fix and bring back scroll area into custom widgets + +Stelios Vitalis 2017-10-06 + + Fix indentation and apply remarks + +Nyall Dawson 2017-10-06 + + Consistent tense for undo commands + +Nyall Dawson 2017-10-06 + + Add undo commands when reordering items through items dock + +Nyall Dawson 2017-10-06 + + Port display name handling from composer + +Nyall Dawson 2017-10-06 + + Fix undo/redo crash with temporary test item + +Nyall Dawson 2017-10-06 + + Indentation + +Nyall Dawson 2017-10-06 + + Port hide pages action from composer + +Nyall Dawson 2017-10-06 + + Port keyboard nudge of items from composer + +Nyall Dawson 2017-10-06 + + Call base class undo commands + +Nyall Dawson 2017-10-06 + + Fix invalid merge of non equal item commands + +Nyall Dawson 2017-10-06 + + Port preview modes from composer + +Nyall Dawson 2017-10-06 + + Fix items are removed from scene twice + +Nyall Dawson 2017-10-06 + + Fix build when model test is enabled + +Nyall Dawson 2017-10-04 + + Create undo/redo commands when changing item visibility + +Nyall Dawson 2017-10-04 + + Add undo/redo commands when toggling lock through items panel + +Nyall Dawson 2017-10-04 + + Fix size of columns in items dock on hidpi screens + +Nyall Dawson 2017-10-04 + + Add new icon for resize to square (thanks @nirvn) + +Nyall Dawson 2017-10-04 + + Hide most of QgsLayoutModel from stable API and remove from bindings + + We only expose the QAbstractItemModel interface as stable API - the + rest is non-stable and subject to change. + +Nyall Dawson 2017-10-04 + + Nicer API for adding/removing items + + Automatically create the corresponding undo commands, so that + plugins and scripts which add/delete items will be added to + the undo stack without any work required. + +Nyall Dawson 2017-10-04 + + Even more explicit naming + +Nyall Dawson 2017-10-04 + + Save/restore frame properties, add unit tests for undo/redo + +Nyall Dawson 2017-10-04 + + Save/restore a few more layout item properties + +Nyall Dawson 2017-10-04 + + Correctly create undo commands for item addition and removal + +Nyall Dawson 2017-10-04 + + Nicer menu naming + +Nyall Dawson 2017-10-04 + + [FEATURE][layouts] Add 'resize to square' action + + Resizes all selected items so that they are square + +Nyall Dawson 2017-10-04 + + Use new icons + +nirvn 2017-10-04 + + [layout] add distribute and resize action icons + +Nyall Dawson 2017-10-04 + + Fix doxygen warning + +Nyall Dawson 2017-10-04 + + Port delete action - TODO: undo/redo + +Nyall Dawson 2017-10-04 + + [FEATURE][layout] Add actions to auto resize items in a selection + + Options are resize to narrowest, widest, shortest and tallest. + +Nyall Dawson 2017-10-04 + + [FEATURE][layout] Add item distribution actions + + Adds actions for distributing selections of items by their + left/center/right/top/bottom edges. + + Useful for quickly evenly distributing items in the layout + + Needs new icons + +Nyall Dawson 2017-10-03 + + Unit tests for alignment + +Nyall Dawson 2017-10-03 + + Port item alignment to layouts + +Nyall Dawson 2017-10-03 + + Add more unit tests + +Nyall Dawson 2017-10-03 + + Move actions which apply to selected items only to QgsLayoutView + + Selections are a gui concept, so these actions belong to the + gui class instead of cluterring QgsLayout + +Nyall Dawson 2017-10-03 + + Add tests for changing item z order + +Nyall Dawson 2017-10-03 + + Unfinished restore of stacking actions + +Nyall Dawson 2017-10-03 + + Port toggle panel action to layouts + +Nyall Dawson 2017-10-03 + + Restore items dock + +Nyall Dawson 2017-10-03 + + Port select next above/below actions + +Nyall Dawson 2017-10-03 + + Resurrect locking/unlocking item actions + +Nyall Dawson 2017-10-03 + + Correctly report selected status to items model + +Nyall Dawson 2017-10-03 + + Port item model from composer to layouts + +Nyall Dawson 2017-10-03 + + Port selection actions to layout + +Nyall Dawson 2017-10-03 + + Remove redundant custom enum (use Qt version instead) + +Nyall Dawson 2017-10-03 + + Correctly handle item focusing in layout designer + +Nyall Dawson 2017-10-02 + + Fix orphan snap lines sometimes show + +Nyall Dawson 2017-10-02 + + Select new items after adding them + +Nyall Dawson 2017-10-02 + + Ensure that snap lines show for whole layout + +Nyall Dawson 2017-10-02 + + Fix item snapping while resizing + +Nyall Dawson 2017-10-02 + + Nicer mouse handle alignment behaviour + + Don't show horizontal/vertical align snap lines if the resize + isn't allowing resizing in that axis + +Nyall Dawson 2017-10-02 + + Prevent snapping to selected items when resizing + +Nyall Dawson 2017-10-02 + + [FEATURE][layouts] Snapping to item bounds when creating new items + + Previously snapping to item bounds would only occur when resizing + or moving items, now it also applies to item creation + +Nyall Dawson 2017-10-02 + + Add item bounds based snapping to QgsLayoutSnapper + +Nyall Dawson 2017-10-02 + + Fix undo/redo for mouse actions + +Nyall Dawson 2017-10-02 + + Prevent unwanted mouse cursor changes + +Nyall Dawson 2017-10-02 + + Fix resizing items + +Nyall Dawson 2017-10-02 + + Move mouse handles to select tool + +Nyall Dawson 2017-10-02 + + Port methods for retrieving item at a point to layouts + +Nyall Dawson 2017-09-29 + + Work on interactive moving of items + +Nyall Dawson 2017-09-29 + + Restore ability to show/hide selection bounds + +Nyall Dawson 2017-09-29 + + Fix click behavior in select tool + +Nyall Dawson 2017-09-29 + + Start porting mouse handles to layout + +Nyall Dawson 2017-09-29 + + Add method to push messages to layout designer status bar + +Nyall Dawson 2017-09-29 + + Allow selection tool to control selection + +Nyall Dawson 2017-09-29 + + Don't pass handled mouse events down to QGraphicsView + +Nyall Dawson 2017-09-29 + + Shape items should not have a background/frame + +Nyall Dawson 2017-09-29 + + Add signals for size and rotation changes + +Nyall Dawson 2017-09-29 + + Port some composer utils + +Nyall Dawson 2017-09-29 + + Port selection handling code from composer + +Nyall Dawson 2017-09-29 + + Port item frame related code from composer + +Nyall Dawson 2017-09-29 + + Port item selection and lock related code from composer + +Nyall Dawson 2017-09-12 + + Port frame and background handling to layout items + + And add support for frame widths with units + +Nyall Dawson 2017-10-06 + + Fix doxygen warning + + See http://doxygen.10944.n7.nabble.com/How-can-I-escape-in-a-comment-td5528.html + +Mario Baranzini 2017-10-06 + + Fix QgsDockWidget custom widget + +Merge: 58d7176979 04a9cd9211 +Nyall Dawson 2017-10-06 + + Merge pull request #5300 from nyalldawson/formatting + + Doxygen Formatting + +Nyall Dawson 2017-10-06 + + Fix build warnings + +Nyall Dawson 2017-10-06 + + Add more consistency to doxygen formatting + +Nyall Dawson 2017-10-05 + + Fix doxygen warnings + +Nyall Dawson 2017-10-05 + + Make doxygen_space script convert multiline //! comments + + Because: + - the /** format is much more prevalent throughout QGIS + - sipify works correctly with /** + +Nyall Dawson 2017-10-05 + + Initialize pointers to nullptr in headers + +Merge: 2f44d52ee5 7528207333 +Alessandro Pasotti 2017-10-05 + + Merge pull request #5281 from boundlessgeo/auth_use_settings_widget + + [auth][needs-docs] Provider connection dialogs use the new auth settings widget + +Merge: a725dae950 de126a1452 +Sandro Mani 2017-10-05 + + Merge pull request #5298 from manisandro/ogr_tin_triangle + + [Feature][OGR] Support Triangle, TIN and PolyhedralSurface geometry types by mapping them to Polygon and MultiPolygon respectively + +Merge: 1e60213a84 7eb247525b +Sandro Mani 2017-10-05 + + Merge pull request #5288 from manisandro/defer_repack_v2 + + [OGR] Pass AUTO_REPACK=OFF when opening datasets for non-implicit update modes + +Alessandro Pasotti 2017-10-05 + + [auth] Sipify + +Alessandro Pasotti 2017-10-05 + + [auth] More verbose docstrings + +nirvn 2017-10-05 + + [layout] improve the select / move item tool icon + +nirvn 2017-10-05 + + [layout] update align action icons + +Sandro Mani 2017-10-04 + + Also handle QgsWkbTypes::Triangle in QgsSymbol::renderFeature + +Sandro Mani 2017-10-04 + + Fix QgisApp::askUserForOGRSublayers expecting 4 fields per sublayer, but since 51abef4d there can be up to 5 + +Sandro Mani 2017-10-04 + + [Feature][OGR] Support Triangle, TIN and PolyhedralSurface geometry types by mapping them to Triangle and MultiPolygon respectively + +Sandro Mani 2017-10-04 + + Remove debug leftover + +Sandro Mani 2017-10-04 + + Fix QgsTriangle::fromWkb possibly not setting ring geometry + +Sandro Mani 2017-10-04 + + Also handle triangles in QgsGeometryFactory::geomFromWkbType + +Larry Shaffer 2017-10-04 + + [auth] Update wording of auth settings widget; add formatted warnings + +Stelios Vitalis 2017-10-04 + + Change triangulation algorithm for 3D planes + +Matthias Kuhn 2017-10-04 + + Fix multiline docstring + +Harrissou Sant-anna 2017-10-04 + + Remove the unneeded close button on select by expression (#5273) + + fixes #17207 + +Matthias Kuhn 2017-10-04 + + Less executable files in codebase + +Stelios Vitalis 2017-10-04 + + Remove validation of geometries (GEOS validation is not 3D enabled) + +Larry Shaffer 2017-10-04 + + [auth] Update embedded QgsAuthSettingsWidget spacing + + - Minimize all text-wrapped QLabel text in QgsAuthSettingsWidget + (wrapped text defaulted to 3 lines of spacing, even if not used) + - Remove default 'Basic' text + - Hide Basic QLabel if there is no text + - Add 'Optional' placholder text for Password of Basic + - Fix non-expanded Name and URL fields for newhttpconnectionbase.ui + - Smaller minimum size for QgsAuthConfigSelect + - Minimize 'Convert to configuration' button width + +Sandro Mani 2017-10-03 + + [OGR] Don't call repack after OGR_L_SyncToDisk if compiled against gdal-2.2.0+ + + OGR_L_SyncToDisk internally does a repack with gdal-2.2.0 onwards + +Sandro Mani 2017-10-03 + + [OGR] Pass AUTO_REPACK=OFF when opening datasets for non-implicit update modes + +Matthias Kuhn 2017-10-04 + + Private classes should not be exported + +Matthias Kuhn 2017-10-04 + + CMakeLists.txt does not need to be executable + +Matthias Kuhn 2017-10-04 + + conversions.sip does not need to be executable + +Merge: c764d9c177 f8152c1eec +rldhont 2017-10-04 + + Merge pull request #4912 from dmarteau/svg-marker-size + + [FEATURE][needs-docs] Svg marker size: change aspect ratio + +Merge: 1ed95f4855 159486515b +Matthias Kuhn 2017-10-04 + + Merge pull request #5256 from qgis/docker2 + + [travis] Use docker to run test + +Harrissou Sant-anna 2017-10-04 + + Fix Select tools switch settings + +Nyall Dawson 2017-10-04 + + Fix dxf export when CRS is not canvas CRS and not limiting to canvas extent + +Nyall Dawson 2017-10-04 + + Fix windows build + +Nyall Dawson 2017-10-04 + + Fix build warning + +Nyall Dawson 2017-10-04 + + Added better version info to QgsRectangle::buffered + +Merge: 9256d00606 0bffe1c1d6 +Martin Dobias 2017-10-04 + + Merge pull request #5183 from wonder-sk/cad-utils + + Refactor CAD editing alignment logic to new QgsCadUtils class + +Harrissou Sant-anna 2017-10-03 + + Save active button in settings + +Harrissou Sant-anna 2017-10-03 + + Add some consistency + + in variables naming according to the name used in the comment few lines above + +Harrissou Sant-anna 2017-10-03 + + Enable display of selection tools in Attribute toolbar + + when switching tools + +lbartoletti 2017-10-03 + + remove SquareCenter use RegularPolygon instead + +lbartoletti 2017-10-03 + + Change rubberband of possible centers to point. + +lbartoletti 2017-10-03 + + Uniformize message when segments are parallels + +lbartoletti 2017-10-03 + + Visual indent part 3 + +lbartoletti 2017-10-03 + + Visual indent part 2 + +lbartoletti 2017-10-03 + + Visual indent part 1 + +lbartoletti 2017-10-03 + + Use unique_ptr for mNumberSidesSpinBox + +lbartoletti 2017-10-03 + + modernize (delete default) destructor + +Merge: de80f44e86 f20041dc60 +lbartoletti 2017-10-03 + + Merge branch 'regularShape_gui' of https://github.com/lbartoletti/QGIS into regularShape_gui + +lbartoletti 2017-10-03 + + Concat successive if + +lbartoletti 2017-10-03 + + Concat successive if + +lbartoletti 2017-10-03 + + Add const + +lbartoletti 2017-10-03 + + @return -> \returns + +lbartoletti 2017-10-03 + + Move header and normalize space + +Merge: 22d4d22b93 afecc21012 +Alessandro Pasotti 2017-10-03 + + Merge pull request #5289 from boundlessgeo/bugfix_16427 + + [bugfix] Do not cache invalid WM(T)S responses + +lbartoletti 2017-10-03 + + Add missing copyright for QgsMapToolAddRegularPolygon + +lbartoletti 2017-10-03 + + Remove initialization when it's already in header + +Matthias Kuhn 2017-10-03 + + Add sanitized landsat2.nc + + @rouault + > [landsat2.nc.zip](https://github.com/qgis/QGIS/files/1352514/landsat2.nc.zip) + > "gdal_translate -of NETCDF landsat.tif landsat2.nc" will not work as expected + > since the driver doesn't support creating subdatasets. I have used ncdump + + > manual changing of _FillValue to 0 + ncgen to recreate it. Hopefully it + > should work (untested) Result attached + +Matthias Kuhn 2017-09-28 + + Ignore missing logfile + +Matthias Kuhn 2017-09-27 + + Disable unstable tests + + Parts of the following tests behave unstable because of enironment changes + (distro upgrade, running in docker, ...) or dependency updates. + + - qgis_rastersublayertest (Failed) + - PyQgsShapefileProvider (Failed) + - PyQgsWFSProvider (Failed) + + They are unlikely to be introduced by the new continuous integration + environment. + + Therefore, the affected parts have been disabled. Help by knowledgeable + developers to make the tests more stable or fix real underlying issues. + +Martin Dobias 2017-09-14 + + Added forgotten SIP file + +Martin Dobias 2017-09-13 + + Finished unit tests + +Martin Dobias 2017-09-12 + + Refactor CAD editing alignment logic to new QgsCadUtils class + +Alessandro Pasotti 2017-10-03 + + [:)] Make a developer happy + +Alessandro Pasotti 2017-10-03 + + [bugfix] Do not cache invalid WM(T)S responses + + The problem here was that in case of http->https redirect + from a misconfigured server (that advertizes http and then + redirects all request to https) all http redirect requests + were cached, making all subsequent requests to the same + url hit the 301 Moved Permanently reponse page intead of + the redirected content. + + Fixes #16427 WMTS rendering problems in 2.18 and Master + +lbartoletti 2017-10-03 + + Fix qgisapp.ui + +Merge: 0204302aaa 22d4d22b93 +lbartoletti 2017-10-03 + + Merge branch 'master' into regularShape_gui + +lbartoletti 2017-10-03 + + - Add QgsMapToolRegularPolygonCenterCorner and change + QgsMapToolRegularPolygonCenterPoint + - Add QgsMapToolCircle2TangentsPoint + +Mathieu Pellerin 2017-10-03 + + fix highlight showing when hidden (#5278) + +Pete King 2017-10-03 + + Update and vectorize the DB manager icon (#5262) + +Nyall Dawson 2017-10-03 + + [processing] Fix history doesn't correctly escape values + + Fixes #17229 + +Juergen E. Fischer 2017-10-03 + + translation string fix + +Nyall Dawson 2017-10-03 + + Fix duplicate WFS item in browser (fixes #17176) + +Alessandro Pasotti 2017-10-03 + + [auth] Proxy settings use the new auth settings dialog + +Merge: 58f64bb4af 04cdf496b7 +Blottiere Paul 2017-10-03 + + Merge pull request #5150 from pblottiere/server_bugfix_ogc_getfeatureinfo_invalid_format + + [server][bugfix] Fix OGC test getfeatureinfo:invalid-info_format + +Merge: f3a4a6b2ec 2326334cb3 +Nyall Dawson 2017-10-03 + + Merge pull request #5276 from nyalldawson/build_dep + + Update some Windows build instructions + +Juergen E. Fischer 2017-10-02 + + debian packaging: add 3d for sid and artful + +Merge: 143c4bf677 d46c440110 +Martin Dobias 2017-10-02 + + [FEATURE] QGIS 3D (pull request #5203) + +Alessandro Pasotti 2017-10-02 + + [auth] XYX use the new authentication widget + +Alessandro Pasotti 2017-10-02 + + [auth] PG uses the new authentication widget + +Alessandro Pasotti 2017-10-02 + + [auth] Renamed setters to better follow Qt5 conventions + +Alessandro Pasotti 2017-10-02 + + [auth] DB2 use the new authentication widget + +Alessandro Pasotti 2017-10-02 + + [auth] Added support for "Store" checkboxes + +Merge: 2fa68110e3 524c7915e8 +Matthias Kuhn 2017-10-02 + + Merge pull request #5275 from daniviga/qgis3-rpm + + Initial RPM sources update for QGIS3 + +Alessandro Pasotti 2017-10-02 + + [auth] Use new auth settings widget in http connections dialogs + +Alessandro Pasotti 2017-10-02 + + [auth] Tests for new setters methods + +Alessandro Pasotti 2017-10-02 + + [auth][cosmetic] Moved method + +Alessandro Pasotti 2017-10-02 + + [auth] Removed group box wrapper + +Alessandro Pasotti 2017-10-02 + + [auth] Added setters to the auth settings widget + + Also: + - removed wrapper goupBox for added flexibility + - explicit connections + +Merge: 11eb9cfe57 feeec8e0bf +Alessandro Pasotti 2017-10-02 + + Merge pull request #5279 from boundlessgeo/auth_widget_signals + + [auth] Use explicit signal connections in auth settings widget + +Alessandro Pasotti 2017-10-02 + + [auth] Use explicit signal connections + +Matthias Kuhn 2017-09-30 + + Show actions menu in feature form + + Fix #16889 + +Mathieu Pellerin 2017-10-02 + + [style dock] fix wrong label settings when switching layers + + (fixes #17029) + +Merge: 65bade9d05 e4a4d3d191 +Alessandro Pasotti 2017-10-02 + + Merge pull request #5270 from boundlessgeo/auth_widget2 + + [auth][needs-docs] Authentication widget + +Daniele Viganò 2017-10-02 + + Update qgis-mime.xml for RPM, replace wrong ext in buildrpms.sh + +lbartoletti 2017-10-02 + + Reborn of QgsMapToolCircle3Tangents. Thanks Martin! + +Daniele Viganò 2017-10-02 + + Force vim syntax in rpm/qgis.spec.template + +Matthias Kuhn 2017-10-02 + + Typo fix + +Matthias Kuhn 2017-10-02 + + Add missing break + +Merge: d1018cbe2b c5ed92ca8d +Blottiere Paul 2017-10-02 + + Merge pull request #5157 from pblottiere/server_bugfix_ogc_invalid_querylayers + + [server][bugfix] Fix OGC test getfeatureinfo:invalid-query_layers + +Merge: d922b5540e 5b6f02ecde +Nyall Dawson 2017-10-02 + + Merge pull request #5268 from nyalldawson/flash2 + + [FEATURE] Flash features + +Nyall Dawson 2017-10-02 + + Update INSTALL + +Nyall Dawson 2017-10-02 + + Update references to Qt4 in msys build instructions to Qt5 + + (untested) + +Nyall Dawson 2017-10-02 + + Update ancient cmake download link + +Nyall Dawson 2017-10-02 + + Explicitly mention that Python3 is a compulsory build dependancy + +Nyall Dawson 2017-10-02 + + Add python3-six to windows build deps + + It's required for building the expression context help + +Nyall Dawson 2017-10-02 + + Fix some gcc build warnings + +Nyall Dawson 2017-10-02 + + Avoid some unnecessary build warnings when WITH_BINDINGS is off + +Nyall Dawson 2017-10-02 + + Refine flash features API + + Use a QgsCoordinateReferenceSystem object instead of + QgsVectorLayer to make API more flexible + +Nyall Dawson 2017-09-29 + + Use a clone of the renderer for attribute table model + + Fixes potential crash + +Nyall Dawson 2017-09-29 + + Fix rubber band doesn't like geometries with Z/M + +Nyall Dawson 2017-09-29 + + More efficient canvas features flash + +Nyall Dawson 2017-09-29 + + Make rubber band creation a bit more efficient (avoid multiple transform creation) + +Nyall Dawson 2017-09-29 + + [FEATURE] Flash features in canvas + + This adds: + - API call to QgsMapCanvas to flash a set of features + - A right click menu option in the attribute table to flash + the clicked feature + - An option in the Search by Form dialog to flash matching + features + + When triggered, the features flash allowing easy identification + without having to alter the current selection or map extent + +Nyall Dawson 2017-09-29 + + Fix incorrect draw stacking when drawing rubber bands with + secondary lines enabled + +Daniele Viganò 2017-10-01 + + Update links to issues in qgis.spec.template + +Daniele Viganò 2017-10-01 + + Initial RPM sources update for QGIS3 + +Martin Dobias 2017-10-01 + + Downgrade "Super 3D Map Widget" to plain, average, ordinary "3D Map" widget + +Martin Dobias 2017-10-01 + + Fix crash in tessellation (polygon 3D symbol) for touching rings + +Juergen E. Fischer 2017-10-01 + + fix windows build + +Nyall Dawson 2017-09-28 + + Replace default constructors/destructors with = default + +Martin Dobias 2017-09-30 + + Add copyright headers + few bits from review + fixing sip updates + +Martin Dobias 2017-09-30 + + Introduced Shape enum for 3D point symbols (from Nyall's review) + +Martin Dobias 2017-09-30 + + Turn QDoubleSpinBox widgets into QgsDoubleSpingBox (from Nyall's review) + +Martin Dobias 2017-09-30 + + Address comments from Nyall's code review + +Alessandro Pasotti 2017-09-30 + + [auth] Sipify + +Alessandro Pasotti 2017-09-30 + + [auth] Renamed class to QgsAuthSettingsWidget + +Alessandro Pasotti 2017-09-29 + + [auth] Restore configurations active tab at start + +Alessandro Pasotti 2017-09-29 + + [auth] Added \since QGIS 3 + +Alessandro Pasotti 2017-09-29 + + [auth] New icons for the config selector widget + +Matthias Kuhn 2017-09-29 + + [FEATURE] Default values on update + + Add an option to add default values on update of attributes or geometry. + This can be seen as a "derived value" that will be saved to the database + (like area of a polygon) or as a means to track last_modified dates etc. + + See #5218 + +Matthias Kuhn 2017-09-29 + + Fix indentation + +Matthias Kuhn 2017-09-29 + + Avoid recursion in apply on update default values + +Matthias Kuhn 2017-09-29 + + Config interface for apply on update default values + +Matthias Kuhn 2017-09-28 + + Doxygen + +Matthias Kuhn 2017-09-28 + + Make Mr. Travis happy + +Matthias Kuhn 2017-09-27 + + Fix missing import + +Matthias Kuhn 2017-09-27 + + Fix QgsVectorLayerUtils::createFeature + +Matthias Kuhn 2017-09-27 + + Fix compilation + +Matthias Kuhn 2017-09-27 + + Add more applyOnUpdate tests + +Matthias Kuhn 2017-09-27 + + Test updates for changed method name/signature + +Matthias Kuhn 2017-09-27 + + Doxygen updates for changed method names + +Matthias Kuhn 2017-09-27 + + Default Value updates for QgsField stream operator + +Matthias Kuhn 2017-09-26 + + More default value tests + +Matthias Kuhn 2017-09-26 + + Actually apply default value + +Matthias Kuhn 2017-09-26 + + Pssst... Quiet, there are people around + +Matthias Kuhn 2017-09-26 + + Add tests for QgsDefaultValue + +Matthias Kuhn 2017-09-26 + + Rename QgsField::defaultValue + + It's now called QgsField::defaultValueDefinition, because it's only a + value after being evaluated + +Matthias Kuhn 2017-09-26 + + Update cpp tests for QgsDefaultValue + +Matthias Kuhn 2017-09-26 + + Remove redundant nullptr check + +Matthias Kuhn 2017-09-26 + + Fix typo in QgsFields api doc + +Matthias Kuhn 2017-09-26 + + Properly report QgsDefaultValue.__bool__ in Python + +Matthias Kuhn 2017-09-26 + + Apply default values on update + +Matthias Kuhn 2017-09-20 + + Use QgsDefaultValue throughout the code + +Matthias Kuhn 2017-09-20 + + Doxymentation + +Matthias Kuhn 2017-09-19 + + Add sip bindings + +Matthias Kuhn 2017-09-19 + + Add some doxymentation + +Matthias Kuhn 2017-09-19 + + Add "apply on update" option to default values + +Merge: f981795bec ca5a0bb3de +Matthias Kuhn 2017-09-29 + + Merge pull request #5269 from m-kuhn/represent_value + + [expression] represent_value also determines implicitly provided column name + +Matthias Kuhn 2017-09-27 + + Make parse_dash_result safer to use + +Matthias Kuhn 2017-09-27 + + Update control image mask + +Matthias Kuhn 2017-09-27 + + Make valid CRS test less sensitive + + See https://github.com/qgis/QGIS/commit/fbf99afd01a9dbf7bc8a09cea0f9e9d6d0729a67#commitcomment-24572295 + +Matthias Kuhn 2017-09-29 + + Silence the lambs + +Matthias Kuhn 2017-09-29 + + Range based for loop + +Matthias Kuhn 2017-09-29 + + Fix NULL vs 0 issue in relation reference widget + + Fix #16760 https://issues.qgis.org/issues/16760 + +Alessandro Pasotti 2017-09-29 + + [auth] Added tests and completed QgsAuthenticationWidget + +Matthias Kuhn 2017-09-29 + + Fix python expression functions + +Matthias Kuhn 2017-09-29 + + Remove debug statement + +Matthias Kuhn 2017-09-29 + + Some layout changes + +Matthias Kuhn 2017-09-29 + + Fix store/reload of widget configuration + +Matthias Kuhn 2017-09-29 + + Silence of the lambs + +Matthias Kuhn 2017-09-29 + + Range based for loop + +Juergen E. Fischer 2017-09-29 + + typo fix + +Alessandro Pasotti 2017-09-29 + + [auth] Morph push button to toolbutton for consistency and Mac compatibility + +Alessandro Pasotti 2017-09-28 + + [auth] Add missing import after re-design of the auth config selector + +Alessandro Pasotti 2017-09-28 + + [auth] Re-designed authentication configuration selector widget + + - single line widget + - takes much less space + - it has the same functionality of the previous version + - use icons and tooltips to convey information + +Alessandro Pasotti 2017-09-29 + + [auth] Added new widget ui + +Matthias Kuhn 2017-09-29 + + Fix reference to temporary + +Matthias Kuhn 2017-09-29 + + Avoid warnings + +Matthias Kuhn 2017-09-29 + + Cleanup slots + +Matthias Kuhn 2017-09-29 + + API break documentation + +Matthias Kuhn 2017-09-29 + + Add test + +Matthias Kuhn 2017-09-28 + + Single parameter version of `represent_value` + + Becuase `represent_value("fieldname")` is much shorter to write and in 98% + there is no need to specify the name separately as + `represent_value("fieldname", 'fieldname')`. + +Matthias Kuhn 2017-09-29 + + Disable QgsFieldsProperites save logic + +Matthias Kuhn 2017-09-29 + + Deal with QGIS' need to talk + +Matthias Kuhn 2017-09-29 + + Deal with QGIS' need to talk + +Alessandro Pasotti 2017-09-29 + + [auth] New authentication settings widget + +Blottiere Paul 2017-09-08 + + Translate error message in exception + +Blottiere Paul 2017-09-08 + + Add tests + +Blottiere Paul 2017-09-08 + + Fix OGC test getfeatureinfo:invalid-query_layers + +Blottiere Paul 2017-09-07 + + Add some tests + +Blottiere Paul 2017-09-07 + + Fix OGC test getfeatureinfo:invalid-info_format + +Marco Bernasocchi 2017-09-28 + + Update linux.t2t + +Marco Bernasocchi 2017-09-28 + + add libzip-devel for fedora build + + in the fedora build instruction libzip-devel was missing + +Juergen E. Fischer 2017-09-29 + + translation fix + +Juergen E. Fischer 2017-09-28 + + remove qgscontexthelp_texts.cpp from i18n + +lbartoletti 2017-09-28 + + Modernize + +Merge: 8e4234ca75 69f370e4f2 +lbartoletti 2017-09-28 + + Merge branch 'master' into regularShape_gui + +Merge: f9f5aafaf4 04e54903e8 +Alessandro Pasotti 2017-09-28 + + Merge pull request #5152 from ismailsunni/add_section + + Add section in beginGroup and remove Setting. + +lbartoletti 2017-09-28 + + Fix tools which doesn't works when map is rotated + +Matthias Kuhn 2017-09-28 + + Fix build warnings + +Merge: ae806ad11c f9f5aafaf4 +Matthias Kuhn 2017-09-28 + + Merge remote-tracking branch 'qgis/master' into propertieslayout + +Nyall Dawson 2017-07-30 + + Add items for project map layers and relations to expression builder + + Allows easy insertion of map layer IDs and relation IDs into + expressions. Numerous expression functions now utilise these, + so it makes sense to allow them to be easily inserted. + + Fix #11680, #16879 + + Sponsored by Andreas Neumann + +Matthias Kuhn 2017-09-28 + + Change widget selection list to combobox + +Matthias Kuhn 2017-09-28 + + Descriptive Titles + +Matthias Kuhn 2017-09-27 + + Fix debug logging + +Matthias Kuhn 2017-09-26 + + Fix test + +Matthias Kuhn 2017-09-25 + + parse_dash_results: Clean exit when finished + +Matthias Kuhn 2017-09-25 + + parse_dash_results: Better info messages + +Matthias Kuhn 2017-09-25 + + parse_dash_results: Put images in scroll area + +Matthias Kuhn 2017-09-25 + + Use self.assertTrue instead of assert + +Matthias Kuhn 2017-09-25 + + Test debug information + +Matthias Kuhn 2017-09-25 + + More control images + +Matthias Kuhn 2017-09-25 + + More control image updates + +Matthias Kuhn 2017-09-25 + + Fix some test masks + +Matthias Kuhn 2017-09-25 + + Update parse_dash_results.py for Python 3 + +Matthias Kuhn 2017-09-23 + + Create test postgres database with UTF-8 + +Matthias Kuhn 2017-09-22 + + Remove unrequired cast + +Matthias Kuhn 2017-09-22 + + Some cleanup + +Matthias Kuhn 2017-09-21 + + [docker] Install curl for cdash results link + +Matthias Kuhn 2017-09-21 + + We skip tests based on the environment variable TRAVIS + +Matthias Kuhn 2017-09-21 + + Fix postgres restore + +Matthias Kuhn 2017-09-20 + + [travis] Restore postgres database after build + + This will give postgres plenty of time to start up + +Matthias Kuhn 2017-09-20 + + We all need to get more sleep + +Matthias Kuhn 2017-09-20 + + [docker] Fix unicode issues + +Matthias Kuhn 2017-09-20 + + [travis] Give postgres some time to start + +Matthias Kuhn 2017-09-20 + + [travis] Enable all tests + +Matthias Kuhn 2017-09-20 + + [processing] Add new projection candidate to test + +Matthias Kuhn 2017-09-19 + + [processing] Fix test "Polygon buffer with dissolve" + +Matthias Kuhn 2017-09-19 + + [processing] Fix test "Single sided buffer multiline (bevel)" + +Denis Rouzaud 2017-09-19 + + remove extra doc coverage test + +Denis Rouzaud 2017-09-19 + + use same build folder + +Denis Rouzaud 2017-09-19 + + fix code layout build + +Matthias Kuhn 2017-09-19 + + chmod -x StatisticsByCateogries.py + +Denis Rouzaud 2017-08-15 + + Revert "use second Dockerfile to push 2nd image" + + This reverts commit 050682a37364e110f350b9c3293f662b0011036d. + +Denis Rouzaud 2017-08-13 + + # This is a combination of 5 commits. + # The first commit's message is: + some fixes + + # The 2nd commit message will be skipped: + + # more fixes + + # The 3rd commit message will be skipped: + + # minor fixes + + # The 4th commit message will be skipped: + + # Revert "minor fixes" + # + # This reverts commit 24c3ae15e04bc928b1c59d059d5378ad30bd6008. + + # The 5th commit message will be skipped: + + # Revert "more fixes" + # + # This reverts commit 1d3c4d97cf6ecd81f27ca43889132b5ba1bdd1ad. + +Denis Rouzaud 2017-08-12 + + use second Dockerfile to push 2nd image + +Denis Rouzaud 2017-08-08 + + some fixes + +Denis Rouzaud 2017-08-08 + + fix psql + +Matthias Kuhn 2017-08-08 + + Wait for postgres server to spin up + +Matthias Kuhn 2017-08-08 + + Setup postgis + +Matthias Kuhn 2017-08-08 + + Output on failure + +Denis Rouzaud 2017-08-07 + + echo instead of ninja + +Denis Rouzaud 2017-08-07 + + better var names + +Denis Rouzaud 2017-08-07 + + use ninja and env var + +Matthias Kuhn 2017-08-07 + + Fix build folder + +Denis Rouzaud 2017-08-07 + + add travis branch + +Denis Rouzaud 2017-08-07 + + explicit setup of ccache + +Denis Rouzaud 2017-08-07 + + fix ctest command + +Denis Rouzaud 2017-08-07 + + fix line ending + +Denis Rouzaud 2017-08-07 + + try to add git to the image + +Denis Rouzaud 2017-08-07 + + missing ctest var + +Denis Rouzaud 2017-08-07 + + missing env var + +Denis Rouzaud 2017-08-05 + + use docker for newer dependencies on Travis + +rldhont 2017-09-04 + + Update the QgsRatioLockButton use for fixedAspectRatio in SVG marker + +rldhont 2017-08-27 + + Use QgsRatioLockButton for fixedAspectRatio in SVG marker + +rldhont 2017-08-20 + + Update SIP for fixedAspectRatio in SVG marker + +rldhont 2017-07-25 + + Add tests for fixedAspectRatio in SVG marker + +rldhont 2017-07-20 + + Configure and use fixedAspectRatio in QgsSvgSymbolLayerWidget and QgsSvgSymbolLayer + +David Marteau 2017-07-17 + + Add fixedAspectRatio in QgsSvgCacheEntry and compute image size accordingly + +Matthias Kuhn 2017-09-28 + + Remove switch default: Force warnings + +Matthias Kuhn 2017-09-28 + + Range-based for loop + +Matthias Kuhn 2017-09-28 + + m prefix is only for members + +Ismail Sunni 2017-09-09 + + Add unit test for remove and beginGroup with section. + +Ismail Sunni 2017-09-08 + + Add section in beginGroup and remove Setting. + +Matthias Kuhn 2017-09-28 + + Add getter/setter for type + +Matthias Kuhn 2017-09-28 + + Code formatting + +Denis Rouzaud 2017-09-28 + + [custom widget] fix missing external resource widget + +Juergen E. Fischer 2017-09-27 + + debian package: handle grass RC abis + +Juergen E. Fischer 2017-09-27 + + debian packaging: depend on grass abi + +Nyall Dawson 2017-09-27 + + More efficient use of QStrings + + - use .isEmpty() instead of == QLatin1String( "" ) to check for + empty strings + - use .clear() instead of = QLatin1String( "" ) to empty a string + - remove unnecessary QString initializations + +Gary Sherman 2017-09-27 + + Fix Object Inspector in Python console editor + +Gary Sherman 2017-09-27 + + Make case consistent for description of Run Script tool in Python console + +Merge: 6ce8b4c83e 385cca6036 +Alessandro Pasotti 2017-09-27 + + Merge pull request #5253 from boundlessgeo/auth_proxy + + [auth][feature][needs-docs] Proxy authentication integration with QGIS authentication system + +lbartoletti 2017-09-27 + + Remove no more usable tools Circle by 3 tangents + +lbartoletti 2017-09-27 + + Suppress old constructors + +lbartoletti 2017-09-27 + + Fix minimum for QgsMapToolRegularPolygonCenterPoint + +Alessandro Pasotti 2017-09-27 + + [auth] Added debug messages + +Alessandro Pasotti 2017-09-27 + + [auth] Added tests for updateNetworkProxy + +Martin Dobias 2017-09-27 + + Require Qt >= 5.8 when 3D support is enabled + +Martin Dobias 2017-09-27 + + Law & order in the main "3d" directory + + Just renames / cleanup - no code changes + +Martin Dobias 2017-09-27 + + Law & order in "terrain" subdir + + No actual code changes, just renaming / cleanups + +Martin Dobias 2017-09-27 + + Law & order in "chunks" subdir (variable naming, no public member vars) + + No actual code changes, just renames / moves + +Merge: e536cdde43 65170d0e85 +Nyall Dawson 2017-09-27 + + Merge pull request #5259 from nyalldawson/modernize + + Modernize initializers + +Merge: 79fb064c99 e536cdde43 +lbartoletti 2017-09-26 + + Merge branch 'master' into regularShape_gui + +lbartoletti 2017-09-26 + + resolve conflicts + +Nyall Dawson 2017-09-27 + + Remove some unneeded initializations + +Nyall Dawson 2017-09-27 + + Run clang-tidy modernize-use-default-member-init to move member + initialization to headers (c++11 style) + +lbartoletti 2017-09-25 + + Fix tools with extent when map is rotated (add a messagebar) + +Alessandro Pasotti 2017-09-26 + + [auth] Updated debug string + +Merge: f6479c1f79 d6743903e7 +Alessandro Pasotti 2017-09-26 + + Merge pull request #5249 from boundlessgeo/auth_certs_store_tab + + [auth] Certs manager remembers (in the settings) the last opened tab + +Matthias Kuhn 2017-09-26 + + [processing] Fields mapper code improvement + +Matthias Kuhn 2017-09-26 + + Fix function help for represent_value + +Matthias Kuhn 2017-09-26 + + Add unit tests for represent_value + +Matthias Kuhn 2017-09-26 + + [FEATURE] Expression function represent_value + + This will lookup the representation value given the widget + configuration. This is helpful to get nicely formatted messages for + value maps, value relations and others in expressions. + +Martin Dobias 2017-09-26 + + Qgs-ify axis aligned bounding box. Qgs-ification finished! + +Martin Dobias 2017-09-26 + + Qgs-ification of classes for chunked rendering + +Martin Dobias 2017-09-26 + + Fix doxygen warnings + +Martin Dobias 2017-09-26 + + Move DEM terrain tile loader to a separate file + +Merge: f8cf2f4dbe 0943cd5d51 +Nyall Dawson 2017-09-26 + + Merge pull request #5255 from nyalldawson/proc_test + + Resurrect some commented out processing tests + +Nyall Dawson 2017-09-26 + + Add an empty line + + Because the world will explode if not + +Nyall Dawson 2017-09-26 + + Resurrect commented out zonal stats test + +Nyall Dawson 2017-09-26 + + Make shortest path test less fussy + +Nyall Dawson 2017-09-26 + + Enable a commented out processing test + +Nyall Dawson 2017-09-13 + + [FEATURE] Add 'materialize' method to QgsFeatureSource + + When called, materialize takes a QgsFeatureRequest argument + and runs it over the source. The resultant features + are saved into a new memory provider based QgsVectorLayer, which + is returned by the function (along with ownership of the layer) + + This makes it easy to create a new layer from a subset of an + existing one. + + Materialize also considers subsets of attributes, so that the + returned layer only contains fetched fields (and not blank + fields filled with NULL values). + +Nyall Dawson 2017-09-26 + + [processing] Fix Refactor Fields rejects valid field configuration input + +Merge: 7705179a6c ac7fede91a +Nyall Dawson 2017-09-26 + + Merge pull request #5254 from nyalldawson/geometry_coverage + + Geometry unit test coverage + +Nyall Dawson 2017-09-26 + + Modernize some geometry code + +Nyall Dawson 2017-09-26 + + Boost test coverage of multipolygons + +Nyall Dawson 2017-09-26 + + Fix multipolygon allowing insertion of non polygon geometries + +Nyall Dawson 2017-09-26 + + Ensure multiipolygon dimensionality is respected when adding new surfaces + +Nyall Dawson 2017-09-26 + + Boost test coverage for multisurface + +Nyall Dawson 2017-09-26 + + Fix multisurface allowing insertion of non surface geometries + +Nyall Dawson 2017-09-26 + + Fix clearing multisurface should reset dimensionality + +Nyall Dawson 2017-09-26 + + Ensure multisurface dimensionality is respected when adding new surfaces + +Nyall Dawson 2017-09-26 + + Fix multicurve allowing insertion of non curve geometries + +Nyall Dawson 2017-09-26 + + Boost test coverage of geometry classes + +Nyall Dawson 2017-09-26 + + Ensure multicurve dimensionality is respected when adding new lines + +Nyall Dawson 2017-09-26 + + Fix clearing multicurve should reset dimensionality + +Nyall Dawson 2017-09-26 + + Fix memory leak when inserting invalid geometries + +Nyall Dawson 2017-09-26 + + Boost test coverage for multilinestrings + +Nyall Dawson 2017-09-26 + + Fix multi line string allowing insertion of non line geometries + +Nyall Dawson 2017-09-26 + + Fix nasty crash caused by converting MultiLineStrings to GML2 + + Exporting the geometry to GML2 would corrupt it, causing a + future crash to occur + +Nyall Dawson 2017-09-26 + + Fix QgsMultiLineString -> toCurveType doesn't convert to curve type + +Martin Dobias 2017-09-25 + + Qgs-ification of terrain classes + +Martin Dobias 2017-09-25 + + Fix some doxygen warnings + +Nyall Dawson 2017-09-26 + + Ensure multilinestring dimensionality is respected when adding new lines + +Nyall Dawson 2017-09-26 + + Fix clearing multilinestring should reset dimensionality + +Martin Dobias 2017-09-25 + + Let's make Travis green again + +Alessandro Pasotti 2017-09-25 + + [auth] Apply proxy stored auth configuration + +Alessandro Pasotti 2017-09-25 + + [auth] Added updateNetworkProxy method to auth manager + + This allows to apply stored proxy auth settings to the + proxy configuration. + +Alessandro Pasotti 2017-09-25 + + [auth] Moved mTray and NAM initialization so that proxy settings can be applied + + ... at the right time + +Martin Dobias 2017-09-25 + + This should finally pass code layout test + +Martin Dobias 2017-09-25 + + Add 3d doxygen group + more doxymentation + +Martin Dobias 2017-09-25 + + Do not spell check poly2tri sources + +Alessandro Pasotti 2017-09-25 + + [auth] Only show compatible authentication configurations + +Merge: 992a759caa 6b7201f4ed +Sandro Mani 2017-09-25 + + Merge pull request #5250 from manisandro/ogr_orig_fid + + [OGR] orig_ogc_fid followups + +Martin Dobias 2017-09-25 + + Yet another round of doxygen comments for 3D + + Getting there! + +Alessandro Pasotti 2017-09-25 + + [auth] Allow stored auth configurations to be used for proxy settings + +Merge: c235264d00 59ed19fff0 +Sandro Mani 2017-09-25 + + Merge pull request #5231 from manisandro/ogr_repack + + [OGR] Defer repacking while in explicit updateMode + +Alessandro Pasotti 2017-09-25 + + [auth] Add proxy to providers for http basic + +Sandro Mani 2017-09-25 + + [OGR] Use a ORIG_OGC_FID constant instead of hard-coding orig_ogc_fid + +Merge: 386d52d873 73d6058bd1 +Alexander Bruy 2017-09-25 + + Merge pull request #5248 from alexbruy/network-analysis + + [processing] enable network analysis tests + +Sandro Mani 2017-09-25 + + [OGR] Ensure orig_ogc_fid is never set as ignored field + +Nyall Dawson 2017-09-25 + + Ensure multipoint dimensionality is respected when adding new points + +Nyall Dawson 2017-09-25 + + Fix memory leak when restoring invalid geometry collection wkt + +Nyall Dawson 2017-09-25 + + Fix multi point allowing insertion of non point geometries + +Nyall Dawson 2017-09-25 + + Fix clearing multipoint should reset z/m status + +Nyall Dawson 2017-09-25 + + Fix incorrect /Transfer/ for geometry collection + +Sandro Mani 2017-09-25 + + [OGR] Followup: Add orig_ogc_fid as last field to avoid changing field order + +Alexander Bruy 2017-09-25 + + ignore crs for network analysis tests + +Alessandro Pasotti 2017-09-25 + + [auth] Certs manager remembers (in the settings) the last opened tab + + This is a minor UX/UI change that remembers the latest opened + tab in the certificates manager window + +Merge: 5f11793b17 57108f9b61 +Nyall Dawson 2017-09-25 + + Merge pull request #5247 from nyalldawson/geometry_coverage + + Geometry unit test coverage + +Alessandro Pasotti 2017-09-25 + + Restore debug build after PR #5246 + +Alexander Bruy 2017-09-25 + + [processing] enable network analysis tests + +Nyall Dawson 2017-09-25 + + Boost test coverage for geometry collections + +Nyall Dawson 2017-09-25 + + Fix crash in geometry collections with negative part numbers + +Nyall Dawson 2017-09-25 + + Fix dropping M/Z values from geometry collections + +Nyall Dawson 2017-09-25 + + Fix crash in nextVertex with bad geometry collection part number + +Nyall Dawson 2017-09-25 + + Fix crash when trying to insert geometry into collection with bad index + +Nyall Dawson 2017-09-25 + + Fix crash in geometry collection when working with empty collections + +Nyall Dawson 2017-09-25 + + Fix geometry collection can be corrupted by importing incorrect wkb + +Nyall Dawson 2017-09-25 + + Fix potential crash in QgsGeometry::smooth + +Nyall Dawson 2017-09-25 + + Boost test coverage for QgsRectangle + +Nyall Dawson 2017-09-25 + + Rename QgsRectangle::buffer to buffered and mark as const + +Nyall Dawson 2017-09-25 + + Boost test coverage for compound curve + +Nyall Dawson 2017-09-25 + + Fix crash when removing vertices from compound curves + +Nyall Dawson 2017-09-25 + + Fix incorrect wkb type for compound curve when adding vertex to empty curve + +Merge: 14a48c0349 b0b1714e98 +Nyall Dawson 2017-09-25 + + Merge pull request #5246 from nyalldawson/clazy + + Fix some Clazy warnings + +Nyall Dawson 2017-09-25 + + Fix build + +Nyall Dawson 2017-09-25 + + Fix doctest + +Nyall Dawson 2017-09-25 + + Sip sync + +Nyall Dawson 2017-09-25 + + Add missing QStringLiterals + +Nyall Dawson 2017-09-25 + + Sip sync + +Nyall Dawson 2017-09-25 + + Misc clazy fixes + +Nyall Dawson 2017-09-25 + + Fix clazy override signal with signal warnings + +Nyall Dawson 2017-09-25 + + Remove some unused variables + +Nyall Dawson 2017-09-25 + + Flip some easy QLists to QVectors + +Nyall Dawson 2017-09-25 + + Fix clazy overriden signals with non signal warnings + +Nyall Dawson 2017-09-25 + + Add missing QStringLiterals + +Nyall Dawson 2017-09-25 + + Fix clazy connect-3arg-lambda warnings + + Always use 4 arg overload with a lambda, to avoid lambda + execution when context object is deleted. + +Nyall Dawson 2017-09-25 + + Fix clazy detaching range based for warnings + +Nyall Dawson 2017-09-25 + + Fix clazy allocating unneeded temporary container warnings + +Nyall Dawson 2017-09-25 + + Use QString multi-arg overload (clazy warning) + +Merge: f4d5ca75c6 d72309e42b +Alexander Bruy 2017-09-25 + + Merge pull request #5201 from nyalldawson/point_crs + + [processing] Transparently handle CRS for point parameters + +Merge: a71f2ad5dc 26aae589ad +mhugent 2017-09-25 + + Merge pull request #5213 from mhugent/capabilities_exclusive_groups + + [FEATURE]: In GetProjectSettings, show if a legend group is mutually exclusive + +Nyall Dawson 2017-09-25 + + Fix non-virtual destructor + +Nyall Dawson 2017-09-25 + + Fix Coverity uninitialized member warnings + +Nyall Dawson 2017-09-25 + + Fix Coverity null pointer dereference warning + +Merge: 8902d5f48f 99def105bb +Nyall Dawson 2017-09-25 + + Merge pull request #5245 from nyalldawson/conditionalHelpLink + + Set the most accurate User Manual page to Options tabs + +Martin Dobias 2017-09-25 + + Make sip_include script use the workaround for SIP's path parsing + +Nyall Dawson 2017-09-25 + + Correct link for processing options help + +Martin Dobias 2017-09-25 + + Another round of doxygen comments + +Martin Dobias 2017-09-24 + + More doxygen comments + +Martin Dobias 2017-09-24 + + More class documentation + +Martin Dobias 2017-09-24 + + Trying to work around SIP file parsing error (dir starting with number) + +Nyall Dawson 2017-09-24 + + Fix transform of extent parameter set to match layer's extent + +Nyall Dawson 2017-09-24 + + Use text encoded versions of points and extents in history panel + + Fixes generation of unit tests with point/extent parameters + +Nyall Dawson 2017-09-24 + + [processing] Allow encoding crs into text definitions of extents + +Nyall Dawson 2017-09-24 + + [processing] Allow encoding crs into text definitions of points + +Nyall Dawson 2017-09-15 + + Fix passing of QgsReferencedPointXY from Python to c++ + +Nyall Dawson 2017-09-15 + + Use correct SRS when building graph + +Nyall Dawson 2017-09-15 + + Better cursor for point picker tool + +Nyall Dawson 2017-09-15 + + [processing] Fix picking point from map always triggers a release + event for previous map tool + +Nyall Dawson 2017-09-15 + + Transparently reproject source points in algs + +Nyall Dawson 2017-09-15 + + Allow use of QgsPointXY/QgsReferencedPointXY for point parameter values + +Merge: fe98fe1131 afac940d37 +Nyall Dawson 2017-09-24 + + Merge pull request #5244 from nyalldawson/proc_misc + + [processing] Misc test related fixes + +Nyall Dawson 2017-09-24 + + Use processing config help key + +Nyall Dawson 2017-09-24 + + Allow QgsOptionsPageWidget to set a specific help key to view + when clicking help in the options dialog + +Harrissou Sant-anna 2017-09-05 + + Set the most accurate User Manual page to Options tabs + + Because some of the tabs in Options dialog have a dedicated chapter where they are fully described, better use those links instead of the global one. + +Merge: 9e36fd9c6d b39459b8ff +Nyall Dawson 2017-09-24 + + Merge pull request #5236 from nyalldawson/field_default + + [processing] Allow setting default values for field parameters in models + +Alexander Bruy 2017-09-13 + + [processing] add band parameter support in test generator + +Alexander Bruy 2017-09-13 + + [processing] more fixes for tests creation + +Nyall Dawson 2017-08-22 + + Fix creation of SAGA tests + +Nyall Dawson 2017-08-15 + + Fix excepthook handling in standalone scripts + +Nyall Dawson 2017-08-15 + + Fix exception when running alg with no parameters from toolbox + +Juergen E. Fischer 2017-09-23 + + remove app startup tests depending on removed options configpath and --optionspath + +Juergen E. Fischer 2017-09-23 + + fix metasearch settings (fixes #16532) + +Juergen E. Fischer 2017-09-23 + + INSTALL: add ubuntu artful (implements #17177) + +Merge: e3f128b55f 5a802b595d +Nyall Dawson 2017-09-23 + + Merge pull request #5241 from nyalldawson/clean_code + + [processing] Code cleanups + +Nyall Dawson 2017-09-23 + + Expand test coverage of compound curves + +Etienne Trimaille 2017-09-23 + + [FEATURE] [needs-docs] Metadata editor + + Adds a new metadata tab to layer properties, representing the new metadata model from QEP #91 + +Muhammad Yarjuna Rohmat 2017-09-23 + + [FEATURE][geonode] integration - copy style action + + Allows copying styles directly from geonode layers for pasting into project layers. + +Nyall Dawson 2017-09-23 + + Add missing test files + +Nyall Dawson 2017-09-23 + + Update expected test results (rename field) + +Nyall Dawson 2017-09-23 + + [processing] Port mean coordinates to c++ + + And remove final use of inefficient vector.extractPoints function + +Nyall Dawson 2017-09-23 + + Replace more duplicate code with QgsProcessingUtils.combineFields + +Nyall Dawson 2017-09-23 + + Remove duplicate testForUniqueness method (replaced with QgsProcessingUtils.combineFields) + +Ismail Sunni 2017-09-21 + + Fix 'Qsci/qsciapis.h' file not found + +Juergen E. Fischer 2017-09-22 + + fix typo + +Merge: 782ed47d00 02e3916bf5 +Matthias Kuhn 2017-09-22 + + Merge pull request #5179 from vmora/listen_notify + + [FEATURE] layer refresh and trigger actions on provider notification + +Juergen E. Fischer 2017-09-22 + + translation string improvements + +Vincent Mora 2017-09-08 + + [FEATURE] layer refresh and trigger actions on provider notification + + [needs-docs] + + In vector layer properties (only usefull for postgres datasources) + + **in the rendering tab** + + A "Refresh layer on notification" checkbox has been added to refresh layer + on provider notification. + + For a postgres datasource, if a `NOTIFY qgis;` command is issued by one of the database clients, + a refresh of the layer will occur. + + If the "Only if message is" checkbox is checked, the notification will trigger the refresh only + if the message contend is the one specified, e.g. if the user enters + "refresh" in the box right next to the "Only if message is" checkbox, + then a `NOTIFY qgis, 'refresh';` command in the datatabase will trigger + a layer refresh, but `NOTIFY qgis;` or `NOTIFY qgis, 'something else';` + won't. + + **in the actions tab** + + A column "On notification" has been added, the action editor widget + a has text field "Execute if notification message matches" to + specify a filter for notification from the provider. The filter is a + Perl-type regex. + + Note that, as opposed to the "layer refresh" that + + Exemple: + - QGIS side "Execute if notification message matches" `^trigger my action` + - Postgres side: `NOTIFY qgis, 'trigger my action'` will trigger the action + - Postgres side: `NOTIFY qgis, 'trigger my action some additional data'` will trigger the action + - Postgres side: `NOTIFY qgis, 'do not trigger my action some additional data'` will NOT trigger the action + + Please note that if the `^`, which means "starts with", in `^trigger my action` had been ommited, + the last notification would have triggered the action because the + notification message contains the `trigger my action` + + A new qgis variable `notification_message` is available for use in + actions, it holds the contend of the notification message. To continue + with the previous exemple, if the action is of python type with the code: + + ```python + print('[% @notification_message %]') + ``` + + The three notifictions above will result in two printed lines + ``` + trigger my action + trigger my action some additional data + ``` + + User Warning: + + For postgres providers, if the "Refresh layer on notification" is checked, or if one layer action has + "On notification" specified, a new connection to the database is made to + listen to postgres notifications. This olds even if transaction groups + are enabled at the project level. + + Note that once the notification mechanism is started in a QGIS + session, it will not stop, even if there is no more need for it (Refresh + layer on notification" unchecked and no "On notification" in any + action). Consequently the connection listening to notification will + remain open. + + IMPLEMENTATION DETAILS: + + A notify signal has been added to the abstract QgsVectorDataProvider + along with a setListening function that enables/disble the notification + mechanism. + + For the moment only the postgres provider implements the notification. + + QgsAction has a notificationMessage member function that holds the regex + to match to trigger action + + QgsActionManager becomes a QObject and is doing the filtering and execute actions on + notifications. + + The notification notion extends beyond SRGBD servers (postgres and oracle at + least have the notify) and the "watch file" in the delimitedtext + provider could also benefit from this interface. + + For the postgres provider a thread is created with a second connection + to the database. This thread is responsible for listening postgres + notifications. + + It would be nice to avoid the creation of one listening chanel per + provider in the case transaction groups are enabled. + + Please note that when listening starts (a thread and connection is + created in the postgres provider) it cannot be stopped by removing the + connected actions or unchecking the refresh check box. Indeed, since we + don't know who needs the signals, we dont't want to stop the service. + + The service will not restart in the next qgis session though. + + If this behavior is not deemed appropriate, we could use + ``` + int QObject::receivers ( const char * signal ) const + ``` + and have QgsDataProvider::setListening return a bool to tell the caller + if the signal has actually been closed. + +Juergen E. Fischer 2017-09-22 + + translation string fixes + +Juergen E. Fischer 2017-09-22 + + fix build + +Merge: a6b1c3ee9f cbca7c97bc +Nyall Dawson 2017-09-22 + + Merge pull request #5238 from nyalldawson/geometry_coverage + + Geometry unit test coverage + fixes + +Merge: 5d6c178f71 57b76920d6 +Nyall Dawson 2017-09-22 + + Merge pull request #5237 from nyalldawson/port_algs + + [processing] Port line intersection and split with lines to c++ + +Merge: db738f65e6 d6bf31783c +Nyall Dawson 2017-09-22 + + Merge pull request #5227 from nyalldawson/browser_awesome + + [browser] Show QPT print templates and Python scripts + +Merge: cf636dcafa 387771fad4 +Nyall Dawson 2017-09-22 + + Merge pull request #5234 from nyalldawson/action_lifetime + + Fix browser action item lifetime + +Nyall Dawson 2017-09-22 + + Boost test coverage of geometry classes + +Nyall Dawson 2017-09-22 + + Expand docs + +Nyall Dawson 2017-09-22 + + Fix incorrect result for reversing compound curves + +Nyall Dawson 2017-09-21 + + Port line intersection and split with lines to c++ + +Nyall Dawson 2017-09-21 + + Port processing combineFields to c++ + +Merge: 559973739c 33d2d1119c +Nyall Dawson 2017-09-22 + + Merge pull request #5235 from nyalldawson/model_progress2 + + [processing] Proper progress reports during model execution + +Nyall Dawson 2017-09-22 + + Update sip + +Nyall Dawson 2017-09-22 + + Matching default multiple fields should also be case-insensitive + +Nyall Dawson 2017-09-22 + + Setting field for QgsFieldComboBox should be case-insensitive + +Merge: 9caa7224cd 5534d743f1 +Larry Shaffer 2017-09-21 + + Merge pull request #5202 from dmarteau/fix_ln_option_OSX + + Execute ln command with GNU compatible options in install phase + +Nyall Dawson 2017-09-22 + + Formatting + +Nyall Dawson 2017-09-21 + + Allow setting default value for field parameters in models + +Nyall Dawson 2017-09-21 + + Better debugging for models by showing child algorithm parameters in the log + +Nyall Dawson 2017-09-21 + + [processing] Proper progress reports during model execution + + Instead of showing the progress reports for each child algorithm + individually, which leads to repeated 0->100% progress for every + step of a model, we proxy the progress reports and account for the + overall progress through a model as well. This means that + the progress accounts for both the progress within the current + model step AND the total number of steps left to execute. + +Nyall Dawson 2017-09-20 + + Expand unit tests for compound curves + +Nyall Dawson 2017-09-20 + + Fix loss of dimensionality when cloning compound curves + +Nyall Dawson 2017-09-20 + + Fix adding curves with Z/M to non Z/M compound curves + + Z/M for these curves should be dropped to ensure consistent + dimensionality for the whole compound curve + +Nyall Dawson 2017-09-20 + + Expand test coverage for compound curves + +Nyall Dawson 2017-09-20 + + Fix setting correct WKB type for compound curves when adding first curve + +Nyall Dawson 2017-09-20 + + Fix crash when trying to delete invalid curve from compound curves + +Nyall Dawson 2017-09-20 + + Fix crash when requesting invalid curve from compound curves + +Nyall Dawson 2017-09-20 + + Expand geometry test coverage + +Nyall Dawson 2017-09-20 + + Expand geometry unit test coverage + +Nyall Dawson 2017-09-22 + + Consistent capitalization for browser item actions + +Nyall Dawson 2017-09-22 + + Correctly parent browser item actions to transient menu instance + + Currently most browser item actions are parented to the item + itself, which is often long-lived (e.g. connection items + which last for the duration of the qgis session). This + commit adds an explicit parent widget parameter to + QgsDataItem::actions to ensure that the newly created actions + are correctly parented to the menu, and deleted after the + menu is removed. + +Merge: 8ef28e3f87 8f2c885436 +Matthias Kuhn 2017-09-21 + + Merge pull request #5230 from m-kuhn/taskWaitForFinished + + QgsTask::waitForFinished without event loop + +Matthias Kuhn 2017-09-21 + + [travis] Disable flaky test + + See https://travis-ci.org/qgis/QGIS/jobs/278224577 + https://github.com/qgis/QGIS/pull/5230#issuecomment-331189552 + +Matthias Kuhn 2017-09-21 + + Add some docstring + + Mainly to run travis again + +Merge: 54ea029de8 68909a12b6 +Matthias Kuhn 2017-09-21 + + Merge pull request #5114 from gacarrillor/update_add_feature_tooltips + + [needs-docs] Update tooltips for adding features/records + +Alessandro Pasotti 2017-09-21 + + Moved project properties menu item + +Matthias Kuhn 2017-09-21 + + QgsTask::waitForFinished without event loop + + because the old approach with using signals, using deleteLater and using + an internal event loop is a very good recipe for big troubles. + +Sandro Mani 2017-09-20 + + [OGR] Defer repacking while in explicit updateMode + +Merge: 06dc9660a3 a67194df77 +Sandro Mani 2017-09-21 + + Merge pull request #5224 from manisandro/ogr_gdb_subset + + [OGR] Add workaround for OGRSQL not recognizing the column name returned by OGR_L_GetFIDColumn + +Merge: 6e5324b9d8 846fef2013 +Matthias Kuhn 2017-09-21 + + Merge pull request #5229 from m-kuhn/cleanCode + + Clean code + +Sandro Mani 2017-09-21 + + [OGR] Add orig_ogc_fid as last field to avoid changing field order + +Sandro Mani 2017-09-20 + + [OGR] Add workaround for OGRSQL not recognizing the column name returned by OGR_L_GetFIDColumn + +Alessandro Pasotti 2017-09-21 + + Fix doxygen ingroup gui -> core for moved classes + +Matthias Kuhn 2017-09-02 + + Doxygen + +Matthias Kuhn 2017-09-01 + + Remove dummy method + +Matthias Kuhn 2017-09-01 + + Move definition to class + +Nyall Dawson 2017-09-21 + + Add an 'Open in external editor' option for python scripts in browser + +Nyall Dawson 2017-09-21 + + [FEATURE] Show python scripts in browser + + Double clicking (or dragging them onto canvas) executes the script + +Nyall Dawson 2017-09-21 + + Make sure iface is available when executing dropped python scripts + +Nyall Dawson 2017-09-21 + + [FEATURE] Show QPT print templates in browser + + Double clicking the template (or dragging and dropping to canvas) + results in a new layout being created from the template + +Merge: d34fd9f0b1 a67dab52d2 +Nyall Dawson 2017-09-21 + + Merge pull request #5221 from nyalldawson/browser_awesome + + Add QLR, processing models to browser + +Juergen E. Fischer 2017-09-20 + + debian packaging: add ubuntu artful + +David 2017-09-20 + + work in progress status + +Merge: e6169d8518 a6dc600784 +Matthias Kuhn 2017-09-20 + + Merge pull request #5143 from m-kuhn/nulldatasetparams + + QgsVectorFilewriter skip default null options + +Nyall Dawson 2017-09-20 + + Spelling + +Nyall Dawson 2017-09-20 + + Identation + +Merge: 825a323a14 21fc2e1a86 +Nyall Dawson 2017-09-20 + + Merge pull request #5220 from nyalldawson/open_folder + + [FEATURE] Add 'open directory' action to right click menu for folders in browser dock + +Alessandro Pasotti 2017-09-20 + + Fix single raster data items in ogr source select + + Thanks to Nyall for catching this. + +Matthias Kuhn 2017-09-20 + + [processing] Fix single sided buffer multiline (bevel) + +Nyall Dawson 2017-09-20 + + [FEATURE] Show processing models in browser + + And allow them to be executed and edited directly from there + +Nyall Dawson 2017-09-20 + + Add a Custom item type for QgsDataItem + +Nyall Dawson 2017-09-20 + + Allow QgsDataItems to override default double click behavior + +Nyall Dawson 2017-09-20 + + [FEATURE] Show qlr files in browser + + Fixes #10737 + +Nyall Dawson 2017-09-20 + + Show a tooltip with full path for directory items + +Nyall Dawson 2017-09-20 + + Use native OS directory separators in browser dock + +Nyall Dawson 2017-09-20 + + [FEATURE] Add 'open directory' action to right click menu for + folders in browser dock + + Opens the folder in the OS' file explorer + +Merge: 4587961607 677c10434b +Nyall Dawson 2017-09-20 + + Merge pull request #5193 from Gustry/layer_properties + + move metadata panel to OGC server panel + +Matthias Kuhn 2017-09-19 + + Remove leftover files + +Merge: f5c4fdff2e 1f0e73a336 +Alessandro Pasotti 2017-09-19 + + Merge pull request #5214 from boundlessgeo/gpkg_import_master_task + + Geopackage import multiple files master task + +Matthias Kuhn 2017-09-19 + + [processing] Fix test "Polygon buffer with dissolve" + +Matthias Kuhn 2017-09-19 + + [processing] Fix test "Single sided buffer multiline (bevel)" + +Matthias Kuhn 2017-09-19 + + [processing] Fix test "variable buffer on points with dissolve option" + +rldhont 2017-09-19 + + [BUFIX][Server] GetFeatureInfo on Raster Layer, fix valid identify + + Manually merge to QGIS 3 from 2.18 + + Funded by Ifremer + +Matthias Kuhn 2017-09-19 + + [processing] Update python field calculator test results + +Matthias Kuhn 2017-09-19 + + [processing] Make python field calculator support LongLong + +Matthias Kuhn 2017-09-19 + + [processing] Fix type resolving in python field calculator + +Matthias Kuhn 2017-09-19 + + Fix qgis:lineintersections test + +Merge: 8d34023d6e 38cc5703d7 +Nyall Dawson 2017-09-19 + + Merge pull request #5209 from nyalldawson/geometry_coverage + + [WIP] Extend geometry classes unit test coverage + +Alessandro Pasotti 2017-09-19 + + QgsGeoPackageImportTask -> QgsConcurrentFileWriterImportTask + +Nyall Dawson 2017-09-19 + + Improve test cases + +Merge: b0892488be d1d26e96b0 +Matthias Kuhn 2017-09-19 + + Merge pull request #5216 from m-kuhn/vectorFileWriter + + Make error message accessible for python in vector file writer + +Merge: e05f2669f5 a5647c7016 +Alessandro Pasotti 2017-09-19 + + Merge pull request #5212 from boundlessgeo/browser_homogenize + + Geopackage: browser homogenize + +Merge: b53e986781 388f8630f3 +rldhont 2017-09-19 + + Merge pull request #4959 from rldhont/server-wms-configparser-getprint + + [Server] WMS GetPrint refactoring + +Nyall Dawson 2017-09-19 + + Fix some leaks in geometry tests (valgrind noise) + +Matthias Kuhn 2017-09-19 + + Fix test + +Alessandro Pasotti 2017-09-19 + + Added documentation for QgsDataItemProviderFromPlugin constructor + +Nyall Dawson 2017-09-19 + + Astyle + +Matthias Kuhn 2017-09-19 + + Fix tests for new QgsVectorFileWriter python API + +rldhont 2017-09-06 + + Null pointer check for the layer tree + +Nyall Dawson 2017-09-19 + + Boost test coverage of geometry classes + +Nyall Dawson 2017-09-19 + + Fix some potential crashes in curve polygons + +Nyall Dawson 2017-09-19 + + Fix crash in QgsCompoundCurve equality operator + +Nyall Dawson 2017-09-19 + + Boost test coverage of geometry classes + +Nyall Dawson 2017-09-19 + + Move overriden methods from headers to cpp files + + Since they can't be inlined anyway + +Nyall Dawson 2017-09-19 + + Move QgsPolygonV2 equality operators up to QgsCurvePolygon + +Nyall Dawson 2017-09-19 + + Cleaner signature for QgsAbstractGeometry::closestSegment + +Nyall Dawson 2017-09-19 + + Expand geometry test coverage + +Nyall Dawson 2017-09-19 + + Make QgsAbstractGeometry::toCurveType pure virtual, and implement + for all geometry types + + Previously this method would return nullptrs for many geometry + types + +Nyall Dawson 2017-09-19 + + Fix incorrect vertexAngle calculation for circular strings + + Angle was always perpendicular to the tangent, instead of + tangential to the curve + +Nyall Dawson 2017-09-19 + + Fix potential crash in QgsCircularString::vertexAngle + +Nyall Dawson 2017-09-19 + + Remove impossible to reach code + +Nyall Dawson 2017-09-19 + + fixup + +Nyall Dawson 2017-09-19 + + Fix crash when calculating area for invalid circular string + +Nyall Dawson 2017-09-19 + + Fix invalid return from QgsCircularString::pointN with negative indices + +Nyall Dawson 2017-09-19 + + Fix incorrect 'left of' calculation when finding nearest point + to circular string + +Nyall Dawson 2017-09-18 + + More tests + +Nyall Dawson 2017-09-18 + + Boost test coverage of geometry classes + +Nyall Dawson 2017-09-18 + + When constructing a QgsPoint with explicit WKB type specified, + ignore any explicit z/m value if the WKB type does not have + that dimensionality + + Brings consistent behavior to all QgsPoint constructors + +Nyall Dawson 2017-09-18 + + Set correct WKB type when clearing a QgsCircularString + +Nyall Dawson 2017-09-18 + + Fix potential crash when calling QgsCircularString::pointN with bad + index + +Nyall Dawson 2017-09-18 + + Fix crash when calling equality operator on QgsCircularString + +Nyall Dawson 2017-09-18 + + Remove unused QgsGeometryFactory::fromRect method + +Nyall Dawson 2017-09-18 + + Expand QgsTriangle test coverage + +Nyall Dawson 2017-09-18 + + Extend geometry test coverage + +Nyall Dawson 2017-09-18 + + Extend unit tests for QgsPolygonV2, QgsPoint + +Nyall Dawson 2017-09-18 + + Extend geometry unit test coverage + +Nyall Dawson 2017-09-18 + + Remove default statements for better compiler warnings + +Nyall Dawson 2017-09-18 + + Consistently use unsigned int for QgsRegularPolygon + +Nyall Dawson 2017-09-18 + + Fix memory leak in QgsEllipse + +rldhont 2017-09-12 + + Null pointer check for the layer tree model + +Nyall Dawson 2017-09-19 + + Allow data item providers to override default directory handling + +Nyall Dawson 2017-09-19 + + Correctly handle opening gdb directories as a database in browser + + Allows ESRI gdb directories to be accessed and the contained + layers to be visible and added to projects. + +Nyall Dawson 2017-09-19 + + Add method to retrieve OGR supported directory driver extensions (e.g. 'gdb') + +Alessandro Pasotti 2017-09-19 + + Always run import task when at least one layer is valid + +rldhont 2017-09-19 + + [Server] WMS Parameters: const QStringList &l + +rldhont 2017-09-19 + + [Server] WMS Parameters: const QVariant &value + +rldhont 2017-09-14 + + [Server] WMS Parameters: const QVariant &defaultValue + +rldhont 2017-09-13 + + [Server] GetLegendGraphics : Wait for feature counter finshed + +rldhont 2017-09-14 + + QgsVectorLayer, countSymbolFeatures return QgsVectorLayerFeatureCounter + +rldhont 2017-09-06 + + [Server] Enhance QgsConfigCache + +rldhont 2017-09-06 + + [Server] Refactoring, removing qgs*parser files + +rldhont 2017-09-06 + + [Server] Remove QgsProject::instance + +rldhont 2017-08-25 + + [Server] Refactoring, removing config parser from WMS + +rldhont 2017-08-25 + + [BUGFIX][Server] GetLegendGraphics: Clear root legend + +rldhont 2017-08-10 + + [Server] WMS GetPrint refactoring - Update parameters manager + +rldhont 2017-08-06 + + [Server] WMS GetPrint refactoring - Update tests + +rldhont 2017-08-06 + + [Server] WMS GetPrint refactoring - Add Highlight layers + +rldhont 2017-08-01 + + [Server] WMS GetPrint refactoring + +rldhont 2017-09-11 + + [Server] test: add response content in message when it's not an image + +rldhont 2017-08-25 + + Cancel QgsVectorLayerFeatureCounter on QGsVectorLayer destroy + +Merge: 281236f4a1 7048d73d0c +Nyall Dawson 2017-09-19 + + Merge pull request #5170 from nyalldawson/drop_spatial_query + + Drop spatial query plugin + +Merge: b9a700075b 90378b79a8 +Nyall Dawson 2017-09-19 + + Merge pull request #5211 from mhugent/atlas_compress_tiff + + Use LZW compression for tifs exported from atlas / composer + +Merge: 15bc5ed0c3 d8de869780 +Matthias Kuhn 2017-09-18 + + Merge pull request #5215 from m-kuhn/metaCode + + Doxymentation and de-noising + +Matthias Kuhn 2017-09-18 + + Document API breaks + +Matthias Kuhn 2017-09-18 + + Return error message from QgsVectorFileWriter + +Matthias Kuhn 2017-09-18 + + Remove useless debug messages + +Matthias Kuhn 2017-09-18 + + Doxygen improvements + +Alessandro Pasotti 2017-09-18 + + Geopackage import multiple files master task + + This fixes a problem when importing multiple files + into a gpkg. Previous implementation spawned multiple + independent task causing the import to fail because + of DB being write-locked. + + This implementation uses a master task with subtask + and dependencies. + +Juergen E. Fischer 2017-09-18 + + dxf export: fix layer assignment (fixes #17126; followup 92091c536b) + +Marco Hugentobler 2017-09-18 + + [FEATURE]: In GetProjectSettings, show if a legend group is mutually exclusive + +Mathieu Pellerin 2017-09-18 + + [expression] fix caching for aggregate() and @parent exp. (fixes #15797) + +Juergen E. Fischer 2017-09-18 + + debian packaging: drop mimelnk files for KDE3 + +Kent Porter 2017-09-18 + + Removed new icon 'mIconAddData.svg' and replaced old 'mActionDataSourceManager.svg' with new version. + +Alessandro Pasotti 2017-09-18 + + QgsSettings -> Settings in options dialog tab + +Alessandro Pasotti 2017-09-18 + + Geopackage: switch the action from add/remove connection + + depending on the connection being already stored or not, + this allows the user to remove and existing connection. + +Alessandro Pasotti 2017-09-18 + + Added a short comment in file header + +Alessandro Pasotti 2017-09-18 + + Geopackage: fix store connection from browser + +Alessandro Pasotti 2017-09-18 + + Fix refreshConnections: only emit if it's a root item + + and propagate down to the tree until the root is reached. + +Alessandro Pasotti 2017-09-18 + + Geopackage data items: added tooltip and fix connection storage + +Alessandro Pasotti 2017-09-18 + + Minor cosmetic code change: removed unnecessary parenthesis + +Alessandro Pasotti 2017-09-18 + + Handle gpkg vectors and rasters with ogr data items + +Alessandro Pasotti 2017-09-18 + + Typo in docstring + +Alessandro Pasotti 2017-09-15 + + File browser: use GeoPackage items for gpkg files + +Alessandro Pasotti 2017-09-12 + + Allow gpkg to also show vectors in zipped files + +Marco Hugentobler 2017-09-18 + + Use LZW compression for tifs exported from atlas / composer + +Merge: 938f261596 0ee9d66511 +Even Rouault 2017-09-18 + + Merge pull request #5206 from rouault/ogrprovider_use_gdaldriver_and_gdaldataset_api + + [OGR provider] USE GDAL driver and dataset API, and pass FORCE_SRS_DETECTION=YES for GML + +nirvn 2017-09-18 + + [processing] fix map layer combo box layer reference + +Mathieu Pellerin 2017-09-18 + + [processing] implement source flag for feature based algorithms (#5208) + +Nyall Dawson 2017-09-18 + + Fix memory leak + +Nyall Dawson 2017-09-18 + + Fix coverity unchecked return value warning + +Nyall Dawson 2017-09-18 + + Fix coverity uninitialized members warnings + +Nyall Dawson 2017-09-18 + + Fix memory leak + +Etienne Trimaille 2017-09-14 + + [needs-docs] move metadata panel to OGC server panel + +Merge: f9bc9259c0 0cdabb5e60 +Mathieu Pellerin 2017-09-16 + + Merge pull request #5204 from nirvn/saveselected_native + +Merge: 7a1b9f970b 085687d8f0 +Nyall Dawson 2017-09-16 + + Merge pull request #5171 from nyalldawson/processing_selectioncheckboxes + + [processing] Add useCheckBoxes option to EnumWidgetWrapper + +Nyall Dawson 2017-09-16 + + Also update other spatial join alg + +Nyall Dawson 2017-09-12 + + Improve wording of spatial location alg parameters + +Nyall Dawson 2017-09-12 + + Add context menu with Select All/Clear Selection to checkboxes panel + +Nyall Dawson 2017-09-12 + + Use checkboxes for Extract/Select by Location algs + +Nyall Dawson 2017-09-12 + + [processing] A non-optional multiple enum parameter must have at + least one choice selected to be valid + +Nyall Dawson 2017-09-12 + + Use smaller margins for checkboxes panel + +Nyall Dawson 2017-09-12 + + Update class name + +arnaud.morvan@camptocamp.com 2017-08-09 + + [processing] Add ui option useCheckBoxes in ByLocation algorithms + +arnaud.morvan@camptocamp.com 2017-08-09 + + [processing] add ui option useCheckBoxes in CheckValidity + +arnaud.morvan@camptocamp.com 2017-05-01 + + [processing] Add useCheckBoxes option to SelectionWidgetWrapper + + This allow to show checkboxes or radioboxes intead of line edit with button. + This is configurable for each algorithm thought ParameterSelection metadata parameter. + It is also possible to choose the number of columns. + This is not applied in case of the BatchDialog. + +Alessandro Pasotti 2017-09-15 + + DBManager -> Browser synchronization + + Reload/refresh the browser tree and source select connection + items when connections, tables etc. change in the DBManager + + Note that this is uni-directional: changes in the browser tree + are not (yet) propagated to the DBManager + +Even Rouault 2017-09-15 + + [OGR provider] Workaround bug in OGR GML driver + +Martin Dobias 2017-09-15 + + Docstring/sip fixes in core/3d + +Matthias Kuhn 2017-09-15 + + [travis] Traceback for python tests on timeout + +Matthias Kuhn 2017-09-15 + + Fix save/reload of N:M relations + +Vincent Mora 2017-09-15 + + [FEATURE] Add undo and redo on transaction groups (#4765) + + * [FEATURE] adds undo/redo for transaction groups + + [needs-docs] the undo/redo now works with transcation groups. Just check + that there is no restriction in the transaction groups doc concerning + undo. + + related to #14799 + + The undo/redo is implemented using SAVEPOINT. + + The QgsTransaction interface has been enlarged to allow savepoints + creation and management. The savepoint is destroyed on + rollbackToSavepoint to have the same behavior has the sql ROLLBACK TO + SAVEPPOINT. + + To avoid the creation of a savepoint for each feature modified in bulk + editing (e.g. paste, field calculator) the logic is a bit complicated: the + savepoint is created on QgsVectorLayer::editCommandStarted and the first + actual undo command (QgsVectorLayerUndoPassthroughCommand) is + responsible for the re-creation of the savepoint in case of undo-redo. + Since the behavior must be different in case edition doesn't take place + inside an edit command, a member function has been added to + QgsVectorLayer to expose the mEditCommandActive state. + + Another (commented) tricky bit is the modification of the database + structure on add/delete attributes. On undo, the attribute is removed + before the rollback to savepoint, i.e. there is a useless ALTER TABLE + issued to restore the structure just before restoring it with the + ROLLBACK TO SAVEPOINT. This is necessary to make the provider + aware of the change of structure. It could be nicer/cleaner to have a way + to reload providers metadata. + + The editPaste function has also been modified to use addFeatures instead of + addFeature (plural/singular), this is at the expense of an additional "cpy" + of the clipboard in memory, but it should improve perf with postgis provider. + + * fixup operator aliases + +Even Rouault 2017-09-15 + + [OGR provider] Use FORCE_SRS_DETECTION=YES open option for GML datasets + +Even Rouault 2017-09-15 + + [OGR provider] Use GDAL driver and dataset API + + This is a preparation work to be able to provide open options to vector + drivers, which require using the GDALOpenEx() API, and thus requires to + use GDALDatasetH instead of OGRDataSourceH, GDALDriverH instead of OGRDriverH, + GDALOpenEx() instead of OGROpen(), GDALClose() instead of OGR_DS_Destroy(), + GDALDatasetXXXX instead of OGR_DS_XXXX, etc... + +Martin Dobias 2017-09-15 + + Add 3d to doxygen, do not verify indentation of included poly2tri lib + +Matthias Kuhn 2017-09-15 + + Fix N:M Relations + + Fix #17143 (https://issues.qgis.org/issues/17143) + +Merge: f282a753c6 06ee6f68e1 +Nyall Dawson 2017-09-15 + + Merge pull request #5200 from nyalldawson/drop_handler + + [FEATURE][processing] Allow dropping model files onto QGIS window to execute them + +Nyall Dawson 2017-09-15 + + [processing] Fix incorrect filters in vector layer parameter selections + +nirvn 2017-09-15 + + [needs-docs][processing] return empty layer for save + selected features algorithm if no features are selected + +Nyall Dawson 2017-09-15 + + Expand docs + +nirvn 2017-09-15 + + [processing] native save selected features algorithm + +Nyall Dawson 2017-09-15 + + Update sip_include + +Nyall Dawson 2017-09-15 + + [FEATURE][processing] Allow drag and drop of model files onto QGIS window + to execute them + +Nyall Dawson 2017-09-15 + + Make QgsCustomDropHandler a QObject, and only store weak pointers to them + + This means if a plugin registers a custom drop handler, but crashes + before it can deregister it, at least it won't leave the main + app in a crashy state. + +Nyall Dawson 2017-09-15 + + Allow QgsCustomDropHandlers to directly operate mime data + and dropped file names + + This allows QgsCustomDropHandlers which aren't directly associated + with providers (e.g. for plugins to handle dropped files of + a certain type) + +Nyall Dawson 2017-09-15 + + Slightly cleanup drop handling in qgisapp + +Martin Dobias 2017-09-15 + + Post rebase fixes + +Martin Dobias 2017-08-15 + + More renaming. No code changes + +Martin Dobias 2017-08-15 + + More renaming of 3D-related classes and files. No actual code changes + +Martin Dobias 2017-08-15 + + Renaming and moving of 3D entities for 3D symbols + +Martin Dobias 2017-08-15 + + 3D symbols: private members + public getters/setters ... just like big kids + +Martin Dobias 2017-08-15 + + Moved 3D symbol class implementations into separate files + +Martin Dobias 2017-08-14 + + Extend range of spin boxes for 3d properties + +Martin Dobias 2017-08-14 + + Ignore invalid polygon geometries to avoid crashes in tessellation + +Martin Dobias 2017-08-12 + + Use middle button for rotation/tilt, right button for zoom + +Martin Dobias 2017-08-11 + + Remove 3D canvas widget when the dock is closed (just like 2d canvas) + +Martin Dobias 2017-08-10 + + Do not die when passed invalid full extent from QGIS + +Martin Dobias 2017-08-10 + + Handle curved geometries (line/polygon 3d symbol) and repeated vertices + +Martin Dobias 2017-08-10 + + Correctly working "zoom full" + more robust near/far plane config + +Martin Dobias 2017-08-10 + + Heuristics for setup of near/far planes of camera + + Based on terrain's active nodes, this should configure frustum depth + long enough not to clip away anything that should stay visible and + at the same time make good use of depth buffer (range not too large) + +Peter Petrik 2017-08-05 + + [FEATURE] support 3d models + +Blottiere Paul 2017-08-05 + + Feature selection is also displayed in 3D map view for polygons + +Blottiere Paul 2017-08-05 + + Feature selection is also displayed in 3D map view for lines + +Blottiere Paul 2017-08-05 + + Get selection color from map canvas + +Blottiere Paul 2017-08-05 + + Encapsulate entities for selected/not selected points in a root entity + +Blottiere Paul 2017-08-04 + + [FEATURE] Feature selection is also displayed in 3D map view for points + +Peter Petrik 2017-08-03 + + fix frustum culling for terrain + +Martin Dobias 2017-08-02 + + Zoom in/out by pressing middle mouse button and moving up/down + +Peter Petrik 2017-08-01 + + fix the bug + +Martin Dobias 2017-08-01 + + Respect background color from project's main canvas + +Martin Dobias 2017-08-01 + + Update terrain map whenever an active layer requests repaint + +Martin Dobias 2017-07-31 + + Reworked background loading and updating of chunks + + Before there was a dedicated thread for loading and it was not great because map rendering + requests were started from worker thread which is not potentially dangerous. Updates of map + were done in main thread, blocking user interface - ugly! + + Now everything is handled more cleanly - there is one queue of jobs (two types: load chunk / update chunk), + things are started asynchronously from main thread. No dedicated thread / mutex / wait condition. + Better management of states of chunk nodes - state changes are very explicit which is a good thing. + +Martin Dobias 2017-07-29 + + Decide number of zoom levels from max. allowed ground error + +Martin Dobias 2017-07-29 + + Read/write 3D renderers of map layers to project files + +Martin Dobias 2017-07-28 + + Update layer 3D entities when terrain generator or scale change + +Martin Dobias 2017-07-28 + + Update list of 3D entities when the list of active layers is changed + +Martin Dobias 2017-07-27 + + GUI for 3D point symbols + +Martin Dobias 2017-07-26 + + GUI for configuration of 3D line symbols for vector layers + +Martin Dobias 2017-07-26 + + GUI for configuration of 3D polygon symbols for vector layers + + In the style dock there is a new "3D View" tab - so far working just for polygon layers. + It is possible to select a polygon layer, enable 3D renderer and adjust its properties. + If a 3D Map View is open, it will be immediately updated (if auto-apply is enabled) + + Very exciting! :-) + +Martin Dobias 2017-07-25 + + Introduce concept of 3D symbols + addition of "single symbol" vector 3D renderer + +Martin Dobias 2017-07-24 + + Base class for 3D renderers + a bit of code shuffling + +Martin Dobias 2017-07-24 + + Signals/slots in Map3D + partial scene udates from Map3D signals + +Martin Dobias 2017-07-24 + + Terrain settings in GUI, react to changes of visible layers + + Temporarily disabled 2d canvas preview to better see 3D performance + +Martin Dobias 2017-07-23 + + Start of 3D map configuration widget + +Martin Dobias 2017-07-23 + + Fixed flat terrain without CRS defined + +Martin Dobias 2017-07-23 + + Initial work on integration of 3D map into QGIS application + + One can create a 3D map view from menu similar to a new 3D map view + +Martin Dobias 2017-07-20 + + Move all chunk-related functionality to a sub-directory + +Martin Dobias 2017-07-20 + + Move terrain related classes to a sub-directory + +Martin Dobias 2017-07-19 + + Rename TerrainBoundsEntity to ChunkBoundsEntity + + ... since it can be used also for other chunked entities - not just terrain + +Martin Dobias 2017-07-19 + + Fix build with Qt 5.9 + +Martin Dobias 2017-07-19 + + Added missing shaders and temporary test application + +Martin Dobias 2017-07-19 + + Import of initial work on QGIS 3D framework from wonder-sk/qgis3d + +Merge: c5ae3a0c98 a13aa96b6a +Alessandro Pasotti 2017-09-15 + + Merge pull request #5194 from boundlessgeo/iface_conn_changed + + Adds connectionsChanged signal to iface + +David Marteau 2017-09-15 + + Execute ln command with GNU compatible options + + On some OSX macport installation, GNU commands may be used in favor + of native commands and 'make install' fail with + 'ln: invalid option -- 'h'" + + As BSD ln support the GNU -n option as an equivalent of the -h option + it shoud be preferred over the specific BSD option. + +Alessandro Pasotti 2017-09-15 + + Typo forwarder->forwarded + +Alessandro Pasotti 2017-09-15 + + Add reloadConnections to the app and expose to iface + +Merge: 8d088c0da4 8605be0dbb +Nyall Dawson 2017-09-15 + + Merge pull request #5199 from nyalldawson/extract_by_extent2 + + [processing] Extent handling improvements + +Merge: ba9cb873ae 3a78253764 +Alexander Bruy 2017-09-15 + + Merge pull request #5198 from NaturalGIS/fix_saga_vectorizng_grid_classes_master + + [processing] fix SAGA LTR vectorizing grid classes tool for QGIS master + +Nyall Dawson 2017-09-15 + + New algorithm to convert an extent parameter to a layer + + Creates a new layer with a single feature with polygon geometry + covering the extent parameter value. + + This is designed for use in models where some child algorithms require + a layer based input, while others require an extent based + parameter + +Nyall Dawson 2017-09-15 + + Add method to recover extent parameter CRS + +Nyall Dawson 2017-09-15 + + Fix unit test data + +Nyall Dawson 2017-09-15 + + Fix passing QgsReferencedRec/Point from python to c++ + +Nyall Dawson 2017-09-15 + + Use geometry of reproject extent parameters for more accurate clipping + +Nyall Dawson 2017-09-15 + + Use CRS when calculating extent during algorithm extection + +Nyall Dawson 2017-09-15 + + Return a referenced rectangle from ExtentSelectionPanel + +Nyall Dawson 2017-09-15 + + Nicer display of rectangle parameter values + +Nyall Dawson 2017-09-15 + + Allow use of Qgs(Referenced)Rectangle for processing extent parameter values + + And add a new target CRS argument to parameterAsExtent. If set, and + the source CRS of the rectangle parameter can be determined, then + the returned value will be the rectangle automatically reprojected + to the desired target CRS. + +Nyall Dawson 2017-09-15 + + [FEATURE] New processing algorithm "extract/clip by extent" + + Allows extract a subset of another layer using an extent, with + optional setting to clip geometries to the extent + +Giovanni Manghi 2017-09-14 + + fix SAGA LTR vectorizing grid classes tool for QGIS master + +Tom Elwertowski 2017-09-14 + + macOS needs path to GEOS framework + +Alessandro Pasotti 2017-09-14 + + Geopackage items: add URI to tooltip + +Alessandro Pasotti 2017-09-14 + + Geopackage items: fix create new layer close dialog + +Alessandro Pasotti 2017-09-14 + + Adds connectionsChanged signal to iface + + This is meant to be used by plugins (DBManager is the + first candidate) to notify the application that + the GUI elements that handle connections needs to + be updated (i.e. the data source manager dialog + and the browsers) + +Alessandro Pasotti 2017-09-14 + + [bugfix] Geopackage restore connections in DB-manager + +Alessandro Pasotti 2017-09-14 + + Restore synchronization between connections and data source manager + + Partial revert of commit 22bd2a35 + +Alessandro Pasotti 2017-09-14 + + Fix geopackage delete connection + +Matthias Kuhn 2017-09-14 + + [docker] Use a unicode compatible locale + +Larry Shaffer 2017-09-13 + + Set CMake 3.9 policy for macOS RPATH settings to NEW + +Nyall Dawson 2017-09-14 + + Fix area calculation on polygons with Z/M wkb types + + Follow up a6800d6 + +Nyall Dawson 2017-09-14 + + [processing] Transparently map 'qgis' algorithms to 'native' algorithms + + This allows us to freely move algorithms from the qgis python library + to the c++ native provider without breaking API or existing models + +Nyall Dawson 2017-09-14 + + Port simplify geometries to c++ + +Nyall Dawson 2017-09-14 + + Port merge lines and smooth to c++ + +Nyall Dawson 2017-09-14 + + Port fix geometries alg to c++ + +Nyall Dawson 2017-09-14 + + Add missing overrides + +Merge: c371b72dfe bf078b1c84 +Nyall Dawson 2017-09-14 + + Merge pull request #5188 from nyalldawson/int + + [processing] Fix intersection and union tools don't work with input layers with Z or M values present + +Nyall Dawson 2017-09-14 + + [processing] Fix intersection and union tools don't work with + input layers with Z or M values present + + Also ensure that written geometries are always multitype, to + match the created layer geometry type (before the layer was + being created as a multi* layer, but single part geometries + were sometimes created. This causes errors with some data + providers) + +Merge: d084cc6b73 be88da8173 +Nyall Dawson 2017-09-14 + + Merge pull request #5184 from nyalldawson/join_locate + + [FEATURE] Reworked processing 'Join by location' alg + +Merge: 742f3e5b4d c3309b9257 +Nyall Dawson 2017-09-14 + + Merge pull request #5178 from Gustry/metadata_viewer + + use the metadata API for the metadata viewer + +Kent Porter 2017-09-13 + + Adds new Icon for Data Manager + +Etienne Trimaille 2017-09-12 + + use the metadata API in the HTML viewer + +Merge: df94b503a5 26830949d9 +Nyall Dawson 2017-09-13 + + Merge pull request #5112 from nyalldawson/locator_core + + Move locator non-gui classes to core + +Nyall Dawson 2017-09-13 + + [FEATURE][processing] Add 'Join by location (summary)' algorithm + + Like the main Join Attributes by Location algorithm, this algorithm + takes two layers and combines the attributes based on a spatial + criteria. + + However this algorithm calculates summaries for the attributes for + all matching features, e.g. calculating the mean/min/max/etc. + + The list of fields to summaries, and the summaries to + calculate for those, can be selected. + +Merge: 5796783e04 fe8b751eb5 +Mathieu Pellerin 2017-09-13 + + Merge pull request #5180 from nirvn/fix_levels + +nirvn 2017-09-13 + + [FEATURE] Make symbol levels dialog a style dock panel widget + +nirvn 2017-09-12 + + [symbology] resurrect symbol levels dialog (fixes #16996) + +Nyall Dawson 2017-09-13 + + [FEATURE] Reworked processing 'Join by location' alg + + Improvements: + - transparently handle different source/join CRS + - added option to create output feature for EVERY joined + feature (i.e. 1 to many type join) + - added option to select joined fields to take + - optimised performance of algorithm + + The previous option to create a summary of joined features has been + removed, and will be moved to a separate 'Join by location (summary)' + algorithm. + +Merge: 5614df4b6e 220c5e85e3 +Nyall Dawson 2017-09-13 + + Merge pull request #5153 from nyalldawson/geonode + + [FEATURE] QGIS - GeoNode Integration + +Nyall Dawson 2017-09-12 + + Move GeoNode browser/source select from app -> new 'geonode' provider + + Instead of including these classes in app, we instead make a + shell data provider which implements only the dataItemProviders() + and sourceSelectProviders() methods. + + Helps keep GeoNode GUI related code partitioned + +Nyall Dawson 2017-09-12 + + Fix geonode connection correctly storing service specific settings + +Nyall Dawson 2017-09-12 + + Make sure WFS/WMS settings are respected when adding GeoNode layers from source select dialog + +Nyall Dawson 2017-09-12 + + Add support for updating a uri with GeoNode WFS/WMS related connection settings + +Nyall Dawson 2017-09-12 + + Generalize some WFS/WMS connection setting handling + +Nyall Dawson 2017-09-12 + + Cleanup QgsOwsConnection + +Nyall Dawson 2017-09-12 + + Remove duplicate code + +Nyall Dawson 2017-09-12 + + Fix build + +Nyall Dawson 2017-09-11 + + Rework QgsGeoNodeNewConnection to inherit from QgsNewHttpConnection + + Avoids a lot of duplicate code. + + Note that while this refactoring was done to allow WFS and WMS + settings to be simultaneously visible, I've removed the settings + from the GeoNode connection for now. Looking into this they were + being stored, but not used at all when loading the layers from + the GeoNode instance. + +Nyall Dawson 2017-09-11 + + Cleanup some strings + +Nyall Dawson 2017-09-11 + + Rework QgsNewHttpConnection layout so that both WFS and WMS settings + can be shown simultaneously + +Nyall Dawson 2017-09-11 + + Use explicit flags to set behavior of QgsNewHttpConnection instead of key parsing + +Nyall Dawson 2017-09-11 + + Fix ordering of Arcgis map server item + +Nyall Dawson 2017-09-10 + + Clean comments + +Nyall Dawson 2017-09-10 + + Remove Q_FOREACH, fix inefficient loops + +Nyall Dawson 2017-09-10 + + Revert unused changes to QgsDataItem + +Nyall Dawson 2017-09-10 + + Fix spelling + +Nyall Dawson 2017-09-08 + + Hide non-functional style related browser actions + +Nyall Dawson 2017-09-08 + + Cleanup and add docs for QgsGeoNodeConnection + +Nyall Dawson 2017-09-08 + + [geonode] Don't block data source manager while connecting to a server + + Also add missing docstrings + +Nyall Dawson 2017-09-08 + + Class shuffle + +Nyall Dawson 2017-09-08 + + Run all GeoNode tests locally, but skip ones which rely on a remote server on Travis + +Nyall Dawson 2017-09-06 + + Add missing sip file + +Nyall Dawson 2017-09-06 + + Misc optimisations to geonode data items, fix leaks + +Nyall Dawson 2017-09-06 + + Move remaining geonode classes from gui->app + +Nyall Dawson 2017-09-06 + + Revert redundant changes to ows provider + +Nyall Dawson 2017-09-06 + + Move GeoNode data items from OWS provider to app + +Nyall Dawson 2017-09-06 + + Remove non-functional close button from geonode source select dialog + +Nyall Dawson 2017-09-06 + + Don't link app into provider + +Nyall Dawson 2017-09-06 + + Include geonode folder in doxyden search folders + + Required to build the docs for this folder, and correctly + include the classes in the documentation coverage test + +Nyall Dawson 2017-09-06 + + Slight folder restructuring + +Nyall Dawson 2017-09-06 + + Rollback all geonode specific changes to QgsDataSourceManagerDialog + +Nyall Dawson 2017-09-06 + + Add a very trivial registry GeoCMS providers to app + + Currently it's only used to register GeoNode source select dialogs. + As additional GeoCMS handling is added to QGIS we can start + refining this class to handle common functionality. + + For now, it's locked away in app so we don't need to worry + about frozen API restricting us when this happens. + +Nyall Dawson 2017-09-06 + + Add a bit more structure to provider source select ordering + +Nyall Dawson 2017-09-06 + + Move QgsGeoNodeSourceSelect to app + +Nyall Dawson 2017-09-06 + + Rollback changes to app + + There's no need for a dedicated 'Add GeoNode layer' menu entry, + as the unified data source manager has been designed to replace + all these specific provider based actions. + +Nyall Dawson 2017-09-06 + + Correctly handle using layer name option + +Nyall Dawson 2017-09-06 + + Misc code cleanup + +Nyall Dawson 2017-09-06 + + Condense code + +Nyall Dawson 2017-09-06 + + Use correct messagebox type + +Nyall Dawson 2017-09-06 + + Fix another leak + +Nyall Dawson 2017-09-06 + + Fix memory leak + +Nyall Dawson 2017-09-06 + + Allow QgsAbstractDataSourceWidget subclasses to add vector layers + with a specific provider key + +Nyall Dawson 2017-09-06 + + Minor code cleanup + +Nyall Dawson 2017-09-06 + + Remove unused code + +Nyall Dawson 2017-09-06 + + QgsGeoNodeSourceSelect is a QgsAbstractDataSourceWidget + +Nyall Dawson 2017-09-06 + + Fix ui file build warning + +Nyall Dawson 2017-09-05 + + Use QgsDebugMsg instead of QgsMessageLog for non-error feedback + + QgsMessageLog should only be used for errors or warnings, + not 'everything is working ok' type debug messages + +Nyall Dawson 2017-09-05 + + Split QgsGeoNodeConnection into two classes + + Move utility functions to QgsGeoNodeConnectionUtils + +Nyall Dawson 2017-09-05 + + QgsGeonodeConnection is not a Q_OBJECT + +Nyall Dawson 2017-09-05 + + Performance optimizations + + - avoid container detachments + - use QStringLiteral + +Nyall Dawson 2017-09-05 + + Pass strings by const ref + +Nyall Dawson 2017-09-05 + + Static members should use a 's' prefix, not 'm' + +Ismail Sunni 2017-08-31 + + Fix can not delete geonode instance from browser. + +Ismail Sunni 2017-08-30 + + Add style retriever for a geonode layer. + +Ismail Sunni 2017-08-25 + + Simplify getLayers method for geonode client. + +myarjunar 2017-08-25 + + add copy and paste style actions to the layer node + +Ismail Sunni 2017-08-22 + + Fix QGIS Crash on loading WFS/WMS/XYZ layer from GeoNode. + +myarjunar 2017-08-22 + + fix qgis crash on startup (invalid pointer) + +Muhammad Yarjuna Rohmat 2017-08-07 + + [FEATURE] QGIS - GeoNode Integration: Integrate with QGIS Browser Panel (#4816) + + * add Geonode connection menu to the toolbar + + * add header files for geonode-qgis client + + * add action to launch geonode connection dialog from menubar + + * Move to proper directory + + * Add geonodeconnection class. + + * Add unit test for geonode connection. + + * Use const static to avoid typo. + + * Get list layers from geonode. + + * Add get maps method. + + * Geonode connection dialog (#13) + + * add new geonode connection dialog + + * apply functionality to the geonode connection manager dialog + + * add save and load geonode connection functionality + + * edit baseKey and credentialBaseKey + + * remove auto-connect slots + + * Add unit test for geonode connection. + + * Add wms url getter. + + * Add uuid and layer name in the table. + + * Add handler for the list layer clicked. WIP. + + * Use new style connect, better hacky to get wms url. + + * update gitignore + + * Make QGIS able to add WMS layer from geonode. With hacky code. + + * Fix Docstring. + + * Show web service type (WMS/WFS) in layer table. + + * fix http and toolbar menu + + * add geonode data item to the browser panel as an extention of ows provider + + * [WIP] Add WFS. + + * Add geonode get service url. + + * combobox functionality and test geonode connection + + * Add WFS. + + * Disable add button if it's a map. Currently we can't do anything for map. + + * Add busy cursor when add layer. + + * get service uri capabilitites + + * add available layers to the geonode browser panel + + * remove debugging footprint and replace old style connect + + * add actions (new, edit, delete) to geonode browser panel + + * fix getLayers by WMS url + + * add Geonode connection menu to the toolbar + + * Filter out invalid layer / map. + + * Fix service url method. + + * Add service url for XYZ for GeoNode QGIS Server backend. + + * Add XYZ url to geonode connection dialog. + + * Add XYZ layer to QGIS. + + * fix double geonode submenu + + * add wfs/wms layers from browser panel using its native provider + + * comply with qgis3 new class naming + + * Handle different prefix for layer in GeoNode QGIS Server backend. + + * base class for cms connection + + * make geonode connection as a derived class from cms connection + + * update cmakelists + + * move geonode connection to geocms dir + + * update CMakeLists + + * Handle geonode 2.7 with new API. + + * Handle multiple geoserver url in one geonode. + + * Fix add xyz for qgis server. Fix add wms, wfs, xyz for geoserver in geonode 2.7 + + * Refactor serviceURL to return QStringList. + + * add 'add geonode layer' icon + + * add geonode to the data source manager dialog + + * [GeoNode-Client] Fix add WFS layer. + + * fix wms url parameter + + * add xyz dataitems + + * Use new style connect. + + * [GeoNode Client] Handle qgis server specific typename to make add WFS works. + + * Code improvement. + + * [GeoNode Client] Make geonode dialog in add universal layer can add layer. + + * Open universal add layer when click Add GeoNode layer. + + * Make sure the geonode url has protocol. + + * Handle geonode version in a better way. + + * make sure the serviceUrl method has scheme in its urls + + * add services option to the dialog + + * remove version label if not wfs + + * construct wms url with parameters for geonode connection + + * handle layer from multi service urls for every wfs, wms, & xyz services + + * fix new style connect using static_cast + + * hode close button if dialog is in embedded mode + + * fix xyz layer naming in the browser tree + + * create base class for geocms dataitems + + * fix compiling warning + + * Use struct instead QVariantMap. + + * tidy up code + + * Tidy up code, use QgsStringMap instead QVariantMap. + + * Add spellok for catalogue. + + * update sip + + * update sip + + * Use naming convention for QgsGeoCmsConnection and use QUuid. + + * Async by using GeoNodeRequest class. + + * Move geonode to src/gui. + + * Use stack not heap. + + * Remove unused includes. + + * Use signal to handle request. + + * Use QStringLiteral. + + * Switch to use Q_FOREACH. + + * Use Q_FOREACH and addressing PR's review. + + * Set private for data members. + + * update sip + + * Update sip. + + * Update sip. + + * Fix sip problem to make it buildable again. + + * Remove geocms + + * Tidy up code. + + * Use QgsSetting Scope::Provider. + + * Fix missing zip.h + +Merge: 9dcdefd68e 850fed557f +Alessandro Pasotti 2017-09-12 + + Merge pull request #5164 from boundlessgeo/browser_shared_model + + [bugfix] Browser shared model + +Merge: 4115d06fba 95cd8d744d +Sandro Mani 2017-09-12 + + Merge pull request #5181 from manisandro/ogr_subsetstring + + [OGR] Ensure subset string is set when reopening dataset + +Sandro Mani 2017-09-12 + + [OGR] Ensure subset string is set when reopening dataset + + QgsOgrProvider::reloadData calls close() and open(), which in turn called setSubsetString with mSubsetString. + Since setSubsetString does nothing if the passed sql string is equal to mSubsetString, this resulted in the + substring not being set on re-open. This commit clears mSubsetString before calling setSubsetString, and + blocks signals when calling setSubsetString to avoid an endless recursion of emit dataChanged -> reload. + Fixes #17122. + +Alessandro Pasotti 2017-09-12 + + Const getter and api break docs + +Alessandro Pasotti 2017-09-11 + + Typo delayied -> delayed + +Alessandro Pasotti 2017-09-10 + + Browser: removed redundant refresh signals + +Alessandro Pasotti 2017-09-10 + + Removed reference + +Alessandro Pasotti 2017-09-10 + + Share QgsBrowserModel among browser instances + +Alessandro Pasotti 2017-09-10 + + Moved the scan time to populated and get it from settings + +Alessandro Pasotti 2017-09-09 + + [bugfix] Browser keeps scanning directory with gpkg file + + Fixes #17043 by introducing a check for last directory + scan timestamp and skipping the directoryChanged signal + is the last scan was less than 10 seconds in the past. + + Tested with > 300 gpkg files in a single directory. + +Alexander Bruy 2017-09-12 + + remove context help popup on console opening + +Alexander Bruy 2017-09-12 + + [console] return home directory as string instead of QDir instance (fix #17106) + +Merge: 457709d3d8 814ef78732 +Nyall Dawson 2017-09-12 + + Merge pull request #5165 from Gustry/save_metadata + + write metadata with XML + +Merge: 9b8fad515f cf16a82419 +Nyall Dawson 2017-09-12 + + Merge pull request #5173 from nyalldawson/model_crash_win + + [processing] Fix crash in modeler on Windows + +Nyall Dawson 2017-09-12 + + Fix indentation + +Mathieu Pellerin 2017-09-12 + + [ogr provider] insure connection pool updated when subset sql added/changed (#5172) + +Merge: 220b58d0c9 516aad7cdf +Alexander Bruy 2017-09-12 + + Merge pull request #4440 from alexbruy/gdal-compression + + expose image compression in the layer metadata (fix #15702) + +Martin Dobias 2017-09-11 + + Fix vertex+segment vs segment snapping type + + When user picked snapping to current layer / all layers, snapping to + vertex+segment vs segment were working the other way around + (advanced configuration was working correctly though) + +Nyall Dawson 2017-09-12 + + [processing] Fix crash when editing models on Windows (fix #17028) + +Nyall Dawson 2017-09-12 + + Cleanup model algorithm parameter definition dialog + +Etienne Trimaille 2017-09-08 + + write metadata with XML + +Nyall Dawson 2017-09-12 + + Daily Q_FOREACH removal + +Nyall Dawson 2017-09-12 + + [processing] List 'All files (*.*)' option last in save as dialogs + + See https://ux.stackexchange.com/questions/111689/file-dialog-formats-list-should-all-files-be-listed-first-or-last for discussion: + + - for 'file open' dialogs, wildcard options should be listed first + - for 'file save' dialogs, wildcard options should be listed last + +Nyall Dawson 2017-09-12 + + [FEATURE] Drop spatial query plugin + + * Tagged as feature to remember to include in release notes + + The functionality of this plugin is duplicated in the processing + Extract by Location and Select by Location algorithms. + +Nyall Dawson 2017-09-12 + + Use offline editing plugin instead of spatial query for detecting plugin path + +Juergen E. Fischer 2017-09-12 + + Fix windows build + +Merge: 6772541720 9b04589ce7 +Nyall Dawson 2017-09-12 + + Merge pull request #5166 from nyalldawson/tidy + + clang-tidy fixes + +Martin Dobias 2017-09-11 + + CAD dock: fix a typo -> enable new snapping option + + When X or Y is locked and user has mouse on top of a segment, CAD dock widget + will snap at the intersection of the segment and the axis. + +Martin Dobias 2017-09-11 + + Fix node tool sometimes behaving incorrectly with topo editing + + This would happen especially when zoomed out due to mismatch of snapping match vs original map point + +Martin Dobias 2017-09-11 + + Only update CAD canvas item geometry when necessary + + The call to setRect() in paint() handler was triggering canvas redraws + all the time, keeping one CPU core busy nearly all the time when + CAD dock was active. + +Martin Dobias 2017-09-11 + + Make CAD dock work well with node tool when adding vertex at endpoint + +Nyall Dawson 2017-09-11 + + More missing docs + +Nyall Dawson 2017-09-11 + + Add missing docs + +Nyall Dawson 2017-09-11 + + Add missing override keyword + +Nyall Dawson 2017-09-11 + + Fix clang-tidy misleading comment warning + +Nyall Dawson 2017-09-11 + + Remove redundant code + +Nyall Dawson 2017-09-11 + + Use std::move to reassign unique_ptrs + +Nyall Dawson 2017-09-11 + + Fix clang-tidy int to bool conversion warning + +Nyall Dawson 2017-09-11 + + Fix clang-tidy redundant .get() calls + +Nyall Dawson 2017-09-11 + + Fix clang-tidy redundant return/continue warnings + +Nyall Dawson 2017-09-11 + + Remove redundant virtual keyword from signatures with override + +Nyall Dawson 2017-09-11 + + Fix clang-tidy use emplace_back instead of push_back warnings + +Nyall Dawson 2017-09-11 + + Remove more unnecessary destructors, flip empty constructors to =default + +Nyall Dawson 2017-09-11 + + Use .empty() instead of .size() > 0/.size() >=1/etc + + Possibly faster, and clearer to read + +Nyall Dawson 2017-09-11 + + Pass by const ref where possible + +Martin Dobias 2017-09-11 + + Fix settings icon for CAD dock widget + + Previously it used an icon from georeferencer's QRC + +Alessandro Pasotti 2017-09-11 + + Fix broken signals for AFS/AMS layer addition from the datasource dialog + +Nyall Dawson 2017-09-11 + + Use =delete to remove default functions + + Via clang-tidy modernize-use-equals-delete + +Nyall Dawson 2017-09-11 + + Remove some unnecessary delete guards + + Via clang-tidy readability-delete-null-pointer + +Nyall Dawson 2017-09-11 + + Remove some unnecessary initializers + + From clang-tidy readability-redundant-member-init + +Nyall Dawson 2017-09-11 + + Simplify boolean expressions + + By applying clang-tidy readability-simplify-boolean-expr fixit + +Nyall Dawson 2017-09-11 + + Cleanup pointer comparisons to nullptr + +Nyall Dawson 2017-09-11 + + 0/NULL -> nullptr + + Using clang-tidy modernize-use-nullptr + +Nyall Dawson 2017-09-11 + + Avoid casting int to bool + + Using clang-tidy modernize-use-bool-literals + +Nyall Dawson 2017-09-11 + + Remove use of deprecated header + +Nyall Dawson 2017-09-11 + + Ignore =default during doxygen coverage test + +Nyall Dawson 2017-09-11 + + Replace reimplemented default methods by = default + + Using clang-tidy modernize-use-equals-default + +Nyall Dawson 2017-09-11 + + Remove redundant initializations + + Fixes when a member is initialized both in the header and + source to the same initial value + + (via clang-tidy modernize-use-default-member-init fixit) + +Merge: a650681061 c733b366f1 +Alessandro Pasotti 2017-09-11 + + Merge pull request #5156 from boundlessgeo/gpkg_tab + + [feature][needs-docs] Gpkg tab in source select dialog + +Merge: 7f5bd00cbf 02e8f1e6fa +Nyall Dawson 2017-09-11 + + Merge pull request #5131 from nyalldawson/location_algs + + Rework Select by Location algorithm + +Merge: cf8afc1e5b 4ca972a2ff +Nyall Dawson 2017-09-11 + + Merge pull request #5154 from nyalldawson/stats + + [processing] Improve Stats by Categories algorithm, remove duplicate algs + +Merge: 8aeffdb457 1fb48f456c +Nyall Dawson 2017-09-11 + + Merge pull request #5159 from alexbruy/fix-filter + + [processing] fix file filter construction for output files + +Martin Dobias 2017-09-10 + + Reduce debugging noise when using curved geometries + +Merge: cea7eb8be5 f938b60f12 +Martin Dobias 2017-09-10 + + Merge pull request #5148 from wonder-sk/adv-digitizing-cleanup-2 + + Advanced digitizing cleanup - part 2 + +Martin Dobias 2017-09-07 + + Handle mouse events of adv.digitizing map tools in the map tool base class + +Martin Dobias 2017-09-06 + + Move snapSegment() from map mouse event to private area of CAD dock + +Martin Dobias 2017-08-29 + + More advanced digitizing dock widget cleanups + + - CaptureMode enum has been moved back to QgsMapToolCapture where it belongs + - map tools that need clearing of CAD points do so explicitly when needed + +Martin Dobias 2017-08-29 + + Remove some workarounds for advanced digitizing from node tool + +Martin Dobias 2017-08-29 + + Better control of CAD dock widget operation from map tools + +Nyall Dawson 2017-09-10 + + Fix tests + +Merge: 1caaa2e697 64718766fc +Nyall Dawson 2017-09-10 + + Merge pull request #5119 from nyalldawson/layout_next3 + + [layouts] Undo/redo framework + +Nyall Dawson 2017-09-10 + + Optimise calcuation of disjoint features + +Nyall Dawson 2017-09-10 + + Optimise Extract/Select by Location alg + + Only create and prepare the GEOS representation for intersection + layer features when we encounter a feature in the target layer + within that feature's bounding box. + +Nyall Dawson 2017-09-10 + + More tests for Extract by Location + +Nyall Dawson 2017-09-10 + + Fix missing geometries/attributes in Extract by Location + +Alessandro Pasotti 2017-09-09 + + Use auto for const complex vars in for loop + +Alessandro Pasotti 2017-09-08 + + More Q_FOREACH removal + +Martin Dobias 2017-09-08 + + Range for loop without detach + +Martin Dobias 2017-09-08 + + Replace Q_FOREACH by range for loop + +Martin Dobias 2017-09-07 + + Node tool: give priority to the current layer when selecting vertex + +Alessandro Pasotti 2017-09-08 + + Update tests for OGR getLayers now returning also the geometry column name + +Nyall Dawson 2017-09-08 + + Drop python Select/Extract by Location algs + +Nyall Dawson 2017-09-08 + + Swap unit tests to use native algorithms + +Nyall Dawson 2017-09-08 + + Native c++ Extract by Location algorithm + +Nyall Dawson 2017-09-08 + + Move allFeatureIds from QgsVectorLayer to QgsFeatureSource + +Richard Duivenvoorde 2017-09-08 + + fix capitalisation + +Alexander Bruy 2017-09-08 + + [processing] fix file filter construction for output files + +Merge: 25c27b3c80 858413e5c1 +Alessandro Pasotti 2017-09-08 + + Merge pull request #5000 from jgrocha/add-default-layers + + [FEATURE][needs-docs] Add XYZ connection to provide default OpenStreetMap tiles + +Nyall Dawson 2017-09-08 + + Port Select by Location to c++ + +Alessandro Pasotti 2017-09-08 + + Disable SQL filter when a raster is selected + +Alessandro Pasotti 2017-09-08 + + Give credits to the original author of the source select + + and amend some comments + +Juergen E. Fischer 2017-09-08 + + avoid leak + +Juergen E. Fischer 2017-09-08 + + use SIP_SKIP (followup 5c3a72014) + +Nyall Dawson 2017-09-08 + + Remove 'precision' option from spatial relation processing algs + + Rationale: + - the correct use for this option is unclear, and users are + mistakenly using it as a 'tolerance' option + - it's very likely to generate invalid geometries as a result + of the snapping, causing unreliable results + + Given these substantial issues, it's safer to remove this + option and require that users who need the snap to grid + precision change explicitly do this via an extra model + step before running the algorithm. + +Nyall Dawson 2017-09-05 + + Rework Select by Location algorithm + + Changes: + + - handle different CRS transparently + + - don't build a spatial index on the selection layer. Instead + only use feature requests to fetch features which are within + the desired bounds, and rely on the presence of an appropriate + spatial index at the provider's backend. Otherwise, we force + every user of this algorithm to have a full iteration of the + source table, regardless of how large the table is. That means + that trying to select a set of addresses which fall within + a specific locality from a table which contains the addresses + for a whole state will FORCE every address in the state to + be initially read before any calculation begins. With this + change only those features within the bounding box of the + selected localities will ever be fetched from the provider, + resulting in huge speed improvements for the algorithm. + + - use prepared geometries for the spatial relation tests. + This dramatically speeds up the algorithm in the case + where the intersection layer features cover multiple + features from the 'selection' layer. + + - Add a 'select within current selection' mode + + - Optimise feature requests for efficiency (especially + with respect to the 'disjoint' selection mode) + +Alessandro Pasotti 2017-09-08 + + Use the new generic OGR source select class + +Alessandro Pasotti 2017-09-08 + + Generic implementation of OGR file DB connection + +Alessandro Pasotti 2017-09-08 + + New generic file-based DB OGR source select + +Alessandro Pasotti 2017-09-08 + + Use the OGR generic methods + +Nyall Dawson 2017-09-08 + + Fix stats by categories tests on Travis + +Alessandro Pasotti 2017-09-08 + + Moved some reusable methods from gpkg to the ogr items class + +Nyall Dawson 2017-09-08 + + Allow multiple primary key fields to be specified for processing tests + ` + +Alessandro Pasotti 2017-09-08 + + Added add geopackage icon + +Alessandro Pasotti 2017-09-08 + + Refactor of QgsGeoPackageConnection to a generic class + +lbartoletti 2017-09-04 + + fix qgsgeometry sip + +lbartoletti 2017-09-04 + + add overload methods + +lbartoletti 2017-09-03 + + initial commit + +Larry Shaffer 2017-09-07 + + Fix CMake bundling error on macOS + +Nyall Dawson 2017-09-08 + + Fix existing unit test, add new tests + +Nyall Dawson 2017-09-08 + + [processing] A non optional, multiple field input must have at least + one selected field to be considered valid + +Nyall Dawson 2017-09-06 + + [FEATURE] Drop 'Frequency analysis' and 'Number of unique values in classes' algs + + The functionality of both these algorithms is available in 'stats by + categories' + +Nyall Dawson 2017-09-06 + + Make value field in 'Stats by category' optional + + If not set, only the feature counts for each category will + be calculated + +Nyall Dawson 2017-09-06 + + Fix calculation with null strings + +Nyall Dawson 2017-09-06 + + [FEATURE] Allow multiple category fields in 'stats by category' + +Nyall Dawson 2017-09-06 + + [FEATURE] Improve Stats by Categories algorithm + + - allow non spatial inputs + - allow calculation of stats on any field type, with specific + string and datetime stats calculated when field type matches + - output a full set of stats for numeric fields (including median + , quartiles, etc) + - also calculate stats for 'null' category + +Merge: a0e6b7fde0 437aefa32a +Blottiere Paul 2017-09-07 + + Merge pull request #5094 from pblottiere/trust2 + + [FEATURE] Trust project option + +Alessandro Pasotti 2017-09-07 + + Added static QgsLayerItem::iconName(LayerType) for reuse and consistency + +Alessandro Pasotti 2017-09-07 + + Add geometry column name to sublayers result + +Blottiere Paul 2017-09-07 + + Move trust checkbox in data sources tab + +Merge: eee7577122 e57c3b3974 +lbartoletti 2017-09-06 + + Merge branch 'regularShape_gui' of https://github.com/lbartoletti/QGIS into regularShape_gui + +lbartoletti 2017-09-06 + + Use unique_ptr + +Merge: 37b60527f2 a0e6b7fde0 +lbartoletti 2017-09-06 + + Merge branch 'master' into regularShape_gui + +lbartoletti 2017-09-06 + + Add Rectangle from 3 points + +Blottiere Paul 2017-09-05 + + Rename methods + +Blottiere Paul 2017-09-05 + + Add some tests + +Blottiere Paul 2017-09-05 + + Trust is now a project option instead of a global option + +Harrissou Sant-anna 2017-09-04 + + Code cleanup + + Remove already declared groups in header + +Blottiere Paul 2017-08-29 + + Some cleanup and renaming + +Blottiere Paul 2017-08-28 + + Do not update extent by default if trust project option is activated + +Blottiere Paul 2017-08-21 + + Do not check primary key unicity on views when trustProject option is activated + +Blottiere Paul 2017-08-21 + + Add tests + +Blottiere Paul 2017-08-21 + + Add option on layer to read extent from xml in case of data source without metadata + +Blottiere Paul 2017-08-21 + + Fix extent writing in project file + +Blottiere Paul 2017-08-21 + + Add an enum for postgres relation kind + +Blottiere Paul 2017-08-21 + + Extent for vector layers should not be read from qgis project by default + +Blottiere Paul 2017-08-21 + + [needs-doc] Add Trust Project option + +Alessandro Pasotti 2017-09-06 + + Add QgsGeoPackageLayerInfo and move sublayers logic + + sublayers is now a reusable static function + +Alessandro Pasotti 2017-09-06 + + Removed blank lines + +Matthias Kuhn 2017-09-06 + + Leave more defaults for vector creation to OGR + +Harrissou Sant-anna 2017-09-06 + + Add help link for OWS Server tab + +Harrissou Sant-anna 2017-09-06 + + Set the most accurate User Manual page to Project Properties tabs + + Because some of the tabs in the dialog have a dedicated chapter where they are fully described, better use those links instead of the global one. + +Merge: 3b839ceb43 6f9be4de0f +Matthias Kuhn 2017-09-06 + + Merge pull request #5137 from m-kuhn/expressionhistory + + [FEATURE] History for attribute table form view display expressions + +Matthias Kuhn 2017-09-06 + + QgsVectorFilewriter skip default null options + + Don't specify dataset options which have null default values. Setting + these as empty strings might introduce a different behavior than + expected. + + For example not creating an xsd companion file for GML. + +Matthias Kuhn 2017-09-06 + + [travis] Fail fast on error + +Matthias Kuhn 2017-09-06 + + Fix build with Qt 5.5 + +Matthias Kuhn 2017-09-06 + + [travis] Stop building on errors + +Matthias Kuhn 2017-09-06 + + [travis] Fold build output + +Matthias Kuhn 2017-09-06 + + [travis] Workaround timeouts + +Merge: 2e20b6f69b eb9e2ace75 +Blottiere Paul 2017-09-06 + + Merge pull request #5084 from pblottiere/server_bugfix_ogc_mode + + [server][bugfix] Fixes OGC test on getmap:each-format mode for 1bit/8bit/16bit + +Blottiere Paul 2017-09-04 + + Add some tests + +Blottiere Paul 2017-08-29 + + Fix OGC test getmap:each-format mode for 1bit/8bit/16bit + +Merge: 9502022bb5 f1313af914 +Nyall Dawson 2017-09-06 + + Merge pull request #4720 from nyalldawson/ref_geom + + Template based referenced geometry class + +Nyall Dawson 2017-08-31 + + Add some more unit tests + +Nyall Dawson 2017-08-31 + + Add missing docs + +Nyall Dawson 2017-08-31 + + Add unit tests for referenced geometries + +Nyall Dawson 2017-08-31 + + Metatype Qgs(Referenced)Rectangle/PointXY + +Nyall Dawson 2017-08-31 + + Use inheritance rather than composition for QgsReferencedGeometries + + See https://github.com/qgis/QGIS/pull/4720#issuecomment-308652392 + for discussion of the rationale + +Nyall Dawson 2017-08-31 + + Update sip + +Denis Rouzaud 2017-06-13 + + fix constructor and skip method with same python signature + +Nyall Dawson 2017-06-13 + + Template based referenced geometry class + +Merge: e464c76b64 2830f31e8b +Nyall Dawson 2017-09-06 + + Merge pull request #5141 from nyalldawson/disable_osx_travis + + Disable Travis OSX builds + +Nyall Dawson 2017-09-06 + + Disable Travis OSX builds + + They are broken and ignored at the moment, but still + causing a massive backlog and delay in obtaining + the valid test results + +Merge: a11e0c6687 7a2f148add +Nyall Dawson 2017-09-06 + + Merge pull request #5110 from nyalldawson/ogr_crs + + [ogr] Don't try to calculate CRS for geometryless layers + +Merge: 26b9c043b4 1b5fbf98fe +Nyall Dawson 2017-09-06 + + Merge pull request #5130 from nyalldawson/deprecated + + Fix use of some deprecated Qt methods + +Merge: 5f5be25357 ea09aa92a3 +Nyall Dawson 2017-09-06 + + Merge pull request #5116 from nyalldawson/remove_transect + + Remove QgsTransectSample + +Merge: 1d0de6028e 59aaa2780e +Alessandro Pasotti 2017-09-05 + + Merge pull request #5124 from boundlessgeo/providers_gui_config + + Providers gui config + +Matthias Kuhn 2017-09-05 + + Remove generic debug noise + +Matthias Kuhn 2017-09-05 + + Make ogr a bit less verbose + +Matthias Kuhn 2017-09-05 + + Remove dead code + +Matthias Kuhn 2017-09-05 + + Make raster rendering a bit less verbose + +Matthias Kuhn 2017-09-05 + + [FEATURE] History for attribute table form view display expressions + + It's possible to re-use the last 10 display expressions in the form view + of the attribute table. + + The expressions will also be persisted in the project file. + + Using fields will now show field aliases instead of column names where + available. + +Alessandro Pasotti 2017-09-05 + + Use the tooltip: virtual layer needs it + + ... because the automatically generated one was: + "Add Virtual Layer layer" + +Alessandro Pasotti 2017-09-05 + + Add tooltips and tests for the provider class + +Alessandro Pasotti 2017-09-05 + + Q_FOREACH removal + +Alessandro Pasotti 2017-09-05 + + Sip updates for qgssourceselectprovider + +Alessandro Pasotti 2017-09-05 + + Removed SIP_FACTORY and fixed docstrings + +DiGro 2017-09-05 + + Typo corrected + + appoximation --> should be: approximation + +Richard Duivenvoorde 2017-09-04 + + Fix for #17104 + +Matthias Kuhn 2017-09-05 + + [FEATURE] Add "starts with" and "ends with" to multi attribute search + +Merge: 4ea4478bad 7627851026 +Nyall Dawson 2017-09-05 + + Merge pull request #5129 from nyalldawson/collect + + [processing] Rework 'singlepart to multipart' algorithm + +Matthias Kuhn 2017-09-05 + + Thread safety for feature counter + + Make sure that results from a feature counter will only be delivered on + the main thread and that they will be discarded if the layer is deleted + meanwhile. + +Nyall Dawson 2017-09-05 + + Fix bad strings + +Nyall Dawson 2017-09-05 + + Add notes to see related algorithms in algorithm help + +Nyall Dawson 2017-09-05 + + [FEATURE] Remove Singleparts to Multiparts algorithm + + This algorithm is no longer required - it's been replaced by + the 'Promote to multipart' and 'Collect geometries" algorithms. + + Tagged as feature to remember to include in release notes + +Nyall Dawson 2017-09-05 + + [FEATURE] New algorithm for 'collecting' geometries + + This is basically the equivalent of the dissolve algorithm, but + instead of a dissolving overlapping geometries the geometries + are instead just collected together into a multipart geometry. + + It's designed to slot between the 'promote to multipart' algorithm + (which performs no collection of geometries - it just converts + singleparts to multiparts with 1 part) and the more complex + all-encompassing 'aggregate' algorithm. + +Nyall Dawson 2017-09-05 + + [FEATURE] Native 'Promote to Multipart' algorithm + + This algorithm is basically the equivalent of the ST_Multi(...) + command - it forces a feature's geometry to become multipart, + regardless of the input geometry type. + + If input geometries are singlepart, they will output as + multipart with just 1 part. If they are already multipart, + they will be output unchanged. + +Nyall Dawson 2017-09-05 + + Show WKB type in vector layer information tab + +Merge: d08398f785 f01ad63bba +Alexander Bruy 2017-09-05 + + Merge pull request #5111 from nyalldawson/min_bounding_geom_alg + + [FEATURE] New processing algorithm "minimum bounding geometry" + +Nyall Dawson 2017-09-05 + + [FEATURE] Drop processing 'Select by Attribute Sum' algorithm + + Tagged as feature to be included in release notes. + + Because: + + - The use case for this algorithm is very unclear for users - the name + does not describe what the algorithm does, and there's no help + documentation available for the algorithm either. Given this I suspect + that the algorithm is not being put into use. + + - The algorithm needs enhancement to be more useful. There's no logic + in place which dictates how neighbouring features are chosen to + dissolve into the selected feature (it's effectively random - you're + just as likely to get a huge narrow polygon stretching across a map as + you are a nice compact cluster). To be more useful the algorithm would + need logic to either minimise the area of the dissolved feature, or + minimise the total number of dissolved features, or ... ? + +Nyall Dawson 2017-09-05 + + Replace use of qCopy + +Nyall Dawson 2017-09-05 + + Replace use of deprecated QSqlError::number + +Nyall Dawson 2017-09-05 + + Replace use of deprecated QShortcut string operator + +Nyall Dawson 2017-09-05 + + Replace use of deprecated Qt::escape + +Nyall Dawson 2017-09-05 + + Replace use of qSort with std::sort + +Nyall Dawson 2017-09-05 + + Replace use of deprecated QMouseEvent::posF() + +Nyall Dawson 2017-09-05 + + Replace use of deprecated QHeaderView methods + +Nyall Dawson 2017-09-05 + + Replace use of deprecated QString::fromAscii + +Mathieu Pellerin 2017-09-05 + + [symbology] fix duplicate layers in symbol levels dialog (#5041) + +Nyall Dawson 2017-09-05 + + Daily Q_FOREACH -> for conversion + +Nyall Dawson 2017-09-05 + + Add some layout undo/redo tests + +Nyall Dawson 2017-09-05 + + Don't create undo commands for snap settings changes + + In practice this turns out to be undesirable - snapping changes + are more of a semi-permenant interface setting as opposed to something + which should be stored in the layout's undo history. + +Nyall Dawson 2017-09-05 + + Identation + +Nyall Dawson 2017-09-05 + + Fix unused variable warning + +Nyall Dawson 2017-09-05 + + SIP, indentation and documentation updates + +Nyall Dawson 2017-09-01 + + Move guide collection under page collection + +Nyall Dawson 2017-09-01 + + Start work on undo/redo support for layouts + +Nyall Dawson 2017-09-01 + + Implement some saving/restoring layout items to XML + +Nyall Dawson 2017-07-28 + + Port methods to retrieve layout items + +Nyall Dawson 2017-09-01 + + Fix setting custom page size + +Nyall Dawson 2017-09-01 + + Auto close item properties widget when item is deleted + +Nyall Dawson 2017-09-05 + + Add some more debugging to processing algorithm test + + Trying to pinpoint which algorithm occasionally segfaults during + test runs + +Merge: c241c6a1d0 c555079971 +Nyall Dawson 2017-09-05 + + Merge pull request #5120 from strk/drop-unreachable-code + + Remove unreachable code from curveToLine + +Matthias Kuhn 2017-09-04 + + Fix include path usage from 3rd party + +Matthias Kuhn 2017-09-04 + + Make sure classes do not miss their key function + +Merge: c43cd995a2 14f9cd19bc +Sandro Mani 2017-09-04 + + Merge pull request #5128 from manisandro/globe + + [Globe] Adapt for QGIS API changes, add Qt5 compatibility, support osgEarth up to current git master + +Alessandro Pasotti 2017-09-04 + + Sipify + +Sandro Mani 2017-03-29 + + [Globe] Adapt for QGIS API changes, add Qt5 compatibility, support osgEarth up to current git master + +Alessandro Pasotti 2017-09-04 + + Fix build warnings + +Alessandro Pasotti 2017-09-04 + + Resistance is futile, you will be sipified + +Merge: 399c2ca0dc 217e70067f +Sandro Mani 2017-09-04 + + Merge pull request #5122 from manisandro/ogr_subset_fid + + [OGR] Attempt to use actual ogr_fid also if subset string is set + +Sandro Mani 2017-09-02 + + [OGR] Attempt to use actual ogr_fid also if subset string is set + + If a subset string is set on an OGR layer, the feature iterator returns features with ids taken from a sequence starting from 0, regardless of the original feature id. + + This causes a mismatch in the data shown by the identify results table and the attribute widget. + +Alessandro Pasotti 2017-09-04 + + Implement sourceSelectProviders() for all providers + +Alessandro Pasotti 2017-09-04 + + Updates tests for source select registry + +Alessandro Pasotti 2017-09-04 + + Sip updates for source select provider and registry + +Alessandro Pasotti 2017-09-04 + + Remove all hardcoded source selects: rely on the registry + + The data source manager dialog is now clean from + hardcoded provider keys and there is a mean to + add items to the dialog via plugins (C++, providers + and Python). + +Harrissou Sant-anna 2017-09-04 + + Removing placement button groups declaration + +Harrissou Sant-anna 2017-09-02 + + Implement logic to use radio buttons for diagram placement + +Harrissou Sant-anna 2017-08-18 + + Moving diagram placement options from combobox to radio buttons + +Alessandro Pasotti 2017-09-04 + + Link gui + +Jorge Gustavo Rocha 2017-09-01 + + Improve test: assert → assertTrue + +Juergen E. Fischer 2017-09-04 + + translation string fix + + (cherry picked from commit 3943e7b9310714cbf2b2943669a8c8f56f3ed884) + +Harrissou Sant-anna 2017-08-22 + + Right align pixel size-based visibility DD button + +Harrissou Sant-anna 2017-08-19 + + Set labeling widgets to horizontally expand + + will be consistent with diagram and symbology widgets (combobox, spinbox and textbox) behavior + +Alessandro Pasotti 2017-09-04 + + QgsSourceSelectProviderRegistry delayed initialization + + Due to QgsGui being initialized after data provider. + +Sandro Santilli 2017-09-04 + + Remove unreachable code from curveToLine + + Drops the unused support for including control points in output. + See https://github.com/qgis/QGIS/pull/4746#issuecomment-326730297 + +Nyall Dawson 2017-09-04 + + Skip another test which is fragile on Travis + +Merge: 3e837045be 700f9b2ef8 +Nyall Dawson 2017-09-04 + + Merge pull request #5117 from nyalldawson/skip_test_travis + + Skip some task manager tests on Travis only + +Merge: df7c3df473 1c3e358151 +Werner Macho 2017-09-04 + + Merge pull request #5115 from Cracert/trans + + New polish translators of QGIS desktop + +Alessandro Pasotti 2017-09-04 + + Add sourceSelectProviders() to the ogr data provider + + This is the first data provider real implementation, + all other data provider will follow. + +Alessandro Pasotti 2017-09-04 + + Attach QgsSourceSelectProviderRegistry to QgsGui + + And make it a singleton + +Nathan Woodrow 2017-09-04 + + Revert "Ignore some python warnings for now" + + Doesn't work on all platforms + + This reverts commit f0e53db254f38071e87b993b580ea050b19f4b17. + +Merge: f0e53db254 d1d5e6cf83 +Nyall Dawson 2017-09-04 + + Merge pull request #5118 from nyalldawson/label_rotate + + Fix rotate label tool + +Nyall Dawson 2017-09-04 + + Fix bad icon drawn on top of points when rotating labels + +Nathan Woodrow 2017-09-04 + + Ignore some python warnings for now + + shhhh Qt5 + +Nyall Dawson 2017-09-04 + + Fix rotate label tool results in inverted rotation + + Fix #17068 + +Nyall Dawson 2017-09-04 + + Fix error when adding disabled plugin based processing providers + +Nyall Dawson 2017-09-04 + + Condense qgstestutils.h and qgstest.h into a single file + +Nyall Dawson 2017-09-04 + + Skip some task manager tests on Travis only + + Instead of #ifdefing them out, only prevent them running + on Travis so that they still run locally. + + Also skip another task manager test which randomly + fails only on Travis + +Nyall Dawson 2017-09-04 + + Remove QgsTransectSample + + Because: + - it's unused in master, and is more code to maintain + just for possible use by plugins + - it's unmaintained, and has had no work done (beside compilation + fixes) in the recent past + - there's no unit tests or detailed documentation to show + how the class should be used + +Nyall Dawson 2017-09-04 + + Rename 'Polygon from layer extent' to 'Extract layer extent' + + It's slightly simpler to understand and better reflects + what this alg does + +Nyall Dawson 2017-09-03 + + Unify processing "polygon from layer extent" algorithms + + Now that the extra features of the "polygon from vector layer extent" + algorithm are covered by the new "Minimum bounding geometry" algorithm, + we can replace the previous two "polygon from vector extent" and + "polygon from raster extent" algorithms by a single "polygon + from layer extent" algorithm. + +Nyall Dawson 2017-09-03 + + Add note to see 'minimum bounding geometry' alg to feature by feature alg help + +Nyall Dawson 2017-09-03 + + Remove redundant algorithms + +Nyall Dawson 2017-09-03 + + [FEATURE] Split minimum enclosing geometry algs into separate + feature based algorithms + + Instead of algorithms which handle both whole layers/groups + of features/individual features, we leave the whole layer + and group of features handling to the "Minimum bounding + geometry" algorithm. + + The feature-by-feature algorithms are now native c++ + algorithms. + + This affects: + - bounding boxes + - convex hulls + - minimum enclosing circle + - minimum oriented rectangles + +Nyall Dawson 2017-09-03 + + Optimise calculation of envelopes for MinimumBoundingGeometry alg + + It's more efficient to calculate these on the fly, rather then + collecting all geometry points and then calculating. + +Nyall Dawson 2017-09-03 + + [FEATURE] New processing algorithm "minimum bounding geometry" + + This algorithm creates geometries which enclose the features + from an input layer. + + Numerous enclosing geometry types are supported, including + bounding boxes (envelopes), oriented rectangles, circles and + convex hulls. + + Optionally, the features can be grouped by a field. If set, + this causes the output layer to contain one feature per grouped + value with a minimal geometry covering just the features with + matching values. + +Nyall Dawson 2017-09-04 + + Daily Q_FOREACH -> for conversion + +Robert Szczepanek 2017-09-03 + + New polish translators of QGIS desktop + +gacarrillor 2017-09-03 + + [needs-docs] Update tooltips for adding features/records + +Alessandro Pasotti 2017-09-03 + + Remove all specialized methods for adding the source selects + + We now have a unified interface for all dialogs. + +Alessandro Pasotti 2017-09-03 + + Removed specialized signal that is now in the base class + +Alessandro Pasotti 2017-09-03 + + Added last missing signal replaceVectorLayer + + This is only used by virtual layers, but it + might be handy for others too and now I can + start to remove all specialized source + select add methods from the datas source + manager dialog. + + This is only the first step: next is looping + through the source select provider registry + to get all needed GUI elements for the dialog. + +Nyall Dawson 2017-09-03 + + Add a QgsLocatorModel subclass which automatically sets up + required connections to a QgsLocator + + Use this QgsLocatorModel subclass when you want the connections + between a QgsLocator and the model to be automatically created + for you. If more flexibility in model behavior is required, + use the base QgsLocatorModel class instead and setup the + connections manually. + +Nyall Dawson 2017-08-30 + + Move locator non-gui classes to core + + Allows reuse in projects which don't build QGIS gui, e.g. + QField + +Nyall Dawson 2017-09-03 + + [ogr] Don't try to calculate CRS for geometryless layers + + Slight speedup when loading attribute table containing + joins to a geometryless OGR table + +Jorge Gustavo Rocha 2017-09-03 + + remove unnecessary test + +Jorge Gustavo Rocha 2017-09-03 + + remove unwanted files + +Merge: dc50a3e644 390a34f5ec +Jorge Gustavo Rocha 2017-09-02 + + Merge remote-tracking branch 'origin/add-default-layers' into add-default-layers + +Jorge Gustavo Rocha 2017-09-02 + + settings.globalChildGroups() test moved to test_qgssettings.py + +Jorge Gustavo Rocha 2017-09-02 + + settings.globalChildGroups() test moved to test_qgssettings.py + +lbartoletti 2017-09-02 + + [FEATURE][Processing] Minimal enclosing circle + +Harrissou Sant-anna 2017-09-01 + + Add Help button and connect it to user manual + +Merge: 56040c41e8 bbd0beb50c +Nyall Dawson 2017-09-02 + + Merge pull request #5102 from nyalldawson/socket_error + + Fix QSocketNotifier error on startup + +Nyall Dawson 2017-09-02 + + Fix bad doc string + + [ci skip] + +Merge: 46264414bc 14ce8b5bc0 +Nyall Dawson 2017-09-02 + + Merge pull request #5109 from nyalldawson/fix_17086 + + [composer] Fix node based items (line/polygon) ignore exclude from export setting + +Nyall Dawson 2017-09-01 + + Fix QSocketNotifier error on startup + + And avoid unnecessary creation of unused QFileSystemWatchers + +Nyall Dawson 2017-09-02 + + [composer] Fix node based items (line/polygon) ignore exclude + from export setting + + Fixes #17086 + + (forward port from 89c38ed) + +Merge: d9152429a1 9d3c9e1963 +Nyall Dawson 2017-09-02 + + Merge pull request #5104 from nyalldawson/composer_tweaks + + Composer tweaks + +Alessandro Pasotti 2017-09-01 + + Update sip file + +Alessandro Pasotti 2017-09-01 + + Add QgsSourceSelectProviderRegistry with tests + +Alessandro Pasotti 2017-09-01 + + Add class QgsSourceSelectProvider and tests + + This is the first step for QEP 101 + +Nyall Dawson 2017-09-01 + + [FEATURE] Expose "justify" text alignment as an option for + composer label alignment + + It's supported by Qt already, just not shown as an option + in the config widget! + +Nyall Dawson 2017-09-01 + + [composer] Allow finer setting of scalebar height and widths + + While the settings are stored as double, they were being + rounded off in the UI to the nearest mm + +Jorge Gustavo Rocha 2017-09-01 + + Improve test: assert → assertTrue + +Jorge Gustavo Rocha 2017-09-01 + + Include settings.globalChildGroups in test + Fix container iteration + +Merge: 247d2657ca b6d86753e2 +Alessandro Pasotti 2017-09-01 + + Merge pull request #5101 from boundlessgeo/fix_pseudocolor_ramp_widget + + Fix broken qgscolorramp button + +Nyall Dawson 2017-09-01 + + Fix invalid regular expression warnings + +Nyall Dawson 2017-09-01 + + Fix QFileSystemWatcher debug warning on startup + +Nyall Dawson 2017-09-01 + + Pass QString by const ref + +Nyall Dawson 2017-09-01 + + Add missing SIP_FACTORY + +Nyall Dawson 2017-09-01 + + Fix another small leak + +Nyall Dawson 2017-09-01 + + Fix memory leak + +Nyall Dawson 2017-09-01 + + Fix uninitialized/not copied member variable + +Nyall Dawson 2017-09-01 + + Avoid Coverity unchecked return value warnings + +Nyall Dawson 2017-09-01 + + Fix some possible leaks in tests + +Nyall Dawson 2017-09-01 + + Fix possible divide by 0 (Thanks to Coverity) + +Nyall Dawson 2017-09-01 + + Switch some dynamic_casts to qobject_casts + +Nyall Dawson 2017-09-01 + + Fix some Coverity null pointer dereference warnings + +Nyall Dawson 2017-09-01 + + Add guard against nullptr dereference (Coverity warning) + +Merge: 4810c73e4d c2f8a8224b +Nyall Dawson 2017-09-01 + + Merge pull request #5089 from nyalldawson/hausdorff + + Expose GEOS Hausdorff distance calculations to QgsGeometry, add expression function + +Alessandro Pasotti 2017-08-31 + + Fix broken qgscolorramp button + + For a misterious reason ( the docs are not completely clear ) + calling text() on the ramp QAction returned all string prefixed + with '&' causing the whole button to miss the changed ramp. + + By calling iconText() instead we get the right name for + the ramp. + +Alessandro Pasotti 2017-08-31 + + Keep XYZ connections synchronized in browser(s) and data source manager dialog + +Merge: 9fa12ac57f 0346fb839a +Alessandro Pasotti 2017-08-31 + + Merge pull request #5096 from boundlessgeo/server_ogr_multi_geom + + [server] Rely on the provider to get the correct wkbType + +Merge: 6fe6394fc7 bb5a499c23 +Nyall Dawson 2017-08-31 + + Merge pull request #5090 from nyalldawson/raster_layer_extent + + [FEATURE] New algorithm for creating vector layer from raster layer's extent + +Nyall Dawson 2017-08-31 + + Geometry error string is not shared + + Instead move it to a private QgsGeometry member. It's copied + with QgsGeometry, but not the underlying private geometry + data. + + This means the error string can be changed without detaching + (and copying) the geometry data. + + Also make greater use of error string for all use of GEOS + functions. + +Nyall Dawson 2017-08-30 + + Fix evaluation of expression functions which use optional arguments + with null default values + +Nyall Dawson 2017-08-30 + + [FEATURE] Expression function for hausdorff distance + + Allows calculation of the Hausdorff distance between two + geometries + +Nyall Dawson 2017-08-30 + + Expose GEOS Hausdorff distance calculations to QgsGeometry + +Alessandro Pasotti 2017-08-30 + + [server] Rely on the provider to get the correct wkbType + + This commit removes a check for OGR provider that + always returned gml:GeometryPropertyType in + describefeaturetype. + + This is a partial fix for #17019 + + Needs backporting + +Matthias Kuhn 2017-08-30 + + Make crssync quiet by default + + We only need it to show up in the build log if something has gone wrong. + By default we will just happily assume that it's doing a great job in + all conscience. + +Merge: 12e69d0991 d46317802b +Nyall Dawson 2017-08-30 + + Merge pull request #5092 from nyalldawson/algs + + Port some GDAL algs to new API + +Nyall Dawson 2017-08-30 + + Port gdal translate alg to new api + +Nyall Dawson 2017-08-30 + + Port rgb2pct to new API + +Nyall Dawson 2017-08-30 + + Port GDAL info alg to new API + +Nyall Dawson 2017-08-30 + + Fix generation of processing tests on Windows + +Nyall Dawson 2017-08-30 + + Rename parameter for consistency with other algs + +Nyall Dawson 2017-08-30 + + Rename Polygon from Layer Extent to Polygon from Vector Extent + + Helps clarify that this alg only functions for vector layers + +Nyall Dawson 2017-08-30 + + [FEATURE] New algorithm for creating vector layer from raster layer's extent + + Allows creation of a new vector layer with a single feature containing + a raster layer's extent. Previously this was only possible for + vector layers. + +Juergen E. Fischer 2017-08-30 + + dxf export: + * empty field name resets to layer name (fixes #17060) + * allow forcing to 2d to support polyline width (fixes #17049) + +Merge: 2a4a2d872b c12fc9c62f +Nyall Dawson 2017-08-30 + + Merge pull request #5088 from telwertowski/master + + Add headers needed by macOS for recently added std:: prefixes + +Merge: 9464ab75e6 184899ec30 +Nyall Dawson 2017-08-30 + + Merge pull request #5087 from nyalldawson/algs + + Port remaining plotly based algs to new API + +Nyall Dawson 2017-08-30 + + Port remaining plotly based algs to new API + +Tom Elwertowski 2017-08-29 + + Add headers needed by macOS for recently added std:: prefixes + +Juergen E. Fischer 2017-08-29 + + fix translation string + +Radim Blazek 2017-08-29 + + GRASS uppercase in project description + +Radim Blazek 2017-08-29 + + highlight disappearing fix - second attempt, 4659691 and 51170aec follow-up + +Merge: e5b11d4206 e6203847d3 +Nyall Dawson 2017-08-30 + + Merge pull request #5078 from nyalldawson/rename + + Some more analysis lib cleanups + +Merge: f99a7a966e 1e4e45d0a7 +Alessandro Pasotti 2017-08-29 + + Merge pull request #5085 from boundlessgeo/wfs_mutex_offline + + Offline editing: workaround for bug 17087 deadlock + +Alessandro Pasotti 2017-08-29 + + [bugfix] Workaround for bug 17087 deadlock + + Add the layer to the project after iteration completed. + This prevents the bug to freeze QGIS forever but it doesn't + of course fix it. + +Nyall Dawson 2017-08-26 + + Update sip include + +Nyall Dawson 2017-08-26 + + Use a QgsFeatureSink instead of path to shapefile in QgsTinInterpolator + + Instead of just forcing writing the triangulation to a shapefile (boo!) + change the parameter to use a QgsFeatureSink, so that anything + which implements the QgsFeatureSink interface can be used for + storing the triangulation. + +Nyall Dawson 2017-08-26 + + Add missing headers to analysis CMakeLists + +Nyall Dawson 2017-08-26 + + Swap final uses of QProgressDialog in analysis lib to QgsFeedback + +Nyall Dawson 2017-08-26 + + Remove some unused QProgressDialog imports from analysis lib + +Nyall Dawson 2017-08-26 + + Remove interpolation internal classes from stable API + + These classes still need a lot of cleanup (e.g. use of proper + 3d geometry classes instead of their own 3d line classes, etc) + and we don't want them locked into the 3.0 API. + + Better to remove them from the API and reintroduce them after + they have been cleaned up (in >3.0). They are mostly implementation + details anyway, and unlikely to be used outside of the high + level interpolation classes. + +Nyall Dawson 2017-08-26 + + More .cc -> .cpp renames + +Nyall Dawson 2017-08-26 + + Exclude MathUtils from sip bindings + + We don't want these part of stable API - this namespace really shouldn't + exist, as it mostly contains code which is duplicated in other + parts of the API (with better maintained and tested versions). + +Nyall Dawson 2017-08-26 + + Rename .cc files to .cpp for consistency + +Merge: 51170aec0c e4c1e1b905 +Nyall Dawson 2017-08-29 + + Merge pull request #5083 from nyalldawson/clazy + + Clazy optimisations + +Nyall Dawson 2017-08-29 + + Ignore Q_ENUM in doxygen test + +Nyall Dawson 2017-08-29 + + Restore qRegisterMetaType for Q_ENUMed enums + + It's odd - because one reason to swap to Q_ENUM is to gain + automatic registration of these types, so it should work + without the manual registration. Might be a SIP binding issue... + +Nyall Dawson 2017-08-29 + + Update sip + +Nyall Dawson 2017-08-29 + + Some more Clazy cleanups + +Nyall Dawson 2017-08-29 + + Use .at(0) instead of .left(1), as it avoids string allocation + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Include qglobal.h before relying on Qt macro definitions + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Use faster QVariant::toString method + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Use faster static QFileInfo::exists instead of constructing QFileInfo + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Avoid detach of temporary + +Nyall Dawson 2017-08-29 + + Use faster QColor constructor with r/g/b parameters + + The QString based constructor is slow, as the string must + be parsed to interpret the color. + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Fix missing (or incorrect use of) emit + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Don't use .lower() to perform case-insensitive string operations + + Use the faster versions with Qt::CaseInsensitive instead. These + don't require a string copy and conversion to lowercase. + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Fix detaching of temporary container + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Remove some unused variables + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Fix some Clazy detaching container warnings + + (not all are valid, but at worst this flips some more + Q_FOREACH uses to c++11 for loops) + +Nyall Dawson 2017-08-29 + + Use faster QString.arg multistring overload + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Remove trivial assignment operator + + Violates rule of 2. Thanks to Coverity! + +Nyall Dawson 2017-08-29 + + Fix missing Q_OBJECT macros + + Thanks to Clazy + +Nyall Dawson 2017-08-29 + + Fix mixed uses of const/non-const iterator methods + + Thanks for Clazy + +Nyall Dawson 2017-08-29 + + Flip Q_ENUMS to Q_ENUM + + See https://woboq.com/blog/q_enum.html for rationale + +nirvn 2017-08-29 + + Revert "highlight fix" due to regression (fixes #16824) + + This reverts commit 46596914e11dae13cd4d986941246c12f30aa0d9. + +Merge: c3a737bd36 487adb45f6 +Alessandro Pasotti 2017-08-29 + + Merge pull request #5057 from boundlessgeo/gpkg-raster-import2 + + Geopackage: handle raster drop in browser + +Merge: 9ac511dc83 9b2e60ee1b +Nyall Dawson 2017-08-29 + + Merge pull request #5082 from nyalldawson/cmp0005 + + Remove use of old CMP0005 CMake policy + +Nyall Dawson 2017-08-29 + + Flip a couple of Q_FOREACHs to c++11 for loops + + ... just to check how bad the Q_FOREACH deprecation will be. And yep, + it's horrendous. Each one takes around 10 seconds or so to port, and + we've got some 2500+ remaining uses. + +Nyall Dawson 2017-08-29 + + Fix UI build warning + +Nyall Dawson 2017-08-29 + + Remove use of old CMP0005 CMake policy + + Since it's deprecated on newer CMake versions + +Merge: 99ef3ff834 21a3b8a4f3 +Nyall Dawson 2017-08-29 + + Merge pull request #5081 from nyalldawson/fix_c4566 + + Fix C4566 warning on Windows build + +Nyall Dawson 2017-08-29 + + Use QGSCOMPARENEAR instead of QVERIFY( qgsDoubleNear(... ) ) + + QGSCOMPARENEAR gives better debugging output when the + test fails + +Nyall Dawson 2017-08-29 + + Fix C4566 warning on Windows build + +Merge: 347a8171b8 725301ad58 +Nyall Dawson 2017-08-29 + + Merge pull request #5075 from nyalldawson/no_math_defines + + Remove redundant math constant defines + +Nyall Dawson 2017-08-29 + + Ignore C4091 warnings caused by inclusion of DbgHelp.h on Windows + + There's a bug in this header file provided by the Win SDK, + so just disable this warning for any QGIS source files which include + DbgHelp.h + +Nyall Dawson 2017-08-26 + + Add qgsAsConst(...) + + This is the equivalent of std::as_const (which requires c++17) or + qAsConst (which requires Qt 5.7), neither of which we have + as minimum dependancies. + + By wrapping implicitly shared Qt containers in qgsAsConst we can + safely use c++ for ranged loops instead of Q_FOREACH. (Since + Q_FOREACH's future is shaky) + + See https://www.kdab.com/goodbye-q_foreach/ for further details + on why for causes a detach for Qt containers and why Q_FOREACH + is being removed from Qt. + +Merge: 55a01dcb17 19ce33f011 +Blottiere Paul 2017-08-28 + + Merge pull request #4913 from pblottiere/joineditable2 + + [FEATURE] Joined layers are editable + +Blottiere Paul 2017-08-27 + + Add a safety guard + +Blottiere Paul 2017-08-27 + + Request without attributes + +Blottiere Paul 2017-08-25 + + Improve performance + +Blottiere Paul 2017-08-25 + + QgsVectorLayerJoinBuffer inherits from QgsFeatureSink + +Blottiere Paul 2017-08-25 + + Replace if by switch + +Blottiere Paul 2017-08-25 + + Move join intelligence in QgsVectorlayerJoinBuffer + +Blottiere Paul 2017-08-24 + + Add some const + +Blottiere Paul 2017-08-22 + + Update tests + +Blottiere Paul 2017-08-22 + + A joined feature is added only when one of its field is not null + +Blottiere Paul 2017-08-21 + + Add tests + +Blottiere Paul 2017-08-21 + + Joined features are created on changeAttributeValue when upsertOnEdit is activated + +Blottiere Paul 2017-08-21 + + Fix spell check + +Blottiere Paul 2017-08-03 + + Update vector layer properties ui list for join + +Blottiere Paul 2017-07-26 + + Add some tooltips + +Blottiere Paul 2017-07-26 + + Add icons for joins status in attribute form + +Blottiere Paul 2017-07-25 + + Fix tests + +Blottiere Paul 2017-07-24 + + Initialize attributes + +Blottiere Paul 2017-07-24 + + Rename setDeleteCascade/isDeleteCascade in setCascadedDelete/hasCascadedDelete + +Blottiere Paul 2017-07-24 + + Rename isUpsertOnEdit in hasUpsertOnEdit + +Blottiere Paul 2017-07-24 + + Initialize joined feature properly + +Blottiere Paul 2017-07-21 + + Add tests for deleteCascade option + +Blottiere Paul 2017-07-21 + + Implements deleteCascade option + +Blottiere Paul 2017-07-20 + + Small cleanup + +Blottiere Paul 2017-07-20 + + Add tests for upsertOnEdit option + +Blottiere Paul 2017-07-20 + + Update sip binding + +Blottiere Paul 2017-07-20 + + Implements upsertOnEdit option + +Blottiere Paul 2017-07-20 + + Fix column name in join configuration + +Blottiere Paul 2017-07-20 + + Add tests + +Blottiere Paul 2017-07-18 + + [FEATURE] Joined fields are editable if the option is activated + +Blottiere Paul 2017-07-11 + + Update sip binding + +Blottiere Paul 2017-07-11 + + [needs-doc] Add editable/upsert on edit/delete cascade options + +Sandro Santilli 2017-08-25 + + Simplify linearizeArc code dropping useless conditionals + +Alessandro Pasotti 2017-08-28 + + Removed some GDAL version ifdefs + + Now that 2.1 is required + +Merge: d476abf5a7 095bcae01d +Mathieu Pellerin 2017-08-28 + + Merge pull request #5070 from nirvn/open_raster_imp + + Open raster layer UI improvements + +nirvn 2017-08-25 + + use a QgsFileWidget in open vector layer UI + +nirvn 2017-08-25 + + harmonize open raster and open vector UIs + +nirvn 2017-08-25 + + fix open raster not focusing on raster data source manager tab + +Merge: 37052db39a a2c9710a2d +Nyall Dawson 2017-08-27 + + Merge pull request #5054 from nyalldawson/canvas_select + + Ensure canvas has focus if nothing else has + +Clément MARCEL 2017-08-27 + + Fix crash when closing a project with layers in edition (fixes #16771) + + Delete layers from project & not through layers tree, avoiding + double deletion of layers. + +Merge: 650cf6a3fd 43200ea8e9 +Nyall Dawson 2017-08-26 + + Merge pull request #5074 from nyalldawson/cleanup + + Remove some redundant and unused MathUtils methods + +Sandro Santilli 2017-08-25 + + Remove line segmentation test checking for control point containement + + There are more tests in dedicated file (testqgscurve.cpp) + +Sandro Santilli 2017-08-25 + + Expect centroid obtained by not forcing inclusion of control point + +Sandro Santilli 2017-08-25 + + Do not expect forced control point in output + +Sandro Santilli 2017-08-25 + + Do not force inclusion of control point + + This reverts commit dae9d025293c217628def8eb8d196238d2218ddc. + +Sandro Santilli 2017-08-25 + + Update expected centroid, interpolated angle and located point for reference curves + + These values change because they are computed on the *linearization* + of those curves, and refactoring linearization codes results in + slighly different values. + + NOTE: adding or not adding the control point would also affect these + results + +Sandro Santilli 2017-08-25 + + Update expected results now that we're forcing control point in output + +Sandro Santilli 2017-08-25 + + Remove test off-variable + +Sandro Santilli 2017-08-22 + + Fix build and multi-arc duplicated points + +Sandro Santilli 2017-07-21 + + Refactor curveToLine to emit equidistant segments and fix some issues + + Fixes #16717 + Fixes #16722 + + Include tests + +Nyall Dawson 2017-08-26 + + Remove some redundant and unused MathUtils methods + +Nyall Dawson 2017-08-26 + + Make more use of math constants + +Nyall Dawson 2017-08-26 + + Remove redundant math constant defines + + Since we use _USE_MATH_DEFINES for windows builds, these are + not required + +Merge: c64bc974b5 2d192791c2 +Nyall Dawson 2017-08-26 + + Merge pull request #5069 from nyalldawson/std + + Swap use of some q* macros to std calls + +nirvn 2017-08-25 + + [processing] one more z factor minimum value adjustment + +nirvn 2017-08-25 + + [processing] fix z factor minimum value in various raster algorithms + +nirvn 2017-08-25 + + [analysis] fix derivative filter z factor handling + +Nyall Dawson 2017-08-25 + + qMin/qMax -> std::min/max + +Nyall Dawson 2017-08-25 + + Add new raster hash for hillshade test (verified ok) + +Nyall Dawson 2017-08-25 + + Better test debugging + +Merge: 65455c4b9e 018c13afbf +Nyall Dawson 2017-08-25 + + Merge pull request #5061 from nouanda/fix16887 + + Fix #16887: creating a memory scratch layer with Z/M values does not add Z/M to the layer + +Nyall Dawson 2017-08-25 + + Update sip bindings + +Nyall Dawson 2017-08-25 + + Fix build + +Merge: 9f18050e62 bd8decee09 +Matthias Kuhn 2017-08-24 + + Allow creation of Z/M gpkg layers (#5060) + + Fix #16888: create gpkg layer does not allow to add Z/M dimension + +Nyall Dawson 2017-08-25 + + Replace some more c headers with c++ headers + +Nyall Dawson 2017-08-25 + + Always use " for qgs header imports + +Nyall Dawson 2017-08-25 + + Replace use of math.h with cmath + +Nyall Dawson 2017-08-25 + + Add more missing std:: prefixes + +Nyall Dawson 2017-08-25 + + Remove unused qmath.h includes + +Nyall Dawson 2017-08-25 + + Remove use of some other q* functions which are implemented in std + +Nyall Dawson 2017-08-25 + + qFuzzyIsNull -> qgsDoubleNear + +Nyall Dawson 2017-08-25 + + (q)sqrt -> std::sqrt + +Nyall Dawson 2017-08-25 + + (q)sin -> std::sin + +Nyall Dawson 2017-08-25 + + (q)floor -> std::floor + +Nyall Dawson 2017-08-25 + + (q)cos -> std::cos + +Nyall Dawson 2017-08-25 + + (q)ceil -> std::ceil + +Nyall Dawson 2017-08-25 + + (q)atan2 -> std::atan2 + +Nyall Dawson 2017-08-25 + + Swap q(pow) -> std::pow + +Nyall Dawson 2017-08-25 + + Make sure (f)abs are prefixed with std:: + +Nyall Dawson 2017-08-24 + + Use fabs/abs/labs instead of qAbs + + Better to stick to standard methods where available instead + of less supported Qt methods + +Nyall Dawson 2017-08-24 + + Use std::round instead of qRound + + Now that our minimum VS studio version allowed supports std::round, + we should use that in place of Qt's qRound method. + + Because: + - it doesn't truncate to int, resulting in unpredictable + behaviour (refs #16925) + - better to stick to standard c++ methods wherever possible, + since they're likely better supported and optimised by the + compilers + - it's a tiny reduction to the barrier for entry to QGIS + development (I'm sick of pointing out the need to use + qRound during PR reviews!) + +Alessandro Pasotti 2017-08-24 + + Removed not qobject from moc + +Alessandro Pasotti 2017-08-24 + + Geopackage import rasters with drag and drop + + This implementation uses GDALTranslate and + a QgsTask. + +C. Marcel 2017-08-24 + + Split Z/M checkbox into 2 checkboxes. + +Harrissou Sant-anna 2017-08-24 + + Filling the help infrastructure (#5064) + + * Filling the help infrastructure + + Add missing help button and links to user manual + + * Remove unneeded comment + + * remove unneeded comment + + * Remove unneeded comment + +Merge: 835e6d253d 465b27a40d +rldhont 2017-08-24 + + Merge pull request #5044 from pblottiere/server_bugfix_ogc_getcapa_styles + + [server][bugfix] Fixes OGC test on legendurl styles + +Merge: 50e8e1c00b b947406155 +Alessandro Pasotti 2017-08-24 + + Merge pull request #5062 from boundlessgeo/raster-widget-multiple-select + + Allow multiple raster selection from GDAL source select widget + +Alessandro Pasotti 2017-08-24 + + More robust multiple paths split and utility static method + +Alessandro Pasotti 2017-08-24 + + Do not quote when single raster file is selected + +Alessandro Pasotti 2017-08-24 + + Small code style changes + +Harrissou Sant-anna 2017-08-23 + + Reorganize buttons to set map extent + + There's likely no situation where the four buttons are activated simultaneously... Better have three on a line than the current heterogeneous UI. + +Matthias Kuhn 2017-08-23 + + Fix spelling + +Alessandro Pasotti 2017-08-23 + + Allow multiple raster selection from GDAL source select widget + + Since I'm using QgsFileWidget I also added + multiple files support to that widget and + tests for this new behavior. + +Matthias Kuhn 2017-08-23 + + [docker] Set valid workdir + +C. Marcel 2017-08-23 + + Use layer type instead of first vertex type + +C. Marcel 2017-07-25 + + Fix 16888: create gpkg layer does not allow to add Z/M dimension + +Matthias Kuhn 2017-08-23 + + [docker] Remove source tree from image + +Etienne Trimaille 2017-08-22 + + enable custom help in python expressions + +Merge: ef89a624a1 0669167af2 +Nyall Dawson 2017-08-23 + + Merge pull request #5058 from nyalldawson/processing_fixes + + Processing polish + +Nyall Dawson 2017-08-23 + + Rename processing 'recently used algorithms' to 'recently used' + + Since we show much more than just 'algorithms' here + +Nyall Dawson 2017-08-23 + + Fix model execution missing from processing history + +Nyall Dawson 2017-08-23 + + Fix restricting model algorithm input types to valid types for alg (refs #17030) + +Jorge Gustavo Rocha 2017-08-23 + + Fix TRAVIS qgis_global_settings path + +Jorge Gustavo Rocha 2017-08-22 + + Support removal of global defined XYZ connections + +Nyall Dawson 2017-08-23 + + Add a file selector for file parameters in model algorithms + + Makes it more obvious to users that a fixed filename can be + used here + +Nyall Dawson 2017-08-23 + + Reformat code + +Nyall Dawson 2017-08-23 + + Don't throw python exception when modeler algorithm is missing inputs + + Instead use nicer messagebar for feedback. Also fix untranslatable + strings. + + Refs #17028 + +Alessandro Pasotti 2017-08-22 + + Minor update in the comment + +Alessandro Pasotti 2017-08-22 + + Bump required GDAL version from 2.0 to 2.1 + + Because we need GDALTranslate() + +Nyall Dawson 2017-08-23 + + Rename some processing widget wrappers to better match corresponding c++ classes + +Nyall Dawson 2017-08-23 + + Add basic unit tests for constructing processing widget wrappers + +Nyall Dawson 2017-08-22 + + Fix some inconsistent capitalization in algorithm naming + +Nyall Dawson 2017-08-22 + + Rationalise algorithm groups a bit + +Nyall Dawson 2017-08-22 + + Fix use of incorrect icon for algorithm + +Nyall Dawson 2017-08-22 + + Don't allow dragging groups in model algorithm tree + +lbartoletti 2017-08-22 + + Fix remaining rubberBand + +Alessandro Pasotti 2017-08-22 + + Safer handling of GDAL handles and feedback on success + +Alessandro Pasotti 2017-08-22 + + I'm eating too much Python (fix a Qt warning for missing arg) + +Alessandro Pasotti 2017-08-22 + + Geopackage: handle raster drop in the browser + +Alessandro Pasotti 2017-08-22 + + OGR provider: moved QgsCPLErrorHandler to its own header file + + This is being reused in gpkg data items + +Alessandro Pasotti 2017-08-22 + + Added rasterLayer method + +lbartoletti 2017-08-22 + + Fix error when the tools was changed. setParentTool is not needed. + +Juergen E. Fischer 2017-08-20 + + creatensis.pl: don't require admin rights to create the uninstaller + +Matthias Kuhn 2017-08-22 + + [docker] Install bindings to system python path + +Matthias Kuhn 2017-08-22 + + [docker] Install to /usr prefix + +Harrissou Sant-anna 2017-08-21 + + Fix wording + + Fully write the label because there's enough space + alignment + +Harrissou Sant-anna 2017-08-21 + + Fix Python console web link + +Harrissou Sant-anna 2017-08-21 + + Delete obsolete context help + + already ported to user manual and linked to help button + +Merge: b8d2a17476 4d3c7e558b +Alessandro Pasotti 2017-08-21 + + Merge pull request #5055 from boundlessgeo/gpkg-fix-delete-layers + + Geopackage: fix crash when deleting raster layers + +Matthias Kuhn 2017-08-21 + + Port symbols test from ebf20a5 + +Alessandro Pasotti 2017-08-21 + + Geopackage: fix crash when deleting raster layers + +Nyall Dawson 2017-08-22 + + Followup canvas focus commit + +Sandro Mani 2017-08-09 + + Ensure canvas has focus if nothing else has + + Forward port from Sourcepole's fork + +Merge: 2530d9eefe bcc662722b +Nyall Dawson 2017-08-22 + + Merge pull request #5050 from nyalldawson/algs + + Port more QGIS algs to new API + +David 2017-08-21 + + QEP 37: Fields And Forms Redesign - interim status + +Merge: f867b65cd2 aa69737807 +Alessandro Pasotti 2017-08-20 + + Merge pull request #5051 from boundlessgeo/gpkg-prevent-auto-import + + Geopackage: prevent import layer over itself + +Alessandro Pasotti 2017-08-20 + + Prevent import layer over itself + +Nyall Dawson 2017-08-20 + + Upgrade Convert Geometries algorithm to maintain Z/M, curves were possible + +Nyall Dawson 2017-08-20 + + Fix test reference file + +Nyall Dawson 2017-08-20 + + Port Convert Geometry Type to new API + + Includes partial support for Z/M types (values are lost during + conversion, but at least 2d geometries are exported) + + TODO: full support for Z/M/curves + +Nyall Dawson 2017-08-20 + + Partial port of raster calculator to new API + + TODO: modeler handling + +Nyall Dawson 2017-08-20 + + Port Execute SQL to new API, add test + +Nyall Dawson 2017-08-20 + + Fix some issues when creating processing tests + +Nyall Dawson 2017-08-20 + + Port define projection to new API + +Nyall Dawson 2017-08-20 + + Port Find Projection alg to new API + + Also modify alg to export a vector table of candidates instead of + a HTML list, since a vector table is more useful inside of + models and can be used for further analysis steps. + +Nyall Dawson 2017-08-19 + + Resurrect Python Field Calculator algorithm, add test + +Nyall Dawson 2017-08-19 + + Resurrect Field Calculator algorithm, add test + +Nyall Dawson 2017-08-19 + + Fix conversion of direct vector layer parameters to python strings + +Juergen E. Fischer 2017-08-19 + + creatensis.pl: create signed installer + +Juergen E. Fischer 2017-08-19 + + updat splash + +Juergen E. Fischer 2017-08-19 + + add typo to spelling.dat + +Juergen E. Fischer 2017-08-19 + + translation string fixes + +Denis Rouzaud 2017-08-02 + + fix QgsRasterHistogram::histogramVector for SIP <= 4.17 + +Giovanni Manghi 2017-08-18 + + improves grass7 v.in.dxf making a couple of parameters optional/mandatory + +Merge: 5481177699 114f071cf8 +Nyall Dawson 2017-08-19 + + Merge pull request #5042 from nyalldawson/algs + + Port some more algs to new API + +Nyall Dawson 2017-08-19 + + Don't generate triangulation files by default in TIN algorithm + +Nyall Dawson 2017-08-19 + + Use QgsFeedback instead of QProgressDialog in tin interpolator + +Nyall Dawson 2017-08-19 + + Restore TIN interpolation algorithm + +Nyall Dawson 2017-08-19 + + Fix broken TIN interpolation (loss of point z coordinates) + +Nyall Dawson 2017-08-19 + + Use QgsFeedback in QgsGridFileWriter instead of QProgressDialog + +Nyall Dawson 2017-08-19 + + Port IDW Interpolation alg to new API + +Nyall Dawson 2017-08-19 + + Add Map Layer input parameter type for models + + Since algorithms now use this parameter type (render map alg) + we also need to allow its use in models + +Nyall Dawson 2017-08-19 + + Expose all layer type filters to both model feature source, vector + layer and multi layer inputs + + Refs #17030 + +Nyall Dawson 2017-08-19 + + Fix wrapped c++ object has been deleted error when editing model parameters + + Fixes #16858 + +Nyall Dawson 2017-08-19 + + Rename some enum values for clarity + +Nyall Dawson 2017-08-19 + + Port rectangles, ovals, diamonds to new API + +Even Rouault 2017-08-18 + + [OGR provider] Avoid 'database locked' issues when editing several layers of the same GeoPackage (fixes #17034) + +Nyall Dawson 2017-08-19 + + Port build virtual vector alg to new API + +Nyall Dawson 2017-08-19 + + Model vector layer inputs can also be used for feature source parameters + +Nyall Dawson 2017-08-19 + + Fix processing setting to use filename as layer name + +Nyall Dawson 2017-08-19 + + Fix processing rendering styles for output dialog, functionality + +Merge: f0d3677865 a2914ff66c +Hugo Mercier 2017-08-18 + + Merge pull request #5043 from pblottiere/bugfix_refrel + + Fixes relation reference widget by refreshing filter lists. Fixes #16400 + +Nyall Dawson 2017-08-19 + + Port set raster style alg to new API + +Nyall Dawson 2017-08-19 + + Allow selecting wildcard filter for any file input parameter + +Nyall Dawson 2017-08-19 + + Restore Set style for vector layer alg + +Nyall Dawson 2017-08-19 + + Use a QgsFeedback object in QgsRelief instead of QProgressDialog + +Nyall Dawson 2017-08-19 + + Port raster relief alg to new API + +Blottiere Paul 2017-08-18 + + Add test + +Blottiere Paul 2017-08-18 + + Fix OGC test getcapabilities:style-legendurls + +Etienne Trimaille 2017-08-18 + + fix opening sublayers in a group + +Merge: 86949cb2fa dc6d1c135e +Alessandro Pasotti 2017-08-18 + + Merge pull request #5040 from boundlessgeo/gpkg-raster-delete + + Geopackage: moved delete to abstract item and implemented raster deletion + +Blottiere Paul 2017-08-18 + + Add unit tests + +Blottiere Paul 2017-08-18 + + Fixes relation reference widget by refreshing filter lists. Fixes #16400 + +Nyall Dawson 2017-08-18 + + Port hypsometic curves to new API + +Nyall Dawson 2017-08-18 + + Port oriented minimum bounds to new API + +Merge: 0c46ac4030 7a314f3cb2 +Nyall Dawson 2017-08-18 + + Merge pull request #5037 from nyalldawson/render_progress_bar + + Avoid 'flashy' status bar progress widget when map renders are fast + +Merge: c188578186 e8ad0ba5d9 +Nyall Dawson 2017-08-18 + + Merge pull request #5038 from nyalldawson/canvas_dock_tweaks + + Canvas dock tweaks + +Merge: 251354eaaa 37b899fb99 +Nyall Dawson 2017-08-18 + + Merge pull request #5039 from nyalldawson/fix_model_crash + + Add a pure virtual clone method to processing parameter definitions + +Alessandro Pasotti 2017-08-17 + + Removed metadata table from the list of tables to be cleared + +Alessandro Pasotti 2017-08-17 + + Use sqlite3_close instead of v2 + +Alessandro Pasotti 2017-08-17 + + Geopackage try to remove optional entries + fix build warnings + +Alessandro Pasotti 2017-08-17 + + Prevent SQL injection by using sqlite3_mprintf + +Alessandro Pasotti 2017-08-17 + + Geopackge bugfix: also show single raster layers + + The previous implementation only showed subdatasets + while single raster were skipped. + + Now the single rasters are also showed and the name + is retrieved from GDAL metadata IDENTIFIER. + + The gpkg table name is used to delete the table. + +Alessandro Pasotti 2017-08-17 + + Geopackage moved delete to abstract item and implement raster deletion + +Nyall Dawson 2017-08-18 + + Add a pure virtual clone method to processing parameter definitions + + And use it when we need to clone parameters (instead of more fragile + conversion to and from variants) + + This fixes model loading which use algorithms which create python + subclasses of parameter definitions + +Merge: 7dbfc5202f 9bfca65ac3 +Nyall Dawson 2017-08-18 + + Merge pull request #5035 from nyalldawson/preview_tasks + + Tweaks to map preview tasks + +Merge: a369c9b28c 4b5d81b370 +Nyall Dawson 2017-08-18 + + Merge pull request #4210 from arnaud-morvan/processing_aggregate + + [processing] [needs-docs] Add aggregate algorithm + +Nyall Dawson 2017-08-18 + + Move "sync extent" canvas view option to map settings menu + + This means all the settings are collected together, and the + dock toolbar just contains navigation actions. + + (followup feedback from hackfest demo) + +Nyall Dawson 2017-08-18 + + Make sure new map dock views use correct icon size + +Nyall Dawson 2017-08-18 + + Add API to enable/disable preview jobs + + Disabled by default, and enabled only for main canvas (not + secondary canvases) + +Nyall Dawson 2017-08-17 + + Also delay initial preview job by a short timeout + +Nyall Dawson 2017-08-17 + + Use a QgsMapRendererSequentialJob for rendering preview maps + + Means that at most the preview jobs will use a single thread + instead of hammering all available threads. + +Merge: 5fbd628854 7b2250bb35 +Nyall Dawson 2017-08-17 + + Merge pull request #4760 from nyalldawson/tests + + Convert processing tests to use native algs where they exist + +Merge: 469eb0de25 a0e453ebe5 +mhugent 2017-08-17 + + Merge pull request #4939 from mhugent/wms_toplevel_browser + + Show toplevel wms group in browser + +Nyall Dawson 2017-06-21 + + Convert processing tests to use native algs where they exist + +Merge: 26a911cd61 c7affb3b70 +Nyall Dawson 2017-08-17 + + Merge pull request #5034 from nyalldawson/exporter_api + + Use const references to options instead of pointers in QgsVectorLayerExporter + +Nyall Dawson 2017-08-17 + + Avoid 'flashy' status bar progress widget when map renders are fast + + If previous canvas render took less than 0.5 seconds, delay the appearance of the + 'render in progress' status bar widget by a short amount - this avoids the + status bar rapidly appearing and then disappearing for very fast renders + +Nyall Dawson 2017-08-17 + + Use const references to options instead of pointers in QgsVectorLayerExporter + + The use of pointers make ownership of the argument confusing, and there's + nothing stopping us just using an empty map as the default value instead. + +lbartoletti 2017-08-17 + + Fix build with improvement of #5209 + +Merge: fad59736b0 e0d1ddc506 +Nyall Dawson 2017-08-17 + + Merge pull request #4751 from nyalldawson/unique_ptr + + Return std::unique_ptrs where possible + +Nyall Dawson 2017-08-17 + + Fix failing test + +Nyall Dawson 2017-08-17 + + Fix intermittently failing QgsGeometry asGML tests + +Juergen E. Fischer 2017-08-17 + + spelling fixes + +Merge: 9ae68e84bf e32589599a +lbartoletti 2017-08-17 + + Merge branch 'master' of https://github.com/QGIS/QGIS into regularShape_gui + +Nyall Dawson 2017-08-17 + + Return subclasses where possible to fix build on older compilers + +Nyall Dawson 2017-08-17 + + Fix ui build warning + +Nyall Dawson 2017-06-20 + + Return std::unique_ptrs where possible + + When a class isn't exposed to Python, we should return a + std::unique_ptr whenever a returned pointer value is owned + by the caller. + +Juergen E. Fischer 2017-08-17 + + packaging updates after helpviewer removal (followup 55cdc89a1) + +Denis Rouzaud 2017-08-17 + + add docker shield + +Nyall Dawson 2017-08-07 + + Remove startup tips + +Merge: 6d388942ad 0227bdc376 +Nyall Dawson 2017-08-17 + + Merge pull request #4993 from nyalldawson/remove_analyzer + + Remove QgsGeometryAnalyzer, QgsOverlayAnalyzer, QgsPointSample + +Merge: fdee6ea2a5 8139786605 +Nyall Dawson 2017-08-17 + + Merge pull request #5024 from nyalldawson/build-vrt + + Restore gdal build vrt alg, plus improvements + +Merge: 11fb601a98 e6814bca2c +Alessandro Pasotti 2017-08-16 + + Merge pull request #5031 from boundlessgeo/gpkg-drag-n-drop + + [feature][needs-docs] Geopackage handle drops in the browser + +Merge: f610ffaf52 497d4a808f +Alessandro Pasotti 2017-08-16 + + Merge pull request #5027 from boundlessgeo/gpkg-vector-delete + + [feature][needs-docs] Adds delete layer context action to ogr and geopackage items + +Nyall Dawson 2017-08-17 + + Allow adding manual layers in modeler multi layer alg parameters + + This allows creation of models with child algorithms which do + things like merge a selected layer with a predefined static + layer, or create a vrt with a mix of static and user selected + layers. + +Nyall Dawson 2017-08-17 + + Fix exception when editing multi layer parameter in model + +Nyall Dawson 2017-08-17 + + Fix multi layer parameters in models not giving all options for inputs + +Nyall Dawson 2017-08-17 + + Handle mixed lists of values and lists when evaluating multilayer + parameters + + This can happen when running models with mixed input types + for multilayer parameters + +Nyall Dawson 2017-08-17 + + Fix default layer sometimes inserted into multi layer parameter values + +Alessandro Pasotti 2017-08-16 + + [feature] Geopackage handle drops in the browser + + It is now possible to drag and drop from any vector + layer onto a gpkg node layer and import a layer. + + Overwrites are protected by a confirmation dialog. + +Nyall Dawson 2017-08-17 + + Default to vrt extension for build vrt alg output + +Merge: 7e01602319 f610ffaf52 +lbartoletti 2017-08-16 + + Merge branch 'master' into regularShape_gui + +Nyall Dawson 2017-08-15 + + Allow selecting multiple items in processing multi layer input dialog + + And selecting/deselecting only these items. Otherwise it can be quite + cumbersome to manually select complex sets of items (e.g. try needing + to select ~50% of the layers in a large project - there's currently + no quick way to do this.) With this change you can at least + ctrl/shift click to create selections quicker. + +Nyall Dawson 2017-08-15 + + Allow adding layers which aren't open in the project to processing + parameters which accept lists of multiple layers + + E.g. build vrt alg, merge vector layers alg + + Otherwise you may need to load 100's of layers temporarily into + a project to perform algs on them + +Nyall Dawson 2017-08-15 + + Port gdal build vrt to new API + +Matthias Kuhn 2017-08-16 + + Remove ParameterDataObject + +Matthias Kuhn 2017-08-15 + + [travis] Install libzip for macos + +Matthias Kuhn 2017-08-15 + + [travis] no longer any need for patching qsci + +Etienne Trimaille 2017-08-04 + + always set a default name in the QGS project to avoid discrepancies with GetCapabilities + +Merge: 0be0a4e30c 32c81a0311 +Matthias Kuhn 2017-08-16 + + Merge pull request #5004 from jgrocha/helpviewer + + [needs-docs] Refactoring of all help calls, deprecating QgsContextHelp+Helpviewer + +Jorge Gustavo Rocha 2017-08-16 + + Update sip files + +Jorge Gustavo Rocha 2017-08-16 + + Added documentation comments on new methods + +Alessandro Pasotti 2017-08-16 + + Shows a warning and abort deletion if the layer is in the current project + +Martin Dobias 2017-08-16 + + Always use snapping configuration from the project in adv.digitizing dock + + It was slightly confusing to have another override for snapping while it is possible + to configure "no snapping" or "all layers" snapping mode in project anyway. + And with the nice snapping toolbar it can be also done very quickly. + +Martin Dobias 2017-08-16 + + Remove class members that were never used + +Alessandro Pasotti 2017-08-16 + + Added 'datasource' and 'GeoPackage' to the delete confirm message + +Denis Rouzaud 2017-08-16 + + add Dockerfile for automated build on docker cloud + +arnaud.morvan@camptocamp.com 2017-05-04 + + [processing] Add Aggregate algorithm + +Alessandro Pasotti 2017-08-16 + + Different messages for file and table layer deletion + +Alessandro Pasotti 2017-08-16 + + Translate GDAL error codes + +Mathieu Pellerin 2017-08-16 + + [processing] restore near black and hillshade gdal algs (#5028) + +Jorge Gustavo Rocha 2017-08-15 + + Change all ocurrences on_buttonBox_helpRequested to showHelp + Add help button to 3 dialogs + Fix missing QStringLiteral + Fix CMakeLists.txt indentation + Fix qhelp.h and qgis_sip.h includes with <> + +Alessandro Pasotti 2017-08-15 + + Adds delete layer context action to ogr and geopackage items + + TODO: decide what to do if the layer to be deleted was + added to the canvas: block the deletion? + + Current implementation just ignores the fact with + no apparent serious consequences beside that + obviously the layer is not drawn anymore. + +Denis Rouzaud 2017-08-15 + + alog:along typo (#5025) + +Larry Shaffer 2017-08-15 + + Add support for finding zipconf.h in separate location; use include dirs + + LIBZIP_INCLUDE_DIRS could end up with duplicate entries, but seems to be + the simplest way of supporting headers installed to multiple locations. + +Merge: 3922efcbc6 aece517c50 +Nyall Dawson 2017-08-15 + + Merge pull request #5023 from nyalldawson/gdal_test + + Unblacklist Processing GDAL tests + +Nyall Dawson 2017-08-15 + + Avoid duplicate geometry columns, invalid geometry column name in gdal points along lines alg + +Nyall Dawson 2017-08-15 + + More comprehensive updating of gdal command when parameters change + +Nyall Dawson 2017-08-15 + + Unblacklist Processing GDAL test + +Merge: 7d4f81d4c6 7d074de90d +Alessandro Pasotti 2017-08-15 + + Merge pull request #5022 from boundlessgeo/gpkg-show-attributes + + Geopackage fix mixed geometry layers and attributes + +Alessandro Pasotti 2017-08-14 + + Geopackage fix mixed geometry layers and attributes + + In addition to geometry filtered layers for each geometry + type in a mixed-geometry type layer adds a table + layer with all attributes. + + Tehre is no perfetc solution here, if the layer is created + with a filter on geometrytype, the attributes are not shown + (this is probably a pre-existing bug), if the layer is added + as is, only the first geometry type is drawn. + + With this implementation at least all data (attributes and + geometries) are accessible in some way. + + Note that geopackage layers added by DB Manager do not show + all geometries of a mixed type layer. + +Merge: 80e8ff04e0 04f79d174d +Alessandro Pasotti 2017-08-14 + + Merge pull request #5019 from boundlessgeo/gpkg-dbmanager-sync + + Geopackage: Use the same settings for DB Manager and browser + +Merge: 904cd6f104 3d53a2dfb8 +Matthias Kuhn 2017-08-14 + + Merge pull request #5014 from m-kuhn/enumgeomfunc + + Return enum instead of int from QgsGeometry operations + +Alessandro Pasotti 2017-08-14 + + Geopackage: Use the same settings for DB Manager and browser + +Merge: b26e6812d4 11f179154f +Alessandro Pasotti 2017-08-14 + + Merge pull request #5018 from boundlessgeo/gpkg-show-tables + + Browser tree: also show geopackage geometryless layers as tables + +arnaud.morvan@camptocamp.com 2017-08-05 + + [processing] Check all parameter's values in ModelerParametersDialog + + Check that all parameter's values pass the validity check, + even if not returned as QgsProcessingModelChildParameterSource. + + In case of list, tests that it is really a QgsProcessingModelChildParameterSource list, + and create a QgsProcessingModelChildParameterSource from the list if it is not the case + (useful for custom parameters that return lists as ParameterFieldsMapping). + +arnaud.morvan@camptocamp.com 2017-07-21 + + [processing] Port refactor fields to new API + +Alessandro Pasotti 2017-08-14 + + Browser tree: also show geometryless layers as tables + +Matthias Kuhn 2017-08-14 + + Spelling + +Matthias Kuhn 2017-08-14 + + Fix splitFeatures + +Matthias Kuhn 2017-08-14 + + Fix crash in test + +Merge: 8d615543b7 ad2f760c0e +Alessandro Pasotti 2017-08-14 + + Merge pull request #5016 from boundlessgeo/gpkg-handle-collections + + Geopackage: proper handling of geometry ANY + +Matthias Kuhn 2017-08-14 + + More doxymentation + +Matthias Kuhn 2017-08-14 + + More doxymentation + +Alessandro Pasotti 2017-08-13 + + GPKG: proper handling of unknown geometry + + This handles the test use case for layer: + Layer name: geometry2d + Geometry: Unknown (any) + Feature Count: 8 + + The browser tree will now show the different geometry + layers and allow them to be added in the canvas, + GeometryCollections are skipped. + +Matthias Kuhn 2017-08-14 + + More doxymentation + +Matthias Kuhn 2017-08-14 + + Define params as /Out/ + +Matthias Kuhn 2017-08-14 + + Fix segfault + +Matthias Kuhn 2017-08-13 + + Increase QgsGeometry::OperationResult values + + To avoid collisions with old enums and make it easier for plugin devs to + determine if their values have already been ported to QGIS 3.0 or not. + +Denis Rouzaud 2016-08-23 + + Return enum instead of int from QgsGeometry operations + +Merge: 7768f06776 f9750dde52 +Nyall Dawson 2017-08-14 + + Merge pull request #4835 from nyalldawson/more_processing + + [processing] Restore some gdal provider algorithms + +Nyall Dawson 2017-08-14 + + Port gdal color relief to new API + +Nyall Dawson 2017-08-14 + + Port gdal tri alg to new API + +Nyall Dawson 2017-08-14 + + Port gdal assign projection to new api + +Nyall Dawson 2017-08-14 + + More reliable updates to the gdal command shown + + By also checking for child widget signals - otherwise we don't + catch signals when compound widgets (such as raster layer source + widgets) are changed + +Nyall Dawson 2017-08-14 + + Fix errors calculating gdal command when dialog is being constructed + +Nyall Dawson 2017-08-14 + + Fix showing gdal command in algorithm dialog + +Nyall Dawson 2017-08-14 + + Followup fixes to ogr2ogrpostgis alg porting + +Nyall Dawson 2017-08-14 + + Port gdal aspect alg to new API + +Nyall Dawson 2017-08-14 + + Fix error in gdal warp algorithm + +Nyall Dawson 2017-08-14 + + Allow skipping crs check in processing test results + + The GML format often requires extra 'hand holding' in order to + get QGIS to detect it's CRS (e.g. GML files created directly + in GDAL will not have an autodetected CRS when pulled into + QGIS). This needs fixing, but as a workaround to allow + processing algorithm porting to continue we can now skip + the crs check for these layers. + +Nyall Dawson 2017-08-14 + + Fix OGR algs always export shapefiles, regardless of output file extension + +Nyall Dawson 2017-08-14 + + Move OGR processing provider specific methods to GdalUtils + +Nyall Dawson 2017-08-14 + + Fix failing test + +Nyall Dawson 2017-08-14 + + Port GDAL Ogr2OgrPostgis to new API + +Nyall Dawson 2017-08-14 + + An empty string parameter should not fallback to default value + + Since we need to allow empty strings to override defaults in + some circumstances + +Nyall Dawson 2017-07-11 + + Cleanup conversion of input layers to OGR compatible sources + +Nyall Dawson 2017-06-27 + + Resurrect OGR points along lines algorithm + +Nyall Dawson 2017-06-27 + + ogrConnectionString reuses existing context + +Nyall Dawson 2017-06-27 + + Fix overridden function signatures + +Nyall Dawson 2017-06-27 + + Resurrect gdal warp algorithm + +Nyall Dawson 2017-06-27 + + Restore gdal algorithm support + +Matthias Kuhn 2017-08-13 + + Document api breaks + +Matthias Kuhn 2017-08-13 + + Simplify QgsGeometryEngine code + +Matthias Kuhn 2017-08-13 + + Doxymentation + +Matthias Kuhn 2017-08-13 + + Use pointers and not references to QgsAbstractGeometry + + because using this more consistently throughout the codebase makes it + easier to maintain code. + We also do not want to call the copy constructor on them, using pointers + just makes this more obvious. Further, casting is also something + that's commonly done on pointers and not references. + + And if you want a value or a reference, just use QgsGeometry, it's meant + to be handled like this. + +Nyall Dawson 2017-08-14 + + Fix ui build warning + +Nyall Dawson 2017-08-14 + + Fix spelling + +Merge: 35da03f640 f7ae07126e +Nyall Dawson 2017-08-14 + + Merge pull request #5001 from nyalldawson/algs + + Restore some processing functionality + +Nyall Dawson 2017-08-14 + + Base class processing feedback object forwards messages to message log + +Nyall Dawson 2017-08-13 + + Fix some possible exceptions in topocolor alg + +Nyall Dawson 2017-08-09 + + Fix exception in TopoColor algorithm + +Nyall Dawson 2017-08-09 + + Port Points From Lines to new API + +Nyall Dawson 2017-08-09 + + Port Points From Polygons to new API + +Nyall Dawson 2017-08-08 + + Port Points Displacement algorithm to new API + + Rework algorithm to use same approach as points displacement + renderer. Also maintain Z/M values, and add tests and docs. + +Matthias Kuhn 2017-08-13 + + Update NEWS + +Merge: 20a54b1cf4 3da4c33bb3 +Matthias Kuhn 2017-08-13 + + Merge pull request #4541 Add qgsgeometry_cast + + Because it + + * is faster than dynamic_cast + * doesn't rely on RTTI + * encapsulates type checking in one place + +Matthias Kuhn 2017-08-13 + + Avoid extra copy of point in QgsGeometry::centroid() + +Matthias Kuhn 2017-08-13 + + Handle M/Z typed CurvePolygons in qgsgeometry_cast + +Richard Duivenvoorde 2017-05-18 + + Fix #16528 mix of Qgis en qgis as root in settins + + On Linux the use of Qgis and qgis as root for connection settings + makes it currently impossible to add a new WCS connection + + Fixes #16528 + +Matthias Kuhn 2017-08-13 + + Update connections to Qt5 style + +Sebastian Dietrich 2015-12-16 + + Reset digitizing tools when new project is loaded/created + + Refs #4237 https://issues.qgis.org/issues/4237 + +Matthias Kuhn 2017-08-13 + + Fix build error + +Matthias Kuhn 2017-08-13 + + Convert more dynamic_casts to qgsgeometry_casts + +Matthias Kuhn 2017-08-13 + + Expose makeValid() errors to QgsGeometry::error() + +Matthias Kuhn 2017-08-13 + + Use pointers instead of references for QgsAbstractGeometry + +Matthias Kuhn 2017-08-13 + + Add qgsgeometry_cast to qgssurface + +Matthias Kuhn 2017-08-13 + + Allow qgsgeometry_cast-ing const geometries + +Matthias Kuhn 2017-08-13 + + Convert more calls to qgsgeometry_cast + +Matthias Kuhn 2017-08-13 + + Fix misplaced SIP_TRANSFER + +Matthias Kuhn 2017-08-13 + + Fix build warnings + +Nyall Dawson 2017-08-08 + + Restore ability to create processing tests from history panel + +Nyall Dawson 2017-08-08 + + Improve conversion of processing parameters to Python code + + - Use layer paths instead of layer ids where possible, since they are persistent + - Don't wrap in QgsProcessingFeatureSourceDefinition/QgsProcessingOutputLayerDefinition + if we can avoid it + +Denis Rouzaud 2017-08-10 + + spell check: add ...:… + + and a few fixes :) + + handle #spellok in shell or cmake files + + allow to exclude scripts from search files + +Matthias Kuhn 2017-08-12 + + Take inheritance into account in qgsgeometry_cast + +Matthias Kuhn 2017-08-12 + + Avoid crash + +Matthias Kuhn 2017-07-17 + + QgsPointV2 -> QgsPoint + +Matthias Kuhn 2017-07-17 + + NULL to nullptr + +Matthias Kuhn 2017-05-12 + + Add qgsgeometry_cast + + Because it + - is faster than dynamic_cast + - doesn't rely on RTTI + - encapsulates type checking in one place + +Matthias Kuhn 2017-08-12 + + Make sure relations are reloaded when setting edit config + +Merge: 97d168e163 afd45eefff +Alessandro Pasotti 2017-08-12 + + Merge pull request #5011 from boundlessgeo/less_verbose_items + + QgsDebugMsg -> QgsDebugMsgLevel + typo + +Alessandro Pasotti 2017-08-12 + + QgsDebugMsg -> QgsDebugMsgLevel + typo + +arnaud.morvan@camptocamp.com 2017-05-11 + + Insert dropped uris in reverse order. + + As each one is inserted on top of previous, + this result in layers sorted alphabeticaly in layer tree. + Relate with #6828. + +arnaud.morvan@camptocamp.com 2017-08-06 + + [FEATURE] Add expression function array_agg + +Juergen E. Fischer 2017-08-11 + + fix fix !"@$% + +Juergen E. Fischer 2017-08-11 + + fix utf8 python translation string + +Matthias Kuhn 2017-08-11 + + [travis] Run make in ctest if on pull request + +Harrissou Sant-anna 2017-08-11 + + more typo fixes + +Harrissou Sant-anna 2017-08-11 + + Typo fixes + +Mathieu Pellerin 2017-08-11 + + [processing] improve rasterize dialog UI, add help (#5008) + +Merge: 34032d662b 3dc08b30b6 +Mathieu Pellerin 2017-08-11 + + Merge pull request #4793 from DelazJ/RenderingDiagram + +Jorge Gustavo Rocha 2017-08-11 + + helpviewer application source code removed + +Jorge Gustavo Rocha 2017-08-10 + + Prevent test_console.py to open the browser with help file + Fix link to documentation related with OGR connections + +Merge: dc58c1ad15 13431ca123 +Nyall Dawson 2017-08-11 + + Merge pull request #5003 from nyalldawson/proc_algs + + Followups to rasterise alg + +Nyall Dawson 2017-08-07 + + Remove QgsGeometryAnalyzer, QgsOverlayAnalyzer, QgsPointSample + + These classes are unused in the master QGIS code, and are + unmaintained and with no unit tests or other QA, and + have inflexible API (e.g. always requiring writing outputs + to shapefiles) + + They all have equivalent algorithms available via Processing + (where the algorithms are unit tested and maintained). We should + be pushing all QGIS api users to use the Processing algorithms + instead. + +Nyall Dawson 2017-08-11 + + Bump minimum tile size to 64 for rasterise alg + +Nyall Dawson 2017-08-09 + + Small cleanups to rasterise alg + +Nyall Dawson 2017-08-09 + + Implement widget wrapper for QgsProcessingParameterMapLayer + +Nyall Dawson 2017-08-09 + + Use ellipsis for isolated strings in plugins too + +nirvn 2017-08-10 + + [processing] fix non-normal blending composition for the rasterzie alg + +Juergen E. Fischer 2017-08-10 + + fix windows build (extern "C" can returns pointers, but not C++ containers) + +Mario Baranzini 2017-08-08 + + Update CONTRIBUTORS + + Added myself and Marco Bernasocchi to the contributors list. + +Matthias Kuhn 2017-08-10 + + [travis] Only build outside ctest on master + +Juergen E. Fischer 2017-08-10 + + refine spellcheck progress output + +Juergen E. Fischer 2017-08-10 + + more msvc warning fixes (followup 03e0298f4) + +Matthias Kuhn 2017-08-10 + + Start preview jobs slower (250ms interval) + +Matthias Kuhn 2017-08-10 + + Fix map canvas preview + + Followup 8e200767e + +Matthias Kuhn 2017-08-10 + + [travis] change to build folder before building + +Matthias Kuhn 2017-08-10 + + [travis] Build outside ctest + +Matthias Kuhn 2017-08-09 + + Less verbose application exit output + +Matthias Kuhn 2017-08-09 + + More verbose python testing output + +Juergen E. Fischer 2017-08-09 + + msvc warning fixes: + * use AUTORCC to avoid locked qrc_images.cpp during build of gui tests + * bump minimum version of cmake to 3.0.0 for AUTORCC + * suppress some warnings in sip bindings + * suppress unreachable warnings and some more + * split sip files in more parts to suppress warning BK4504 + * also remove old WITH_INTERNAL_YAML from travis + +Jorge Gustavo Rocha 2017-08-09 + + Replace old QSettings with QgsSettings + +Merge: 267286ee61 92da308466 +Alessandro Pasotti 2017-08-09 + + Merge pull request #4953 from boundlessgeo/gpkg-enhancements + + Expose GeoPackage to the browser tree + +Alessandro Pasotti 2017-08-09 + + Delete gpkg connections + +Jorge Gustavo Rocha 2017-08-09 + + Fix links to current documentation + +Jorge Gustavo Rocha 2017-08-09 + + SIP bindings + +Andreas Neumann 2017-08-09 + + Correct an error in array_slice function description + + There was a copy/paste error in the "name" + +Alessandro Pasotti 2017-08-09 + + Updated file header for geopackage data items + + also added "db" to multiple layers extensions + +Jorge Gustavo Rocha 2017-08-09 + + Refactoring of all help calls, deprecating QgsContextHelp and the former helviewer + +Alessandro Pasotti 2017-08-09 + + Removed PNG version of GPKG icon + +Alessandro Pasotti 2017-08-09 + + Added mGeoPackage svg icon + +Alessandro Pasotti 2017-08-09 + + Added file path to debug msg output on errors + +Alessandro Pasotti 2017-08-08 + + Fixes two issues with the browser refresh + + 1. endless loop when a sqlite-based layer is opened, and + wal+shm files are created. This triggers a loop because + the directoryChanged signal is emitted again and again ... + This was the real blocker. + + 2. when a new files appears in a directory + the directoryChanged is emitted and OGR/GDAL may fail + to open the file because the file copy was not yet + finished. + + This commit fixes 1 but the fix for 2 is only a best effort using + a 100 ms timer: I could not find a definitive solution to this issue, + a file could be legitimately opened in streaming mode and it will + always triggers an error, there is apparently no way to get + the QFileSystemWatcher emit a signal when new files are closed + flusehd and not when they are just created. + +Alessandro Pasotti 2017-08-08 + + Changed geopackage icon to svg + +Alessandro Pasotti 2017-08-08 + + Remove initial : from the sublayers name in the browser tree + +Alessandro Pasotti 2017-08-07 + + Added raster support to browser geopackage data items + +Alessandro Pasotti 2017-08-07 + + Initial support for extension-based scan on multiple layers + +Alessandro Pasotti 2017-08-07 + + Small typo + +Alessandro Pasotti 2017-08-07 + + Added a comment to this fertility line :) + +Alessandro Pasotti 2017-08-07 + + Typo + +Alessandro Pasotti 2017-08-07 + + Fix sublayers disappear when refreshing GDAL layers + +Alessandro Pasotti 2017-08-06 + + Sip update for qgsproject + +Alessandro Pasotti 2017-08-06 + + Fixes raster sublayer not apperaring in the browser tree + +Alessandro Pasotti 2017-08-06 + + Move the default CRS for new layers function to QgsProject + + The reason is that it needs to access to project's crs + and it's not only needed by app but also by the providers + (will be) + +Alessandro Pasotti 2017-08-03 + + Expose GeoPackage to the browser tree + +Merge: 425aa30fe9 d9f71deb30 +Matthias Kuhn 2017-08-08 + + Merge pull request #4998 from marioba/rasterize_provider + + [FEATURE] Added processing algorithm to convert map to raster + +Mario Baranzini 2017-08-08 + + Remove osgeo.gdal.UseExceptions() + +Mario Baranzini 2017-08-08 + + Refactoring of rasterize algorithm + +Mario Baranzini 2017-08-08 + + Refactoring + +Mario Baranzini 2017-08-07 + + Fix header comment + +Mario Baranzini 2017-08-07 + + Refactoring and added better comments + +Mario Baranzini 2017-08-07 + + Added processing algorithm to convert map to raster + +Nyall Dawson 2017-08-08 + + Fix valgrind jump on uninitialised values warnings + +Nyall Dawson 2017-08-08 + + Fix crash when editing feature after opening a form with relation reference widget + + Also fixes a leak/performance issue - the attribute table model + for the relation reference widget is not parented to the widget, + so it is never cleaned up when the widget is deleted. + + (forward port from f976e8b6) + +Juergen E. Fischer 2017-08-08 + + fix typos + +Jorge Gustavo Rocha 2017-08-07 + + Add XYZ connection to provide default OpenStreetMap tiles + +lbartoletti 2017-08-07 + + fix perl;add bash + +lbartoletti 2017-08-07 + + Use portable /usr/bin/env/{perl,python} instead of /usr/bin/{perl,python} + +Matthias Kuhn 2017-06-16 + + Fix postgres server imposed NOT NULL constraint + +Merge: f802c56573 14546ec935 +Nyall Dawson 2017-08-08 + + Merge pull request #4928 from nyalldawson/layout_next + + Layout chapter IV: snapping and guides + +Nyall Dawson 2017-08-08 + + Fix unit test + +Nyall Dawson 2017-08-07 + + Fix ownership issue with layout guides + +Nyall Dawson 2017-08-07 + + Add signal when page is about to be deleted + +Nyall Dawson 2017-07-29 + + Fix crash when creating guide and no pages in layout + +Nyall Dawson 2017-07-29 + + Use +/- icons instead of text + +Nyall Dawson 2017-07-28 + + Fix incorrect dialog title + +Nyall Dawson 2017-07-28 + + Fix locked widgets when switching to custom page size + +Nyall Dawson 2017-07-27 + + [needs-docs] Refine snapping logic for layouts + + Previously grids would always take precedence when both a grid + and guide were within tolerance of a point. + + Now, guides will always take precedence - since they have been + manually set by users we make the assumption that they have + been explicitly placed at highly desirable snapping locations, + and should be selected over the general grid. + + Additionally, grid snapping was previously only done if BOTH + x and y could be snapped to the grid. We now snap to the nearest + grid line for x/y separately. This means if a point is close + to a vertical grid line but not a horizontal one it will still + snap to that nearby vertical grid line. + +Nyall Dawson 2017-07-27 + + Add layout properties menu entry + +Nyall Dawson 2017-07-27 + + Add some other guide/ruler related actions to ruler right click menu + +Nyall Dawson 2017-07-27 + + Hook up snap to guides menu option + +Nyall Dawson 2017-07-27 + + Readd menu option to show/hide guides + +Nyall Dawson 2017-07-27 + + [FEATURE] Add a button in guide manager to apply current page's guides + to all other pages + + This allows resetting all other pages to use the guide configuration + for the current page. Since guides are now single page only (required + to handle mixed page size/orientation layouts), this is a shortcut + to allow guide configuration to be setup on a single page and then + easily transferred to all other pages in the layout. + +Nyall Dawson 2017-07-27 + + Add a clear all guides button to guide manager + +Nyall Dawson 2017-07-27 + + Show different cursor and paint guide markers darker when hovering them in rulers + +Nyall Dawson 2017-07-27 + + Add missing files + +Nyall Dawson 2017-07-26 + + Hook up clearing guides + +Nyall Dawson 2017-07-26 + + Allow deletion of guides by dragging outside of pages + +Nyall Dawson 2017-07-26 + + Support dragging existing guides in rulers + +Nyall Dawson 2017-07-26 + + Show guide positions in rulers + +Nyall Dawson 2017-07-26 + + Add methods to determine visible pages in a view + +Nyall Dawson 2017-07-26 + + Support deletion of guides through manager + +Nyall Dawson 2017-07-26 + + Slightly improved guide appearance + +Nyall Dawson 2017-07-25 + + Better headers in guide view + +Nyall Dawson 2017-07-25 + + Nicer table view for guide editing + +Nyall Dawson 2017-07-25 + + Dropping guides outside of pages doesn't create new guides + +Nyall Dawson 2017-07-25 + + [needs-docs] Partial WIP of dragging rulers to create guide lines + + Unlike in 2.x, Layouts in 3.0 adopt the standard UX of dragging + out rulers to create guide lines (instead of clicking on a ruler + position to create a guide) + +Nyall Dawson 2017-07-25 + + [FEATURE] Add a dock widget showing snap guides for current page + + Allows creation of snap lines at specific locations, and + adjusting position of existing guides to exact coordinates + +Nyall Dawson 2017-07-25 + + New class QgsLayoutGuideCollection for storing sets of layout snap guides + + The class is a QAbstractListModel subclass, making it easy + for creation of different views showing the guides in a layout. + + Additionally, a QSortFilterProxyModel (QgsLayoutGuideProxyModel) + has been created to filter QgsLayoutGuideCollection to guides + with matching page numbers and orientations. + +Nyall Dawson 2017-07-25 + + Refine QgsLayoutGuide API + +Nyall Dawson 2017-07-25 + + Start on classes for snapping guide items + +Nyall Dawson 2017-07-25 + + Show snapped cursor position in status bar + +Nyall Dawson 2017-07-25 + + Refine z order for some new items + +Nyall Dawson 2017-07-25 + + Code refactor - split grid appearance settings into their own class + +Nyall Dawson 2017-07-24 + + Start porting layout settings panel + + Readd settings for grid tolerance/spacing/offset + +Nyall Dawson 2017-07-24 + + Add actions to switch grid display/snapping on/off + +Nyall Dawson 2017-07-24 + + Start on snapping marker + +Nyall Dawson 2017-07-24 + + Hook up snapping for QgsLayoutViewTools + + Tools can now indicate (via setFlags()) if they desire snapping + to be active for the tool. When a tool has the flag set, + any QgsLayoutViewMouseEvents it receives will have a snappedPoint() + available which returns the mouse event point snapped using + the layout's snapping settings. + +Nyall Dawson 2017-07-24 + + Add ability for QgsLayoutSnapper to snap to grid + +Nyall Dawson 2017-07-24 + + Start on layout snapper + +Nyall Dawson 2017-07-24 + + Restore drawing of page grids + +Nyall Dawson 2017-07-24 + + Support data defined paper sizes + +Nyall Dawson 2017-07-22 + + Partially hook up data defined page size + + TODO: + - preset page sizes + - reflow after update + +Merge: 0409da3a4c 4ab4a1fcad +Nyall Dawson 2017-08-07 + + Merge pull request #4996 from nyalldawson/spelling_and_stuff + + Fix some spelling, add parameter names to tooltips in processing + +Mario Baranzini 2017-08-07 + + Fixed PEP8 missing blank line + +Mario Baranzini 2017-08-06 + + Add cmp() function + +Mario Baranzini 2017-08-06 + + Removed 2 calls to standard_library + +Mario Baranzini 2017-08-05 + + Remove python future compatibility layer + +Nyall Dawson 2017-08-07 + + Spell check 'mitre' -> 'miter' (i.e. use en-us variation) + +Nyall Dawson 2017-08-07 + + Spell check seting->setting + +Nyall Dawson 2017-08-07 + + Fix some grammar + +Nyall Dawson 2017-08-07 + + Show Python identifier for processing parameters in tooltip + over widgets + + Hopefully helps Python processing users match the parameters + in the gui to the parameter names to use when calling via + API + + (Blender style!) + +Merge: 518ffe3f62 a2c1810436 +Alessandro Pasotti 2017-08-07 + + Merge pull request #4980 from boundlessgeo/Win_CutAndPaste_issue16870 + + From Clipboard Cut&Paste fix when attached special field values. Fixes #16870 + +Nyall Dawson 2017-08-07 + + Remove debugging code + +Denis Rouzaud 2017-08-06 + + fix doxygen test on Travis + + it seems that doxygen 1.18.13 is not behaving the same as 1.1811 (Travis one). + one might need to remove some spaces in the signature as they are different depending on Doxygen's version + +Merge: 80d53e4f59 ecafb494a8 +Nyall Dawson 2017-08-07 + + Merge pull request #4424 from nyalldawson/osx_tests + + Add some mask images, adjust test results for OSX + +Nyall Dawson 2017-04-27 + + Add some mask images, adjust test results for OSX + +Merge: 54007ef584 4e436c221e +Nyall Dawson 2017-08-07 + + Merge pull request #4466 from arnaud-morvan/test_python_qgsfields_getitem + + Add test for python QgsFields [] operator + +Harrissou Sant-anna 2017-07-13 + + Delete context help dialogs that are replaced by online links. + +Merge: f6bc74c631 558b8d3395 +Nyall Dawson 2017-08-07 + + Merge pull request #4991 from marioba/fix_processing_parameters + + Protect processing parameters from segfault + +Merge: c5f6af7508 b808c5647a +Nyall Dawson 2017-08-07 + + Merge pull request #4952 from nyalldawson/otf_transform_upgrade + + When upgrading 2.x projects to 3.0, default to enabling a valid project projection instead of defaulting to no CRS + +Merge: 5b9d7cf331 2d88a4d73a +Nyall Dawson 2017-08-07 + + Merge pull request #4989 from nyalldawson/icon_size + + Fix various icon size issues + +Nyall Dawson 2017-08-07 + + Fix doxygen test whitelist + +Juergen E. Fischer 2017-08-06 + + ts scripts: pass languages from pull_ts.sh and push_ts.sh + +Juergen E. Fischer 2017-08-06 + + use star in spelling.dat instead of \> + +Nyall Dawson 2017-08-07 + + Revert "[FEATURE] QGIS - GeoNode Integration: Integrate with QGIS Browser Panel (#4816)" + + This reverts commit 5f66f36ff6dd911ba3fca8ec9580e50812f404a0. + + Some outstanding issues need to be addressed before this can be merged + +Nyall Dawson 2017-08-03 + + When upgrading 2.x projects to 3.0, default to enabling a valid + project projection instead of defaulting to no CRS + + Fixes #16965 + +Nyall Dawson 2017-08-07 + + Fix failing tests + +Mario Baranzini 2017-08-06 + + Protect processing parameters from segfault + +Merge: 5f66f36ff6 f5f133e0b2 +Nyall Dawson 2017-08-07 + + Merge pull request #4926 from nyalldawson/coverity_158026 + + Fix coverity identical code for different branches warning + +Nyall Dawson 2017-08-07 + + Fix invalid icon sizes in processing model builder + + While the toolbar buttons were shown in the correct size, the + actual icon image in the buttons was not correctly scaling to + match the button size. + + Hardcoding the svg icons in the py file seems to be the only + way to avoid this. + +Muhammad Yarjuna Rohmat 2017-08-07 + + [FEATURE] QGIS - GeoNode Integration: Integrate with QGIS Browser Panel (#4816) + + * add Geonode connection menu to the toolbar + + * add header files for geonode-qgis client + + * add action to launch geonode connection dialog from menubar + + * Move to proper directory + + * Add geonodeconnection class. + + * Add unit test for geonode connection. + + * Use const static to avoid typo. + + * Get list layers from geonode. + + * Add get maps method. + + * Geonode connection dialog (#13) + + * add new geonode connection dialog + + * apply functionality to the geonode connection manager dialog + + * add save and load geonode connection functionality + + * edit baseKey and credentialBaseKey + + * remove auto-connect slots + + * Add unit test for geonode connection. + + * Add wms url getter. + + * Add uuid and layer name in the table. + + * Add handler for the list layer clicked. WIP. + + * Use new style connect, better hacky to get wms url. + + * update gitignore + + * Make QGIS able to add WMS layer from geonode. With hacky code. + + * Fix Docstring. + + * Show web service type (WMS/WFS) in layer table. + + * fix http and toolbar menu + + * add geonode data item to the browser panel as an extention of ows provider + + * [WIP] Add WFS. + + * Add geonode get service url. + + * combobox functionality and test geonode connection + + * Add WFS. + + * Disable add button if it's a map. Currently we can't do anything for map. + + * Add busy cursor when add layer. + + * get service uri capabilitites + + * add available layers to the geonode browser panel + + * remove debugging footprint and replace old style connect + + * add actions (new, edit, delete) to geonode browser panel + + * fix getLayers by WMS url + + * add Geonode connection menu to the toolbar + + * Filter out invalid layer / map. + + * Fix service url method. + + * Add service url for XYZ for GeoNode QGIS Server backend. + + * Add XYZ url to geonode connection dialog. + + * Add XYZ layer to QGIS. + + * fix double geonode submenu + + * add wfs/wms layers from browser panel using its native provider + + * comply with qgis3 new class naming + + * Handle different prefix for layer in GeoNode QGIS Server backend. + + * base class for cms connection + + * make geonode connection as a derived class from cms connection + + * update cmakelists + + * move geonode connection to geocms dir + + * update CMakeLists + + * Handle geonode 2.7 with new API. + + * Handle multiple geoserver url in one geonode. + + * Fix add xyz for qgis server. Fix add wms, wfs, xyz for geoserver in geonode 2.7 + + * Refactor serviceURL to return QStringList. + + * add 'add geonode layer' icon + + * add geonode to the data source manager dialog + + * [GeoNode-Client] Fix add WFS layer. + + * fix wms url parameter + + * add xyz dataitems + + * Use new style connect. + + * [GeoNode Client] Handle qgis server specific typename to make add WFS works. + + * Code improvement. + + * [GeoNode Client] Make geonode dialog in add universal layer can add layer. + + * Open universal add layer when click Add GeoNode layer. + + * Make sure the geonode url has protocol. + + * Handle geonode version in a better way. + + * make sure the serviceUrl method has scheme in its urls + + * add services option to the dialog + + * remove version label if not wfs + + * construct wms url with parameters for geonode connection + + * handle layer from multi service urls for every wfs, wms, & xyz services + + * fix new style connect using static_cast + + * hode close button if dialog is in embedded mode + + * fix xyz layer naming in the browser tree + + * create base class for geocms dataitems + + * fix compiling warning + + * Use struct instead QVariantMap. + + * tidy up code + + * Tidy up code, use QgsStringMap instead QVariantMap. + + * Add spellok for catalogue. + + * update sip + + * update sip + + * Use naming convention for QgsGeoCmsConnection and use QUuid. + + * Async by using GeoNodeRequest class. + + * Move geonode to src/gui. + + * Use stack not heap. + + * Remove unused includes. + + * Use signal to handle request. + + * Use QStringLiteral. + + * Switch to use Q_FOREACH. + + * Use Q_FOREACH and addressing PR's review. + + * Set private for data members. + + * update sip + + * Update sip. + + * Update sip. + + * Fix sip problem to make it buildable again. + + * Remove geocms + + * Tidy up code. + + * Use QgsSetting Scope::Provider. + + * Fix missing zip.h + +Nyall Dawson 2017-08-07 + + Fix incorrect icon sizes in Python console + + Console was not respecting application icon size setting + +Harrissou Sant-anna 2017-07-29 + + Update broken links to documentation + + Because links to doc are based on plain hyperlinks, changes in doc + structure affect these relations. This PR fixes the broken links. + +Merge: 42d7e0b898 c3b62ad4ca +Nyall Dawson 2017-08-07 + + Merge pull request #4982 from nyalldawson/drop_file_drop_file_drop_file_drop_file_drop + + Remove QgsFileDropEdit widget and integrate functionality into QgsFileWidget + +andreasneumann 2017-08-06 + + renamed parameter names of array_slice, ran prepare-commit.sh + +andreasneumann 2017-08-06 + + [FEATURE] array_slice expression function + +Juergen E. Fischer 2017-08-06 + + cancelled => canceled etc. //#spellok + +Nyall Dawson 2017-08-07 + + Customise->Customize + +Juergen E. Fischer 2017-08-06 + + fix 'allows to/allows one to' spell errors and enhance to our spellchecker to deal with those + +Merge: 5f87bd8643 05a039b173 +Nyall Dawson 2017-08-07 + + Merge pull request #4986 from nyalldawson/console_imports + + Import gui, analysis, processing and Qt classes on console startup + +Juergen E. Fischer 2017-08-06 + + msvc: suppress some warnings + +Juergen E. Fischer 2017-08-06 + + prepare-commit.sh: when run as pre-commit hook use /dev/tty. And don't + generally complain about trailing whitespaces as we have cases where + that's fine (and hence are excluded from astyle). + +Nyall Dawson 2017-08-06 + + [needs-docs] Remove python console "import class" action + + Since these classes are always imported by default, there's no + need for a toolbar action to manually import them + +Merge: c9e754cf7b 6823d1f5f9 +Andreas Neumann 2017-08-06 + + Merge pull request #4983 from raymondnijssen/master + + new contributor Raymond Nijssen + +Nyall Dawson 2017-08-06 + + Import all qgis.gui, analysis, processing, and Qt classes by default + in Python console + + Because it's a PITA to remember to manually import these all the time + +Merge: 78e1026c21 9ba2d7b5c2 +Andreas Neumann 2017-08-06 + + Merge pull request #4985 from raymondnijssen/patch-1 + + Update CONTRIBUTORS + +Raymond Nijssen 2017-08-06 + + Update CONTRIBUTORS + + added contributor Raymond to CONTRIBUTORS too + +Andreas Neumann 2017-08-06 + + Add myself as a contributor + +Raymond Nijssen 2017-08-06 + + new contributor + +Nyall Dawson 2017-08-06 + + Remove QgsFileDropEdit widget and integrate functionality into QgsFileWidget + + It makes no sense to have two classes covering this use case, with + partial functionality in each. Smash the two together so we can + safely use QgsFileWidget for all use cases in future. + +Nyall Dawson 2017-08-06 + + Improve appearance of QgsFileWidget + + Fix vertical alignment of widgets so that they are always + in line + +Tim Sutton 2017-08-06 + + [FEATURE] Colourblind preview modes now work on OSX (#4971) + + * [FEATURE] Colourblind preview modes now work on OSX + + * Enable colour picker widgets on Mac OS and colour preview modes in composer in Mac OS + +Luigi Pirelli 2017-08-06 + + From Clipboard Cut&Paste fix when attached special field values. Fiexies #16870 + +Denis Rouzaud 2017-08-06 + + rename symbology-ng to symbology + +Harrissou Sant-anna 2017-08-06 + + Fix option label + +Juergen E. Fischer 2017-08-06 + + fix windows build (followup acead27197; that went through travis ;)) + +Martí ANgelats i Ribera 2017-08-06 + + Fixed the FALLTHROUGH macro. + +Alessandro Pasotti 2017-08-06 + + Fix QgsFileWidget remember the folder functionality + +Merge: 0ebc1315d0 06f4c396ad +Alessandro Pasotti 2017-08-06 + + Merge pull request #4975 from boundlessgeo/openvectorlayer-removal + + Removed QgsOpenVectorLayer that is now the source select widget for '… + +Alessandro Pasotti 2017-08-06 + + Removed QgsOpenVectorLayer that is now the source select widget for 'ogr' provider + +Denis Rouzaud 2017-08-06 + + reenable spelling and sipify tests + +Denis Rouzaud 2017-08-06 + + increase timeouts for code layouts + +Merge: a612a6874d 7f1fa540b7 +Nyall Dawson 2017-08-06 + + Merge pull request #4973 from nyalldawson/std_reverse + + Use std::reverse instead of custom array reverse + +Alessandro Pasotti 2017-08-06 + + Sipify docstring for signal + +Merge: 7f5b4dbc18 3a715dbb80 +Alessandro Pasotti 2017-08-06 + + Merge pull request #4969 from boundlessgeo/unified-layer-dialog-raster-mods + + Unified layer dialog raster mods + +Nyall Dawson 2017-08-06 + + Use std::reverse instead of custom array reverse + +Nyall Dawson 2017-08-06 + + Followup 6ed389c8, fix push direct to master ;) + +Harrissou Sant-anna 2017-08-06 + + Improve Diagram dialog + + Make combobox, spinbox and textbox expand + Use group boxes in Rendering and Placement tabs + +Harrissou Sant-anna 2017-06-29 + + [needs-docs] Move diagram z-index option to a renamed Rendering tab + + Trying to standardize dialog with the Labels tab: + * Rename the Appearance tab to Rendering + * Move the Diagram z-index option from the placement tab to rendering; i believe it's more about visibility than x-y placement + + Also Improve diagram and label z-index tooltip + +Tim Sutton 2017-08-05 + + Python console (#4550) + + * Use tabbed view for python console settings. Allow fonts larger that 15pt in console and python editor. + + * Make the python console settings list look more like the C++ implemented settings dialogs. + + * Use scroll areas in python console settings to prevent widget squashing + + * Fix python console settings icons + + * updating python console settings to be part of main QGIS settings + + * Revert "updating python console settings to be part of main QGIS settings" + + This reverts commit a811d7d7b184fece419f6610321a98f1acc9238f. + +Merge: 0395225c41 303f9b7cdd +Andreas Neumann 2017-08-05 + + Merge pull request #4970 from andreasneumann/array_reverse + + [FEATURE] expression function array_reverse + +Juergen E. Fischer 2017-08-05 + + INSTALL updates: MSVC builds, debian builds + +Juergen E. Fischer 2017-08-05 + + fix translation string again and improve translation scripts (followup 79a095cb) + +Juergen E. Fischer 2017-08-05 + + package.cmd: don't exit parent when displaying usage + +Andreas Neumann 2017-08-05 + + [FEATURE] expression function array_reverse + +Alessandro Pasotti 2017-08-05 + + Renamed vars + +Merge: ca1abdc716 470afbebbe +Nyall Dawson 2017-08-06 + + Merge pull request #4950 from nyalldawson/algs + + Port some more algs to new API + +Merge: 2e2edd64c2 40ccd3bcb3 +Nyall Dawson 2017-08-06 + + Merge pull request #4964 from arnaud-morvan/processing_delete_dialogs + + [processing] Correctly delete processing dialogs + +Mario Baranzini 2017-08-05 + + Fix qt qhash seed for QT >= 5.6.0 + +Alessandro Pasotti 2017-08-05 + + Add raster widget to data source manager dialog + + Also: + - created source select widget for GDAL provider + - created source select widget for OGR provider + - added addVecorLayers signal to the base class + +Nyall Dawson 2017-08-05 + + Use correct file filters for processing vector/raster input selectors + +Merge: 0854e795d9 5100d85c49 +Nyall Dawson 2017-08-05 + + Merge pull request #4963 from Gustry/category + + add category in QgsLayerMetadata using keywords + +Nyall Dawson 2017-08-05 + + Allow specifying a 'primary key' field when comparing layers for + processing tests + + Some algorithms will return results in different orders, e.g. + due to the use of dicts or other methods which do not guarantee + a fixed return order. + + Using a primary key to do the feature match allows us to flexibly + handle these situations and provide tests for these algorithms. + +Alessandro Pasotti 2017-08-05 + + Source select signals: remove duplicate code and rely to the base class + +Matthias Kuhn 2017-08-02 + + Protect postgis crs cache with mutex + +Matthias Kuhn 2017-07-31 + + Stay more responsive while scheduling preview jobs + + Because starting 8 jobs on the main thread in a loop can lead to reduced + responsiveness. + + The new approach is to start each job 10 ms after the scheduling the + last one. + +Matthias Kuhn 2017-07-31 + + [postgis] Cache unknown CRS information + + CRS information is queried when setting up a new feature source. This + happens on the main thread (read: blocking). With this patch, at least + this only happens once per srid. + +arnaud.morvan@camptocamp.com 2017-05-10 + + Remove invisible layers from legend + + Do not show invisible layers in composer legend. + Useful for raster layers as QgsMapHitTest only take care of vector layers. + Related with #14194 + Related with #11641 + +Nyall Dawson 2017-08-05 + + Fix typo in gridify alg + +Nyall Dawson 2017-08-05 + + Port Stats by Category to new API + + Improvements: + - keep original field type and name for category field + - add unit test + +Nyall Dawson 2017-08-05 + + Port Join Attributes alg to new API + + Improvements: + - don't fetch unused geometry for joined table + +Nyall Dawson 2017-08-05 + + Remember window geometry in multi input dialogs + +Nyall Dawson 2017-08-04 + + Add alternate reference layer for points to path algorithm + +Nyall Dawson 2017-08-04 + + Add second reference layer for topocolor algorithm + +Nyall Dawson 2017-08-04 + + Allow specifying multiple possible vector layer results for processing + tests + + Some algorithms are non-deterministic and the results may vary from + run to run. In this case we allow specifying multiple possible valid + results, and the test will pass if the result layer matches any of these. + +Nyall Dawson 2017-08-04 + + Allow testing of layer equality without throwing asserts + + Sometimes in tests it's required to check for layer equality without + aborting in case of mismatches + +Nyall Dawson 2017-08-04 + + Allow list of acceptable raster hashes for processing algorithm tests + + Differences in gdal libraries mean the hash value may differ between + platforms. Allow multiple acceptable hashes to be listed for + expected test results + +Nyall Dawson 2017-08-04 + + Port Eliminate Selection to new API + +Nyall Dawson 2017-08-04 + + Port Topocolor algorithm to new API + +Nyall Dawson 2017-08-03 + + Port points to path to new API + + Improvements: + - Maintain Z/M values + - Keep original data type for group/order fields + - Group field is optional + - Added unit tests + - Don't export text files for features by default + +Nyall Dawson 2017-08-03 + + Port hub lines algorithm to new API + + Improvements: + - transparent reprojection to match hub/spoke CRS + - keep all attributes from matched hub/spoke features + - don't break after matching one hub point to spoke - instead + join ALL hub/spoke points with matching id values + +Nyall Dawson 2017-08-03 + + Port Hub Distance (lines) to new API + + Improvements: + - handle different CRS between points and hubs + - add unit test + +Nyall Dawson 2017-08-03 + + Port Hub Distance (points) to new API + + Improvements: + - handle different CRS between points and hubs + - add unit test + +Nyall Dawson 2017-08-03 + + Add tests for gridify + +Nyall Dawson 2017-08-03 + + Port gridify to new API + +Nyall Dawson 2017-08-02 + + Port grid lines to new API + +Nyall Dawson 2017-08-02 + + Port random selection algorithms to new API + + And heavily optimise random selection within subsets alg + +Nyall Dawson 2017-08-02 + + [processing] If an error occurs while running an algorith, always + keep the algorithm dialog open after execution + + Otherwise it's hard to see the error - you have to know to check + the python log. Keeping the dialog open at the log makes the + error immediately visible to the user + +Nyall Dawson 2017-08-02 + + Register QgsFeatureIds metatype + + Fixes warnings when using signals which use this type, like + QgsVectorLayer::selectionChanged + +arnaud.morvan@camptocamp.com 2017-08-05 + + [processing] Correctly delete processing dialogs + + del only delete the python variable, not the dialog which is owned by the main window. + +Etienne Trimaille 2017-08-04 + + add category in QgsLayerMetadata using keywords + +Juergen E. Fischer 2017-08-05 + + update oracle selection dialog (followup dc6017dc1) + +Merge: 5e2b17af9f fef3bc099d +Alessandro Pasotti 2017-08-04 + + Merge pull request #4962 from boundlessgeo/unified-layer-dialog-mods + + Unified layer dialog mods + +Denis Rouzaud 2017-08-04 + + Update .agignore + +Nyall Dawson 2017-08-05 + + Followup 69a25d + +Nyall Dawson 2017-08-05 + + Revert "translation string fix" + + Causes 'AlgorithmDialog' object has no attribute 'trUtf8' error when + trying to launch processing algorithms + +Nyall Dawson 2017-08-05 + + Add initial test suite for processing algorithm dialog + +Alessandro Pasotti 2017-08-04 + + Renamed button slots and make ogr dialog inherit from the abstract base + +Merge: 21653c0df8 511521ff2b +Alessandro Pasotti 2017-08-04 + + Merge pull request #4956 from jgrocha/profilemenu + + Fix #16970 (related to PR#4184) + +Juergen E. Fischer 2017-08-04 + + packaging update: include libzip + +Andreas Neumann 2017-08-04 + + Added new help files to the expression function groups of Arrays and Maps + +Juergen E. Fischer 2017-08-04 + + translation string fix + +Merge: f96442884b c2138ca4bd +Andreas Neumann 2017-08-04 + + Merge pull request #4957 from andreasneumann/master + + Correct help of expression array_remove_all + +Alessandro Pasotti 2017-08-04 + + Move the buttons and connections into the base class + + This was a small refactoring to homogenize the + dialogs buttons and add an Ok/Add button bar. + +Andreas Neumann 2017-08-04 + + Correct help of expression array_remove_all + +Merge: b20f4c6729 9fe326dee2 +Alexander Bruy 2017-08-04 + + Merge pull request #4954 from alexbruy/processing-band + + [FEATURE][needs-docs][processing] add parameter representing raster band + +Jorge Gustavo Rocha 2017-08-04 + + Fix #16970 (related to PR#4184) + +Merge: 3c58599bd1 86c63a15b6 +Matthias Kuhn 2017-08-04 + + Merge pull request #4845 from pblottiere/zip + + [FEATURE] New zip format + +Alexander Bruy 2017-08-04 + + [processing] more consistent naming for class members, setters and + getters + +Alexander Bruy 2017-08-04 + + [processing] tests for new band parameter + +Alexander Bruy 2017-08-04 + + [processing] adapt algorithms to use new band parameter + +Alexander Bruy 2017-08-04 + + [processing] add parameter representing raster band + +Matthias Kuhn 2017-07-28 + + Remove what's this button + +Nyall Dawson 2017-08-03 + + Fix tiny marker and ellipse symbol preview icons on HIDPI screens + +lbartoletti 2017-08-03 + + - Fix crash for QgsMapToolCircle3Tangents when segment is not activated + or segments are parallels. + - Add preconditions for methods of QgsTriangle when is empty or invalid. + Tests and docs are updated. + +Nyall Dawson 2017-08-03 + + Remove invalid return from API doc, remove some redundant inclusions + +lbartoletti 2017-08-02 + + Add circle from 3 tangents + +Nyall Dawson 2017-08-03 + + Fix broken strings in expression function help + +Nyall Dawson 2017-08-03 + + Fix always disabled layout extent decoration widget + +Nyall Dawson 2017-08-03 + + Fix infinitely growing widgets + + Fixes #16849 + +Merge: 1887cfffa8 d88a7f4198 +Nyall Dawson 2017-08-02 + + Merge pull request #4949 from lbartoletti/inclination_help + + add missing help for inclination + +Nyall Dawson 2017-08-02 + + Only grab tap-and-hold gestures on Android + + We don't want to capture these on desktop environments - it + messes with dropdown menus and other click and drag type operations + +lbartoletti 2017-08-01 + + Shapes drawing with 3 points are no longer frozen when a left click is + made for the 3rd point. + +lbartoletti 2017-08-01 + + add missing help for inclination + +Merge: 0328b7af48 79adad7c8c +Alexander Bruy 2017-08-01 + + Merge pull request #4948 from alexbruy/processing-raster + + [processing] restore and improve some raster algorithms + +Alexander Bruy 2017-08-01 + + indentation + +Alexander Bruy 2017-08-01 + + [processing] remove unused code + +Alexander Bruy 2017-08-01 + + [processing] adopt algs to use new API call to retrieve GDAL driver + +Alexander Bruy 2017-08-01 + + [API] method to retrieve corresponding GDAL driver from a file + extension + +Alexander Bruy 2017-08-01 + + [processing] limit pixel size values + +Alexander Bruy 2017-07-28 + + [processing] port raster layer statistics + +Alexander Bruy 2017-07-28 + + [processing] improve Create constant raster algorithm + +Merge: a8f6dbc3b7 917263a9a3 +Nyall Dawson 2017-08-01 + + Merge pull request #4943 from nyalldawson/exp_layer_rel + + Add items for project map layers and relations to expression builder + +Merge: 0db8a5816b e44a5ce44a +rldhont 2017-08-01 + + Merge pull request #4945 from pblottiere/server_smallclean + + [server] Small clean-up in WMS renderer + +lbartoletti 2017-07-31 + + Add CircleExtent svg + +Merge: 6036fa6a7c 0db8a5816b +lbartoletti 2017-07-31 + + Merge branch 'master' into regularShape_gui + +lbartoletti 2017-07-31 + + clean + +Blottiere Paul 2017-07-31 + + Set an attribute as private instead of protected + +Blottiere Paul 2017-07-24 + + Update sip binding + +Blottiere Paul 2017-07-24 + + Remove sip rule in header + +Blottiere Paul 2017-07-24 + + Update spell check file + +Blottiere Paul 2017-07-24 + + Update documentation + +Blottiere Paul 2017-07-24 + + Set destructor as virtual + +Blottiere Paul 2017-07-17 + + Some cleanups in qgisapp + +Blottiere Paul 2017-07-17 + + Update documentation for QgsProjectArchive + +Blottiere Paul 2017-07-17 + + Update tests + +Blottiere Paul 2017-07-17 + + Update sip binding + +Blottiere Paul 2017-07-17 + + Remove zip/unzip methods from QgsProject + +Blottiere Paul 2017-07-17 + + Fix compilation by taking libzip version into account + +Blottiere Paul 2017-07-13 + + Add libzip-dev in travis.yml + +Blottiere Paul 2017-07-13 + + Temporary .qgs files are deleted + +Blottiere Paul 2017-07-13 + + Add QIODevice::Truncate for opening a new file + +Blottiere Paul 2017-07-13 + + Add a QgsProjectArchive class to keep QgsArchive generic + +Blottiere Paul 2017-07-13 + + Replace toLower() with compare( ..., Qt::CaseInsensitive ) + +Blottiere Paul 2017-07-13 + + Fix camel case + +Blottiere Paul 2017-07-11 + + .qgz files are supported by default for opening + +Blottiere Paul 2017-07-11 + + Archive has to be cleared when clear() is called + +Blottiere Paul 2017-07-11 + + Add more tests + +Blottiere Paul 2017-07-11 + + Update documentation and sip binding + +Blottiere Paul 2017-07-11 + + Remove unnecessary ternary test + +Blottiere Paul 2017-07-11 + + Datasource path are relatives in embedded qgs project + +Blottiere Paul 2017-07-10 + + [FEATURE] Add the possibility to save/open a project in .qgz + +Blottiere Paul 2017-07-10 + + Add tests + +Blottiere Paul 2017-07-10 + + [FEATURE] Project may be zipped/unzipped + +Blottiere Paul 2017-07-07 + + Add tests + +Blottiere Paul 2017-07-07 + + Add utilities functions for zip support + +Blottiere Paul 2017-07-06 + + Add libzip as dependency + +Blottiere Paul 2017-07-31 + + Add tests + +Blottiere Paul 2017-07-31 + + Small cleanups in WMS renderer + +Merge: cf753e9ff4 1da9c607c9 +Matthias Kuhn 2017-07-31 + + Merge pull request #4944 from m-kuhn/PyOverrideCursor + + Safer cursor overriding for python + +Matthias Kuhn 2017-07-31 + + [MetaSearch] Make dialog element size dynamic + +Matthias Kuhn 2017-07-31 + + Fix typo + +lbartoletti 2017-07-31 + + rm qgsmaptooladdregularshape.{cpp,h} + +Nyall Dawson 2017-07-31 + + Allow setting project for QgsExpressionBuilderWidget + + (still defaults to QgsProject::instance()) + +Nyall Dawson 2017-07-30 + + Add some unit tests for QgsExpressionBuilderWidget + +Nyall Dawson 2017-07-30 + + Add items for project map layers and relations to expression builder + + Allows easy insertion of map layer IDs and relation IDs into + expressions. Numerous expression functions now utilise these, + so it makes sense to allow them to be easily inserted. + + Fix #11680, #16879 + + Sponsored by Andreas Neumann + +Matthias Kuhn 2017-07-30 + + Add missing import + +Matthias Kuhn 2017-07-30 + + Even more endless hourglass avoidance + +Matthias Kuhn 2017-07-30 + + More endless hourglass protection + +Matthias Kuhn 2017-07-30 + + Avoid endless wait cursors in console + +Matthias Kuhn 2017-07-30 + + Avoid endless wait cursors + +lbartoletti 2017-07-30 + + Remove rectangle3points (crash) + +Merge: f6b8426b20 91e39a7a95 +Matthias Kuhn 2017-07-30 + + Merge pull request #4942 from gacarrillor/relation_reference_widget_fixes + + [needs-docs] Relation Reference Widget: Add option to show/hide Open Form Button + +Nathan Woodrow 2017-07-30 + + Profile menu naming + +Nathan Woodrow 2017-07-30 + + Hide profiles section if there is only one user profile + +gacarrillor 2017-07-29 + + [needs-docs] Relation Reference Widget: Add option to show/hide the Open Form Button + + The option was already available in the API (QgsRelationReferenceWidget->setOpenFormButtonVisible), but couldn't be used from QgsEditorWidgetSetup nor from the config dialog. For the former, a 'ShowOpenFormButton' key is added, whereas for the latter, a new checkbox is available. + + Being able to hide the Open Form Button is helpful when configuring lookup tables, where a single combo box should be shown in the edit form with no additional buttons. + +lbartoletti 2017-07-30 + + Fix crash for rectangle (centerPoint - extent) + +lbartoletti 2017-07-29 + + Fix tests + +lbartoletti 2017-07-29 + + Add rectangle and regular polygon. + + Rectangle crash + +Nathan Woodrow 2017-07-28 + + Move profiles to settings menu + +Merge: 7f1bb72872 5281a3697f +Nyall Dawson 2017-07-29 + + Merge pull request #4938 from SrNetoChan/dialog_titles_2 + + More work on titles capitalization + +Alexandre Neto 2017-07-28 + + More work on titles capitalization + +Marco Hugentobler 2017-07-28 + + Show toplevel wms group in browser + +Merge: 4705c97511 f43df122ec +Matthias Kuhn 2017-07-28 + + Merge pull request #4937 from m-kuhn/attributeTableCodeEnhancements$ + + Attribute table code enhancements + +Matthias Kuhn 2017-07-28 + + Fix typo in api_break.dox + +Matthias Kuhn 2017-07-28 + + Pre-Qt 5.6 compatibility + +Matthias Kuhn 2017-07-20 + + Q_FOREACH instead of non const iterator + +Matthias Kuhn 2017-07-20 + + Modernize connections to actions + + Use function references rather than SLOTs + +Ismail Sunni 2017-07-27 + + Add {GP} to make the script use gsed in macos. + +Merge: 9763b602fc aa65af5e1a +rldhont 2017-07-28 + + Merge pull request #4898 from tcoupin/master + + Fix srsDimension parsing in GML, fixes #15721 + +Merge: fbff452e5c e8290928dd +Nyall Dawson 2017-07-28 + + Merge pull request #4936 from nyalldawson/algs + + Restore more processing algs + +Nyall Dawson 2017-07-28 + + Port Variable distance buffer to new API + + Improvements: + - add cap style/join style/ miter limit setting from fixed distance buffer + +Nyall Dawson 2017-07-28 + + Port fixed distance buffer to new API + +Nyall Dawson 2017-07-28 + + Port Convex Hull alg to new API + + Improvements: + - slight optimisation to feature requests - don't request attributes + which are not used + - Remove "method" param. Now the decision to group by field or + not is made only on whether a class field was selected or not + +Nyall Dawson 2017-07-28 + + Port singlepart to multipart to new API, fix disabled test + +Nyall Dawson 2017-07-28 + + Port points along line to new API + +Nyall Dawson 2017-07-28 + + Port extract specific nodes algorithm to new API + + Improvements: + - keep Z/M values if present in geometries + +Nyall Dawson 2017-07-28 + + QgsGeometry::vertexAt now returns QgsPoint, not QgsPointXY + + Since it's easy to convert from a QgsPoint to a QgsPointXY, + but impossible to recover the Z/M values lost by only + returning a QgsPointXY. + +Nyall Dawson 2017-07-28 + + Port delete duplicate geometries to new API + +Nyall Dawson 2017-07-28 + + Port equivalent num field algorithm to new API + +Juergen E. Fischer 2017-07-28 + + run t2tdoc + +Merge: c0c18cd466 0a4a76ec9b +Jürgen Fischer 2017-07-28 + + Merge pull request #4935 from johanvdw/patch-1 + + update INSTALL: only GRASS 7 is supported + +Johan Van de Wauw 2017-07-27 + + update INSTALL: only GRASS 7 is supported + + INSTALL has to be updated as only GRASS7 is now supported ( + #4847 ) + +Alessandro Pasotti 2017-07-27 + + Added missing \param to ctor documentation + +Merge: 5c82a856bf 5a62029478 +Hugo Mercier 2017-07-27 + + Merge pull request #4932 from pblottiere/bugfix_chainfilter2 + + Fixes relation reference widget when filters are reset + +Blottiere Paul 2017-07-27 + + Add tests + +Blottiere Paul 2017-07-27 + + Fixes relation reference widget when filters are reset + +Merge: 4aaecb95ba 82182040ab +Nyall Dawson 2017-07-27 + + Merge pull request #4929 from nyalldawson/algs + + Restore some more processing algorithms... + +Nyall Dawson 2017-07-27 + + Port Create Constant Raster to new API and add test + +Nyall Dawson 2017-07-27 + + Port split with lines to new API + + Improvements: + - handle transparent reprojection if layer and lines are in different CRS + +Nyall Dawson 2017-07-27 + + Port Explode algorithm to new API + + Improvements: + - Keep Z/M values if present + - Add unit tests + +Ismail Sunni 2017-07-27 + + Add bash version checking for sip_include.sh. + +Nyall Dawson 2017-07-27 + + Port Polygonize to new API + +Nyall Dawson 2017-07-27 + + Port Truncate alg to new API + +Nyall Dawson 2017-07-27 + + Port create spatial index algorithm to new API + +Nyall Dawson 2017-07-27 + + Allow setting layer type filter for QgsProcessingParameterVectorLayer + + Turns out this is required for some algorithms + +Nyall Dawson 2017-07-27 + + Port merge lines algorithm to new API + +Nyall Dawson 2017-07-27 + + Restore text to float algorithm + + And add test + +Nyall Dawson 2017-07-27 + + Port export geometry info to new API + +Nyall Dawson 2017-07-27 + + Remove some unrequired iface usage from processing algs + + Flip to context.project().crs() use instead + +Nyall Dawson 2017-07-27 + + Use context.project() instead of QgsProject.instance() + +Nyall Dawson 2017-07-27 + + Remove vector.simpleMeasure + + It's quite a confusing function - instead use optimised versions + of the measurement calculations in its place + +Nyall Dawson 2017-07-27 + + Astyle + +Nyall Dawson 2017-07-27 + + Temporarily disable spelling and sip uptodate tests on Travis + + Tests are timing out for an unknown reason, causing valid commits + to fail + +Nyall Dawson 2017-07-27 + + Fix coverity identical code for different branches warning + +Nyall Dawson 2017-07-27 + + Fix some unhandled db errors in user profiles (thanks to Coverity) + +Nyall Dawson 2017-07-27 + + Fix tiny svg preview size on hidpi displays + +Nyall Dawson 2017-07-27 + + Fix typo causing undefined behavior warnings + +Merge: a3af69a44d 8d4dec5c3f +Nyall Dawson 2017-07-27 + + Merge pull request #4924 from SrNetoChan/dialog_titles + + Making dialog titles use Book Style Capitalization [needs-docs] + +Alexandre Neto 2017-07-26 + + Making dialog titles use Book Style Capitalization [needs-docs] + +rldhont 2017-07-26 + + [BUGFIX][SERVER] GetFeatureInfo not evaluated for maptip context when using FILTER param + + fixed #16670 + +Merge: cf042dc5dd a7693d9076 +Tom Kralidis 2017-07-26 + + Merge pull request #4923 from GeoCat/closeXmlTag + + Close unmatched xml tag + +Merge: 1b9dea9ea1 5cfed129b5 +Nyall Dawson 2017-07-26 + + Merge pull request #4838 from aaime/textsymbolizer_sc + + SLD label exports. fixes #8925 + +doublebyte1 2017-07-26 + + - closed unmatched xml tag. + +Merge: d19b4aa2bf 58ea88715d +Hugo Mercier 2017-07-26 + + Merge pull request #4904 from pblottiere/bugfix_chainfilter + + Fixes relation reference widget when chain filter option is activated, fixes #16903 + +Andrea Aime 2017-06-16 + + Ading all other labelling options supported by SLD. fixes #8925 + +Blottiere Paul 2017-07-21 + + Add tests + +Blottiere Paul 2017-07-21 + + Fix relation reference widget when 'Chain Filters' is activated. Fixes #16903 + +Merge: f0a6376adb cdfca0a45f +Hugo Mercier 2017-07-26 + + Merge pull request #4905 from pblottiere/bugfix_scrolllocked + + Fixes value relation widget to keep scrollbar activated, fixes #16654 + +Merge: 11dd4170de c89a15a247 +Nyall Dawson 2017-07-26 + + Merge pull request #4910 from nyalldawson/layout_next + + Layouts, chapter III + +Nyall Dawson 2017-07-26 + + Try to balance UI element sizes on windows builds + +Nyall Dawson 2017-07-26 + + Fix vector file formats show in processing options for raster output + extension (fix #16894) + +Nyall Dawson 2017-07-26 + + Move 'Run as batch' button to bottom of algorithm dialog + + Inserting it into the tab widget doesn't work well cross + platform/between hidpi/lowdpi displays. So instead add + it as a normal button in the button box. + + Also fix capitalization of button text + + Fixes #16767 + +Merge: 1b9c5be10d 383422f069 +Nyall Dawson 2017-07-26 + + Merge pull request #4921 from nyalldawson/fix_deleted_algs + + Fix "wrapped object has been deleted" errors in Processing + +Nyall Dawson 2017-07-26 + + Fix "wrapped object has been deleted" errors in Processing + + Ownership of Python subclass algorithm instances was getting + mangled due to passing through multiple functions with /Factory/ + annotations. + + As per Phil Thomson's advice on + https://www.riverbankcomputing.com/pipermail/pyqt/2017-July/039450.html: + " + /Factory/ is used when the instance returned is guaranteed to be + new to Python. In this case it isn't because it has already been + seen when being returned by createInstance(). (However for a different + sub-class implemented in C++ then it would be the first time it was seen + by Python so the /Factory/ on create() would be correct.) + + You might try using /TransferBack/ on create() instead - that might be + the best compromise. + " + + Changing to /TransferBack/ indeed fixes the error for me. + +Andrea Aime 2016-11-20 + + Porting Raymond Nijssen FOSS4G 2016 labeling work onto latest version of master, with basic support for testing. fixes #8925 + +Merge: c5371b64cb 588fe49aee +Hugo Mercier 2017-07-25 + + Merge pull request #4839 from pblottiere/joinconstraints + + [FEATURE] Constraints are resolved for joined fields + +volaya 2017-06-23 + + added new SAGA descriptions + + (cherry picked from commit a3bb3f13902638ee38f85c25c57d68b34b33bfbc) + +Alessandro Pasotti 2017-07-25 + + Minor fix in comment text + +Alexandre Neto 2017-06-21 + + Restores QToolButton + +Alexandre Neto 2017-06-02 + + Fixes Table Background Color Dialog behavior + +Merge: fc0bd62ece ecd2c650ca +Alexander Bruy 2017-07-25 + + Merge pull request #4916 from NaturalGIS/master_fix_saga_cluster_analysis + + [processing] fix SAGA cluster analysis for rasters + +Juergen E. Fischer 2017-07-25 + + typo fix + +Nyall Dawson 2017-07-25 + + Don't disable page height/width controls when set to a known + page size + + Instead leave them enabled, and flick across to custom page + size if they're changed. + +Nyall Dawson 2017-07-25 + + Make matching to known page sizes less fussy + + Since all gui widgets for page sizes limit to 2 decimal places, + we need to allow this much tolerance when checking the setting + against known page sizes. + +Nyall Dawson 2017-07-25 + + Add some pixel sized wallpapers to the standard page sizes + +Nyall Dawson 2017-07-25 + + Add some missing overrides + +Nyall Dawson 2017-07-25 + + Fix layout context flags not being respected when rendering items + +Nyall Dawson 2017-07-25 + + Astyle + +Nyall Dawson 2017-07-25 + + Fix calculation of layout bounds considers page shadow + +Nyall Dawson 2017-07-25 + + Try to fix sip item casting clashing between composer items and layout items + + Add a temporary hack to QgsComposerItem subclassing to handle this + for now. + +Nyall Dawson 2017-07-25 + + Set the background for layouts on the view, rather then in the scene + + Setting the background on the scene means in applies in renders + of the scene (e.g. to images). We don't want this - we always + want scenes rendered on transparent backgrounds. So instead + use stylesheets to only show the grey background outside of pages + in the view. + +Nyall Dawson 2017-07-22 + + Show known page size when opening page properties if current page size matches + +Nyall Dawson 2017-07-22 + + Functional page properties widget + +Nyall Dawson 2017-07-22 + + Add a lot of framework code for showing item properties in designer + + And hook up a non-functional page properties widget which is + shown when right clicking on a page in the view. + +Nyall Dawson 2017-07-22 + + Refine item widget creation methods in layout item gui registry + +Nyall Dawson 2017-07-22 + + Port base class for item configuration widgets + +Nyall Dawson 2017-07-22 + + [needs-docs] Start on right click menu for layouts + + Currently only contains option for removing the current + page and (non-functional) option for setting current page + properties + +Nyall Dawson 2017-07-22 + + Add method to retrieve page at a specified layout position + +Nyall Dawson 2017-07-22 + + Add an interface for creation of QgsLayoutView context menus + + Allows display of custom right click menus when right click + events are not handled by the current layout view tool. + +Nyall Dawson 2017-07-22 + + Add unit test for scaling layout view with layouts in pixels + +Nyall Dawson 2017-07-22 + + Fix initial position of items for non mm layout units + +Nyall Dawson 2017-07-22 + + Fix scale calculation when layout is in pixels + +Nyall Dawson 2017-07-22 + + Don't use constant space between pages - doesn't work well for non mm units + +Nyall Dawson 2017-07-22 + + Default to layout units in new page dialog + +Nyall Dawson 2017-07-22 + + Show correct unit type in status bar + +Nyall Dawson 2017-07-22 + + Fix cursor position display for multipage layouts + +Nyall Dawson 2017-07-21 + + Fix drawing of rulers with multipage layouts + +Nyall Dawson 2017-07-22 + + Draw page shadow in layout units + + Simplifies code a lot, pixel based size proved to complex for + small result + +Nyall Dawson 2017-07-21 + + Add a dialog for inserting new pages into a layout + +Nyall Dawson 2017-07-21 + + Add ratio lock for width/height in new item properties dialog + +Nyall Dawson 2017-07-21 + + QgsLayoutUnitComboBox can be linked to spin boxes so that their + values are automatically updated when the combo box unit changes + + This means that you can flip between units and things like + the existing width and height are converted immediately to the + new unit + +Nyall Dawson 2017-07-21 + + Fix page shadow drawing + +Nyall Dawson 2017-07-20 + + wip use page as item parent + +Nyall Dawson 2017-07-19 + + Add some tests for data defined page size + +Nyall Dawson 2017-07-19 + + Start on reflow support for page collections (needs tests) + +Nyall Dawson 2017-07-19 + + Add support for adding/removing pages to a collection + +Nyall Dawson 2017-07-19 + + Add methods for handling page size to QgsLayoutItemPage + +Nyall Dawson 2017-07-18 + + wip page rendering + +Nyall Dawson 2017-07-18 + + Add a page collection to layouts, and start porting composer page items + +Nyall Dawson 2017-07-18 + + Port item id and uuid code + +Nyall Dawson 2017-07-18 + + Add support for reading/writing item properties to XML + +Nyall Dawson 2017-07-18 + + Add API to save/restore QgsLayoutObject properties to XML + +Nyall Dawson 2017-07-25 + + Fix size of some color widgets on hidpi displays + +Nyall Dawson 2017-07-25 + + Fix size of color swatch grid in color buttons on hidpi displays + +Nyall Dawson 2017-07-25 + + Fix menu header appearance on hidpi displays + +Nyall Dawson 2017-07-25 + + Use QgsMenuHeaderWidgetAction instead of QMenu::addSection + + Because addSection adds really ugly separators and throws out + the menu alignment + +Mathieu Pellerin 2017-07-25 + + [FEATURE] Add copy to clipboard function to save as image (#4914) + + Sponsored by Andreas Neumann. + +Juergen E. Fischer 2017-07-24 + + vector layer save as: adjust our to OGR's defaults + * GPX_USE_EXTENSIONS default is false not true (fixes #16811) + * CSV GEOMETRY is none not AS_XY (fixes #16819) + + (followup 9a6235db) + +Giovanni Manghi 2017-07-24 + + master: fix SAGA cluster analysis for rasters + +Blottiere Paul 2017-07-11 + + Constraints fail on non existent joined fields + +Blottiere Paul 2017-07-10 + + Add tests + +Blottiere Paul 2017-07-10 + + Update sip binding + +Blottiere Paul 2017-07-10 + + [FEATURE] Constraints are updated on joined fields when dynamic form option is enabled + +Denis Rouzaud 2017-07-24 + + Qt 5.5 has no default value for parent in QAction constructor + + see http://code.qt.io/cgit/qt/qtbase.git/commit/src/widgets/kernel/qaction.h?id=536da5eb6ab1b4b07c13ad9f4c0f69dba5ca1624 + +Merge: 33071f4720 90e68771ec +Alessandro Pasotti 2017-07-24 + + Merge pull request #4755 from SrNetoChan/fix_datasource_manager_ui + + Removes frames from data manager dialog + +Denis Rouzaud 2017-07-24 + + fix doxymentation + +Denis Rouzaud 2017-07-24 + + enhanced output for code_layout build on Travis + +Nathan Woodrow 2017-07-24 + + Remove corner widget for profiles. Make it normal menu + + Hopefully for now until I work out better UX + +Nathan Woodrow 2017-07-24 + + Nicer level string in message log window + +Merge: db745df4a4 6202f06e98 +Nyall Dawson 2017-07-24 + + Merge pull request #4907 from nyalldawson/symbol_button + + New QgsSymbolButton widget + +Nyall Dawson 2017-07-24 + + Fix more tests + +Nyall Dawson 2017-07-24 + + Fix failing tests + +Denis Rouzaud 2017-07-24 + + fix indentation + +Denis Rouzaud 2017-07-24 + + remove QgsScrollAreaWidgetPlugin from custom widgets + + it had to be removed form the widget list in uic plugin. It might be better to provide the real list of implemented widgets rather than the full gui list. + + fixes #16428 + +Merge: 2723f4f199 c440ade2d8 +Alexander Bruy 2017-07-24 + + Merge pull request #4901 from alexbruy/processing-random + + [processing] restore "random" algorithms + +Nyall Dawson 2017-07-24 + + Allow copying and pasting symbols between QgsSymbolButtons + +Alexander Bruy 2017-07-24 + + [processing] remove Z/M addition from "random" algorithms + +Alexander Bruy 2017-07-21 + + [processing] port Random points along lines + +Alexander Bruy 2017-07-21 + + [processing] port Random points in polygons + +Alexander Bruy 2017-07-21 + + [processing] restore Random points in layer bounds + +Alexander Bruy 2017-07-21 + + [processing] port Random points within extent + +Denis Rouzaud 2017-07-24 + + remove duplicate method + + followup 391712d2d42a761acb4bacce81cbe9ed8da52f6b + +Nathan Woodrow 2017-07-24 + + Always log message bar messages to message log + + Mainly so they don't just disappear on the user + +Nathan Woodrow 2017-07-24 + + Load default profile name from global + + Also adds overrideLocalProfile to ignore local profiles.ini file + +Nathan Woodrow 2017-07-24 + + Also load profiles-path from global settings + +Nathan Woodrow 2017-04-10 + + [FEATURE] Add user profiles. + + All user settings/plugins, etc are now loaded from APPDATA for each + platform and no longer .qgis3 and are isolated from each other. + This allows for different profiles depending on what the user of QGIS + needs, e.g test, prod, demo, etc + + Profile menu allows for switching between profiles, or creating new + ones. + +Nyall Dawson 2017-07-24 + + Add some missing /Factory/ annotations + +nirvn 2017-07-24 + + [welcome page] improve rounded rect background color + +Merge: 9a12249b02 e304662a4f +Nyall Dawson 2017-07-24 + + Merge pull request #4909 from nyalldawson/label_units + + Use standard QgsUnitTypes::RenderUnit throughout labeling + +Nyall Dawson 2017-07-24 + + Use standard QgsUnitTypes::RenderUnit throughout labeling + + Instead of duplicate labeling specific unit enum, reuse + the QgsUnitTypes::RenderUnit enum in labeling. + + This brings several improvements, including: + - label offset/distance/repeat units now works correctly + in all available unit types (inc pixels, map unit meters, + points, inches, etc) + - less duplicate code + - labeling can use the robust QgsRenderContext methods for + converting between different units and painter coordinates + + Also change comments for members to doxygen comments, so + that these get included in the API docs. + +Nyall Dawson 2017-07-23 + + Custom widget plugin for QgsSymbolButton + +Nyall Dawson 2017-07-23 + + Port conditional formatting symbol button to QgsSymbolButton + +Nyall Dawson 2017-07-23 + + Port decoration buttons to QgsSymbolButton + +Nyall Dawson 2017-07-23 + + Add opacity slider to symbol button menu + +Nyall Dawson 2017-07-23 + + Use symbol button in annotation config widgets + +Nyall Dawson 2017-07-23 + + Port some symbol buttons across to QgsSymbolButton + + - composer shape style button (no other composer ones for now- they're + all getting removed with layouts anyway) + - point cluster/displacement renderer buttons + +Nyall Dawson 2017-07-23 + + [FEATURE] New standard widget for symbol buttons + + Button widgets for configuring symbol properties were reimplemented + multiple times throughout the codebase. This commit creates a new + standard QgsSymbolButton widget which should be used whenever + a button for configuring symbol properties is required. + + Features include: + - automatic use of inline panels whenever possible + - dropdown menu with shortcuts to color settings, copy/pasting colors + - accepts drag and dropped colors to set symbol color + +Nyall Dawson 2017-07-24 + + Improve string wording, capitalization and plural consistency + +Merge: d570b430f3 54bf013004 +Nyall Dawson 2017-07-24 + + Merge pull request #4877 from nyalldawson/layout_next + + Layouts, chapter II + +Alexandre Neto 2017-07-22 + + Fix code style + +Alexandre Neto 2017-06-21 + + Enforce margins in cpp file + +Alexandre Neto 2017-06-20 + + Removes frames from data manager dialog + Removes extra margin from mOptionsFrame + +Merge: b95d432a8c 99bf32bafb +Nyall Dawson 2017-07-23 + + Merge pull request #4908 from nyalldawson/fix_displace_crash + + Fix crash in displacement/distance renderers + +Nyall Dawson 2017-07-23 + + Fix crash in displacement/distance renderers + + Individual symbol instances were being rendered multiple times + concurrently + +Juergen E. Fischer 2017-07-22 + + huh? of course SubLayerItem is private + +Juergen E. Fischer 2017-07-22 + + sub layer dialog: sort by layer id and feature count numerically (fixes #16917) + +Merge: 89ffecbf05 dfc9285121 +Alexander Bruy 2017-07-22 + + Merge pull request #4903 from NaturalGIS/master + + [processing] fix SAGA LTR mosaiking tool + +Merge: 0cba29cc09 e423eea2cf +Alessandro Pasotti 2017-07-21 + + Merge pull request #4881 from boundlessgeo/xyz-auth-gui + + [feature][needs-docs] XYZ authentication and referer added to GUI + +Blottiere Paul 2017-07-21 + + Add tests + +Blottiere Paul 2017-07-21 + + Update sip binding + +Blottiere Paul 2017-07-21 + + Fixes value relation widget to always keep scrollbar activated. Fixes #16654 + +Giovanni Manghi 2017-07-21 + + master: fix SAGA LTR mosaiking tool + +nirvn 2017-07-21 + + improve extent and scale/dpi relation in save as image/PDF + +nirvn 2017-07-21 + + fix locked ratio width adjustment in save as image/PDF + +nirvn 2017-07-21 + + fix expanding ratio lock button under kbuntu qt theme + +Merge: eb5ac44b27 38c8268400 +Nyall Dawson 2017-07-21 + + Merge pull request #4899 from nyalldawson/ratio_lock + + Allow setting width/height spin boxes to link to QgsRatioLockButton + +Nyall Dawson 2017-07-21 + + Allow setting width/height spin boxes to link to QgsRatioLockButton + + When set, these spin boxes will automatically be updated when their + accompanying spin box changes value so that the ratio is maintained. + +Nyall Dawson 2017-07-21 + + Update test + +Nyall Dawson 2017-07-21 + + Followup 5241c74, fix calculation of heatmaps + +Nyall Dawson 2017-07-21 + + Fix memory leak in canvas preview images + +Juergen E. Fischer 2017-07-21 + + crash report: fix report on 64bit + +lbartoletti 2017-07-20 + + - Add ellipse tools + - Change QgsEllipse().toLineString to have closed linestring + +tcoupin 2017-07-20 + + Fix srsDimension parsing in GML + +Juergen E. Fischer 2017-07-20 + + [FEATURE] fill ring tool: by pressing shift an existing ring is filled + +Merge: f78157be7d 5e03f579d1 +Alexander Bruy 2017-07-20 + + Merge pull request #4896 from NaturalGIS/master_fix_saga_ltr_catchaments_area + + [processing] fix SAGA LTR Catchment Area tools + +Juergen E. Fischer 2017-07-20 + + fix 67f7b3a2 + +Juergen E. Fischer 2017-07-20 + + crash report dialog: + * get current context without an exception (eg. Ctrl+\) + * use 
 around stack
+    * make report details expandable
+    * what about threads?
+
+Giovanni Manghi 	2017-07-20
+
+    mater: fix SAGA LTR Catchement Area tools
+
+Merge: 96fc3bde0c 5241c74c6c
+Alexander Bruy 	2017-07-20
+
+    Merge pull request #4891 from nyalldawson/fix_heatmap_raster
+
+    Correctly create raster for heatmap output
+
+Merge: cd399990f1 96cf6612d3
+Nyall Dawson 	2017-07-20
+
+    Merge pull request #4890 from nyalldawson/algs_next
+
+    Resurrect some processing algorithms
+
+Nyall Dawson 	2017-07-20
+
+    Correctly create raster for heatmap output
+
+    Incorrect creation of geo transform was leading to invalid raster
+    outputs and many "creating warped vrt" log messages
+
+Merge: 6e49403163 63a2b741f2
+Alessandro Pasotti 	2017-07-20
+
+    Merge pull request #4889 from gacarrillor/one_button_ESC_key_handling
+
+    Handle Esc key in Data Source Manager
+
+Nyall Dawson 	2017-07-20
+
+    Port geometry by expression to new API
+
+Nyall Dawson 	2017-07-20
+
+    Port extend lines to new API
+
+Nyall Dawson 	2017-07-20
+
+    Port single sided buffer to new API
+
+Nyall Dawson 	2017-07-20
+
+    Resurrect Translate algorithm
+
+Nyall Dawson 	2017-07-20
+
+    Flip some more algorithms to feature based algorithms
+
+gacarrillor 	2017-07-19
+
+    Fix wrong indentation detected by Travis
+
+Merge: a231f1625a 6e49403163
+gacarrillor 	2017-07-19
+
+    Merge branch 'master' into one_button_ESC_key_handling
+
+gacarrillor 	2017-07-19
+
+    Close Data Source Manager if child widget is closed
+
+Nyall Dawson 	2017-07-20
+
+    Fix QgsFieldComboBox::setField sets incorrect field when filter is present
+
+lbartoletti 	2017-07-19
+
+    - Init GUI for RegularShapes (add a Toolbar:
+    RegularShapeDigitizeToolBar)
+    - Add Circle Tools (2 Points on circle, 3 Points on circle, center and a
+    point)
+    - Fix an error on QgsCircle
+
+Sandro Santilli 	2017-07-19
+
+    Test that PostGIS query can be passed as both unicode and string literal
+
+    See https://issues.qgis.org/issues/16833
+
+Alessandro Pasotti 	2017-07-19
+
+    Fix addWfsLayer in the WFS GUI test (blacklisted on Travis)
+
+    This test segfaults locally.
+
+Matthias Kuhn 	2017-07-19
+
+    [travis] Force precise
+
+Sandro Santilli 	2017-07-19
+
+    Add test for #16833
+
+    Tested to pass with Python 2.7.13
+
+Juergen E. Fischer 	2017-07-19
+
+    fix c29fc35155
+
+Juergen E. Fischer 	2017-07-19
+
+    also "s/( )/()/;" in sipify.pl (followup 4f9a9e036)
+
+Mathieu Pellerin 	2017-07-19
+
+    [FEATURE] Locked aspect ratio state for Save as image/PDF" (#4880)
+
+    Sponsored by Andreas Neumann.
+
+Merge: 744fbc5346 349c996ad2
+rldhont 	2017-07-19
+
+    Merge pull request #4846 from rldhont/server-wms-configparser-getfeatureinfo
+
+    [Server] WMS GetFeatureInfo refactoring
+
+Denis Rouzaud 	2017-07-19
+
+    fix sipify tests
+
+    followup 4f9a9e0360a3ce6b4289e948bb2549a0496f48f2
+
+Juergen E. Fischer 	2017-07-19
+
+    s/( )/()/;  s/==  /== /; s/!=  /!= /;
+
+Juergen E. Fischer 	2017-07-19
+
+    fix oracle provider build (followup c4e26d72)
+
+Juergen E. Fischer 	2017-07-18
+
+    oracle provider: skip updating of key attributes of added features for versioned tables
+
+Nyall Dawson 	2017-07-19
+
+    Fix windows build
+
+Merge: 857f8437d1 1e145b3ab2
+Nyall Dawson 	2017-07-19
+
+    Merge pull request #4777 from nyalldawson/preview
+
+    Forward port Sourcepole's work on map panning previews
+
+Merge: 0b263f9ac6 11cfc78a24
+Nyall Dawson 	2017-07-19
+
+    Merge pull request #4873 from nyalldawson/processing_feature_alg
+
+    Add QgsProcessingFeatureBasedAlgorithm subclass
+
+Alessandro Pasotti 	2017-07-18
+
+    [feature][needs-docs] XYZ authentication and referer added to GUI
+
+    Fixes #16883
+
+Nyall Dawson 	2017-07-18
+
+    Skip invalid returned features
+
+Merge: 6acd326a8f 854430991e
+Alessandro Pasotti 	2017-07-18
+
+    Merge pull request #4737 from boundlessgeo/browser-sync
+
+    [bugfix] Sync the browser connections when changed from the select dialogs
+
+Mathieu Pellerin 	2017-07-18
+
+    [FEATURE] Draw extent onto canvas in save as image/PDF dialog (#4878)
+
+Alessandro Pasotti 	2017-07-18
+
+    Remove unused includes and variables
+
+Alessandro Pasotti 	2017-07-18
+
+    Rebase and partially revert 9bae83275368
+
+    All signals are now in the base class, even if only
+    a subset of available providers actually emits them.
+
+    This way we can handle all source select dialogs
+    the same way, regardless if they are vector, DB
+    or raster (or others).
+
+Nyall Dawson 	2017-07-18
+
+    Change signature of processFeature so that features are no longer modified in place
+
+Alessandro Pasotti 	2017-07-18
+
+    Store canvas into the base class and set extent/crs from the arcgis classes
+
+    This modification was necessary because the current implementation
+    of the source select dialogs within the unified add layer dialog
+    create the provider dialogs the first time and do not destroy
+    them, this means that the canvas extent and CRS can change from
+    a dialog invocation to the next and the extent and CRS need to
+    be updated at layer creation time.
+
+Alessandro Pasotti 	2017-07-17
+
+    Moved arcgis dialogs to the provider directory
+
+Alessandro Pasotti 	2017-07-17
+
+    Homogenize signals from different source select dialogs, move to base class
+
+Nyall Dawson 	2017-07-18
+
+    Add note about throwing QgsProcessingException to cancel algorithm execution
+
+Alessandro Pasotti 	2017-07-17
+
+    Complete documentation for connectionsChanged signals
+
+Alessandro Pasotti 	2017-07-17
+
+    Renamed base class to QgsAbstractDataSourceWidget
+
+Alessandro Pasotti 	2017-07-14
+
+    Refactored all providers to use the new base class
+
+    Also use refreshConnections from the data items when
+    a refresh is required, this function also emits
+    the signal to update the other GUI elements.
+
+Nyall Dawson 	2017-07-17
+
+    Improve dox
+
+Nyall Dawson 	2017-07-17
+
+    Always output algorithm results, even when input source has no
+    features
+
+    Allows more versatile models which can handle empty layers
+
+Nyall Dawson 	2017-07-17
+
+    [FEATURE] Followup addition of set Z/M values algs with Drop Z/M Values algorithm
+
+    Allows easy access to drop any z or m values present in a layer (e.g. if
+    required for compatibility with a database destination, etc)
+
+Nyall Dawson 	2017-07-17
+
+    [FEATURE] New algorithms to add Z/M values to existing geometries
+
+    Allows upgrading geometries to include these dimensions, or
+    overwriting any existing Z/M values with a new value.
+
+    Intended mostly as a test run for QgsProcessingFeatureBasedAlgorithm
+
+Nyall Dawson 	2017-07-17
+
+    Port a single python algorithm to QgsProcessingFeatureBasedAlgorithm
+
+Nyall Dawson 	2017-07-17
+
+    Port some existing algorithms to QgsProcessingFeatureBasedAlgorithm
+
+Nyall Dawson 	2017-07-10
+
+    Add QgsProcessingFeatureBasedAlgorithm subclass
+
+    An abstract QgsProcessingAlgorithm base class for processing algorithms
+    which operate "feature-by-feature".
+
+    Feature based algorithms are algorithms which operate on individual
+    features in isolation. These are algorithms where one feature is
+    output for each input feature, and the output feature result
+    for each input feature is not dependent on any other features
+    present in the source.
+
+    For instance, algorithms like "centroids" and "buffers" are feature
+    based algorithms since the centroid or buffer of a feature is
+    calculated for each feature in isolation. An algorithm like "dissolve"
+    is NOT suitable for a feature based algorithm as the dissolved output
+    depends on multiple input features and these features cannot be
+    processed in isolation.
+
+    Using QgsProcessingFeatureBasedAlgorithm as the base class for feature
+    based algorithms allows shortcutting much of the common algorithm code
+    for handling iterating over sources and pushing features to output sinks.
+    It also allows the algorithm execution to be optimised in future
+    (for instance allowing automatic multi-thread processing of the
+    algorithm, or use of the algorithm in "chains", avoiding the need
+    for temporary outputs in multi-step models).
+
+Nyall Dawson 	2017-07-18
+
+    On first run, try to guess a good default icon size based on screen DPI
+
+    Otherwise icons are miniscule when loading QGIS on hidpi screens, and
+    users must know that they need to manually change the icon size
+    to make it usable...
+
+Nyall Dawson 	2017-07-18
+
+    On first load, default to 80% of current screen size for main window
+
+    Using a fixed default window geometry wasn't working well anymore -
+    it made the default window size tiny on hidpi screens.
+
+Alessandro Pasotti 	2017-07-12
+
+    Added since 3.0 to the renamed class
+
+Alessandro Pasotti 	2017-07-12
+
+    Renamed QgsSourceSelectDialog to QgsArcGisServiceSourceSelect
+
+Alessandro Pasotti 	2017-07-11
+
+    Added since 3.0
+
+Alessandro Pasotti 	2017-07-11
+
+    SIP include
+
+Alessandro Pasotti 	2017-07-11
+
+    Added python bindings for the base source select class
+
+Alessandro Pasotti 	2017-07-11
+
+    [bugfix] Sync the dialogs connections when changed from the browser
+
+    For now it's only for WMS but you get the idea.
+
+    There is a new abstract base class for the source select
+    dialogs, that will grow with common behavior for all
+    the select dialogs.
+
+    Signals are forwarded from the (root) data items to the
+    app and then delivered to the various browser instances
+    and to the unified layer dialog.
+
+    A change in one of the browser items should trigger a
+    refresh in all the other browsers and dialogs.
+
+Alessandro Pasotti 	2017-06-15
+
+    [bugfix] Sync the bowser connections when changed from the select dialogs
+
+    For now, the sync works only in one direction: from the dialogs
+    to the browser instances
+
+David 	2017-07-17
+
+    Codestyle
+
+David 	2017-07-17
+
+    Fix in attributetable - unable to update column
+
+    Fix #16746
+
+David 	2017-07-17
+
+    Fix crash in attributetable when removing more than one column
+
+    References #16746
+
+Nyall Dawson 	2017-07-18
+
+    Make locator bar a bit wider
+
+Nyall Dawson 	2017-07-18
+
+    Save/restore window geometry for plugin installer repo fetching dialog
+
+Mathieu Pellerin 	2017-07-18
+
+    Non-blocking save as image/PDF dialogs (#4874)
+
+Nyall Dawson 	2017-07-18
+
+    Update tests
+
+Nyall Dawson 	2017-07-18
+
+    Dox updates
+
+Nyall Dawson 	2017-07-18
+
+    Add method to specify item groups for item classes in QgsLayoutItemGuiRegistry
+
+    This allows the designer dialog to group the corresponding item
+    actions together (i.e. grouping all basic shape creation actions
+    together), but without any hardcoded special handling so that
+    plugin based items can also be grouped.
+
+Nyall Dawson 	2017-07-18
+
+    Add unit types to new item properties dialog, handle different reference
+    point settings
+
+Nyall Dawson 	2017-07-18
+
+    Add methods to construct layout size/point from QSizeF/QPointF
+
+Nyall Dawson 	2017-07-18
+
+    Add QComboBox subclass widget for selecting layout units
+
+Nyall Dawson 	2017-07-17
+
+    [needs-docs] Add a new item properties dialog
+
+    When adding a new item to a layout, if the user just does a single
+    click of the mouse (vs a click and drag to set the new item
+    position/size), then a dialog is shown asking to user for
+    the new item size/position/reference point.
+
+    This allows easy creation of items with an exact position/size
+    and is common behavior in most proper DTP/illustration apps.
+
+Nyall Dawson 	2017-07-17
+
+    Port shape items to layouts
+
+Nyall Dawson 	2017-07-14
+
+    Implement a cache for item content renders
+
+    Speeds up redraw of items, making use of layout designer much
+    faster with slow to redraw items.
+
+    This will also make it possible to use live effects on layout
+    items without killing performance of the designer.
+
+Nyall Dawson 	2017-07-14
+
+    Ensure that item painter is correctly scaled so that painter units are pixels
+
+Nyall Dawson 	2017-07-14
+
+    Change QgsLayoutItem::draw to use a renderContext instead of
+    direct QPainter argument
+
+    This will make use of other rendering code within layout items
+    much easier - since symbology/text renderer/diagrams/etc all
+    require QgsRenderContexts for use, it makes sense for
+    layout item rendering to also use this approach.
+
+    This also avoids lots of duplicate code which was scattered
+    throughout different composer item types to manually handle
+    creation of QgsRenderContexts when required.
+
+Nyall Dawson 	2017-07-14
+
+    Partially port some layout utils for render context creation
+
+Nyall Dawson 	2017-07-14
+
+    Shell class for QgsLayoutItemMap
+
+Nyall Dawson 	2017-07-10
+
+    Start porting item rotation
+
+Nyall Dawson 	2017-07-10
+
+    Add QgsLayoutUtils
+
+Nyall Dawson 	2017-07-10
+
+    Port data defined item position and size
+
+Nyall Dawson 	2017-07-10
+
+    Ensure that moving/resizing items respects reference point
+
+Nyall Dawson 	2017-07-10
+
+    Implement item size and positioning using layout units
+
+Nyall Dawson 	2017-07-10
+
+    Add some rendering checks for layout items
+
+Nyall Dawson 	2017-07-07
+
+    Port a bunch of low-level methods to layouts
+
+    Relating to expression contexts and variables
+
+Nyall Dawson 	2017-07-07
+
+    Port some basic functionality from QgsComposerObject
+
+Nyall Dawson 	2017-07-07
+
+    Layouts have a name
+
+Nyall Dawson 	2017-07-07
+
+    [layout] Add measurement unit handling to QgsLayout
+
+    Allows layouts to convert from various units to their
+    own native units
+
+    Also added a QgsLayoutContext to QgsLayout.
+
+Nyall Dawson 	2017-07-07
+
+    Add measurement converter and dpi to layout context
+
+Nyall Dawson 	2017-07-07
+
+    Add a context class for layouts
+
+    Stores information relating to the current context (such as
+    associated feature and layer) and rendering settings for a layout.
+
+Merge: 9bae832753 514e43057a
+Nyall Dawson 	2017-07-18
+
+    Merge pull request #4876 from nyalldawson/upstream_ftw
+
+    Upstream some sourcepole fork commits
+
+Sandro Mani 	2017-07-17
+
+    Re-use timer in QgsMapCanvas::refresh to ensure multiple refresh requests get compressed
+
+    Forward port from Sourcepole's fork
+
+Sandro Mani 	2017-07-17
+
+    Demote translation loading warning to debug msg
+
+    (forward port from Sourcepole's fork)
+
+Juergen E. Fischer 	2017-07-17
+
+    add (unemitted) signals to provider source selectors to silence data
+    source manager connection warnings
+
+Juergen E. Fischer 	2017-07-17
+
+    don't close database selection dialogs
+
+Juergen E. Fischer 	2017-07-17
+
+    consider datum transformation when pasting features (fixes #16846)
+
+rldhont 	2017-07-17
+
+    [Server] WMS GetFeatureInfo refactoring cleanup
+
+Juergen E. Fischer 	2017-07-17
+
+    Fix qgsversion.h creation
+
+David 	2017-07-15
+
+    run target t2tdoc (followup 478dd209)
+
+David 	2017-07-15
+
+    Additional libraries for Fedora
+
+rldhont 	2017-07-03
+
+    [Server] WMS GetFeatureInfo refactoring
+
+Merge: 6c0cb2f5c0 f3f74a9ddf
+Alexander Bruy 	2017-07-17
+
+    Merge pull request #4869 from alexbruy/network-analysis
+
+    [processing] restore network analysis algorithms
+
+Alexander Bruy 	2017-07-17
+
+    [processing] adapt network analysis algorithms to latest API changes
+
+Alexander Bruy 	2017-07-16
+
+    [processing] make service area outputs optional
+
+Alexander Bruy 	2017-07-16
+
+    [processing] allow diferent CRS for point layers and network layer
+
+Alexander Bruy 	2017-07-16
+
+    [processing] add cancellation support where possible
+
+Alexander Bruy 	2017-07-16
+
+    [processing] restore Service area from layer
+
+Alexander Bruy 	2017-07-16
+
+    [processing] restore Service area from point
+
+Alexander Bruy 	2017-07-16
+
+    [processing] restore Shortest path from layer to point
+
+Alexander Bruy 	2017-07-16
+
+    [processing] restore Shortest path from point to layer
+
+Alexander Bruy 	2017-07-16
+
+    [processing] restore Shortest path from point to point
+
+Merge: 246685b0cb 09bb55a895
+Alexander Bruy 	2017-07-17
+
+    Merge pull request #4872 from alexbruy/network-api
+
+    [API] small improvements for network analysis API
+
+Matthias Kuhn 	2017-07-16
+
+    [processing] Better error reporting in point on surface
+
+Matthias Kuhn 	2017-07-16
+
+    [FEATURE] Give access to geometry errors
+
+    When methods are called that use GEOS to create new geometries, the
+    result geometries now contain information about what has gone wrong in
+    case of an error.
+
+    In practice, this means it's possible to give more detailed information
+    in place (and not only in the message log) when things like processing
+    algorithms fail.
+
+Nyall Dawson 	2017-07-17
+
+    Make doc test happy
+
+Nyall Dawson 	2017-07-17
+
+    Fix uninitialized member (thanks to Coverity)
+
+Nyall Dawson 	2017-07-17
+
+    Fix use after delete error (thanks to Coverity)
+
+Merge: 3a2710efe5 8711473b7f
+Nyall Dawson 	2017-07-17
+
+    Merge pull request #4848 from nyalldawson/virtual_agg
+
+    Fix aggregate calculation in virtual fields
+
+Merge: 97c1def8b5 38a13ff5af
+Nyall Dawson 	2017-07-17
+
+    Merge pull request #4870 from nyalldawson/algs3
+
+    Port 4 more algs to new API
+
+Nyall Dawson 	2017-07-17
+
+    Make pole of inaccessibility calculation handle multipolygons
+
+Nyall Dawson 	2017-07-16
+
+    Port Reverse Line Direction to new API, add test
+
+Alexander Bruy 	2017-07-16
+
+    initialize QgsFeedback with nullptr by default
+
+Merge: 75d9fd5023 8370bbb150
+Tom Kralidis 	2017-07-16
+
+    Merge pull request #4857 from jcomas/patch-1
+
+    [MetaSearch] Update connections-default.xml
+
+Alexander Bruy 	2017-07-16
+
+    [network analysis] use QgsFeedback for progress reporting and
+    cancelation
+
+Alexander Bruy 	2017-07-16
+
+    [network analysis] use QgsFeatureSource instead of QgsVectorLayer in
+    QgsVectorLayerDirector
+
+Juergen E. Fischer 	2017-07-16
+
+    Fix windows build
+
+Nyall Dawson 	2017-07-16
+
+    Port Offset line, Orthogonalize and Pole of Inaccessibility to new API
+
+    Improvements:
+    - Fix handling of multiline outputs for Offset Line algorithm
+
+Merge: 261391d499 1342f4d9ac
+Nyall Dawson 	2017-07-16
+
+    Merge pull request #4868 from nyalldawson/nn
+
+    Port Remove Null Geometries algorithm to c++/new API
+
+Matthias Kuhn 	2017-07-16
+
+    Handle geos errors
+
+Matthias Kuhn 	2017-07-16
+
+    Port PointOnSurface QGIS algorithm
+
+Nyall Dawson 	2017-07-16
+
+    Add API to set optional destination parameters as not created by default
+
+    This allows optional outputs (such as null geometry features detected
+    by the Remove Null Geometries algorithm) to be skipped by default
+    when desirable.
+
+Nyall Dawson 	2017-07-16
+
+    Port Remove Null Geometries algorithm to c++/new API
+
+    Enhancements:
+    - add a new optional output for null geometries, and make
+    the non-null geometry output optional. This allows the algorithm
+    to act as a router for features with null/not null geometries
+    inside of a model
+
+Merge: 99a9e249f5 1b1dc7de63
+Nyall Dawson 	2017-07-16
+
+    Merge pull request #4863 from nyalldawson/nn
+
+    Port 2 more processing algorithms
+
+Matthias Kuhn 	2017-07-16
+
+    Fix file permissions for processing algs
+
+Nyall Dawson 	2017-07-16
+
+    Port Extract Nodes to new API
+
+    Improvements:
+    - Retain Z/M values from input geometries
+
+Nyall Dawson 	2017-07-15
+
+    Fix typo
+
+Nyall Dawson 	2017-07-15
+
+    Port Unique Values algorithm to new API
+
+    Improvements:
+    - by default output a table with unique values, instead of a HTML
+    file. This allows the values to be more easily used in follow up
+    analysis (e.g. in a model). HTML output is still available, but
+    not output by default
+
+Juergen E. Fischer 	2017-07-15
+
+    run target t2tdoc (followup ec74e03a)
+
+Merge: 8333f6a59d d66b7b2c90
+Jürgen Fischer 	2017-07-15
+
+    Merge pull request #4864 from signedav/patch-1
+
+    Fedora Install Typo: OSWLib to OWSLib
+
+Nyall Dawson 	2017-07-15
+
+    Fix mean coords uses old exception
+
+signedav 	2017-07-15
+
+    Fedora Install Typo: OSWLib to OWSLib
+
+Nyall Dawson 	2017-07-15
+
+    Port Distance Matrix algorithm to new API
+
+    Enhancements:
+    - support source/target layers in different CRS
+    - output layers with geometry (i.e. keep input point geometry - avoids
+    need to rejoin result back to original table to get geometry)
+    - keep original data types for id fields
+    - don't fire off many single feature requests - instead request
+    multiple features at once to improve speed
+
+Nyall Dawson 	2017-07-15
+
+    Port mean coords algorithm to new API
+
+    Improvements:
+    - Don't export UID class field if no class field was set
+
+Merge: eaad18c6ad a6736ceb77
+Nyall Dawson 	2017-07-15
+
+    Merge pull request #4862 from nyalldawson/nn
+
+    Port Line Intersection algorithm to new API
+
+Nyall Dawson 	2017-07-15
+
+    Add ability to select output fields from both layers to Intersection algorithm
+
+Nyall Dawson 	2017-07-15
+
+    Port Line Intersection algorithm to new API
+
+    Improvements
+    - allow different CRS between layers
+    - instead of optionally allowing selection of a single field to keep from
+    both inputs, allow selection of multiple fields
+
+Merge: 1cb2728c02 353d4fc703
+Nyall Dawson 	2017-07-15
+
+    Merge pull request #4861 from nyalldawson/nn
+
+    Port nearest neighbour alg to new API
+
+Merge: bbe466ff98 671f024789
+Alexander Bruy 	2017-07-15
+
+    Merge pull request #4859 from alexbruy/processing-restore
+
+    [processing] restore most of terrain analysis tools
+
+Nyall Dawson 	2017-07-15
+
+    Add missing dox
+
+Nyall Dawson 	2017-07-15
+
+    Allow bulk load of QgsSpatialIndex to be canceled via QgsFeedback
+
+Alexander Bruy 	2017-07-15
+
+    fix tests
+
+Alexander Bruy 	2017-07-14
+
+    [processing] restore Hillshade algorithm
+
+Alexander Bruy 	2017-07-14
+
+    [processing] restore Ruggedness algorithm
+
+Alexander Bruy 	2017-07-14
+
+    [processing] restore Slope algorithm
+
+Alexander Bruy 	2017-07-14
+
+    [processing] homogenize input/output names in Heatmap algorithm
+
+Nyall Dawson 	2017-07-15
+
+    Port nearest neighbour analysis algorithm to new API
+
+Nyall Dawson 	2017-07-15
+
+    Ensure distance area is always correctly used in processing
+
+Merge: 223059776e 2e8b84867e
+Nyall Dawson 	2017-07-15
+
+    Merge pull request #4860 from nyalldawson/sum_lines
+
+    Port sum line length algorithm to new API
+
+Nyall Dawson 	2017-07-15
+
+    Port sum line length algorithm to new API
+
+    and implement auto reprojection of lines to polygon layer CRS
+
+Merge: 455769c54d 79df6b4749
+Nyall Dawson 	2017-07-15
+
+    Merge pull request #4858 from nyalldawson/points
+
+    Port Points in Polygon algorithms to new API
+
+Nyall Dawson 	2017-07-15
+
+    Add cancelation support for points in polygons algorithm
+
+Nyall Dawson 	2017-07-15
+
+    [needs-docs] Copy unique class field option from Points in Polygons Unique
+    to Points in Polygons
+
+    Again, it doesn't make sense for a whole separate algorithm just to
+    add a single option
+
+Nyall Dawson 	2017-07-15
+
+    [needs-docs] Add optional weight field to Points In Polygon algorithm
+
+    Instead of a separate Points In Polygon algorithm just for this
+    extra option, add it to the original Points In Polygon algorithm
+    as a non-default option.
+
+Nyall Dawson 	2017-07-15
+
+    Port counts points in polygon alg to new API
+
+    and add auto-reprojection support if points layer is in
+    different CRS to polygon layer
+
+Merge: 9c08d0050f 53cb9edaf8
+Nyall Dawson 	2017-07-15
+
+    Merge pull request #4856 from signedav/stringliteral
+
+    Minor improvements QStringLiterals for GitHub Test
+
+Josep Comas 	2017-07-14
+
+    Update connections-default.xml
+
+    Added Spain resource: Centro Nacional de Información Geográfica (CNIG)
+
+Juergen E. Fischer 	2017-07-14
+
+    update t2tdoc outputs (INSTALL, NEWS; followup 0d9945deac)
+
+signedav 	2017-07-14
+
+    Use QStringLiteral
+
+Nyall Dawson 	2017-07-14
+
+    Minor code improvements
+
+Nyall Dawson 	2017-06-26
+
+    Add missing override
+
+Nyall Dawson 	2017-06-26
+
+    Cancel preview jobs without blocking
+
+    Makes for more reponsive map updates
+
+Nyall Dawson 	2017-06-26
+
+    Don't label preview tiles
+
+    Labeling can be expensive, so don't do this for tiles which
+    are only going to be used as a preview image
+
+Nyall Dawson 	2017-06-26
+
+    New style connects
+
+Nyall Dawson 	2017-06-26
+
+    Fix build
+
+Marco Hugentobler 	2017-06-09
+
+    [FEATURE] First experiment with preloading
+
+    After main map canvas render is complete, render a separate image
+    for each adjacent map "tile" (in the background). These are shown
+    when panning the map to display a preview of what will be visible
+    when the panning operation ends.
+
+Matthias Kuhn 	2017-07-13
+
+    Return invalid fid instead of null fid
+
+    The default comparison code for two QVariants does a really crappy job
+    when it comes to NULL values.
+    I.e. it will return true for `QVariant( 0 ) == QVariant( QVariant::Int )`
+    We work around this issue here by returning an invalid QVariant instead,
+    which - and luckily also Qt is aware of this - also is different from 0.
+
+    Fix #16745
+
+Mathieu Pellerin 	2017-07-14
+
+    [processing] restore and improve lines to pol / pol to lines algs (#4850)
+
+    New geometry model for lines to pol / pol to lines agls.
+
+Nyall Dawson 	2017-07-13
+
+    Add a very basic guard against virtual fields which reference themself
+
+Merge: 0639264a4a 1c8b17fea4
+Nyall Dawson 	2017-07-14
+
+    Merge pull request #4819 from nyalldawson/layout_gui
+
+    Layout GUI work (pt 1/?)
+
+Nyall Dawson 	2017-07-13
+
+    Fix aggregate expression calculation when used with virtual fields
+
+    The layer expression context (which is required for aggregate
+    calculation to work) was not being added to the context used
+    by vector layer feature iterators.
+
+    Fix #15930
+
+Merge: 0d9945deac 4fa69643fc
+Nyall Dawson 	2017-07-14
+
+    Merge pull request #4852 from nyalldawson/heatmap_source
+
+    Use QgsFeatureSource instead of QgsVectorLayer for QgsKde
+
+Harrissou Sant-anna 	2017-07-08
+
+    Use JavaScript instead of javascript/Javascript
+
+    + update INSTALL doc
+
+Harrissou Sant-anna 	2017-07-08
+
+    Use Cartesian instead of cartesian
+
+Nyall Dawson 	2017-07-13
+
+    Fix heatmap widget wrapper, update to use source input
+
+Nyall Dawson 	2017-07-13
+
+    Move method to evaluate a variant to a feature source to QgsProcessingUtils
+
+Nyall Dawson 	2017-07-13
+
+    Fix reportError call
+
+Nyall Dawson 	2017-07-13
+
+    Update heatmap alg to use feature source instead of layer
+
+Nyall Dawson 	2017-07-13
+
+    Use QgsFeatureSource instead of QgsVectorLayer for QgsKde
+
+    Allows generation of heatmaps from feature sources instead
+    of requiring vector layer inputs
+
+Nyall Dawson 	2017-07-13
+
+    Push minimumValues/maximumValues up to QgsFeatureSource base class
+
+    Allows these methods to be called on feature sources
+
+Merge: fc7ac8323f 8285712d68
+Nyall Dawson 	2017-07-13
+
+    Merge pull request #4843 from alexbruy/processing-heatmap
+
+    [processing] port heatmap algorithm
+
+Alexander Bruy 	2017-07-13
+
+    more test fixes
+
+Alexander Bruy 	2017-07-12
+
+    [processing] add test for heatmap algorithm
+
+Alexander Bruy 	2017-07-12
+
+    [processing] port heatmap algorithm
+
+Juergen E. Fischer 	2017-07-13
+
+    vector file writer: reapply integer options (accidentally removed in 9a6235db; fixes #16811, #16819)
+
+Merge: 50df255edc 56208540f9
+Alexander Bruy 	2017-07-13
+
+    Merge pull request #4851 from alexbruy/processing-exception
+
+    [processing] use QgsProcessingException instead of old exception class
+
+Merge: 172e809181 eb6301e023
+Radim Blazek 	2017-07-13
+
+    Merge pull request #4847 from blazek/remove-grass6
+
+    Remove GRASS 6 support
+
+Mark Johnson 	2017-07-13
+
+    [FEATURE] New unit type for rendering in map unit meters sizes
+
+    Allows setting symbols other map item sizes to Map Units in Meters. This allows setting the size always in meters, regardless of what the underlying map units are (e.g. they can be it geographic degrees). The size in meters is calculated based on the current project ellipsoid setting and a projection of the distances in meters at the center of the current map extent.
+
+Alexander Bruy 	2017-07-13
+
+    [processing] remove GeoAlgorithmExecutionException
+
+Alexander Bruy 	2017-07-13
+
+    [processing] use QgsProcessingException in algorithms
+
+Alexander Bruy 	2017-07-12
+
+    [processing] remove unused version() function
+
+Mathieu Pellerin 	2017-07-13
+
+    [processing] restore intersection algorithm (#4849)
+
+Merge: 64575b3a09 6434d8dce0
+Nyall Dawson 	2017-07-13
+
+    Merge pull request #4842 from mj10777/master3.qgsdatetimeedit
+
+    changes to QgsDateTimeEdit to support the minimal Date supported by Q…
+
+mj10777 	2017-07-13
+
+    changed setMinimumEditDateTime to private.
+
+Nyall Dawson 	2017-07-13
+
+    Silence some more gcc fallthrough warnings (no real issues)
+
+Nyall Dawson 	2017-07-13
+
+    Fix use of integer constants in boolean context warning
+
+Nyall Dawson 	2017-07-13
+
+    Silence implicit-fallthrough warning in GCC when FALLTHROUGH macro is used
+
+Nyall Dawson 	2017-07-13
+
+    Port grass followup to area calculation fix
+
+    https://trac.osgeo.org/grass/changeset/71259
+
+    refs discussion at
+
+    https://trac.osgeo.org/grass/ticket/3369
+
+Radim Blazek 	2017-07-12
+
+    [GRASS] remove GRASS 6 support
+
+rldhont 	2017-07-12
+
+    [Server] Tests update mask image
+
+Mathieu Pellerin 	2017-07-12
+
+    [processing] restore union algorithm
+
+Alessandro Pasotti 	2017-07-12
+
+    Skip bindings for classes migrated from app
+
+Alessandro Pasotti 	2017-07-12
+
+    Revert "SIP include"
+
+    This reverts commit f2b9a936d0938cf8f6afa364cc3a19c090fbd138.
+
+Alessandro Pasotti 	2017-07-12
+
+    SIP include
+
+Merge: 6067d514dc b6e25791a3
+Alessandro Pasotti 	2017-07-12
+
+    Merge pull request #4769 from boundlessgeo/unified-button-movetogui-2
+
+    Move all app/ogr and datasource manager dialog to GUI
+
+Nyall Dawson 	2017-07-12
+
+    Fix crash when using line pattern fills
+
+    Line pattern fill was not calling stopRender on the line symbol!
+
+Nyall Dawson 	2017-07-12
+
+    Nicer debugging from boundary alg
+
+Nyall Dawson 	2017-07-12
+
+    Really delete processing dialogs
+
+    The dialogs are parented to the main window, which means sip
+    transfers the ownership to the main window - and they are
+    never deleted as a result. This results in various error
+    messages caused by the widgets hanging around forever
+    and listening out for various signals they are connected to.
+
+Nyall Dawson 	2017-07-12
+
+    Update processing.algorithmHelp for new API
+
+Nyall Dawson 	2017-07-12
+
+    Initialise algorithms when they are added to a provider
+
+    By initializing the prototype of the algorithm stored in the
+    provider we allow shortcuts like directly querying the parameter
+    definitions from the provider's prototype (instead of having
+    to create a new instance and manually initialize it first)
+
+Merge: 18b52b22f1 91d6ac9537
+Nyall Dawson 	2017-07-12
+
+    Merge pull request #4840 from nyalldawson/processing_next
+
+    [processing] Simplify output creation
+
+mj10777 	2017-07-12
+
+    changes to QgsDateTimeEdit to support the minimal Date supported by QDateTimeEdit (0100-01-01)
+
+Nyall Dawson 	2017-07-12
+
+    Update script algorithms for auto output creation
+
+Nyall Dawson 	2017-07-12
+
+    Cleanup some imports, remove use of dataobjects
+
+Nyall Dawson 	2017-07-12
+
+    Take advantage of auto created outputs in ported algorithms
+
+Nyall Dawson 	2017-07-12
+
+    Auto create corresponding outputs when adding destination style
+    parameters to an algorithm
+
+    QgsProcessingAlgorithm::addParameter() has a new createOuput
+    argument (true by default).
+
+    If the createOutput argument is true, then a corresponding
+    output definition will also be created (and added to the
+    algorithm) where appropriate. E.g. when adding a
+    QgsProcessingParameterVectorDestination and createOutput is
+    true, then a QgsProcessingOutputVectorLayer output will be
+    created and added to the algorithm. There is no need to call
+    addOutput() to manually add a corresponding output for this
+    vector. If createOutput is false then this automatic output
+    creation will not occur.
+
+    This should simplify declaration of outputs for algorithms
+    as it avoids the need to manually declare these corresponding
+    outputs.
+
+Mathieu Pellerin 	2017-07-11
+
+    [processing] restore difference algorithm
+
+Nyall Dawson 	2017-07-11
+
+    Port ability to switch designer to full screen
+
+Nyall Dawson 	2017-07-11
+
+    Add toolbar menu
+
+Nyall Dawson 	2017-07-11
+
+    Port ability to show/hide rulers
+
+Nyall Dawson 	2017-07-11
+
+    Spelling update
+
+Nyall Dawson 	2017-07-11
+
+    Restore rulers in layout designer
+
+Nyall Dawson 	2017-07-10
+
+    Partially revert "categorized renderer: also setup symbol render context for hashed symbols"
+
+    This partially reverts commit c7c52442f71a6a17ea1ad97e741b2b4b6d51f698.
+
+    Causes a race condition which results in random crashes while
+    using the categorised symbol renderer.
+
+    The intent behind the original commit is unknown
+
+Nyall Dawson 	2017-07-10
+
+    Add an assert to protect multiple calls to QgsSymbolV2::startRender()
+    while rendering has already been started for a particular symbol instance
+
+    Relates to a random but frequent crash which occurs when using the
+    categorised symbol renderer - tracked down to a race condition
+    in which multiple concurrent calls to startRender() are performed
+    on a single symbol instance.
+
+Nyall Dawson 	2017-07-11
+
+    Add zoom to width as menu item too
+
+Nyall Dawson 	2017-07-11
+
+    Port display of cursor location from composer
+
+Nyall Dawson 	2017-07-11
+
+    Also add a slider for easier zoom changing to status bar
+
+Nyall Dawson 	2017-07-11
+
+    Add some shortcuts to zoom to layout/layout width in status bar combobox
+
+Nyall Dawson 	2017-07-11
+
+    Add status bar zoom control to layout designer
+
+Nyall Dawson 	2017-07-10
+
+    Port zoom actions from composer to layout designer
+
+Nyall Dawson 	2017-07-07
+
+    Split layout item registry into two separate registries
+
+    Instead of relying on forward declared c++ classes from
+    gui in QgsLayoutItemRegistry, instead create a
+    QgsLayoutItemGuiRegistry which handles registration
+    of all the GUI specific behavior relating to layout items.
+
+    Remove all GUI related code from QgsLayoutItemRegistry.
+
+    This creates a cleaner split between core/gui code, and
+    given that there'll be a lot of gui specific behavior
+    which needs to be handled by a registry it makes sense
+    to keep this isolated in gui.
+
+    It also plays nicer with the sip bindings, which can't
+    handle forward declared gui classes in core.
+
+Nyall Dawson 	2017-07-07
+
+    Port ability to pan layouts with middle mouse button depressed
+
+Nyall Dawson 	2017-07-07
+
+    Port ability to navigate layouts using space-pan and ctrl-space zoom
+
+Nyall Dawson 	2017-07-07
+
+    Don't auto populate QgsLayoutItemRegistry
+
+    Initially create an empty registry, allow it to be populated
+    at a later stage.
+
+Nyall Dawson 	2017-07-05
+
+    Port ability to wheel zoom into/out of layout designer
+
+Nyall Dawson 	2017-07-05
+
+    Add shell for non-functional layout select tool
+
+Nyall Dawson 	2017-07-05
+
+    Respect events which has been set to ignore in QgsLayoutViewTools
+
+    If ignored, default handling occurs
+
+Nyall Dawson 	2017-07-05
+
+    Update cursor on alt press/release for zoom tool
+
+Nyall Dawson 	2017-07-05
+
+    Add a zoom tool to designer dialog
+
+Nyall Dawson 	2017-07-05
+
+    Add layout zoom tool
+
+Nyall Dawson 	2017-07-05
+
+    Move click-and-drag detection to QgsLayoutViewTool
+
+Nyall Dawson 	2017-07-05
+
+    Allow setting pen/brush for QgsLayoutViewRubberBand
+
+Nyall Dawson 	2017-07-05
+
+    Handle tool changes mid press-release operation
+
+    Because it's possible for users to change the tool while a
+    press release operation is mid-way, e.g. by pressing a tool
+    shortcut key.
+
+Nyall Dawson 	2017-07-04
+
+    Add layout panning tool
+
+Nyall Dawson 	2017-07-04
+
+    Add a temporary layout item type for testing
+
+Nyall Dawson 	2017-07-04
+
+    Add some unit tests
+
+Nyall Dawson 	2017-07-04
+
+    Create rubber band classes for layout views
+
+    c++ QgsLayoutItem metadata classes can directly register
+    a function which creates a QgsLayoutViewRubberBand for the item
+    subclass.
+
+    Python code cannot utilise this shortcut (due to inaccessibility
+    of forward declared gui classes from core Python classes), so
+    there's a separate gui registry utility class added for registering
+    prototypes for rubber bands for already registered item types.
+
+Nyall Dawson 	2017-07-04
+
+    Subclass QMouseEvent to QgsLayoutViewMouseEvent
+
+    For easy access to mouse event coordinates in layout coordinate
+    space (and future use with snapped item coordinates)
+
+Nyall Dawson 	2017-07-04
+
+    Start implementing an add item tool
+
+Nyall Dawson 	2017-07-04
+
+    Add some unit tests for layout tools
+
+Nyall Dawson 	2017-07-04
+
+    Add shell classes for layout view tools
+
+    Copy the same model as QgsMapCanvas uses, with separate
+    classes for individual interaction tools instead of keeping
+    all the logic in the QGraphicsView subclass (as is done
+    with composer)
+
+Nyall Dawson 	2017-07-04
+
+    Add layout view to layout designer
+
+Nyall Dawson 	2017-07-04
+
+    Add shell for QgsLayoutView
+
+Merge: 726936eee2 224c4c1313
+Nyall Dawson 	2017-07-11
+
+    Merge pull request #4834 from mhugo/fix_attribute_element_sip
+
+    Fix QgsAttributeEditorContainer SIP
+
+Merge: 1693873e8a 2b8e06719e
+Nyall Dawson 	2017-07-11
+
+    Merge pull request #4831 from nyalldawson/processing_alg_config2
+
+    Minor refactoring to processing algorithms, future proofing some API
+
+Hugo Mercier 	2017-07-10
+
+    Fix QgsAttributeEditorContainer SIP
+
+Merge: 18c36346ef 5b149fb389
+Mathieu Pellerin 	2017-07-10
+
+    Merge pull request #4782 from nirvn/shapefile_wkbtype
+
+Nyall Dawson 	2017-07-10
+
+    Add sip subclass code for QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-07-10
+
+    Allow child algorithm configuration to be stored and handled by models
+
+Nyall Dawson 	2017-07-10
+
+    Allow specifying algorithm configuration when calling create
+
+Nyall Dawson 	2017-07-10
+
+    Move declaration of algorithm parameters/outputs to a new virtual
+    initAlgorithm() method
+
+    This allows 2 benefits:
+    - algorithms can be subclassed and have subclasses add additional
+    parameters/outputs to the algorithm. With the previous approach
+    of declaring parameters/outputs in the constructor, it's not
+    possible to call virtual methods to add additional parameters/
+    outputs (since you can't call virtual methods from a constructor).
+
+    - initAlgorithm takes a variant map argument, allowing the algorithm
+    to dynamically adjust its declared parameters and outputs according
+    to this configuration map. This potentially allows model algorithms which
+    can be configured to have variable numbers of parameters and
+    outputs at run time. E.g. a "router" algorithm which directs
+    features to one of any number of output sinks depending on some
+    user configured criteria.
+
+nirvn 	2017-07-10
+
+    [ogr] return multipart geometry for multipart datasets in feature iterator
+
+nirvn 	2017-06-27
+
+    [ogr] return multi{linestring,polygon} type for shapefile driver
+
+Nyall Dawson 	2017-07-10
+
+    Add sip VirtualCatcherCode to avoid algorithm copies being
+    destroyed by the python garbage collector
+
+    The code generated with the /Factory/ annotation was not sufficient
+    to correctly transfer the ownership of objects created in Python
+    back to c++ (despite mailing list messages which hint that it
+    is).
+
+    Anyway, this awful abomination works. Let's all move on to more
+    useful ways to spend our time...
+
+Harrissou Sant-anna 	2017-07-10
+
+    Use the same icon for the reset button (#4747)
+
+Nyall Dawson 	2017-07-10
+
+    Split QgsProcessingAlgorithm::create into non virtual-create
+    and pure virtual createInstance
+
+    Allows us to add logic which always need applying within
+    create(), leaving createInstance() free to just return a
+    raw new instance of the class
+
+Merge: dae0bf854f d85039363a
+Nyall Dawson 	2017-07-10
+
+    Merge pull request #4828 from nyalldawson/fix_16820
+
+    Fix incorrect area calculation in corner cases (fix #16820)
+
+Nyall Dawson 	2017-07-10
+
+    Fix incorrect area calculation in corner cases (fix #16820)
+
+    In certain circumstances very proximal nodes could cause instability
+    in the ellipsoidal area calculation.
+
+    Port (slightly tweaked) fix from grass changeset 71167 for same issue,
+    and add a unit test
+
+Matthias Kuhn 	2017-07-09
+
+    Fix `with_variable` expression isStatic
+
+Nyall Dawson 	2017-07-09
+
+    Model child algorithms store a copy of the algorithm itself
+
+    Instead of always retrieving it from the registry
+
+Nyall Dawson 	2017-07-09
+
+    Add method to processing registry to create a new instance of an algorithm directly
+
+Merge: 745da0f367 ec40783b5a
+Nyall Dawson 	2017-07-09
+
+    Merge pull request #4827 from DelazJ/num_selected
+
+    Simplify the error message
+
+Harrissou Sant-anna 	2017-07-09
+
+    Simplify the error message
+
+Merge: 7d67b02ae4 845accdf4b
+Nyall Dawson 	2017-07-09
+
+    Merge pull request #4813 from DelazJ/layout_extent
+
+    Fix Layout extents dialog title
+
+Even Rouault 	2017-07-08
+
+    [OGR] Use OGR_F_SetFieldNull() with GDAL >= 2.2 to avoid GeoJSON fields to be unset (fixes #16812)
+
+Merge: e2c84f1a50 fedf88ea3d
+Nyall Dawson 	2017-07-08
+
+    Merge pull request #4826 from nyalldawson/processing_cleanups
+
+    Some more cleanups and misc fixes to processing code
+
+Nyall Dawson 	2017-07-08
+
+    Remove redundant sip file
+
+Nyall Dawson 	2017-07-08
+
+    Split QgsProcessingModelAlgorithm into separate components
+
+    The cpp/h file was getting too large, so split off the individual
+    subcomponents into their own h/cpp files to keep code
+    maintainable.
+
+Nyall Dawson 	2017-07-08
+
+    Fix incorrect icon size in processing windows
+
+    Well... kind of. It fixes the toolbar button size, but for some
+    reason the actual icon content itself isn't being resized. I can't
+    work out why this is...
+
+Nyall Dawson 	2017-07-08
+
+    Update model input type names
+
+Nyall Dawson 	2017-07-08
+
+    Save and restore window geometry for modeler dialogs
+
+Nyall Dawson 	2017-07-08
+
+    Use a filter line edit for outputs
+
+Nyall Dawson 	2017-07-08
+
+    Make model editor dialog more robust while loading models
+
+Nyall Dawson 	2017-07-08
+
+    Rename "output" style parameters for clarity
+
+    The previous naming was too easily confused with processing outputs.
+    Rename them to QgsProcessingParameterFileDestination, etc... to
+    make it clearer what they are used for.
+
+Nyall Dawson 	2017-07-08
+
+    Move an enum to new QgsProcessing class
+
+Nyall Dawson 	2017-06-27
+
+    Rename method to more generic name - it's usable by vector layer outputs too
+
+Nyall Dawson 	2017-06-27
+
+    Expose compatible vector layer parameter evaluation to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-06-27
+
+    Add method to evaluate parameters to compatible vector layers
+    of a specified type
+
+Nyall Dawson 	2017-06-27
+
+    Fix some processing algorithm exception handling
+
+Merge: 8f8cb67370 df9344e344
+Matthias Kuhn 	2017-07-08
+
+    Merge pull request #4669 from nyalldawson/spinbox_ctrl
+
+    When holding ctrl while mouse wheeling on spin box, increase in smaller amounts
+
+Merge: 875a5d6d9d d3614187aa
+Matthias Kuhn 	2017-07-08
+
+    Merge pull request #4803 from DelazJ/polygon_symbol
+
+    Reorganize Polygon symbol dialogs
+
+Merge: ada9ce4dcf 0d1c4cdc59
+Matthias Kuhn 	2017-07-08
+
+    Merge pull request #4818 from DelazJ/spelling
+
+    Fix some spelling issues
+
+Merge: 6b6a52be49 89a06f6907
+Matthias Kuhn 	2017-07-08
+
+    Merge pull request #4825
+
+    Various new expression functions and possibilities
+
+Matthias Kuhn 	2017-07-08
+
+    No need to set limit with setFilterFid
+
+Matthias Kuhn 	2017-07-08
+
+    Code dedup
+
+Matthias Kuhn 	2017-07-08
+
+    Fix leak
+
+Merge: d28296f27f aa24896ce1
+rldhont 	2017-07-07
+
+    Merge pull request #4823 from rldhont/fix-qgis3-asgml2
+
+    Fix GML2 after GML3 improvements
+
+Matthias Kuhn 	2017-07-07
+
+    Get rid of the comment about getting rid of the qgseditorwidgetregistry
+
+Blottiere Paul 	2017-07-06
+
+    Add unit tests
+
+Blottiere Paul 	2017-07-04
+
+    [bugfix] Fixes relation widget when switching between layer styles #16100
+
+Matthias Kuhn 	2017-07-07
+
+    Drop gui dependency from server
+
+Matthias Kuhn 	2017-07-07
+
+    Doxygen
+
+rldhont 	2017-07-05
+
+    Fix GML2 after GML3 improvements
+
+Matthias Kuhn 	2017-07-07
+
+    Add tests
+
+Matthias Kuhn 	2017-07-07
+
+    Fix running expressions without context
+
+Matthias Kuhn 	2017-07-07
+
+    Local variables should not be prefixed
+
+Matthias Kuhn 	2017-07-07
+
+    Improvements to layer handling in expressions
+
+Matthias Kuhn 	2017-07-06
+
+    get_feature_by_id docs
+
+Matthias Kuhn 	2017-07-06
+
+    array docs
+
+Matthias Kuhn 	2017-07-06
+
+    [FEATURE] Add expression function get_feature_by_id
+
+    ... like get_feature, just with an id instead of a field value
+
+Matthias Kuhn 	2017-07-07
+
+    Rename set_variable to with_variable
+
+rldhont 	2017-07-07
+
+    [Server] Tests update mask image
+
+Matthias Kuhn 	2017-07-06
+
+    [FEATURE] Add with_variable function
+
+    This function sets a variable for parts of an expression, therefore
+    avoiding to repeatedly recalculate complex values.
+
+Matthias Kuhn 	2017-07-06
+
+    [FEATURE] Add array_first and array_last expression functions
+
+Matthias Kuhn 	2017-07-06
+
+    [FEATURE] Add snapping results to default value calculation
+
+    ... as @snapping_results variable
+
+Martin Dobias 	2017-07-06
+
+    Make it possible to build just core lib and providers: -DWITH_GUI=FALSE
+
+    This is useful in some cases when working on a third party app/script
+    that only uses qgis_core. For example, I am working on qgis 3D project
+    and it is useful to be able to build QGIS core lib with custom Qt version
+    without having to spend too much time building what I do not need.
+    Also may be useful for QField to simplify the build of QGIS as a dependency
+    (no QScintilla, Qwt) and avoid bits of code in providers that would not
+    be used anyway.
+
+    No real source code changes, just configuration changes, mainly in providers.
+
+Nyall Dawson 	2017-07-07
+
+    Fix some button sizes on hidpi displays
+
+Nyall Dawson 	2017-07-07
+
+    Fix folder destinations always default to temp folder (fix #16800)
+
+Nyall Dawson 	2017-07-07
+
+    Fix minimum height of font buttons on non-Windows platforms
+
+Nyall Dawson 	2017-07-07
+
+    [processing] Use correct file filter for file output dialog
+
+Francisco Raga 	2017-07-07
+
+    Fix link to create a pull request and to git download (#4817)
+
+    * fixing link to create a pull request
+
+    * fixing link in git exe
+
+    Git for Windows 1.x is deprecated, superseded by Git for Windows 2.x.
+
+Merge: 0036f27216 df5551a2b7
+Matthias Kuhn 	2017-07-07
+
+    Merge pull request #4795 from pblottiere/dynamicform
+
+    [FEATURE] Dynamic form for joined fields
+
+Harrissou Sant-anna 	2017-07-07
+
+    Running check_spelling.sh
+
+Merge: cb6c6f39a2 3a31f54b15
+Nyall Dawson 	2017-07-07
+
+    Merge pull request #4794 from nyalldawson/tests2
+
+    Use native algorithms for processing tests where possible
+
+Nyall Dawson 	2017-07-07
+
+    Don't use broken qHash< QList<...> > on Qt < 5.6
+
+    Results in infinite recursion
+
+Matthias Kuhn 	2017-07-03
+
+    Print debug info when ctest2travis indexes run out of sync
+
+Nyall Dawson 	2017-06-29
+
+    Use native algorithms for processing tests where possible
+
+    And fix a few issues in the dissolve algorithm
+
+Merge: 52f4c5e975 515ba24230
+Nyall Dawson 	2017-07-07
+
+    Merge pull request #4812 from nyalldawson/model_exp_input
+
+    [processing] Allow model child parameters to take values from an expression
+
+Nyall Dawson 	2017-07-07
+
+    Update tests
+
+Nyall Dawson 	2017-07-04
+
+    Add all 'single value' input/output types as expression variables
+
+    Since expressions can be written which convert string values
+    to numeric, and vice versa, it doesn't make sense to restrict
+    creation of expression variables to only numeric inputs/outputs.
+    Instead create variables for all sensible inputs/outputs, since
+    users may want to use these in expressions which convert the
+    output to a number....
+
+Nyall Dawson 	2017-07-04
+
+    Add unit tests
+
+Nyall Dawson 	2017-07-04
+
+    Add descriptions for model algorithm variables
+
+Nyall Dawson 	2017-07-04
+
+    Add method for specifying variable description when adding to contexts
+
+    And use this description in expression builders when it's set.
+
+Nyall Dawson 	2017-07-04
+
+    Add function to return variables available for child algorithms during
+    model execution
+
+    And use this function to determine in advance dependencies between
+    child algorithm parameters with expression based values and
+    which other child algorithms they depend upon.
+
+Nyall Dawson 	2017-07-03
+
+    Fix setting number parameters to expressions
+
+Nyall Dawson 	2017-07-03
+
+    Create specific expression context scope for child algorithms
+
+    Contains variables for model parameters, algorithm results for
+    other child algorithms which are not dependent on the
+    algorithm.
+
+    Allows removal of final pieces of ModelerAlgorithm code
+
+Nyall Dawson 	2017-07-03
+
+    Use c++ method for available sources
+
+Nyall Dawson 	2017-07-03
+
+    Reimplement getAvailableValuesOfType in QgsProcessingModelAlgorithm
+
+Nyall Dawson 	2017-07-03
+
+    Use an expression context when evaluating child parameters with expression sources
+
+Nyall Dawson 	2017-07-03
+
+    Allow model child parameters to take values from an expression
+
+    The expression is evaluated just before the child algorithm is
+    executed, so can utilise results already calculated by other
+    children in the model through the use of expression context
+    functions
+
+Merge: 29c4fcfc16 240dd19f97
+Nyall Dawson 	2017-07-07
+
+    Merge pull request #4799 from nyalldawson/m2
+
+    Run processing algorithms using task manager
+
+Nyall Dawson 	2017-07-07
+
+    Update tests
+
+Nyall Dawson 	2017-07-07
+
+    Expand on docs
+
+Nyall Dawson 	2017-07-01
+
+    Fix deadlock when running algs in task manager and python exception occurs
+
+Nyall Dawson 	2017-07-01
+
+    Fix possible error when messagebar items are popped and events are queued
+
+Nyall Dawson 	2017-07-01
+
+    Fix processing.runAndLoadResults
+
+Nyall Dawson 	2017-07-01
+
+    When calling procesing.run(), map layer results are automatically
+    converted to QgsMapLayer objects with the ownership transferred
+    to the Python caller
+
+    This should make it super-easy for PyQGIS scripts to run processing
+    algorithms and immediately utilise the results, even if they
+    are memory layers. They call processing.run(), and get a dict of
+    results back which includes those layers ready for adding to the
+    current project or doing some other processing or operations
+    with, and if they don't transfer to ownership off then these
+    layers will be correctly garbaged collected by Python.
+
+Nyall Dawson 	2017-07-01
+
+    Make concave hull alg more efficient
+
+    - remove temporary layers from context, delete them as soon as they
+    are finished with
+    - directly remove features via data provider, instead of selecting
+    and using edit buffer
+    - use native geometry methods for splitting to single features
+    and removing rings
+
+Nyall Dawson 	2017-07-01
+
+    Add a method to take result layers (and ownership) from processing context
+
+Nyall Dawson 	2017-07-01
+
+    Port a multi-step algorithm to new API (concave hull)
+
+Nyall Dawson 	2017-07-01
+
+    Port delaunay triangulation alg to new API
+
+Nyall Dawson 	2017-07-01
+
+    Port voronoi polygons algorithm to new API
+
+Nyall Dawson 	2017-07-01
+
+    runPrepared rethrows exceptions
+
+Nyall Dawson 	2017-07-01
+
+    Port snap geometries algorithm to new API
+
+Nyall Dawson 	2017-07-01
+
+    When running algorithm tests, if two parameters share the same
+    layer source, ensure that the actual parameter values point
+    to the same layer
+
+Nyall Dawson 	2017-07-01
+
+    Add missing signal
+
+Nyall Dawson 	2017-07-01
+
+    Don't try to load default styles in processing test layers
+
+Nyall Dawson 	2017-07-01
+
+    Add equality operator for QgsProcessingFeatureSourceDefinition
+
+Nyall Dawson 	2017-07-01
+
+    Use a feature source instead of vector layer for QgsGeometrySnapper
+
+Nyall Dawson 	2017-07-01
+
+    Algorithms don't have to be split to prepare/process/postProcess
+
+    Since it's safe to evaluate parameters in background threads
+    now, it's usually going to be ok to evaluate everything in
+    the processAlgorithm step.
+
+    This keeps the algorithm code as simple as possible, and will
+    make porting faster.
+
+    Note that the prepare/postProcess virtual methods still exist
+    and can be used when an algorithm MUST do setup/cleanup work
+    in the main thread.
+
+Nyall Dawson 	2017-06-30
+
+    Fix build warning
+
+Nyall Dawson 	2017-06-30
+
+    Indentation
+
+Nyall Dawson 	2017-06-30
+
+    Keep correct order for zonal stats options, set some stats by default
+
+Nyall Dawson 	2017-06-30
+
+    Fix zonal stats algorithm execution
+
+Nyall Dawson 	2017-06-30
+
+    Fix procesing test layer loading
+
+Nyall Dawson 	2017-06-30
+
+    Better debuging from processing alg tests
+
+Nyall Dawson 	2017-06-30
+
+    Fix execution of script algorithms was not releasing layers/sinks
+
+Nyall Dawson 	2017-06-30
+
+    Fix build
+
+Nyall Dawson 	2017-06-30
+
+    Avoid QgsFeedback flooding progress report signals
+
+    We only emit the progress changed signal when there's been at
+    least a 0.1% change since the last progress report. Otherwise
+    it's possible that things like processing algorithms which
+    are reporting feedback every feature in a 500k feature dataset
+    cause a gazillion signals to be emitted and everything to
+    slow to a crawl
+
+Nyall Dawson 	2017-06-30
+
+    Don't set thinking cursors when running processing algorithms
+
+    Since now they're run in a background thread, it's not appropriate
+    anymore
+
+Nyall Dawson 	2017-06-30
+
+    Make QgsProcessingAlgRunnerTask work correctly
+
+    It now safely can execute algorithms in background threads
+    without issues
+
+Nyall Dawson 	2017-06-30
+
+    Make processing algorithms safe to run in threads
+
+Nyall Dawson 	2017-06-30
+
+    Remove unused member
+
+Nyall Dawson 	2017-06-30
+
+    Add method to take results from another processing context and
+    add to the current context
+
+    With appropriate note and tests to ensure that both the current
+    context and that which the results being taken from share the
+    same thread affinity
+
+Nyall Dawson 	2017-06-30
+
+    Add method to copy thread safe settings between processing contexts
+
+Nyall Dawson 	2017-06-30
+
+    Add methods to retrieve current thread affinity and push contexts
+    to another thread
+
+    With suitable assert in place to ensure that pushes are only
+    made when current thread == existing thread affinity
+
+Nyall Dawson 	2017-06-30
+
+    Add method to transfer all layers from one map store to another
+
+    With a note and assert that both stores must have the same
+    thread affinity
+
+Nyall Dawson 	2017-06-30
+
+    Better assert messages
+
+    Issues is actually when prepare/postProcess is called in a different
+    thread to context - it doesn't have to be the main thread
+
+Nyall Dawson 	2017-06-30
+
+    Make algorithm dialog use background tasks to execute algorithms
+
+Nyall Dawson 	2017-06-30
+
+    Fix tests
+
+Nyall Dawson 	2017-06-30
+
+    Flush sink buffers instead of deleting sink/sources in processAlgorithm
+
+    Avoids potential issues if processAlgorithm is run in a different
+    thread
+
+Nyall Dawson 	2017-06-28
+
+    Rename QgsProcessingAlgorithm::clone to ::create
+
+    Since it better describes what the function does. It returns a new
+    pristine copy of the algorithm, not a clone of its current state
+
+Nyall Dawson 	2017-06-28
+
+    Upgrade ported python algs to be thread ready
+
+Harrissou Sant-anna 	2017-07-06
+
+    revert SpatiaLite spelling
+
+Harrissou Sant-anna 	2017-07-06
+
+    Use PostGIS and PostgreSQL spelling when appropriate
+
+Harrissou Sant-anna 	2017-07-06
+
+    Use SpatiaLite right spelling when needed
+
+Harrissou Sant-anna 	2017-07-04
+
+    Replace "drop down" and some dropdown by drop-down
+
+Harrissou Sant-anna 	2017-07-04
+
+    Replace "double click" and "doubleclick" by double-click
+
+Nyall Dawson 	2017-06-27
+
+    Split algorithm execution into separate prepare/process/postProcess steps
+
+    The prepare and postProcess steps are designed to be run in main
+    thread only, while the process step can safely be run in a background
+    thread.
+
+Nyall Dawson 	2017-06-27
+
+    Add clone method to ScriptAlgorithm
+
+Nyall Dawson 	2017-06-27
+
+    Fix some processing algorithm exception handling
+
+Nyall Dawson 	2017-06-27
+
+    Add some more clone methods to algorithm subclasses
+
+Nyall Dawson 	2017-06-27
+
+    Improvements to QgsProcessingAlgRunnerTask
+
+    - take a clone of algs before running them. This avoids issues
+    if the algorithm is removed or edited while a background task
+    is running
+
+    - accept an optional existing feedback object
+
+Nyall Dawson 	2017-06-27
+
+    Fix re-saving already saved models
+
+Nyall Dawson 	2017-06-27
+
+    Add a pure virtual clone method for algorithms
+
+    This is required for safely executing the algorithm in a background
+    thread.
+
+Nyall Dawson 	2017-07-07
+
+    Replace another expresion with createFieldEqualityExpression, remove unused variables
+
+Nyall Dawson 	2017-07-07
+
+    Followup 15546d84, fix matching of null representation
+
+Merge: 603168e8fa e306cb4b09
+Nyall Dawson 	2017-07-07
+
+    Merge branch 'bugfix_relationquote' of https://github.com/pblottiere/QGIS into pblottiere-bugfix_relationquote
+
+Nyall Dawson 	2017-07-07
+
+    Update sip
+
+Merge: 536f6432a3 e2acf5369f
+Nyall Dawson 	2017-07-07
+
+    Merge pull request #4736 from nyalldawson/text_button
+
+    New gui widget QgsFontButton
+
+Blottiere Paul 	2017-07-06
+
+    Add the hint as a placeholder on text edit
+
+Blottiere Paul 	2017-07-06
+
+    Add a hint on widgets for non existent joined features
+
+Juergen E. Fischer 	2017-07-06
+
+    debian packaging: update oracle dependencies
+
+Matthias Kuhn 	2017-07-06
+
+    Protected -> Private
+
+Matthias Kuhn 	2017-07-06
+
+    Remove leftovers
+
+Matthias Kuhn 	2017-07-06
+
+    Remove unused variable
+
+Nathan Woodrow 	2017-07-06
+
+    Don't duplicate layer tree node when alt is held
+
+    Looks like it duplicates the layer but it really just copies the node
+    meaning QGIS can get confused
+
+    Duplicate on Alt will come at a later date
+
+Nyall Dawson 	2017-07-06
+
+    Add custom widget for QgsFontButton
+
+Nyall Dawson 	2017-07-06
+
+    [needs-docs] Show recently used fonts in submenu in font button
+
+Nyall Dawson 	2017-07-06
+
+    [needs-docs] Mouse wheeling over font buttons can change font size
+
+    With ctrl+mouse wheel changing in smaller size increments
+
+Nyall Dawson 	2017-07-06
+
+    Recommend that QgsFontButton is used instead of getFont
+
+Nyall Dawson 	2017-07-06
+
+    Use QgsFontButton everywhere we can
+
+Nyall Dawson 	2017-07-06
+
+    Fix size hint for font button
+
+Nyall Dawson 	2017-07-06
+
+    Add method to use QgsFontButton in cut down mode for QFont settings only
+
+    The button can now be used in two different modes. The default behavior
+    is to include all settings used for configuring
+    QgsTextFormat/QgsTextRenderer classes. A cut down mode (without settings
+    for color/buffer/drop shadow/etc) is also available when the resultant
+    font is to be used only in a QFont object.
+
+Nyall Dawson 	2017-07-06
+
+    Add methods to convert QFont to/from mime data
+
+Nyall Dawson 	2017-07-06
+
+    [needs-docs] New gui widget QgsFontButton
+
+    A standard widget for configuring text format properties for use
+    with QgsTextRenderer/QgsTextFormat.
+
+    It's modelled heavily off QgsColorButton, and supports lots of nice
+    things like dragging formats between buttons, copying and pasting
+    format settings, dropping colors from color buttons, dragging colors
+    from font buttons to color buttons, directly setting font size
+    and opacity/color without having to open a dialog.
+
+Denis Rouzaud 	2017-07-06
+
+    reason spelling
+
+Merge: f3a6df5c0d ada01d8671
+Nyall Dawson 	2017-07-06
+
+    Merge pull request #4807 from nyalldawson/layout_item_registry
+
+    Create a layout item registry for item types
+
+Denis Rouzaud 	2017-07-06
+
+    obscure spelling
+
+Denis Rouzaud 	2017-07-06
+
+    simplify custom widgets CMakeLists.txt
+
+Nyall Dawson 	2017-07-06
+
+    Use windows path format for project_path/project_folder variables on windows
+
+Blottiere Paul 	2017-07-05
+
+    Add some tests
+
+Juergen E. Fischer 	2017-07-05
+
+    Only convert geometries to provider type when provider does strict type checking
+    (ie. not for shapes; fixes #16593, #16784, #16792, #16770;
+    followup 87116abd72; forward ported from d19ed1c6)
+
+Blottiere Paul 	2017-07-05
+
+    Add a method which builds an expression to test if a field is equal to a value
+
+Denis Rouzaud 	2017-07-05
+
+    remove QgsVectorLayer::hasGeometryType in favor of QgsMapLayer::isSpatial
+
+Nathan Woodrow 	2017-07-05
+
+    [MSSQL] Fix string length when using nchar, nvarchar, ntext
+
+Merge: 1aad6894be 391f76b4fc
+Nyall Dawson 	2017-07-05
+
+    Merge pull request #4730 from Zverik/atlas_rotate
+
+    Rotate geometry before calculating bounding box in atlas
+
+Merge: 0a8f75576d fe8522f811
+rldhont 	2017-07-04
+
+    Merge pull request #4811 from rldhont/polygon-asgml-picking
+
+    [Geometry] Polygon::asGml: fix outer and add tests
+
+rldhont 	2017-07-03
+
+    [Geometry] Polygon::asGml: fix outer and add tests
+
+Merge: b5360f8dcf 502c18a338
+Nyall Dawson 	2017-07-04
+
+    Merge pull request #4787 from nyalldawson/expand_favourites
+
+    Always expand out browser favorites node on startup
+
+Nathan Woodrow 	2017-07-04
+
+    [MSSQL] Correctly set geometry type from geometry_columns table
+
+Nyall Dawson 	2017-07-04
+
+    Fix typo (coordiantes)
+
+Harrissou Sant-anna 	2017-07-04
+
+    Move back Texture width to top
+
+Nathan Woodrow 	2017-07-04
+
+    [MSSQL] Fix connection string issue for browser
+
+Harrissou Sant-anna 	2017-07-04
+
+    Fix dialog title
+
+Blottiere Paul 	2017-07-03
+
+    Do not differentiate strings from non string in conditions
+
+Blottiere Paul 	2017-07-03
+
+    More fixes about filtering safety
+
+Blottiere Paul 	2017-07-03
+
+    Add unit test
+
+Blottiere Paul 	2017-07-03
+
+    [bugfix] Fixes relation widget reference when filter value contains a quote #16399
+
+Blottiere Paul 	2017-07-03
+
+    Fields of non existent joined features are set to NULL
+
+Nathan Woodrow 	2017-07-03
+
+    Auto resize first column in info tool
+
+Merge: b57cd0deb1 bdaba00a01
+Nyall Dawson 	2017-07-03
+
+    Merge pull request #4808 from nyalldawson/model_out_layer_names
+
+    Fix incorrect layer names used when loading result layers from models
+
+Harrissou Sant-anna 	2017-07-03
+
+    [processing] align the "Iterate over layer" button (#4796)
+
+Harrissou Sant-anna 	2017-07-03
+
+    Reorganize point symbol dialogs (#4802)
+
+Nyall Dawson 	2017-07-03
+
+    Fix incorrect layer names used when loading result layers from models
+
+Harrissou Sant-anna 	2017-07-02
+
+    Ok is spelled OK
+
+Harrissou Sant-anna 	2017-07-02
+
+    ok is spelled OK
+
+Matthias Kuhn 	2017-07-03
+
+    Followup 7683cfac: add license headers
+
+Nyall Dawson 	2017-07-03
+
+    Fix build warnings
+
+Nyall Dawson 	2017-07-03
+
+    Update docs, sip
+
+Nyall Dawson 	2017-07-03
+
+    Remove useless testqgslayoutitemregistry.cpp file
+
+Nyall Dawson 	2017-07-03
+
+    Layout designers listen out for new item types in registry and
+    auto create actions for adding new items of the newly registered type
+
+    This avoids hard-coding in available item types into layout UI classes,
+    and allows designers to handle plugin-supplied item types
+
+Nyall Dawson 	2017-07-03
+
+    Emit signal when new layout item types are added to registry
+
+Nyall Dawson 	2017-07-03
+
+    Add registration of item types to QgsLayoutItemRegistry
+
+Nyall Dawson 	2017-07-03
+
+    Fix uninitialized member identified by Coverity
+
+Nyall Dawson 	2017-07-03
+
+    Fix silly logic error identified by Coverity
+
+Nyall Dawson 	2017-07-03
+
+    Fix initial dialog title
+
+Nyall Dawson 	2017-07-03
+
+    Shell layout designer dialog
+
+Merge: d924b85a0d 35cbfa0087
+Nyall Dawson 	2017-07-03
+
+    Merge pull request #4805 from DelazJ/checkbox
+
+    Spelling: Replace check box by checkbox
+
+Merge: d4f5ecc677 37cc8fc5f1
+Nyall Dawson 	2017-07-03
+
+    Merge pull request #4806 from nyalldawson/dependent_params
+
+    [modeler] Don't allow removal of model parameters on which other parameters depend
+
+Nyall Dawson 	2017-07-03
+
+    Don't allow removal of model parameters on which other parameters
+    depend
+
+Nyall Dawson 	2017-07-03
+
+    Add method to determine whether dependencies exist between model parameters
+
+Nyall Dawson 	2017-07-03
+
+    Add method to retrieve dependent parameters for a parameter
+
+Nyall Dawson 	2017-07-03
+
+    Fix ui build warning
+
+Nyall Dawson 	2017-06-29
+
+    Draw links between dependent parameters in graphical modeler
+
+    Fix #12907
+
+Nyall Dawson 	2017-06-29
+
+    Fix processing modeler joins are drawn doubled
+
+    OCD fix: joins are actually being drawn with two lines going
+    in both directions. This is totally 100% unacceptable, so
+    this commit fixes it so they are correctly drawn only with one line.
+
+Harrissou Sant-anna 	2017-07-02
+
+    Replace check box by checkbox
+
+Harrissou Sant-anna 	2017-07-01
+
+    Add catalog to spell_check
+
+Harrissou Sant-anna 	2017-06-30
+
+    Spelling check: Replace check-box by checkbox
+
+Harrissou Sant-anna 	2017-06-30
+
+    Spelling check: Replace analyse by analyze
+
+Harrissou Sant-anna 	2017-06-30
+
+    Replace catalogue by catalog
+
+Blottiere Paul 	2017-07-02
+
+    Update tooltip
+
+Blottiere Paul 	2017-07-02
+
+    Replace QString by QStringLiteral
+
+Blottiere Paul 	2017-07-02
+
+    Q_FOREACH use to iterate over joins info
+
+Blottiere Paul 	2017-07-02
+
+    Add consistency between ptrs and ref
+
+Harrissou Sant-anna 	2017-07-02
+
+    Fix labels
+
+Harrissou Sant-anna 	2017-07-02
+
+    Reorganize Polygon symbol dialogs
+
+    Group parameters that look alike for a better sequence
+
+Even Rouault 	2017-07-02
+
+    [WFS provider] Do not be confuse by elements that have ref attribute when parsing DescribeFeatureType response; and fix support of (deprecated) ref='gml:XXXXProperty' attributes
+
+Denis Rouzaud 	2017-06-30
+
+    add missing custom widgets
+
+Blottiere Paul 	2017-06-30
+
+    Add unit tests
+
+Merge: 6dfcf40227 cd979d8ab0
+Nyall Dawson 	2017-06-30
+
+    Merge pull request #4779 from nyalldawson/page_registry
+
+    [layout] Create a page size registry for layout
+
+Juergen E. Fischer 	2017-06-30
+
+    fix 20197c2fa (refs #13520)
+
+Blottiere Paul 	2017-06-30
+
+    Safer filtering step thanks to QgsExpression
+
+Blottiere Paul 	2017-06-30
+
+    Q_FOREACH use to iterate over fields
+
+Nyall Dawson 	2017-06-30
+
+    Add some base classes for layouts
+
+Nyall Dawson 	2017-06-29
+
+    [layout] Create a page size registry for layout
+
+    Adds a new QgsPageSize class and QgsPageSizeRegistry registry
+    (attached to QgsApplication), which stores and manages known
+    page sizes
+
+Blottiere Paul 	2017-06-30
+
+    Joined fields are updated according to the target field name in form
+
+Blottiere Paul 	2017-06-30
+
+    [needs-doc] New option to update joined fields in form
+
+Merge: bc4aae7d1f 77588b9b61
+Nyall Dawson 	2017-06-30
+
+    Merge pull request #4798 from nyalldawson/intput_list
+
+    Convert model child algorithm parameter sources to a list
+
+Nyall Dawson 	2017-06-30
+
+    Convert model child algorithm parameter sources to a list
+
+    So that multiple input type parameters are correctly handled,
+    allowing models with child algorithms like merge to correctly
+    use any combination of static layers/model inputs/child outputs
+    as their input parameter
+
+Nyall Dawson 	2017-06-30
+
+    Add conversion for QMap< QString, QList< TYPE > > for Python bindings
+
+Harrissou Sant-anna 	2017-06-30
+
+    Tweaks on symbol layer dialogs (#3945)
+
+    * Vertical center alignment for "Offset" label with its corresponding comboboxes
+    * Vertical center alignment for "Anchor point" label with its comboboxes + consistency in the order of options
+    * Remove unnecessary horizontal layouts (with single widget) in the dialog
+    * Fix tab order
+
+Nyall Dawson 	2017-06-30
+
+    Fix deletion of QObject from non main thread
+
+Nyall Dawson 	2017-06-30
+
+    Fix a memory leak
+
+Merge: 7b1932a3fb bf3d55c9e5
+Nyall Dawson 	2017-06-30
+
+    Merge pull request #4797 from nyalldawson/flush_sink
+
+    Move flushBuffer method up to QgsFeatureSink
+
+Nyall Dawson 	2017-06-30
+
+    Move flushBuffer method up to QgsFeatureSink
+
+    Allows calling flushBuffer on QgsFeatureSink objects, ensuring
+    that any internal buffer the sink may have is flushed
+
+Radim Blazek 	2017-06-29
+
+    Do not delete vector layer in QgsVectorLayerExporterTask thread
+
+Radim Blazek 	2017-06-29
+
+    refresh postgres schema in browser after import
+
+Even Rouault 	2017-06-29
+
+    [GDAL provider] Disable workaround added in 32dd2b68cdf41b088f40dbd3ca5096c9609383bd that is no longer necessary with GDAL 2.3dev
+
+Denis Rouzaud 	2017-06-29
+
+    remove useless script
+
+nirvn 	2017-06-29
+
+    [processing] keep only one zonal statistics algorithm
+
+nirvn 	2017-06-29
+
+    [zonal statistics] add variance statistic
+
+Merge: a39d6d9530 468e44dc3a
+Nyall Dawson 	2017-06-29
+
+    Merge pull request #4791 from nyalldawson/reproj_test
+
+    Use native projection algorithm for unit test
+
+Merge: 891481deb1 d797a9b3cf
+Nyall Dawson 	2017-06-29
+
+    Merge pull request #4790 from nyalldawson/proc_layer_param
+
+    Some minor processing fixes and improvements
+
+Nyall Dawson 	2017-06-29
+
+    Use native projection algorithm for unit test
+
+Nyall Dawson 	2017-06-27
+
+    Fix some processing algorithm exception handling
+
+Nyall Dawson 	2017-06-28
+
+    Use a QgsFeedback instead of QProgressBar for QgsNineCellFilter
+
+    Gives progress reports and allows cancelation of processing
+    aspect algorithm
+
+Nyall Dawson 	2017-06-28
+
+    Fix use of direct map layers as inputs for source parameters
+
+Denis Rouzaud 	2017-06-28
+
+    remove static tests (doc, sip coverage) from main build
+
+    finally!
+
+Denis Rouzaud 	2017-06-28
+
+    add test to check that header has a corresponding sip file
+
+Merge: ebcc3d8599 d1a93e0e13
+Nyall Dawson 	2017-06-28
+
+    Merge pull request #4786 from nyalldawson/algs4
+
+    Restore points layer from table algorithm
+
+Denis Rouzaud 	2017-06-28
+
+    fix doxygen warning
+
+Denis Rouzaud 	2017-06-26
+
+    script to write include SIP files
+
+Denis Rouzaud 	2017-06-28
+
+    fix indentation
+
+Nyall Dawson 	2017-06-28
+
+    Restore points layer from table algorithm
+
+Nyall Dawson 	2017-06-28
+
+    Always expand out browser favorites node on startup
+
+    It's the user-set favorites, so they should be accessible
+    as quickly as possible!
+
+Merge: 9f5e33af72 b354986209
+Hugo Mercier 	2017-06-28
+
+    Merge pull request #4776 from pblottiere/bugfix_attributetable
+
+    [bugfix] attribute table
+
+Merge: 0f83a5f52d 8791aacd74
+Nyall Dawson 	2017-06-28
+
+    Merge pull request #4767 from nyalldawson/layouts3
+
+    [layouts] Add layout measurement and size classes
+
+Juergen E. Fischer 	2017-06-27
+
+    fix windows build
+
+Nyall Dawson 	2017-06-27
+
+    Fix crash when no options are selected in a multiple-enum parameter
+
+Mathieu Pellerin 	2017-06-27
+
+    [processing] restore zonal statistics (qgis) alg (#4784)
+
+Denis Rouzaud 	2017-06-27
+
+    fix qt version in comment
+
+Juergen E. Fischer 	2017-06-27
+
+    spelling fixes
+
+Juergen E. Fischer 	2017-06-27
+
+    update INSTALL
+
+    Followup 775e8cd59, 8bfb695be, 23ddace9e and e70f74198
+
+Merge: 1468eef635 4f096a6f8b
+Nyall Dawson 	2017-06-27
+
+    Merge pull request #4783 from nyalldawson/script
+
+    processing: restore script algorithm provider and tests
+
+Nyall Dawson 	2017-06-27
+
+    Feature source parameters cannot be used for vector layer algorithm
+    parameters in models
+
+    There's not a 1:1 correlation here - vector layers can be used
+    as inputs for sources, but sources cannot be used when a
+    full vector layer is required.
+
+Nyall Dawson 	2017-06-27
+
+    Restore script based algorithm tests
+
+Nyall Dawson 	2017-06-27
+
+    Restore select by expression algorithm
+
+Nyall Dawson 	2017-06-27
+
+    Update processing.run() for new API
+
+Nyall Dawson 	2017-06-27
+
+    Also add results to results dock when running through algorithm dialog
+
+Nyall Dawson 	2017-06-27
+
+    Fix use of temporary files for outputs
+
+Nyall Dawson 	2017-06-27
+
+    Fix generation of temporary processing filenames
+
+Nyall Dawson 	2017-06-27
+
+    Resurrect select by attribute algorithm
+
+Nyall Dawson 	2017-06-27
+
+    Don't set override cursor in processing.run
+
+    Callers may not want this, so leave it up to them to set
+    an override caller if desired
+
+Nyall Dawson 	2017-06-27
+
+    Explicit parameters, feedback, context arguments for processing.run
+
+Nyall Dawson 	2017-06-27
+
+    processing.run requires a dictionary for parameters
+
+Nyall Dawson 	2017-06-27
+
+    Fix script algorithm centroids tests
+
+Nyall Dawson 	2017-06-27
+
+    Restore save selected features algorithm
+
+Nyall Dawson 	2017-06-27
+
+    Restore script algorithm provider
+
+Nyall Dawson 	2017-06-27
+
+    Remove manually set tab bar height in algorithm dialog
+
+    Breaks dialog layout on hidpi screens
+
+Merge: 775e8cd596 11f42eb432
+Nyall Dawson 	2017-06-27
+
+    Merge pull request #4781 from nyalldawson/centroid_tests
+
+    Reenable centroid algorithm tests
+
+Nyall Dawson 	2017-06-27
+
+    Add missing python dependencies to Fedora install section
+
+Nyall Dawson 	2017-06-27
+
+    Reenable centroid algorithm tests
+
+Merge: 8bfb695be3 7a6a6ff9f8
+Nyall Dawson 	2017-06-27
+
+    Merge pull request #4780 from nyalldawson/more_processing
+
+    [processing] Finish modeler port, start script algorithms porting
+
+Nyall Dawson 	2017-06-27
+
+    Add instructions to INSTALL for enabling debug output on Fedora
+
+    By default Fedora hides the useful debug output prints, which
+    makes debugging unit tests very hard!
+
+Nyall Dawson 	2017-06-27
+
+    Fix test on Qt5.6
+
+Nyall Dawson 	2017-06-26
+
+    Restore frequency analysis script
+
+    This script has been changed to use a sink output, not the previous
+    TableWriter csv output.
+
+    All algorithms which output flat tables should now still output
+    feature sinks, to allow correct use in later model steps.
+
+Nyall Dawson 	2017-06-26
+
+    Correct parameter evaluation for multiple field types
+
+Nyall Dawson 	2017-06-26
+
+    Reorder arguments in parameterAsSink to avoid requiring wkb type and crs
+
+Nyall Dawson 	2017-06-26
+
+    Allow storing multiple status in field script code
+
+Nyall Dawson 	2017-06-26
+
+    Fix auto creation of variables when running script algorithms
+
+Nyall Dawson 	2017-06-26
+
+    Fix incorrect layer source from widget wrapper
+
+Nyall Dawson 	2017-06-26
+
+    Fix setting number inputs to algorithms in modeler
+
+Nyall Dawson 	2017-06-26
+
+    Restore keep n biggest parts script
+
+Nyall Dawson 	2017-06-26
+
+    Restore ability to run script algorithms
+
+Nyall Dawson 	2017-06-26
+
+    Start restoring creation of outputs from string
+
+Nyall Dawson 	2017-06-26
+
+    First steps in resurrecting script algorithms
+
+Nyall Dawson 	2017-06-26
+
+    Mark QgsProcessingModelAlgorithm as non-stable API
+
+    We want to be able to extend this in future without any
+    stable API contract.
+
+Nyall Dawson 	2017-06-26
+
+    Port exporting model as python code to c++
+
+Nyall Dawson 	2017-06-24
+
+    Port conversion to/from script code to c++
+
+Nyall Dawson 	2017-06-23
+
+    Port parameter conversion to script code to c++
+
+Nyall Dawson 	2017-06-27
+
+    Remove newlines from Fedora dependencies list in install
+
+    Prevents copy-pasting dependencies line to terminal in one shot
+
+Nyall 	2017-06-27
+
+    Add some missing build dependencies for Fedora to install
+
+Merge: 32dd2b68cd b64f256e84
+Nyall Dawson 	2017-06-27
+
+    Merge pull request #4727 from aaime/stroke_hairline
+
+    Fixes 16707, export of hairline results in a different visual thickness
+
+Even Rouault 	2017-06-26
+
+    "[GDAL provider] Set VRT_SHARED_SOURCE=NO configuration option by default (#16507)
+
+    This will avoid crashes with VRT datasets in multi-threaded use.
+
+Ilya Zverev 	2017-06-21
+
+    Update SIP file for QgsRectangle
+
+Ilya Zverev 	2017-06-17
+
+    Rectangle moving operators
+
+Merge: b7d524c111 f22ee6bee5
+Nyall Dawson 	2017-06-26
+
+    Merge pull request #4733 from aaime/categorized_function_conflict
+
+    Fixes 16712, SLD export of categorized style fails if attribute name conflicts with a built-in function name
+
+Denis Rouzaud 	2017-06-26
+
+    sipify server
+
+Martin Dobias 	2017-06-26
+
+    Mark the new delegate class as private
+
+Merge: 81653d6978 fd8158bca0
+Matthias Kuhn 	2017-06-26
+
+    Merge pull request #4771 from m-kuhn/closest_point
+
+    Closest point
+
+Martin Dobias 	2017-06-26
+
+    Data-defined size legend: configurable labels + few fixes
+
+    This may break projects that started to use data-defined size legend with manually defined rules.
+
+Merge: 1730bc95d1 e7ea972c64
+mhugent 	2017-06-26
+
+    Merge pull request #4772 from mhugent/feature_info_filter_geometry
+
+    WMS Server: Feature info with geometry filter
+
+Matthias Kuhn 	2017-06-26
+
+    Minimal performance improvement
+
+Matthias Kuhn 	2017-06-26
+
+    Update docstrings
+
+Matthias Kuhn 	2017-06-26
+
+    Make QgsLineString Z and M values NaN if unspecified
+
+Matthias Kuhn 	2017-06-25
+
+    Prevent division by 0 and unrequired interpolation
+
+Matthias Kuhn 	2017-06-23
+
+    Add tests for QgsGeometryUtils::closestPoint()
+
+Matthias Kuhn 	2017-06-23
+
+    More generic closest point on line interpolation
+
+Matthias Kuhn 	2017-06-23
+
+    Improve API docstrings
+
+nirvn 	2017-06-26
+
+    [processing] include invalid geometries in check validity alg
+
+Mathieu Pellerin 	2017-06-26
+
+    [processing] restore import into spatialite & spatialite execute sql
+
+Merge: b88ad8e1ce 2b7b0db747
+Nyall Dawson 	2017-06-26
+
+    Merge pull request #4775 from nyalldawson/named
+
+    Allow keyword arguments for all arguments in PyQGIS bindings
+
+Nyall Dawson 	2017-06-26
+
+    Port Fix Geometry algorithm to new API
+
+Nyall Dawson 	2017-06-26
+
+    Add method to retrieve all features from a QgsProcessingFeatureSource
+
+    ...even when invalid geometries are present and option is set to
+    skip invalid or break on invalid.
+
+    Some algorithms (e.g. those which repair geometries) need a way
+    to retrieve all features with invalid geometries, regardless of
+    the user's settings.
+
+Nyall Dawson 	2017-06-26
+
+    Export QgsProcessingFeatureSource to Python
+
+Nyall Dawson 	2017-06-26
+
+    Followup 005d0fa, fix build
+
+Nyall Dawson 	2017-06-26
+
+    Followup 7ae1ee9, update name
+
+Nyall Dawson 	2017-06-26
+
+    Update sip
+
+Nyall Dawson 	2017-06-26
+
+    Followup 1c1e771, fix crash
+
+Nyall Dawson 	2017-06-26
+
+    Astyle all
+
+Nyall Dawson 	2017-06-26
+
+    Add sourceName() method to QgsFeatureSource
+
+    Sometimes it's necessary to retrieve the name of a source...
+
+Nathan Woodrow 	2017-06-26
+
+    Add script to run local tests using travis blacklist
+
+Nyall Dawson 	2017-06-26
+
+    Modernise some code
+
+Nyall Dawson 	2017-06-26
+
+    Add missing docs
+
+Nathan Woodrow 	2017-06-26
+
+    Update python requirements
+
+Juergen E. Fischer 	2017-06-26
+
+    avoid forward declaration of QgsDataDefinedSizeLegend (fixes windows build)
+
+Blottiere Paul 	2017-06-25
+
+    Add unit test
+
+Blottiere Paul 	2017-06-25
+
+    [bugfix] Attribute table model not updated after opening a project with joins
+
+Blottiere Paul 	2017-06-25
+
+    Add unit test
+
+Nathan Woodrow 	2017-06-25
+
+    Update gitignore
+
+Nyall Dawson 	2017-06-25
+
+    Allow keyword arguments for all arguments in PyQGIS bindings
+
+    Previously this was only enabled for optional arguments (i.e.
+    those with default values). Enabling them for all arguments
+    allows for more readable PyQGIS code, and there seems no
+    downside given that we already have this support partly enabled.
+
+    The consequence of this change is that when 3.0 API is frozen
+    the freeze must also include the naming of function arguments,
+    since that's effectively now part of public API.
+
+Blottiere Paul 	2017-06-23
+
+    [bugfix] Attribute table model not updated when a feature is changed
+
+Merge: e8ddc48d81 7a154061bc
+Nyall Dawson 	2017-06-25
+
+    Merge pull request #4773 from DelazJ/typo
+
+    Typo fix
+
+Etienne Trimaille 	2017-06-24
+
+    review of the raster metadata viewer (#4726)
+
+Harrissou Sant-anna 	2017-06-24
+
+    Typo fix
+
+Marco Hugentobler 	2017-06-24
+
+    Indentation
+
+Marco Hugentobler 	2017-06-24
+
+    Unit test for feature info geometry filter
+
+Marco Hugentobler 	2017-06-24
+
+    Use unique_ptr
+
+Nyall Dawson 	2017-06-24
+
+    Remove misleading icon from vector split algorithm
+
+    The algorithm doesn't split geometries - it seperates features
+    into different layers without altering the geometry
+
+Nyall Dawson 	2017-06-24
+
+    Rename 'delete column' alg to 'Drop field(s)' (for consistency)
+
+Nyall Dawson 	2017-06-24
+
+    Fix error when deleting models
+
+Nyall Dawson 	2017-06-24
+
+    Load other providers before model provider
+
+Nyall Dawson 	2017-06-24
+
+    Refresh model algorithms when providers are added
+
+    Since algorithms which models are dependent upon may now be
+    available, we need to rebuild them to ensure that they
+    will operate correctly.
+
+Nyall Dawson 	2017-06-24
+
+    More .model -> .model3 updates
+
+Nyall Dawson 	2017-06-24
+
+    Make QgsAlgorithm::setProvider() public
+
+    Turns out there's valid use cases for calling this from outside
+    code.
+
+Nyall Dawson 	2017-06-24
+
+    Use generic algorithm icon for qgis algorithms which do not
+    have specific icons, instead of generic qgis icon
+
+    We consider these 'top level' algorithms, and using the
+    standard algorithm icon should help reflect this and
+    differentiate them from 3rd party algorithms.
+
+Nyall Dawson 	2017-06-24
+
+    Move groups from QGIS (and QGIS native) provider to top level items
+    in processing toolbox
+
+    Helps aid in user discoverability of these algorithms, and
+    indicates to users that these should generally be the
+    preferred algorithm choices if duplicates exist from other
+    providers.
+
+Merge: b7e66b4f72 d667bf595f
+Nyall Dawson 	2017-06-24
+
+    Merge pull request #4770 from nyalldawson/proc
+
+    More processing model porting, better invalid geometry feedback
+
+Nyall Dawson 	2017-06-24
+
+    Move iterator exception handling to c++
+
+Nyall Dawson 	2017-06-23
+
+    Port another member to c++
+
+Nyall Dawson 	2017-06-23
+
+    Fix copy/paste error
+
+Nyall Dawson 	2017-06-23
+
+    Fix (unwanted) python exception in algorithm test
+
+Nyall Dawson 	2017-06-23
+
+    Remove another member from ModelerAlgorithm
+
+Nyall Dawson 	2017-06-23
+
+    Move more modelling code to c++
+
+Nyall Dawson 	2017-06-23
+
+    Port model help code to c++
+
+Nyall Dawson 	2017-06-23
+
+    Fix errors when edit model help
+
+Alessandro Pasotti 	2017-06-23
+
+    Added note missing in python bindings
+
+Alessandro Pasotti 	2017-06-23
+
+    Added ctor documentation
+
+Alessandro Pasotti 	2017-06-23
+
+    Removed helper functions from moc headers
+
+Alessandro Pasotti 	2017-06-23
+
+    Indentation
+
+Alessandro Pasotti 	2017-06-23
+
+    Move all app/ogr and datasource manager dialog to GUI
+
+Nyall Dawson 	2017-06-23
+
+    [layout] Add layout measurement and size classes
+
+    These classes are used for storing measurements for a layout
+    (QgsLayoutMeasurement), sizes for a layout (QgsLayoutSize)
+    and points in a layout (QgsLayoutPoint)
+
+    They support storing a measurement unit alongside a measurement
+    length/size. A new class QgsLayoutMeasurementConverter handles
+    conversion between different units, including converting to and
+    from pixels via a specified DPI property.
+
+Mathieu Pellerin 	2017-06-23
+
+    [processing] restore simplify geometries & smooth algorithms (#4766)
+
+Nathan Woodrow 	2017-06-23
+
+    [MSSQL] Don't MakeValid on geometries
+
+    MakeValid can make geometry data we can't read back (e.g
+    GEOMETRYCOLLECTION) which is worse then
+    just a user error in the first place.  QGIS has the tools to deal with
+    this so let it came back to the user to fix
+
+Nyall Dawson 	2017-06-23
+
+    Use FastInsert when adding features from processing
+
+Nyall Dawson 	2017-06-23
+
+    Fix processing algs crash when no source features exist
+
+    Instead we output an empty layer - this may be critical for
+    multi-step models where there is validly no features present
+    in a source layer
+
+Nyall Dawson 	2017-06-23
+
+    Fix loss of output names in graphical modeler
+
+Merge: 2906d1f1c9 c3e24b76b5
+Nyall Dawson 	2017-06-23
+
+    Merge pull request #4764 from nyalldawson/processing_exception
+
+    Throw c++ exception when a Python exception occurs while running a algorithm
+
+Nyall Dawson 	2017-06-23
+
+    Fix some processing tests where output is not generated or should
+    not be compared
+
+Nyall Dawson 	2017-06-23
+
+    Also call invalidGeometryCallback when skipping features
+
+Nyall Dawson 	2017-06-23
+
+    Add test that python exception is caught when executing an alg
+
+Nyall Dawson 	2017-06-23
+
+    Add SIP_VIRTUALERRORHANDLER to Doxyfile.in
+
+Nyall Dawson 	2017-06-23
+
+    Consolidate all QgsException subclasses in the same header
+
+Nyall Dawson 	2017-06-23
+
+    Transform errors encountered while iterating features in
+    processing are non-fatal. We report them to users, and treat the
+    feature as having no geometry, but don't stop execution.
+
+Nyall Dawson 	2017-06-23
+
+    Move invalid geometry callback from Python to c++
+
+Nyall Dawson 	2017-06-23
+
+    Report errors when executing algs within dialogs
+
+Nyall Dawson 	2017-06-23
+
+    Report success or failure after running algs
+
+    And auto catch python exceptions and report failure of model
+
+Nyall Dawson 	2017-06-22
+
+    Throw QgsProcessingException when a python exception occurs while running an alg
+
+Nyall Dawson 	2017-06-22
+
+    [sipify] Add support for specifying VirtualErrorHandlers to use for a function
+
+Nyall Dawson 	2017-06-22
+
+    Add support for VirtualErrorHandlers in core sip
+
+    Unfortunately requires a bunch of code to be duplicated from
+    QgsPythonUtilsImpl::getTraceback() into core.sip, but there's no way
+    to avoid this
+
+Nyall Dawson 	2017-06-22
+
+    Add a QgsProcessingException exception
+
+Merge: 7ed6c90f51 531e1a3282
+Nyall Dawson 	2017-06-23
+
+    Merge pull request #4763 from nyalldawson/algs3
+
+    Restore more processing algs
+
+Nathan Woodrow 	2017-06-23
+
+    Code format
+
+Nathan Woodrow 	2017-06-23
+
+    [MSSQL] Better fix to removing MZ. Thanks to Nyall ;)
+
+Nathan Woodrow 	2017-06-19
+
+    [MSSQL] Remove Z/M from WKT type name on insert/update
+
+    SQL Server doesn't follow OGC standard of LINESTRINGZ so we have
+    to remove it. SQL support LINESTRING(x y z) but not LINESTRINGZ(x y z)
+
+Merge: e40f92cc1b ee043956b9
+Nyall Dawson 	2017-06-23
+
+    Merge pull request #4734 from nyalldawson/addfeatures
+
+    Add a flag argument to QgsFeatureSink::addFeatures, support fast feature insert
+
+Denis Rouzaud 	2017-06-22
+
+    sipify analysis interpolation (#4757)
+
+Radim Blazek 	2017-06-22
+
+    highlight fix
+
+Marco Hugentobler 	2017-04-02
+
+    [FEATURE]: Select features in feature info intersecting a geometry
+
+Radim Blazek 	2017-06-22
+
+    nearest point measure in identify tool
+
+Merge: df07772a56 863b7d2b29
+Martin Dobias 	2017-06-22
+
+    [FEATURE] Legend for markers with data-defined size
+
+    (Merge pull request #4752 from wonder-sk/legend-data-defined-size)
+
+Martin Dobias 	2017-06-22
+
+    Fix the last test image
+
+Martin Dobias 	2017-06-22
+
+    Fix few bugs + fix test images + allow data-defined size without transformer
+
+Martin Dobias 	2017-06-22
+
+    Use white bg color for test images to avoid black background
+
+Martin Dobias 	2017-06-22
+
+    Fix writing of legend symbol to project file
+
+Martin Dobias 	2017-06-22
+
+    Fix subclassing of QgsDiagramRenderer in Python
+
+Nyall Dawson 	2017-06-22
+
+    Update tests
+
+Nyall Dawson 	2017-06-22
+
+    Restore random extract + Random Extract within subsets algs
+
+Nyall Dawson 	2017-06-22
+
+    Restore vector split algorithm
+
+Nyall Dawson 	2017-06-22
+
+    Fix creation of feature sinks when using windows style paths
+
+Nyall Dawson 	2017-06-22
+
+    Fix dest selection panel when used in folder mode
+
+    Also fix some UX issues with the panel in folder, such as
+    correctly remembering/restoring last used folders, defaulting
+    to home dir, don't clear value when canceling while browsing
+
+Nyall Dawson 	2017-06-22
+
+    Add folder output type
+
+Nyall Dawson 	2017-06-22
+
+    Restore symmetrical difference alg
+
+Nyall Dawson 	2017-06-22
+
+    Restore regular points alg
+
+Nyall Dawson 	2017-06-22
+
+    Restore Postgis Execute SQL alg
+
+Nyall Dawson 	2017-06-22
+
+    Restore import into postgis algorithm
+
+Nyall Dawson 	2017-06-22
+
+    Upgrade postgis widget wrappers to new API
+
+Nyall Dawson 	2017-06-22
+
+    Fix creation of widget wrappers via metadata parameters
+
+Nyall Dawson 	2017-06-22
+
+    Make QgsVectorLayerExporter::flushBuffer public
+
+    Sometimes it's necessary to manually call this, instead of
+    deleting the exporter and letting it be called automatically
+    There's a chance that features in the buffer will cause errors
+    while being exported, and if the only way to flush the buffer
+    is to delete the exporter then there's no way to detect or
+    retrieve these errors.
+
+Nyall Dawson 	2017-06-22
+
+    Allow storing arbitrary metadata in parameter definitions
+
+Nyall Dawson 	2017-06-22
+
+    Make 'merge' algorithm store the original layer name and source
+
+Nyall Dawson 	2017-06-22
+
+    Cleanup alg imports
+
+Nyall Dawson 	2017-06-22
+
+    Remove deprecated algorithms
+
+    Removed:
+    - Basic Stats for Numbers/String algs (replaced by generic
+    Basic Stats alg)
+    - Split Lines with Lines (replaced by generic Split with lines)
+    - Vector Grid Lines/Polygons (replaced by other create grid
+    algs)
+
+Nyall Dawson 	2017-06-22
+
+    Remove python algs where a native alg exists
+
+    Removed python algs are:
+    - Centroids
+    - Clip
+    - Dissolve
+    - Extract by attribute
+    - Extract by expression
+    - Multipart to singlepart
+    - Polygon centroids
+    - Reproject layer
+
+Nyall Dawson 	2017-06-22
+
+    Resurrect a processing test
+
+Martin Dobias 	2017-06-22
+
+    Fixing tests
+
+Nyall Dawson 	2017-06-22
+
+    Fix error when adding parameter
+
+Merge: b01cae0740 0db4cf37fe
+Nyall Dawson 	2017-06-22
+
+    Merge pull request #4762 from nyalldawson/processing_model_c++
+
+    Resurrect ability to run processing models
+
+Nyall Dawson 	2017-06-22
+
+    Add another test
+
+Nyall Dawson 	2017-06-22
+
+    Fix build
+
+Nyall Dawson 	2017-06-22
+
+    Sipify
+
+Nyall Dawson 	2017-06-22
+
+    Expand model unit test coverage
+
+Nyall Dawson 	2017-06-21
+
+    Don't create unused optional outputs when running models
+
+Nyall Dawson 	2017-06-21
+
+    Add method to generate temporary destination parameter value
+
+Nyall Dawson 	2017-06-21
+
+    Move some temp file/folder utils to c++
+
+Nyall Dawson 	2017-06-21
+
+    Move default file extension code to c++
+
+Nyall Dawson 	2017-06-21
+
+    Destination parameters track whether they support non-file based outputs
+
+Nyall Dawson 	2017-06-21
+
+    Steps towards executing models
+
+Nyall Dawson 	2017-06-20
+
+    Start on executing models
+
+Nyall Dawson 	2017-06-20
+
+    Fix generation of outputs for models
+
+Nyall Dawson 	2017-06-20
+
+    Fix generation of destination parameters for models
+
+Nyall Dawson 	2017-06-20
+
+    Fix some errors in graphical modeler
+
+Merge: 57bf9daaac a65e171298
+Nyall Dawson 	2017-06-22
+
+    Merge pull request #4761 from nyalldawson/algs2
+
+    Port more processing algs to new API
+
+Nyall Dawson 	2017-06-22
+
+    Fix test
+
+Nyall Dawson 	2017-06-22
+
+    Reduce noise in algorithm tests
+
+Sandro Santilli 	2017-06-13
+
+    Document semantic of SegmentationToleranceType
+
+    .. and default of QgsCircularString::curveToLine
+
+    [ci skip]
+
+Radim Blazek 	2017-06-21
+
+    param description fix
+
+Radim Blazek 	2017-06-21
+
+    support copy vector layer to browser postgres/spatialite by drag and drop
+
+Radim Blazek 	2017-06-21
+
+    force copy action when dragging layer to browser
+
+Martin Dobias 	2017-06-21
+
+    Back to unique_ptr
+
+Martin Dobias 	2017-06-21
+
+    Use bold font in tests + fix a unit test
+
+Martin Dobias 	2017-06-21
+
+    Use panel widget for data-defined size legend
+
+Nyall Dawson 	2017-06-21
+
+    Port create attribute index alg to new api
+
+Even Rouault 	2017-06-21
+
+    [DBManager] Avoid unhandled exception on a untyped geometry (wkbUnknown) layer (#16730)
+
+Nyall Dawson 	2017-06-21
+
+    Add missing tests for vector input parameter, add vector out parameter
+
+Nyall Dawson 	2017-06-21
+
+    Rename some parameter classes for consistency
+
+Nyall Dawson 	2017-06-21
+
+    Native extract by expression and attribute algs
+
+Nyall Dawson 	2017-06-21
+
+    Resurrect some processing algs, port multipart to singlepart to c++
+
+Denis Rouzaud 	2017-06-21
+
+    sipify analysis raster
+
+Denis Rouzaud 	2017-06-21
+
+    sipify analysis vector
+
+Martin Dobias 	2017-06-20
+
+    More build fixes
+
+Martin Dobias 	2017-06-20
+
+    Fix build problems
+
+Denis Rouzaud 	2017-06-20
+
+    fix tests
+
+Denis Rouzaud 	2017-06-20
+
+    sipify core composer part 4
+
+Denis Rouzaud 	2017-06-20
+
+    sipify core composer part 3
+
+Denis Rouzaud 	2017-06-20
+
+    sipify core composer part 2
+
+Denis Rouzaud 	2017-06-20
+
+    sipify core composer part 1*
+
+Merge: 66fb8d0afc 6eab2ee133
+Alessandro Pasotti 	2017-06-20
+
+    Merge pull request #4716 from DelazJ/addlayer
+
+    Reorganize the Datasource Manager tabs
+
+Denis Rouzaud 	2017-06-20
+
+    Revert "Removed ui_qgstablewidgetbase.h"
+
+    This reverts commit d9d68724344c164dcec29e8cbe80ae4873fc988d.
+
+Merge: 8b98db0787 d3a2f7cd65
+Nyall Dawson 	2017-06-20
+
+    Merge pull request #4729 from nyalldawson/processing_model_c++
+
+    Porting processing model algorithm to C++, pt 1
+
+Martin Dobias 	2017-06-20
+
+    Manual configuration of classes in legend with data-defined sizes
+
+Nyall Dawson 	2017-06-20
+
+    Models can now be saved and restored
+
+Nyall Dawson 	2017-06-20
+
+    Add methods to convert parameter definitions to/from variants
+
+Nyall Dawson 	2017-06-20
+
+    First steps to model/save restore in c++
+
+    Models now save to QVariantMap, using QgsXmlUtils to save to
+    an xml based format (with extension .model3)
+
+Merge: 7fff6cf029 28c9fee756
+Alessandro Pasotti 	2017-06-20
+
+    Merge pull request #4742 from boundlessgeo/browsertree-collapse-wms
+
+    Browsertree collapse network provider items
+
+Nyall Dawson 	2017-06-20
+
+    Port more model to c++
+
+Nyall Dawson 	2017-06-15
+
+    Indentation
+
+Nyall Dawson 	2017-06-15
+
+    Port more model API across to c++
+
+Nyall Dawson 	2017-06-13
+
+    Begin port of modeler algorithm to c++
+
+Nyall Dawson 	2017-06-13
+
+    Work on resurrecting modeler
+
+Nyall Dawson 	2017-06-13
+
+    Fix working with inputs in modeler
+
+Nyall Dawson 	2017-06-13
+
+    Small cleanups
+
+Mathieu Pellerin 	2017-06-20
+
+    [atlas] move file format for image export to atlas widget
+
+    Two big wins:
+    - remember file format across sessions (no more accidental
+    .bmp atlas export!)
+    - use native directory picker
+
+Merge: b3da171040 fbd1d00f42
+Nyall Dawson 	2017-06-20
+
+    Merge pull request #4732 from nyalldawson/alg
+
+    [FEATURE] Subdivide algorithm for geometries
+
+Nyall Dawson 	2017-06-20
+
+    Swap remaining QSharedPointer uses to std::shared_ptr
+
+Martin Dobias 	2017-06-19
+
+    Added unit tests
+
+Martin Dobias 	2017-06-19
+
+    Read/write also legend symbol in DDS legend, update DDS legend dialog
+
+Martin Dobias 	2017-06-19
+
+    GUI for configuration of size-based legend for diagrams
+
+nirvn 	2017-06-19
+
+    [ui] harmonize QDialogButtonBox position in provider dialogs
+
+    This commit insures that the QDialogButtonBox widget (i.e.
+    help, add, build query, set filter) is always located at
+    the very bottom of the dialog. It helps make a better UX out
+    of the unified add layer dialog.
+
+Merge: cef089a83a b42bf82081
+Sandro Mani 	2017-06-19
+
+    Merge pull request #4740 from manisandro/afsshareddata
+
+    [ArcGIS REST] Introduce QgsAfsSharedData to remove dependency on QgsAfsProvider by QfsAfsFeatureSource
+
+nirvn 	2017-06-19
+
+    [ui] vectorize and align metadata section icon
+
+Nathan Woodrow 	2017-06-19
+
+    [MSSQL] Correctly raise errors to UI level
+
+Merge: 89aae4d6c9 b49f53bac8
+Alexander Bruy 	2017-06-19
+
+    Merge pull request #4743 from PedroVenancio/master
+
+    [processing] change resampling methods to be like SAGA default (fix #16646)
+
+nirvn 	2017-06-19
+
+    [ui] remove background in the add db2 layer icon
+
+Ilya Zverev 	2017-06-18
+
+    A test for atlas feature extent after rotation
+
+Ilya Zverev 	2017-06-17
+
+    Fix bounding box after rotating atlas geometry
+
+Harrissou Sant-anna 	2017-06-18
+
+    Move buttons and menu items
+
+Harrissou Sant-anna 	2017-06-12
+
+    Reorganize the Datasource Manager tabs
+
+Matthias Kuhn 	2017-06-17
+
+    New style signal/slot connections
+
+Matthias Kuhn 	2017-06-17
+
+    Followup 01b4eeb: Fix crash
+
+Alessandro Pasotti 	2017-06-12
+
+    [bugfix] Collapse all connection item leaves in the browser a start
+
+    To prevent unwanted connections to be initiated when QGIS launches
+
+PedroVenancio 	2017-06-16
+
+    Changes SAGA io_gdal RESAMPLING method to B-Spline Interpolation, as SAGA default, and add the Resampling Method parameter to SAGA Raster Calculator, as explained in https://issues.qgis.org/issues/16646
+
+Alessandro Pasotti 	2017-06-09
+
+    [bugfix] Prevent expansion of WMS connection layers when restoring the browser
+
+    This was causing unwanted connections to WMS when QGIS starts.
+
+Alessandro Pasotti 	2017-06-09
+
+    Removed ui_qgstablewidgetbase.h
+
+Martin Dobias 	2017-06-16
+
+    Added GUI for data-defined size legend (single/categorized/graduated renderer)
+
+Matthias Kuhn 	2017-06-16
+
+    Replace QString::null with QString()
+
+    Deprecated sind Qt 5.9
+
+Matthias Kuhn 	2017-06-16
+
+    The nodetool only needs to consider spatial layers
+
+Sandro Mani 	2017-06-16
+
+    [ArcGIS REST] Introduce QgsAfsSharedData to remove dependency on QgsAfsProvider by QfsAfsFeatureSource
+
+Rob Jones 	2017-06-15
+
+    Fix include for case sensitive HFS+ builds
+    CocoaInitializer.h != cocoainitializer.h on case sensitive filesystems
+
+Matthias Kuhn 	2017-06-15
+
+    Less noise from QgsNetworkAccessManager
+
+Martin Dobias 	2017-06-15
+
+    [FEATURE] Rendering of data-defined size in legend in "collapsed" mode
+
+    Instead of having different marker sizes in legend as separate legend nodes,
+    the new "collapsed" mode packs all sizes into one legend node.
+
+    This commit only makes it available in the API, not exposed in GUI yet.
+
+Denis Rouzaud 	2017-06-15
+
+    make QgsMapCanvas::updateCanvasItemPositions a protected slot
+
+Denis Rouzaud 	2017-06-15
+
+    fix advanced digitizing panel display issue after panning
+
+    panning would cause the rubberbands of the adv. digit. panel to be invisible.
+    update the canvas item is now done after each extent changes
+
+Denis Rouzaud 	2017-06-15
+
+    fix indentation
+
+Denis Rouzaud 	2017-06-15
+
+    fix zoomToSelected with geometry-less layer or features
+
+Andrea Aime 	2017-06-14
+
+    Fixes 16712, SLD export of categorized style fails if attribute name conflicts with a built-in function name
+
+Andrea Aime 	2017-06-13
+
+    Fixes 16707, export of hairline results in a different visual thickness
+
+Nyall Dawson 	2017-06-15
+
+    Astyle
+
+Nyall Dawson 	2017-06-15
+
+    Update api break docs
+
+Nyall Dawson 	2017-06-15
+
+    Rename addFeature member in QgsVectorFileWriter to avoid clash
+
+Nyall Dawson 	2017-06-15
+
+    Fix grass provider compilation
+
+Nyall Dawson 	2017-06-15
+
+    Also update oracle provider for addFeatures flags
+
+Nyall Dawson 	2017-06-15
+
+    Small optimisations to postgres provider when using FastInsert
+
+    Although ideally we should use COPY mode in this case for best
+    possible speed.
+
+Nyall Dawson 	2017-06-15
+
+    Native processing algs use FastInsert were possible
+
+    We want maximum possible speed here
+
+Nyall Dawson 	2017-06-15
+
+    QgsVectorLayerExporter always uses FastInsert
+
+    Since it does nothing with the features after adding them to
+    the provider, and we want maximum speed possible here.
+
+Nyall Dawson 	2017-06-15
+
+    Add a flag argument to QgsFeatureSink::addFeatures
+
+    Flags can be used to control how features are added to the sink.
+
+    For now, there's only a single flag available - FastInsert.
+    When FastInsert is set, faster inserts will be use at the cost
+    of updating the passed features to reflect changes made at the
+    provider.
+
+    This includes skipping the update of the passed feature IDs
+    to match the resulting feature IDs for the feature within
+    the data provider.
+
+    Individual sink subclasses may or may not choose to respect
+    this flag, depending on whether or not skipping this update
+    represents a significant speed boost for the operation.
+
+    QgsVectorLayer always ignores the flag - feature ids are
+    required for the featureAdded signal to be correctly emitted,
+    and it's expected that performance critical applications will
+    add features directly to a data provider instead of
+    via QgsVectorLayer's edit buffer.
+
+Denis Rouzaud 	2017-06-15
+
+    follow up 8333b71034a5018642ccfac0d9ddc7bffda508d4 QgsSnappingUtils sipify
+
+Denis Rouzaud 	2017-06-15
+
+    [sipify] allow exception to required  _EXPORT macros
+
+Nyall Dawson 	2017-06-15
+
+    Spelling fix 'grometry'->'geometry'
+
+Nyall Dawson 	2017-06-15
+
+    Expand tests for subdivide
+
+Nyall Dawson 	2017-06-14
+
+    Update multiparts to singleparts to new processing API
+
+Nyall Dawson 	2017-06-14
+
+    [FEATURE][processing] New algorithm for subdividing geometries
+
+    The returned geometry will be a collection containing subdivided parts
+    from the original geometry, where no part has more then the specified
+    maximum number of nodes.
+
+    This is useful for dividing a complex geometry into less complex parts,
+    which are better able to be spatially indexed and faster to perform
+    further operations such as intersects on. The returned geometry parts may
+    not be valid and may contain self-intersections.
+
+Nyall Dawson 	2017-06-14
+
+    [FEATURE] Subdivide algorithm for QgsGeometry
+
+    Subdivides the geometry. The returned geometry will be a collection
+    containing subdivided parts from the original geometry, where no
+    part has more then the specified maximum number of nodes.
+
+Nyall Dawson 	2017-06-14
+
+    Expose GEOS clip by rect algorithm via QgsGeometry API
+
+    Performs a fast, non-robust intersection between the geometry and
+    a rectangle. The returned geometry may be invalid.
+
+Nyall Dawson 	2017-06-14
+
+    Add method to QgsGeometryFactory to create a multigeometry
+    from any wkb type
+
+    Eg calling QgsGeometryFactory::createCollectionOfType( QgsWkbTypes::PolygonM )
+    will return a new QgsMultiPolygonV2 with M values.
+
+Juergen E. Fischer 	2017-06-14
+
+    fix windows build
+
+Juergen E. Fischer 	2017-06-14
+
+    Remove unused SnapToMapMode in QgsSnappingUtils
+
+Nyall Dawson 	2017-06-14
+
+    [processing] Port transform alg to c++
+
+Ilya Zverev 	2017-06-14
+
+    Rotate geometry before calculating bounding box in atlas. Fixes #11954
+
+Matthias Kuhn 	2017-06-14
+
+    Remove unrequired SIP_SKIP
+
+Matthias Kuhn 	2017-06-13
+
+    Fix tests
+
+Matthias Kuhn 	2017-06-11
+
+    Fix geometry tests for NaN
+
+Matthias Kuhn 	2017-06-11
+
+    Use NaN for missing Z and M coordinates in QgsPoint
+
+Matthias Kuhn 	2017-06-10
+
+    Projecting a 2D point with inclination assumes 0 for Z
+
+Matthias Kuhn 	2017-06-09
+
+    Fix point test
+
+Matthias Kuhn 	2017-06-09
+
+    Compare Z and M values in QgsPoint::operator== only when required
+
+Matthias Kuhn 	2017-06-08
+
+    More intuitive QgsPoint python constructors
+
+    In python, the wkb type of a QgsPoint will by default be determined from
+    the provided parameters, where Z and M will be added as required if the
+    wkbType is Undefined.
+
+        QgsPoint(x, y, z=nan, m=nan, wkbType=QgsWkbTypes.Undefined)
+
+    Thanks to the python API support of named parameters, it's also
+    straightforward to specify z, m and wkbType in any desired combination.
+
+    On the other hand, on C++ side it's often preferable to use
+
+        QgsPoint(QgsWkbTypes::WkbType wkbType, double x, double y, double z, double m);
+
+    due to the lack of named parameters which make it harder to specify a
+    specific type and the advantage of typesafety that makes it possible to
+    verload the first constructor with this one.
+
+Matthias Kuhn 	2017-06-08
+
+    Fix sip bindings for QgsPoint
+
+Matthias Kuhn 	2017-06-08
+
+    Add an easy to use Z/M default value constructor to QgsPoint
+
+Matthias Kuhn 	2017-06-03
+
+    Fix QgsPoint(XY) sip bindings
+
+Denis Rouzaud 	2017-06-13
+
+    fix class declaration
+
+Denis Rouzaud 	2017-05-21
+
+    sipify QgsRange as template
+
+Juergen E. Fischer 	2017-06-13
+
+    vector file writer fixes:
+    * don't apply un-overridden default options
+    * DGN: don't export attributes and fix layername to "elements"
+
+    (cherry picked from commit 7634b0b759bc0cedba28f9e9199d6a81a498ec5a)
+
+Juergen E. Fischer 	2017-06-13
+
+    fix windows build
+
+Denis Rouzaud 	2017-06-13
+
+    move acceptable missing doc to code_layout tests path
+
+Denis Rouzaud 	2017-06-13
+
+    fixes failing sipify test
+
+Denis Rouzaud 	2017-06-13
+
+    [sipify] fix again template inheritance
+
+Merge: b6e75be493 54124bd0aa
+Nyall Dawson 	2017-06-13
+
+    Merge pull request #4721 from nyalldawson/processing_pt31
+
+    [processing] Restore batch mode
+
+Denis Rouzaud 	2017-06-13
+
+    remove precise ppa
+
+    doxygen has sufficient minimum version in trusty
+
+Juergen E. Fischer 	2017-06-13
+
+    fix 5ff6b14f (followup 00f8eff0)
+
+Denis Rouzaud 	2017-06-13
+
+    followup 82bd08c187daa66cf5dbd11e34d9c90b9e4cfd30
+    removed debugging stuff
+
+Denis Rouzaud 	2017-06-13
+
+    [sipify] fixes to template based inheritance
+    * fix space-formatting issue
+    * avoid double include of the same header
+
+Nyall Dawson 	2017-06-13
+
+    Restore batch algorithm mode following new processing API
+
+Nyall Dawson 	2017-06-13
+
+    Add string output type
+
+Nyall Dawson 	2017-06-13
+
+    Add QgsProcessingParameterFolderOuput
+
+Nyall Dawson 	2017-06-13
+
+    Catch errors while running algs
+
+Nyall Dawson 	2017-06-12
+
+    Remove outdated TODO
+
+Nyall Dawson 	2017-06-13
+
+    Fix crash when searching in options dialog (fix #16644)
+
+Martin Dobias 	2017-06-09
+
+    API cleanup for legend support in renderers
+
+Denis Rouzaud 	2017-06-12
+
+    fix snapping in move feature tool
+
+Denis Rouzaud 	2017-06-12
+
+    install QgsGeometryRubberBand header
+
+Merge: 1be9997dd3 ac1a579b42
+Alexander Bruy 	2017-06-12
+
+    Merge pull request #4604 from boundlessgeo/postgis_merge_features_port3_fix#15741
+
+    Fix Postgis Merge selected features regression (fix #15741)
+
+Luigi Pirelli 	2017-06-12
+
+    adapted to the return value as QgsGeometry()
+
+Luigi Pirelli 	2017-06-12
+
+    more QgsPointXY
+
+Alexander Bruy 	2017-06-12
+
+    more QgsPoint -> QgsPointXY fixes
+
+Luigi Pirelli 	2017-06-09
+
+    typo
+
+Luigi Pirelli 	2017-05-25
+
+    added check if no gemetry is available
+
+Luigi Pirelli 	2017-05-24
+
+    avoid control on all geometries if one fail
+
+Luigi Pirelli 	2017-05-22
+
+    fix Postgis Merge selected features regression: port 3.0 fixes #15741
+
+Nyall Dawson 	2017-06-12
+
+    Fix some memory leaks in tests
+
+Denis Rouzaud 	2017-06-12
+
+    avoid python signature overloads to handle NaN default values
+
+Denis Rouzaud 	2017-06-12
+
+    [sipify] properly handle python signatures
+
+Merge: 492ad2db08 7b844837bb
+rldhont 	2017-06-12
+
+    Merge pull request #4699 from pblottiere/getlegendgraphic
+
+    [Server] WMS GetLegendGraphics refactoring
+
+Merge: 40cae29228 63611b1d8f
+Nyall Dawson 	2017-06-12
+
+    Merge pull request #4715 from nyalldawson/processing_pt31
+
+    [processing] Bring back iterating mode for algorithms
+
+Nyall Dawson 	2017-06-12
+
+    Port script code functions to c++ classes
+
+    Restore logging executed algorithms
+
+Nyall Dawson 	2017-06-12
+
+    Add a more descriptive tooltip for iterate mode button
+
+Nyall Dawson 	2017-06-12
+
+    More responsive feedback when using iterate mode
+
+Nyall Dawson 	2017-06-12
+
+    Fix running algorithms in iterating mode
+
+Nyall Dawson 	2017-06-12
+
+    Port calculation of iterating destination to c++
+
+Merge: 0ceeb297f8 277926047b
+Nyall Dawson 	2017-06-12
+
+    Merge pull request #4702 from nyalldawson/processing_pt31
+
+    More processing goodness, restore algs
+
+Nyall Dawson 	2017-06-12
+
+    Respect dissolve setting in c++ buffer alg
+
+Nyall Dawson 	2017-06-12
+
+    Hide qgis scripts for now (non-functional)
+
+Nyall Dawson 	2017-06-12
+
+    Fix feature source widget returns source even when not set
+
+Nyall Dawson 	2017-06-12
+
+    Fix raster layers showing as input choices for vector algs
+
+Nyall Dawson 	2017-06-12
+
+    Port clip alg to c++
+
+    Rough benchtests reveal it's about 25% faster then the python
+    version
+
+Merge: dd0bb8c161 03bfe9bfbc
+Nyall Dawson 	2017-06-12
+
+    Merge pull request #4706 from nyalldawson/id
+
+    Use uuid instead of timestamp when generating layer ids
+
+Nyall Dawson 	2017-06-12
+
+    Native c++ dissolve alg
+
+Nyall Dawson 	2017-06-12
+
+    Fix handling optional multiple table field parameter with no fields set
+
+Nyall Dawson 	2017-06-12
+
+    Nicer formatting for log in algorithm dialog
+
+Nyall Dawson 	2017-06-12
+
+    [processing] Catch transform errors in when iterating features
+
+Nyall Dawson 	2017-06-12
+
+    Astyle
+
+Nyall Dawson 	2017-06-11
+
+    Check validity outputs counts of valid/invalid features
+
+Nyall Dawson 	2017-06-11
+
+    Avoid creating unused sinks
+
+Nyall Dawson 	2017-06-11
+
+    Make html output in basic stats algorithm optional
+
+Nyall Dawson 	2017-06-11
+
+    Output useful logging when running algorithms from toolbox
+
+    Now outputs the input parameters, execution time, and results
+
+Nyall Dawson 	2017-06-11
+
+    Correctly reject algorithm dialog
+
+    Algorithm dialog was not being rejected when close button was
+    called (only hidden), leading to old dialogs and widgets
+    hanging around forever...
+
+Nyall Dawson 	2017-06-11
+
+    Only use a temporary feedback object when running algorithms
+
+    Otherwise canceling a run causes all future runs to be canceled
+
+Nyall Dawson 	2017-06-09
+
+    Port checkInputCRS to c++, and allow algorithms to flag when they
+    require all input layers to be in the same CRS
+
+    The default behaviour is to assume that algorithms are well behaved
+    and can handle multi-CRS inputs, but algs have the option to
+    flag that they do not allow this and require the input CRS check.
+
+    Those algs should document that they require all inputs to have
+    matching CRS - processing 3.0 behaviour is to assume that algs
+    can handle this.
+
+Nyall Dawson 	2017-06-09
+
+    Merge algorithm reprojects layers so that all features are
+    in CRS of first input layer
+
+Nyall Dawson 	2017-06-09
+
+    Port merge alg to new API
+
+Nyall Dawson 	2017-06-09
+
+    Resurrect grid polygon algorithm
+
+Nyall Dawson 	2017-06-09
+
+    [FEATURE] Port Extract by Expression to new API, allow saving
+    non matching features to separate output
+
+Nyall Dawson 	2017-06-09
+
+    [processing] Clip alg allows mask in different CRS to clipped layer
+
+Merge: 10341310c2 74ce5550ad
+Nyall Dawson 	2017-06-12
+
+    Merge pull request #4713 from nyalldawson/rect_api
+
+    Remove duplicate QgsRectangle::unionRect method
+
+Nyall Dawson 	2017-06-11
+
+    Remove duplicate QgsRectangle::unionRect method
+
+    QgsRectangle::combineExtentWith does the exact same thing
+
+Nyall Dawson 	2017-06-11
+
+    Add a provider unit test checking extent after adding/deleting features
+
+Nyall Dawson 	2017-06-10
+
+    Don't wastefully recalculate memory provider extent after every
+    feature addition
+
+    Previously, the memory provider would automatically recalculate
+    the extent of the layer after new features are added by
+    looping through the entire set of existing features and calculating
+    the bounding boxes. This is very wasteful, as many code paths
+    add features one-by-one, so with every new feature added to
+    the provider every existing feature is iterated over. This caused
+    memory layers to slow to a crawl after many features are added.
+
+    This commit improves the logic so that IF an existing layer
+    extent is known, then it's updated on the fly as each individual
+    feauture is added. Instead of looping through all features, we
+    just expand the existing known extent with the added features
+    bounds. If the extent isn't known, we just invalidate it
+    when adding/deleting/modifying features, and defer the actual
+    extent calculation until it's next requested.
+
+    Makes memory layers many thousands of magnitudes of orders faster
+    when adding lots of features (e.g. when memory providers
+    are used as temporary outputs in processing)
+
+Nyall Dawson 	2017-06-11
+
+    Fix running processing algs through locator
+
+Nyall Dawson 	2017-06-11
+
+    Scroll to newly added entries in paletted renderer widget
+
+Nyall Dawson 	2017-06-11
+
+    When using destination CRS in a feature request and a transform
+    exception occurs, clear the feature's geometry before returning
+
+    We never want to return features with mixed CRS geometries.
+
+Matthias Kuhn 	2017-06-11
+
+    followup cc877c39: fix build
+
+Matthias Kuhn 	2017-06-03
+
+    No more QgsGeometry pointers in the public API
+
+    Geometries are passed as const reference and returned by value.
+    This make using the API easier and reduces the risk of ownership
+    problems.
+
+    The overhead is minimal due to implicit sharing.
+
+    Fix https://github.com/qgis/qgis3.0_api/issues/68
+
+Merge: e839ab1dab aedb95b1aa
+Alexander Bruy 	2017-06-10
+
+    Merge pull request #4705 from PedroVenancio/master
+
+    [processing] fixes GRASS 7 v.net.alloc (fix #16672)
+
+Nyall Dawson 	2017-06-10
+
+    Indentation
+
+Nyall Dawson 	2017-06-10
+
+    Use uuid instead of timestamp when generating layer ids
+
+    Timestamps can result in duplicate layer ids when layers
+    are created rapidly or in different threads.
+
+    Fix #14390
+
+Nyall Dawson 	2017-06-10
+
+    Fix crash when saving vector layer in background task
+
+PedroVenancio 	2017-06-10
+
+    Fixes GRASS 7 v.net.alloc #16672
+
+Nyall Dawson 	2017-06-10
+
+    Cleanup and unify text formatting in projection combo box
+
+Juergen E. Fischer 	2017-06-10
+
+    spelling fixes
+
+Juergen E. Fischer 	2017-06-10
+
+    re-run t2tdoc
+
+Juergen E. Fischer 	2017-06-09
+
+    include expect/unbuffer in INSTALL install list
+
+Juergen E. Fischer 	2017-06-09
+
+    fix install (followup 532b9a14)
+
+Blottiere Paul 	2017-06-08
+
+    [Server] Fonts used in GetLegendGraphics tests are bolded and increased
+
+Blottiere Paul 	2017-06-08
+
+    [Server] Add/update tests
+
+Blottiere Paul 	2017-06-08
+
+    [Server] GetLegendGraphics refactoring
+
+Merge: f80a1f54ce 9d9e94e6b9
+rldhont 	2017-06-09
+
+    Merge pull request #4700 from sbrunner/service-onlineressource
+
+    [Server] WMS Fix the mandatory OnlineResource
+
+Stéphane Brunner 	2017-06-08
+
+    Fix the mandatory OnlineResource
+
+Stéphane Brunner 	2017-06-09
+
+    More verbose response
+
+Merge: 00b2d24247 8df3391fc4
+rldhont 	2017-06-09
+
+    Merge pull request #4687 from rldhont/server-wms-dxf-writer
+
+    [Server] WMS DXF writer refactoring
+
+rldhont 	2017-06-05
+
+    [Server] dxf writer refactoring
+
+Denis Rouzaud 	2017-06-08
+
+    sipiy gui symbology
+
+Denis Rouzaud 	2017-06-08
+
+    sipify gui effects + layertree
+
+Denis Rouzaud 	2017-06-08
+
+    sipify gui attribute table
+
+Denis Rouzaud 	2017-06-08
+
+    [sipify] fix enum again
+
+Denis Rouzaud 	2017-06-08
+
+    sipify gui part n
+
+Juliusz Hoffman 	2017-06-09
+
+    consider middle geometry column when retrieving default values (fixes #16685)
+
+Juergen E. Fischer 	2017-06-09
+
+    fix 8c873b14 (fixes #16624)
+
+Juergen E. Fischer 	2017-06-05
+
+    update translation scripts
+
+Merge: 57a6735810 8c73bcbcfe
+Nyall Dawson 	2017-06-09
+
+    Merge pull request #4701 from nyalldawson/processing_pt31
+
+    [processing] allow optional feature sink parameters
+
+Merge: 32ecbcfa21 a8ca3b28ae
+Nyall Dawson 	2017-06-09
+
+    Merge pull request #4672 from nyalldawson/scale
+
+    Unify scale widgets API, pt 1
+
+Nyall Dawson 	2017-06-09
+
+    Port test to new API
+
+Nyall Dawson 	2017-06-07
+
+    [FEATURE] Port CheckValidity alg to new API
+
+    Also make outputs optional from the alg - now you can select
+    which outputs you need for your model!
+
+Nyall Dawson 	2017-06-07
+
+    If a feature sink parameter is optional and not set, don't create the sink
+
+    This adds a lot of flexibility to algorithms, as it makes output
+    sinks truely optional. For instance, the various "Extract by..."
+    algorithms could add a new optional sink for features which
+    'fail' the extraction criteria. This effectively allows these
+    algorithms to become feature 'routers', directing features onto
+    other parts of a model depending on whether they pass or fail
+    the test.
+
+    But in this situation we don't always care about these failing
+    features, and we don't want to force them to always be fetched
+    from the provider. By making the outputs truely optional,
+    the algorithm can tweak its logic to either fetch all features
+    and send them to the correct output, or only fetch
+    matching features from the provider in the first place (a big
+    speed boost).
+
+Nyall Dawson 	2017-06-07
+
+    Restore basic stats alg
+
+Nyall Dawson 	2017-06-09
+
+    [needs-docs] Use standard scale widgets and terminology for labeling
+
+    Also unify API with other scale API.
+
+    Fix #16349
+
+Nyall Dawson 	2017-06-09
+
+    Improve API docs
+
+Nyall Dawson 	2017-06-09
+
+    Unify scale API in rule based labeling, fix GUI issues
+
+Nyall Dawson 	2017-06-09
+
+    Unifying rule based renderer scale API, fix scale related bugs
+
+    Fix #15512
+
+Merge: 9f71156a13 482ed3f25a
+Nyall Dawson 	2017-06-09
+
+    Merge pull request #4693 from nyalldawson/request_crs
+
+    Allow specifying a destination CRS in QgsFeatureRequest
+
+Nyall Dawson 	2017-06-09
+
+    Unify diagram scale API with rest of scale API
+
+Nyall Dawson 	2017-06-09
+
+    More consistency across scale API
+
+    Use a real scale widget for point displacement label scale
+
+Nyall Dawson 	2017-06-09
+
+    Use a real scale widget in vector save as dialog
+
+Nyall Dawson 	2017-06-09
+
+    Update tests for new API
+
+Nyall Dawson 	2017-06-09
+
+    Fix zoom to visibile scale when min/max scale is set to 0
+
+Nyall Dawson 	2017-06-09
+
+    Improve documentation
+
+Nyall Dawson 	2017-06-02
+
+    Flip remaining scale API from real to denominators
+
+Nyall Dawson 	2017-06-02
+
+    Clarify in doxygen what scale values represent
+
+Nyall Dawson 	2017-06-02
+
+    Unify scale widgets API
+
+    Flip all scale based widgets to use scale denominators instead
+    of actual scales (ie 100.0 instead of 0.01 for 1:100).
+
+    This is done for consistency with the rest of the API, which
+    predominantly uses scale denominators. It also helps
+    precision loss as a result of multiple 1.0 / scale conversions
+    throughout the code.
+
+    Refs #15337
+
+Nyall Dawson 	2017-06-09
+
+    Explicitly mention in docs that presence of destination CRS does
+    not affect filter expressions or virtual field values
+
+Nyall Dawson 	2017-06-09
+
+    Return an invalid iterator if a transform exception occurs
+    when projecting filter rects from destination crs
+
+Nyall Dawson 	2017-06-09
+
+    Rename transform methods for clarity
+
+Merge: b280c873d5 cd9a802c5c
+Nyall Dawson 	2017-06-09
+
+    Merge pull request #4678 from nyalldawson/layer_scale
+
+    Swap QgsMapLayer min/max scale API definitions (unify scale api, pt 2)
+
+Martin Dobias 	2017-06-08
+
+    Node tool: give preference to vertex match over segment match from previous feature
+
+Martin Dobias 	2017-06-08
+
+    Fix python tests after previous commit
+
+Martin Dobias 	2017-06-08
+
+    Reshape tool: use default Z value for 3D geometries
+
+Martin Dobias 	2017-06-08
+
+    Node tool: add default Z value to new vertices in 3D geometries (fixes #16240)
+
+Martin Dobias 	2017-06-08
+
+    Fix a crash when toggling a layer to editable mode
+
+Martin Dobias 	2017-06-08
+
+    Do not #include QtConcurrent when using map renderer jobs C++ API
+
+    This way C++ apps using the API do not need to add QtConcurrent to their build
+
+Denis Rouzaud 	2017-06-07
+
+    sipify core symbology part 2
+
+Nyall Dawson 	2017-06-08
+
+    Handle request crs transform in cached feature iterators
+
+Nyall Dawson 	2017-06-08
+
+    Indentation
+
+Nyall Dawson 	2017-06-08
+
+    Handle request destinationCrs in QgsVectorLayerFeatureIterator
+
+Nyall Dawson 	2017-06-07
+
+    Allow specifying a destination CRS in QgsFeatureRequest
+
+    If set, all geometries will be reprojected from their original
+    coordinate reference system to the destination CRS while
+    iterating over features.
+
+    If a CRS has been set as the destination CRS, then the filterRect
+    parameter should be specified in the same CRS as this destination
+    CRS.
+
+    Additionally, a callback function can be specified on the request
+    to be called if a transform exception is encountered while
+    iterating over features.
+
+    This is designed to make it easier for scripts and plugins to
+    correctly reproject layers in an efficient and robust way, instead
+    of having to implement lots of repeated code themselves and
+    potentially missing some of the important considerations which
+    come with reprojecting geometries & bounding boxes.
+
+    Now, if a script wants the features from a layer in a specific
+    CRS, they can call:
+
+        crs = QgsCoordinateReferenceSystem('epsg:4326')
+        request = QgsFeatureRequest().setDestinationCrs(crs)
+        for f in layer.getFeatures(reqeuest):
+            print('geometry in 4326 is {}.format(f.geometry().exportToWkt()))
+
+Harrissou Sant-anna 	2017-06-07
+
+    More typo fixes
+
+Harrissou Sant-anna 	2017-06-06
+
+    Typo fix and list ordering
+
+Merge: 9e176feeac fbad91165c
+Nyall Dawson 	2017-06-08
+
+    Merge pull request #4698 from nyalldawson/cache_test
+
+    Add feature source test for QgsVectorLayerCache
+
+Denis Rouzaud 	2017-06-08
+
+    gps fixes
+
+Denis Rouzaud 	2017-05-23
+
+    sipify core gps
+
+Nyall Dawson 	2017-06-08
+
+    Identation
+
+Nyall Dawson 	2017-06-08
+
+    Add feature source test for QgsVectorLayerCache
+
+    While it's not a QgsFeatureSource subclass (yet), it behaves
+    just like one so when can run the feature source conformance
+    test suite over it.
+
+    Fix a few minor issues identified by the test suite, and one
+    potential crash (requesting an invalid id from a cache iterator
+    crashes qgis)
+
+Denis Rouzaud 	2017-06-07
+
+    sipify gui part 1
+
+Denis Rouzaud 	2017-06-08
+
+    fix merge
+
+Denis Rouzaud 	2017-06-08
+
+    [sipify] fix false virtual methods
+
+Nyall Dawson 	2017-06-08
+
+    Don't allow selection of adding z/multigeometries when saving a vector
+    layer with geometry type set to No Geometry
+
+Nyall Dawson 	2017-06-08
+
+    Fix composer legend "Filter by Atlas Feature" does not save
+
+    Fix #16663
+
+    (forward port from ecb4c5a)
+
+Merge: 1bbfd5b8c2 7397b3c3a9
+Nyall Dawson 	2017-06-08
+
+    Merge pull request #4657 from DelazJ/patch-1
+
+    Typo fix: Add missing spacing
+
+Merge: 648ff29304 be501a0f5f
+Nyall Dawson 	2017-06-08
+
+    Merge pull request #4692 from nyalldawson/prepare
+
+    Make more use of prepared geometries for intersection tests
+
+Merge: 6606d463d3 342897c6ae
+Nyall Dawson 	2017-06-08
+
+    Merge pull request #4695 from nyalldawson/buffer_test
+
+    Add feature source unit tests for vector layer with edits in buffer
+
+Nyall Dawson 	2017-06-08
+
+    Add source test for vector layer with deleted features in buffer
+
+Denis Rouzaud 	2017-06-07
+
+    fix enum
+
+Denis Rouzaud 	2017-06-07
+
+    [sipify] fix negative value assignment
+
+Denis Rouzaud 	2017-06-06
+
+    sipify core symbology classes
+
+Denis Rouzaud 	2017-06-06
+
+    [sipify] fix body detection*
+
+Nyall Dawson 	2017-06-07
+
+    Add feature source unit tests for vector layer with edits in buffer
+
+    Run the feature source tests over a layer with added, edited
+    geometries, and edited attributes unsaved in an edit buffer
+
+    Fix identified issues when iterating over these edited features
+
+Even Rouault 	2017-06-07
+
+    [WFS provider] Recognize Geomedia layers with gmgml:LineString_Curve_MultiCurve_CompositeCurvePropertyType type as multilinestring layers (#16675)
+
+Denis Rouzaud 	2017-06-06
+
+    sipify Qgis, QgsDxfExport
+
+Denis Rouzaud 	2017-06-06
+
+    [sipify] uniform die messages
+
+Nyall Dawson 	2017-06-07
+
+    Make more use of prepared geometries for intersection tests
+
+    Should speed up a few operations
+
+Merge: 5f1a78ddab 64a86e3d6c
+Nyall Dawson 	2017-06-07
+
+    Merge pull request #4691 from nyalldawson/validator
+
+    Add an explicit argument to set QgsGeometryValidator method
+
+Nyall Dawson 	2017-06-07
+
+    Add an explicit argument to set QgsGeometryValidator method
+
+    Previously this was always read from settings when using
+    QgsGeometryValidator. It's now an explicit argument
+    when constructing QgsGeometryValidator or calling the
+    static validation methods, allowing choice of internal/GEOS
+    validation methods.
+
+    Helps remove more QgsSettings use from core.
+
+Nyall Dawson 	2017-06-07
+
+    Update inverted polygon test mask
+
+Martin Dobias 	2017-06-06
+
+    Use invalid CRS as default in map settings
+
+    I have got caught by the default set to WGS 84 when I loaded a layer
+    in projected CRS, set extent to layer's extent and... nothing got rendered
+    because map renderer was reprojecting to WGS 84.
+
+    This default is closer to the default in 2.x where reprojection is turned off.
+
+Sandro Santilli 	2017-06-06
+
+    Add DBManager test for service-only URI
+
+    Ref #16626
+
+    Also fixes runs with non-standard QGIS_PGTEST_DB env variable set
+
+Merge: 39b5f4e5b3 448f019e1f
+Nyall Dawson 	2017-06-06
+
+    Merge pull request #4684 from nyalldawson/processing_pt3
+
+    Add sourceExtent method to QgsFeatureSource
+
+Martin Dobias 	2017-06-06
+
+    Update acceptable missing doc
+
+Sandro Santilli 	2017-06-06
+
+    Make the `check` rule use xvfb-run, drop `check-no-x`
+
+    I see no reason for anyone wanting to see popping windows during
+    a `make check` run. Closes #12172.
+
+Merge: 51e7efe218 e89502f43d
+Alexander Bruy 	2017-06-06
+
+    Merge pull request #4675 from alexbruy/processing-help
+
+    [processing] improve help system
+
+Martin Dobias 	2017-06-06
+
+    Replace QString::null by QString() in core (deprecated since Qt 5.9)
+
+Alexander Bruy 	2017-06-06
+
+    fix help opening
+
+Nyall Dawson 	2017-06-06
+
+    Port polygon from layer extent alg to new API
+
+Merge: 38d905f694 ad14373aa6
+rldhont 	2017-06-06
+
+    Merge pull request #4683 from rldhont/server-string-list-exceptions
+
+    [Server] bulk enhancements: string, list and exceptions
+
+Sandro Santilli 	2017-06-02
+
+    Add a notice about service=qgis_test being used by some tests
+
+Sandro Santilli 	2017-06-02
+
+    Add a raster table to the test postgis setup, use it from dbmanager test
+
+Sandro Santilli 	2017-05-26
+
+    Add test for DBManager's PostGIS connector and plugin
+
+    Only enabled when ENABLE_PGTEST is set
+    Includes test for dbname-less URI (#10600 and #16625 and #16626)
+
+    The test relies on default libpq accessed database containing
+    one raster table, but makes no effort to create such database yet.
+
+Alexander Bruy 	2017-06-06
+
+    [processing] use QGIS user manual as help source for all algorithms by
+    default.
+
+    NOTE: URL scheme should be adopted when documentation team decided how
+    manual will be scructured.
+
+Alexander Bruy 	2017-06-06
+
+    [processing] move collapse button to the top
+
+Alexander Bruy 	2017-06-06
+
+    [processing] use arrow cursor for collapse button
+
+Alexander Bruy 	2017-06-06
+
+    [processing] add button to collapse/expand short help
+
+Alexander Bruy 	2017-06-06
+
+    [processing] simplify modeler algorithm dialog and use new help in it
+    too
+
+Alexander Bruy 	2017-06-06
+
+    [processing] open help in the default webbrowser to be consistent with
+    the rest of QGIS dialogs
+
+Alexander Bruy 	2017-06-06
+
+    [processing] save and restore geometry of the algorithm dialog
+
+Alexander Bruy 	2017-06-06
+
+    [processing] make short help panel resizable and replace  Help tab with corresponding button
+
+Nyall Dawson 	2017-06-06
+
+    Add sourceExtent method to QgsFeatureSource
+
+Merge: 2b0af000fd 1d2e54d1ba
+Nyall Dawson 	2017-06-06
+
+    Merge pull request #4682 from nyalldawson/processing_pt3
+
+    Processing rebuilding...
+
+Nyall Dawson 	2017-06-06
+
+    Port delete columns alg to new API
+
+Nyall Dawson 	2017-06-06
+
+    Port clip algorithm to new API
+
+Nyall Dawson 	2017-06-06
+
+    Fix warning
+
+Nyall Dawson 	2017-06-06
+
+    Port BarPlot alg to new API
+
+Nyall Dawson 	2017-06-06
+
+    Port getHTMLOutputsCount to c++ API
+
+Nyall Dawson 	2017-06-06
+
+    Add file based and HTML outputs to c++ API
+
+Nyall Dawson 	2017-06-06
+
+    Fix field widget wrapper
+
+Nyall Dawson 	2017-06-06
+
+    Port addautoincrementalfield to new API
+
+Nyall Dawson 	2017-06-06
+
+    Port aspect algorithm to new API
+
+Nyall Dawson 	2017-06-06
+
+    Remove some unused code
+
+Nyall Dawson 	2017-06-06
+
+    Add raster layer output parameters
+
+Nyall Dawson 	2017-06-06
+
+    Allow direct map layer parameter/default values were appropriate
+
+Nyall Dawson 	2017-06-06
+
+    Rename QgsProcessingFeatureSinkDefinition to QgsProcessingOutputLayerDefinition
+
+    Since it also applies to raster layer outputs, we need a more generic name
+
+Nyall Dawson 	2017-06-06
+
+    Fix incorrect import
+
+Nyall Dawson 	2017-06-06
+
+    Port another alg to new API
+
+Nyall Dawson 	2017-06-06
+
+    Add a cancel button for algorithms which support cancelation
+
+Nyall Dawson 	2017-06-06
+
+    Move algorithm expression context generation to QgsProcessingAlgorithm
+
+    Fix error when selecting "from expression" in algorithm parameter dialog
+
+Nyall Dawson 	2017-06-06
+
+    Restore ability to save outputs directly to Spatialite/PostGIS providers
+
+Nyall Dawson 	2017-06-06
+
+    Fix saving processing outputs with correct encoding
+
+Merge: 632a2be86a 77072b15ac
+Nyall Dawson 	2017-06-06
+
+    Merge pull request #4590 from nyalldawson/processing_pt3
+
+    Processing armaggeddon, pt 1
+
+Nyall Dawson 	2017-06-06
+
+    Rename QgsProcessingFeatureSink to QgsProcessingFeatureSinkDefinition
+
+    For consistency with QgsProcessingFeatureSourceDefinition
+
+Nyall Dawson 	2017-06-06
+
+    Use a QgsProject pointer instead of bool loadIntoProject
+
+    Allows potential future use case of loading results into
+    a different open project
+
+Nyall Dawson 	2017-06-06
+
+    Only accept QgsPropertys in QgsProcessingFeatureSourceDefinition/
+    QgsProcessingFeatureSink, not all QVariant types
+
+    Only strings/QgsPropertys are valid anyway, so instead of strings
+    use static properties. This makes it clearer what possible
+    values are permitted for the underlying source/sink definition.
+
+Nyall Dawson 	2017-06-06
+
+    [processing] Change explicit encoding string parameters to more
+    flexible QVariantMap creatOptions parameters which include an
+    optional fileEncoding value
+
+    More flexible, allows sinks to be created using any creation
+    option which is passed to the underlying provider
+
+Nyall Dawson 	2017-06-05
+
+    Fix failing tests, temporarily disable some processing tests during
+    refactoring
+
+Nyall Dawson 	2017-06-05
+
+    Move getFileFilter from params to gui wrappers
+
+Nyall Dawson 	2017-06-05
+
+    Resurrect another Python QGIS algorithm
+
+Nyall Dawson 	2017-06-05
+
+    Remove global processing use selection setting
+
+Nyall Dawson 	2017-06-05
+
+    [FEATURE][processing] Add checkbox for each vector input layer
+    to control whether selected features only are to be used
+
+    Replaces the old global setting and makes it immediately obvious
+    to users when the selection will be respected
+
+Nyall Dawson 	2017-06-05
+
+    Restore correct layer naming when loading results
+
+Nyall Dawson 	2017-06-05
+
+    Fix loading of results after running algorithms
+
+Nyall Dawson 	2017-06-05
+
+    [processing] Remove more UseSelectionIfPresent use
+
+Nyall Dawson 	2017-06-05
+
+    Temporarily deactivate more algorithms
+
+Nyall Dawson 	2017-06-05
+
+    Remove no longer required QgsProcessingContext::UseSelectionIfPresent flag
+
+    Since using selection is now a per-feature-source setting
+
+Nyall Dawson 	2017-06-05
+
+    Create class for encapsulating settings relating to a feature source
+    input to a processing algorithm.
+
+    This allows parameter inputs to encapsulate extra information
+    relating to a feature source input, such as whether only
+    selected features from the source layer should be used.
+
+Nyall Dawson 	2017-06-05
+
+    Remove QgsProcessingUtils::uniqueValues
+
+    Use QgsFeatureSource method instead
+
+Nyall Dawson 	2017-06-05
+
+    [processing] Don't use vector layers directly as feature sources
+
+    Instead, parameters evaluate to QgsFeatureSource, which are
+    used for retrieving features, feature count, crs, wkb type,
+    etc.
+
+    This abstracts away the actual feature source, so that
+    algorithms may potentially operate from non-layer
+    feature sources.
+
+    It also helps remove the need for specialised QgsProcessingUtils
+    methods like getFeatures, featureCount, and createSpatialIndex.
+    Instead the standard API methods using QgsFeatureSources can
+    be used instead.
+
+Nyall Dawson 	2017-06-05
+
+    Create class for encapsulating settings relating to a feature sink
+    input to a processing algorithm.
+
+    This allows parameter inputs to encapsulate extra information
+    relating to a feature sink input, such as destination file
+    encoding and whether the sink layer should be loaded into
+    the project on completion
+
+Nyall Dawson 	2017-06-05
+
+    Rename QgsProcessingParameterOutputVectorLayer to QgsProcessingParameterFeatureSink
+
+Nyall Dawson 	2017-06-05
+
+    Rename QgsProcessingParameterVectorLayer to QgsProcessingParameterFeatureSource
+
+    Helps abstract away sources to allow non vector layer sources in future
+
+Nyall Dawson 	2017-06-05
+
+    Add direct method to retrieve QgsFeatureSink from parameter
+
+Nyall Dawson 	2017-05-31
+
+    Cleanup API - remove redundant name argument
+
+Nyall Dawson 	2017-05-31
+
+    Fix build
+
+Nyall Dawson 	2017-05-22
+
+    Indentation
+
+Nyall Dawson 	2017-05-22
+
+    QgsProcessingParameterVectorLayer accepts lists of vector layer types
+
+Nyall Dawson 	2017-05-22
+
+    Partially port a trial python alg to new API
+
+Nyall Dawson 	2017-05-22
+
+    Adapt more python code to new API
+
+Nyall Dawson 	2017-05-19
+
+    Temporarily fix memory layer outputs
+
+Nyall Dawson 	2017-05-17
+
+    Adapt more python code to new API
+
+Nyall Dawson 	2017-05-17
+
+    Move expression context generation out of parameters
+
+Nyall Dawson 	2017-05-17
+
+    Remove no longer required _resolveLayers method
+
+Nyall Dawson 	2017-05-17
+
+    Move minimum layer extent calculation to c++
+
+Nyall Dawson 	2017-05-16
+
+    Adapt more code to c++ API
+
+Nyall Dawson 	2017-05-16
+
+    Port parameter checking to c++
+
+Nyall Dawson 	2017-05-16
+
+    Create a QgsProcessingAlgRunnerTask task
+
+    Allows background execution of processing algorithms.
+
+    Not exposed anywhere in GUI (yet)
+
+Nyall Dawson 	2017-05-15
+
+    First working pure c++ algorithms
+
+Nyall Dawson 	2017-05-15
+
+    Push parameters into processAlgorithm and related functions
+
+Nyall Dawson 	2017-05-15
+
+    Refactor Algorithm setParamValues -> getParamValues
+
+    Now returns a dict of parameter inputs for the algorithm
+
+Nyall Dawson 	2017-05-15
+
+    Partially port wrappers to QgsProcessingParameterDefinition
+
+    And create a new WidgetWrapperFactory for creating a suitable wrapper
+    corresponding to a parameter
+
+Nyall Dawson 	2017-05-15
+
+    Move alg character definitions to __init__
+
+Nyall Dawson 	2017-05-15
+
+    Move getParametersPanel out of algorithm class
+
+    It's a gui related method, so shouldn't be in core class
+
+Nyall Dawson 	2017-05-19
+
+    Remove help related methods from GeoAlgorithm
+
+Nyall Dawson 	2017-05-15
+
+    Port algorithm help to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-05-15
+
+    Port getCustomParametersDialog to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-05-15
+
+    Add framework for algorithm outputs
+
+    This somewhat changes the meaning of outputs from processing 2.x.
+    In 2.x processing outputs were used both as a method of specifying
+    inputs to algorithms (file paths to destination layers created
+    by the algorithm) AND pure outputs (such as statistics calculated
+    by the algorithm).
+
+    This is now split. The old input-type-outputs (destination layers)
+    are now input parameters (since the parameter value IS an input to the
+    algorithm). To differentiate them from parameters indicating pure
+    input layers a new "isDestination()" method was added to
+    QgsProcessingParameterDefinition.
+
+    Output definitions are now purely indications of values CREATED
+    by the algorithms. Suitable candidates are the existing calculated
+    stats and actual file path/URI of any layers created by the algorithm.
+    Moving forward we should ensure all algorithms output as much
+    useful information as possible - e.g. number of features processed,
+    number of skipped features, count null geometries encountered, etc...
+
+Nyall Dawson 	2017-05-15
+
+    Move execution check to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-05-19
+
+    [processing] Remove all remaining algorithm copies
+
+    Algorithms are no longer copied - just a single const instance
+    of each algorithm is used
+
+Nyall Dawson 	2017-05-19
+
+    Add native c++ algorithm provider
+
+Nyall Dawson 	2017-05-15
+
+    Port algorithm countVisibleParameters to c++
+
+Nyall Dawson 	2017-05-19
+
+    Temporarily deactivate all processing providers/algorithms
+
+    While the processing API is in such a state of flux it's
+    become unmaintainable to port these algorithms change-by-change.
+    Instead, disable them all until the API is fixed, and then we
+    can port them algorithm by algorithm and reactivate each
+    test in turn.
+
+Nyall Dawson 	2017-06-06
+
+    Disable QgsTaskManager::waitForFinished test by default
+
+    The test intermittently fails on Travis builds, likely due
+    to the platform's inconsistent availability to multiple threads.
+
+Denis Rouzaud 	2017-06-02
+
+    sipify core raster part 3
+
+Denis Rouzaud 	2017-06-05
+
+    fix external lib path
+
+Denis Rouzaud 	2017-06-02
+
+    run code_layout build from top CMakeLists
+
+    instead of adding an extra CMakeLists in .ci/travis/code_layout to build API doc, astyle and run tests (indentation, spelling, sip, doc coverage), the top CMakeLists has been adapted to allow not building core libraries and possibly just the static code layout
+    * astyle has been moved from /src/astyle to /lib/astyle (I would propose to move all external libraries, and possibly add git submodules)
+
+Denis Rouzaud 	2017-05-31
+
+    fix test import
+
+Denis Rouzaud 	2017-05-31
+
+    run Doxygen and doc coverage test on static Travis config
+
+rldhont 	2017-06-05
+
+    [Server] Replace list.size() > 0 by !list.isEmpty()
+
+rldhont 	2017-06-05
+
+    [Server] Test update masks WMS_GetMap_Annotations and  WMS_GetMap_Highlight
+
+rldhont 	2017-06-02
+
+    [Server] Replaced unnecessary QStringLiteral by character
+
+rldhont 	2017-06-02
+
+    [Server] WMS GetMap throw exception is layer nickname is not available
+
+rldhont 	2017-06-02
+
+    [Server] Replace list.size() < 1 by list.isEmpty()
+
+rldhont 	2017-05-31
+
+    [Server] Replaced unnecessary QStringLiteral by character
+
+Juergen E. Fischer 	2017-06-05
+
+    fix oracle provider build
+
+Merge: 09e03650f7 6fed80b1e9
+Nyall Dawson 	2017-06-05
+
+    Merge pull request #4679 from nyalldawson/selected_feature_source
+
+    QgsVectorLayerSelectedFeatureSource
+
+Merge: 27850fb00e 3388857526
+Nyall Dawson 	2017-06-05
+
+    Merge pull request #4680 from nyalldawson/unique_values
+
+    Move uniqueValues to QgsFeatureSource
+
+Nyall Dawson 	2017-06-05
+
+    Move uniqueValues to QgsFeatureSource
+
+    Also change signature of QgsVectorLayer/QgsVectorDataProvider
+    uniqueValues method to match (and improve API)
+
+Merge: f69d1c2065 2c5e52b3f1
+Alexander Bruy 	2017-06-05
+
+    Merge pull request #4592 from alexbruy/messagebars-for-db
+
+    Use QgsMessageBar instead of QMessageBoxes to show result of testing connection
+
+Nyall Dawson 	2017-06-05
+
+    Add a couple more tests for QgsVectorLayerSelectedFeatureSource
+
+Nyall Dawson 	2017-06-05
+
+    Create QgsVectorLayerSelectedFeatureSource
+
+    ...which is a QgsFeatureSource subclass which only considers
+    selected features from a QgsVectorLayer
+
+Nyall Dawson 	2017-06-05
+
+    Convert isolated '...' strings to '…'
+
+    Ideally we'd replace ALL ... instances to …, but need to
+    first work out how to avoid the translation burden of this
+    change
+
+Nyall Dawson 	2017-06-05
+
+    Fix inconsistent capitalization
+
+Nyall Dawson 	2017-06-05
+
+    Make paletted raster widget behave the same as categorized widget
+    when changing current band
+
+    Now the widget asks users if they want to delete existing categories
+    when they switch a band, just like how the categorized renderer
+    widget asks when the categorized field is changed.
+
+Nyall Dawson 	2017-06-05
+
+    Make paletted raster widget behave more like vector categorized
+    renderer widget
+
+    Since they are basically counterparts to each other
+
+Juergen E. Fischer 	2017-06-04
+
+    remove unused provider mManagerMode member
+
+Nyall Dawson 	2017-06-05
+
+    Fix doxygen test
+
+Juergen E. Fischer 	2017-06-04
+
+    oracle provider: fix build
+
+Merge: 0f2a49d9b5 ae8b71edeb
+Nyall Dawson 	2017-06-04
+
+    Merge pull request #4670 from nyalldawson/widget_action_header
+
+    New classes QgsMenuHeader, QgsMenuHeaderWidgetAction
+
+Nyall Dawson 	2017-06-04
+
+    [FEATURE] Fix incorrectly swapper layer_property function min_scale and max_scale values
+
+    The values returned were the opposite of what's shown in the GUI.
+
+    Marked as feature as reminder to include this project break in the
+    release notes
+
+Nyall Dawson 	2017-06-04
+
+    Swap QgsMapLayer min/max scale API definitions
+
+    setMaximumScale() and setMinimumScale(), maximumScale() and
+    minimumScale() had the opposite meaning to other min/max scales
+    in the API, and were the opposite to how these settings were
+    exposed in the GUI. This lead to very confusing API!!
+
+    Their definitions have now been swapped. setMaximumScale
+    now sets the maximum (i.e. largest scale, or most zoomed in)
+    at which the layer will appear, and setMinimumScale now sets
+    the minimum (i.e. smallest scale, or most zoomed out) at
+    which the layer will appear. The same is true for the
+    maximumScale and minimumScale getters.
+
+Matthias Kuhn 	2017-06-02
+
+    Remove Point3D
+
+    ... in favor of QgsPoint
+    Reference https://github.com/qgis/qgis3.0_api/issues/71
+
+Matthias Kuhn 	2017-06-02
+
+    Document API change
+
+Matthias Kuhn 	2017-06-02
+
+    Rename qgspoint.h and qgspointv2.h
+
+    To qgspointxy.h
+    And qgspoint.h
+
+Matthias Kuhn 	2017-06-02
+
+    QgsPoint migration
+
+Matthias Kuhn 	2017-06-02
+
+    fix server
+
+Matthias Kuhn 	2017-06-02
+
+    Fix tests
+
+Matthias Kuhn 	2017-06-01
+
+    [travis] Better match pattern for colorizing failing tests
+
+Matthias Kuhn 	2017-06-01
+
+    Fix QgsPointXY issues
+
+Matthias Kuhn 	2017-06-01
+
+    Fix python plugins
+
+Matthias Kuhn 	2017-06-01
+
+    Fix python test imports
+
+Matthias Kuhn 	2017-06-01
+
+    Rename QgsPointV2 to QgsPoint and QgsPoint to QgsPointXY
+
+    Because 3D coordinates should be the default.
+
+    References https://github.com/qgis/qgis3.0_api/issues/36
+
+Matthias Kuhn 	2017-06-01
+
+    Gadgetize QgsPointV2
+
+Merge: 78c3423861 7a2ce49408
+Alessandro Pasotti 	2017-06-02
+
+    Merge pull request #4629 from boundlessgeo/unified-button
+
+    Add layer button
+
+Alessandro Pasotti 	2017-06-02
+
+    [addlayerbutton] Connect and forward all signals from browser to app
+
+Sandro Santilli 	2017-06-02
+
+    For GDAL sake extract a dbname from the connection
+
+    Works around GDAL limitation reported in:
+    https://trac.osgeo.org/gdal/ticket/6910
+
+    Ref #16625
+    Ref #16626
+
+Alessandro Pasotti 	2017-06-02
+
+    [addlayerbutton] Replace icon for the datasourcemanager
+
+Alessandro Pasotti 	2017-05-30
+
+    [addlayerbutton] Fix height problems within the delimited text dialog
+
+    Also moved the status information under the button bas for
+    consistency with other dialogs.
+
+Alessandro Pasotti 	2017-05-30
+
+    [addlayerbutton] Prevent a crash when the layer list is rebuilt after a change in the layer tree
+
+Alessandro Pasotti 	2017-05-30
+
+    [addlayerbutton] Removed button bar from main dialog
+
+    No Close button anymore ... prepare your wrist for
+    a precise hit on the [X] or hit ESC to close the
+    dialog.
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] Data Source Manager toolbar and menu
+
+    This implements the proposal from @SrNeto:
+
+    - new toolbar with the new dialog button and
+      all the "new" data soource buttons
+    - old layer toolbar hidden by default
+    - new dialog open from first item in layer menu
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] New GUI for the delimited text dlg by Luigi Pirelli
+
+Alessandro Pasotti 	2017-05-29
+
+    Removed old comment
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] Removed all the individual source select slots
+
+    In favour of the unified dialog.
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] Fix order of signals when open page called
+
+    The problem was with raster "tab" (that is not a real page
+    but a forwarded signal to the app), when openPage
+    was called before the show() call.
+
+    Moving the activation inside the unique currentPage call,
+    the implementation is much simpler (got rid of the lambda
+    with the second currentRowChanged connection).
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] Add method to open a given page in the layer dlg
+
+    This is preliminary to change all dialogs slots to
+    open the unified dialog with the righ page open.
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] Added option for modeless layer dialog (default false)
+
+Alessandro Pasotti 	2017-05-29
+
+    [addlayerbutton] Removed help button
+
+    Almost all provider dialogs have its own button
+    resulting in duplicated help buttons in the
+    unified dialog.
+
+Alessandro Pasotti 	2017-05-28
+
+    [addbuttonlayer] Fix layout of vector dialog
+
+    This is an attempt to fix the layout of the vector
+    layer dialog to fit in the unified dialog layout.
+
+    The optiomal solution would probably involve
+    a complete refactoring of the vector layer dialog
+    to use a stacked widget.
+
+Alessandro Pasotti 	2017-05-27
+
+    [addlayerbutton] Larry Shaffer's fix to the raster button
+
+    Tricky solution, but temporary
+
+Alessandro Pasotti 	2017-05-26
+
+    [addlayerbutton] Raster support added
+
+    There is still an issue with the list not being
+    correclty reset after the raster icon is selected.
+
+Alessandro Pasotti 	2017-05-26
+
+    [addlayerbutton] Virtual Layers support added
+
+    Some changes in connections are required to keep in sync
+    the available layers lists in the virtual layer dialog.
+
+    (Modeless support is on the way)
+
+Alessandro Pasotti 	2017-05-25
+
+    [addlayerbutton] Added delimited text layers
+
+Alessandro Pasotti 	2017-05-25
+
+    [addlayerbutton] Use enum for window mode instead of booleans
+
+Alessandro Pasotti 	2017-05-25
+
+    [addlayerbutton] Initialise pointer
+
+Alessandro Pasotti 	2017-05-25
+
+    [addlayerbutton] Added help button (URL is still a placeholder)
+
+Alessandro Pasotti 	2017-05-24
+
+    [addlayerbutton] Use QgsOptionsDialogBase and all its nice features and styles
+
+Alessandro Pasotti 	2017-05-24
+
+    [addlayerbutton] Removed merge markers
+
+Alessandro Pasotti 	2017-05-24
+
+    [addlayerbutton] Show Add button in embedded spatialite dialog
+
+Alessandro Pasotti 	2017-05-24
+
+    [addlayerbutton] More embeddable dialogs
+
+Alessandro Pasotti 	2017-05-23
+
+    [addlayerbutton] New signals for new interfaces
+
+Alessandro Pasotti 	2017-05-23
+
+    [addlayerbutton] Added more providers and get canvas from ctor
+
+Alessandro Pasotti 	2017-05-23
+
+    [addlayerbutton] Embedded dialog support
+
+Alessandro Pasotti 	2017-05-23
+
+    [addlayerbutton] Pass canvas to the manager (needed by AMS)
+
+Alessandro Pasotti 	2017-05-22
+
+    [addlayerbutton] Add embedded option to spatialite dlg
+
+Alessandro Pasotti 	2017-05-19
+
+    [addlayerbutton] Added embeddedMode to all providers
+
+    Also switched managerMode and embeddedMode arguments
+    for a more logical arg passing from the factory function.
+
+Alessandro Pasotti 	2017-05-19
+
+    [addlayerbutton] Added WFS, WMS and vector layers
+
+Alessandro Pasotti 	2017-05-19
+
+    [addlayerbutton] Add embedded flag for widget-like usage
+
+Alessandro Pasotti 	2017-05-18
+
+    [addlayerbutton] Initial implementation
+
+Sandro Santilli 	2017-06-02
+
+    Fix typo in URI service extraction (introduced in 93624b08)
+
+    Also add a comment about lack of support in GDAL up to 2.2.x for
+    service specification in datasource uri
+
+    Ref #16626
+
+Merge: 2d78ef80a9 d62d444ea7
+Alessandro Pasotti 	2017-06-02
+
+    Merge pull request #4659 from boundlessgeo/browser-to-gui
+
+    Move QgsBrowserDockWidget from app to gui
+
+Alessandro Pasotti 	2017-06-01
+
+    Moved support classes into own private header
+
+Alessandro Pasotti 	2017-06-01
+
+    Added docs and SIP bindings for QgsBrowserDockWidget
+
+Alessandro Pasotti 	2017-05-31
+
+    Move QgsBrowserDockWidget from app to gui
+
+Denis Rouzaud 	2017-06-02
+
+    handle PyName for enums
+
+Denis Rouzaud 	2017-06-01
+
+    sipify core raster part 2
+
+Nyall Dawson 	2017-06-02
+
+    Correctly handle when either min or max map layer scale visibility
+    is set to 0
+
+    0 is intrepreted as "no limit"
+
+Radim Blazek 	2017-06-02
+
+    removed unused block in postgres provider
+
+Alexander Bruy 	2017-06-02
+
+    [processing] always look for SAGA LTR first (fix #16648)
+
+Alexander Bruy 	2017-06-02
+
+    [processing] fix description for GRASS 7 v.drape algorithm (fix #16175)
+
+Juergen E. Fischer 	2017-06-02
+
+    new http connection: parse service less fragile (fixes #16653; followup 1ca73f4f)
+
+Mathieu Pellerin 	2017-06-02
+
+    [save as image] attach scope variables
+
+    This is needed to properly render symbols with
+    expression-based styling rely on those.
+
+Nyall Dawson 	2017-06-02
+
+    Add missing ellipsis to decoration menu items
+
+Nyall Dawson 	2017-06-02
+
+    New classes QgsMenuHeader, QgsMenuHeaderWidgetAction
+
+    Custom widgets designed for displaying subheaders within a QMenu
+    in a standard style (i.e. matching the subheaders shown within
+    the color button drop down menus)
+
+Nyall Dawson 	2017-06-02
+
+    Silence some Coverity unchecked return value warnings
+
+Merge: b2360dfd22 5f7178a581
+Nyall Dawson 	2017-06-02
+
+    Merge pull request #4668 from SrNetoChan/select_attributes_fix
+
+    Fixes missing Icon in Select Attribute Dialog
+
+Nyall Dawson 	2017-06-02
+
+    Update test mask for WMS server diagrams test
+
+Nyall Dawson 	2017-06-02
+
+    When holding ctrl while mouse wheeling on spin box, increase
+    in smaller amounts
+
+    Default Qt behavior is to increase step size 10x when ctrl
+    is held while mouse wheel - but everywhere else in QGIS
+    UI we use the ctrl modifier as a "finer" increment with
+    the mouse wheel (e.g. ctrl+wheel = fine zoom into map/composer).
+
+    So override Qt's behavior and instead make ctrl modifier result
+    in 1/10th usual increment for spin boxes.
+
+Nyall Dawson 	2017-06-02
+
+    Add method to convert QgsUnitTypes::RenderUnit to translated string
+
+Nyall Dawson 	2017-06-02
+
+    Fix mouse wheel modifications to colors in QgsColorRampWidget
+
+Alexandre Neto 	2017-06-01
+
+    Fix missing Icon in Select Attribute Dialog
+
+Merge: e9a7dffb5a e663d192e3
+rldhont 	2017-06-01
+
+    Merge pull request #4313 from pblottiere/cleansingleton
+
+    [Server] WMS getmap refactoring
+
+Radim Blazek 	2017-06-01
+
+    added Z,M,ZM types to postgres output, allowed AddFeatures for layers with measures
+
+Matthias Kuhn 	2017-06-01
+
+    [travis] Allow failures on macos
+
+    Seems to be an upstream issue
+
+Etienne Trimaille 	2017-06-01
+
+    sipify OSM classes
+
+Denis Rouzaud 	2017-06-01
+
+    sip doesn't like named argument in operators (apparently)
+
+Denis Rouzaud 	2017-06-01
+
+    fix missing private operator
+
+Denis Rouzaud 	2017-06-01
+
+    sipify core raster part 1
+
+Merge: 2f9bfc5653 19ca0e00a7
+Nyall Dawson 	2017-06-01
+
+    Merge pull request #4606 from nyalldawson/feature_locator
+
+    [FEATURE] Active layer feature locator filter
+
+Merge: f359ffb562 d8d17524b2
+Nyall Dawson 	2017-06-01
+
+    Merge pull request #4661 from nyalldawson/feature_index
+
+    Add method for manually inserting features into spatial indexes
+
+Nyall Dawson 	2017-06-01
+
+    Avoid issues if active layer changes
+
+Nyall Dawson 	2017-06-01
+
+    Only search text and numeric fields
+
+Merge: 5077e1285e babfb6bef9
+Nyall Dawson 	2017-06-01
+
+    Merge pull request #4625 from nyalldawson/comp_extent
+
+    [FEATURE] New decoration type for showing composer map extents
+
+Nyall Dawson 	2017-06-01
+
+    Optimise queries - use a single feature request which combines
+    all field checks instead of firing off multiple requests
+    for every field
+
+Nyall Dawson 	2017-05-23
+
+    [FEATURE] Active layer feature locator filter
+
+    Searches for matching attributes in any field from the current
+    active layer.
+
+Nyall Dawson 	2017-06-01
+
+    Allow optional labels for composer extent decorations
+
+Nyall Dawson 	2017-06-01
+
+    Make QgsTextFormat::readXml more forgiving to input element
+
+Nyall Dawson 	2017-06-01
+
+    Only show extent of open composer windows
+
+Nyall Dawson 	2017-05-24
+
+    [FEATURE] New decoration type for showing composer map extents
+
+    Adds a new (disabled by default) decoration item for showing
+    the extents of composer maps in the main canvas. When enabled,
+    the extents of all maps within all composers will be shown
+    using a lightly dotted border. The border symbol is configurable
+    for improved legibility against different map backgrounds.
+
+    This is useful when you're tweaking the positioning of map elements
+    such as labels, and need to know what the actual visible region
+    of composer maps are.
+
+Nyall Dawson 	2017-06-01
+
+    Make QgsSpatialIndex protected members private
+
+    The class is not designed to be subclassed
+
+Nyall Dawson 	2017-06-01
+
+    Add method for manually inserting features into spatial indexes
+
+    i.e. inserting a feature with a different bounding box to that
+    feature's actual geometry
+
+Merge: 451bda0012 9e147413db
+Nyall Dawson 	2017-06-01
+
+    Merge pull request #4652 from nyalldawson/extent
+
+    [FEATURE] Add option to take extent from project map layer to QgsExtentGroupBox
+
+Nyall Dawson 	2017-06-01
+
+    Move logic for maintaining exact extent when CRS changes from
+    raster layer save as dialog to QgsExtentGroupBox, add tests
+
+Nyall Dawson 	2017-05-31
+
+    Try to fix Travis build failure
+
+Merge: 2148fa9287 bb789e99b2
+rldhont 	2017-05-31
+
+    Merge pull request #4644 from rldhont/server-wms-configparser-getstyles
+
+    [Server] WMS GetStyles (and GetStyle) refactoring
+
+Harrissou Sant-anna 	2017-05-31
+
+    Typo fix: Add missing spacing
+
+Denis Rouzaud 	2017-05-31
+
+    handle protected inheritance, rename ui class to avoid class name collision
+
+Denis Rouzaud 	2017-05-31
+
+    sip gui layertree and raster
+
+rldhont 	2017-05-27
+
+    [Server] WMS GetStyles (and GetStyle) refactoring
+
+Nyall Dawson 	2017-05-31
+
+    Remove unnecessary ellipsis from string
+
+Nyall Dawson 	2017-05-31
+
+    Ensure extent is updated when QgsExtentGroupBox crs is changed
+
+Nyall Dawson 	2017-05-31
+
+    Add unit tests for QgsExtentGroupBox
+
+Nyall Dawson 	2017-05-31
+
+    Clean up QgsExtentGroupBox API
+
+    Make protected members private, improve documentation
+
+Nyall Dawson 	2017-05-31
+
+    [FEATURE] Add option to take extent from project map layer
+    to QgsExtentGroupBox
+
+    This allows matching another layer's extent in the save vector/
+    raster layer dialog, among others
+
+    Fix #16357
+
+Etienne Trimaille 	2017-05-31
+
+    sipify
+
+Denis Rouzaud 	2017-05-31
+
+    add missing ConvertToSubClass sections
+
+Denis Rouzaud 	2017-05-31
+
+    sipify gui auth classes
+
+Mathieu Pellerin 	2017-05-31
+
+    fix project re-load missing layers (fixes #16560)
+
+Merge: 8ce847f9b4 c019314f86
+Nyall Dawson 	2017-05-31
+
+    Merge pull request #4646 from nyalldawson/rotation
+
+    Unify UX behavior, pt 2: rotation
+
+Nyall Dawson 	2017-05-30
+
+    Update more rotation widgets to standard behavior, fix tests
+
+Denis Rouzaud 	2017-05-30
+
+    more constness
+
+Radim Blazek 	2017-05-30
+
+    force not shared postgres connection on non main thread
+
+Alexander Bruy 	2017-05-30
+
+    fix icon loading in the nohelp.html file
+
+Denis Rouzaud 	2017-05-30
+
+    add Factory annotation to clone() methods
+
+Denis Rouzaud 	2017-05-30
+
+    missing annotation and fix warning
+
+Denis Rouzaud 	2017-05-30
+
+    partial fix of snapping config issues
+
+Blottiere Paul 	2017-05-30
+
+    Add/update tests
+
+Sandro Santilli 	2017-05-30
+
+    ENABLE_PGTESTS doesn't really make sense w/out ENABLE_TESTS
+
+    [ci skip]
+
+Radim Blazek 	2017-05-30
+
+    enabled to save as vector with measure
+
+Blottiere Paul 	2017-05-30
+
+    Update sip binding
+
+Blottiere Paul 	2017-05-30
+
+    GetMap refactoring
+
+Sandro Santilli 	2017-05-30
+
+    Fix typo
+
+Radim Blazek 	2017-05-30
+
+    updated min required versions in INSTALL
+
+Nyall Dawson 	2017-05-30
+
+    Sipify update
+
+Nyall Dawson 	2017-05-30
+
+    Unify behaviour of more rotation controls
+
+Nyall Dawson 	2017-05-30
+
+    Unify label rotation with other rotation settings
+
+    Label rotation is now specified in degrees clockwise, just like
+    symbol rotation, map rotation, etc.
+
+    Fix #4518
+
+Sandro Santilli 	2017-05-26
+
+    Pass "service" parameter to gdal when opening PostGIS Rasters
+
+    See #16626 - needs backport to 2.18
+
+Nyall Dawson 	2017-05-30
+
+    Unify behavior of more rotation widgets
+
+Nyall Dawson 	2017-05-30
+
+    Make QgsMapSettings rotation API docs follow same standard as other rotation API
+
+Nyall Dawson 	2017-05-30
+
+    Update diagram renderer to use rotation in degrees clockwise
+
+Nyall Dawson 	2017-05-30
+
+    Allow transform effect rotation from -360 to 360
+
+Nyall Dawson 	2017-05-30
+
+    [composer] Improve picture rotation API docs
+
+Nyall Dawson 	2017-05-30
+
+    [composer] Allow map rotation from -360 to 360
+
+    Fix #15823
+
+    Also reenable instant map refresh as map rotation changes. Since
+    map refresh is done in the background now, this is safe to reenable.
+
+Nyall Dawson 	2017-05-30
+
+    [composer] Allow item rotation from -360->360
+
+    Fix #12696
+
+Merge: 9e1108243c e8b11a3b0a
+Nyall Dawson 	2017-05-30
+
+    Merge pull request #4641 from nyalldawson/alpha
+
+    Unify opacity UI/API, pt 1
+
+Merge: b2ba450d46 ca7cd631d8
+Alexander Bruy 	2017-05-30
+
+    Merge pull request #4593 from alexbruy/create-raster-api
+
+    [API] convenience API call to create empty raster file with given number of bands
+
+Nyall Dawson 	2017-05-30
+
+    Fix test
+
+Nyall Dawson 	2017-05-30
+
+    Change some remaining alpha/transparency strings to opacity
+
+Nyall Dawson 	2017-05-30
+
+    Flip 'alpha' to 'opacity' in gui API
+
+Nyall Dawson 	2017-05-30
+
+    Use QgsOpacityWidget wherever appropriate
+
+Nyall Dawson 	2017-05-30
+
+    Fix build
+
+Nyall Dawson 	2017-05-30
+
+    Create new QgsOpacityWidget widget
+
+    Allows consistent behavior and appearance across all opacity controls
+
+Nyall Dawson 	2017-05-30
+
+    Flip symbology from alpha/transparency to opacity
+
+Nyall Dawson 	2017-05-30
+
+    Raster API opacity documentation
+
+Nyall Dawson 	2017-05-29
+
+    Fix tests
+
+Nyall Dawson 	2017-05-29
+
+    Flip QgsVectorLayer from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Flip Transparency property type to Opacity
+
+Nyall Dawson 	2017-05-29
+
+    Change labeling from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Remove ancient disabled layer transparency code
+
+Nyall Dawson 	2017-05-29
+
+    Fix test
+
+Nyall Dawson 	2017-05-29
+
+    Flip some doxygen from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Flip QgsDiagramSettings from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Flip QgsShadowEffect from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Flip QgsDrawSourceEffect from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Flip QgsGlowEffect from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Flip QgsColorEffect from transparency to opacity
+
+Nyall Dawson 	2017-05-29
+
+    Change QgsBlurEffect to use opacity instead of transparency
+
+Nyall Dawson 	2017-05-29
+
+    Change QgsComposerItem to use opacity instead of transparency
+
+Nyall Dawson 	2017-05-30
+
+    Fix build warning
+
+Denis Rouzaud 	2017-05-29
+
+    remove useless Python version variable
+
+Hugo Mercier 	2017-05-29
+
+    Fix attribute form python cleanup
+
+Denis Rouzaud 	2017-05-29
+
+    include gdal_version and add private constructor
+
+Etienne Trimaille 	2017-05-21
+
+    sipify
+
+rldhont 	2017-05-27
+
+    [Server] Add GetStyles test
+
+Merge: d996cf28cd 8a0261c94e
+rldhont 	2017-05-29
+
+    Merge pull request #4637 from rldhont/server-wms-configparser-describelayer
+
+    [Server] WMS DescribeLayer refactoring
+
+nirvn 	2017-05-29
+
+    clean up expression convertion errors
+
+nirvn 	2017-05-26
+
+    [FEATURE] create_ramp() expression function
+
+Denis Rouzaud 	2017-05-29
+
+    improved sipify code layout
+
+Nyall Dawson 	2017-05-29
+
+    Fix missing break statements (identified by Coverity)
+
+Nyall Dawson 	2017-05-29
+
+    Fix memory leak in TestQgsPaintEffect
+
+Nyall Dawson 	2017-05-29
+
+    Fix memory leak, potential crash when creating QgsVectorLayerSimpleLabeling
+
+    Identified by Coverity
+
+Nyall Dawson 	2017-05-29
+
+    Fix memory leak when cloning vector layers
+
+Merge: a9370af19c 14fcddb6e7
+Nyall Dawson 	2017-05-29
+
+    Merge pull request #4601 from timlinux/contributors
+
+    Added Ismail Sunni and Etienne Trimaille to contributors list
+
+Nyall Dawson 	2017-05-29
+
+    Fix potential crashes in geometry checker (identified by Coverity)
+
+Nyall Dawson 	2017-05-29
+
+    Fix memory leaks in processing tests
+
+Merge: ba079d80c9 0a661d5b10
+Nyall Dawson 	2017-05-29
+
+    Merge pull request #4598 from Gustry/atlas_expressions
+
+    [needs-docs] add layerid and layername to atlas expressions
+
+Nyall Dawson 	2017-05-27
+
+    Fix crash when reordering composer items via drag and drop
+
+    Caused by internal Qt bug when multiple QSortFilterProxyModels
+    used by widgets are attached to a parent model which calls
+    beginMoveRows.
+
+    Adds some tests, but none reproduce the crash. Not reproducable
+    on Qt5 builds.
+
+Merge: 9cfe70c058 5b0bc93834
+Nyall Dawson 	2017-05-27
+
+    Merge pull request #4627 from nyalldawson/json_format
+
+    Use field formatter when exporting feature attributes to JSON
+
+Merge: 13e39da074 47ffb588fe
+Nyall Dawson 	2017-05-27
+
+    Merge pull request #4624 from nyalldawson/feature_source
+
+    QgsFeatureSource
+
+Sandro Santilli 	2017-05-26
+
+    Ensure "dbname" is set in the uri, once again
+
+    Fixes #16625 (ref #10600)
+
+rldhont 	2017-05-26
+
+    [Server] WMS DescribeLayer refactoring
+
+rldhont 	2017-05-26
+
+    [Server] Rename QgsServerProjectUtils::wcsLayers to QgsServerProjectUtils::wcsLayerIds
+
+rldhont 	2017-05-26
+
+    [Server] Add DescribeLayer test
+
+Merge: 8c873b14b8 ce3cbeb963
+rldhont 	2017-05-26
+
+    Merge pull request #4630 from rldhont/server-wms-configparser-getcontext
+
+    [Server] WMS GetContext refactoring
+
+rldhont 	2017-05-25
+
+    [Server] Add GetContext accesscontrol test
+
+rldhont 	2017-05-25
+
+    [Server] Add GetContext test
+
+rldhont 	2017-05-25
+
+    [Server] Fix QgsServerProjectUtils readListEntry
+
+rldhont 	2017-05-25
+
+    [Server] WMS GetContext refactoring
+
+Juergen E. Fischer 	2017-05-26
+
+    avoid slashes in connection names (followup 30900e9b8; fixes #16624)
+
+Alexander Bruy 	2017-05-26
+
+    [processing] explisitly load outputs as raster or vector depending
+    on the output type. Don't rely on extension or other indirect attributes
+
+Sandro Santilli 	2017-05-26
+
+    Add test for QgsScaleRangeWidget::setScaleRange
+
+    See #15463 as this test guards after the fix for that bug
+    (minScale visibility corrupted upon project load)
+
+Sandro Santilli 	2017-05-23
+
+    When setting scale range, make sure to set min before max scale
+
+    This ensures the limit on max scale imposed by previously set min
+    scale does not trim the new value.
+
+    Fixes #15463
+
+    (cherry picked from commit 55ffbf5e932ede65144474c4854000708757b700)
+
+Mathieu Pellerin 	2017-05-26
+
+    [composer] fix export atlas as image crash (fixes #16623)
+
+Nyall Dawson 	2017-05-25
+
+    Fix some providers not requesting all required attributes needed
+    for client side order by clauses
+
+rldhont 	2017-05-25
+
+    [Server] fix wmsInspireActivated to wmsInspireActivate
+
+Nyall Dawson 	2017-05-25
+
+    Split ProviderTestCase into provider/source tests
+
+    There's now a FeatureSourceTestCase base class which handles
+    testing QgsFeatureSources for conformance. These tests
+    consist mostly of tests which where previously in
+    ProviderTestCase. ProviderTestCase now subclasses
+    FeatureSourceTestCase + adds tests which are specific
+    to QgsVectorDataProviders.
+
+Nyall Dawson 	2017-05-24
+
+    Add missing overrides
+
+Nyall Dawson 	2017-05-24
+
+    QgsFeatureSource/Sink can be stored in QVariant
+
+Nyall Dawson 	2017-05-24
+
+    Add crs, fields, wkbType and featureCount to QgsFeatureSource
+
+Nyall Dawson 	2017-05-24
+
+    QgsVectorLayer, QgsVectorDataProvider are QgsFeatureSources
+
+Nyall Dawson 	2017-05-24
+
+    Add QgsFeatureSource interface as interface for classes which
+    provide feature iterators via a getFeatures method
+
+Nyall Dawson 	2017-05-25
+
+    More windows build fixes
+
+Juergen E. Fischer 	2017-05-25
+
+    Revert "fix windows build (followup dd40a3d)"
+
+    This reverts commit b3f2fe2b5504ef3dbb57c719c8da57ddbf7e621f.
+
+Merge: f63adfe145 599db1b7fd
+Nyall Dawson 	2017-05-25
+
+    Merge pull request #4628 from nyalldawson/fix_16390
+
+    [composer] Refresh data defined properties after page size changes
+
+Nyall Dawson 	2017-05-25
+
+    Rename QgsJSONExporter/Utils to QgsJsonExporter/Utils
+
+    Follows proper QGIS/Qt capitalization convention
+
+Nyall Dawson 	2017-05-25
+
+    Small optimisations
+
+Nyall Dawson 	2017-05-24
+
+    Use field formatter when exporting feature attributes to JSON
+
+    This means that field values which utilise widget setups like
+    value maps will correctly show the "friendly" value
+    for the field, instead of the raw values.
+
+Nyall Dawson 	2017-05-24
+
+    Use weak layer pointer instead of layer id in QgsJsonExporter
+
+Denis Rouzaud 	2017-05-24
+
+    [sipify] keep external forward declaration
+
+Denis Rouzaud 	2017-05-23
+
+    sipify core effects
+
+Denis Rouzaud 	2017-05-24
+
+    QgsCharacterSelectorDialog: rename file name according to class name
+
+Denis Rouzaud 	2017-05-23
+
+    sipify gui part 2
+
+Denis Rouzaud 	2017-05-24
+
+    [sipify] handle constrained annotation
+
+Denis Rouzaud 	2017-05-23
+
+    sipify gui part 3
+
+Denis Rouzaud 	2017-05-23
+
+    sipify gui part 4
+
+Denis Rouzaud 	2017-05-23
+
+    sipify gui part 5
+
+Nyall Dawson 	2017-05-24
+
+    [composer] Refresh data defined properties after page size changes
+
+    Fix #16390
+
+Denis Rouzaud 	2017-05-24
+
+    add default constructors to QgsFieldFormatter inherited classes
+
+Denis Rouzaud 	2017-05-23
+
+    sipify core field formatter
+
+Denis Rouzaud 	2017-05-24
+
+    [sip] handle Deprecated annotations
+
+    some additional fixes in headers too
+
+Denis Rouzaud 	2017-05-23
+
+    sipify gui part 1
+
+Juergen E. Fischer 	2017-05-24
+
+    spelling fix
+
+Juergen E. Fischer 	2017-05-24
+
+    fix windows build (followup dd40a3d)
+
+Denis Rouzaud 	2017-05-23
+
+    sipify diagram classes
+
+Denis Rouzaud 	2017-05-24
+
+    template classes are not imperatively exported
+
+    followup a14ad32b676664cef99f4d43f0a54b4d1ee88f52
+    fixes win build
+
+Luigi Pirelli 	2017-05-01
+
+    Avoid row sorts during attribute editing in AttributeTable Fix #15976
+
+Denis Rouzaud 	2017-05-23
+
+    [sip] more reverse engineering
+
+Alessandro Pasotti 	2017-05-23
+
+    [bugfix] Fixes an unreported crash in WFS
+
+Denis Rouzaud 	2017-05-23
+
+    sipify QgsVectorLayerFeatureIterator
+
+Denis Rouzaud 	2017-05-23
+
+    reverse sipify override methods
+
+Denis Rouzaud 	2017-05-23
+
+    sipify auth classes
+
+Denis Rouzaud 	2017-05-23
+
+    sipify batch
+
+Alexander Bruy 	2017-05-23
+
+    add test for createMultiBandRaster
+
+Alexander Bruy 	2017-05-23
+
+    remove not used variable
+
+Alexander Bruy 	2017-05-23
+
+    rename new method to createMultiBandRaster to make it more obvious
+    reorganize arguments
+
+Alexander Bruy 	2017-05-19
+
+    [API] convenience API call to create empty raster file with given
+    number of bands. Will be useful for porting raster analysis code
+    to use QgsRasterBlock instead of GDAL calls.
+
+    Follow up ff8d91214748e0363010e263401212d0b4e0e491
+
+Alexander Bruy 	2017-05-19
+
+    manual deleting of messagebar is not necessary
+
+Alexander Bruy 	2017-05-19
+
+    use messagebar to report test connection results in the Add new Oracle
+    connection dialog
+
+Alexander Bruy 	2017-05-19
+
+    use messagebar to report test connection results in the Add new BD2
+    connection dialog
+
+    Also reduce debug noise
+
+Alexander Bruy 	2017-05-19
+
+    use messagebar to report test connection results in the Add new PostGIS
+    connection dialog
+
+Nyall Dawson 	2017-05-23
+
+    Revert "Immediately show progress bar when opening attribute table"
+
+    This reverts commit 80a000cd98f3caa90d43f44e0b4bde22cffc1c43.
+
+    Causes issues with relation editor widgets
+
+Nyall Dawson 	2017-05-23
+
+    Microoptimise opening attribute table - don't call sort on model when no sort order set
+
+Nyall Dawson 	2017-05-23
+
+    Microoptimise and avoid cache lookup when no sort order set
+
+Nyall Dawson 	2017-05-23
+
+    Immediately show progress bar when opening attribute table
+
+    ...instead of waiting 1 second before first showing it. It's a
+    placebo which doesn't affect the actual opening time, but
+    makes it seem more responsive to users by avoiding the
+    initial 1 second blocking delay before any feedback is
+    given.
+
+Nyall Dawson 	2017-05-23
+
+    Don't prefetch attribute table sort values when no sorting set
+
+    Shaves some seconds off opening the attribute table in certain
+    circumstances (no sorting applied)
+
+    Refs #16577, #16239
+
+Nyall Dawson 	2017-05-23
+
+    Greatly speed up attribute table loading
+
+    Don't advise for rows added when a model reset is in progress.
+    Otherwise the rows are tested for sort order, etc triggering
+    a bunch of useless calculations, given that the model is in
+    the process of being reset anyway.
+
+    Tested using a 150k point shapefile, decreased attribute table
+    load times from 50+ seconds to 4 seconds.
+
+    Refs #16577, #16239
+
+    (forward port from b97a980b99a32f7cbbb8cc32ac6a781246df1171)
+
+Salvatore Larosa 	2017-05-22
+
+    [processing] fix duplicates fields name in field calculator algorithm when switching between layers (followup c2699b4)
+
+Juergen E. Fischer 	2017-05-22
+
+    don't set friendly name without sublayers (followup e0a2267; fixes #16593, #16594, #16598)
+
+Nathan Woodrow 	2017-05-22
+
+    [mssql] Ignore computed columns in insert/update
+
+Merge: d93d0a8066 087e7f75dc
+rldhont 	2017-05-22
+
+    Merge pull request #4597 from rldhont/server-wms-configparser-getcapabilities-part2
+
+    [Server] WMS GetCapabilities refactoring - Part 2
+
+Denis Rouzaud 	2017-05-22
+
+    [sipify] detect multiple variable declarations oneliners
+
+Denis Rouzaud 	2017-05-22
+
+    sipify batch
+
+Nyall Dawson 	2017-05-22
+
+    Fix debug noise
+
+Nyall Dawson 	2017-05-22
+
+    Fix duplicate layout warnings
+
+Nathan Woodrow 	2017-05-22
+
+    Fix Windows build
+
+Nyall Dawson 	2017-05-22
+
+    Don't clear locator model immediately when a new search triggers
+
+    Instead delay the search until either a tiny timeout (100ms) or
+    the first new results come in, whichever happens first.
+
+    This avoids the list view clearing too frequently and giving
+    a distracting "flashing" appearance when users type quickly
+    into to locator bar.
+
+Tim Sutton 	2017-05-22
+
+    Added Ismail Sunni and Etienne Trimaille to contributors list
+
+Merge: 3452e8de69 592c92e15e
+Jürgen Fischer 	2017-05-21
+
+    Merge pull request #4599 from ismailsunni/fix_geos_c
+
+    Fix geos_c.h not found.
+
+Etienne Trimaille 	2017-05-21
+
+    [needs-docs] add layerid and layername to atlas expressions
+
+Juergen E. Fischer 	2017-05-21
+
+    fix osx build
+
+Ismail Sunni 	2017-05-21
+
+    Fix geos_c.h not found.
+
+Juergen E. Fischer 	2017-05-21
+
+    db manager: fix spatialite plugin (followup c77172ed; fixes #16542)
+
+rldhont 	2017-05-21
+
+    [Server] wmsInfoFormatSIA2045 to wmsInfoFormatSia2045: Qt style naming
+
+Juergen E. Fischer 	2017-05-21
+
+    sipify.pl: consider structs in exported classes also exported
+
+Martin Dobias 	2017-05-21
+
+    Fix a crash when confirming config dialog of a locator filter
+
+    The locator was getting invalidated, but there was no feedback object associated for cancellation.
+
+Juergen E. Fischer 	2017-05-20
+
+    creatensis.pl: avoid (harmless) postinstall.log message
+
+    (cherry picked from commit 0be274f4675ae6d8c35927369f0a8c9ea8ed9907)
+
+rldhont 	2017-05-20
+
+    [Server] Update QgsServerProjectUtils SIP file
+
+rldhont 	2017-05-19
+
+    [Server] WMS GetCapabilities refactoring - Part 2
+
+    Part 2 (the last) for removing QgsWMSProjectParser from GetCapabilities
+
+Juergen E. Fischer 	2017-05-19
+
+    Once again fix QgsFeatureRequest::OrderBy on windows (followup b0bb873, 1d5d92e, 8f29f28 and 3c843a8)
+
+Juergen E. Fischer 	2017-05-19
+
+    fix build of oracle provider
+
+Denis Rouzaud 	2017-05-19
+
+    fix sip coverage test
+
+Denis Rouzaud 	2017-05-18
+
+    [sipify] implement template inheritance
+
+Merge: 0a82ab51fe b9929d4c2a
+Alexander Bruy 	2017-05-19
+
+    Merge pull request #4587 from alexbruy/processing-saga
+
+    [processing][needs-docs] always use SAGA shipped with QGIS (refs #16422)
+
+Merge: fe2350c50b 0c72d4bc2b
+Hugo Mercier 	2017-05-19
+
+    Merge pull request #4432 from pblottiere/bugfix_sld
+
+    [bugfix] Fix unit of sizes when reading a SLD file (uom attribute from SLD 1.1 version is supported)
+
+Alexander Bruy 	2017-05-18
+
+    [processing][needs-docs] always use SAGA shipped with QGIS (refs #16422)
+
+Merge: d7b952b4c0 24b16c5fb3
+Matthias Kuhn 	2017-05-19
+
+    Merge pull request #4557 from m-kuhn/expressionModulaizing
+
+    Modularizing the expression engine file structure and some cleanup
+
+Merge: 95ac7d0f7b e0a2267de7
+Alexander Bruy 	2017-05-19
+
+    Merge pull request #4579 from alexbruy/layer-naming
+
+    homogenize layer naming when adding via browser and add vector dialog (fix #15510)
+
+Matthias Kuhn 	2017-05-19
+
+    Fix runtime added functions
+
+Matthias Kuhn 	2017-05-18
+
+    Revert expression TVL as boolean to int
+
+Matthias Kuhn 	2017-05-18
+
+    Revert expression NULL value to invalid QVariant
+
+Matthias Kuhn 	2017-05-18
+
+    Fix build
+
+Matthias Kuhn 	2017-05-18
+
+    Update sip files
+
+Matthias Kuhn 	2017-05-16
+
+    Fix more include paths
+
+Matthias Kuhn 	2017-05-16
+
+    Adapt “@qgsfunction" decorator to new expression structure
+
+Matthias Kuhn 	2017-05-16
+
+    Migrate expression usage in server
+
+Matthias Kuhn 	2017-05-16
+
+    Add missing include
+
+Matthias Kuhn 	2017-05-15
+
+    Fix compiling on mac
+
+Matthias Kuhn 	2017-05-15
+
+    Add QgsExpressionUtils class
+
+Matthias Kuhn 	2017-05-15
+
+    Document API changes
+
+Matthias Kuhn 	2017-05-15
+
+    Reorganize code from qgsexpression.cpp
+
+Matthias Kuhn 	2017-05-14
+
+    General include cleanup
+
+    This unifies the way the include directories are handled in the
+    CMakeLists.txt files.
+    Paths are now normally relative to the root of the source- or build dir.
+    They may still be relative for paths withing a plugin subdirectory but
+    should no longer be relative to paths outside of the current source- or
+    build-directory.
+
+    The previous approach had resultet in many different styles which are
+    hard to wrap ones head around if new to the build system.
+    It sometimes defined includes twice
+    By using relative paths, it was not possible to copy paste the paths
+    between different files.
+
+Matthias Kuhn 	2017-05-14
+
+    Modularize expressions
+
+    The file qgsexpressions.h has grown to one monolithic piece over the
+    years. This makes it hard to maintain and slows down compilation because
+    even small changes at one end will result in recompiling big parts of
+    the source tree. It also requires the compiler to keep track of all
+    these implementation details for said big parts of the source tree.
+
+    This splits this implementation into smaller pieces. There are soe API
+    changes connected to this, but since these can be considered
+    implementation details, on which not many plugins rely, this shouldn't
+    have a big impact on the ecosystem outside the source tree.
+
+Matthias Kuhn 	2017-05-14
+
+    Declutter header files
+
+    Implementations of virtual methods will never be inlined, there's no
+    reason to keep them in headers. It just makes code less readable and
+    potentially slows down compilation.
+
+Merge: c82bffe5db aa2739c975
+Matthias Kuhn 	2017-05-19
+
+    Merge pull request #4567 from pblottiere/clone
+
+    Add clone() methods for layers
+
+Juergen E. Fischer 	2017-05-19
+
+    debian packaging: drop release-sponsors.html
+
+Juergen E. Fischer 	2017-05-19
+
+    fix windows build of QgsFeatureRequest::OrderBy again (reapply 8f29f28 and 3c843a8)
+
+Juergen E. Fischer 	2017-05-18
+
+    make prepare-commit.sh work with git-new-workdir
+
+Denis Rouzaud 	2017-05-18
+
+    sipify batch
+
+Juergen E. Fischer 	2017-05-18
+
+    crssync: check result of CSVReadParseLine instead of feof
+
+Denis Rouzaud 	2017-05-18
+
+    [spell check] try do not use thread affinity in silver searcher to avoid errors on Travis
+
+Blottiere Paul 	2017-05-18
+
+    Update sip binding
+
+Merge: ffe5e1c255 5112a0dc88
+Alexander Bruy 	2017-05-18
+
+    Merge pull request #4575 from alexbruy/qgis-sponsors
+
+    remove QgsSponsors widget. Instead open sponsors page in the webbrowser (fix #16169)
+
+Blottiere Paul 	2017-05-18
+
+    Add more const ref
+
+Blottiere Paul 	2017-05-18
+
+    Add note in api break doc for plugin layers
+
+Blottiere Paul 	2017-05-18
+
+    Add const reference
+
+Blottiere Paul 	2017-05-17
+
+    Fix documentation
+
+Blottiere Paul 	2017-05-17
+
+    Update documentation and sip binding
+
+Blottiere Paul 	2017-05-17
+
+    Update unit tests for raster layer
+
+Blottiere Paul 	2017-05-17
+
+    Update unit tests for vector layer
+
+Blottiere Paul 	2017-05-17
+
+    Clone more members in raster layer
+
+Blottiere Paul 	2017-05-17
+
+    Clone more members in vector layer
+
+Blottiere Paul 	2017-05-17
+
+    Fix renderer cloning in vector layer when it's null
+
+Blottiere Paul 	2017-05-17
+
+    The extent is cloned in map layer
+
+Blottiere Paul 	2017-05-17
+
+    Update documentation for setCustomProperties
+
+Blottiere Paul 	2017-05-17
+
+    Remove unnecessary include
+
+Blottiere Paul 	2017-05-17
+
+    Remove the deep copy functionality
+
+Blottiere Paul 	2017-05-17
+
+    Update cloning method for styles
+
+Blottiere Paul 	2017-05-16
+
+    Use clone() methods within duplicateLayers() function
+
+Blottiere Paul 	2017-05-16
+
+    Add unit tests
+
+Blottiere Paul 	2017-05-16
+
+    Update sip binding
+
+Blottiere Paul 	2017-05-16
+
+    [FEATURE] add clone() methods for layers
+
+Denis Rouzaud 	2017-05-18
+
+    verbose check spelling test to detect issue on Travis
+
+Juergen E. Fischer 	2017-05-18
+
+    db manager: fix layer custom action
+
+Denis Rouzaud 	2017-05-18
+
+    sipify batch
+
+    python/core/qgspaintenginehack.sip
+    python/core/qgspainting.sip
+    python/core/qgspallabeling.sip
+    python/core/qgspathresolver.sip
+    python/core/qgspluginlayer.sip
+    python/core/qgspluginlayerregistry.sip
+    python/core/qgspointlocator.sip
+    python/core/qgsproject.sip
+    python/core/qgsprojectbadlayerhandler.sip
+    python/core/qgsprojectproperty.sip
+    python/core/qgsprojectversion.sip
+    python/core/qgssnappingconfig.sip
+
+Juergen E. Fischer 	2017-05-18
+
+    oracle provider: fix triangle warnings
+
+Juergen E. Fischer 	2017-05-18
+
+    install qgsvectorlayerlabeling.h
+
+Martin Dobias 	2017-05-18
+
+    Fix build (followup 43a0938)
+
+Juergen E. Fischer 	2016-12-03
+
+    oracle provider: skip retrying unavailable connections for 30s
+
+    (cherry picked from commit b0126d017873e467f3cd69fa4b3a3bfd16e6a8c8)
+
+Merge: 43a0938e96 b9bd66d2b3
+Alexander Bruy 	2017-05-18
+
+    Merge pull request #4568 from alexbruy/gdal-profiles
+
+    store profiles as QStringList to avoid issues with spaces (fix #16327)
+
+Tim Sutton 	2017-05-18
+
+    Make locator bar shortcut hint show Cmd-K on MacOS (#4583)
+
+Nyall Dawson 	2017-05-18
+
+    Allow rotate point symbol tool to work with features with initially
+    NULL rotation values
+
+Martin Dobias 	2017-05-18
+
+    Fix locator widget's width on hi-dpi screens
+
+    It was too short to see the whole placeholder text...
+
+Merge: e001d5c70a 27077c875e
+Nyall Dawson 	2017-05-18
+
+    Merge pull request #4582 from nyalldawson/status_bar
+
+    Add a QgsStatusBar widget/interface for adding messages/widgets to main window statusbar
+
+Martin Dobias 	2017-05-17
+
+    Add QgsGeometry::isSimple() - useful for self-intersection checks
+
+Nyall Dawson 	2017-05-18
+
+    Add a QgsStatusBar widget/interface for adding messages/widgets to
+    main window statusbar
+
+    QStatusBar gives almost no control over display and placement
+    of child widgets. It's not possible to subclass and reimplement
+    either, due to how QMainWindow works internally, and also due to
+    the special handling for the size grip and other platform specific
+    handling in QStatusBar.
+
+    Instead, we embed a single QgsStatusBar covering the whole real
+    status bar. All child widgets and temporary messages instead
+    are pushed to the QgsStatusBar instead - giving us as much control
+    as we desire over how these widgets are placed and their behavior.
+
+    As a result the locator widget has been moved to its logical placement
+    on the left of the status bar.
+
+    All plugins must ensure that they use the status bar interface
+    available via iface.statusBarIface() instead of directly interacting
+    with the status bar (e.g. iface.mainWindow().statusBar()...)
+
+Nyall Dawson 	2017-05-18
+
+    Fix transform shear value not saved (fix #16567)
+
+Nyall Dawson 	2017-05-18
+
+    Add failing test for #16567
+
+Nyall Dawson 	2017-05-18
+
+    Fix windows build
+
+Nyall Dawson 	2017-05-18
+
+    Forward port test for #16517
+
+Merge: 8231d7528b 7108d6b056
+Nyall Dawson 	2017-05-18
+
+    Merge pull request #4512 from nyalldawson/locator
+
+    [FEATURE] Implement a QtCreator style locator bar in the QGIS status bar
+
+Nyall Dawson 	2017-05-18
+
+    Blacklist PyQgsLocator test on Travis OSX builds
+
+    Travis OSX is too underpowered to even run the normal tests...
+    let alone something that requires... *gasp* multiple cores!!! *gasp*
+
+Nyall Dawson 	2017-05-18
+
+    Remove duplicate include
+
+Alexander Bruy 	2017-05-17
+
+    homogenize layer naming when adding via browser and add vector dialog
+    (fix #15510)
+
+Denis Rouzaud 	2017-05-16
+
+    sipify QgsExpressionContext, QgsFeatureRequest, QgsOptionalExpression
+
+Nyall Dawson 	2017-05-17
+
+    Small cleanups
+
+Nyall Dawson 	2017-05-17
+
+    Allow filters to provide configuration dialogs
+
+Nyall Dawson 	2017-05-17
+
+    Invalidate current locator results when locator options are changed
+
+Nyall Dawson 	2017-05-17
+
+    Make locator settings persistent
+
+Nyall Dawson 	2017-05-17
+
+    Enable disabling filters via options dialog
+
+Nyall Dawson 	2017-05-17
+
+    Add (non-functional) locator configuration dialog
+
+Nyall Dawson 	2017-05-17
+
+    Start on options page
+
+Nyall Dawson 	2017-05-17
+
+    Add configure menu to locator widget
+
+Nyall Dawson 	2017-05-16
+
+    Style fixes
+
+Nyall Dawson 	2017-05-16
+
+    Fix QgsFloatingWidget discards some events
+
+Nyall Dawson 	2017-05-12
+
+    Nicer results, always show an icon, show description
+
+Nyall Dawson 	2017-05-12
+
+    Show a list of shortcut prefixes in locator bar if no text is entered
+
+Nyall Dawson 	2017-05-12
+
+    Always select the best result by default, even if good results are
+    slow to fetch
+
+Nyall Dawson 	2017-05-12
+
+    Provide a standard string comparison method in QgsLocatorFilter
+
+    Subclasses should use this method instead of directly calling
+    QString::contains or using Python 's in search' type matches.
+    This ensures consistent matching behaviour across different filters.
+
+Nyall Dawson 	2017-05-11
+
+    Sort filter results so closer matches appear higher
+
+    A closer match means more of the text is matched, ie
+    a short string inside a long string is penalised
+
+Nyall Dawson 	2017-05-11
+
+    Only show action results when . prefix is used
+
+Nyall Dawson 	2017-05-11
+
+    Implement prefix based locator searching
+
+    Filters can indicate their preferred search prefix. Searches which
+    begin with this character will be restricted to the single matching
+    filter.
+
+    E.g. entering 'l buffer' will searching only layers containing 'buffer'
+
+    Other prefixes are:
+    - . search actions
+    - pl search print layouts
+    - a search algorithms
+
+    Plugins are restricted to a minimum 3 character prefix. We do this
+    to avoid plugins 'stealing' desirable prefixes, and instead we
+    want to reserve them for future core filters.
+
+Nyall Dawson 	2017-05-11
+
+    Allow speciyfing the priority for filters
+
+    Higher priority (i.e. more important) filter results get shown
+    first. This means filters like project layers & composers will
+    show above 'cruder' filters like the actions/processing filters.
+
+Nyall Dawson 	2017-05-11
+
+    Show locator filter names in results, sort results and group by filter
+
+Nyall Dawson 	2017-05-11
+
+    Add processing algorithms to locator bar
+
+    Inspired by the ghost of processing's commander
+
+Nyall Dawson 	2017-05-11
+
+    Add a locator filter for main window actions
+
+    Inspired by the ghost of processing's commander
+
+Nyall Dawson 	2017-05-08
+
+    Allowing associating QgsLocatorWidget with a map canvas
+
+    This allows the widget's locator to prioritise results which
+    are close to the current canvas extent
+
+Nyall Dawson 	2017-05-08
+
+    Add a context variable for locator searches
+
+    This allows encapsulation of properties relating to the context
+    of a search, such as a target map extent. Locator filters could
+    use this to prioritise results close to the current canvas extent.
+
+Nyall Dawson 	2017-05-08
+
+    Add missing docs, sip bindings
+
+Nyall Dawson 	2017-05-07
+
+    Add inbuilt filters for project layers and compositions
+
+    The project layer filter allows you to quickly select a layer
+    from the current project and highlight it in the layer tree.
+    It's useful for complex project with lots of groups, where
+    it's easy to "lose" layers somewhere in the tree...
+
+    The composition filter allows searching for and opening
+    compositions from the current project
+
+Nyall Dawson 	2017-05-06
+
+    [FEATURE] Implement a QtCreator style locator bar in the QGIS status bar
+
+    This adds a new "locator" bar to the QGIS status bar. If you're not
+    familiar with QtCreator's locator, it's a quick search bar
+    (activated by Ctrl+K) which displays matching search results
+    from any number of registered search filters.
+
+    Search filters are subclassed from QgsLocatorFilter, and
+    added to the app's locator via iface.registerLocatorFilter(...)
+
+    Searching is handled using threads, so that results always
+    become available as quickly as possible, regardless of whether
+    any slow search filters may be installed. They also appear
+    as soon as each result is encountered by each filter, which means
+    that e.g. a file search filter will show results one by one
+    as the file tree is scanned. This ensures that the UI is always
+    responsive even if a very slow search filter is present (e.g.
+    one which uses an online service).
+
+    This framework is designed to be extended by plugins, such as
+    OSM nominatim searches, direct database searching (i.e. Discovery
+    plugin), layer catalog searches, etc...
+
+Nyall Dawson 	2017-05-17
+
+    Better method to ensure memory layers always have unique sources
+
+Merge: 591c3ab995 84871ce00d
+Alexander Bruy 	2017-05-17
+
+    Merge pull request #4565 from alexbruy/processing-single2multi
+
+    [processing] handle NULL values in the single to multi algorithm (fix #15822)
+
+Martin Dobias 	2017-05-17
+
+    Remove QgsPoint::onSegment() method
+
+    This is a completely wrong use of an algorithm that is meant to be used with *integer* values,
+    e.g. when dealing with pixels on screen, but not for coordinates that are floating point numbers.
+    The algorithm has a fixed tolerance of 1 unit.
+
+    QgsPoint(5,0.9).onSegment(QgsPoint(0,0), QgsPoint(10,0)) would return 2 (i.e. point is on line segment)
+
+    See the original code: https://github.com/erich666/GraphicsGems/blob/master/gems/PntOnLine.c
+
+Alexander Bruy 	2017-05-17
+
+    remove QgsSponsors widget. Instead open sponsors page in the webbrowser
+    (fix #16169)
+
+Merge: d0d6959b6f ccd5d75225
+Alessandro Pasotti 	2017-05-17
+
+    Merge pull request #4569 from boundlessgeo/xyz-inverted-y
+
+    [bugfix] Fix broken inverted Y support in XYZ layers
+
+Alessandro Pasotti 	2017-05-16
+
+    [bugfix] Fix broken inverted Y support in XYZ layers
+
+    This follows the convention used by OpenLayers, where
+    an inverted axis is indicated by {-y} in the URL
+    definition.
+
+    Fixes #15927
+
+    Needs backporting.
+
+Alexander Bruy 	2017-05-17
+
+    [processing] temporarily disable singleparts to multiparts test
+
+Merge: 0bac937173 0eb337ffce
+Werner Macho 	2017-05-16
+
+    Merge pull request #4570 from mach0/master
+
+    [i18n] adding translator on request
+
+Sandro Santilli 	2017-05-16
+
+    Fix indentation as requested by Travis
+
+    NOTE: I do have the prepare-commit.sh hook in place, but it did
+          not handle this
+
+Sandro Santilli 	2017-05-16
+
+    Add test for unprojectible polygon labeling
+
+    See #15507
+
+Alexander Bruy 	2017-05-16
+
+    store profiles as QStringList to avoid issues with spaces (fix #16327)
+
+Blottiere Paul 	2017-05-16
+
+    Add unit tests
+
+Blottiere Paul 	2017-05-16
+
+    Update sip binding
+
+Blottiere Paul 	2017-05-16
+
+    [bugfix] Fix unit of sizes when reading a SLD file (fixes #8978)
+
+Alexander Bruy 	2017-05-16
+
+    [processing] handle NULL values in the single to multi algorithm (fix #15822)
+
+Alexander Bruy 	2017-05-16
+
+    Revert "Merge pull request #4562 from alexbruy/processing-singletomulti-3"
+
+    This reverts commit e3d79a1fe940b5d813b5f79c51b43393d085bb16, reversing
+    changes made to 3f7f95ee262ea3646d61600c21faed0866bc70b0.
+
+    Reverting again, as Travis started failing after merging PR (with all
+    test passed) into master branch
+
+Merge: e3d79a1fe9 45166aaf71
+Alessandro Pasotti 	2017-05-16
+
+    Merge pull request #4564 from boundlessgeo/server-more-requesthandler-api
+
+    [server] Add url and post data getters to request handler
+
+Alessandro Pasotti 	2017-05-16
+
+    [server] Clearer log message when parsing non-XML POST data
+
+Alessandro Pasotti 	2017-05-16
+
+    [server] Sipify QgsRequestHandler
+
+Alessandro Pasotti 	2017-05-16
+
+    [server] Add url and post data getters to request handler
+
+    This completes the API to eventually get rid of all
+    getEnv usage from python server plugins.
+
+    The request handler has now access to the request URL
+    and POST data without the need to query the env.
+
+Merge: 3f7f95ee26 b56e46dad4
+Alexander Bruy 	2017-05-16
+
+    Merge pull request #4562 from alexbruy/processing-singletomulti-3
+
+    [processing] handle NULL values in the single to multi algorithm (fix #15822)
+
+Juergen E. Fischer 	2017-05-16
+
+    db_manager versioning: add RETURNING to INSERT rule (fixes #16083)
+
+Alexander Bruy 	2017-05-15
+
+    [processing] handle NULL values in the single to multi algorithm (fix #15822)
+
+Juergen E. Fischer 	2017-05-16
+
+    sip bindings: exclude QgsCompositionChecker when not building tests
+
+Juergen E. Fischer 	2017-05-16
+
+    debian packaging: include native gui library
+
+Martin Dobias 	2017-05-16
+
+    Fix saving of "obstacle only" state + misc fixes to unit tests
+
+Martin Dobias 	2017-05-15
+
+    Fixes to unit tests
+
+Martin Dobias 	2017-05-15
+
+    Fix for style loading and clean up of used labeling custom properties
+
+Martin Dobias 	2017-05-15
+
+    Fix loading of labeling from 2.x projects
+
+Martin Dobias 	2017-05-15
+
+    Remove dead code for writing of labeling from custom properties
+
+Martin Dobias 	2017-05-15
+
+    Convert remaining bits where labeling was configured using setCustomProperty()
+
+Martin Dobias 	2017-05-14
+
+    Clean up reading/writing of labeling configuration in vector layers
+
+    Historically the configuration used to be stored in layer's custom properties, but that does not scale
+    beyond simple rendering and so rule-based labeling introduced storage of configuration natively in XML elements.
+    That left us with two different ways of reading/writing labeling configurations. This work makes all configuration
+    to use native XML elements.
+
+    To keep compatibility of 2.x projects, reading of configuration from custom properties is preserved.
+
+    This commit also adds Python APIs for direct manipulation of labeling configuration through vector layer's
+    setLabeling() and labeling() calls.
+
+Merge: 59c974379e 5201eb251e
+Nyall Dawson 	2017-05-16
+
+    Merge pull request #4561 from nyalldawson/proj_thread2
+
+    Avoid using thread unsafe proj API - approach 2
+
+Nyall Dawson 	2017-05-16
+
+    Optimise storage/retrieval of projPJ objects
+
+Nyall Dawson 	2017-05-16
+
+    Use thread safe proj API in all other code paths
+
+Nyall Dawson 	2017-05-16
+
+    Utilise thread safe proj API within QgsCoordinateTransform
+
+    Avoids unpredictable behavior when transforms are being
+    conducted in background threads, such as map renders.
+
+    Refs #11441
+
+    This commit:
+    1. Uses thread_local storage for projCtx objects, to ensure
+    that every thread correctly has its own projCtx context.
+
+    2. Refactors QgsCoordinateTransformPrivate so that the
+    projPJ source and destination objects are instead stored
+    in a map (by projCtx). This allows transforms to be
+    transparently performed using the correct projPJ objects
+    for the particular thread in which the transform is being
+    conducted. This approach avoids expensive detachment
+    of QgsCoordinateTransformPrivate, and allows a single
+    QgsCoordinateTransformPrivate to be safely utilised
+    by QgsCoordinateTransform objects in different threads.
+
+Nyall Dawson 	2017-05-16
+
+    Split qgscoordinatetransform_p into .h/cpp
+
+Nyall Dawson 	2017-05-16
+
+    Fix missing name and progress for feature counter task
+
+Nyall Dawson 	2017-05-16
+
+    Ensure created memory layers have unique source
+
+    Sometimes the layer source is used for "looser" comparison then
+    layer ID
+
+Nyall Dawson 	2017-05-16
+
+    Link native to core on OSX only
+
+Denis Rouzaud 	2017-05-15
+
+    [sipify] do not comment global operators
+
+    fix class/struct level detection
+    sipify qgsmargins.qgs
+
+Matthias Kuhn 	2017-05-15
+
+    fix bad copy paste
+
+Matthias Kuhn 	2017-05-15
+
+    No docstrings for out-of-class functions
+
+Matthias Kuhn 	2017-05-14
+
+    Doxymentation
+
+Matthias Kuhn 	2017-05-14
+
+    Unsipify QgsMargins
+
+Matthias Kuhn 	2017-05-14
+
+    No copy of QgsLabelSearchTree is allowed
+
+Matthias Kuhn 	2017-05-14
+
+    Fix sip errors
+
+Matthias Kuhn 	2017-05-14
+
+    Fix sip errors
+
+Matthias Kuhn 	2017-05-14
+
+    Spelling
+
+Matthias Kuhn 	2017-05-14
+
+    [sipify] Another batch of sip
+
+Denis Rouzaud 	2017-05-10
+
+    attachment widget: data defined button for document type
+
+Merge: ae97c333d6 8f44a29ae7
+Nyall Dawson 	2017-05-15
+
+    Merge pull request #4558 from nyalldawson/native-lib-mac
+
+    Add OS native interface lib, with objective-c++ interface to Mac Cocoa libraries, v3
+
+Nyall Dawson 	2017-05-15
+
+    Reintroduce core/native link
+
+Nyall Dawson 	2017-05-15
+
+    Fix compilation
+
+Nyall Dawson 	2017-05-15
+
+    Revert "Port algorithm countVisibleParameters to c++"
+
+    This reverts commit c3c694f8ccfbe0b64df14365f950f5895968a66a.
+
+Nyall Dawson 	2017-05-15
+
+    Move QgsNative instance from app->QgsGui singleton
+
+    This allows gui widgets to utilise native platform interfaces.
+    Additionally attaching the instance to QgsGui allows QgsNative
+    to become a QObject in future if required and for use
+    of signals/slots in the native interfaces.
+
+Mathieu Pellerin 	2017-05-15
+
+    Use millimeters when declaring QPrinter page size
+
+    (This is needed to allow to set a resolution with the printer used
+    by the map renderer)
+
+Nyall Dawson 	2017-05-07
+
+    Indentation
+
+Nyall Dawson 	2017-05-07
+
+    Fix build
+
+Matthias Kuhn 	2017-01-07
+
+    Create a virtual QgsNative base class for platform services
+
+    A QgsNative base class is added, that offers default implementations for
+    a platform interface. These methods can be overridded for the current
+    platform at compile time to allow specialized handling for integration
+    with the current system.
+
+Larry Shaffer 	2014-01-16
+
+    Add OS native interface lib, with objective-c++ interface to Mac Cocoa libraries
+
+Merge: c3c694f8cc a8b10a2fd9
+Nyall Dawson 	2017-05-15
+
+    Merge pull request #4514 from nyalldawson/gui_instance
+
+    Make a new global QgsGui singleton
+
+Nyall Dawson 	2017-05-15
+
+    Port algorithm countVisibleParameters to c++
+
+Nyall Dawson 	2017-05-15
+
+    Update indentation
+
+Nyall Dawson 	2017-05-15
+
+    Sipify update
+
+Nyall Dawson 	2017-05-07
+
+    Rename QgisGui to QgsGuiUtils
+
+    Better reflects what this namespace contains, and replaces the
+    non-standard Qgis prefix with the Qgs standard
+
+Nyall Dawson 	2017-05-07
+
+    QgsMapLayerActionRegistry is no longer a singleton
+
+    Moved the global instance to QgsGui::QgsMapLayerActionRegistry()
+
+Nyall Dawson 	2017-05-07
+
+    QgsLayerTreeEmbeddedWidgetRegistry is no longer a singleton
+
+    Moved the global instance to QgsGui::layerTreeEmbeddedWidgetRegistry()
+
+Nyall Dawson 	2017-05-07
+
+    QgsShortcutsManager is no longer a singleton
+
+    Move the global instance to QgsGui::shortcutsManager()
+
+Nyall Dawson 	2017-05-07
+
+    Make a new global QgsGui singleton
+
+    Move QgsEditorWidgetRegistry from being a singleton itself to
+    instead being a member of the QgsGui singleton
+
+Merge: 7af73b3881 1006aa980a
+Nyall Dawson 	2017-05-15
+
+    Merge pull request #4401 from nyalldawson/processing_params
+
+    c++ framework for parameters and running algorithms
+
+Tim Sutton 	2017-05-14
+
+    Change browser context menu item text for adding layer to 'Add select… (#4459)
+
+    * Change browser context menu item text for adding layer to 'Add selected layer(s) to canvas'
+
+    * Use title case for Add Selected Layer(s) to Canvas browser context menu text
+
+Martin Dobias 	2017-05-14
+
+    Remove unused mAnnotationForm member + getter/setter from QgsVectorLayer
+
+Mathieu Pellerin 	2017-05-14
+
+    Fix crash when saving as PDF with dpi != 96
+
+Martin Dobias 	2017-05-14
+
+    Path resolver instead of project singleton in edit form config and svg annotation
+
+Merge: 93c59f4e25 590526ee32
+Martin Dobias 	2017-05-14
+
+    Merge pull request #4426 from wonder-sk/fix-relative-paths-svg
+
+    Fix relative paths to SVG files in embedded projects
+
+Martin Dobias 	2017-05-14
+
+    Another trial to fix mac tests on travis
+
+Mathieu Pellerin 	2017-05-13
+
+    [raster] fix raster blending (fixes #16546)
+
+Martin Dobias 	2017-05-13
+
+    Trying to fix mac test for QgsProject
+
+Martin Dobias 	2017-05-13
+
+    Fixes to relative paths read/write in composer picture and arrow items
+
+Martin Dobias 	2017-05-13
+
+    Fix build and add bits to project test to understand fail on mac
+
+Martin Dobias 	2017-05-13
+
+    Bring back temporarily disabled projects upgrade + fix a loading bug
+
+    Loading bug: on the first project load, data-defined properties for diagram layer settings were not read
+    as the default constructor did not populate the list of data-defined property definitions.
+
+Martin Dobias 	2017-05-13
+
+    Add doxygen comments to updated methods
+
+Martin Dobias 	2017-05-13
+
+    Fix text renderer test
+
+Martin Dobias 	2017-05-13
+
+    Remove "relative path" checkbox from svg selector widget
+
+    It is decided on different level whether files are saved with relative paths
+    and internally now QGIS always uses absolute paths to SVG files.
+
+Martin Dobias 	2017-05-13
+
+    API break update + read/write context in labeling and text renderer
+
+    This enables correct loading/saving of relative paths of SVG files for background of labels
+
+Martin Dobias 	2017-05-12
+
+    Introduce QgsReadWriteContext that encapsulates QgsPathResolver
+
+    This should make the read/write methods more flexible if we need to give them extra context.
+
+Martin Dobias 	2017-04-27
+
+    Remove duplicate code - now handled by QgsPathResolver
+
+Martin Dobias 	2017-04-27
+
+    Fixes to unit tests
+
+Martin Dobias 	2017-04-27
+
+    Respect relative paths in embedded projects (fixes #16355)
+
+Martin Dobias 	2017-04-27
+
+    Propagate path resolver through renderers, annotations, diagrams
+
+    This is necessary in order to be able to correctly translate between absolute and relative paths
+    deeper in the code - e.g. paths to SVG files used in marker or fill symbols.
+
+    Until now, relative paths were translated to absolute paths on the fly.
+    This is now changed - paths to files should be always absolute within QGIS objects - and paths
+    only get turned into relative when saving projects. When loading a project, relative paths
+    are translated to absolute paths immediately.
+
+    This should lower the overall confusion about relative/absolute paths within QGIS, and also
+    allow having different base directories for relative paths (e.g. QML or QPT files may use relative paths
+    to their directory - rather than to the project directory)
+
+Alexander Bruy 	2017-05-13
+
+    [processing] remove extra quotes when restoring batch process from file
+    (fix #16309)
+
+lbartoletti 	2017-05-13
+
+    Add inclination method for QgsPointV2 (#4536)
+
+Alexander Bruy 	2017-05-13
+
+    [processing] stop algorithm execution if geometry/feature error occured
+    (fix #11986)
+
+Mathieu Pellerin 	2017-05-13
+
+    Deduplicate code in save as image / save as PDF
+
+Alexander Bruy 	2017-05-12
+
+    [processing] take in account file extension when loading Processing
+    results (fix #16486)
+
+Merge: a0c6872f6c 51347914b9
+Alessandro Pasotti 	2017-05-12
+
+    Merge pull request #4535 from boundlessgeo/attributetable-fixes-16492
+
+    Attributetable fixes  crash #16492
+
+Alessandro Pasotti 	2017-05-12
+
+    Only check for validity if attribute has changed
+
+Matthias Kuhn 	2017-05-12
+
+    Fix crash when using expression bar on aliased field
+
+    Fix #16302
+
+nirvn 	2017-05-12
+
+    Force vector output when saving map/canvas as PDF
+
+Matthias Kuhn 	2017-05-12
+
+    Improve stability of QgsTask::waitForFinished test
+
+Mathieu Pellerin 	2017-05-12
+
+    Display name of layers in need of rasterization when saving as PDF (#4539)
+
+Juergen E. Fischer 	2017-05-12
+
+    sip update qgsfeature
+
+Alessandro Pasotti 	2017-05-12
+
+    Speed up the check for valid feature
+
+Juergen E. Fischer 	2017-05-12
+
+    Fix windows warning
+
+    ...\qt5\include\qtcore\qcache.h(124): warning C4150: deletion of pointer to incomplete type 'QDomDocument'; no destructor called
+    .../server/qgsconfigcache.h(34): note: see declaration of 'QDomDocument'
+    ...\qt5\include\qtcore\qcache.h(124): note: while compiling class template member function 'void QCache::clear(void)'
+
+Juergen E. Fischer 	2017-05-12
+
+    Fix windows build
+    undefined error C2079: 'QMapNode::value' uses undefined class 'QgsGeometry'
+
+Mathieu Pellerin 	2017-05-12
+
+    Small save as PDF cleanups
+
+Merge: 9adc32292e b6a5cc4204
+Nyall Dawson 	2017-05-12
+
+    Merge pull request #4509 from nyalldawson/exporter
+
+    API Cleanups (and rename) for QgsVectorLayerImport, background export of layers when dropping to browser
+
+Nyall Dawson 	2017-05-07
+
+    Use QgsFeedback instead of QProgressDialog for QgsVectorLayerExporter::exportLayer
+
+    And add cancelation and progress reporting to background layer export
+
+Nyall Dawson 	2017-05-07
+
+    Optimise QgsVectorLayerExporter::exportLayer when exporting only selected features
+
+Nyall Dawson 	2017-05-07
+
+    Remove unused skipAttributeCreation option in QgsVectorLayerExporter::exportLayer
+
+Nyall Dawson 	2017-05-07
+
+    [FEATURE] Import layers to data providers in background
+
+    Flips the drag and drop import of layers to browser data sources
+    to use task manager, allowing these slow imports to occur
+    in the background.
+
+Nyall Dawson 	2017-05-07
+
+    Rename QgsVectorLayerImport to QgsVectorLayerExporter
+
+    Since the majority of users of this class will be exporting
+    an existing map layer to a data provider, the QgsVectorLayerImport
+    name is misleading and suggests that this class is designed
+    just to bring layers "into" QGIS.
+
+    Explicitly naming the class "Exporter" should help API users
+    discover this class.
+
+    Also cleanup API and improve docs
+
+Merge: 354b667f14 5d50b17c80
+Nyall Dawson 	2017-05-12
+
+    Merge pull request #4515 from nyalldawson/render_crash
+
+    Fix crash when transform exception occurs during rendering
+
+Alessandro Pasotti 	2017-05-11
+
+    [bugfix] Attribute table crashes QGIS when deleting selected
+
+    Fixes https://issues.qgis.org/issues/16492
+
+    Needs-backporting
+
+Alessandro Pasotti 	2017-05-11
+
+    Added a comment to the test header
+
+Alessandro Pasotti 	2017-05-11
+
+    Tiny typo fix - SIP part
+
+Alessandro Pasotti 	2017-05-11
+
+    Tiny typo in a comment
+
+Merge: 5888d22c07 eaabce28e9
+Matthias Kuhn 	2017-05-11
+
+    Merge pull request #4526 from m-kuhn/featureCounter
+
+    Send feature counting to background task
+
+Matthias Kuhn 	2017-05-11
+
+    Doxyfication
+
+Matthias Kuhn 	2017-05-11
+
+    Consify
+
+Matthias Kuhn 	2017-05-11
+
+    Allow specifying expression context for feature count
+
+Matthias Kuhn 	2017-05-11
+
+    [travis] Optimize ccache
+
+Matthias Kuhn 	2017-05-11
+
+    Localize feature count
+
+Matthias Kuhn 	2017-05-10
+
+    Add tests for QgsTask::waitForFinished()
+
+Matthias Kuhn 	2017-05-10
+
+    Improve docs and python bindings for feature count
+
+Matthias Kuhn 	2017-05-10
+
+    Refresh feature count legend text automatically
+
+Matthias Kuhn 	2017-05-10
+
+    Sipify QgsTask[Manager]
+
+Matthias Kuhn 	2017-05-10
+
+    Fix feature counting
+
+Matthias Kuhn 	2017-05-10
+
+    Fix division by 0
+
+Matthias Kuhn 	2017-05-10
+
+    Add QgsTask::waitForFinished
+
+Matthias Kuhn 	2017-05-10
+
+    Fix compatibility with older sip versions
+
+Matthias Kuhn 	2017-05-09
+
+    Send feature counting to background task
+
+Matthias Kuhn 	2017-05-09
+
+    Make fields() available in QgsVectorLayerFeatureSource
+
+Denis Rouzaud 	2017-05-11
+
+    fix sip bindings documentation
+
+Denis Rouzaud 	2017-05-11
+
+    [doxygen] remove remaining 'note Added in XXX' in favor of '\since ...'
+
+Merge: f131792351 a924915b00
+Alessandro Pasotti 	2017-05-11
+
+    Merge pull request #4444 from boundlessgeo/sort_on_top_portTo3
+
+    [attributetable] Fix "Move selection to top" for 3.x regression fixes #15803
+
+Juergen E. Fischer 	2017-05-11
+
+    fix test font message
+
+Luigi Pirelli 	2017-05-10
+
+    hide setting and value control in setSortOrder
+
+Alexander Bruy 	2017-05-10
+
+    [processing] don't apply -te and -te_srs if not requested (fix #16519)
+
+Denis Rouzaud 	2017-05-10
+
+    minor cleaning of python/CMakeLists.txt
+
+Denis Rouzaud 	2017-05-10
+
+    fix valueChanged signal not emitted in QgsExternalResourceWidget
+
+Denis Rouzaud 	2017-05-10
+
+    [sip] add missing ConvertToClassCode
+
+    This was causing an issue if you tried to access widgets in a form using findChildren
+    widgets could not be casted to QGIs native types
+
+    also sipify QgsFilterLineEdit and QgsRelationEditorWidget
+
+lbartoletti 	2017-05-10
+
+    New geometry class: QgsRegularPolygon (#4502)
+
+Luigi Pirelli 	2017-04-28
+
+    [attributetable] fix sortOnTop due to sortOrder wrong enum values from QgsAttributeTableConfig: fixes #15803
+    port to 3.0 for https://github.com/qgis/QGIS/pull/4306
+
+Alessandro Pasotti 	2017-05-10
+
+    Use a valid polygon in attr-table test
+
+Alexander Bruy 	2017-05-10
+
+    prevent crash when exporting spatial bookmarks (fix #16345)
+
+Nyall Dawson 	2017-05-10
+
+    Fix doc warning
+
+Merge: 8423aaf0bf 01f647eef0
+Matthias Kuhn 	2017-05-10
+
+    Merge pull request #4307 from ghtmtt/proc_tests
+
+    [processing] other qgis test, clean commit
+
+Nyall Dawson 	2017-05-09
+
+    Convert remaining parameters from python
+
+Nyall Dawson 	2017-05-09
+
+    Temporarily make QgsProcessingAlgorithm::run non pure-virtual (for travis)
+
+Nyall Dawson 	2017-04-24
+
+    [processing] c++ framework for parameters and running algorithms (WIP)
+
+    This commit adds the virtual method for running processing algs
+    to the base c++ class, and adds the initial framework
+    for c++ algorithm parameters.
+
+    When running an algorithm, a QVariantMap is passed
+    as the algorithm parameters. The high level API provided
+    by QgsProcessingParameters should be used to retrieve
+    strings/layers/doubles/etc from this QVariantMap.
+
+    This allows advanced use cases, such as passing QgsProperty
+    with the QVariantMap for "dynamic" parameters, where the
+    value should be evaluated for every feature processed.
+
+    E.g. if the buffer algorithm uses a dynamic property for distance,
+    then the distance could be bound to either a field value or
+    to a custom expression. This gets evaluated before buffering
+    each feature to allow for advanced variable buffering.
+
+    Support for dynamic parameters will be "opt in", and non default.
+    So algorithms will need to specifically add support for
+    dynamic properties as required.
+
+Merge: 6d67379bb6 403c03f779
+Alessandro Pasotti 	2017-05-09
+
+    Merge pull request #4525 from boundlessgeo/re-enable-ows-test
+
+    Re-enable OWS auth test
+
+Alessandro Pasotti 	2017-05-09
+
+    Re-enable OWS auth test
+
+Alessandro Pasotti 	2017-05-09
+
+    Remove unused forward declarations
+
+Merge: a4e3c8336e 3784892079
+Alessandro Pasotti 	2017-05-09
+
+    Merge pull request #4503 from boundlessgeo/attributetable-fixes
+
+    [bugfix] Fixes attribute table duplicated rows #15974
+
+Merge: 0824280296 ea4143bbdc
+Nyall Dawson 	2017-05-09
+
+    Merge pull request #4520 from nyalldawson/raster_combo_box
+
+    QgsRasterBandComboBox
+
+Nyall Dawson 	2017-05-09
+
+    Don't disable band combo when only one band is present
+
+Nyall Dawson 	2017-05-09
+
+    Add custom widget plugin for QgsRasterBandComboBox
+
+Nyall Dawson 	2017-05-09
+
+    Flip some more custom raster band combo boxes to QgsRasterBandComboBox
+
+Nyall Dawson 	2017-05-09
+
+    Add unit tests for QgsRasterBandComboBox
+
+Nyall Dawson 	2017-05-09
+
+    Add a "not set" option to QgsRasterBandComboBox
+
+Nyall Dawson 	2017-05-09
+
+    Disable raster band combo box for rasters without multiple bands
+
+Nyall Dawson 	2017-05-09
+
+    Add a new QgsRasterBandComboBox widget
+
+    And use wherever custom widgets were being created. Reduces
+    duplicate code and allows specialised handling for raster
+    band display/selection to be centralized.
+
+Denis Rouzaud 	2017-05-08
+
+    sipify gui editor widgets
+
+Nyall Dawson 	2017-05-09
+
+    [processing] Cleanup some layer/writer related handling
+
+    Ensure that layers created by QgsProcessingUtils::createFeatureSink
+    can always be retrieved using QgsProcessingUtils::mapLayerFromString
+
+nirvn 	2017-05-09
+
+    [FEATURE] Add opacity support to copyright decorator
+
+nirvn 	2017-05-09
+
+    [FEATURE] Add outline and color opacity settings for scale bar decoration
+
+nirvn 	2017-05-09
+
+    [FEATURE] Color settings for north arrow decoration
+
+Merge: 3cd3e5d378 927faf7037
+Nyall Dawson 	2017-05-09
+
+    Merge pull request #4522 from nyalldawson/new_random
+
+    [needs-docs] Add a "shuffle random" option to color ramp button
+
+Nyall Dawson 	2017-05-09
+
+    Allow storing QgsProperty in QVariant
+
+Nyall Dawson 	2017-05-09
+
+    [needs-docs] Add a "shuffle random" option to color ramp button
+
+    Allows quick regeneration of a new set of random colors if the
+    current color ramp is a random color ramp.
+
+Nyall Dawson 	2017-05-09
+
+    Refine paletted raster renderer classification
+
+    Change behaviour from clearing all existing values on classification
+    to instead keeping any existing values which do exist in the raster,
+    maintaining their current color and label.
+
+Nyall Dawson 	2017-05-09
+
+    Fix unreadable text in plugin manager (fix #16516)
+
+Nyall Dawson 	2017-05-09
+
+    Limit the initial feature request sent by expression builder widget
+
+    Should help avoid short delays in opening the expression widget
+    on slower layers (such as with the Postgres provider where features
+    are fetched in a minimum batch of 2000 by default)
+
+Nyall Dawson 	2017-05-09
+
+    Followup c2699b4, fix missing field names in expression builder
+
+Juergen E. Fischer 	2017-05-08
+
+    include metadata headers in install (followup 3a965e6d)
+
+Mathieu Pellerin 	2017-05-08
+
+    Update north arrow decorator to use a vector graphic (#4519)
+
+Merge: de03642ebb 29c87de679
+Nyall Dawson 	2017-05-08
+
+    Merge pull request #4511 from nyalldawson/composer_async
+
+    Asyncronously render composer map previews
+
+Nyall Dawson 	2017-05-08
+
+    [needs-docs][composer] Remove Render/Cache modes from composer maps
+
+    Make maps invalidate cache whenever layer order changes. Cache mode
+    is now identical to Render mode, so  all mode switching has been
+    removed from composer maps. This should greatly simplify the learning
+    curve and usability of composer maps.
+
+Alessandro Pasotti 	2017-05-08
+
+    Consolidate QgsRequestHandler
+
+Nyall Dawson 	2017-05-08
+
+    If composer map is set to use project CRS, update cached render
+    when project CRS changes
+
+    This should prevent one of the most common confusions with
+    composer maps - users inserting multiple maps, with apparently
+    different CRS due to outdated cache renders, and getting confused
+    because outputs from composer look different to the composer view....
+
+Nyall Dawson 	2017-05-08
+
+    [needs-docs][composer] Remove Rectangle mode from composer maps
+
+    No longer required - the Cache mode is now performant enough
+    that we don't have to rely on the old rectangle preview
+    when desiring responsive composers
+
+Nyall Dawson 	2017-05-08
+
+    [composer] Always update map caches when zoom changes
+
+    Before this would only happen with the "render" mode, not "cache"
+    mode. Now updating caches is so responsive and transparent to users
+    we can safely trigger the background cache update whenever the
+    zoom changes without any performance impact.
+
+Nyall Dawson 	2017-05-08
+
+    sipify QgsComposerMap
+
+Nyall Dawson 	2017-05-08
+
+    Rework how composer map cache is invalidated
+
+    Avoids unnecessary redraws and defers cache update until
+    when item is actually visible
+
+Nyall Dawson 	2017-05-07
+
+    [FEATURE] Asyncronously render composer map previews without blocking UI
+
+    Makes working with compositions much more responsive and enjoyable!
+
+    Inspired by manisandro's commit in Sourcepole's fork
+
+Denis Rouzaud 	2017-05-08
+
+    [sipify] fix Abstract class
+
+    unblacklist qgstransaction.sip
+    (followup 931bf32a9fe46570ac80d947552d46c9f427457)
+    also fix method declaration with private only inheritance
+
+Mathieu Pellerin 	2017-05-08
+
+    [FEATURE] Save map/canvas as PDF (#4516)
+
+Nyall Dawson 	2017-05-08
+
+    Fix intermittent QgsMapLayerStore test failure
+
+Nyall Dawson 	2017-05-08
+
+    Fix a lot of leaks in crssync and related QgsCoordinateReferenceSystem methods
+
+Nyall Dawson 	2017-05-08
+
+    Swap some members to unique_ptrs to make ownership clearer
+
+Nyall Dawson 	2017-05-08
+
+    Fix crash when transform errors occur while rendering
+
+    If a transform exception occurred while rendering a symbol then
+    the QgsSymbolRenderContext cleanup code was never called,
+    leading to a double delete and crash.
+
+    Fixes #16377, #15345, and numerous other crashes seen "in the wild"
+
+    Possibly refs #16385
+
+Nathan Woodrow 	2017-05-07
+
+    Black list some tests for now
+
+Nathan Woodrow 	2017-05-07
+
+    Fix build
+
+Nathan Woodrow 	2017-05-07
+
+    Fix #16474 - Clean up formatting of crash report data
+
+Merge: 4160e19bdc 40319df357
+Nyall Dawson 	2017-05-07
+
+    Merge pull request #4510 from qgis/revert-4494-composer_async
+
+    Revert "Asyncronously render composer map previews "
+
+Nyall Dawson 	2017-05-07
+
+    Revert "Asyncronously render composer map previews "
+
+Juergen E. Fischer 	2017-05-07
+
+    fix windows build
+
+Merge: 54e208b974 06c4dea7ff
+Nyall Dawson 	2017-05-07
+
+    Merge pull request #4495 from nyalldawson/writer
+
+    [processing] Port vector.createVectorWriter to c++
+
+Merge: 7efcfee28c 2b48026ec7
+Nyall Dawson 	2017-05-07
+
+    Merge pull request #4494 from nyalldawson/composer_async
+
+    Asyncronously render composer map previews
+
+Nyall Dawson 	2017-05-03
+
+    [processing] Remove vector.createVectorWriter
+
+    Use QgsProcessingUtils.createFeatureSink instead
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Port vector.createVectorWriter to c++
+
+    This implements an improved version of vector.createVectorWriter
+    in QgsProcessingUtils. The improved version relies on the
+    core class QgsVectorLayerImport to create empty layers,
+    which:
+    - reduces duplicate code and reuses the mature QgsVectorLayerImport
+    routines
+    - avoids manual conversion of field types to destination provider
+    field types
+    - potentially allows any writable provider to be used as a feature
+    sink for algorithms (e.g. output direct to MSSQL/Oracle/db2). This
+    should work now - it just needs exposing via UI.
+
+Juergen E. Fischer 	2017-05-06
+
+    osgeo4w: also build pdb and corresponding package for releases
+
+Martin Dobias 	2017-05-06
+
+    Small cleanup of QgsAbstractGeometry header
+
+Alessandro Pasotti 	2017-05-06
+
+    [server] More WMS tests for FILTER parameter with bool operators and UTF8
+
+    Forward port from 2.18 commit 8fd4fc60697738a986207
+
+Alessandro Pasotti 	2017-05-06
+
+    [server] Fail test when expected and reference have different number of lines
+
+Alessandro Pasotti 	2017-05-06
+
+    Added server changes to API break docs
+
+Merge: 51d3fac19c 1033c7b3bd
+Nyall Dawson 	2017-05-06
+
+    Merge pull request #4507 from nyalldawson/import_sink
+
+    QgsVectorLayerImport is a QgsFeatureSink
+
+Mathieu Pellerin 	2017-05-06
+
+    Fix attribute table header feature selection (fixes #16520)
+
+Nyall Dawson 	2017-05-05
+
+    Fix perpetual rendering message on newly created maps
+
+Nyall Dawson 	2017-05-05
+
+    Add some safety checks
+
+Nyall Dawson 	2017-05-05
+
+    Initially draw 'rendering' text while waiting for first cache of composer maps
+
+Nyall Dawson 	2017-05-05
+
+    Draw cached composer map image respecting any content movement
+
+Nyall Dawson 	2017-05-05
+
+    Also trigger composer map update on resize
+
+Nyall Dawson 	2017-05-05
+
+    [composer] Use last complete map render when previewing map items
+    until a new cached preview is ready
+
+    Ensures that map items always show some content while a background
+    cache update is rendering
+
+Nyall Dawson 	2017-05-04
+
+    Avoid crash on exit of PyQgsPalLabelingComposer test
+
+Nyall Dawson 	2017-05-04
+
+    Remove debug messages
+
+Nyall Dawson 	2017-05-04
+
+    Cleanup 57d162, improved cancelation and code modernization
+
+Sandro Mani 	2017-04-26
+
+    Asyncronously render composer map previews
+
+    (Forward port from Sourcepole fork)
+
+Nyall Dawson 	2017-05-06
+
+    Remove unused argument
+
+Nyall Dawson 	2017-05-06
+
+    Make QgsVectorLayerImport protected members private
+
+    This class isn't designed to be subclassed
+
+Nyall Dawson 	2017-05-06
+
+    Sipify QgsVectorLayerImport
+
+Nyall Dawson 	2017-05-06
+
+    QgsVectorLayerImport is a QgsFeatureSink
+
+Merge: df679a2d56 e2a735f39e
+Nyall Dawson 	2017-05-06
+
+    Merge pull request #4487 from nyalldawson/memory
+
+    Move memory provider to core
+
+Nathan Woodrow 	2017-05-06
+
+    Set paths in qgis python module based on osgeo4w env file
+
+Merge: 27ab5a0eaf 32e06f486a
+Nyall Dawson 	2017-05-06
+
+    Merge pull request #4478 from nyalldawson/layer_store
+
+    Split off map layer storage handling from QgsProject to QgsMapLayerStore
+
+Merge: 0a0c33dcf2 fe677040f8
+Nyall Dawson 	2017-05-06
+
+    Merge pull request #4504 from nyalldawson/project_cleanup
+
+    Cleanup project closing
+
+Martin Dobias 	2017-05-05
+
+    Remove QgsGeometryCache class
+
+    The geometry cache was only used for few geometry editing operations anyway. In earlier versions
+    of QGIS the geometry cache was also used by old snapping classes which have been replaced
+    by QgsPointLocator that also keeps a spatial index of geometries and it is not rebuilt on every re-render.
+
+    Reasons for removal:
+    - geometry cache was repopulated on every redraw of layers in editing mode, slowing down rendering
+    - data structure for the cache was a simple map with features accessed by their ID (no spatial index)
+    - the cache was only getting refreshed for the current view of the main map canvas (not a generic cache)
+    - not used for snapping anymore where caching was important to avoid roundtrips to data provider
+
+Nyall Dawson 	2017-05-06
+
+    Simplify QgsMemoryProviderUtils::createMemoryLayer()
+
+Nyall Dawson 	2017-05-06
+
+    Rename some QgsProviderRegistry methods to clarify that they are factories
+
+    - provider() was renamed to createProvider()
+    - selectWidget() was renamed to createSelectionWidget()
+    - providerLibrary() was renamed to createProviderLibrary()
+
+Nyall Dawson 	2017-05-06
+
+    Add missing /Factory/ annotations to QgsProviderMetadata
+
+    Also sipify QgsProviderMetadata and QgsProviderRegistry
+
+Nyall Dawson 	2017-05-06
+
+    Update QgsProviderRegistry docs
+
+Nyall Dawson 	2017-05-05
+
+    QStringLiteral
+
+Nyall Dawson 	2017-05-04
+
+    Remove memory provider library from packaging
+
+Nyall Dawson 	2017-05-03
+
+    Use QgsMemoryProviderUtils::createMemoryLayer when pasting as scratch layer
+
+    Also avoids annoying invalid "missing CRS" message/window when pasting
+    features to a scratch layer
+
+Nyall Dawson 	2017-05-03
+
+    Add QgsMemoryProviderUtils.createMemoryLayer for easy creation
+    of new memory layers from QgsFields/QgsCoordinateReferenceSystem/etc
+
+    Since memory provider cannot use QgsVectorLayerImport we need
+    another centeralized function for creating new memory layers
+    without the need to manually create the uri string.
+
+Nyall Dawson 	2017-05-03
+
+    Move memory provider to core
+
+    This commit introduces basic support for non-library based
+    data providers, and moves the memory provider from a library
+    based provider to a core provider.
+
+    The memory provider is used so frequently throughout QGIS that
+    it has become integral to QGIS functionality and must be
+    available wherever the QGIS core library is used.
+
+    The changes here (while not exposed yet to Python) could potentially
+    be built on to allow creation of pure Python data providers.
+
+Alessandro Pasotti 	2017-05-03
+
+    [bugfix] Fixes attribute table duplicated rows #15974
+
+Nathan Woodrow 	2017-05-05
+
+    Fix space
+
+Nathan Woodrow 	2017-05-05
+
+    Fix symbol path for osgeo4w installs
+
+Merge: 931bf32a9f 391cb73ebd
+Alexander Bruy 	2017-05-05
+
+    Merge pull request #4501 from alexbruy/statistics-by-type
+
+    Statistics panel: show only relevant statistics depending on the field type
+
+Matthias Kuhn 	2017-05-05
+
+    Doxymentation for QgsTransaction
+
+Matthias Kuhn 	2017-05-05
+
+    Documentation for custom functions
+
+Matthias Kuhn 	2017-05-05
+
+    Expose "context" to expression functions
+
+Matthias Kuhn 	2017-05-04
+
+    Doxygen typo
+
+Merge: 41dd2e733d c2699b4640
+Alexander Bruy 	2017-05-05
+
+    Merge pull request #4499 from alexbruy/processing-fieldcalc
+
+    [processing] reset variables list in field calculator on layer change  (fix #15633)
+
+Nyall Dawson 	2017-05-05
+
+    Cleanup project closing
+
+    - ensure that layers are removed when clearing projects
+    - ensure that project is cleared before destruction
+
+Merge: 67e1558fcf aea21306ed
+Nyall Dawson 	2017-05-05
+
+    Merge pull request #4447 from arnaud-morvan/fix_new_bookmark
+
+    Fix new bookmark query.
+
+Nyall Dawson 	2017-05-05
+
+    Remove unused symbols from qgis.h
+
+    Also slow down @NathanW2's build
+
+Werner Macho 	2017-05-05
+
+    [i18n] adding translator on request
+
+Alexander Bruy 	2017-05-05
+
+    rebuild statistics drop-down menu only when field type changed
+
+Alexander Bruy 	2017-05-05
+
+    introduce private enum to strore field type
+
+Alexander Bruy 	2017-05-04
+
+    correctly handle toggling statistics visibility (fix #16117)
+
+Alexander Bruy 	2017-05-04
+
+    update staistics list depending on the field type (fix #16119, #16118)
+
+Nyall Dawson 	2017-05-05
+
+    Partially revert 636a37f
+
+    Fix processing modeler error on startup
+
+Nyall Dawson 	2017-05-05
+
+    Fix windows build
+
+Denis Rouzaud 	2017-05-04
+
+    introduce SIP_SKIP in headers
+
+    based on the docstrings 'not available in Python bindings'
+
+Denis Rouzaud 	2017-05-04
+
+    [sipify] use a distinct header to simplify includes
+
+    there was an issue in libdxf which includes qgslogger in debug mode
+    and qgsdebug.h includes qgis.h include qgswkbtypes.h (which geometry directory was not listed in libdxrw included paths)
+
+Matthias Kuhn 	2017-05-04
+
+    SIP_SKIP QgsExpression::cloneTo
+
+Alexander Bruy 	2017-05-01
+
+    [processing] reset variables list in field calculator on layer change (fix #15633)
+
+Denis Rouzaud 	2017-05-04
+
+    add missing signals
+
+Alexander Bruy 	2017-05-03
+
+    doxymentation
+
+Alexander Bruy 	2017-05-03
+
+    fix qgsgraphanalyzer.h for sipification
+
+Alexander Bruy 	2017-05-02
+
+    update SIP files
+
+Alexander Bruy 	2017-05-02
+
+    fix indentation
+
+Alexander Bruy 	2017-05-01
+
+    remove qgsgraphanalyzer from SIP blacklist
+
+Alexander Bruy 	2017-05-01
+
+    [sipify] follow-up 634c7aa3f460ee945743850f6715940d47a12579
+
+Alexander Bruy 	2017-05-01
+
+    [sipify] remove space before ModuleTypeHeader
+    also update network analysis SIP files
+
+Alexander Bruy 	2017-05-01
+
+    also sipify QgsGraphAnalyzer
+
+Alexander Bruy 	2017-05-01
+
+    initial sipification of the network analysis library
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sipify core.QgsGemlSchema
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sipify core.QgsGml
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sypify core.QgsHistogram
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sipify core.QgsJsonUtils
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sipify core.QgsInterval
+
+Nyall Dawson 	2017-05-04
+
+    Add a button to project properties to open folder containing project
+
+    (Opens in default OS file browser)
+
+Denis Rouzaud 	2017-05-04
+
+    [sipify] use single regex for all double annotation cases
+
+    followup ac54a3f83fa95e965f415ec6884d195629e87273
+
+Denis Rouzaud 	2017-05-04
+
+    [sipify] signals are public
+
+Nyall Dawson 	2017-05-04
+
+    Show project path using native OS format
+
+    Avoids showing project paths as d:/... on windows, and instead
+    uses the more familiar d:\... format
+
+Merge: 548d61b8c4 8389b9a04f
+Nyall Dawson 	2017-05-04
+
+    Merge pull request #4356 from nyalldawson/metadata
+
+    Implement Metadata store (WP2 for QEP-91) (part 1)
+
+Nyall Dawson 	2017-05-04
+
+    Fix expected sipify output
+
+Nyall Dawson 	2017-05-04
+
+    [sipify] Combine multiple argument annotations
+
+Merge: 9e662a7807 98e25d178c
+Nyall Dawson 	2017-05-04
+
+    Merge pull request #4397 from nyalldawson/no_adawaita
+
+    Block use of the Adwaita themes if we can avoid them
+
+Nyall Dawson 	2017-05-04
+
+    Sipify update
+
+Nyall Dawson 	2017-04-19
+
+    Add spatial and temporal extents to metadata
+
+Nyall Dawson 	2017-04-19
+
+    Add doxygen note about metadata validation
+
+Nyall Dawson 	2017-04-18
+
+    Add history item to metadata
+
+Nyall Dawson 	2017-04-18
+
+    Add license section to metadata
+
+Nyall Dawson 	2017-04-18
+
+    Add metadata validator
+
+    Adds a new abstract base class QgsMetadataValidator for validating
+    metadata against standard schemas.
+
+    Initially only QgsNativeMetadataValidator for validating against
+    the native QGIS metadata schema is implemented.
+
+    In future this could be extended with Dublin Core, ISO 19115
+    validators, etc...
+
+Nyall Dawson 	2017-04-12
+
+    Add temporary methods to save layer metadata in layer custom properties
+
+    Allows temporary persistance of metadata inside a single project. Will
+    be removed when later work packages from the metadata project are
+    merged.
+
+Nyall Dawson 	2017-04-11
+
+    Implement metadata store for map layers
+
+    QgsLayerMetadata handles storage and management of the metadata
+    for a QgsMapLayer. This class is an internal QGIS format with a common
+    metadata structure, which allows for code to access the metadata properties for
+    layers in a uniform way.
+
+    The metadata store is designed to be compatible with the Dublin Core metadata
+    specifications, and will be expanded to allow compatibility with ISO specifications
+    in future releases. However, the QGIS internal schema does not represent a superset
+    of all existing metadata schemas and accordingly conversion from specific
+    metadata formats to QgsLayerMetadata may result in a loss of information.
+
+    This class is designed to follow the specifications detailed in
+    the schema definition available at resources/qgis-resource-metadata.xsd
+    within the QGIS source code.
+
+Nyall Dawson 	2017-04-10
+
+    Attach layer metadata to QgsMapLayer
+
+Nyall Dawson 	2017-04-10
+
+    Metadata class shell
+
+Nyall Dawson 	2017-04-10
+
+    Remove duplicate gui/effects include
+
+Nyall Dawson 	2017-04-10
+
+    Preparation for metadata directory
+
+Merge: 87e2aab0f3 944ce5f611
+Nyall Dawson 	2017-05-04
+
+    Merge pull request #4330 from kalxas/metadata_schema
+
+    Adding Metadata schema for WP1 for QEP-91
+
+Merge: 32ff0921f4 03dd26ef9f
+Nyall Dawson 	2017-05-04
+
+    Merge pull request #4492 from nyalldawson/driver_from_extension
+
+    Add method to retrieve corresponding OGR driver from a file extension
+
+Merge: a87e8d1aa6 e40cb0716c
+Nyall Dawson 	2017-05-04
+
+    Merge pull request #4491 from nyalldawson/proxy_sink
+
+    Add QgsProxyFeatureSink
+
+Merge: cdb947c8d5 04a9264e86
+Nyall Dawson 	2017-05-04
+
+    Merge pull request #4493 from arnaud-morvan/sipify_core_classes_2
+
+    Sipify core classes 2
+
+arnaud.morvan@camptocamp.com 	2017-05-01
+
+    Add test for python QgsFields [] operator
+
+Merge: 3be20f8680 569593b79a
+Alessandro Pasotti 	2017-05-03
+
+    Merge pull request #4465 from boundlessgeo/server-plugins-api-refactoring2
+
+    [server] Server plugins API refactoring
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sipify core.QgsFeatureIterator
+
+arnaud.morvan@camptocamp.com 	2017-05-02
+
+    Sipify core.QgsFeatureFilterProvider
+
+Tom Kralidis 	2017-05-03
+
+    update qgisMinimumVersion to current LTR
+
+Nyall Dawson 	2017-05-03
+
+    Move QgsProxyFeatureSink methods to header
+
+    To allow better compiler optimisation
+
+Nyall Dawson 	2017-05-03
+
+    Add method to retrieve sink
+
+Alessandro Pasotti 	2017-04-30
+
+    [server] Python plugins API cleanup part 3
+
+    This removes the handleRequest method that returns the
+    headers and body as byte array.
+
+    This superceeded by the implementation that takes a
+    request and response instances.
+
+Alessandro Pasotti 	2017-04-30
+
+    [server] Python plugins API cleanup part 2
+
+    This part adds the headers as an optional argument
+    to the request and start using the handleRequest(request, response)
+    call in the python tests.
+
+    Some additional tests are also added.
+
+Alessandro Pasotti 	2017-04-30
+
+    [server] Python plugins API cleanup part 1
+
+    This is the first step to a cleaner and consitent API
+    for server plugin.
+
+    It also adds some new tests for the base request and
+    response classes
+
+Nyall Dawson 	2017-05-03
+
+    Adapt to GDAL 2.0 API
+
+Nyall Dawson 	2017-05-03
+
+    Add method to retrieve corresponding OGR driver from a file extension
+
+Nyall Dawson 	2017-05-03
+
+    Add QgsProxyFeatureSink
+
+    A simple feature sink which proxies feature addition on to another feature sink.
+
+    This class is designed to allow factory methods which always return new QgsFeatureSink
+    objects. Since it is not always possible to create an entirely new QgsFeatureSink
+    (e.g. if the feature sink is a layer or a layer's data provider), a new
+    QgsProxyFeatureSink can instead be returned which forwards features on to
+    the destination sink. The proxy sink can be safely deleted without affecting
+    the destination sink.
+
+Merge: 85f3b81b55 6f759a87c9
+Alexander Bruy 	2017-05-03
+
+    Merge pull request #4470 from alexbruy/ignore-empty-svg-path
+
+    ignore empty SVG path (fix #15891)
+
+Denis Rouzaud 	2017-05-03
+
+    remove double spaces in sip files
+
+    fix indentation
+
+Denis Rouzaud 	2017-05-03
+
+    [sipify] rename SIP_PYARGTYPE to SIP_PYTYPE since it can be used to changed return types too
+
+Nyall Dawson 	2017-05-03
+
+    Followup 363336, fixing adding features to OGR data providers
+
+    (addFeature cannot be called directly - it must be called
+    by addFeatures to ensure the various edition setup code
+    is called)
+
+Merge: a2327d3a70 747c2e2bf3
+Mathieu Pellerin 	2017-05-03
+
+    Merge pull request #4488 from nirvn/saveasimage_fix_rotated
+
+nirvn 	2017-05-03
+
+    rotated world file support in QgsMapSettingsUtils::worldFileContent()
+
+nirvn 	2017-05-03
+
+    Fix rotated canvas scale issue in save as image
+
+Nyall Dawson 	2017-05-03
+
+    Fix Coverity uninitialized member warning
+
+Nyall Dawson 	2017-05-03
+
+    Make QgsProcessingContext::temporaryLayerStore() return a pointer to store
+
+Nyall Dawson 	2017-05-03
+
+    Allow access to project's internal layer store, remove some duplicate code
+
+Merge: 8e70aa84fa 1526afecbd
+Nyall Dawson 	2017-05-03
+
+    Merge pull request #4483 from nyalldawson/writer_pt1
+
+    Small cleanups to processing getVectorWriter
+
+Nyall Dawson 	2017-05-02
+
+    Fix failing test
+
+Nyall Dawson 	2017-05-02
+
+    Fix build
+
+Nyall Dawson 	2017-05-02
+
+    Fix failing tests
+
+Nyall Dawson 	2017-05-02
+
+    Use a QgsMapLayerStore instead of whole QgsProject for
+    temporary layer storage in QgsProcessingContext
+
+Nyall Dawson 	2017-05-02
+
+    Move old map layer registry tests into QgsProject tests
+
+Nyall Dawson 	2017-05-02
+
+    Use QgsMapLayerStore within QgsProject
+
+Nyall Dawson 	2017-05-02
+
+    Split off map layer storage handling from QgsProject to QgsMapLayerStore
+
+    Turns out that there's valid use cases for having layer stores
+    outside of the cost of using a whole QgsProject.
+
+    Partially reverts the merger of QgsMapLayerRegistry into QgsProject,
+    except that there's no singletons here.
+
+Nyall Dawson 	2017-05-03
+
+    Add missing import
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Always require real QgsFields objects in getVectorWriter,
+    don't allow arrays of fields as inputs
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Fix vector split alg
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Remove unused options argument from (create/get)VectorWriter
+
+Merge: 8d8fa9466c e232a0809c
+Nyall Dawson 	2017-05-03
+
+    Merge pull request #4439 from arnaud-morvan/processing_run_context
+
+    [processing] Handle context in processing.run
+
+Merge: fbd62be7c5 c30d7b98d7
+Matthias Kuhn 	2017-05-02
+
+    [feature] Expression performance improvements
+
+Denis Rouzaud 	2017-05-02
+
+    [sipify] remove static const value assignment
+
+Merge: b342accfe4 5664d3df08
+rldhont 	2017-05-02
+
+    Merge pull request #4486 from rldhont/server-wfs-refactoring
+
+    [Server] little WFS refactoring
+
+Matthias Kuhn 	2017-05-02
+
+    Fix docstrings
+
+Matthias Kuhn 	2017-05-02
+
+    Fix crashing test
+
+rldhont 	2017-04-28
+
+    [Server] little WFS refactoring
+
+arnaud.morvan@camptocamp.com 	2017-04-29
+
+    [processing] Handle context in processing.run
+
+    Fix #15985 (Concave hull)
+
+Merge: 144492d4ce dea558b824
+Alexander Bruy 	2017-05-02
+
+    Merge pull request #4484 from lejedi76/processing_errormsg_mergevectorlayers_fix
+
+    [processing] fix error message in merge algorithm
+
+Merge: 8792265851 cf5d1aaece
+Alexander Bruy 	2017-05-02
+
+    Merge pull request #4481 from alexbruy/remove-r-provider
+
+    [processing][needs-docs] remove R provider from Processing core
+
+LOMENEDE Jean-Daniel 	2017-05-02
+
+    fix error message in merge algorithm
+
+Etienne Trimaille 	2017-05-01
+
+    sipify osmdownloader and small improvments to the overpass server
+
+Denis Rouzaud 	2017-05-02
+
+    change mullptr in api doc test
+
+Alexander Bruy 	2017-05-02
+
+    remove old import
+
+Alexander Bruy 	2017-05-02
+
+    [processing] remove stuff related to R provider
+
+Alexander Bruy 	2017-05-02
+
+    [processing] remove R provider from core distribution
+
+Denis Rouzaud 	2017-05-02
+
+    [sipify] fix detection of method signature with following body
+
+Denis Rouzaud 	2017-05-02
+
+    fix macros after signal
+
+Denis Rouzaud 	2017-05-02
+
+    [sip] mass introduction of annotations into headers
+
+Denis Rouzaud 	2017-05-01
+
+    script to reverse engineering from SIP to header
+
+    go grab annotations in SIP files to write them in the header
+    or what could be called the headerizer
+
+Merge: 7d459149c7 295c21227c
+Mathieu Pellerin 	2017-05-02
+
+    Merge pull request #4460 from nirvn/wallpapers
+
+Denis Rouzaud 	2017-05-02
+
+    [sip] align missing bits and replace nullptr by 0
+
+nirvn 	2017-05-01
+
+    Add a QgsMapSettingsUtils::worldFileContent() function
+
+Merge: 1711a41da6 877775d2c0
+Nyall Dawson 	2017-05-02
+
+    Merge pull request #4479 from nyalldawson/save_temp
+
+    [processing] Port dataobjects.getLayerFromString to c++
+
+Nyall Dawson 	2017-05-02
+
+    Remove a bunch of unneeded imports
+
+nirvn 	2017-05-01
+
+    Add missing wordfile creation to revamped save as image
+
+nirvn 	2017-05-01
+
+    [FEATURE] customizable output width and height in save as image dialog
+
+Nyall Dawson 	2017-05-02
+
+    Add a bunch of missing QgsProcessingUtils imports
+
+Nyall Dawson 	2017-05-02
+
+    Add unit test for QgsProcessingUtils::createSpatialIndex
+
+Nyall Dawson 	2017-05-02
+
+    Fix use of QgsProcessingUtils.mapLayerFromString
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Remove vector.spatialindex()
+
+    Use QgsProcessingUtils.createSpatialIndex() instead.
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Remove unused vector.duplicateInMemory() function
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Remove vector.bufferedBoundingBox()
+
+    Use QgsRectangle.grow() instead
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Remove unused dataobjects.loadList method
+
+Nyall Dawson 	2017-05-02
+
+    [processing] Remove unused dataobjects.extent method
+
+Nyall Dawson 	2017-05-02
+
+    Fix failing test
+
+Nyall Dawson 	2017-05-02
+
+    Fix resolving memory layers when multiple memory layers are used in model
+
+Nyall Dawson 	2017-05-02
+
+    Update API break docs
+
+Nyall Dawson 	2017-05-02
+
+    Add unit tests for QgsProcessingUtils::mapLayerFromString
+
+Nyall Dawson 	2017-05-02
+
+    Only expose a single mapLayerFromString method in QgsProcessingUtils
+
+Nyall Dawson 	2017-05-01
+
+    Add method QgsProcessingUtils::mapLayerFromString
+
+    Algorithms and other processing code should use this method
+    (instead of dataobjects.getLayerFromString) to
+    retrieve layers from a string, as it considers the processing
+    context and allows resolving strings to temporarily stored layers.
+
+    This permits processing models to function correctly when
+    intermediate results are stored as memory layers. Subsequent
+    model algorithms can then access these temporary layers as inputs.
+    All temporary layers will be removed when the context object
+    is destroyed after the model algorithm is run.
+
+Matthias Kuhn 	2017-05-02
+
+    Tag test context function as non-static
+
+Matthias Kuhn 	2017-05-02
+
+    Fix bindings
+
+Matthias Kuhn 	2017-05-02
+
+    Explicitly tag static variables
+
+Matthias Kuhn 	2017-05-01
+
+    Fully qualify nested classes for vintage sip
+
+Matthias Kuhn 	2017-05-01
+
+    Also report ScopedFunctions as static when approporiate
+
+Matthias Kuhn 	2017-05-01
+
+    Specify for expression functions if they are static
+
+    ... and prepare them whenever possible
+
+Matthias Kuhn 	2017-05-01
+
+    Prepare orderby in feature iterator
+
+Matthias Kuhn 	2017-05-01
+
+    Allow QgsFeatureRequest::OrderBy expressions to be prepared
+
+Matthias Kuhn 	2017-05-01
+
+    Expression variables are more often than not static
+
+Germán 	2017-05-01
+
+    Fix Interlis 2 extension in vector file writer
+
+Germán 	2017-05-01
+
+    Fix Interlis 2 extension in open dialog
+
+Matthias Kuhn 	2017-05-01
+
+    [travis] Improve macos timeout message
+
+Denis Rouzaud 	2017-05-01
+
+    align pointer and reference in sip files batch 2
+
+Merge: 93971d5ed3 00700292ef
+Denis Rouzaud 	2017-05-01
+
+    Merge branch 'GeoCat-sip-annotated'
+
+Merge: bb1bded249 93971d5ed3
+Denis Rouzaud 	2017-05-01
+
+    Merge branch 'master' into sip-annotated
+
+Denis Rouzaud 	2017-05-01
+
+    [sip] align pointer and reference in blacklisted files
+
+    this will facilitate sip diff checking
+
+doublebyte1 	2017-05-01
+
+    - changes to sipify script
+    - updated gsdataitem header:
+      - added qgis.h include
+      - skip sDataItemPtr
+      - remove , between SIP annotations
+    - run sipify for qgsvector and qgsdataitem
+
+Alexander Bruy 	2017-05-01
+
+    regenerate SIP files
+
+Alexander Bruy 	2017-05-01
+
+    add class prefixes
+
+Alexander Bruy 	2017-05-01
+
+    sipify QgsStatisticalSummary and QgsStringStatisticalSummary
+
+arnaud.morvan@camptocamp.com 	2017-05-01
+
+    Sipify QgsFieldFormatterRegistry
+
+arnaud.morvan@camptocamp.com 	2017-05-01
+
+    Sipifi QgsFieldFormatter
+
+arnaud.morvan@camptocamp.com 	2017-05-01
+
+    Sipify QgsFieldConstraints
+
+Denis Rouzaud 	2017-05-01
+
+    [sipify] fix do not print comment after SIP directive
+
+Alexander Bruy 	2017-05-01
+
+    ignore empty SVG path (fix #15891)
+
+Etienne Trimaille 	2017-05-01
+
+    sipify QgsColor*
+
+Merge: 2da64e4415 44731f2314
+Jürgen Fischer 	2017-05-01
+
+    Merge pull request #4434 from arnaud-morvan/db_manager_fix_schema_g
+
+    Db manager fix schema g
+
+Denis Rouzaud 	2017-05-01
+
+    [Travis] fix macos timeout message
+
+Alexander Bruy 	2017-05-01
+
+    add placeholder when new help location entry added (fix #16157)
+
+Alexander Bruy 	2017-05-01
+
+    [processing] uncheck Z-coordinate on layer change in Interpolation
+    algorithm (fix #10010)
+
+Denis Rouzaud 	2017-05-01
+
+    handle server sipify in prepare-commit
+
+raymondnijssen 	2017-04-30
+
+    sipified qgsadvanceddigitizingdockwidget
+
+arnaud.morvan@camptocamp.com 	2017-04-30
+
+    Sipify QgsField
+
+    I've removed the commented __getitem__ method from the sip file.
+
+Etienne Trimaille 	2017-04-30
+
+    sipify groupwmsdatadialog and qgsgroupbox
+
+Matthias Kuhn 	2017-05-01
+
+    Fix warnings
+
+Alexander Bruy 	2017-05-01
+
+    Revert "[processing] handle NULL values in the Singleparts to multiparts (fix #15822)"
+
+    This reverts commit a944f7c4c1010767abb811200686e327040c2d32.
+
+Alexander Bruy 	2017-05-01
+
+    Revert "Merge pull request #4458 from arnaud-morvan/processing_fix_single_to_multi_test"
+
+    This reverts commit 77d95905a51db6c2d938c736e34da246ad6e0f50, reversing
+    changes made to 6fd45f0ef5968e2471421a21f81017c9c86f3fb7.
+
+Nyall Dawson 	2017-05-01
+
+    [processing] Fix refreshing alg list does not refresh toolbox
+
+    Fix #16455, #16463
+
+Nyall Dawson 	2017-05-01
+
+    [processing] Fix executing models
+
+Nyall Dawson 	2017-05-01
+
+    [processing] Fix invalid logging error
+
+Nyall Dawson 	2017-05-01
+
+    [processing] Fix some regressions following algorithm refactoring
+
+Nyall Dawson 	2017-05-01
+
+    [processing] Fix editing existing model has no algorithms shown
+
+Merge: 6fd45f0ef5 adf5b6f0c5
+Nyall Dawson 	2017-05-01
+
+    Merge pull request #4458 from arnaud-morvan/processing_fix_single_to_multi_test
+
+    [processing] Fix qgis:singlepartstomultipart test
+
+Juergen E. Fischer 	2017-05-01
+
+    fix 82418ea0
+
+arnaud.morvan@camptocamp.com 	2017-04-30
+
+    Sipify QgsField
+
+Denis Rouzaud 	2017-05-01
+
+    prepare-commit: do not exist if indentation fails to go on with sipify
+
+Matthias Kuhn 	2017-05-01
+
+    Fixup d230cf2e4
+
+Denis Rouzaud 	2017-05-01
+
+    followup b46de90d53c9298ba4f1267d2bdabcf4d669afe5
+
+Matthias Kuhn 	2017-04-29
+
+    Doxymentation
+
+Matthias Kuhn 	2017-04-30
+
+    more usage of cached values
+
+Matthias Kuhn 	2017-04-29
+
+    Also support invalid-as-null variants
+
+Matthias Kuhn 	2017-04-29
+
+    Code cleanup in QgsExpression
+
+Matthias Kuhn 	2017-04-29
+
+    Collapse static nodes in QgsExpression:prepare()
+
+    If the result of a node in a QgsExpression can already be determined to
+    be static at preparation time, there is no need to re-evaluate it
+    for every feature.
+
+Matthias Kuhn 	2017-04-30
+
+    Fix remaining errors
+
+Matthias Kuhn 	2017-04-30
+
+    Cleanup blacklist
+
+Denis Rouzaud 	2017-04-30
+
+    sipify QgsExpression
+
+Denis Rouzaud 	2017-04-30
+
+    [sipify| do not write docstring for [] operator
+
+Denis Rouzaud 	2017-04-30
+
+    move SIP_CODE to public section
+
+raymondnijssen 	2017-04-30
+
+    sipify QgsPoint
+
+Etienne Trimaille 	2017-04-30
+
+    sipify qgsoverlayanalyzer and qgsnewmemorylayer
+
+Merge: 1287a64eb2 2aba4c5b88
+doublebyte1 	2017-04-30
+
+    Merge branch 'sip-annotated' of https://github.com/GeoCat/QGIS into sip-annotated
+
+arnaud.morvan@camptocamp.com 	2017-04-30
+
+    [processing] Fix qgis:singlepartstomultipart test
+
+doublebyte1 	2017-04-30
+
+    - updated const variables on the qgsvector header.
+    - Removed dataItem_t pointer from qgsdataitem bindings.
+    - Put back qobject_cast.
+
+doublebyte1 	2017-04-30
+
+    - Supporting automated sip generation for qgsdataitem and qgsvector classes
+     - Removed qgsdataitem.sip and qgsvector.sip from auto_sip.blacklist
+     - Annotated qgsdataitem.h for sip
+     - regenerated automatically qgsdataitem.sip and qgsvector.sip
+
+Juergen E. Fischer 	2017-04-30
+
+    remove superfluous semicolon (followup e4d2f34)
+
+arnaud.morvan@camptocamp.com 	2017-04-30
+
+    Fix typo in sipify.pl
+
+Etienne Trimaille 	2017-04-30
+
+    sipify QgsScaleCombobox
+
+Alexander Bruy 	2017-04-30
+
+    fix failing test
+
+Merge: a26a6efe38 298e14b314
+doublebyte1 	2017-04-30
+
+    Merge remote-tracking branch 'upstream/master' into sip-annotated
+
+Denis Rouzaud 	2017-04-30
+
+    [sipify] handle multiple annotations
+
+Merge: 59bf146cc5 4ae22ac67e
+doublebyte1 	2017-04-30
+
+    Merge remote-tracking branch 'upstream/master' into sip-annotated
+
+Juergen E. Fischer 	2017-04-30
+
+    update INSTALL following 82418ea0
+
+Matthias Kuhn 	2017-04-30
+
+    [sipify] seealso
+
+Denis Rouzaud 	2017-04-30
+
+    [sipify] do not take // comments into docstrings
+
+Denis Rouzaud 	2017-04-30
+
+    [sipify] better remove body, remove duplicate code
+
+Denis Rouzaud 	2017-04-29
+
+    [sipify] fix oneliner constructor and destructor
+
+Denis Rouzaud 	2017-04-29
+
+    [sipify] fix handling of nested classes
+    going to proper section when ending a nesting classes (public/private)
+    also improve debugging output
+
+Denis Rouzaud 	2017-04-29
+
+    [sipify] fix multiline definition with member initiliazing list
+
+doublebyte1 	2017-04-30
+
+    - updated const variables on the qgsvector header.
+    - Removed dataItem_t pointer from qgsdataitem bindings.
+    - Put back qobject_cast.
+
+Juergen E. Fischer 	2017-04-30
+
+    debian packaging: disable WITH_PYSPATIALITE in favor of libsqlite3-mod-spatialite
+
+doublebyte1 	2017-04-30
+
+    - Supporting automated sip generation for qgsdataitem and qgsvector classes
+     - Removed qgsdataitem.sip and qgsvector.sip from auto_sip.blacklist
+     - Annotated qgsdataitem.h for sip
+     - regenerated automatically qgsdataitem.sip and qgsvector.sip
+
+raymondnijssen 	2017-04-30
+
+    add some cheering
+
+raymondnijssen 	2017-04-30
+
+    add beer
+
+Alexander Bruy 	2017-04-30
+
+    homogenize allowed tolerance values (fix #16336)
+
+Alexander Bruy 	2017-04-30
+
+    [processing] handle NULL values in the Singleparts to multiparts (fix #15822)
+
+Alexander Bruy 	2017-04-30
+
+    [processing] fix GRASS commands logging
+
+Denis Rouzaud 	2017-04-30
+
+    fix sipify_all
+
+Juergen E. Fischer 	2017-04-30
+
+    remove accidentally committed files
+
+Juergen E. Fischer 	2017-04-30
+
+    fix 98c89ccab
+
+Merge: 70da6b6ee7 a86f5ea52d
+Denis Rouzaud 	2017-04-30
+
+    followup #a86f5ea52d75862c190105d1ceb23c47a61bba4e fix issues links
+
+Denis Rouzaud 	2017-04-30
+
+    remove PyNames for QgsGeometry::compare methods
+
+    single python method with some MethodCode to dispatch to proper cpp methods.
+
+Denis Rouzaud 	2017-04-27
+
+    sipify geometry classes
+
+Juergen E. Fischer 	2017-04-30
+
+    fix test_qgsgeometry.py indentation
+
+arnaud.morvan@camptocamp.com 	2017-04-29
+
+    Fix new bookmark query. Fix #16465
+
+    QSqlQuery was returning an error : wrong parameters count.
+    It seems that bindValue was having no effect (no bounded values).
+    Using prepare after construction seems to solve the problem.
+
+Merge: b587282186 bc09875866
+Alexander Bruy 	2017-04-30
+
+    Merge pull request #4445 from arnaud-morvan/processing_fix_rasterize
+
+    [processing] fix rasterize dialog openning (fix #16061)
+
+Merge: cb63e82d62 0d5cbfe689
+Nyall Dawson 	2017-04-30
+
+    Merge pull request #4433 from nyalldawson/blur_buffer
+
+    [FEATURE] Allow paint effects for label buffers & backgrounds
+
+Larry Shaffer 	2017-04-30
+
+    Fix QgsJSONUtils test to work on macOS
+
+    Apparently, newer versions of QJsonDocument strip extra new lines when
+    encoding some mapped values. Ignore in output from any version for now
+
+Nyall Dawson 	2017-04-30
+
+    Fix memory leak
+
+Nyall Dawson 	2017-04-30
+
+    Fix Coverity null dereference warnings
+
+Nyall Dawson 	2017-04-30
+
+    Fix Coverity logically dead code error
+
+Nyall Dawson 	2017-04-30
+
+    Fix Coverity uninitialized member warning
+
+Nyall Dawson 	2017-04-30
+
+    Fix Coverity unchecked return value error
+
+Nyall Dawson 	2017-04-30
+
+    Unblacklist qgis_distanceareatest on OSX
+
+Nyall Dawson 	2017-04-30
+
+    Fix import WKT of the format MultiPoint (-20 -90, -20 -88 )
+
+    Should technically be MultiPoint ((-20 -90), (-20 -88)), but
+    it's nice to be forgiving and accept as wide a range of WKT
+    formats as possible
+
+    Fix #16483
+
+Matthias Kuhn 	2017-04-29
+
+    [travis] Unblacklist expression test on osx
+
+Werner Macho 	2017-04-29
+
+    Add Filename to error message
+
+Juergen E. Fischer 	2017-04-29
+
+    hub.qgis.org moved to issues.qgis.org
+
+Larry Shaffer 	2017-04-29
+
+    Enable hidpi support on macOS by default
+
+Larry Shaffer 	2017-04-29
+
+    Update macOS app bundle copyright notice
+
+Tim Sutton 	2017-04-29
+
+    Added a little more padding for recent projects title (#4443)
+
+arnaud.morvan@camptocamp.com 	2017-04-29
+
+    [processing] Fix rasterize dialog openning
+
+    Fix #16061
+
+    Do not pass in getConsoleCommand just to get commandName for shortHelp.
+    This avoid errors with non initialized parameters.
+
+Alexander Bruy 	2017-04-29
+
+    [processing] add multithreading option to warp (fix #15340)
+
+Richard Duivenvoorde 	2017-04-29
+
+    Update README.md
+
+Juergen E. Fischer 	2017-04-28
+
+    also accept uppercase .qgs as project extension (fixes #15871)
+
+Merge: b3e1aba1cd 76d8650358
+Alessandro Pasotti 	2017-04-29
+
+    Merge pull request #4438 from elpaso/server-class-split
+
+    [server] Moved QgsBufferServerRequest into its own header and cpp file
+
+Alessandro Pasotti 	2017-04-29
+
+    [server] Moved QgsFcgiServerRequest into its own header and cpp file
+
+Alessandro Pasotti 	2017-04-29
+
+    [server] Moved QgsBufferServerRequest into its own header and cpp file
+
+Alexander Bruy 	2017-04-29
+
+    expose image compression in the layer metadata (fix #15702)
+
+Larry Shaffer 	2017-04-29
+
+    Use gsed for spellchecking on macOS; ignore inline ‘replys’ spell check
+
+Denis Rouzaud 	2017-04-29
+
+    followup ec568222e06776f45ec6dbe390d21c117938cb67
+
+Denis Rouzaud 	2017-04-28
+
+    followup b88f350b2283df3ce5f527fd41b7b1382f4c23a1
+
+    add server to sipify test
+
+Denis Rouzaud 	2017-04-28
+
+    add server files to sipify
+
+    you just now need to unblacklist them :)
+
+arnaud.morvan@camptocamp.com 	2017-04-28
+
+    [db_manager] Fix postgis plugins loading
+
+    Fix infinite recursion on load calls
+
+Denis Rouzaud 	2017-04-28
+
+    add server files to sipify
+
+    you just now need to unblacklist them :)
+
+rldhont 	2017-04-28
+
+    [BUGFIX][Processing] Fix spatialite version comparison: import re
+
+Matthias Kuhn 	2017-04-28
+
+    Autoapply sipify in prepare-commit.sh
+
+Nyall Dawson 	2017-04-28
+
+    Update text renderer mask images
+
+arnaud.morvan@camptocamp.com 	2017-04-28
+
+    [db_manager] Fix DBConnector.getSchemaTableName
+
+    Fix #15910
+
+Nyall Dawson 	2017-04-28
+
+    Update text renderer tests
+
+Nyall Dawson 	2017-04-28
+
+    Sipify QgsTextRenderer
+
+Nyall Dawson 	2017-04-28
+
+    [FEATURE] Allow setting paint effects on label background shapes
+
+    Can also be useful for improving text readability through
+    outer glows and blurs
+
+Nyall Dawson 	2017-04-28
+
+    [FEATURE] Paint effect support for label buffers
+
+    Allows applying a paint effect (such as blurs) to label buffers.
+    Blurring label buffers is a great way to get the text readability
+    of a label buffer without the distracting halo effect.
+
+Denis Rouzaud 	2017-04-28
+
+    update Doxyfile to 1.8 template (#4428)
+
+Nyall Dawson 	2017-04-28
+
+    [composer] Fix missing item config for shape items
+
+Matthias Kuhn 	2017-04-27
+
+    Add QgsDataProvider::uri property
+
+Matthias Kuhn 	2017-04-27
+
+    fix sipdiff call to sipify
+
+Alexander Bruy 	2017-04-27
+
+    add online QGIS User Guide as default help source (fix #16155)
+
+    NOTE: to use online QGIS user Guide as help source we still need
+    some server-side tweaks: redirection to the testing docs for non-LTR
+    QGIS versions and redirection to english docs for not supported locales
+
+Denis Rouzaud 	2017-04-27
+
+    fix Doxygen build for new SIP macros
+
+Denis Rouzaud 	2017-04-27
+
+    [sipify] debug + fix multiline in SIP_RUN
+
+Alexander Bruy 	2017-04-27
+
+    followup 1ac053fc26
+
+Alexander Bruy 	2017-04-27
+
+    [processing] prevent division by zero in save selected features
+    algorithm (fix #16431)
+
+Alexander Bruy 	2017-04-27
+
+    restore missed icon (fix #16466)
+
+Matthias Kuhn 	2017-04-26
+
+    Fix osgeo import
+
+Matthias Kuhn 	2017-04-26
+
+    fixup .ci rename
+
+Matthias Kuhn 	2017-04-26
+
+    do not force link bison and flex
+
+Matthias Kuhn 	2017-04-26
+
+    Move ci to .ci
+
+Matthias Kuhn 	2017-04-26
+
+    Reorganize travis scripts
+
+Nyall Dawson 	2017-04-27
+
+    Followup 20197c2, fix orphaned highlights remaining on maps
+
+Nyall Dawson 	2017-04-27
+
+    Fix some broken utf strings on Windows
+
+Nyall Dawson 	2017-04-27
+
+    Better tooltips for map layers
+
+    Including CRS information
+
+Merge: f1d4ac33e7 348b65b12c
+Nyall Dawson 	2017-04-27
+
+    Merge pull request #4425 from nyalldawson/qwt
+
+    Remove old code for handling QWT < 6.1
+
+Nyall Dawson 	2017-04-27
+
+    Remove old code for handling QWT < 6.1
+
+    Versions < 6.1 are not compatible with Qt5
+
+Merge: 84471f2e6d 0b0ccc9e9d
+Nyall Dawson 	2017-04-27
+
+    Merge pull request #4282 from nyalldawson/sel
+
+    Rename QgsVectorLayer::selectedFeaturesIterator to getSelectedFeatures
+
+Nyall Dawson 	2017-04-27
+
+    Rename QgsVectorLayer::selectedFeaturesIterator to getSelectedFeatures
+
+    It's more in line with QgsVectorLayer::getFeatures, hence a more
+    discoverable API
+
+lbartoletti 	2017-04-12
+
+    New classes for circle and ellipse.
+
+Merge: d7181105b5 fd2c18ee16
+Nyall Dawson 	2017-04-27
+
+    Merge pull request #4417 from nyalldawson/processing_writer
+
+    Refactor processing writer to use QgsFeatureSink
+
+Nyall Dawson 	2017-04-27
+
+    [composer] Fix selection drawn in maps if renderer has symbol level order
+
+Matthias Kuhn 	2017-04-26
+
+    Calculate travis timeout dynamically
+
+Matthias Kuhn 	2017-04-23
+
+    Enable osx tests
+
+Denis Rouzaud 	2017-04-26
+
+    [sipify] operators, remove argument
+
+     * skip some operators
+     * allow to remove an argument with SIP_PYARGREMOVE
+
+Denis Rouzaud 	2017-04-26
+
+    fix doxgen test
+
+Denis Rouzaud 	2017-04-26
+
+    followup 45266cd03ef8037fd657b992357b0d2d716522da
+
+Denis Rouzaud 	2017-04-26
+
+    [sipify] improvements
+
+     * add In annotation
+     * remove struct forward declarations
+     * fix members initialization list in header
+     * merge removal code for function bodies and constructor definition
+
+Nyall Dawson 	2017-04-26
+
+    Refactor processing writer to use QgsFeatureSink, and to store
+    temporary output layers in the provided processing context
+
+    Should fix loss of intermediate memory layers when running
+    a multi-step model
+
+Merge: 9bb076295e a5e33fa93c
+Nyall Dawson 	2017-04-26
+
+    Merge pull request #4418 from nyalldawson/take_layer
+
+    Allow taking layers from QgsProject
+
+Nyall Dawson 	2017-04-26
+
+    Add method to take layer and ownership from a project
+
+Denis Rouzaud 	2017-04-26
+
+    [sipify] improvements
+
+     * add Array and ArraySize annotations
+     * also handle multiline skipped bodies
+     * handle #if 0 blocks
+
+Nyall Dawson 	2017-04-26
+
+    Add missing docs
+
+Merge: 6b4ddb3b0d e9f13d1ea3
+Nyall Dawson 	2017-04-26
+
+    Merge pull request #4400 from nyalldawson/processing_log
+
+    [processing] Move some log handling to c++ class
+
+Nyall Dawson 	2017-04-26
+
+    Add temporary layer store to processing context
+
+    This temporary layer store (a QgsProject) is used as a
+    store for layers that are added if a parameter that
+    is evaluated to a layer requires that a new, non-active-project
+    layer is loaded. It means that these layers will remain accessible
+    for the duration of the algorithm's execution (or models
+    execution if an algorithm is run as part of a model), before
+    being automatically discarded when the QgsProcessingContext
+    used to run the algorithm/model goes out of scope.
+
+    This approach has several benefits:
+    - it means that algorithms (including c++ algorithms) are able
+    to use both project and non-project layers without needing
+    to handle any memory management themselves.
+    - it means that layers are guaranteed to last for the duration
+    of a model execution. This is currently an issue where models
+    which use memory layers as intermediate outputs do not
+    function correctly as the memory layers are destroyed before
+    the model has finished executing
+    - there should be no leakage of layers remaining open
+    after an algorithm exits
+
+Nyall Dawson 	2017-04-26
+
+    Just use standard QgsMessageLog functionality instead of a dedicated
+    method for processing
+
+Nyall Dawson 	2017-04-25
+
+    Fix logging from GDAL
+
+Nyall Dawson 	2017-04-24
+
+    [processing] Move some log handling to c++ class
+
+Merge: fea6bff707 a4cd66f8d8
+Nyall Dawson 	2017-04-26
+
+    Merge pull request #4412 from nyalldawson/processing_get_features
+
+    Port processing vector.features to c++
+
+Nyall Dawson 	2017-04-26
+
+    Port some more code to new API
+
+Nyall Dawson 	2017-04-26
+
+    Fix failing test
+
+Nyall Dawson 	2017-04-26
+
+    Add c++ optimised uniqueValues method which respects processing context
+
+    Remove processing vector.uniqueValues/vector.getUniqueValues
+    and port usage to c++ method
+
+    Should be much faster than the python method, as the c++ method takes
+    advantage of handing off the unique values calculation to the
+    provider source whenever possible
+
+Nyall Dawson 	2017-04-26
+
+    [processing] Don't use config values for invalid geometry handling in tests
+
+Nyall Dawson 	2017-04-26
+
+    Indentation/sipify
+
+Nyall Dawson 	2017-04-26
+
+    Fix failing tests
+
+Nyall Dawson 	2017-04-25
+
+    Move createContext to dataobjects
+
+Nyall Dawson 	2017-04-25
+
+    Rename UseSelection -> UseSelectionIfPresent, clarify docs
+
+Nyall Dawson 	2017-04-25
+
+    Add missing doc
+
+Nyall Dawson 	2017-04-25
+
+    Remove vector.features
+
+    Use QgsProcessingUtils.getFeatures instead
+
+Nyall Dawson 	2017-04-25
+
+    Remove len method from vector.features
+
+    Use QgsProcessingUtils::featureCount instead
+
+Nyall Dawson 	2017-04-25
+
+    Raise GeoAlgorithmExecutionException when encountering invalid
+    geometries in QgsProcessingUtils::getFeatures
+
+Nyall Dawson 	2017-04-25
+
+    Allow setting the invalid geometry callback in processing context
+
+Nyall Dawson 	2017-04-25
+
+    Add methods for getting vector iterators to QgsProcessingUtils
+
+Nyall Dawson 	2017-04-25
+
+    Use context to control vector.features()
+
+Nyall Dawson 	2017-04-25
+
+    Add context argument to other vector methods
+
+Nyall Dawson 	2017-04-25
+
+    Add context argument to vector.features
+
+Nyall Dawson 	2017-04-25
+
+    Add invalid geometry handling method to processing context
+
+Nyall Dawson 	2017-04-25
+
+    Add UseSelection flag to QgsProcessingContext
+
+    Indicates whether only selected features should be used in
+    algorithms
+
+Nyall Dawson 	2017-04-25
+
+    [processing] Pass context argument to processAlgorithm
+
+Nyall Dawson 	2017-04-24
+
+    Create a context object for processing algorithm execution
+
+Merge: 16cb244d2a 9e4f9d4ac6
+Nyall Dawson 	2017-04-26
+
+    Merge pull request #4389 from nyalldawson/scalebar
+
+    Refactor scalebar renderer, split from composer
+
+Merge: 13b44722ca 4293de6327
+Nyall Dawson 	2017-04-26
+
+    Merge pull request #4416 from nyalldawson/feature_sink
+
+    Add a QgsFeatureSink interface
+
+Nyall Dawson 	2017-04-26
+
+    Add missing override keywords
+
+Nyall Dawson 	2017-04-26
+
+    Provide a base class version of QgsFeatureSink::addFeature
+
+    Means that subclasses are only required to implement addFeatures
+
+Nyall Dawson 	2017-04-26
+
+    Sipify update
+
+Nyall Dawson 	2017-04-23
+
+    Add missing docs
+
+Nyall Dawson 	2017-04-23
+
+    More robust test for numeric scale bar
+
+Nyall Dawson 	2017-04-21
+
+    Refactor scale bar rendering
+
+    Move all scalebar rendering code out of composer and ensure that
+    all scalebar rendering is done independant of QgsComposerScaleBar
+
+    This allows scalebar rendering code to be reused by plugins
+    and by non-composer code.
+
+    Also rename QgsScaleBarStyle -> QgsScaleBarRenderer, (and all
+    subclasses too). This name better reflects what these classes do.
+
+Nyall Dawson 	2017-04-26
+
+    Add a method to QgsFeatureSink to add all features from an iterator
+
+Nyall Dawson 	2017-04-26
+
+    Remove invalid doxygen note
+
+    It's only flipping a bool, and possibly in some circumstances
+    it's more efficient to add features one by one rather than storing
+    large number of features in a temporary list
+
+Nyall Dawson 	2017-04-26
+
+    Don't force use of In,Out in QgsFeatureSink methods
+
+Nyall Dawson 	2017-04-26
+
+    QgsFeatureStore is a QgsFeatureSink
+
+    Also clean up API for QgsFeatureStore, sipify
+
+Nyall Dawson 	2017-04-26
+
+    QgsVectorLayer is a QgsFeatureSink
+
+    Also cleanup API for addFeature(s) in QgsVectorLayer, by removing
+    the unused extra argument from addFeature() and be removing the
+    makeSelected argument from addFeatures() (code should be adapted
+    to manually select added features after adding if desired - this
+    was only used in a single place in the QGIS code and I suspect
+    this was unintentional in any case)
+
+Nyall Dawson 	2017-04-26
+
+    QgsVectorFileWriter is a QgsFeatureSink
+
+Nyall Dawson 	2017-04-26
+
+    Add In,Out annotations to QgsFeatureSink methods
+
+Nyall Dawson 	2017-04-26
+
+    QgsVectorDataProvider is a QgsFeatureSink
+
+Nyall Dawson 	2017-04-26
+
+    Add a QgsFeatureSink interface for classes which accept adding features
+
+Nyall Dawson 	2017-04-26
+
+    Add a simple qHash for QVariant
+
+    Allows creation of QSet
+
+Merge: c869fa29b6 ae7ace9873
+Larry Shaffer 	2017-04-25
+
+    Merge pull request #4407 from boundlessgeo/filedownloader-auth
+
+    [auth] Add authentication configuration support to QgsFileDownloader
+
+rldhont 	2017-04-25
+
+    [BUGFIX][Server] Filter restorer modifying layers and not well restoring them
+
+    The Subsetstring is updated through QgsVectorLayer::setSubsetString and restored by QgsVectorDataProvider::setSubsetString and it's not idempotent.
+    The solution is to use QgsVectorLayer::setSubsetString in the 2 cases.
+
+Merge: 96151e732a 27a9053490
+rldhont 	2017-04-25
+
+    Merge pull request #4415 from rldhont/server-wms-configparser-getcapabilities-part1
+
+    [Server] WMS GetCapabilities refactoring - Part 1
+
+Denis Rouzaud 	2017-04-25
+
+    remove extra SIP_TRANSFERTHIS in cpp files
+
+rldhont 	2017-04-20
+
+    [Server] WMS GetCapabilities refactoring - Part 1
+
+    Part 1 for removing QgsWMSProjectParser from GetCapabilities
+
+Nathan Woodrow 	2017-04-24
+
+    Add QgsStackTrace class
+
+Denis Rouzaud 	2017-04-25
+
+    sipify batch
+
+    * QgsDial
+    * QgsDialog
+    * QgsDockWidget
+    * QgsEncodingFileDialog
+    * QgsErrorDialog
+
+Denis Rouzaud 	2017-04-25
+
+    [doxygen] add include path to allow macro retrieval
+
+Denis Rouzaud 	2017-04-25
+
+    fix doxymentation
+
+Denis Rouzaud 	2017-04-24
+
+    sipify layer tree classes
+
+Nyall Dawson 	2017-04-25
+
+    Remove deprecated assertEquals use
+
+Merge: 3fa1162229 d27cbe7f3f
+Nyall Dawson 	2017-04-25
+
+    Merge pull request #4402 from nyalldawson/iterator_invalid_geom
+
+    Add invalid geometry handling to QgsFeatureRequest/QgsVectorLayerFeatureIterator
+
+Merge: b0c1604864 965350b3ae
+Even Rouault 	2017-04-25
+
+    Merge pull request #4408 from rouault/fix_12695
+
+    DBManager: fix importing a new layer in a GeoPackage (#16295)
+
+Nyall Dawson 	2017-04-25
+
+    Try to fix build failure on clang
+
+Nyall Dawson 	2017-04-25
+
+    More cleanups to MethodCode
+
+Nyall Dawson 	2017-04-25
+
+    Cleaner MethodCode
+
+Nyall Dawson 	2017-04-25
+
+    Expose invalid geometry callback to python
+
+Nyall Dawson 	2017-04-24
+
+    Slight reorganisation of geometry check to make it easier to
+    add other checks in future
+
+Nyall Dawson 	2017-04-24
+
+    [processing] Remove special handling for invalid geometries
+
+    Instead rely on QgsFeatureRequest method. There's a temporary
+    loss of the feedback on encountering an invalid geometry
+    when abort on invalid is set, but that will be resurrected
+    when all of vector.features is moved to c++
+
+Nyall Dawson 	2017-04-24
+
+    Expand unit tests
+
+Nyall Dawson 	2017-04-24
+
+    Allow specifying a callback for encountering invalid geometries while iterating
+
+Nyall Dawson 	2017-04-24
+
+    Add method to perform invalid geometry checking in QgsFeatureRequest
+
+    Allows requests to specify how invalid geometries should be
+    handled. Default is to perform no geometry validity checking.
+
+Denis Rouzaud 	2017-04-25
+
+    fix indentation
+
+Even Rouault 	2017-04-24
+
+    DBManager: fix importing a new layer in a GeoPackage (#16295)
+
+Alessandro Pasotti 	2017-04-24
+
+    pep8 travis quirks (do not err locally)
+
+Alessandro Pasotti 	2017-04-24
+
+    [auth] Add authentication configuration support to QgsFileDownloader
+
+    With tests.
+
+Even Rouault 	2017-04-24
+
+    Adjust expected results for GDAL 2.2
+
+Denis Rouzaud 	2017-04-24
+
+    [sifpiy] handle multiline body
+
+Merge: fbe10d461c d3453063ea
+Alessandro Pasotti 	2017-04-24
+
+    Merge pull request #4404 from elpaso/server-tests-improvements
+
+    [server] Tests housekeeping and improved robustness
+
+Denis Rouzaud 	2017-04-24
+
+    followup 8f35ee464f0a32284263b684abbdf2a42c0e9131
+
+Denis Rouzaud 	2017-04-24
+
+    sipify improvements
+
+     * one liner enum (without assignements)
+     * remove function bodies of skipped methods
+
+Alessandro Pasotti 	2017-04-24
+
+    [server] Tests housekeeping and improved robustness
+
+    * There is now a new common base class for QGIS Server testing
+    * WMS tests have been moved into their own class
+    * Added tests for onlineResource URL in query string
+
+Denis Rouzaud 	2017-04-24
+
+    sipify batch
+
+     * QgsCredentials
+     * QgsCrsCache
+     * QgsDataSourceUri
+     * QgsDateTimeStatisticalSummary
+     * QgsDatumTransformStore
+
+Denis Rouzaud 	2017-04-24
+
+    [sipify] remove EXPORT macro from struct definition
+
+Merge: c540ab33bd cbcd193875
+Alessandro Pasotti 	2017-04-24
+
+    Merge pull request #4393 from elpaso/server-api-mods
+
+    [server] Server api mods
+
+Denis Rouzaud 	2017-04-24
+
+    sipify QgsApplication
+
+Denis Rouzaud 	2017-04-24
+
+    [sipify] do not remove function body within SIP_RUN blocks
+
+Denis Rouzaud 	2017-04-24
+
+    sipify batch
+
+        * QgsBearingUtils
+        * QgsBrowserModel
+        * QgsColorScheme, QgsColorSchemeRegistry
+        * QgsContextHelp
+        * QgsCoordinateReferenceSystem
+        * QgsCoordinateTransform
+        * QgsFeedback
+
+Denis Rouzaud 	2017-04-24
+
+    sipify improvements
+
+     * reset comment while changing section
+     * fix comment at the end of a comment block
+     * use SIP_FORCE to show private members
+
+Denis Rouzaud 	2017-04-24
+
+    revert 82c66f8aa38e4e0e2d213b2040360410cafef30d
+
+Denis Rouzaud 	2017-04-24
+
+    Revert "Revert "Revert "Remove virtual method from class which shouldn't be subclassed"""
+
+    This reverts commit 2a8555e13eb9a0e6bc0a24502ddb034f1aa1a3ac.
+
+    sorry for the noise
+
+Denis Rouzaud 	2017-04-24
+
+    Revert "Revert "Remove virtual method from class which shouldn't be subclassed""
+
+    This reverts commit cb68c982b829ecf94b19f9b9a030a269e1c2239f.
+
+Denis Rouzaud 	2017-04-24
+
+    [spelling] fix bad inword detection for activeXXX
+
+Merge: 347934f4de 414772b6f4
+Alexander Bruy 	2017-04-24
+
+    Merge pull request #4385 from volaya/remove_processing_commander
+
+    [FEATURE][processing] remove processing commander
+
+Denis Rouzaud 	2017-04-24
+
+    follow up 1bfa539
+
+Denis Rouzaud 	2017-04-24
+
+    [sipify] remove extra blank line
+
+Nyall Dawson 	2017-04-24
+
+    Revert "Remove virtual method from class which shouldn't be subclassed"
+
+    This reverts commit 858129ddd3072d633e0abd97e1a45fe880f4cfb2.
+
+    I remember now... that was added to avoid a totally nonsense and
+    otherwise unfixable crash in the sip bindings...
+
+nirvn 	2017-04-24
+
+    Save as image cleanup:
+    * message bar go away after 5sec
+    * make a couple of strings translatable in settings dialog
+    * nicer initialization of members
+
+Nyall Dawson 	2017-04-24
+
+    Remove virtual method from class which shouldn't be subclassed
+
+Nyall Dawson 	2017-04-24
+
+    Block use of the Adwaita themes if we can avoid them
+
+    The Qt variants of these GTK themes are VERY broken
+    for apps like QGIS. E.g. oversized controls like
+    spinbox widgets prevent actually showing any actual CONTENT
+    in these widgets, leaving a very bad impression of QGIS
+
+    Keeping a consistent DE theme is nice and all, but if
+    it leaves QGIS in an unusable state then it's misguided.
+
+    *Blame resides with gnome's obsession with "touch friendly"
+    tablet style widgets
+
+Nathan Woodrow 	2017-04-24
+
+    UI cleanup for crash dialog
+
+Merge: 82c66f8aa3 94c56aaf8c
+Nyall Dawson 	2017-04-24
+
+    Merge pull request #4394 from nyalldawson/bad_iterator_go_and_sit_in_a_corner
+
+    Fix crash when OGR layer is removed when source is stored
+
+Nyall Dawson 	2017-04-24
+
+    Remove unused variable
+
+Nyall Dawson 	2017-04-24
+
+    Nicer initialization of members in iterators/sources
+
+Nyall Dawson 	2017-04-24
+
+    Use unique_ptrs in provider feature sources
+
+Nyall Dawson 	2017-04-24
+
+    AFS feature source doesn't need to be a QObject
+
+Nyall Dawson 	2017-04-24
+
+    Correct use of private vs protected in  provider/sources
+
+Nyall Dawson 	2017-04-23
+
+    Partial fix for virtual layer iterator depending on provider
+
+    The proper fix is more involved and requires reworking of the
+    sqlite handle to utilise a shared pointer. Without this
+    the iterator will return no features if the provider is removed
+    while a source is active (i.e. removing virtual layer while
+    map is rendering).
+
+    But at least it avoids a crash in this circumstance...
+
+Nyall Dawson 	2017-04-23
+
+    Fix crash when OGR layer is removed when source is stored
+
+    Remove link to provider in OGR feature source
+
+Nyall Dawson 	2017-04-23
+
+    Add test to provider test suite that provider source does not rely
+    on source layer or provider in any way
+
+    Fails for OGR provider! :o
+
+Nyall Dawson 	2017-04-24
+
+    "Fix" failing spell check
+
+Nathan Woodrow 	2017-04-23
+
+    Add QgsCrashHandler for single place for all platforms (#4395)
+
+    Add QgsCrashHandler for single place for all platforms
+
+Juergen E. Fischer 	2017-04-23
+
+    fix windows build (followup e0d20e53)
+
+Merge: 268acab5d6 8385cd9f4c
+Nyall Dawson 	2017-04-23
+
+    Merge pull request #4284 from arnaud-morvan/expression_compare_arrays
+
+    Add arrays comparison in QgsExpression
+
+Mathieu Pellerin 	2017-04-23
+
+    [FEATURE] New "Save as image" settings dialog (#4390)
+
+    * Resolution dpi setting
+    * Extent setting
+    * Scale setting
+    * Draw annotations / decorations setting
+
+Nyall Dawson 	2017-04-23
+
+    Allow canceling background map renders
+
+Nyall Dawson 	2017-04-23
+
+    Fix crash when saving map image and dpi != 90
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] Add to API break and pass enum by value
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] disabled failing check
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] disabled failing check
+
+Nyall Dawson 	2017-04-22
+
+    Update indentation
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] Fix access control test
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] handleRequest accept QgsServerRequest.Method instead of a string
+
+    Also made this optional
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] More Qt-style getter changes getHeader( key ) -> header( key )
+
+Alessandro Pasotti 	2017-04-22
+
+    [server] Expose HTTP status code and test refactoring
+
+    * Renamed returnCode to statusCode (as per RFC https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html)
+    * Expose statusCode to server iface
+    * API Break: Renamed getHeader() to header() Qt-style
+    * Split server plugin filter tests in its own test file
+    * Added tests for clearBody() and body() getter
+
+Merge: e192bc4876 018d2a24fb
+Alessandro Pasotti 	2017-04-22
+
+    Merge pull request #4392 from dmarteau/server_handle_request_full_url
+
+    Server: pass full url string and data to handleRequest()
+
+Nathan Woodrow 	2017-04-21
+
+    Remove old stack trace dump code in main
+
+    Will be moved to a new class.
+
+Nathan Woodrow 	2017-04-17
+
+    Add stack info to crash dialog
+
+David Marteau 	2017-04-21
+
+    Server: pass full url string and data to handleRequest()
+
+        Fix tests by removing passing url pieces from environment
+
+Merge: 25ed76b86e a55390e319
+rldhont 	2017-04-21
+
+    Merge pull request #4391 from dmarteau/server_request_body_accessor
+
+    Server: Restore body() accessor in QgsRequestHandler
+
+David Marteau 	2017-04-21
+
+    Restore body() accessor in QgsRequestHandler
+
+        Restore clearBody() method in QgsRequestHandler
+
+Martin Dobias 	2017-04-21
+
+    Move labeling engine config to a new class + QgsPalLabeling cleanup
+
+    Another bit to make core library independent from QgsProject::instance().
+    Until now labeling engine configuration was taken from project singleton.
+
+    Removed legacy methods from QgsPalLabeling - the class now does not have
+    any more member variables/methods, it is just a bunch of helper functions.
+
+    (PR #4384)
+
+Etienne Trimaille 	2017-04-18
+
+    fix tab order in qgsvectorlayer properties dialog
+
+Mathieu Pellerin 	2017-04-21
+
+    Update decorators to avoid relying on map canvas when rendering (#4388)
+
+Mathieu Pellerin 	2017-04-21
+
+    Upgrade the save as image function into a background task (#4382)
+
+Juergen E. Fischer 	2017-04-20
+
+    avoid opening multiple attribute forms for a single feature in identify
+    (fixes #13520)
+
+    On behalf of Faunalia, sponsored by ENEL
+
+    (cherry picked from commit 7b8fb793cf63483477b8af1670541aca033e8ab9)
+
+rldhont 	2017-04-20
+
+    [BUGFIX][Processing] Fix spatialite version comparison
+
+volaya 	2017-04-20
+
+    indentation fix
+
+Denis Rouzaud 	2017-04-20
+
+    [sipify] handle SIP_SKIP on several lines
+
+Denis Rouzaud 	2017-04-20
+
+    [sipify] handle override method signature on several lines
+
+Denis Rouzaud 	2017-04-20
+
+    sipify all
+
+Denis Rouzaud 	2017-04-20
+
+    [sipify] read file at once into an array
+
+    this will allow accessing other lines while reading
+
+volaya 	2017-04-20
+
+    [processing] fixed I/O of models
+
+volaya 	2017-04-20
+
+    improvements for extracts within subsets
+
+volaya 	2017-04-20
+
+    [processing] removed commander
+
+Juergen E. Fischer 	2017-04-20
+
+    utf8 translation string fix
+
+Juergen E. Fischer 	2017-04-20
+
+    update INSTALL
+
+Denis Rouzaud 	2017-04-19
+
+    fix doxymentation
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsScaleWidget
+
+Nyall Dawson 	2017-04-20
+
+    Add a QgsProject::ellipsoidChanged signal
+
+Merge: 490f5f06fe dce3c88b06
+Nyall Dawson 	2017-04-20
+
+    Merge pull request #4380 from nyalldawson/clone_annotations
+
+    Add methods to clone annotations
+
+Nyall Dawson 	2017-04-20
+
+    Add methods to clone annotations
+
+Nyall Dawson 	2017-04-20
+
+    Revise main window title bar text
+
+    - Change order to "project name - QGIS" to follow standard
+    convention (also avoids possible truncation of project name which is
+    more useful then the "QGIS" text)
+    - Don't show version number in release builds. Only show version
+    in dev builds instead. Showing the version number violates the
+    HIG for Windows and OSX (and probably Linux DEs too).
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsIdentifyMenu
+
+Denis Rouzaud 	2017-04-19
+
+    [sipify] fix struct member assignment
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsMapLayerModel, QgsMapLayerProxyModel
+
+Denis Rouzaud 	2017-04-19
+
+    move QgsFieldModel and QgsFieldProxyModel to core and sipify
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsMapLayerCombobox, QgsFieldCombobox
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsFileWidget, QgsExternalResourceWidget
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsRelation
+
+Denis Rouzaud 	2017-04-19
+
+    [sipify] remove Q_INVOKABLE
+
+Denis Rouzaud 	2017-04-19
+
+    [sipify] fix remove protected members
+
+Denis Rouzaud 	2017-04-19
+
+    [sipify] fix enum combination
+
+Denis Rouzaud 	2017-04-19
+
+    sipify QgsFieldExpressionWidget
+
+jef 	2017-04-19
+
+    fix windows build
+
+jef 	2017-03-28
+
+    update ICOs
+
+Alexander Bruy 	2017-04-19
+
+    [processing] add information message when feature skipped
+
+Alexander Bruy 	2017-04-19
+
+    [processing] prevent division by zero in random points in polygons fixed
+
+Alexander Bruy 	2017-04-19
+
+    [processing] fix parsing selection parameter in translate algorithm
+
+Nyall Dawson 	2017-04-19
+
+    Rework QgsRange to better handle temporal ranges
+
+    Make a new QgsTemporalRange template class for specific
+    temporal classes.
+
+    Add QgsDateTimeRange class.
+
+Nyall Dawson 	2017-04-19
+
+    Add is2d() method to QgsBox3d to determine whether box is 2d
+
+Martin Dobias 	2017-04-19
+
+    Rewrite addTopologicalPoints() and remove legacy snapping code + unit test
+
+Nyall Dawson 	2017-04-19
+
+    Silence some annoyingly debug chatty classes
+
+Nyall Dawson 	2017-04-19
+
+    [cad] Listen out for CRS changes and enable if appropriate
+
+    Avoids having to manually switch on and off cad tools after changing
+    CRS from geographic->metres based
+
+Nyall Dawson 	2017-04-19
+
+    Disable cad perpendicular/parallel buttons when snapping is disabled
+
+    And use tooltips to advise users that snapping must be enabled
+    before this functionality can be used.
+
+    Hopefully helps make the behaviour of these features a bit more
+    predictable for users
+
+Nyall Dawson 	2017-04-19
+
+    [composer] Correctly handle restoring map layer style overrides from template
+
+    (when template was created in a different project)
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-04-19
+
+    Correctly handle restoring atlas coverage layer from template
+
+    (when template was created in a different project)
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Martin Dobias 	2017-04-18
+
+    Node tool: improvements for deletion of vertices
+
+    - fix issue when deleting the repeated first+last vertex of polygon's ring
+    - make deletion aware of topological editing (also delete other vertices at the same position)
+    - fix issue with dragging not being stopped when deleting multiple vertices
+    - make deletion in node editor follow the same code path
+    - unit tests for topological editing (moving / deleting vertices)
+
+Merge: 6bb3fa61c5 f413963e2f
+Nyall Dawson 	2017-04-18
+
+    Merge pull request #4368 from nyalldawson/composer_map_layer_ref
+
+    More use of weak layer references in composer templates
+
+Nyall Dawson 	2017-04-18
+
+    Change &operator to get()
+
+Nyall Dawson 	2017-04-18
+
+    [composer] Correctly restore map item layers when loading a template
+    in a different project to that which the template was created in
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-04-18
+
+    Add some methods for working with lists of map layer references
+
+Nyall Dawson 	2017-04-18
+
+    [composer] Use weak layer reference matching when loading attribute table from XML
+
+    Allows attribute tables in templates to reattach to matching layers
+    when loaded in a different project to the project the template was
+    created in.
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-04-18
+
+    Add some useful operators to layer reference
+
+Nyall Dawson 	2017-04-18
+
+    Move layer ref resolving to QgsMapLayerRef
+
+    Add unit tests
+
+Nyall Dawson 	2017-04-18
+
+    Some API improvements to QgsMapLayerRef, unit tests
+
+Merge: 405da5950f 7949c81c3d
+Nyall Dawson 	2017-04-18
+
+    Merge pull request #4353 from nyalldawson/range
+
+    New QgsRange template based class for storing interval ranges
+
+Martin Dobias 	2017-04-17
+
+    Rename QgsNodeTool2 to QgsNodeTool
+
+Nyall Dawson 	2017-04-11
+
+    Add templated docs to acceptable missing docs
+
+Nyall Dawson 	2017-04-11
+
+    Add missing docs
+
+Nyall Dawson 	2017-04-11
+
+    New QgsRange template based class for storing interval ranges
+
+    QgsRange classes represent a range of values of some element
+    type. For instance, ranges of QDateTime might be used to
+    represent the ranges of timestamp ranges.
+
+    Ranges can indicate whether the upper and lower values are
+    inclusive or exclusive. The inclusivity or exclusivity of
+    bounds is considered when determining things like whether
+    ranges overlap or during calculation of range intersections.
+
+    Includes typedefs for QgsDoubleRange, QgsIntRange, QgsDateRange.
+
+Merge: 302e9dd363 3535ee2d55
+Nyall Dawson 	2017-04-18
+
+    Merge pull request #4357 from nyalldawson/composer_layer_ref
+
+    Use weak layer references and loose matching for composer legend customisation
+
+Nyall Dawson 	2017-04-18
+
+    Fix ui build warning
+
+Merge: 7b202edf04 05b737c215
+Nyall Dawson 	2017-04-18
+
+    Merge pull request #4367 from nyalldawson/distance_area_api
+
+    Cleanup QgsDistanceArea API and sipify, add cache for ellipsoid lookup
+
+Nyall Dawson 	2017-04-18
+
+    Allow QgsDataProvider access through QgsMapLayer
+
+    Avoids having to cast to QgsRasterLayer/QgsVectorLayer before
+    accessing the common QgsDataProvider members
+
+Nyall Dawson 	2017-04-18
+
+    [sipify] Always add virtual keyword for overridden methods
+
+    sip often requires the virtual keyword to be present, or
+    it chokes on covariant return types in overridden methods
+
+Nyall Dawson 	2017-04-12
+
+    Add missing docs
+
+Nyall Dawson 	2017-04-12
+
+    sipify QgsLayerTreeLayer
+
+Nyall Dawson 	2017-04-12
+
+    sipify QgsLayerTreeGroup
+
+Nyall Dawson 	2017-04-12
+
+    Use weak layer references and loose matching for composer legend
+    customisation
+
+    Allows legend customisation to be restored when loading a composer
+    template
+
+    Fix #2738
+
+Nyall Dawson 	2017-04-18
+
+    Add doxygen note linking QgsDistanceArea to QgsEllipsoidUtils
+
+Nyall Dawson 	2017-04-18
+
+    Move retrieval of lists of known ellipsoids to QgsEllipsoidUtils
+
+Nyall Dawson 	2017-04-18
+
+    Move ellipsoid parameter retrieval to new QgsEllipsoidUtils class
+
+Nyall Dawson 	2017-04-18
+
+    More QgsDistanceArea API cleanups and simplification
+
+    - setEllipsoidalMode() was removed. Ellipsoidal calculations are
+    now enabled whenever a valid ellipsoid() has been set. Set the
+    ellipsoid to 'NONE' to disable ellipsoidal calculations.
+
+    - ellipsoidalEnabled() was removed. Ellipsoidal calculations
+    are now enabled whenever a valid ellipsoid() is set. Check
+    willUseEllipsoid() to determine whether ellipsoidal
+    calculations will be performed.
+
+    - sourceCrs() and setSourceCrs() now always take and return
+    QgsCoordinateReferenceSystem objects. All string/ID based CRS
+    methods were removed.
+
+    - geographic() was removed. This was only used internally
+    in one place, so was replaced with sourceCrs().isGeographic() instead.
+
+    - some largely overlapping measurement functions were consolidated
+
+Nyall Dawson 	2017-04-18
+
+    Fix possible corruption of cache
+
+Nyall Dawson 	2017-04-17
+
+    Use a transparent cache to avoid db lookups when setting QgsDistanceArea ellipsoid
+
+Nyall Dawson 	2017-04-17
+
+    C++11 = good
+
+Nyall Dawson 	2017-04-17
+
+    Use default copy constructors and assignment operators for QgsDistanceArea
+
+    There's no complex member variables here - the default implementations
+    should be fine (actually faster, since they won't require
+    recalculation of the derived parameters)
+
+Nyall Dawson 	2017-04-17
+
+    Cleanup ellipsoidal mode detection in QgsDistanceArea
+
+Nyall Dawson 	2017-04-17
+
+    sipify QgsDistanceArea
+
+Nyall Dawson 	2017-04-17
+
+    Cleanup QgsDistanceArea API
+
+    - remove methods which accept a QgsGeometry pointer, leave
+    duplicate methods which accept QgsGeometry reference (caller
+    should handle null geometry pointers in an acceptable
+    way instead of just returning 0 measurements)
+    - make protected members private. This class isn't designed
+    to be subclassed
+    - remove some methods not exposed to bindings and not used
+    anywhere
+
+Martin Dobias 	2017-04-17
+
+    Remove QgsVectorLayer::snapPoint() and unused code in QgsSelectedFeature
+
+Merge: 8c20d993f8 85788151c2
+Alexander Bruy 	2017-04-17
+
+    Merge pull request #4363 from alexbruy/passwordlineedits
+
+    [needs-docs] use QgsPasswordLineEdit in the master password dialog
+
+Mathieu Pellerin 	2017-04-17
+
+    sipify qgscolorbutton and qgscolorrampbutton (#4365)
+
+
+
+    * get rid of params to get rid of warnings
+
+Martin Dobias 	2017-04-17
+
+    R.I.P. QgsSnapper and QgsMapCanvasSnapper
+
+    These classes have been replaced by more efficient and flexible classes
+    (see QgsPointLocator, QgsSnappingUtils, QgsMapCanvasSnappingUtils)
+
+Mark Johnson 	2017-04-17
+
+    added measureLineProjected and computeSpheroidProject to QgsDistanceArea
+
+Martin Dobias 	2017-04-17
+
+    R.I.P. old node tool
+
+Alexander Bruy 	2017-04-17
+
+    doxymentation
+
+Alexander Bruy 	2017-04-14
+
+    sipify QgsCredentials dialog
+
+Alexander Bruy 	2017-04-13
+
+    use QgsPasswordLineEdit in the master password dialog
+
+Merge: eff5a823c9 47a81f0504
+Martin Dobias 	2017-04-17
+
+    [FEATURE] New node tool implementation
+
+Nyall Dawson 	2017-04-17
+
+    [sipify] Convert "\a arg" to "``arg``" when processing Docstrings
+
+    Allows argument names to be highlighted in Python docs
+
+Nyall Dawson 	2017-04-17
+
+    Fix Coverity divide by 0 error
+
+Nyall Dawson 	2017-04-17
+
+    Fix some Coverity null pointer dereference warnings
+
+Nyall Dawson 	2017-04-17
+
+    [sipify] Don't autocreate Docstrings for overridden members
+
+    Skip the autocreated Docstrings with rtype annotations if the
+    member is overridden - better to use the base class
+    Docstring in this case.
+
+Nyall Dawson 	2017-04-17
+
+    Implement a QGIS 3.0 TODO for QgsMessageLogViewer, cleanup docs
+
+Nyall Dawson 	2017-04-17
+
+    [sipify] Fix loss of class docstring if newline present between
+    class doxygen and class definition
+
+Nyall Dawson 	2017-04-17
+
+    Add spelling mistake observed in recent PR
+
+Harrissou Sant-anna 	2017-04-13
+
+    Add tooltips to Vector layer properties dialog
+
+Merge: 1eaa486291 7a48d07578
+rldhont 	2017-04-14
+
+    Merge pull request #4344 from rldhont/server-wfs-configparser
+
+    [Server] WFS refactoring and QgsWfsProjectParser removal
+
+Martin Dobias 	2017-04-13
+
+    Fix map canvas destruction fix (got broken after rebase)
+
+Martin Dobias 	2017-04-13
+
+    Move from "or", "and" to proper C-style ||, &&
+
+Martin Dobias 	2017-04-13
+
+    Fixes for moving between nodes with keyboard
+
+    - supports < and > in addition to comma and dot
+    - wraps around polygon rings (jumps from last node to the first)
+    - moves view to node when it is outside of canvas view
+
+Nyall Dawson 	2017-04-13
+
+    Followup 271e6f1, fix sidebar styling in style dock
+
+Tom Kralidis 	2017-04-12
+
+    Update qgis-resource-metadata.xsd
+
+Nyall Dawson 	2017-04-13
+
+    Make search box in options pages blend in better
+
+Nyall Dawson 	2017-04-13
+
+    Standardise margins on vector layer properties dialog
+
+Nyall Dawson 	2017-04-13
+
+    Fix raster context menu "change transparency" actually changes opacity
+
+Matthias Kuhn 	2017-04-12
+
+    Add centimeters and millimeters to measure dialog
+
+Mathieu Pellerin 	2017-04-13
+
+    [plugin manager] fix QGIS startup crash (fixes #16439) (#4360)
+
+Etienne Trimaille 	2017-04-12
+
+    [needs-docs] update metadata viewer and review UI for vector layer dialog (#4316)
+
+    Funded by WorldBank/GFDRR
+
+Matthias Kuhn 	2017-04-12
+
+    Use monospace fonts for console on all platforms
+
+matteo 	2017-04-12
+
+    travis fix
+
+matteo 	2017-04-12
+
+    2 new plots added
+
+matteo 	2017-04-12
+
+    fix category error and remove np dependency
+
+Alessandro Pasotti 	2017-04-12
+
+    QgsSettings: add writeArray and more group and array tests
+
+Nathan Woodrow 	2017-04-12
+
+    Opps :)
+
+Nathan Woodrow 	2017-04-10
+
+    [FEATURE][needs-docs] Add better crash dialog
+
+Juergen E. Fischer 	2017-04-12
+
+    debian packaging: add dependency qt5keychain-dev (followup 090d530)
+
+Merge: da5c0ed2cd 090d5305e5
+Alessandro Pasotti 	2017-04-12
+
+    Merge pull request #4355 from boundlessgeo/password-helper-authmanager3
+
+    [feature][needs-docs] Master Password integration with OS password manager
+
+Tom Kralidis 	2017-04-12
+
+    Update qgis-resource-metadata.xsd
+
+Nyall Dawson 	2017-03-22
+
+    Fix composer legends are not restored from XML
+
+    Also add unit test to protect this and switch to unique_ptrs
+    instead of raw pointers
+
+Merge: 6726214fd8 b64c7b74b8
+Nyall Dawson 	2017-04-12
+
+    Merge pull request #4349 from nyalldawson/box3d
+
+    Initial framework for 3D box class
+
+Nyall Dawson 	2017-04-12
+
+    Remove unused variable
+
+Nathan Woodrow 	2017-04-12
+
+    [MSSQL] Fix update/insert with timestamp columns
+
+Nyall Dawson 	2017-04-12
+
+    Move QgsRectangle and QgsBox3d to geometry folder
+
+    Since these are both geometry related classes, it's nicer to
+    keep these all together
+
+Nyall Dawson 	2017-04-12
+
+    [composer] Only update map rotation when editing finishes
+
+    Avoids multiple map updates when entering values like "90".
+    Previously the map would be updated at every keystroke,
+    so  "9" and "90" degree rotations.
+
+Nyall Dawson 	2017-04-12
+
+    Add methods to convert between QgsRectangle and QgsBox3d
+
+    Also add volume calculation to QgsBox3d
+
+Nyall Dawson 	2017-04-12
+
+    Cleanup QgsRectangle header and sipify
+
+    Also add methods for returning area and perimeter of rectangle
+
+Nyall Dawson 	2017-04-11
+
+    Add unit tests for QgsBox3d
+
+Nyall Dawson 	2017-04-10
+
+    Initial framework for 3D box class
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xsd
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xsd
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xsd
+
+Tom Kralidis 	2017-04-11
+
+    add docs to XSD
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xml
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xsd
+
+Juergen E. Fischer 	2017-04-12
+
+    debian packaging: add zesty
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xsd
+
+Tom Kralidis 	2017-04-11
+
+    Update qgis-resource-metadata.xml
+
+matteo 	2017-04-11
+
+    try after travis failing
+
+matteo 	2017-04-11
+
+    remove selections tests
+
+Merge: 5e11886086 669fa87eb4
+matteo 	2017-04-11
+
+    Merge branch 'master' into proc_tests
+
+Alessandro Pasotti 	2017-03-21
+
+    [feature][needs-docs] Master Password integration with OS password manager
+
+    This PR adds (optional) synchronization of the master password
+    with the OS password manager (AKA wallet/keychain).
+
+    A set of new menu items has been added in the options ->
+    authentication -> utilities to manage the new behavior.
+
+    Notifications are handled by the message bar unless the
+    password r/w operation is triggered from a modal dialog,
+    in this case the notifications will be routed through
+    the recently exposed QgisApp::showSystemNotification
+    that uses the OS tray notifications.
+
+    This new feature requires libqt5keychain, and was tested
+    with v. 0.5+
+
+Nyall Dawson 	2017-04-11
+
+    [sipify] Fix stripping function body with virtual const reference returns
+
+Nyall Dawson 	2017-04-11
+
+    Make QgsRectangle protected members private
+
+    This class is not designed to be subclassed
+
+Nyall Dawson 	2017-04-11
+
+    Use weak pointers for registered QgsOptionsWidgetFactorys
+
+    Avoids QGIS crashing if a plugin crashes without deregistering
+    its QgsOptionsWidgetFactory.
+
+Merge: e7e73bafcf f2a7dcbdd7
+Nyall Dawson 	2017-04-11
+
+    Merge pull request #4346 from nyalldawson/metadata_api
+
+    Rename QgsMapLayer::metadata() -> htmlMetadata()
+
+Matthias Kuhn 	2017-04-07
+
+    Add test for postgres boolean
+
+Matthias Kuhn 	2017-04-07
+
+    CheckBox widget: support native Bool fields
+
+Matthias Kuhn 	2017-04-07
+
+    [postgis] Native boolean support
+
+Mark Johnson 	2017-04-10
+
+    UTF8 support for QgsRasterDataProvider::cStringList2Q_ (#4345)
+
+    UTF8 support for QgsRasterDataProvider::cStringList2Q_.
+
+    Fix #15978
+
+rldhont 	2017-04-10
+
+    [Server] WFS update files header
+
+rldhont 	2017-04-10
+
+    [Server] WFS Transaction fix update
+
+Nyall Dawson 	2017-04-10
+
+    Rename QgsMapLayer::metadata -> htmlMetadata()
+
+    Frees up metadata() for use as a structured metadata getter
+
+Merge: 78d02b7fab 9dabb9dd20
+Nyall Dawson 	2017-04-10
+
+    Merge pull request #4348 from nyalldawson/sipify_maplayer
+
+    Sipify QgsMapLayer and cleanup API
+
+Nyall Dawson 	2017-04-10
+
+    Avoid some "" literals and QString::nulls in layer API
+
+    Use QString() instead
+
+Nyall Dawson 	2017-04-10
+
+    Fix some QgsMapLayer getters which are incorrectly marked as slots
+
+Nyall Dawson 	2017-04-10
+
+    Remove QgsMapLayer::invalidTransformInput slot
+
+    Calling slot does nothing and is not used anywhere
+
+Nyall Dawson 	2017-04-10
+
+    Sipify QgsMapLayer
+
+Nyall Dawson 	2017-04-10
+
+    [sipify] Also skip mutable protected members
+
+Merge: fc2581c64b 0803b56861
+Alexander Bruy 	2017-04-10
+
+    Merge pull request #4299 from alexbruy/checkable-combobox
+
+    [FEATURE] New custom widget checkable combobox
+
+Nyall Dawson 	2017-04-10
+
+    Daily connectification
+
+Nyall Dawson 	2017-04-10
+
+    Add missing currentThemeChanged signal to interface
+
+Nyall Dawson 	2017-04-10
+
+    Fix missing sip cast for QgsHillshadeRenderer
+
+rldhont 	2017-04-09
+
+    [Server] WFS Transaction fix insert
+
+rldhont 	2017-04-09
+
+    [Server] Update QgsServer WFST test by adding wfs feature count verifying after added
+
+Nathan Woodrow 	2017-04-09
+
+    Remove old comment line
+
+    [ci skip]
+
+Nathan Woodrow 	2017-04-09
+
+    Test cmake (#4343)
+
+    * Streamline cmake test file adding
+
+Matthias Kuhn 	2017-04-08
+
+    Some docstring improvements
+
+Matthias Kuhn 	2017-04-08
+
+    [sipify] skip non-public template based member declarations
+
+Matthias Kuhn 	2017-04-08
+
+    Fix sipify test header file
+
+Matthias Kuhn 	2017-04-07
+
+    Sipify
+
+rldhont 	2017-04-08
+
+    [Server] WFS update indetation and spelling
+
+rldhont 	2017-04-08
+
+    [Server] remove QgsWfsProjectParser
+
+rldhont 	2017-04-08
+
+    [Server] Update QgsServer AccessControl tests
+
+rldhont 	2017-04-08
+
+    [Server] WFS Transaction add KVP support
+
+rldhont 	2017-04-06
+
+    [Server] WFS Transaction refactoring
+
+rldhont 	2017-04-04
+
+    [Server] WFS GetFeature refactoring
+
+    remove QgsWFSProjectParser and rewrite all GetFeature methods
+
+rldhont 	2017-02-18
+
+    [Server] WFS GetCapapbilities and DescribeFeatureType refactoring
+
+    Remove QgsWFSProjectParser from GetCapabilities and DescribeFeatureType
+
+Nathan Woodrow 	2017-04-08
+
+    sip skip on ColumnConfig == for now
+
+    Fails on Windows build for some reason
+
+Alexander Bruy 	2017-04-08
+
+    remove docs for parent parameter
+
+Alexander Bruy 	2017-04-08
+
+    update SIP file
+
+Alexander Bruy 	2017-04-08
+
+    address Nyall's comments:
+     - add TransferThis to parent argument
+     - QSignalSpy always available with Qt5
+
+Alexander Bruy 	2017-04-07
+
+    fix warnings`
+
+Alexander Bruy 	2017-04-07
+
+    replace "added in QGIS 3.0" with "since QGIS 3.0"
+
+Alexander Bruy 	2017-04-07
+
+    homogenize doxygen comments
+
+Alexander Bruy 	2017-04-07
+
+    sipify
+
+Alexander Bruy 	2017-04-07
+
+    don't close popup after first click, so user can select all necessary
+    options at once
+
+Alexander Bruy 	2017-04-05
+
+    add context menu with select/deselect all options
+
+Alexander Bruy 	2017-03-23
+
+    make model and delegate classes private API
+
+Alexander Bruy 	2017-03-23
+
+    remove private member initialization
+
+Alexander Bruy 	2017-03-23
+
+    more doxymentation
+
+Alexander Bruy 	2017-03-22
+
+    add tests
+
+Alexander Bruy 	2017-03-22
+
+    custom widget for Qt Designer
+
+Alexander Bruy 	2017-03-22
+
+    add Python bindings
+
+Alexander Bruy 	2017-03-21
+
+    [FEATURE] new custom widget — combobox with checkable items
+
+Merge: 8c5e241be4 bfd37e1122
+Nyall Dawson 	2017-04-08
+
+    Merge pull request #4339 from nyalldawson/sipify
+
+    Sipify
+
+Nyall Dawson 	2017-04-07
+
+    [sipify] Add return types for functions in docstrings
+
+    and change \return -> :return: in docystrings
+
+Nathan Woodrow 	2017-04-07
+
+    Add header to Qt templates
+
+Matthias Kuhn 	2017-04-07
+
+    sipify_all
+
+Matthias Kuhn 	2017-04-07
+
+    [sipify] Fix exposing members and default struct accessors
+
+Matthias Kuhn 	2017-04-05
+
+    QgsAttributeEditorElement is an abstrat class
+
+Matthias Kuhn 	2017-04-05
+
+    [sipify] Add support for abstract classes
+
+Matthias Kuhn 	2017-04-04
+
+    Sipification
+
+Matthias Kuhn 	2017-04-04
+
+    [sipify] do not copy struct docstrings
+
+Matthias Kuhn 	2017-04-04
+
+    [sipify] Force newlines after sip commands
+
+Nyall Dawson 	2017-04-07
+
+    Avoid showing "0.000 deg" in measure dialog for small degree measurements
+
+    Instead auto add decimal places so that a usable value is shown
+    when the unit is degrees and the setting for decimal places isn't
+    sufficient to show a value.
+
+Alexander Bruy 	2017-04-07
+
+    remove unused label from about dialog
+
+Merge: 2adccb9295 2308b07671
+Alexander Bruy 	2017-04-07
+
+    Merge pull request #4338 from timlinux/processing-fixes
+
+    [processing] Added more error handling for cases when processing help causes an error
+
+Alexander Bruy 	2017-04-07
+
+    fix indentation
+
+Merge: 9c30a0e72e 837ee29488
+Nyall Dawson 	2017-04-07
+
+    Merge pull request #4328 from nyalldawson/proc_c7
+
+    Porting processing to c++, part 2 (followup to #4311)
+
+Nyall Dawson 	2017-04-07
+
+    Indentation
+
+Nyall Dawson 	2017-04-07
+
+    Attempt to fix failing GDAL test
+
+Nyall Dawson 	2017-04-07
+
+    Always return const algorithms, since algorithms should not be modified
+
+Nyall Dawson 	2017-04-04
+
+    Some cleanups
+
+Nyall Dawson 	2017-04-04
+
+    Fix processing error when grass7 not available
+
+Nyall Dawson 	2017-04-04
+
+    Update sip
+
+Nyall Dawson 	2017-04-04
+
+    Remove processing specific methods for adding/removing providers
+
+    QgsProcessingRegistry methods should always be used instead
+
+Nyall Dawson 	2017-04-04
+
+    Remove AlgorithmProvider
+
+    Totally ported to QgsProcessingProvider
+
+Nyall Dawson 	2017-04-04
+
+    Also refactor provider context menu actions and remove from AlgorithmProvider
+
+Nyall Dawson 	2017-04-04
+
+    Refactor provider actions and remove from AlgorithmProvider
+
+Nyall Dawson 	2017-04-04
+
+    Remove activation control from AlgorithmProvider
+
+    Split between QgsProcessingProvider and subclasses
+
+Nyall Dawson 	2017-04-04
+
+    Fix some breakage
+
+Nyall Dawson 	2017-04-04
+
+    Move tr out of AlgorithmProvider to subclasses
+
+Nyall Dawson 	2017-04-04
+
+    Use display name in algorithm help
+
+Nyall Dawson 	2017-04-04
+
+    Remove processing algList
+
+    All functionality has been moved to QgsProcessingRegistry
+
+Nyall Dawson 	2017-04-04
+
+    Move more algList functionality to QgsProcessingRegistry
+
+Nyall Dawson 	2017-04-03
+
+    Move algorithm id (previously commandLineName) to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-04-04
+
+    Don't try to deepcopy QgsProcessingAlgorithm class
+
+Nyall Dawson 	2017-04-04
+
+    Move provider algorithm handling to QgsProcessingProvider
+
+Nyall Dawson 	2017-04-07
+
+    Fix bad string encoding on windows
+
+Nyall Dawson 	2017-04-07
+
+    Fix error when trying to run processing algs
+
+    Caused by trying to deepcopy a c++ object. This is a temporary
+    fix - when the next part of the processing/c++ work lands algorithm
+    copies will no longer be required
+
+Nyall Dawson 	2017-04-07
+
+    Whitespace
+
+Nyall Dawson 	2017-04-07
+
+    [sipify] Replace nullptr with None in docstrings
+
+    Since nullptr has no meaning to Python devs
+
+Nyall Dawson 	2017-04-07
+
+    Update api break docs, sipify QgsRasterFileWriter
+
+Etienne Trimaille 	2017-04-07
+
+    disable export button if we try to export a raster layer (#4319)
+
+Merge: d26d1b7c4a 26e2947765
+Nyall Dawson 	2017-04-07
+
+    Merge pull request #4337 from timlinux/browser
+
+    Changed Tile Server (XYZ) to XYZ Tiles to reduce visual clutter
+
+Merge: c28ad0b1d9 110828feab
+Nyall Dawson 	2017-04-07
+
+    Merge pull request #4336 from nyalldawson/background_raster
+
+    [FEATURE] Background saving of raster layers
+
+Merge: 25d9936df8 d2f3eb1ba5
+Nyall Dawson 	2017-04-07
+
+    Merge pull request #4335 from nyalldawson/save_vector_with_extent
+
+    Much faster save as vector layer when using restricted extent
+
+Nyall Dawson 	2017-04-06
+
+    [FEATURE] Background saving of raster layers
+
+    Use the task manager framework to handle saving of raster layers
+    in the background
+
+Tim Sutton 	2017-04-06
+
+    Changed Tile Server (XYZ) to XYZ Tile Server to reduce visual clutter
+
+Martin Dobias 	2017-04-06
+
+    Cleanup of validation objects and markers
+
+Martin Dobias 	2017-04-06
+
+    Fix snapping configuration to snap only to editable layers
+
+Martin Dobias 	2017-04-06
+
+    Also highlight vertices when highlighting a feature on mouse hover
+
+Tim Sutton 	2017-04-06
+
+    Added more error handling for cases when processing help causes an error
+
+Martin Dobias 	2017-04-06
+
+    Spelling fix
+
+Mathieu Pellerin 	2017-04-06
+
+    [OGR] fix feature count issue for OSM datasets (fixes #16402) (#4322)
+
+Martin Dobias 	2017-04-06
+
+    Fix build for Qt<5.6
+
+Martin Dobias 	2017-04-06
+
+    Add validation of changed geometries
+
+    Whenever geometries are modified, validation will be run while node tool
+    is active and validation errors are displayed in status bar and with markers on canvas
+
+Merge: e5d10b6946 c0fb3f25a7
+Borys Jurgiel 	2017-04-06
+
+    Merge branch 'master' of github.com:qgis/QGIS
+
+Borys Jurgiel 	2017-04-06
+
+    Fix Refactor Fields error if layer has no features
+
+Nyall Dawson 	2017-04-06
+
+    Much faster save as vector layer when using restricted extent
+
+    Use a provider filter rect to avoid looping through every single
+    feature in this case, and also use a prepared extent geometry
+    to speed up the remaining intersection checks.
+
+Nathan Woodrow 	2017-04-06
+
+    Add API area selector in test template
+
+Martin Dobias 	2017-04-06
+
+    Update highlighted nodes when features are changed or deleted
+
+Nathan Woodrow 	2017-04-06
+
+    Add ignore for astyle for template folder
+
+Larry Shaffer 	2017-04-05
+
+    Fix startup NSBitmapImageRep exceptions on macOS, due to missing files
+
+    See https://github.com/qgis/homebrew-qgisdev/issues/27
+
+    Exceptions happen when PNGs were changed to SVGs, but the .ui file was
+    not entirely updated. Then, when PNGs were deleted, a valid, but null,
+    QIcon gets created for the macOS menu item and the exception is thrown.
+
+    Qt 5.8.0 regression.
+
+Martin Dobias 	2017-04-06
+
+    Integrate node editor from the old node tool
+
+    When right-clicking on a feature, a popup menu will be shown
+    and it is possible to open node editor dock widget for that particular
+    feature to edit coordinates numerically or to delete vertices.
+
+Nathan Woodrow 	2017-04-06
+
+    Fix broken template
+
+Nathan Woodrow 	2017-04-06
+
+    Fix unset var in template install script
+
+    Pro Tip: Don't code on the train early in the morning
+
+Nathan Woodrow 	2017-04-06
+
+    Fix typo in install template script
+
+Nathan Woodrow 	2017-04-05
+
+    Add install script for editor templates and code style
+
+Richard Duivenvoorde 	2017-04-05
+
+    Fix dutch service url
+
+    English 'eng' is now a poorly implemented redirect to 'dut', which fails. So fixing this already here while the redirect is fixed at the Kadaster
+
+Tom Kralidis 	2017-04-05
+
+    update schema lineage
+
+Merge: 88c3b51f7e cf7acdf5f8
+Alessandro Pasotti 	2017-04-05
+
+    Merge pull request #4334 from gabrimonfa/bug_16389_sld_stroke_color
+
+    fixes #16389 stroke color is not correctly exported in SLD
+
+Gabriele Monfardini 	2017-04-05
+
+    bug 16389 fix error in sld export about stroke color
+
+Merge: 85d59e648a 377b181c4e
+Nyall Dawson 	2017-04-05
+
+    Merge pull request #4333 from nyalldawson/dataobjects
+
+    Port more processing dataobjects methods to c++
+
+Nyall Dawson 	2017-04-05
+
+    Port more processing dataobjects methods to c++
+
+    Also
+    - simplify and add tests
+    - remove large memory leak (persistant store of all non-project layers)
+    - remove broken support for direct loading postgres/virtual layers
+    by string (Python version was very broken and would never match
+    a postgres/virtual layer)
+
+Juergen E. Fischer 	2017-04-05
+
+    creatensis.pl: fix md5sum verification on filenames with a plus
+
+Nyall Dawson 	2017-04-05
+
+    Use QgsMapLayerComboBox in processing field calculator
+
+Martin Dobias 	2017-04-05
+
+    Slightly improved markers for highlighted nodes and circular nodes
+
+Denis Rouzaud 	2017-04-05
+
+    [sipify] fix private inheritance with namespace
+
+Denis Rouzaud 	2017-04-05
+
+    [sipify] skip protected members
+
+Merge: d5f930adad 8ffdb362cc
+Nyall Dawson 	2017-04-05
+
+    Merge pull request #4331 from nyalldawson/dataobjects
+
+    Port some processing dataobjects routines to c++
+
+Nyall Dawson 	2017-04-05
+
+    Port some processing dataobjects routines to c++
+
+Martin Dobias 	2017-04-05
+
+    Fixed display of rubber bands when using OTF reprojection
+
+Martin Dobias 	2017-04-05
+
+    Fix topological editing when snapping a node to a segment
+
+Martin Dobias 	2017-04-05
+
+    Fix support for advanced digitizing dock (CAD)
+
+Nyall Dawson 	2017-04-05
+
+    Allow storing QgsCoordinateReferenceSystem in QVariants
+
+Nyall Dawson 	2017-04-05
+
+    Spell check "condtion" -> "condition"
+
+Nyall Dawson 	2017-04-05
+
+    [sipify] Replace :: with . during doxygen->docstring conversion
+
+    e.g.
+
+    You can use QgsXmlUtils::writeVariant to save it to an XML document
+    ->
+    You can use QgsXmlUtils.writeVariant to load it from an XML document
+
+Nyall Dawson 	2017-04-05
+
+    Daily connectification
+
+Merge: 85e83e1470 d2a242aa95
+Nyall Dawson 	2017-04-05
+
+    Merge pull request #4311 from nyalldawson/proc_c4
+
+    Simple c++ base class for processing algorithms
+
+Angelos Tzotsos 	2017-04-04
+
+    Added sample XML document for QGIS metadata
+
+Angelos Tzotsos 	2017-04-04
+
+    Added draft XML schema for QGIS metadata
+
+volaya 	2017-04-04
+
+    [Processing] prevent error when running escapeAndJoin with empty param string
+
+    fixes #16200
+
+volaya 	2017-04-04
+
+    Revert "[Processing] prevent error when running escapeAndJoin with empty param string"
+
+    This reverts commit c2a566a3a7bfe369832e5361a0c582bfe2ea5a98.
+
+volaya 	2017-04-04
+
+    [Processing] prevent error when running escapeAndJoin with empty param string
+
+    fixes #16200
+
+volaya 	2017-04-04
+
+    [processing] cast setting size value to int
+
+    fixes #16347
+
+volaya 	2017-04-04
+
+    fixed saga algorithm to adapt it to 2.3 syntax
+
+Denis Rouzaud 	2017-04-04
+
+    fix building without Qt Webkit
+
+    also Qt5 connect style
+
+Martin Dobias 	2017-04-04
+
+    Fix moving of edges with circular edges + code cleanups
+
+Martin Dobias 	2017-04-04
+
+    Simplify code for dragging of edges
+
+Martin Dobias 	2017-04-04
+
+    Simplify code for straight line rubber bands
+
+Nathan Woodrow 	2017-04-04
+
+    Move editor tools into editors folder (#4324)
+
+    Move editor tools into editors folder and add test QtCreator template
+
+Nyall Dawson 	2017-04-04
+
+    Complete daily allocation of Qt5 connect transitions
+
+Nyall Dawson 	2017-04-04
+
+    Update identation
+
+Nyall Dawson 	2017-04-03
+
+    Move format handling flags to QgsAlgorithmProvider
+
+Merge: 9ac70a009c c403994d02
+Tom Kralidis 	2017-04-03
+
+    Merge pull request #4327 from tomkralidis/issue-16320
+
+    [FEATURE] [needs-docs] MetaSearch: add support for ESRI MapServer/FeatureServer layer integration (fixes #16320)
+
+Juergen E. Fischer 	2017-04-03
+
+    fix api break dox for QgsLayerTreeMapCanvasBridge custom layer order
+
+Tom Kralidis 	2017-04-03
+
+    [FEATURE] [needs-docs] MetaSearch: add support for ESRI MapServer/FeatureServer layer integration (fixes #16320)
+
+Denis Rouzaud 	2017-04-03
+
+    [astyle] update licence
+
+Merge: 0e7163be8a d6433c5b4c
+Tom Kralidis 	2017-04-03
+
+    Merge pull request #4325 from tomkralidis/metasearch-fixes
+
+    MetaSearch: set 4326 as default CRS, use WKT to feed polygon geometry
+
+Denis Rouzaud 	2017-04-03
+
+    [astyle] set C++ version to 11
+
+Denis Rouzaud 	2017-04-03
+
+    bump astyle version to 3.0
+
+Tom Kralidis 	2017-04-03
+
+    MetaSearch: set 4326 as default CRS, use WKT to feed polygon geometry
+
+Nyall Dawson 	2017-04-03
+
+    Update PreconfiguredAlgorithm for new API
+
+Nyall Dawson 	2017-04-03
+
+    Fix failing test
+
+Nyall Dawson 	2017-04-03
+
+    Sipify QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-03-29
+
+    Use formatted name for algorithm names
+
+    Avoids conversion of names later and gives clearer separation
+    between visible names and internal names
+
+Nyall Dawson 	2017-03-29
+
+    Move flags (hide from toolbox, etc) to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-03-29
+
+    Port handling of algorithm names to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-03-29
+
+    Move algorithm group handling to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-03-29
+
+    Move algorithm icon handling to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-03-29
+
+    Move tag handling to QgsProcessingAlgorithm
+
+Nyall Dawson 	2017-03-29
+
+    Simple c++ base class for processing algorithms
+
+Nyall Dawson 	2017-04-03
+
+    [processing] Fix MessageBarProgress
+
+Martin Dobias 	2017-04-03
+
+    Correctly show rubber bands when dragging vertices of circular edges
+
+Denis Rouzaud 	2017-04-03
+
+    [sipify] fix override removal
+
+Denis Rouzaud 	2017-04-03
+
+    [sipify] properly get out of private section
+
+Nyall Dawson 	2017-04-03
+
+    [processing] Move dataobjects.getSupportedOutputVectorLayerExtensions
+    to QgsVectorFileWriter
+
+Nyall Dawson 	2017-04-03
+
+    [sipify] Handle enum values using bitshift operators
+
+Nyall Dawson 	2017-04-03
+
+    Handle Q_DECLARE_FLAGS and Q_DECLARE_OPERATORS_FOR_FLAGS in sipify
+
+Merge: 97611fed36 dbc8ad76f1
+Nyall Dawson 	2017-04-03
+
+    Merge pull request #4323 from nyalldawson/doxygen_standard
+
+    Standardise a bunch of doxygen tags, cleanup code
+
+Nyall Dawson 	2017-04-03
+
+    Update some recently merged classes
+
+Nyall Dawson 	2017-04-03
+
+    Strip \a from doxygen comments in sipify
+
+Nyall Dawson 	2017-04-03
+
+    Modernise CharacterWidget API, move to sipify
+
+Nyall Dawson 	2017-04-03
+
+    Update sip files
+
+Nyall Dawson 	2017-04-03
+
+    Use auto doxygen links where possible instead of explicit \link
+
+    Will make things nicer in Python documentation
+
+Nyall Dawson 	2017-04-03
+
+    Spell check: vecotr -> vector
+
+Nyall Dawson 	2017-04-03
+
+    /*! -> /**
+
+    We already have enough doxygen styles to manage!
+
+Nyall Dawson 	2017-04-03
+
+    Remove redundant doxygen comments from .cpp files, move to .h
+    where appropriate
+
+Nyall Dawson 	2017-04-03
+
+    @(end)link -> \(end)link
+
+Nyall Dawson 	2017-04-03
+
+    Fix some malformed doxygen
+
+Nyall Dawson 	2017-04-03
+
+    @throws -> \throws
+
+Nyall Dawson 	2017-04-03
+
+    @ingroup -> \ingroup
+
+Nyall Dawson 	2017-04-03
+
+    Remove some unneeded copydocs
+
+    Since doxygen already copies docs for overridden methods
+
+Nyall Dawson 	2017-04-03
+
+    Remove @author credits from doxygen
+
+    Because
+    - not widely used, seems strange that some authors get credit
+    while others don't
+    - already included in copyright header
+
+Nyall Dawson 	2017-04-03
+
+    @brief -> \brief
+
+Nyall Dawson 	2017-04-03
+
+    @class -> \class
+
+Nyall Dawson 	2017-04-03
+
+    @sa -> \see
+
+Nyall Dawson 	2017-04-03
+
+    @see -> \see
+
+Nyall Dawson 	2017-04-03
+
+    \return -> \returns (for consistency)
+
+Nyall Dawson 	2017-04-03
+
+    @return(s) -> \return(s)
+
+Nyall Dawson 	2017-04-03
+
+    @param -> \param
+
+Nyall Dawson 	2017-04-03
+
+    "Introduced in..." -> "\since"
+
+Nyall Dawson 	2017-04-03
+
+    Change doxygen @note to \note
+
+Merge: 541ecc55ae 3d5a039062
+Nyall Dawson 	2017-04-03
+
+    Merge pull request #4308 from nyalldawson/raster_unique
+
+    [FEATURE] Allow easy styling of discrete rasters
+
+Nyall Dawson 	2017-04-02
+
+    Update raster histogram widget to use feedback object
+
+Nyall Dawson 	2017-04-02
+
+    Cleanup QgsRasterDataProvider/QgsRasterLayer progress reporting
+
+    Instead of progress changed signals on the provider/layer level,
+    instead use QgsFeedback arguments for methods which previously
+    emitted progress changed signals
+
+Nyall Dawson 	2017-03-28
+
+    Add label for color ramp widget
+
+Nyall Dawson 	2017-03-28
+
+    Fix classification test
+
+Nyall Dawson 	2017-03-28
+
+    Don't set both a default ramp and show the random option
+
+Nyall Dawson 	2017-03-28
+
+    Improve random color generation for unique raster values
+
+Nyall Dawson 	2017-03-28
+
+    Default to random color ramps for unique value rasters
+
+Nyall Dawson 	2017-03-28
+
+    [needs-docs] Rename Paletted raster renderer to "Paletted/Unique values"
+
+Nyall Dawson 	2017-03-28
+
+    Auto load raster color table from band when band is changed in
+    paletted raster renderer
+
+    (Only if raster has an embedded color table)
+
+Nyall Dawson 	2017-03-28
+
+    Add unit test to ensure that #13263 is fixed
+
+    Fix #13263
+
+Nyall Dawson 	2017-03-28
+
+    Fix some crashes in paletted raster renderer
+
+    - handle negative color values
+    - don't crash when calculating unique values in bad rasters
+
+Nyall Dawson 	2017-03-27
+
+    Calculate unique raster values in background thread
+
+    To keep UI nice and responsive
+
+Nyall Dawson 	2017-03-27
+
+    Allow cancelation of raster stats/histogram operations
+
+Nyall Dawson 	2017-03-27
+
+    [FEATURE] Add button to paletted renderer widget to allow loading
+    embedded color table
+
+    Only enabled for rasters which contain a color table
+
+Nyall Dawson 	2017-03-27
+
+    [FEATURE] Allow classifying paletted renderer using unique values
+    from a raster layer
+
+    Adds an easy way to style discrete rasters such as landuse classes
+    using the Paletted renderer. Just select the Paletted renderer,
+    pick a band, then hit the "Add Unique Values" button. The unique
+    pixel values will be fetched from the layer and a color assigned
+    to each using the currently selected color ramp.
+
+    Fix #14845
+
+    Sponsored by
+    - Stéphane Henriod
+    - Satelligence (http://satelligence.com/)
+    - Bird's Eye View (https://www.birdseyeviewgis.com/)
+    - + other anonymous backers
+
+Nyall Dawson 	2017-03-27
+
+    No lies!
+
+Nyall Dawson 	2017-03-27
+
+    [FEATURE] Implement saving paletted raster renderer color tables
+
+    Use the .clr/gdal file format, but add the labels on the ends of
+    the lines. Seems other importers like ArcMap just ignore these.
+
+Nyall Dawson 	2017-03-27
+
+    [FEATURE] Allow loading paletted color table from file
+
+    Supports standard GDAL/ESRI clr file format
+
+Nyall Dawson 	2017-03-27
+
+    Add method to load paletted renderer classes from file
+
+Nyall Dawson 	2017-03-27
+
+    Add method to read paletted color data from string
+
+Nyall Dawson 	2017-03-23
+
+    Enable reordering of paletted raster entries
+
+Nyall Dawson 	2017-03-23
+
+    [FEATURE] Add a color ramp combo to paletted raster renderer
+
+    Allows rapid recoloring of palette to match a color ramp
+
+Nyall Dawson 	2017-03-23
+
+    Allow changing label for multiple values at once in paletted renderer widget
+
+Nyall Dawson 	2017-03-23
+
+    Allow changing pixel value in paletted renderer widget
+
+Nyall Dawson 	2017-03-23
+
+    Rework paletted raster renderer widget
+
+    - Switch to a real model
+    - Allow adding new rows and deleting multiple selected rows
+    - Allow changing colors inline in style dock (no modal color picker)
+
+Nyall Dawson 	2017-03-23
+
+    Refactor QgsPalettedRasterRenderer to allow "gaps" in pixel values
+
+    Previously the renderer required that pixel values followed
+    sequential numerical order. This refactor allows values to
+    be skipped, so that only certain color index will be rendered.
+
+Nathan Woodrow 	2017-04-03
+
+    Some more Qt5 signal converts
+
+Nyall Dawson 	2017-04-03
+
+    No more old style connects in providers
+
+Merge: 106d95b95b beb185a72e
+Nyall Dawson 	2017-04-03
+
+    Merge pull request #4321 from m-kuhn/sinceNow
+
+    Use \since instead of \note added in
+
+Matthias Kuhn 	2017-04-03
+
+    Update sipify to use the "\since" tag
+
+Matthias Kuhn 	2017-04-03
+
+    Add some remaining \since tags
+
+Nyall Dawson 	2017-04-03
+
+    More new style Qt5 connects
+
+Matthias Kuhn 	2017-04-03
+
+    Use "\since" instead of "@note added in"
+
+Nyall Dawson 	2017-04-03
+
+    Fix Travis warnings
+
+Matthias Kuhn 	2017-04-03
+
+    some docstrings in cpp files
+
+Matthias Kuhn 	2017-04-03
+
+    Update doc test for \since
+
+Nyall Dawson 	2017-04-03
+
+    Add qgsi->qgis to spell check
+
+Nyall Dawson 	2017-04-03
+
+    QGSI -> QGIS
+
+Nyall Dawson 	2017-04-03
+
+    Replace "python" with "Python" in docs
+
+Nyall Dawson 	2017-04-03
+
+    Remove SIP_TRANSFERTHIS from .cpp files
+
+Matthias Kuhn 	2017-04-02
+
+    Fix build warnings
+
+Matthias Kuhn 	2017-04-02
+
+    Sipify QgsPropertyTransformer
+
+Matthias Kuhn 	2017-04-02
+
+    Sipify QgsConditionalStyle
+
+Matthias Kuhn 	2017-04-02
+
+    Sipify QgsClipper
+
+Matthias Kuhn 	2017-04-02
+
+    Autogenerate more sip files
+
+Matthias Kuhn 	2017-04-02
+
+    Fix sipify override and inline definition combination
+
+Matthias Kuhn 	2017-04-02
+
+    Add %Feature support to sipify
+
+Matthias Kuhn 	2017-04-02
+
+    Fix sipify constructor detection
+
+Matthias Kuhn 	2017-04-02
+
+    Mac compatibility for prepare-commit.sh
+
+Matthias Kuhn 	2017-04-02
+
+    Fix sipdiff
+
+Nyall Dawson 	2017-04-02
+
+    Remove \brief from doxygen in sipify
+
+Nyall Dawson 	2017-04-02
+
+    More sipify blacklist removal
+
+Nyall Dawson 	2017-04-02
+
+    Fix sipify annotations and inline definition combination
+
+Nyall Dawson 	2017-04-02
+
+    Convert doxygen notes and version added to sphinx style in sipify
+
+Nyall Dawson 	2017-04-02
+
+    Remove ingroup and class from doxygen when creating sip docstrings
+
+Nyall Dawson 	2017-04-02
+
+    Fix(?) build warning
+
+Martin Dobias 	2017-04-02
+
+    Move private arc segmentization routines to QgsGeometryUtils
+
+Nyall Dawson 	2017-04-02
+
+    Remove processing sip bindings from sip blacklist
+
+Nyall Dawson 	2017-04-02
+
+    Handle c++11 '= default' in sipify
+
+Nyall Dawson 	2017-04-02
+
+    Fix build when QWebKit not available
+
+Matthias Kuhn 	2017-04-01
+
+    mac compatibility fix
+
+Matthias Kuhn 	2017-04-01
+
+    Add whitespace check to prepare-commit.sh
+
+Matthias Kuhn 	2017-04-01
+
+    [sipify] Add name of source file to generated headers
+
+Matthias Kuhn 	2017-03-31
+
+    Improve sip bindings
+
+Matthias Kuhn 	2017-03-30
+
+    Autogenerate some sip files
+
+Matthias Kuhn 	2017-03-30
+
+    Fix typos
+
+Matthias Kuhn 	2017-03-30
+
+    More information when [LIB]_EXPORT is missing
+
+Denis Rouzaud 	2017-03-30
+
+    fix export macro matching
+
+Denis Rouzaud 	2017-03-30
+
+    sipify scripts fixes
+
+    * fix prepare-commit.sh when SIP file is not created yet
+    * raise an error if header doesn't have EXPORT macro for class definition
+    * sipdiff can generate the SIP file on demand
+
+Denis Rouzaud 	2017-03-30
+
+    sipify: adds test to prepare-commit and adapt sipdiff
+
+    add missing macros to Doxyfile.in
+
+Denis Rouzaud 	2017-03-30
+
+    add type and default values identifiers
+
+Denis Rouzaud 	2017-03-29
+
+    sipify improvements
+
+    * add demo file and start a short doc
+    * fix some annotations
+    * do not display hidden line (SIP_SKIP, delete)
+    * use a defined var for SIP_SKIP
+    * remove constructor definition in header
+    * fix comment after method definition in header
+    * add a test for sipify itself
+
+Denis Rouzaud 	2017-03-29
+
+    use sip includes rather than listing header to generate all sip files
+
+Denis Rouzaud 	2017-03-29
+
+    use dedicated header for QgsAttributes
+
+Denis Rouzaud 	2017-03-28
+
+    also comment methods
+
+    fix comment starting on first line of block
+
+Denis Rouzaud 	2017-03-27
+
+    SIP test: use blacklist rather than whitelist
+
+Denis Rouzaud 	2017-03-27
+
+    sipify QgsVectorLayer, QgsFeature
+
+Denis Rouzaud 	2017-03-27
+
+    pre-process headers (QgsVectorLayer and QgsFeature)
+
+Denis Rouzaud 	2017-03-27
+
+    test auto-generated sip files on Travis
+
+Denis Rouzaud 	2017-03-27
+
+    sipify improvements
+
+     * remove enum value assignments
+     * remove deleted functions
+     * remove private members
+     * remove function bodies
+     * remove keywords (override, inline)
+     * comment out but print SIP_SKIP
+     * allow use of #if(n)def SIP_RUN and remove code in #else statements
+
+     * fix PyName
+     * fix SIP_SKIP
+
+     * add a list of auto-generated sip files and a script to build them at once
+
+Denis Rouzaud 	2017-03-27
+
+    remove comments from sipfiles (QgsVectorLayer and QgsFeature)
+
+Matthias Kuhn 	2017-03-17
+
+    Ignore SIP annotations in doxygen
+
+Matthias Kuhn 	2017-03-17
+
+    Put some sip code into qgsfeature.h
+
+    Just for reference
+
+Matthias Kuhn 	2017-03-17
+
+    Add script to generate sip code from headers
+
+    Add more annotations
+
+    Add some references to upstream documentation
+
+    Add more annotations
+
+Matthias Kuhn 	2017-03-30
+
+    Hide embedded form in relation reference
+
+    by default
+
+Matthias Kuhn 	2017-03-30
+
+    Code formatting
+
+Martin Dobias 	2017-03-30
+
+    Support for moving of multiple vertices at the same time
+
+    Just use selection rectangle to select vertices and then click one vertex
+    from selection to move the whole group.
+
+Nyall Dawson 	2017-03-30
+
+    [FEATURE] Add geometry snapper modes to only snap end points of lines
+
+    Allows snapping of end points only, or end point to end point only
+
+    Also update processing algorithm to match
+
+Nyall Dawson 	2017-03-30
+
+    [FEATURE][processing] Snap Geometries algorithm can now snap
+    within the same layer
+
+    Allows closure of gaps within a layer
+
+Nyall Dawson 	2017-03-30
+
+    [FEATURE] New class QgsInternalGeometrySnapper
+
+    Used for snapping geometries within a set of features to other
+    features from that same set.
+
+    Just like QgsGeometrySnapper, except that where QgsGeometrySnapper
+    requires a separate reference layer to snap to
+    QgsInternalGeometrySnapper snaps *within* a single layer. E.g.
+    allows you to close gaps within that layer.
+
+Martin Dobias 	2017-03-30
+
+    Little bit of renaming of variables to camelCase
+
+Nyall Dawson 	2017-03-30
+
+    Fix compilation error on Travis
+
+Nyall Dawson 	2017-03-30
+
+    Qt5 style connects
+
+Juergen E. Fischer 	2017-03-28
+
+    debian packaging: update icons
+
+Even Rouault 	2017-03-29
+
+    Raster layer properties: fix renderer widget that was reset, and fix wrong behaviour on cancel.
+
+    2 issues :
+    - when opening the raster layer properties dialog, it used to reset the min/max value
+      to custom values, due to a bad interaction with a recent change in the histogram code
+      (likely introduced in 4f3cf6889763ae4236c43179504e9c8ce97b6633)
+    - when closing the raster layer properties dialog on a multiband renderer in updated
+      extent mode for example, it got result to whole raster statistics due to
+      QgsRasterLayerProperties::setRendererWidget() reseting stuff. Honestly the code in
+      that method that changes value in the renderer object seems to be completely
+      inappropriate for a method that you would expect to only affects GUI/widgets.
+
+Merge: eb110fd307 35fab8760c
+volaya 	2017-03-29
+
+    Merge pull request #4278 from sfkeller/patch-1
+
+    [processing] Updated ogr2ogr.py with GeoPackage in FORMATS and EXTS.
+
+Martin Dobias 	2017-03-29
+
+    Added test for dragging of selection rect to delete nodes
+
+Mathieu Pellerin 	2017-03-29
+
+    [gui] improve the browser panel's spinner (#4312)
+
+Martin Dobias 	2017-03-08
+
+    Remove debugging output to track down travis failure
+
+Martin Dobias 	2017-03-08
+
+    Fix highlight of marker to add vertices to linestrings
+
+Martin Dobias 	2017-03-08
+
+    Do not leave rubber band artifacts when deleting vertices
+
+Martin Dobias 	2017-03-08
+
+    Double-click to add vertex only on an edge
+
+Martin Dobias 	2017-03-08
+
+    Fix rubber band unit tests
+
+Martin Dobias 	2017-03-07
+
+    Fix rubber band bounding box calculation
+
+    The icon half-width was incorrectly divided by map units per pixel...
+
+Martin Dobias 	2017-03-07
+
+    fixes after rebase
+
+Martin Dobias 	2017-03-02
+
+    Looks like crs mismatch...?
+
+Martin Dobias 	2017-03-02
+
+    travis
+
+Martin Dobias 	2017-03-02
+
+    More travis testing
+
+Martin Dobias 	2017-03-02
+
+    More travis debugging
+
+Martin Dobias 	2017-03-02
+
+    More travis debugging
+
+Martin Dobias 	2017-03-02
+
+    More travis debugging
+
+Martin Dobias 	2017-03-02
+
+    Trying to understand what's wrong on travis...
+
+Martin Dobias 	2017-03-02
+
+    Code cleanup + more testing
+
+Martin Dobias 	2017-03-01
+
+    More unit tests
+
+Martin Dobias 	2017-03-01
+
+    Fix rare crash on map canvas deletion
+
+Martin Dobias 	2017-03-01
+
+    Added unit testing for the new node tool
+
+Martin Dobias 	2017-02-28
+
+    Fix build warning
+
+Martin Dobias 	2017-02-28
+
+    Fix spelling
+
+Martin Dobias 	2017-02-28
+
+    Fixed some bits from the review
+
+Martin Dobias 	2017-02-24
+
+    Initial port of CAD-enabled node tool
+
+Matthias Kuhn 	2017-03-28
+
+    Catch geos exception in event loop
+
+Matthias Kuhn 	2017-03-28
+
+    Catch geos exceptions
+
+Merge: da41af1481 21df6252f0
+Nyall Dawson 	2017-03-29
+
+    Merge pull request #4290 from nyalldawson/fix_16149
+
+    Fix incorrect project CRS when loading project (fix #16149)
+
+nirvn 	2017-03-29
+
+    fix ArcGIS Feature/Map Server connect()
+
+Nyall Dawson 	2017-03-28
+
+    Clean up progress handling in QgsProcessingFeedback
+
+jef 	2017-03-28
+
+    fix windows build (followup 943d1a2)
+
+Alessandro Pasotti 	2017-03-28
+
+    Removed a few debug messages (credentials leakage)
+
+Nyall Dawson 	2017-03-28
+
+    Fix map views always recenter when resized
+
+Nyall Dawson 	2017-03-28
+
+    Avoid redrawing map views multiple times on creation
+
+Nyall Dawson 	2017-03-28
+
+    Allow labels to be toggled in map views
+
+    Another step toward feature parity with overview panel
+
+Nyall Dawson 	2017-03-28
+
+    Fix Coverity divide by zero errors
+
+Nyall Dawson 	2017-03-28
+
+    More Qt5 style connect conversions
+
+matteo 	2017-03-27
+
+    fix indentation
+
+matteo 	2017-03-27
+
+    [processing] other qgis test, clean commit
+
+Merge: b8cb196322 d2b29a3e06
+Matthias Kuhn 	2017-03-27
+
+    Merge pull request #4280 from timlinux/new-logo
+
+    New logo
+
+Merge: 1f927abe5c 1a46ddbf28
+Alexander Bruy 	2017-03-27
+
+    Merge pull request #4293 from alexbruy/processing-api
+
+    [processing][needs-docs] Processing API improvements
+
+Nyall Dawson 	2017-03-27
+
+    Avoid coverity null dereference after null check warning
+
+Nyall Dawson 	2017-03-27
+
+    Followup 8b9e492, fix drawing of cached layer images
+
+Nyall Dawson 	2017-03-27
+
+    [server] Fix potential crash caused by referencing out of scope local
+
+Nyall Dawson 	2017-03-27
+
+    More Qt5 style connects
+
+Nyall Dawson 	2017-03-26
+
+    Don't try to compose images before they have been initialized
+
+Nyall Dawson 	2017-03-26
+
+    Fix some valgrind issues
+
+Nyall Dawson 	2017-03-26
+
+    Add failing test to ensure that QgsAbstractGeometry.centroid
+    result matches that of GEOS
+
+    It doesn't, and reveals the the QGIS native centroid calculation
+    is quite broken
+
+Nyall Dawson 	2017-03-26
+
+    Port GEOS centroid tests to PyQGIS
+
+Nyall Dawson 	2017-03-26
+
+    Optimise QgsGeos conversions
+
+    Avoid some unnecessary creation of QgsPointV2
+
+Merge: daa2454558 51035cfb67
+Nyall Dawson 	2017-03-25
+
+    Merge pull request #4303 from nyalldawson/densify
+
+    Port processing densify algorithms to c++
+
+Nyall Dawson 	2017-03-25
+
+    Add optimised constructors for QgsLineString
+
+    Instead of requiring all linestrings to be constructed by
+    first creating QgsPointSequence (requiring creation or
+    conversion of points to QgsPointV2), allow construction
+    of LineStrings directly from vectors of values (fastest!)
+    or lists of QgsPoint.
+
+    Likely results in speedups for lots of geometry operations,
+    but using the same layer as earlier tested for densify
+    improvements the densify operation time dropped further
+    from 25 seconds to 15 seconds.
+
+Nyall Dawson 	2017-03-25
+
+    Fix setting project to no projection not triggering lockdown of
+    ellipsoid and unit selection
+
+Nyall Dawson 	2017-03-25
+
+    [composer] Correctly draw overview frame when map item CRS differs
+
+Nyall Dawson 	2017-03-25
+
+    Fix doxygen warning
+
+Nyall Dawson 	2017-03-25
+
+    Also port processing densify to distance to c++
+
+    - Add QgsGeometry method to densify by distance
+    - Fix bug in processing algorithm which resulted in duplicate
+    vertices and incorrectly spaced extra vertices
+
+Nyall Dawson 	2017-03-25
+
+    Fix spelling errors in processing algorithm help
+
+Nyall Dawson 	2017-03-25
+
+    Port processing Densify Geometries algorithm to use c++ densify
+
+    Rough benchmark using 50k geometry polygon shapefile
+
+    Before: 1m25s
+    After:  21s
+
+Nyall Dawson 	2017-03-25
+
+    Densify canvas extent geometry before reprojecting for views
+
+    Makes displaying canvas extent in extra map views nice and smooth
+    if canvas CRSes differ.
+
+Nyall Dawson 	2017-03-25
+
+    [FEATURE] New API QgsGeometry::densifyByCount
+
+    Densifies a geometry by adding a specified number of vertices
+    to each segment
+
+Nathan Woodrow 	2017-03-24
+
+    Hide and show system tray icon on all platforms
+
+Nathan Woodrow 	2017-03-24
+
+    Hide system tray icon on Windows
+
+Mathieu Pellerin 	2017-03-24
+
+    [FEATURE] Add a secondary stroke color to QgsRubberBand (#4301)
+
+    This comes in handy when in need of insure visibility of a
+    marker/line/polygon overlay over both light and dark areas.
+    This also updates the map view's extent to make use of a
+    secondary stroke color instead of a semi-transparent fill.
+
+Alessandro Pasotti 	2017-03-24
+
+    [bugfix] Apply authentication configuration to xyz layers
+
+Mathieu Pellerin 	2017-03-24
+
+    [processing] GRASS 7.2 support: use SQL compatible output names (#4298)
+
+    (fixes #16370)
+
+Nyall Dawson 	2017-03-24
+
+    Fix error when enabling additional providers in processing
+
+    Add an interface method to show the options dialog at a specific
+    page. This is required since plugins can now embed their options
+    in the main options dialog, so they may also need a way to
+    force this dialog to open.
+
+    Implement this in processing so that enabling additional providers
+    works again.
+
+Nyall Dawson 	2017-03-24
+
+    Allow options filter to search in QTreeViews
+
+    Such as processing options. Quite basic - it just checks the item
+    text but does not filter or highlight items in the view
+
+Nyall Dawson 	2017-03-24
+
+    Remove unused options search widgets
+
+Nyall Dawson 	2017-03-24
+
+    Fix broken widget filter box in layer/project properties
+
+Steven Mizuno 	2015-09-15
+
+    hide Internal connection if build is without WITH_QTMOBILITY cmake setting
+
+    use previously set connection; set Autodetect only if Internal happened to be the stored setting.
+    fix #13233
+
+Nyall Dawson 	2017-03-24
+
+    Spell check: accurancy->accuracy
+
+Nyall Dawson 	2017-03-24
+
+    Allow showing main canvas extent in extra map views
+
+    Another step toward multicanvas replacing map overview panel
+
+Matthias Kuhn 	2017-03-23
+
+    Revert renaming of main layer-tree-group node
+
+Matthias Kuhn 	2017-03-22
+
+    Preserve custom layer order in offline editing
+
+Matthias Kuhn 	2017-03-23
+
+    Document API breaks
+
+Matthias Kuhn 	2017-03-23
+
+    Fix tests
+
+Matthias Kuhn 	2017-03-22
+
+    Completely move layer order to core
+
+Merge: 634d5ffb8a 2fe7caf787
+rldhont 	2017-03-23
+
+    Merge pull request #4294 from rldhont/bugfix_processing_saga_io_gdal
+
+    [Processing] Saga: update gdal_io and Flow Accumulation (Flow Tracing)
+
+Nyall Dawson 	2017-03-23
+
+    Mark QgsRasterRenderer::legendSymbologyItems as /Out/ in sip
+
+Nyall Dawson 	2017-03-23
+
+    Some more new style connects
+
+rldhont 	2017-03-22
+
+    [Processing] Saga: update gdal_io and Flow Accumulation (Flow Tracing)
+
+Merge: 060a57f12b 119637768c
+Larry Shaffer 	2017-03-22
+
+    Merge pull request #4292 from Gustry/fix_mac_build
+
+    fix undeclared identifier on MAC in composer
+
+Alexander Bruy 	2017-03-22
+
+    [processing][API] rename runalg() and runandload() to improve
+    readability
+
+Alexander Bruy 	2017-03-22
+
+    [processing][API] rename alglist() to printAlgorithms() to improve
+    readability. Also introduce algorithmsList() call which returns
+    available Processing algorithms as list
+
+Alexander Bruy 	2017-03-22
+
+    [processing] rename AlgorithmExecutor's runalg() and runalgIterating()
+    to avoid overlapping with general functions and improve readability
+
+arnaud.morvan@camptocamp.com 	2017-03-17
+
+    Handle arrays comparison in QgsExpression
+
+arnaud.morvan@camptocamp.com 	2017-03-17
+
+    Handle arrays in QgsExpression::quotedValue
+
+Alexander Bruy 	2017-03-22
+
+    remove unused method
+
+Alexander Bruy 	2017-03-22
+
+    code cleanups
+
+Alexander Bruy 	2017-03-22
+
+    [processing][API] rename algoptions() to algorithmOptions()
+
+Etienne Trimaille 	2017-03-22
+
+    fix undeclared identifier on mac in composer
+
+Alexander Bruy 	2017-03-22
+
+    [processing][API] rename alghelp to algorithmHelp
+
+Merge: 746d288e33 ce7180ca64
+Alexander Bruy 	2017-03-22
+
+    Merge pull request #4287 from nyalldawson/processing_default_layer
+
+    [processing] Default to current layer in layer selection combos
+
+Nyall Dawson 	2017-03-22
+
+    Don't emit layerOrderChanged when removing layers
+
+    Otherwise it automatically enables the layer order panel
+
+Nyall Dawson 	2017-03-22
+
+    Fix incorrect project CRS when loading project (fix #16149)
+
+    This commit fixes a situation where loading a project results
+    in incorrect project & canvas CRS. The bug is trigerred whenever
+    something in the project load calls a processEvents() call, eg
+    restoring a project with layer count enabled on a layer
+    or with a composer html item.
+
+    When this occurs, the "auto-set CRS to first added layer" code
+    would kick in early and replace the project's CRS with that
+    of the first layer loaded.
+
+    To avoid this disable the "auto-set CRS" code when loading
+    layers from a project.
+
+Nyall Dawson 	2017-03-22
+
+    Some more use of QgsProject crs instead of canvas crs
+
+Nyall Dawson 	2017-03-22
+
+    Add missing api break note
+
+Nyall Dawson 	2017-03-22
+
+    Set default layer CRS according to behaviour radio (fix #11889)
+
+    Makes the new layer dialogs correctly respect the current project
+    CRS choice when set to follow project CRS.
+
+Nyall Dawson 	2017-03-22
+
+    [composer] Fix maps defaulting to rectangle preview mode
+
+Nyall Dawson 	2017-03-22
+
+    Add missing dynamic cast for QgsTriangle to sip bindings
+
+Nyall Dawson 	2017-03-22
+
+    Convert almost all core connects to new style
+
+    Just a handful remain which for various reasons cannot
+    be converted
+
+Merge: 2e9f99693d f3e1772bb9
+Nyall Dawson 	2017-03-22
+
+    Merge pull request #4283 from nyalldawson/filterrect
+
+    Remove QgsFeatureRequest::FilterRect
+
+Merge: aad182fdc0 2a80d287ac
+Nyall Dawson 	2017-03-22
+
+    Merge pull request #4281 from nyalldawson/does_not_contain
+
+    [FEATURE][processing] Add 'does not contain' to Extract By Attribute
+
+Merge: fb3d07f3f5 ecb233b792
+Nyall Dawson 	2017-03-22
+
+    Merge pull request #4274 from nyalldawson/scroll_timer
+
+    A different approach to avoiding accidently scroll changes
+
+lbartoletti 	2017-03-21
+
+    [FEATURE] New class for triangle
+
+    Adds a new geometry class for Triangle geometries
+
+    Methods include orthocenter, bisectors, medians, medial, circumscribed (center,
+    radius), inscribed (center, radius)
+
+    Also adds make_triangle expression function for creating triangles
+
+Nyall Dawson 	2017-03-21
+
+    Flip some connects to new style
+
+Nyall Dawson 	2017-03-21
+
+    Swap QgisApp to use new style connects
+
+jdugge 	2017-03-21
+
+    Fix duplicate QgsRectangle.toString methods
+
+    Condenses the 2 duplicate methods to a single method which is usable from the Python bindings.
+
+Nyall Dawson 	2017-03-21
+
+    Use a clearer marker for main canvas position in view windows
+
+Nyall Dawson 	2017-03-21
+
+    Fix Coverity null pointer derefence issues
+
+Nyall Dawson 	2017-03-21
+
+    Fix Coverity null pointer dereference error
+
+Nyall Dawson 	2017-03-21
+
+    Fix Coverity null pointer dereference warning
+
+Nyall Dawson 	2017-03-21
+
+    Remove unnecessary null check
+
+Nyall Dawson 	2017-03-21
+
+    Fix broken logic test in QgsFeatureListModel conditional styles
+
+Nyall Dawson 	2017-03-21
+
+    Fix possible null pointer dereference
+
+Nyall Dawson 	2017-03-21
+
+    Fix coverity use of uninitialized variable error
+
+Merge: c412596b64 ab11dfb7f9
+Nyall Dawson 	2017-03-21
+
+    Merge pull request #4279 from nyalldawson/layout_manager2
+
+    Rework handling of compositions and projects, and composer windows
+
+Nyall Dawson 	2017-03-21
+
+    [composer] Don't load HTML for labels on project load
+
+    Instead defer to composer load. Also make sure html is reloaded
+    when composition is force refreshed.
+
+Nyall Dawson 	2017-03-21
+
+    Better handling of composer map forced refreshes
+
+Nyall Dawson 	2017-03-21
+
+    Fix missing initial render of composer maps
+
+Nyall Dawson 	2017-03-21
+
+    Fix Windows build
+
+Nyall Dawson 	2017-03-19
+
+    Avoid multiple map/legend renders while loading compositions
+
+Nyall Dawson 	2017-03-19
+
+    Remove hack to get composer maps to follow canvas
+
+Nyall Dawson 	2017-03-19
+
+    Fix loading composition triggers render of all composer maps
+
+    Also cleanup some more unused API methods
+
+Nyall Dawson 	2017-03-19
+
+    Add/refine test masks for server test
+
+Nyall Dawson 	2017-03-19
+
+    Fix restoration of compositions from legacy projects
+
+Nyall Dawson 	2017-03-19
+
+    Add missing TransferThis annotation
+
+Nyall Dawson 	2017-03-19
+
+    Don't use combobox of existing composer names in new composer title dialog
+
+    It's odd UX - selecting any of these results in an error message,
+    so giving them as choices is misleading.
+
+    Fix #12673 (indirectly)
+
+Nyall Dawson 	2017-03-18
+
+    Fix crash when reopening composers
+
+Nyall Dawson 	2017-03-18
+
+    Only create composer item config widgets on demand
+
+    Instead of creating them for all items when composer window
+    is opened, instead just create and destroy them when
+    required. None are too heavy to have a noticable delay
+    when selecting items, but in contrast keeping them around
+    forever is wasteful on memory.
+
+    Also clean up a lot of duplicate composer/composition
+    code and remove unnecessary signals from api (use a single
+    itemAdded signal instead of multiple signals for every
+    item type)
+
+Nyall Dawson 	2017-03-18
+
+    Rework atlas layer action to handle temporary composer windows
+
+Nyall Dawson 	2017-03-18
+
+    Remove another use of old iface methods
+
+Nyall Dawson 	2017-03-18
+
+    [composer] Port composer manager to layout manager
+
+    Also switch to using a proper model to show/edit compositions
+    in the dialog.
+
+Nyall Dawson 	2017-03-18
+
+    [composer] Rework interface composer methods
+
+    Since composer windows are now only created on demand, and
+    destroyed when the window is closed, the old interface methods
+    no longer apply. The new interface methods openComposers(),
+    openComposer(), closeComposer(), composerOpened(),
+    composerWillBeClosed() and composerClosed() are similar, but
+    only apply to composer windows when they are exist (i.e.
+    are currently open).
+
+    To access all compositions from a project, the project's
+    layoutManager() should be used instead.
+
+    Additionally, the new interface methods work with
+    QgsComposerInterface objects instead of QgsComposerView
+    objects. This should allow future hooks for plugins to interact
+    with open composer windows in a more useful way.
+
+Nyall Dawson 	2017-03-18
+
+    Add a basic interface for composer windows
+
+    Not much there yet, but it adds an interface with stable API
+    which can be used by plugins and scripts to interact with
+    composer windows.
+
+    Could be expanded in future to add hooks for toolbars, menus,
+    etc, allowing plugins to extend composer functionality.
+
+Nyall Dawson 	2017-03-18
+
+    Better method to autogenerate composer names
+
+Nyall Dawson 	2017-03-17
+
+    Restore opening existing composers
+
+Nyall Dawson 	2017-03-17
+
+    Extend layout manager tests
+
+Nyall Dawson 	2017-03-17
+
+    Remove more ununused composer code, fix updating existing
+    compositions when settings change
+
+Nyall Dawson 	2017-03-17
+
+    Port composer template saving and duplicating to layout manager
+
+Nyall Dawson 	2017-03-17
+
+    [composer] Allow floating docks
+
+    Now that composer windows are deleted on close, we no longer
+    suffer from the Qt bug which keeps floating docks open when
+    the window is hidden
+
+Nyall Dawson 	2017-03-17
+
+    Remove more unneeded composer window code
+
+Nyall Dawson 	2017-03-17
+
+    [composer] Composer windows are created on demand and destroyed on close
+
+    Avoids having to create a window and all widgets for every
+    composition when loading a project. Speeds up loading
+    projects.
+
+    Fix #15193
+
+Nyall Dawson 	2017-03-16
+
+    Use layout manager when testing for unique composer names
+
+Nyall Dawson 	2017-03-15
+
+    [composer] Attach compositions to QgsProject
+
+    This adds a new QgsLayoutManager class which is used for
+    storage and serializing/deserializing of compositions.
+
+    A QgsLayoutManager is attached to QgsProject. This allows
+    core code to access the compositions attached to a project.
+    The intention is to move all handling of compositions from
+    app to core, making it easy for server to access project
+    compositions without resorting to fragile xml parsing.
+
+Nyall Dawson 	2017-03-16
+
+    Followup setting composition name
+
+Nyall Dawson 	2017-03-21
+
+    [processing] Default to current layer in layer selection combos
+
+    Makes things easier for large projects and avoids scrolling through
+    a large list of layers
+
+Nyall Dawson 	2017-03-21
+
+    Better saving/restoring of map view dock position
+
+    Inspired by Sourcepole's kadas-albireo
+
+Nyall Dawson 	2017-03-21
+
+    [processing] Sync features in Select by Expression with Select by Attribute
+
+    Adds new stuff like "is null"/"is not null"/"does not contain"
+    to the Select By Attribute algorithm.
+
+Nyall Dawson 	2017-03-16
+
+    [FEATURE][processing] Add 'does not contain' to Extract By Attribute
+
+Nyall Dawson 	2017-03-21
+
+    Add custom widget plugin for QgsScrollArea
+
+Nyall Dawson 	2017-03-20
+
+    Swap all QScrollAreas to QgsScrollAreas
+
+Nyall Dawson 	2017-03-17
+
+    Avoid accidental child widget value changes when scrolling scroll areas
+
+    This adds a new QgsScrollArea widget which is a subclass of QScrollArea.
+    QgsScrollArea has extra logic which temporarily blocks wheel events
+    from hitting child widgets for a short period following a scroll
+    of the area. This means that when scrolling a scroll area using the
+    mouse wheel, values won't be accidentally changed if the mouse
+    cursor momentarily lands on top of a widget.
+
+    QScrollArea should no longer be used in any QGIS code or plugins,
+    instead use QgsScrollArea to benefit from this fix.
+
+Tim Sutton 	2017-03-20
+
+    Fixed build due to missing image resource reference.
+
+Tim Sutton 	2017-03-20
+
+    More images cleanups: Removed the developers folder as it is not maintained. Removed some XCF files since we dont really need them with the switch to SVG. Updated QGIS mime icon.
+
+Tim Sutton 	2017-03-19
+
+    Update logos to use new QGIS logo
+
+Tim Sutton 	2017-03-18
+
+    In progress migration to new QGIS icon
+
+Alessandro Pasotti 	2017-03-20
+
+    Wrap and expose system tray notifications (#4286)
+
+    * Wrap and expose system tray notifications
+
+    * System tray notifications: renamed to showSystemNotification and const
+
+Alessandro Pasotti 	2017-03-20
+
+    QgsSettings: added Auth, App and Providers sections
+
+    That should be all we need for namespaced settings.
+
+Nyall Dawson 	2017-03-20
+
+    Remove QgsFeatureRequest::FilterRect
+
+    This enum value has not been in use since filter rects were
+    separated from other filter types. Leaving it in API is confusing
+    and leads to incorrect use.
+
+Nyall Dawson 	2017-03-20
+
+    Fix incorrect results when using QgsFeatureRequest.acceptFeature with filter rect
+
+Nyall Dawson 	2017-03-20
+
+    Improve docs
+
+Nyall Dawson 	2017-03-20
+
+    Fix map not refreshed when deselecting/inverting selection (fix #16365)
+
+Nyall Dawson 	2017-03-20
+
+    Revert "[FEATURE] Allow using secondary zoom wheel on mouse to magnify canvas"
+
+    This reverts commit ecc49256a37d4333d9cefdeefff1f3fd7a38d893.
+
+    Works very badly for touchpads, where horizontal movement is interpreted
+    as a magnify request
+
+Matthias Kuhn 	2017-03-19
+
+    Move QgsAnimatedIcon to a generic implementation (#4272)
+
+Matthias Kuhn 	2017-03-18
+
+    Set feature valid on setId
+
+Matthias Kuhn 	2017-03-15
+
+    Fix failing test
+
+Matthias Kuhn 	2017-03-15
+
+    Make features valid on setAttribute and setGeometry
+
+    Implements https://github.com/qgis/qgis3.0_api/issues/75
+
+Larry Shaffer 	2017-03-17
+
+    Updates to QgsPasswordLineEdit
+
+    - Add public func to set password visibility (instead of exposing slot)
+    - Add initial password visibility param; default to obfuscated (false)
+    - Fix bug where initial visibility was true, but show/hide was opposite
+    - Add generic tool tips to show/hide action
+
+Larry Shaffer 	2017-03-17
+
+    Add version parsing to FindQGIS CMake module
+
+Stefan 	2017-03-17
+
+    Updated ogr2ogr.py with GeoPackage in FORMATS and EXTS.
+
+    GeoPackage really deserves to become a first class citizen in QGIS at for vector and probably also for raster :-)
+    (Wondering why the lists aren't sorted alphabetically. This makes searching for a format for the user in the dialog/pul down list a tedious sequential task).
+
+Etienne Trimaille 	2017-03-17
+
+    add checkbox to open sublayers in a group
+
+Merge: 1337ee3866 852f01b0f9
+Even Rouault 	2017-03-17
+
+    Merge pull request #4270 from rouault/wfs_outputformat
+
+    [WFS provider] Select GML3 output format for WFS 1.0 when available
+
+Nyall Dawson 	2017-03-17
+
+    [composer] Smooth scrolling for touchpads
+
+Mathieu Pellerin 	2017-03-17
+
+    [labelling] fix font size @value variable (fixes #16362) (#4273)
+
+Nyall Dawson 	2017-03-17
+
+    Allow clicking mouse back button on stacked panel widgets
+
+    Only works if click occurs outside of widgets - we probably should
+    start ignoring clicks which aren't left/middle/right in any
+    mouse event handlers
+
+Nyall Dawson 	2017-03-17
+
+    Flip panel connects to new style
+
+Nyall Dawson 	2017-03-17
+
+    [FEATURE] Allow using secondary zoom wheel on mouse to magnify canvas
+
+Nyall Dawson 	2017-03-17
+
+    [FEATURE] Allow navigating back/forward through canvas view history
+    with back/forward mouse buttons
+
+Merge: 9887734a1f 2dbb128dd9
+Nyall Dawson 	2017-03-17
+
+    Merge pull request #4266 from nyalldawson/raster_proj
+
+    Avoid getting stuck in raster projector loop for long times
+
+Nyall Dawson 	2017-03-17
+
+    Make raster engine safer with memory usage
+
+Nyall Dawson 	2017-03-16
+
+    Avoid getting stuck in raster projector loop for long times
+
+Juergen E. Fischer 	2017-03-16
+
+    don't crash on late update timeouts
+
+    (cherry picked from commit 5541ad0c06e298c9df804b2236ff660f129db3e6)
+
+Merge: 3bcf287a7e e1b1465bb6
+Alexander Bruy 	2017-03-16
+
+    Merge pull request #4268 from alexbruy/scripts-tests
+
+    [processing] support for scripts in the test suite
+
+Alexander Bruy 	2017-03-16
+
+    move select by attribute script test to QGIS tests
+
+Alexander Bruy 	2017-03-16
+
+    added sample test script which calls two algorithms
+
+Alexander Bruy 	2017-03-16
+
+    minor script fixes
+
+Alexander Bruy 	2017-03-16
+
+    fix typo
+
+Alexander Bruy 	2017-03-16
+
+    missed file
+
+Alexander Bruy 	2017-03-16
+
+    add note about scripts tests to the README
+
+Alexander Bruy 	2017-03-16
+
+    [processing] allow tests for scripts
+
+Matteo Ghetta 	2017-03-16
+
+    Processing tests (#4259)
+
+    * [processing] qgis regular points test
+
+    * [processing] qgis shape buffer variable tests
+
+    * [processing] qgis create grid lines test
+
+    * [processing] qgis convert geometry test
+
+    * [processing] qgis extract by location test
+
+    * [processing] qgis add field test
+
+    * [processing] trying to fix travis failing
+
+    * [processing] trying to fix travis failing/2
+
+    * trying to fix travis failing/3
+
+    * [processing] Add new default option "ProjectCrs" to ParameterCrs
+
+    * [processing] RegularPoints tests shouldn't rely on iface
+
+    * [processing] Fix regular points test
+
+    * [processing] RandmPointsExtent new CRS parameter
+
+    * [processing] qgis random point in extent test
+
+    * [processing] qgis random point in extent test/2
+
+    * [processing] remove qgis random point in extent test
+
+    * no output random points in extent test
+
+    * remove useless output
+
+Even Rouault 	2017-03-14
+
+    [WFS provider] Select GML3 output format for WFS 1.0 when available
+
+    Some WFS servers like QGIS servers can expose GML3 output format for GetFeature
+    requests, which enable to retrieve curve geometries, instead of linearized ones
+    with the default GML2 output format. So use GML3 when advertized, and that
+    no explicit outputFormat is passed in the URI.
+
+Alexander Bruy 	2017-03-16
+
+    add aux files generated by tests to .gitignore
+
+Nyall Dawson 	2017-03-16
+
+    Fix some suffixes for spin boxes
+
+Nyall Dawson 	2017-03-16
+
+    [processing] Fix error when opening modeler (fix #16270)
+
+rldhont 	2017-03-15
+
+    [BUGFIX][Processing] Vector tools -- add next methods for features iterator
+
+Merge: e2d7181289 47dd83dd75
+Even Rouault 	2017-03-15
+
+    Merge pull request #4258 from rouault/ogr_isfieldsetandnotnull
+
+    [OGR provider] Use OGR_F_IsFieldSetAndNotNull() when available.
+
+Denis Rouzaud 	2017-03-15
+
+    spelling
+
+Even Rouault 	2017-03-14
+
+    [OGR provider] Run addFeatures() and deleteFeatures() within transaction
+
+Martin Landa 	2017-02-22
+
+    OGR data provider: use transactions when changing attributes and geometries (if possible) (fixes #16216)
+
+Harrissou Sant-anna 	2017-03-14
+
+    Update the install instructions
+
+    - The install doc is not available in documentation nor translated
+    - SPIT plugin no longer exists
+    - Mention versioning of instructions depending on branches
+
+Nyall Dawson 	2017-03-15
+
+    Move "new view" action alongside other view tools in toolbar
+
+Nyall Dawson 	2017-03-15
+
+    [FEATURE] @layout_name variable for retrieving composition name
+
+    Likely useful in some circumstances!
+
+    Fixes #15824
+
+Nyall Dawson 	2017-03-15
+
+    Move composer title to composition name
+
+    Allows the name to be retrieved from core code
+
+Mathieu Pellerin 	2017-03-15
+
+    [style dock] fix defining min/max values via raster histogram (#4262)
+
+Nyall Dawson 	2017-03-15
+
+    Never set the main canvas CRS manually
+
+    Instead always rely on connection to project CRS changes
+
+Nyall Dawson 	2017-03-15
+
+    Better handling of pre 3.0 project CRS upgrades
+
+    Project CRS is inconsistently used for 2.x projects, so always
+    take the main canvas CRS as the project CRS when opening
+    a 2.x project
+
+    (or invalid CRS if OTF disabled)
+
+Marco Hugentobler 	2017-03-13
+
+    Fix datum transformation for raster layers
+
+    Forward port from d6185b5
+
+Merge: b8c3c139a1 2d37ca9bd9
+Nyall Dawson 	2017-03-15
+
+    Merge pull request #4253 from nyalldawson/multi_canvas2
+
+    [FEATURE] Multi canvas/additional map views
+
+Juergen E. Fischer 	2017-03-14
+
+    blacklist epsg:6966 and epsg:7082 for crssync
+
+Juergen E. Fischer 	2017-03-14
+
+    fix duplicate labels in api_break.dox
+
+Merge: 647e814bfd ac912cc049
+Nyall Dawson 	2017-03-15
+
+    Merge pull request #4254 from Gustry/vertical_alignment
+
+    make the attribute table vertical aligned
+
+Merge: afdbf1bbbb f355fcd96e
+Nyall Dawson 	2017-03-15
+
+    Merge pull request #4248 from arnaud-morvan/expressions_with_null
+
+    Improve NULL handling in expressions
+
+Juergen E. Fischer 	2017-03-14
+
+    fix FieldFormatter in pi_break.dox
+
+Merge: b1327380c6 0dc61cb2fb
+Alexander Bruy 	2017-03-14
+
+    Merge pull request #4256 from alexbruy/password-lineedit
+
+    [FEATURE][needs-docs] new custom widget PasswordLineEdit
+
+Even Rouault 	2017-03-14
+
+    [OGR provider] Use OGR_F_IsFieldSetAndNotNull() when available.
+
+    Starting with GDAL 2.2, there are 2 concepts: unset fields and null fields
+    whereas previously there was only unset fields. For QGIS purposes, both
+    states (unset/null) are equivalent.
+
+Etienne Trimaille 	2017-03-13
+
+    make the attribute table vertically aligned
+
+Alexander Bruy 	2017-03-14
+
+    use new style for signal-slot connection
+
+Alexander Bruy 	2017-03-14
+
+    use C++11 style initializer in custom widget
+
+Alexander Bruy 	2017-03-14
+
+    add Q_PROPERTY for showLockIcon
+
+Alexander Bruy 	2017-03-14
+
+    update dialogs to use new password lineedit widget
+
+Alexander Bruy 	2017-03-13
+
+    add custom widget for Qt Designer
+
+Alexander Bruy 	2017-03-13
+
+    add SIP bindings
+
+Alexander Bruy 	2017-03-13
+
+    remove unused forward declaration
+
+Alexander Bruy 	2017-03-13
+
+    [FEATURE][needs-docs] new custom widget: password edit with built-in show/hide
+    password button.
+
+Denis Rouzaud 	2017-03-07
+
+    external resource widget config: use single combobox rather than checkable group box + combobox
+
+    this will allow to use a data defined button later on
+
+Nyall Dawson 	2017-03-14
+
+    Fix some use of direct project key read when getter should be used
+
+Nyall Dawson 	2017-03-14
+
+    Remove unused files
+
+Nyall Dawson 	2017-03-14
+
+    Fix failing test
+
+Nyall Dawson 	2017-03-14
+
+    Make sure main canvas is always synced to project CRS (part 1)
+
+    Fix #16337
+
+Nyall Dawson 	2017-03-14
+
+    Restore projects with OTF off to "no projection" (fix #16338)
+
+Nyall Dawson 	2017-03-14
+
+    Avoid Qt warning due to null action
+
+Nyall Dawson 	2017-03-14
+
+    Add method to interface to close map canvases
+
+Nyall Dawson 	2017-03-14
+
+    Rework sync extent option for map views
+
+    Instead of a single sync extent option, the option has been split
+    into a "sync map center" option, and a "sync scale" option.
+
+    Sync center just does that - syncs the center of the map without
+    changing the scale. This allows you to have an overview style
+    or magnified map which follows the main canvas center.
+
+    Sync scale borrows from the Auxillary Window/Dockable Mirror
+    Map plugin approach. If sync scale is enabled, a "scale factor"
+    is utilised to multiply the main canvas scale. This allows
+    you to have a view which is e.g. always 2x the scale of the
+    main canvas.
+
+    Splitting the sync extent option like this allows us to address
+    a much wider set of use cases with map views (at the cost of
+    a bit of UI complexity). It also helps cover more of the
+    feature set from the Aux Window/Dockable Mirror Map plugins,
+    hopefully allowing this built-in view approach to make the need
+    for 3rd party plugins redundant.
+
+Nyall Dawson 	2017-03-14
+
+    Port cursor marker from Aux Window plugin to multi canvas
+
+    Shows a marker in map views indicating the position of the cursor
+    in the main canvas. Can be toggled on/off as desired.
+
+Nyall Dawson 	2017-03-14
+
+    Prevent synced view scale from going to 0 when resizing synced docks
+
+Nyall Dawson 	2017-03-14
+
+    Better initial placement of new map views
+
+Nyall Dawson 	2017-03-14
+
+    Remove warning on closing map views
+
+    Seemed like a good idea, but in practice it's just more annoying
+    than it is useful
+
+Nyall Dawson 	2017-03-14
+
+    Move New Map View action to View menu (more logical place)
+
+Nyall Dawson 	2017-03-14
+
+    Fix capitalization, formatting of strings
+
+Nyall Dawson 	2017-03-14
+
+    Indentation
+
+Nyall Dawson 	2017-03-13
+
+    Default to floating docks for new map views
+
+    Helps minimise the effects of being unable to restore docked
+    view positions
+
+Nyall Dawson 	2017-03-13
+
+    Save extent sychronized state in project for views
+
+Nyall Dawson 	2017-03-13
+
+    Use a nicer icon for sync extent
+
+Nyall Dawson 	2017-03-13
+
+    Refresh map extent when activating sync extent mode
+
+Nyall Dawson 	2017-03-13
+
+    Allow annotations to be toggled in additional map views
+
+Nyall Dawson 	2017-03-13
+
+    Add toolbar buttons for navigating map views
+
+Nyall Dawson 	2017-03-09
+
+    Make extra map views either follow the main canvas layers/styles,
+    or allow them to be set to follow a map theme preset
+
+    I.e. all styling and configuration operations for secondary
+    views are done in the main map canvas. Theme presets can be made
+    in the main canvas, and then assigned to the secondary views.
+
+Nyall Dawson 	2017-03-08
+
+    Fix map view synchronization with different CRS
+
+Nyall Dawson 	2017-03-08
+
+    Allow renaming map views
+
+Nyall Dawson 	2017-03-08
+
+    Use a pan tool for map views
+
+Nyall Dawson 	2017-03-08
+
+    Move map view crs setting to menu
+
+Nyall Dawson 	2017-03-08
+
+    Allow setting magnification factor for map views
+
+Nyall Dawson 	2017-03-08
+
+    Add rotation control to map views
+
+Nyall Dawson 	2017-03-08
+
+    Add options menu and allow setting map view scale
+
+Nyall Dawson 	2017-03-07
+
+    Fix crash when loading projects with multi canvas
+
+Nyall Dawson 	2017-03-01
+
+    Allow canvas extents to be synchronized
+
+Nyall Dawson 	2017-03-01
+
+    Save/restore extra map views in project
+
+Nyall Dawson 	2017-03-01
+
+    Correctly handle reading/writing multiple canvas to project
+
+Nyall Dawson 	2017-03-01
+
+    Close extra map views when changing project
+
+Nyall Dawson 	2017-03-01
+
+    Handle deleting map views
+
+Nyall Dawson 	2017-02-28
+
+    Ensure operations which should apply to all canvases do
+
+Nyall Dawson 	2017-02-28
+
+    Ensure all canvases are refreshed when project properties are applied
+
+Nyall Dawson 	2017-02-28
+
+    Ensure additional canvases respect settings
+
+Nyall Dawson 	2017-02-28
+
+    Ensure all canvases show annotations
+
+Nyall Dawson 	2017-02-27
+
+    Create new map canvases using QgsMapCanvasDockWidget
+
+    Dock has a toolbar, currently with a single button to
+    allow users to set the CRS for the canvas
+
+Nyall Dawson 	2017-02-27
+
+    [FEATURE] Shell functionality for creating new canvases
+
+    Allows new "map views" to be created in the main QGIS interface.
+    These are map canvases, but with limited functionality (ie
+    no use of map tools beyond pan tool).
+
+Juergen E. Fischer 	2017-03-13
+
+    add windows download link for ninja to INSTALL
+
+Juergen E. Fischer 	2017-03-13
+
+    fix flake8 warnings
+
+arnaud.morvan@camptocamp.com 	2017-03-03
+
+    Fix geometry aggregate when first geometry is NULL (usertype)
+
+arnaud.morvan@camptocamp.com 	2017-03-03
+
+    Fix aggregate when group_by value is NULL
+
+arnaud.morvan@camptocamp.com 	2017-03-10
+
+    Handle NULL in function "Array"
+
+Harrissou Sant-anna 	2017-03-12
+
+    Fix link to developer's guide
+
+Merge: 1ca73f4f29 a8d627d5ce
+Nyall Dawson 	2017-03-13
+
+    Merge pull request #4239 from nyalldawson/layer_freakin_order
+
+    Allow retrieval of project layer order through QgsProject
+
+Mathieu Pellerin 	2017-03-13
+
+    harmonize all providers to use lowercase qgis as settings key (#4252)
+
+    (fixes ArcGisRest browser / connection dialog)
+
+Nyall Dawson 	2017-03-13
+
+    Revert "Remove no longer required hack to get composer maps to render"
+
+    Because... server
+
+Nyall Dawson 	2017-03-13
+
+    Fix failing composer map tests
+
+Nyall Dawson 	2017-03-13
+
+    When theme is removed, canvas falls back to default view
+
+Nyall Dawson 	2017-03-13
+
+    If no project layer order set, use layer tree layer order
+    for QgsMapThemeCollection::masterVisibleLayers()
+
+Nyall Dawson 	2017-03-13
+
+    Clearing map canvas theme falls back to project layers
+
+Nyall Dawson 	2017-03-13
+
+    Move test to correct location
+
+Nyall Dawson 	2017-03-13
+
+    Indentation
+
+Nyall Dawson 	2017-03-13
+
+    Remove no longer required hack to get composer maps to render
+    canvas layers
+
+Nyall Dawson 	2017-03-13
+
+    Add method to QgsMapThemeCollection to retrieve ordered list of
+    visible layers for the project
+
+Nyall Dawson 	2017-03-13
+
+    Qt5 style connects
+
+Nyall Dawson 	2017-03-13
+
+    No longer need to store custom layer order for canvas bridge
+
+    Since it's now set at the project level
+
+Nyall Dawson 	2017-03-13
+
+    Auto-set GUI for custom layer order when API call to QgsProject::setLayerOrder
+    is made
+
+Nyall Dawson 	2017-03-09
+
+    If no project layer order is set, fall back to stored layer order
+    when retrieving map theme layers
+
+    Since we don't ever want to return no layers in this situation
+    using the stored order is an acceptable last resort
+
+    Should only affect custom scripts run outside of QGIS app
+    in any case!
+
+Nyall Dawson 	2017-03-09
+
+    Project layer order returns all layers in order, not just visible ones
+
+    Otherwise map themes with different visible layers cannot be
+    correctly ordered
+
+Nyall Dawson 	2017-03-09
+
+    Layer order in map themes must always respect project layer order
+
+Nyall Dawson 	2017-03-09
+
+    Allow retrieval of project layer order through QgsProject
+
+    Previously this was only accessible through app
+
+Merge: cd7b19c371 9842fcbfc7
+Nyall Dawson 	2017-03-13
+
+    Merge pull request #4238 from nyalldawson/canvas_theme
+
+    Allow setting map canvases to auto follow a map theme
+
+Nyall Dawson 	2017-03-13
+
+    Add convience method to block while canvas is rendering
+
+    NOT to be called from anything but unit tests and standalone
+    scripts!!
+
+Nyall Dawson 	2017-03-13
+
+    Improved docs for QgsMapCanvas::setTheme, handle setLayers and
+    setLayerStyleOverrides when canvas is following a map theme
+
+Nyall Dawson 	2017-03-09
+
+    Clearer docs
+
+Nyall Dawson 	2017-03-09
+
+    Add unit test for changing appearance of style in a theme
+
+Nyall Dawson 	2017-03-09
+
+    Fix setting layers to match canvas theme
+
+Nyall Dawson 	2017-03-09
+
+    Allow setting map canvases to auto follow a map theme
+
+Matthias Kuhn 	2017-03-12
+
+    Update pull request template and contribute.md
+
+Nyall Dawson 	2016-12-30
+
+    Add PR template for github
+
+Merge: d10d67728a 18851e4b72
+Nyall Dawson 	2017-03-12
+
+    Merge pull request #4250 from ismailsunni/XYZ_connection_dialog
+
+    Update UI for XYZ Connection Dialog
+
+Ismail Sunni 	2017-03-12
+
+    Use new style connect.
+
+Ismail Sunni 	2017-03-12
+
+    Update UI for XYZ Connection.
+
+Blottiere Paul 	2017-03-10
+
+    [BUGFIX] Embedded groups are empty
+
+Juergen E. Fischer 	2017-03-11
+
+    windows test:
+    * skip options startup test (--help shows a message box on windows)
+    * avoid initial console help
+
+myarjunar 	2017-03-10
+
+    fix zoom vactor value on percent
+
+myarjunar 	2017-03-10
+
+    use QgsSpinBox instead of QSpinBox and add tooltip
+
+myarjunar 	2017-03-09
+
+    change zoom factor value to percent
+
+Nyall Dawson 	2017-03-10
+
+    Add missing description to root path property
+
+Nyall Dawson 	2017-03-10
+
+    Generalise editor widget config saving/restoring props from gui
+
+Matthias Kuhn 	2017-03-10
+
+    Fix typo
+
+Merge: 236f44dd4e 4d77431b98
+Tom Kralidis 	2017-03-09
+
+    Merge pull request #4243 from tomkralidis/metasearch-add-data-dropdown
+
+    MetaSearch: consolidate "Add WxS" buttons into single dropdown button
+
+Nyall Dawson 	2017-03-10
+
+    Avoid extra frame drawn around color wheel in menus
+
+    Not needed, and looks very ugly with Qt5 styling
+
+Sandro Mani 	2017-03-10
+
+    [ArcGIS Rest] Fix some icons
+
+Sandro Mani 	2017-03-10
+
+    [ArcGIS Rest] Fix connection key inconsistencies
+
+Juergen E. Fischer 	2017-03-09
+
+    remove python ext-libs that should meanwhile available everywhere
+
+Matthias Kuhn 	2017-03-09
+
+    Fix QgsXmlUtils reading list to variant and add test
+
+Matthias Kuhn 	2017-03-09
+
+    Save QgsProperty related objects via QVariants
+
+Nyall Dawson 	2017-03-07
+
+    Correctly use QgsProperties in editor widgets
+
+    TODO: save/restore properties
+
+Tom Kralidis 	2017-03-09
+
+    MetaSearch: consolidate "Add WxS" buttons into single dropdown button
+
+Larry Shaffer 	2017-03-09
+
+    Skip WMS_GetPrint_SRS test in PyQgsServer, instead of commenting out
+
+    As per discussion with Alessandro Pasotti
+
+Merge: bbc849d73e fa89a588e2
+Tom Kralidis 	2017-03-09
+
+    Merge pull request #4241 from tomkralidis/issue-16266
+
+    add pyproj to Python deps
+
+Tom Kralidis 	2017-03-09
+
+    add pyproj to Python deps (http://hub.qgis.org/issues/16266)
+
+Merge: f5d0ba1aa9 573947896b
+Alessandro Pasotti 	2017-03-09
+
+    Merge pull request #4235 from boundlessgeo/qgssettings-housekeeping
+
+    QgsSettings housekeeping
+
+Larry Shaffer 	2017-03-08
+
+    Ensure on macOS generated export header gets copied to frameworks
+
+    It *should* get copied with PUBLIC_HEADER property of target, but CMake
+    quirk causes it to be skipped if not part of original sources for the
+    target, which can’t happen because the target needs to exist first to
+    make the export header. This only fixes ‘qgis’ frameworks.
+
+    [ci skip]
+
+Larry Shaffer 	2017-03-08
+
+    Show only notifications for macOS system tray, not constant menubar icon
+
+    Otherwise, a menubar QGIS icon is shown, but contains no child actions.
+
+    This method of showing notifications should probably be moved to an
+    abstract call. However, on macOS, the showMessage() icon and timeout
+    are ignored.
+
+    Better to use a direct Obj-C++ method for macOS notifications:
+    https://wiki.qt.io/How_to_use_OS_X_Notification_Center
+
+Larry Shaffer 	2017-03-08
+
+    Add macOS 1024x1024 icon for dock, app switcher, etc., rendering
+
+    [ci skip]
+
+Merge: 94bef531f0 41d5f30961
+Nyall Dawson 	2017-03-09
+
+    Merge pull request #4237 from nyalldawson/filter_selected
+
+    [needs-docs] Attribute table "show selected features" shows no featureswhen none are selected
+
+Nyall Dawson 	2017-03-09
+
+    [needs-docs] Attribute table "show selected features" shows no features
+    when none are selected
+
+    This change is being driven by performance - the "show selected" mode
+    can be used to speed up the attribute table loading for large layers.
+    The current behaviour (showing ALL features when none are selected)
+    breaks this performance benefit, because if users accidently open
+    the table with no selection then they are forced to wait for the
+    entire table to load (sometimes takes hours on large tables/slow
+    connections).
+
+Merge: 95040c1b42 9f23dd2414
+Nyall Dawson 	2017-03-09
+
+    Merge pull request #4231 from nyalldawson/options
+
+    [FEATURE] Interface for plugins to embed pages in the options dialog
+
+Nyall Dawson 	2017-03-09
+
+    Follow up addition of new units
+
+Merge: e0979046a4 8b2180f379
+Nyall Dawson 	2017-03-09
+
+    Merge pull request #4213 from m-kuhn/formatDistanceAreaNew
+
+    Modularize distance and area formatting
+
+Matthias Kuhn 	2017-03-08
+
+    Unit tests for mm/cm units
+
+Matthias Kuhn 	2017-03-08
+
+    [feature] Add support for square centimeters / square millimeter units
+
+    Note for documentation writers, centimers / millimeters support has been
+    added as well in a previous commit.
+
+Matthias Kuhn 	2017-03-03
+
+    Modularize distance and area formatting
+
+Matthias Kuhn 	2017-03-05
+
+    [travis] Fold segfault messages
+
+Alessandro Pasotti 	2017-03-08
+
+    QgsSettings: homogenize "qgis" keys
+
+Alessandro Pasotti 	2017-03-08
+
+    QgsSettings: removed leading slashs from keys
+
+Merge: 5e6d540bbc 7e546c0382
+Nyall Dawson 	2017-03-08
+
+    Merge pull request #4233 from myarjunar/test-toMapPixel
+
+    add unit test for toMapPoint function
+
+Nyall Dawson 	2017-02-27
+
+    Refactor out canvas initializing to project settings
+
+Nyall Dawson 	2017-03-07
+
+    Fix potential crash on destroying QgsMapCanvas
+
+    If an active job is rendering when a map canvas is destroyed
+    then the canvas can crash
+
+Nyall Dawson 	2017-03-08
+
+    Qt5 connects
+
+Nyall Dawson 	2017-03-08
+
+    Fix annotations not always positioned in reprojected maps correctly
+
+Nyall Dawson 	2017-03-08
+
+    Clear cache when setting layer style overrides for canvas
+
+    Since old cache images no longer apply
+
+Nyall Dawson 	2017-03-08
+
+    Add signal when a map theme changes, add tests
+
+myarjunar 	2017-02-08
+
+    add unit test for toMapPoint function
+
+Larry Shaffer 	2017-03-07
+
+    Remove macOS standalone browser icon install
+
+    [ci skip]
+
+Merge: 97545901ca db138ff8bc
+Sandro Mani 	2017-03-07
+
+    Merge pull request #4232 from manisandro/geomchecker
+
+    Geometry checker: Add self-contact check
+
+Sandro Mani 	2017-03-07
+
+    [Geometry checker] Fix duplicate code in QgsGeometrySelfIntersectionCheckError::isEqual
+
+    These checks are already performed by QgsGeometryCheckError::isEqual
+
+Sandro Mani 	2017-03-07
+
+    [Geometry checker] Add self-contact check
+
+Merge: e23dcc8fef d672361597
+Tom Kralidis 	2017-03-07
+
+    Merge pull request #4228 from tomkralidis/metasearch-http-basicauth
+
+    add support for HTTP Basic authentication
+
+Tom Kralidis 	2017-03-06
+
+    add support for HTTP Basic authentication (http://hub.qgis.org/issues/16298)
+
+Denis Rouzaud 	2017-03-07
+
+    [spell check] avoid multiple replace by adding prev and next char to sed replace command
+
+Denis Rouzaud 	2017-03-07
+
+    Revert "spell check: replace only words"
+
+    This reverts commit 0d7f697572e646500e002b53053cea0a1c201fd9.
+
+Juergen E. Fischer 	2017-03-07
+
+    spell check: replace only words
+
+Nyall Dawson 	2017-03-07
+
+    [NEEDS-DOCS][processing] Move configuration to qgis options dialog
+
+Nyall Dawson 	2017-03-07
+
+    [FEATURE] Interface for plugins to embed pages in the options dialog
+
+    Allows plugins to embed their options into the standard options
+    dialog, instead of implementing their own config dialog and having
+    to have extra menu items just for those...
+
+Nyall Dawson 	2017-03-07
+
+    Use a checkbox instead of tree item for "no projection" option
+
+    Makes this option more visible and easier to associate with the
+    old "OTF off" option
+
+Matthias Kuhn 	2017-03-06
+
+    Notify about QgsProject::crs changes
+
+Matthias Kuhn 	2017-03-03
+
+    [Feature] Path prefix for attachment widget can be defined by expression
+
+Matthias Kuhn 	2017-03-03
+
+    [Feature] Conditional styles for relation reference widget
+
+Matthias Kuhn 	2017-03-03
+
+    Qt5 connections
+
+Denis Rouzaud 	2017-03-06
+
+    fix typo
+
+Juergen E. Fischer 	2017-03-06
+
+    spelling fix
+
+Juergen E. Fischer 	2017-03-06
+
+    spelling fixes
+
+Alessandro Pasotti 	2017-03-06
+
+    QgsSettings: removed lower(), now it's case sensistive
+
+Merge: b9a0ba1e28 38079361cb
+rldhont 	2017-03-06
+
+    Merge pull request #4124 from pblottiere/security
+
+    add unit tests for sql injection
+
+Merge: c2b365c70e 6ce208c776
+Tom Kralidis 	2017-03-05
+
+    Merge pull request #4226 from tomkralidis/metasearch-fixes-master
+
+    MetaSearch: minor fixes for QGIS 3 compat
+
+Tom Kralidis 	2017-03-05
+
+    MetaSearch: minor fixes for QGIS 3 compat
+
+Nathan Woodrow 	2017-02-22
+
+    [FEATURE] Add system tray notifcation for finished tasks.
+
+    Should work on all platforms and only shows when application is hidden.
+
+Matthias Kuhn 	2017-03-05
+
+    [travis] Fold successful tests and some noise
+
+Matthias Kuhn 	2017-03-04
+
+    [travis] Less noise when downloading deps
+
+Tom Kralidis 	2017-03-05
+
+    [MetaSearch] update release vresion
+
+Merge: 5a962e8d4e 6822d6b1d0
+Tom Kralidis 	2017-03-05
+
+    Merge pull request #4224 from tomkralidis/metasearch-fixes-master
+
+    Metasearch fixes master
+
+Tom Kralidis 	2017-03-05
+
+    MetaSearch: fix help URL (http://hub.qgis.org/issues/16176)
+
+Tom Kralidis 	2017-03-05
+
+    MetaSearch: clean OWS URL when adding from search (http://hub.qgis.org/issues/16261)
+
+Juergen E. Fischer 	2017-03-05
+
+    translation string fixes
+
+Juergen E. Fischer 	2017-03-04
+
+    fix more flake8 warnings
+
+Juergen E. Fischer 	2017-03-04
+
+    update translation strings
+
+Merge: 9a747de6db fbe4be884b
+Nyall Dawson 	2017-03-05
+
+    Merge pull request #4209 from nyalldawson/postgres_queue_size2
+
+    Dynamically adjust postgres feature queue size
+
+Merge: f0d2f6dcf3 346bfe499f
+Nyall Dawson 	2017-03-05
+
+    Merge pull request #4164 from nyalldawson/cache_upgrade
+
+    Improvements to attribute table performance
+
+Nyall Dawson 	2017-03-05
+
+    Update for QgsSettings
+
+Nyall Dawson 	2017-03-05
+
+    Update indentation, fix build
+
+Nyall Dawson 	2017-03-05
+
+    Indentation
+
+Nyall Dawson 	2017-02-21
+
+    Use correct stats in attribute table dialog title
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-21
+
+    Remove special handling for attribute table "show visible" initial state
+
+    This is no longer required as the show visible option now always
+    uses provider side filters
+
+Nyall Dawson 	2017-02-21
+
+    Avoid unnecessary reloads layer for attribute table
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-21
+
+    Unvert "Ensure that full cache flag is cleared when invalid"
+
+    This is required - when the cache is invalidated it requires
+    a full rebuild (eg due to a new attribute being added) in order
+    to have complete information.
+
+    Since this could be a very lengthy process, it's not safe to
+    immediately rebuild the full cache. Instead, clear the full
+    cache flag and require users of this class to handle
+    responsive cache rebuilding by listening to the invalidated()
+    signal from the cache.
+
+Nyall Dawson 	2017-02-20
+
+    Revert 38f4a6f
+
+Nyall Dawson 	2017-02-20
+
+    Move partial responsibility for filtering attribute table to
+    dual view master model
+
+    This avoids requiring the table to load ALL features when the
+    table is set to just display selected or visible features
+
+    Dramatically improves load time of the attribute table when
+    working with large layers, so long as the table is set to
+    display selected features or visible features by default
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-20
+
+    Fix attribute table always fetches geometries for features
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-20
+
+    Ensure that full cache flag is cleared when invalid
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-20
+
+    Add (failing) test to ensure that attribute table doesn't fetch
+    geometry by default
+
+    (because performance)
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-20
+
+    Ensure both attribute table cache & master model request respect
+    geometry fetching
+
+    If request needs geometry but cache isn't fetching it then cache
+    is bypassed. This is a performance hit, so ensure that cache
+    and request are always in sync wrt to fetching geoms.
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-02-20
+
+    Flip some connects to new style
+
+Nyall Dawson 	2017-02-20
+
+    Small cleanup to QgsDualView - don't use cache to access layer
+
+Nyall Dawson 	2017-02-20
+
+    Clear existing cache when QgsVectorLayerCache is set to cache geom
+
+    Any features inside the cache must be cleared, because they
+    won't necessarily have the feature's geometry cached
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2017-03-03
+
+    Dynamically adjust postgres feature queue size
+
+    Lower the default queue size, but automatically adjust it
+    based on how long each fetch takes. This change keeps fetching
+    responsive even for slow connections or databases. The current
+    approach with a fixed queue size can result in very slow feature
+    fetching, which prevents UI updates for multiple seconds.
+
+Alessandro Pasotti 	2017-03-04
+
+    QgsSettings: pass all keys through the sanitizer (and lower())
+
+Chris Mayo 	2017-02-28
+
+    Add option to select building Georeferencer plugin
+
+    If selected require GSL to be installed
+
+Matthias Kuhn 	2017-03-04
+
+    [travis] Colorize test results
+
+Matthias Kuhn 	2017-03-04
+
+    [travis] Remove leftover env variables
+
+Matthias Kuhn 	2017-03-04
+
+    Make test database setup more quiet
+
+Matthias Kuhn 	2017-03-04
+
+    [travis] Parallelize dependency bootstrapping
+
+Matthias Kuhn 	2017-03-04
+
+    [travis] Add pip cache
+
+Matthias Kuhn 	2017-03-04
+
+    Cache travis dependencies
+
+matteo 	2017-03-03
+
+    [processing] gdal nearest neighbor test
+
+matteo 	2017-03-03
+
+    [processing] gdal moving average interpolation test
+
+matteo 	2017-03-03
+
+    [processing] gdal data metrics interpolation test
+
+matteo 	2017-03-03
+
+    [processing] gdal IDW test
+
+matteo 	2017-03-03
+
+    [processing] gdal raster calculator test
+
+matteo 	2017-03-03
+
+    [processing] gdal proximity test
+
+Matthias Kuhn 	2017-03-04
+
+    Disable flaky test_wms_getprint_srs test
+
+    See https://travis-ci.org/qgis/QGIS/jobs/207575956 for an example of a
+    failing test.
+
+Mathieu Pellerin 	2017-03-04
+
+    enforce lower-case qgssettings keys (#4218)
+
+    * enforce lower-case qgssettings keys
+
+    * add QgsSettings::remove() unit test
+
+Nyall Dawson 	2017-03-04
+
+    Add a unit test for destroying canvas while a job is canceling
+
+Juergen E. Fischer 	2017-03-03
+
+    header cleanups
+
+Juergen E. Fischer 	2017-03-03
+
+    pep8/pyflakes3 cleanups
+
+Juergen E. Fischer 	2017-03-03
+
+    More QgsSettings updates:
+    * revives WMS
+    * QgsSettings::clear() added
+    * section added to QgsSettings::contains()
+    * type parameter added to sip binding of QgsSettings.value()
+    * TODO: customization & evis
+
+Juergen E. Fischer 	2017-03-03
+
+    remove python version checks
+
+Juergen E. Fischer 	2017-03-03
+
+    oracle provider: fix build
+
+Juergen E. Fischer 	2017-03-03
+
+    exclude test data from astyling
+
+Juergen E. Fischer 	2017-03-03
+
+    scripts/astyle-all.sh run
+
+Tom Kralidis 	2017-03-03
+
+    update data.gov CSW endpoint to https
+
+Denis Rouzaud 	2017-03-03
+
+    astyle on left overs
+
+Denis Rouzaud 	2017-03-03
+
+    run astyle on src/*
+
+Denis Rouzaud 	2017-03-03
+
+    run astyle on src/app
+
+Denis Rouzaud 	2017-03-03
+
+    run astyle on src/gui
+
+Denis Rouzaud 	2017-03-03
+
+    run astyle on src/core
+
+Denis Rouzaud 	2017-02-25
+
+    astyle options
+
+Denis Rouzaud 	2017-02-25
+
+    update astyle to 2.06
+
+Merge: fb409b59a9 51da47d61c
+volaya 	2017-03-03
+
+    Merge pull request #4206 from volaya/fix_processing_provider_update
+
+    [processing] fixed update of toolbox after editing script providers
+
+Juergen E. Fischer 	2017-03-02
+
+    oracle provider: use prepared statements with parameters (implements #16251)
+
+Juergen E. Fischer 	2017-03-02
+
+    vector layer ctor: avoid 'Data source is invalid' warning when invoked with defaults
+
+Juergen E. Fischer 	2017-03-02
+
+    canvas: don't try to connect to null layers
+
+Juergen E. Fischer 	2017-03-02
+
+    fix exporting bookmarks
+
+Juergen E. Fischer 	2017-03-02
+
+    oracle provider: update qocispatial driver for/from Qt5
+    * handling of private data
+    * rely on implicit byte array sharing instead of using data pointers
+    * sync with qoci
+
+Nyall Dawson 	2017-03-03
+
+    Indentation
+
+volaya 	2017-03-02
+
+    [processing] fixed update of toolbox after editing script providers
+
+volaya 	2017-03-02
+
+    [provided] avoid removing toolbox entries when there are no recent algs
+
+volaya 	2017-03-02
+
+    [processing] fixed reading script description for R algorithms
+
+    fixes #16227
+
+Matthias Kuhn 	2017-02-28
+
+    Fix map themes in combination w/ offline editing
+
+Merge: e045b369cf ee4681df10
+Alexander Bruy 	2017-03-02
+
+    Merge pull request #4088 from volaya/grass_tempfile_fix
+
+    [processing] fixed grass tempfiles
+
+Alessandro Pasotti 	2017-03-02
+
+    Fixes segfault in QgsSettings::clear, fixes #16233
+
+    mGlobalSettings is read-only and can be a nullptr
+    that QSettings instance should never be modified
+    nor assumed to be instanciated
+
+Merge: e9dee40067 6243f78782
+Nyall Dawson 	2017-03-02
+
+    Merge pull request #4204 from nyalldawson/cancel_without_blocking
+
+    Don't block when canceling canvas render jobs
+
+Nyall Dawson 	2017-03-02
+
+    Add a unit test for map render job cancelation
+
+Nyall Dawson 	2017-03-02
+
+    Don't block when canceling canvas render jobs
+
+    In some cases canceling render jobs can take a long time. Eg when
+    using database layers over a sloooooow connection, canceling a job
+    can be blocked by minutes while waiting for the first batch of feature
+    fetching to finish. (Since eg postgres features are fetched in batches
+    of 2000 with no opportunity to abort mid-way through this).
+
+    This meant that while the first render allows the GUI to remain
+    responsive, any subsequent render operations which occured before
+    the first render completes locks up the whole ui until the first
+    render can finish cancellation.
+
+    With this change, the render cancelation happens with blocking.
+    It means that you can pan and zoom around a map over of slow
+    connection without any ui locks.
+
+Nyall Dawson 	2017-03-02
+
+    Fix build, warnings on windows
+
+Sandro Mani 	2017-03-01
+
+    Fix build against recent sip:
+
+    qgsfiledownloader.sip:33:0:
+    src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()'
+
+Merge: e54cb2e805 1e7b8ef49b
+Nyall Dawson 	2017-03-02
+
+    Merge pull request #4185 from DelazJ/linepattern
+
+    Line pattern fill symbol: Use Spacing instead of Distance
+
+Blottiere Paul 	2017-03-01
+
+    add tests on pattern matching
+
+Nyall Dawson 	2017-03-01
+
+    Fix failing test + build warning
+
+Merge: aeaa5fc687 081cf96c3f
+Nyall Dawson 	2017-03-01
+
+    Merge pull request #4198 from nyalldawson/canvas_api
+
+    Remove support for disabling OTF reprojection
+
+Nyall Dawson 	2017-03-01
+
+    Indentation
+
+Merge: 26557c9a88 dbca0304d9
+Alexander Bruy 	2017-03-01
+
+    Merge pull request #4200 from alexbruy/processing-reorganize-gdal
+
+    [processing] rename algorithm groups in GDAL provider
+
+Matthias Kuhn 	2017-02-27
+
+    [FEATURE] Add new expression function `env`
+
+Nyall Dawson 	2017-03-01
+
+    Fix crash when concurrent rendering operations occur
+
+Nyall Dawson 	2017-03-01
+
+    [FEATURE] Allow setting project CRS to "no projection"
+
+    This replaces the older "OTF off" setting. If a project has
+    no projection set, then the following things happen:
+
+    - no reprojection is done while rendering - features are just
+    drawn using their raw coordinates
+    - ellipsoid, distance and area units, and coordinate display
+    are locked out.
+    - all measurements are done in unknown map units, and no conversion
+    is possible.
+
+    As well as addressing the use cases in which users disabled
+    OTF reprojection, this setting may also be useful for users
+    who use QGIS to create "non-earth" maps, such as RPG or fantasy
+    maps, or for microscopic analysis, or some other local reference
+    system not related to earth based projections.
+
+Nyall Dawson 	2017-03-01
+
+    Allow a "no projection" option in projection selection widget/dialog
+
+    This option allows users to select "no projection", when
+    there's no suitable projection to select...
+
+Nyall Dawson 	2017-03-01
+
+    An invalid CRS should return unknown units for mapUnits
+
+Nyall Dawson 	2017-03-01
+
+    Make QgsCoordinateReferenceSystem less noisy with debug messages
+
+Nyall Dawson 	2017-03-01
+
+    More efficient use of strings
+
+Nyall Dawson 	2017-02-28
+
+    Correctly use QgsMapCanvas::freeze instead of setRenderFlag
+
+Nyall Dawson 	2017-02-28
+
+    Improve documentation for QgsMapCanvas and remove false QGIS 3 TODO
+
+Nyall Dawson 	2017-02-28
+
+    Remove support for setting map units in QgsMapSettings, QgsMapCanvas and QgsDxfExport
+
+    In a post-OTF-disabled world these are no longer required. The
+    map units are dictated by the map units for the destination
+    CRS.
+
+    It's dangerous to separate these two properties as setting
+    the incorrect map units for a given CRS will result in
+    incorrect scale calculations.
+
+Nyall Dawson 	2017-02-28
+
+    Fix failing tests
+
+Nyall Dawson 	2017-02-28
+
+    Remove support for disabling OTF reprojection
+
+    Because
+    - OTF reprojection is mature and stable
+    - Should be no cost when not required - transforms are shortcut
+    when not required
+    - Reduces code complexity
+    - Canvas OTF support was being incorrectly used as a flag for
+    whether measurements should be made in ellipsoidal mode. Instead
+    the project's ellipsoid setting should be checked for this.
+    - Should simplify behavior for new users
+
+Matthias Kuhn 	2017-02-28
+
+    Fix mac build
+
+Matthias Kuhn 	2017-02-28
+
+    Add QgsUnitTypes::toAbbreviatedString
+
+Larry Shaffer 	2017-02-21
+
+    Update QScintilla CMake find module to handle new lib name in 2.10
+
+    [ci skip]
+
+Merge: 79580be502 98d323edb1
+rldhont 	2017-02-28
+
+    Merge pull request #4157 from rldhont/server-wcs-configparser
+
+    [Server] Remove QgsWCSProjectParser
+
+Harrissou Sant-anna 	2017-02-22
+
+    Locked item can't be moved with arrow keys
+
+Matthias Kuhn 	2017-02-28
+
+    Add icons to some shortcut configurations
+
+Denis Rouzaud 	2017-02-27
+
+    [needs-docs] keyboard shortcut to toggle snapping (S)
+
+    Pressing the key "S" will toggle snapping. This helps to quickly
+    enable/disable snapping while digitizing.
+
+Alexander Bruy 	2017-02-28
+
+    [processing] rename algorithm groups in GDAL provider
+
+Nyall Dawson 	2017-02-28
+
+    Fix some use of canvas CRS when project CRS should be used
+
+Nyall Dawson 	2017-02-28
+
+    Flip QgsMapCanvas connects to new style
+
+    Also remove unneeded duplicate signal
+
+Merge: 887ca6f95a 5312965e61
+Nyall Dawson 	2017-02-28
+
+    Merge pull request #4193 from nyalldawson/proj_widget_api
+
+    Rename projection selection widgets and clean up API
+
+Nyall Dawson 	2017-02-27
+
+    Rename projection selection widgets and cleanup API
+
+    The current names for QgsProjectionSelector and
+    QgsGenericProjectionSelector are confusing
+
+rldhont 	2017-02-17
+
+    [Server] Remove QgsWCSProjectParser
+
+Merge: 0eccc89ada f56e6b9d3e
+Hugo Mercier 	2017-02-27
+
+    Merge pull request #4195 from mhugo/fix_vlayers
+
+    [virtual layers] Fix encoding issues in dbmanager
+
+Denis Rouzaud 	2017-02-27
+
+    remove extra file
+
+Denis Rouzaud 	2017-02-27
+
+    find edited files locally
+
+Hugo Mercier 	2017-02-27
+
+    [dbmanager] Fix encoding issues with virtual layers
+
+Hugo Mercier 	2017-02-27
+
+    [virtual layer] Fix geometry column detection for types with Z
+
+Merge: 171dfe1130 ab9bdd4339
+Nyall Dawson 	2017-02-27
+
+    Merge pull request #4188 from luzpaz/small-doxy-typo
+
+    [skip ci] small doxygen typo
+
+Martin Dobias 	2017-02-26
+
+    Retry WMS/WMTS/XYZ requests only on timeout (fixes #15854)
+
+    It does not really make sense to retry if server returns 404 Not Found or similar...
+
+Kunda 	2017-02-25
+
+    [skip ci] small doxygen typo
+
+Denis Rouzaud 	2017-02-23
+
+    remove autopep8 and flip from main build (no more qgisstyle)
+
+Martin Dobias 	2017-02-25
+
+    [FEATURE] Config dialog for XYZ tile connections + editing of existing ones
+
+    As a bonus, also made zmin/zmax configuration visible to users
+
+Matthias Kuhn 	2017-02-24
+
+    Add new constructor QgsPoint( const QgsPointV2& )
+
+Matthias Kuhn 	2017-02-24
+
+    Move QgsVector to its own header
+
+Matthias Kuhn 	2017-02-24
+
+    Build astyle
+
+Juergen E. Fischer 	2017-02-24
+
+    message log viewer: window isn't closeable and last tab has to stay
+    (fixes #16220)
+
+Matthias Kuhn 	2017-02-24
+
+    Indentation fix
+
+Andreas Sturmlechner 	2017-02-19
+
+    Don't link to QtWebKit when it's disabled
+
+Matthias Kuhn 	2017-02-23
+
+    Do not re-lookup already present CRSes
+
+Matthias Kuhn 	2017-02-23
+
+    Remove protected API from non-inherited class
+
+Matthias Kuhn 	2017-02-22
+
+    Default integers to QLongLong in expressions
+
+Harrissou Sant-anna 	2017-02-24
+
+    Restructure Marker line symbol layer dialog (#4183)
+
+Martin Dobias 	2017-02-24
+
+    A bit of const-correctness and new convenience methods for edit tools
+
+Harrissou Sant-anna 	2017-02-23
+
+    Use Spacing instead of Distance
+
+Juergen E. Fischer 	2017-02-23
+
+    fix text format widget connection
+
+Juergen E. Fischer 	2017-02-23
+
+    run t2t
+
+Denis Rouzaud 	2017-02-23
+
+    run spelling and indentation test on another Travis build (#4180)
+
+Matthias Kuhn 	2017-02-23
+
+    Add missing include
+
+Matthias Kuhn 	2017-02-22
+
+    Fix relations in offline editing
+
+Matthias Kuhn 	2017-02-23
+
+    Code cleanup
+
+Juergen E. Fischer 	2017-02-23
+
+    translation string fixes
+
+Juergen E. Fischer 	2017-02-23
+
+    osgeo4w: remove pyc on install and uninstall
+
+Bernhard Ströbl 	2017-02-23
+
+    [processing] replace alg Eliminate with new alg EliminateSelection
+
+    * [processing] replace alg Eliminate with new alg EliminateSelection
+
+    * Deprecate Eliminate algorithm
+
+    * Expose new EliminateSelection algorithm in GUI
+
+    * Rename ouput layer
+
+    * Reflect algorithm changes in help
+
+    * Remove superfluous init method
+
+    * Simplify code, thanks Nyall
+
+    * Improve transfer of selection to processLayer
+
+    * Remove deprecated Eliminate algorithm
+
+    * Remove test for Eliminate
+
+    * Fix indentation
+
+Nyall Dawson 	2017-02-23
+
+    Always reread recent projects before saving new ones
+
+    Avoids loss of recent projects from menu if working in multiple
+    QGIS sessions concurrently
+
+Merge: b95eb07882 b29a8d0c26
+Nyall Dawson 	2017-02-23
+
+    Merge pull request #4178 from nyalldawson/fix_16217
+
+    Accept any whitespace delimiters when parsing WKT (fix #16217)
+
+Nyall Dawson 	2017-02-23
+
+    Accept any whitespace delimiters when parsing WKT (fix #16217)
+
+Nyall Dawson 	2017-02-23
+
+    [composer] Friendlier error messages when exports fail
+
+    Make it clear that this is likely because the destination
+    file is open in another application
+
+Nyall Dawson 	2017-02-23
+
+    Prompt before replacing an existing map theme
+
+    It's too easy to accidently (and unrecoverably) erase an
+    entire theme using the replace preset menu
+
+Nyall Dawson 	2017-02-23
+
+    Flip some connects to new style
+
+Blottiere Paul 	2017-02-08
+
+    [Server] add unit tests for sql injection
+
+Denis Rouzaud 	2017-02-22
+
+    make spell test a proper test and not a standalone script
+
+Marco Hugentobler 	2017-02-22
+
+    Add unit test if circular arc segmentation produces the same vertices in both directions
+
+Mathieu Pellerin 	2017-02-22
+
+    [FEATURE] epoch() expression function (#4151)
+
+    This commit adds an epoch() function to the expression engine which
+    returns the interval in milliseconds between the unix epoch and a
+    given date value.
+
+Alessandro Pasotti 	2017-02-22
+
+    [feature] QgsSettings QGIS QSettings replacement (#4160)
+
+    * [feature] QgsSettings QGIS QSettings replacement
+
+    This is the new QgsSettings class that adds an (optional)
+    Global Settings additional ini file where a system administrator
+    can store default values for the settings and provide
+    pre-configuration.
+
+    If an ini file named qgis_global_settings.ini is found
+    in the pkgDataPath directory it is automatically loaded,
+    this path can be overriden by a command line argument
+    ( --globalsettingsfile path ) and through an environment
+    variable (QGIS_GLOBAL_SETTINGS_FILE).
+
+Merge: 013397b0f8 47683fca4f
+Nyall Dawson 	2017-02-22
+
+    Merge pull request #4174 from nyalldawson/stroke
+
+    [needs-docs] Rename Outline and Border -> Stroke
+
+Nyall Dawson 	2017-02-22
+
+    [needs-docs] Rename Outline and Border -> Stroke
+
+    This change is being driven by:
+
+    - need for consistent terminology in the api. Currently there's
+    a confusing mix of border/outline used
+    - need for consistent terminology in the gui - we have a mix
+    of "border"/"outline"/"pen"
+    - bringing QGIS into line with the standard terminology used
+    in other graphic editing programs
+
+Merge: 3b016466a2 0f16eb869c
+Even Rouault 	2017-02-22
+
+    Merge pull request #4170 from rouault/gdal_mask
+
+    [GDAL provider] Expose GDAL mask band as a pseudo alpha band.
+
+Nyall Dawson 	2017-02-22
+
+    Add missing "interval" and "curvepoint" modes to data defined line marker (fix #16212)
+
+Merge: 18b9f407ce 4790035efa
+Nyall Dawson 	2017-02-22
+
+    Merge pull request #4147 from nyalldawson/exp_feature
+
+    Optimise expression context storage/retrieval of features
+
+Nyall Dawson 	2017-02-22
+
+    Add method to remove feature from a QgsExpressionContextScope
+
+Merge: bde4ff99c4 74abd5bbf6
+Nyall Dawson 	2017-02-22
+
+    Merge pull request #4154 from nyalldawson/coloring
+
+    [FEATURE][processing] New algorithm for topological coloring of polygons
+
+Nyall Dawson 	2017-02-15
+
+    Optimise expression context storage/retrieval of features
+
+    Shaves ~10% rendering time off a 1 million point layer
+
+Nyall Dawson 	2017-02-22
+
+    [FEATURE][processing] Topological coloring can have a minimum
+    distance between features assigned the same color set
+
+Nyall Dawson 	2017-02-17
+
+    Add method to assign colors in order to maximize the distance between
+    features assigned to same color
+
+    This is the most cartographically pleasing color arrangement in my
+    opinion as it creates a nicely distributed set of colors.
+
+Nyall Dawson 	2017-02-17
+
+    Make algorithm recursive
+
+    When a new color is required, repeat the color assignment process.
+    This is the fastest part of the algorithm, so there's no noticable
+    speed drop. Repeating the whole coloring ensures that newly added
+    colors are properly balanced with respect to other colors, and avoids
+    the situation where one of the last features to be colored requires
+    a whole new class to be created, which will only have a few possible
+    members.
+
+    Overall this results in more balanced color assignment.
+
+Nyall Dawson 	2017-02-17
+
+    Add balance by area mode
+
+    This mode attempts to assign colors in such a way that the total
+    area of features assigned to each color class is balanced. It helps
+    avoid larger features causing a single color class to appear more
+    dominant on a colored map.
+
+Nyall Dawson 	2017-02-17
+
+    Allow specifying minimum number of colors for coloring map
+
+Nyall Dawson 	2017-02-17
+
+    [FEATURE][processing] New algorithm for topological coloring of polygons
+
+    This ports to old (pre 2.0!!) topocolor plugin to processing. It's based
+    off my beta 2.x fork (never publicly released) which implemented
+    a bunch of improvements to the algorithm allowing for minimal number
+    of required colors and also balanced counts of features assigned
+    each individual color.
+
+    ** Pretty sure this plugin was highlighted in Victor's presentation
+    about plugins-which-shouldn't-be-plugins-and-should-be-processing-algs
+    instead. It's a prime example of a plugin where the amount of code
+    required for gui+setup exceeded the actual "guts" of the plugin by
+    a huge factor, and which is much more useful when it can be
+    integrated into a larger processing model.
+
+Merge: 66888fecc2 7da28d19b1
+Nyall Dawson 	2017-02-22
+
+    Merge pull request #4169 from nyalldawson/props_gui
+
+    [FEATURE] Interactive curve editing for property overrides
+
+Nyall Dawson 	2017-02-22
+
+    Harmonize plot appearance between gradient editor and curve editor
+
+Nyall Dawson 	2017-02-22
+
+    Expand curve editor if enabled
+
+Nyall Dawson 	2017-02-22
+
+    [FEATURE] Show a histogram for values behind curve editor
+    in property assistant
+
+    Makes it easier to set suitable curves. Populated in the
+    background for a nice reponsive widget!
+
+Nyall Dawson 	2017-02-22
+
+    Allow value fetching and histogram calculation to be canceled
+
+Nyall Dawson 	2017-02-21
+
+    [FEATURE] Interactive curve editing for property overrides
+
+    This adds a new interactive "curve" to the assistant widgets.
+    It allows you to fine tune exactly how input values get
+    mapped to output sizes/colors/etc.
+
+    Think GIMP or Photoshop curves, but for your data...
+
+Nyall Dawson 	2017-02-21
+
+    Restrict curve points to 0-1 range
+
+Nyall Dawson 	2017-02-21
+
+    Allow QgsPropertyTransformers to have an associated QgsCurveTransform
+
+Nyall Dawson 	2017-02-16
+
+    Implement a photoshop-esque curve transformer
+
+    Handles scaling of input values to output values by using
+    a curve created from smoothly joining a number of set
+    control points.
+
+    This assists in creation of curve type transforms, typically
+    seen in raster image editing software (eg the curves dialog
+    in GIMP or Photoshop). Transforms are created by passing a
+    number of set control points through which the transform curve
+    must pass. The curve is guaranteed to exactly pass through
+    these control points. Between control points the curve is
+    smoothly interpolated so that no disjoint sections or
+    "corners" are present.
+
+Even Rouault 	2017-02-21
+
+    [GDAL provider] Expose GDAL mask band as a pseudo alpha band.
+
+    Some TIFF formulations, for example RGB TIFF with JPEG YCbCr compression, cannot
+    include a regular alpha band and instead use the GDAL mask band mechanism. Such
+    mask bands were ignored up to now. Now expose them as if they were alpha bands.
+
+Merge: 6ce8d9480b 7812d4fb17
+Nyall Dawson 	2017-02-22
+
+    Merge pull request #4165 from 3nids/removethe
+
+    remove the-prefix from source code
+
+Denis Rouzaud 	2017-02-21
+
+    remove the-prefix from source code
+
+    this might result in variables having the same name as some methods
+
+Denis Rouzaud 	2017-02-21
+
+    using a single list to exclude tests on travis
+
+Merge: 293e1ee01c 975b5890b9
+mhugent 	2017-02-21
+
+    Merge pull request #4167 from mhugent/direction_neutral_segmentation
+
+    Segmentize circular strings the same way in both directions
+
+Denis Rouzaud 	2017-02-21
+
+    fix print spell check progress on Travis to avoid timeouts (followup 6cc58f3869a7f0642a78ee8f379e0b7862292c0b)
+
+Juergen E. Fischer 	2017-02-21
+
+    use constant for raster iterator default (followup baa5d90, f924578)
+
+Juergen E. Fischer 	2017-02-21
+
+    fix link warning
+
+Juergen E. Fischer 	2017-02-21
+
+    spell check: fix travis condition
+
+Juergen E. Fischer 	2017-02-21
+
+    wms: initialize mStepWidth/mStepHeight w/o parseUri (fixes xyz layer
+    after baa5d90)
+
+Denis Rouzaud 	2017-02-21
+
+    print spell check progress on Travis to avoid timeouts
+
+Juergen E. Fischer 	2017-02-21
+
+    osgeo4w: include .vars in nightly
+
+Merge: 3da44134d8 e20ed4bfdb
+Marco Hugentobler 	2017-02-21
+
+    Merge branch 'master' of https://github.com/qgis/QGIS into direction_neutral_segmentation
+
+Nyall Dawson 	2017-02-21
+
+    Add missing doc
+
+Merge: 4c92689d14 db5dd85408
+Nyall Dawson 	2017-02-21
+
+    Merge pull request #4163 from nyalldawson/clang_tidyu
+
+    Fix a bunch of suggestions from clang-tidy
+
+Juergen E. Fischer 	2017-02-21
+
+    fix windows build
+
+Juergen E. Fischer 	2017-02-21
+
+    [FEATURE] allow to configure maximum request size for WMS requests (fixes #16182)
+    Hardwired setting was 2000, which is still default.
+
+Juergen E. Fischer 	2017-02-20
+
+    release.pl: allow tagging branches as ltr on point releases and
+    bypass pre-commit hooks
+
+    (cherry picked from commit 84cc3778d5dd1e9b25a9641a7de1c7f33b601029)
+
+Merge: 3dcb0c44c0 c4970aafd2
+Larry Shaffer 	2017-02-20
+
+    Merge pull request #4090 from dakcarto/find-qgis-cmake
+
+    FindQGIS.cmake updates
+
+Nyall Dawson 	2017-02-21
+
+    Fix some more clang-tidy suggestions
+
+Nyall Dawson 	2017-02-21
+
+    Fix build error and warnings
+
+Nyall Dawson 	2017-02-20
+
+    Fix a bunch of suggestions from clang-tidy
+
+    And add a new CLANG_TIDY_EXE cmake option. If this is set to the
+    path to the clang_tidy executable then a bunch of clang-tidy
+    checks will be run during compilation.
+
+Alexandre Neto 	2017-02-20
+
+    Adds tooltips to the add/remove variable buttons
+
+Nyall Dawson 	2017-02-21
+
+    Remove temporary group box from diagram properties (fix #16206)
+
+Nyall Dawson 	2017-02-21
+
+    Remove invalid tooltip from arrow symbol widget (fix #16208)
+
+Nyall Dawson 	2017-02-21
+
+    Remove use of deprecated auto_ptr
+
+Nyall Dawson 	2017-02-21
+
+    Fix build warning
+
+Marco Hugentobler 	2017-02-20
+
+    Segmentize circular strings the same way in both directions, avoiding problems with tiny gaps/overlaps
+
+Juergen E. Fischer 	2017-02-20
+
+    fix 74df875
+
+Juergen E. Fischer 	2017-02-20
+
+    debian packing: add plotly dependency
+
+Juergen E. Fischer 	2017-02-20
+
+    fix warnings
+
+Juergen E. Fischer 	2017-02-20
+
+    remove standalone browser
+
+Denis Rouzaud 	2017-02-06
+
+    Ensure that QgsApplication members are usable even when no
+    QgsApplication instance is available
+
+    Fixes crash when using custom widgets with Qt Designer
+
+Denis Rouzaud 	2017-02-20
+
+    add search capability to project properties dialog
+
+Denis Rouzaud 	2017-02-20
+
+    [fix #16193] allow minimization of left panel in option dialogs
+
+Matthias Kuhn 	2017-02-20
+
+    Add missing sip bindings
+
+Matthias Kuhn 	2017-02-20
+
+    Remove Q_INVOKABLE in sipdiff
+
+Matthias Kuhn 	2017-02-17
+
+    Expose QgsRelation to QML
+
+    API changes for consistency:
+      - setRelationName has been renamed to QgsRelation::setName
+      - setRelationId has been renamed to QgsRelation::setId
+
+Matthias Kuhn 	2017-02-17
+
+    Expose relationManager to QML
+
+Matthias Kuhn 	2017-02-16
+
+    Remove "the"-prefix from method signatures
+
+Juergen E. Fischer 	2017-02-20
+
+    fix bde9b46
+
+Juergen E. Fischer 	2017-02-20
+
+    osgeo4w: add qt plugin path for tests
+
+Juergen E. Fischer 	2017-02-19
+
+    osgeo4w: also provider wrapper for browser (followup 801184a)
+
+Juergen E. Fischer 	2017-02-19
+
+    processing: improve saga detection on windows
+
+Juergen E. Fischer 	2017-02-19
+
+    nsis: hide details by default
+
+Nathan Woodrow 	2017-02-20
+
+    [FEATURE] Add support for Windows jump lists (#4161)
+
+Juergen E. Fischer 	2017-02-18
+
+    osgeo4w: add a minimal exe wrapper to initialize the enviroment and load
+    qgis_app.dll (inspired by Nathan's PR #4156)
+
+    On install each shortcut/configuration gets a own copy of the (small)
+    exe.  That exe is started through the batch file that originally was
+    used to start the app at runtime. Argument --exit will cause the wrapper
+    to just dump the environment to an .env file next to the copy of the
+    .exe.  The created shortcuts now point at those .exes instead of the
+    batch files.
+
+    At runtime the .exes source their .env file to get a working environment
+    to run QGIS (ie. qgis_app.dll).  This for example allows the application
+    to be pinned to the taskbar and avoids the of necessity of batch files
+    at runtime to start the app.
+
+Merge: 9ed189e2c6 97f6a52515
+Nyall Dawson 	2017-02-19
+
+    Merge pull request #4126 from nyalldawson/task_progress
+
+    [win] Show task manager progress in windows task bar
+
+Juergen E. Fischer 	2017-02-18
+
+    fix windows build
+
+Nyall Dawson 	2017-02-18
+
+    Ensure all pointer variables are initialized to nullptr
+
+DelazJ 	2016-11-26
+
+    split long tooltip in multiline
+
+Merge: f66b0baf16 04475f8e32
+mhugent 	2017-02-17
+
+    Merge pull request #4130 from mhugent/wfs_gml_from_geometry
+
+    Take wfs gml directly from geometry
+
+Merge: 5c211eac39 e77ccba1ae
+Alexander Bruy 	2017-02-17
+
+    Merge pull request #4144 from alexbruy/processing-results-viewer
+
+    [processing] convert results viewer to dock
+
+Nyall Dawson 	2017-02-17
+
+    Use a pan tool in the browser canvas preview
+
+Nyall Dawson 	2017-02-17
+
+    Fix labeling unit types incorrectly restored as map units from old projects
+
+Marco Hugentobler 	2017-02-16
+
+    Adapt gml3 unit tests to use  instead of 
+
+Merge: 441f6e6e6e 2dfb6dcc5d
+Matthias Kuhn 	2017-02-16
+
+    Merge pull request #4049 from boundlessgeo/master-SldRotationFix
+
+    Tests and fix to read sld:Rotation when does not have ogc sub tags
+
+Merge: aa862810e3 3a12f2a0b6
+Alexander Bruy 	2017-02-16
+
+    Merge pull request #4120 from arnaud-morvan/processing_fix_boolean_wrapper
+
+    [processing] fix boolean widget wrapper in batch dialog
+
+Merge: f587ae5f30 f2ac88ba25
+Alexander Bruy 	2017-02-16
+
+    Merge pull request #4146 from jdugge/master
+
+    [processing] gdal translate fixes
+
+Merge: 35d9b83aa5 1d68c164e2
+Alexander Bruy 	2017-02-16
+
+    Merge pull request #4150 from alexbruy/processing-graphs
+
+    [processing] improve graphs
+
+Alexander Bruy 	2017-02-16
+
+    remove old code
+
+Alexander Bruy 	2017-02-16
+
+    move results viewer icon to QGIS icons directory
+
+Alexander Bruy 	2017-02-10
+
+    [processing] convert results viewer to dock
+
+Merge: 7f1ff08ebb a124fbfe62
+Matthias Kuhn 	2017-02-16
+
+    Merge pull request #4138 from nyalldawson/touch
+
+    Rework map touch tool
+
+Merge: cdb35d6288 f999970899
+volaya 	2017-02-16
+
+    Merge pull request #4116 from ghtmtt/r_prov
+
+    [processing] small fix for R provider
+
+Merge: 7d2d6e89ba 337d1889b8
+volaya 	2017-02-16
+
+    Merge pull request #4119 from arnaud-morvan/processing_postgis_wrappers
+
+    [processing] Add PostGIS widget wrappers
+
+Nyall Dawson 	2017-02-16
+
+    Better feedback and responsiveness when saving large shapefile layers
+
+Martin Dobias 	2017-02-16
+
+    Use a path resolver class instead of QgsProject::instance() in map layers
+
+    A new class QgsPathResolver is introduced for conversion between absolute
+    and relative paths when reading/writing XML.
+
+    Cleaned up code in layer definition file support (.qlr) to better handle
+    relative/absolute path conversion.
+
+Nyall Dawson 	2017-02-16
+
+    Make saving shapefiles slightly faster
+
+Alexander Bruy 	2017-02-15
+
+    don't open output file automatically
+
+Alexander Bruy 	2017-02-15
+
+    remove old imports
+
+Alexander Bruy 	2017-02-15
+
+    [processing] update polar plot
+
+Alexander Bruy 	2017-02-15
+
+    [processing] update mean and std.dev plot
+
+Alexander Bruy 	2017-02-15
+
+    [processing] update raster layer histogram
+
+Alexander Bruy 	2017-02-10
+
+    [processing] update vector layer histogram
+
+Alexander Bruy 	2017-02-10
+
+    [processing] update vector layer scatterplot
+
+Alexander Bruy 	2017-02-10
+
+    [processing] update bar plot
+
+Matteo Ghetta 	2017-02-15
+
+    [processing] test poly_from_extent (#4149)
+
+Tudor Bărăscu 	2017-02-15
+
+    show shortcuts in advanced digitizing tools tooltips + fix small typo (#4102)
+
+    * show shortcuts in tooltips of advanced digitizing panel
+
+    + fix small typo
+
+    * advanced digitizing tooltips styling
+
+Juergen E. Fischer 	2017-02-15
+
+    update some documentation references to QgsDataDefinedButton/QgsDataDefinedSymbolDialog
+
+Juergen E. Fischer 	2017-02-15
+
+    QgsFeature: add pythonic notes to api doc and add QgsFeature.attribute(fieldIdx) binding
+
+Nyall Dawson 	2017-02-15
+
+    Update indentation
+
+lbartoletti 	2017-02-11
+
+    Move midpoint to QgsGeometryUtils
+
+lbartoletti 	2017-02-10
+
+    Add some utils functions for QgsPointV2 (distance3D, midpoint)
+
+jdugge 	2017-02-14
+
+    Update translate.py
+
+Juernjakob Dugge 	2017-02-14
+
+    GDAL translate algorithm: Default value for EXPAND, make PROJWIN optional
+
+Alexander Bruy 	2017-02-14
+
+    add anchor to help URL only if necessary
+
+Juergen E. Fischer 	2017-02-14
+
+    api_break.dox: QgsMapLayerRegistry was removed
+
+Matthias Kuhn 	2017-02-14
+
+    Fix building with -DWITH_BINDINGS=OFF
+
+Merge: 349687164a 5028cc76ac
+Alexander Bruy 	2017-02-14
+
+    Merge pull request #4127 from arnaud-morvan/processing_fix_postgis_dberror
+
+    [processing] Fix infinite recursion in DbError.__str__
+
+Harrissou Sant-anna 	2017-02-10
+
+    Add new help links
+
+Harrissou Sant-anna 	2017-02-10
+
+    Fix links to official documentation
+
+    Avoid use of relative (hence temporary) hyperlinks
+
+Alexander Bruy 	2017-02-14
+
+    [processing] improve SAGA version check. Fix getCopy() method
+
+Matthias Kuhn 	2017-02-14
+
+    Install qgsmaplayerref.h
+
+Marco Hugentobler 	2017-02-14
+
+    Enable gml3 curve output for compoundcurve and some fixes for gml3 output in general
+
+Merge: edb30a2191 efb0c4028f
+Nyall Dawson 	2017-02-14
+
+    Merge pull request #4141 from nyalldawson/props_gui
+
+    Properties framework part 2 - gui component
+
+Nyall Dawson 	2017-02-14
+
+    Add missing diagram is obstacle property button
+
+Nyall Dawson 	2017-02-14
+
+    Fix diagram property buttons do not hide with associated widget (fix #16164)
+
+Nyall Dawson 	2017-02-14
+
+    Fix diagram legend symbol selector missing associated layer (refs #16164)
+
+Nyall Dawson 	2017-02-14
+
+    Fix potential crash in color assistant, set a default ramp
+
+Nyall Dawson 	2017-02-14
+
+    Fix diagram distance property override button association (refs #16164)
+
+Nyall Dawson 	2017-02-14
+
+    Tweak dialogs
+
+Nyall Dawson 	2017-02-14
+
+    Fix failing equality operator test
+
+Nyall Dawson 	2017-02-14
+
+    Update sip bindings
+
+Nyall Dawson 	2017-02-13
+
+    Fix doxygen warnings and failing test
+
+Nyall Dawson 	2017-02-13
+
+    Replace QgsDataDefinedButton custom widget with QgsPropertyOverrideButton widget
+
+Nyall Dawson 	2017-02-13
+
+    Tweaked numeric assistant for rotation properties
+
+Nyall Dawson 	2017-02-13
+
+    [FEATURE] Add a generic numeric transform assistant for easy scaling of values
+
+Nyall Dawson 	2017-02-13
+
+    Some visual tweaks to property assistant widget
+
+Nyall Dawson 	2017-02-13
+
+    Add some spacing around preview icons in property assistant
+
+Nyall Dawson 	2017-02-13
+
+    Use a vertical layout for property assistant when in dock mode
+
+Nyall Dawson 	2017-02-13
+
+    [FEATURE] Interactive color assistant for data defined colors
+
+Nyall Dawson 	2017-02-13
+
+    Remove deprecated QgsScaleExpression and QgsSizeScaleWidget classes
+
+Nyall Dawson 	2017-02-13
+
+    Remove last use of QgsSizeScaleWidget
+
+Nyall Dawson 	2017-02-13
+
+    Show a default symbol in assistant legend preview if none set
+
+Nyall Dawson 	2017-02-13
+
+    Use width assistant for arrow width/start width
+
+Nyall Dawson 	2017-02-13
+
+    Fix clearing data defined outline width
+
+Nyall Dawson 	2017-02-13
+
+    Show size assistant for stroke width properties
+
+Nyall Dawson 	2017-02-13
+
+    If transformer set on property, allow transformer to handle null values
+
+Nyall Dawson 	2017-02-13
+
+    Restore legend preview in symbol size assistant
+
+Nyall Dawson 	2017-02-13
+
+    Fix legend display of scaled sizes for QgsSingleSymbolRenderer
+
+Nyall Dawson 	2017-02-09
+
+    Small tweaks to property override button behavior
+
+Nyall Dawson 	2017-02-09
+
+    Fix build
+
+Nyall Dawson 	2017-02-09
+
+    Remove QgsDataDefined
+
+    Now completely replaced by QgsProperty and the properties framework
+
+Nyall Dawson 	2017-02-09
+
+    Remove QgsDataDefinedButton
+
+    Now completely replaced by QgsPropertyOverrideButton
+
+Nyall Dawson 	2017-02-09
+
+    Deprecate QgsScaleExpression
+
+    Has now been completely replaced by QgsSizeScalePropertyTransformer
+
+Nyall Dawson 	2017-02-09
+
+    Adds methods which attempt to parse expression based properties
+    as property transformers
+
+Nyall Dawson 	2017-02-02
+
+    Add basic shell for widget
+
+Merge: bd46b7809b 35bb5c611f
+Nyall Dawson 	2017-02-14
+
+    Merge pull request #4134 from nyalldawson/save_task
+
+    [FEATURE] Background saving of vector layers
+
+Merge: e025b58bfc e740890cf6
+Nyall Dawson 	2017-02-14
+
+    Merge pull request #4140 from nyalldawson/label_order
+
+    Add non-stable API call to render a layer above the labels in the map canvas
+
+Nyall Dawson 	2017-02-13
+
+    Add custom layer property to render a layer over labels in the map canvas
+
+    Usage:
+
+    layer.setCustomProperty('rendering/renderAboveLabels', True)
+
+    This is exposed only as a layer custom property since it's really just
+    exposing some private internals of the rendering map composition. It's
+    not supported outside of canvas, and only works when parallel rendering
+    with render cache is enabled.
+
+    It's not exposed anywhere in GUI for this same reason. Consider it a
+    hidden API call until someone implements proper handling of mixed
+    layer/label stacking order.
+
+Nyall Dawson 	2017-02-14
+
+    Fix build warning
+
+Nyall Dawson 	2017-02-10
+
+    [FEATURE][processing] Algorithm to find an unknown layer's projection
+
+    If you have a layer with an unknown CRS, this algorithm gives a list
+    of possible candidate CRSes which the layer could be in.
+
+    It allows users to set the area (and corresponding CRS) which they know
+    the layer should be located near. The algorithm then tests every CRS
+    in the database to see what candidate CRSes would cause the layer
+    to be located at that preset area.
+
+    It's much faster than it sounds!! (just a couple of seconds)
+
+    Sponsored by SMEC/Surbana Jurong
+
+Nyall Dawson 	2017-02-10
+
+    [processing] Allow extent parameters to avoid matching layer CRS check
+
+Nyall Dawson 	2017-02-10
+
+    Add method to retrieve all valid srs ids from CRS databases
+
+Merge: 787c84667d 38f87a624e
+Nyall Dawson 	2017-02-14
+
+    Merge pull request #4111 from nyalldawson/refresh_layers
+
+    [FEATURE] Allow layers to be automatically refreshed at a specified interval
+
+arnaud.morvan@camptocamp.com 	2017-02-10
+
+    [processing] Fix infinite recursion in DbError.__str__
+
+Harrissou Sant-anna 	2017-02-03
+
+    Set a name to the raster resampling dialog
+
+Merge: 92091c536b 332961f748
+Vincent Mora 	2017-02-13
+
+    Merge pull request #3905 from nextgis/25d_enhancement
+
+    [FEATURE] QGIS setting to choose default Z value
+
+Nyall Dawson 	2017-02-13
+
+    Flip task manager to use weak layer pointers instead of layer ids
+
+Nyall Dawson 	2017-02-12
+
+    Allow QgsVectorFileWriter to report approx progress
+
+Nyall Dawson 	2017-02-12
+
+    QgsFeedback can handle report progress reports
+
+Nyall Dawson 	2017-02-12
+
+    Add unit tests for QgsVectorFileWriterTask
+
+Nyall Dawson 	2017-02-12
+
+    Register vector file writer task as dependent on layer
+
+Nyall Dawson 	2017-02-11
+
+    [FEATURE] Background saving of vector layers
+
+    Switches the vector layer save operation to a background task
+    using the task manager framework. Allows layers to saved without
+    blocking the interface.
+
+Nyall Dawson 	2017-02-06
+
+    [FEATURE] Allow layers to be automatically refreshed at a specified interval
+
+    This allows users to set a timer interval in layer properties
+    for individual layers. These layers will be automatically refreshed
+    at a matching interval.
+
+    Canvas updates are deferred in order to avoid refreshing multiple
+    times if more than one layer has an auto update interval set.
+
+    Additionally, logic has been added to skip any auto redraws of
+    the canvas while the canvas is already being redrawn. This avoids
+    issues caused by setting a layer auto refresh to a shorter time than
+    is required to redraw the canvas.
+
+Nyall Dawson 	2017-02-07
+
+    Add unit tests for deferred layer refresh
+
+    QgsMapCanvas test is rather messy, but I can't find anyway to
+    avoid showing the canvas in order to get a predictable result
+
+Nyall Dawson 	2017-02-06
+
+    Allow QgsMapLayer::triggerRepaint to defer updates
+
+    By calling QgsMapLayer::triggerRepaint( true ) any cached
+    version of the layer will be invalidated, but a map canvas
+    refresh won't automatically be triggered
+
+    This allows invalidation of cached images while deferring
+    the actual map update until the next canvas refresh.
+
+Juergen E. Fischer 	2017-02-12
+
+    dxf export: consider layer styles (fixes #15946)
+
+Marco Hugentobler 	2017-02-12
+
+    Change gml test output (use xmlns instead of gml: which both is valid)
+
+Juergen E. Fischer 	2017-02-12
+
+    oracle provider: followup 9ceb6c67
+
+Nyall Dawson 	2017-02-12
+
+    Add API break notes for QgsMapToolTouch
+
+Mathieu Pellerin 	2017-02-12
+
+    [ui] adjust size and spacing of welcome screen title (#4139)
+
+Nyall Dawson 	2017-02-12
+
+    Rework map touch tool
+
+    Qt5 allows runtime detection of touch devices. This commit reworks
+    the current touch map tool by pulling its behavior into the normal
+    pan tool when a touch device is detected.
+
+    It avoids the need for a seperate map tool for touch interaction,
+    and also avoids having this tool always appear on the Windows
+    builds (regardless of the presence of a touch device)
+
+Mathieu Pellerin 	2017-02-12
+
+    [ui] fix touch icon rendering a black background (#4137)
+
+Nyall Dawson 	2017-02-12
+
+    Expose QgsGeometryUtils to python bindings
+
+    Has some handy functions and there's no strong reason anymore
+    why these shouldn't be part of stable API
+
+Merge: 4cba47814b d47d31d13c
+Nyall Dawson 	2017-02-12
+
+    Merge pull request #4109 from nyalldawson/db
+
+    Rename "Db"/"DB" in API to "Database"
+
+Denis Rouzaud 	2017-02-08
+
+    use stylesheet rather than palette
+
+    add doxygen comments and fix sip bindings
+
+Denis Rouzaud 	2016-05-30
+
+    allow to search and higlight options
+
+Denis Rouzaud 	2017-02-06
+
+    option to show a search icon in QgsFilterLineEdit
+
+Juergen E. Fischer 	2017-02-11
+
+    processing: fix warning
+
+Juergen E. Fischer 	2017-02-11
+
+    debian packaging: add missing dependency (fixes #16179)
+
+Juergen E. Fischer 	2017-02-11
+
+    update_ts: avoid excessive number of arguments (for windows)
+
+Juergen E. Fischer 	2017-02-10
+
+    osgeo4w: fix quoting in batch files
+
+Alexander Bruy 	2017-02-10
+
+    fix doxygen comment
+
+Merge: e8be083daa 26448364b4
+Alexander Bruy 	2017-02-10
+
+    Merge pull request #4132 from NaturalGIS/fix_ogr_postgis_mandatory_params
+
+    [processing] make ogr postgis parameters mandatory where needed
+
+Alexander Bruy 	2017-02-10
+
+    [processing] remove unused parameters from test (followup 5ade65aa16)
+
+Alexander Bruy 	2017-02-10
+
+    [processing] more fixes to GdalAlgorithm dialog (followup 47d46bb8c3)
+
+Merge: cc1adc528e 5ade65aa16
+Alexander Bruy 	2017-02-10
+
+    Merge pull request #4131 from NaturalGIS/fix_ogr_offset_lines
+
+    [processing] remove useless options form ogr offset line tool
+
+Giovanni Manghi 	2017-02-10
+
+    make ogr postgis parameters mandatory where needed
+
+Alexander Bruy 	2017-02-10
+
+    [processing] handle case when default CRS is None and parameter is not optional
+
+Alexander Bruy 	2017-02-10
+
+    [processing] fix initialization of GdalAlgorithmDialog
+
+Giovanni Manghi 	2017-02-10
+
+    remove usless options form ogr offset line tool
+
+Merge: 2b12a1574d f07154b613
+Alexander Bruy 	2017-02-10
+
+    Merge pull request #4128 from arnaud-morvan/processing_geometrypredicate_wrapper
+
+    [processing] Remove obsolete GeometryPredicateWidgetWrapper
+
+Marco Hugentobler 	2017-02-10
+
+    Take wfs gml directly from geometry
+
+Merge: b96477731b 0e7d428739
+rldhont 	2017-02-10
+
+    Merge pull request #4129 from rldhont/server-geojson-precision
+
+    [Server] The RFC 7946 GeoJSON specification recommends limiting coordinate precision to 6
+
+rldhont 	2017-02-10
+
+    [Server] The RFC 7946 GeoJSON specification recommends limiting coordinate precision to 6
+
+Juergen E. Fischer 	2017-02-09
+
+    osgeo4w: fix designer path
+
+arnaud.morvan@camptocamp.com 	2017-02-10
+
+    [processing] Remove obsolete GeometryPredicateWidgetWrapper
+
+arnaud.morvan@camptocamp.com 	2017-02-10
+
+    [processing] Use ExpressionWidgetWrapperMixin in StringWidgetWrapper
+
+arnaud.morvan@camptocamp.com 	2017-02-09
+
+    [processing] Fix ModelerParametersDialog when len(widget) == 0
+
+arnaud.morvan@camptocamp.com 	2017-02-09
+
+    [processing] Add postgis widget wrappers
+
+Alexander Bruy 	2017-02-10
+
+    [processing] always load ExecuteSQL algorithm
+
+Merge: a46afcad8a 732b501db1
+Alexander Bruy 	2017-02-10
+
+    Merge pull request #4118 from alexbruy/processing-saga-ltr
+
+    [processing] support only SAGA LTR
+
+Nyall Dawson 	2017-02-10
+
+    [win] Show task manager progress in windows task bar
+
+    Hooks the task manager progress reports up to a Windows taskbar button
+    progress bar. This lets you easily see when a background task has
+    finished running!
+
+Nyall Dawson 	2017-02-10
+
+    Fix signature difference between header and cpp
+
+Nyall Dawson 	2017-02-10
+
+    Drop deprecated win api call for handling win 9.x compatibility
+
+    There's no way QGIS 3.0 is windows 98 compatible!!
+
+Merge: 2c188b2b0f f66646c483
+Alexander Bruy 	2017-02-09
+
+    Merge pull request #4122 from alexbruy/processing-gdal2
+
+    [processing] remove code with  GDAL 1.x API calls
+
+arnaud.morvan@camptocamp.com 	2017-02-09
+
+    [processing] Add class ExpressionEnabledWidgetWrapper
+
+arnaud.morvan@camptocamp.com 	2017-02-09
+
+    [processing] Add possibility to pass additionnal parameters to widget wrapper
+
+Alexander Bruy 	2017-02-09
+
+    [processing] fix helper function from system module (fix #16128)
+
+Alexander Bruy 	2017-02-09
+
+    [processing] remove code with  GDAL 1.x API as QGIS 3 will require GDAL 2.x
+
+Merge: 452641bee3 552b6b8937
+Alexander Bruy 	2017-02-09
+
+    Merge branch 'symbolselector_fix'
+
+Alexander Bruy 	2017-02-09
+
+    set margins in code instead of .ui file
+
+Alexandre Neto 	2017-01-18
+
+    Remove margins from symbol selector
+
+Alexandre Neto 	2017-01-18
+
+    Make single symbol render properties widget similar to other
+    - removed extra scroll
+    - added small margin
+
+Merge: 71f1d28b6e af519bad5f
+Alexander Bruy 	2017-02-09
+
+    Merge pull request #4115 from alexbruy/vector-style-layout
+
+    reduce margings main layout in the Style tab of the vector properties dialog
+
+Merge: 7ff894ac83 c43b04ffff
+Alexander Bruy 	2017-02-09
+
+    Merge pull request #4121 from arnaud-morvan/processing_fix_modeler_open_file
+
+    [processing] fix modeler and batch file dialog
+
+arnaud.morvan@camptocamp.com 	2017-02-08
+
+    Fix Boolean widget wrapper in batch dialog
+
+arnaud.morvan@camptocamp.com 	2017-02-09
+
+    Fix modeler and batch file dialog
+
+Alexander Bruy 	2017-02-08
+
+    [processing] support only SAGA LTR
+
+Juergen E. Fischer 	2017-02-09
+
+    include private headers in install
+
+Juergen E. Fischer 	2017-02-09
+
+    processing: fix escaping
+
+Denis Rouzaud 	2017-02-08
+
+    sipdiff: remove forward declarations and option to keep comments
+
+Merge: 2f68d1a7c3 566c058db8
+Alexander Bruy 	2017-02-08
+
+    Merge pull request #4117 from NaturalGIS/fix_qgis3_ogrtools
+
+    [processing] fix some ogr tools in master
+
+Giovanni Manghi 	2017-02-08
+
+    fix some ogr tools in master
+
+Luigi Pirelli 	2017-02-08
+
+    Moved check single value in expressionFromOgcFilter
+
+matteo 	2017-02-08
+
+    [processing] small fix to R provider
+
+Nyall Dawson 	2017-02-08
+
+    Fix build warning when debug mode disabled
+
+Nyall Dawson 	2017-02-08
+
+    Fix leak in expressions
+
+Nyall Dawson 	2017-02-08
+
+    Fix some leaks in test suite
+
+Nyall Dawson 	2017-02-08
+
+    Fix leak in QgsSymbolLegendNode
+
+Nyall Dawson 	2017-02-08
+
+    Fix leak of label engine when start called on single render job multiple times
+
+Nyall Dawson 	2017-02-08
+
+    Fix some leaks in geometry test suite
+
+Nyall Dawson 	2017-02-08
+
+    Fix leak in QgsGeometry make valid
+
+    Also swap some GEOS methods to managed versions
+
+Nyall Dawson 	2017-02-08
+
+    Fix jump on uninitialized value
+
+Nyall Dawson 	2017-02-08
+
+    Fix memory leak in geometry snapper
+
+Nyall Dawson 	2017-02-08
+
+    Fix leaks, multiple connects in QgsFileDownloader
+
+Nyall Dawson 	2017-02-08
+
+    Fix large memory leak in vector file writer (fix #16003)
+
+    Every written geometry is being leaked... ouch!
+
+Nyall Dawson 	2017-02-08
+
+    Fix expressions leaking internal data
+
+Nyall Dawson 	2017-02-08
+
+    Fix leak in QgsCoordinateReferenceSystem
+
+Nyall Dawson 	2017-02-08
+
+    [composer] Fix use of uninitialized member (unlikely to occur outside of tests)
+
+Larry Shaffer 	2017-02-07
+
+    Fix macOS bundling of server service libraries
+
+Denis Rouzaud 	2017-02-07
+
+    sipdiff also remove nullptr
+
+Denis Rouzaud 	2017-02-07
+
+    sipdiff remove function definitions and Q_OBJECT/ENUM/PROPERTY
+
+Alexander Bruy 	2017-02-07
+
+    [processing] don't quote geometry column name (fix #16122)
+
+Alexander Bruy 	2017-02-07
+
+    [processing] fix R syntax highlighting (fix #16082)
+
+Alexander Bruy 	2017-02-07
+
+    [processing] warn user about incorrect input data when calculating
+    mean coordinates using weight field (fix #9084)
+
+Alexander Bruy 	2017-02-07
+
+    strip trailing slash from the help path if necessary (fix #16156)
+
+Alexander Bruy 	2017-02-07
+
+    reduce margings main layout in the Style tab of the vector properties
+    dialog
+
+Denis Rouzaud 	2017-02-07
+
+    make sipdiff available on mac
+
+Juergen E. Fischer 	2017-02-07
+
+    fix directory detection in check_spelling.sh when pre-commit hook is linked to prepare-commit.sh
+
+Juergen E. Fischer 	2017-02-07
+
+    osgeo4w: fix running of python tests
+
+Juergen E. Fischer 	2017-02-07
+
+    update scripts/update_ts.sh to use pylupdate5
+
+Merge: 11f083623c d3003de61c
+Alexander Bruy 	2017-02-07
+
+    Merge branch 'processing-makevalid'
+
+Alexander Bruy 	2017-02-07
+
+    [processing] add tags and short help
+
+Alexander Bruy 	2017-02-02
+
+    explicitly convert geometry to multi
+
+Alexander Bruy 	2017-02-01
+
+    [processing] Fix Geometry algorithm always produces multi-geometry
+    Also added code to handle GeometryCollections
+
+Alexander Bruy 	2017-01-27
+
+    test for Processing "fix geometries" algorithm
+
+Alexander Bruy 	2017-02-01
+
+    [FEATURE][processing] algorithm to fix invalid geometries using native
+    makeValid() implementation
+
+Harrissou Sant-anna 	2017-02-07
+
+    UI update to the raster & vector save as dialogs (#4083)
+
+nirvn 	2017-02-07
+
+    fix crash caused by use of std::sort and sort function to conforming to strict weak ordering
+
+Denis Rouzaud 	2017-02-07
+
+    add missing QScintilla includes
+
+Mathieu Pellerin 	2017-02-07
+
+    fix QgsProject::readNumEntry() validity check (#4112)
+
+Merge: 61523c8124 a08137f101
+Nyall Dawson 	2017-02-07
+
+    Merge pull request #4110 from nyalldawson/label_cache
+
+    [FEATURE] Cache labeling result to avoid unnecessary redraws when refreshing canvas
+
+Nyall Dawson 	2017-02-07
+
+    Update label test masks following sort algorithm change
+
+    std::sort is returning a slightly different sort order when
+    label z order (or label cost) is equal
+
+    Given that the order in these cases is effectively arbitrary
+    I've updated the test masks to accept either order.
+
+Merge: f3d53b8de9 bfd18c4a6d
+Nyall Dawson 	2017-02-07
+
+    Merge pull request #4107 from DelazJ/tips
+
+    Update Startup tips
+
+Nyall Dawson 	2017-02-07
+
+    Fix inefficient code
+
+Nyall Dawson 	2017-02-07
+
+    Fix failing test
+
+Nyall Dawson 	2017-02-07
+
+    Replace deprecated qSort/qStableSort/qGreater/qLess with std:: algs
+
+Nyall Dawson 	2017-02-07
+
+    Replace deprecated qSwap with std::swap
+
+Nyall Dawson 	2017-02-07
+
+    Swap QSharedPointer to std::shared_ptr
+
+Nyall Dawson 	2017-02-07
+
+    Swap QScopedPointer to std::unique_ptr
+
+    Why?
+    - no benefits to QScopedPointer over std::unique_ptr
+    - unlike QScopedPointer, std::unique_ptr has no overhead
+    over regular pointers
+    - using standard language features makes it more likely that
+    compilers can optimise this use and static analysers can
+    correctly handle code using unique_ptrs
+    - QScopedPointer has an (IMO) uncertain future (given that
+    Qt is dropping features which have become part of the c++
+    standard). Better to port now before wider use of QScopedPointer
+    in the codebase!
+
+Nyall Dawson 	2017-02-07
+
+    Add unit tests for map renderer label caching
+
+Nyall Dawson 	2017-02-06
+
+    Fix crash
+
+Nyall Dawson 	2017-02-06
+
+    Don't cache labeling if blend modes are used
+
+    The flattening of the label results to an image blocks
+    blend modes applying correctly to underlying layers
+
+Nyall Dawson 	2017-02-06
+
+    Reuse existing labeling results if cached labels were redrawn
+
+Nyall Dawson 	2017-02-01
+
+    [FEATURE] Cache labeling result to avoid unnecessary redraws
+    when refreshing canvas
+
+    This change allows the labeling results to be cached to an image
+    following a map render. If the cached label result image can be
+    reused for the next render then it will be, avoiding the need
+    to redraw all layers participating in the labeling problem and
+    resolving the labeling solution.
+
+    Basically this means that canvas refreshes as a result of changes
+    to any NON-LABELED layer are much faster. (Changing a layer which
+    is part of the labeling solution still requires all labeled
+    layers to be completely redrawn)
+
+Juergen E. Fischer 	2017-02-06
+
+    * update INSTALL
+    * osgeo4w: search qt5 first and use pyrcc5.bat
+
+Nyall Dawson 	2017-02-06
+
+    Rename "Db"/"DB" in API to "Database"
+
+    Motivations:
+    - consistency - we generally use expanded names, and this also
+    matches Qt API which uses Database instead of Db
+    - avoids unpredictable capitalization throughout API (mix of "Db"
+    and "DB")
+
+Harrissou Sant-anna 	2017-02-04
+
+    Update Startup tips
+
+Denis Rouzaud 	2017-02-06
+
+    compile custom widgets on Travis
+
+Denis Rouzaud 	2017-02-06
+
+    [custom widgets] add missing file widget
+
+alisovenko 	2017-02-06
+
+    Add test for map edit tool. Test the correctness of getting default z.
+
+Denis Rouzaud 	2017-02-06
+
+    spelling fix
+
+Mathieu Pellerin 	2017-02-06
+
+    [ui] make layer rendering collapsed by default (#4108)
+
+Nyall Dawson 	2017-02-06
+
+    Clear cached map renders if dependent layer is removed
+
+Nyall Dawson 	2017-02-06
+
+    Add method to retrieve dependent layers for map renderer cached images
+
+Juergen E. Fischer 	2017-02-06
+
+    osgeo4w: packaging fixes
+
+Nyall Dawson 	2017-02-06
+
+    Fix logically dead code identified by Coverity
+
+Nyall Dawson 	2017-02-06
+
+    Fix indentation
+
+Nyall Dawson 	2017-02-06
+
+    Fix a lot of memory leaks when fetching provider libraries
+
+Merge: 6ca2cc18ef 20eea32952
+Nyall Dawson 	2017-02-06
+
+    Merge pull request #4064 from jgrocha/delete-style-from-db-provider-postgis
+
+    Delete style from db provider postgis
+
+Nyall Dawson 	2017-02-06
+
+    Fix label font size unit from 2.x projects incorrectly restored (fix #16143)
+
+Jorge Gustavo Rocha 	2017-02-05
+
+    Replaced QLibrary * with more safer QScopedPointer
+
+Jorge Gustavo Rocha 	2017-02-05
+
+    Updated Qt connections to the new style qgis/QGIS-Enhancement-Proposals#77
+    Changed isDeleteStyleFromDBSupported to isDeleteStyleFromDbSupported
+
+Nyall Dawson 	2017-02-05
+
+    Allow conversion of QgsPropertyTransfomers to expressions (when possible)
+
+Nyall Dawson 	2017-02-05
+
+    Fix reading project properties fails if any child element
+    has a tag named "properties"
+
+Nyall Dawson 	2017-02-05
+
+    Refactor internals of QgsPropertyOverrideButton
+
+Nyall Dawson 	2017-02-05
+
+    Follow up 4a3871, fix broken data defined properties
+
+    (definitions are often accessed before a QgsSymboLayer/etc
+    is constructed)
+
+Nyall Dawson 	2017-02-05
+
+    Tweak property definitions for size type properties
+
+Juergen E. Fischer 	2017-02-04
+
+    revert more of ab0345
+
+Juergen E. Fischer 	2017-02-04
+
+    translation string fixes
+
+Juergen E. Fischer 	2017-02-04
+
+    fix initial crash on windows
+
+Nyall Dawson 	2017-02-04
+
+    Partially revert ab0345
+
+Merge: 11150dde3e 615745fc8b
+Nyall Dawson 	2017-02-04
+
+    Merge pull request #4095 from nyalldawson/label_engine_layers
+
+    Use weak layer pointers in labeling engine
+
+Nyall Dawson 	2017-02-04
+
+    Add additional curvepolygon with compound curve to reference geometry tests
+
+Nyall Dawson 	2017-02-03
+
+    [processing] Rename 'export/add geometry columns' alg + add tags for discoverability
+
+Merge: a1bdb8fc7d 7619cba438
+alisovenko 	2017-02-03
+
+    Merged master fixed conflict.
+
+Merge: 74c65c8e74 2a77ba76f4
+rldhont 	2017-02-03
+
+    Merge pull request #4100 from rldhont/bugfix_dbmanager_detect_query_layer
+
+    [BUGFIX][DB Manager] Detect query layer like providers do
+
+matteo 	2017-02-02
+
+    [processing] qgis voronoi test
+
+alisovenko 	2017-02-03
+
+    Fix return value warning in defaultZValue function.
+
+Nyall Dawson 	2017-02-03
+
+    Fix/avoid Coverity null pointer dereference warnings
+
+Nyall Dawson 	2017-02-03
+
+    Fix Coverity uninitialized member warnings
+
+rldhont 	2017-02-02
+
+    [BUGFIX][DB Manager] Detect query layer like providers do
+
+    In postgres provider, a query layer is detected as a table starting with `(` and ending with `)`.
+
+Merge: 95091d9342 f94f0d753c
+Alexander Bruy 	2017-02-02
+
+    Merge pull request #4076 from volaya/remove_processing_providers
+
+    [FEATURE][processing] removed otb and lidartools providers
+
+    Tagged as feature to not forget mention this in changelog and docs
+
+Merge: 02b7a551d5 d681e9cb06
+Alexander Bruy 	2017-02-02
+
+    Merge pull request #4062 from alexbruy/raster-provider
+
+    Use native QGIS raster API instead of GDAL API in zonal statistics
+
+Denis Rouzaud 	2017-02-02
+
+    do not run spell check on Travis if no files were edited (only deleted)
+
+Merge: fbcf62499d 1eb836c6e8
+Nyall Dawson 	2017-02-02
+
+    Merge pull request #4016 from nyalldawson/template_error
+
+    Avoid startup error when project template folder does not exist
+
+Denis Rouzaud 	2017-01-30
+
+    remove old designer folder
+
+    I guess that the intention is parlty solved by the custom widgets
+
+Merge: c30eb9e084 83a24884f9
+Nyall Dawson 	2017-02-02
+
+    Merge pull request #4081 from ghtmtt/rename_sql
+
+    [processing] rename execute sql output
+
+Merge: e6b38aff4f afe85ca39e
+Borys Jurgiel 	2017-02-01
+
+    Merge pull request #4097 from alexbruy/plugin-from-zip
+
+    [FEATURE] allow installing plugins from local ZIP packages
+
+Alexander Bruy 	2017-02-01
+
+    [FEATURE] allow installing plugins from local ZIP packages
+
+    This may be useful for users who have plugin packages, so they
+    don't need to extract them manually.
+
+Alessandro Pasotti 	2017-02-01
+
+    Revert "Merge pull request #4087 from elpaso/resource-sharing-plugin"
+
+    This reverts commit db0fa9ff5b7421262304ce6fb5f6e832db1baa57, reversing
+    changes made to aaa8c4e492d135210cd989b5e3131384954badd1.
+
+Nyall Dawson 	2017-02-01
+
+    Use weak layer pointers in labeling engine instead of layer ids
+
+Nyall Dawson 	2017-02-01
+
+    Add typedefs for QPointer QgsMapLayers
+
+Merge: 11170ab263 c1eedc79b9
+Nyall Dawson 	2017-02-01
+
+    Merge pull request #4072 from SrNetoChan/color_expression_help
+
+    Extends color expression help to mention HEX color notation
+
+Alexandre Neto 	2017-02-01
+
+    Updates saving passwords warning messages (#4052)
+
+    to suggest using a authentication method
+
+Alexandre Neto 	2017-01-27
+
+    Extends color expression help to mention HEX color notation
+    and color name Which seems to be possible to use as well
+
+Denis Rouzaud 	2017-02-01
+
+    Remove web view widget in favor of attachment (external resource) (#4074)
+
+    * remove photo widget config
+    * remove webview widget
+    * Remove mention of duplicate widgets
+    * Update api break
+    * migrate web view widgets to attachments
+
+Merge: 54d8d11592 c84ea71bb8
+Nyall Dawson 	2017-02-01
+
+    Merge pull request #4091 from nyalldawson/render_cache
+
+    QgsMapRendererCache improvements
+
+Nyall Dawson 	2017-02-01
+
+    Use list of map layers instead of map layer ids
+
+Nyall Dawson 	2017-02-01
+
+    Add quick hasCacheImage method to QgsMapRendererCache
+
+Nyall Dawson 	2017-02-01
+
+    QgsMapRendererCache can have multiple dependent layers for a cache image
+
+    In some cases the render result for a layer may depend on more than
+    one layer.
+
+    This changes QgsMapRendererCache to use "cache keys" instead of layer ids
+    to identify images within the cache. When setting an image inside the
+    cache, a new list parameter is used to specify all layers on which
+    that image depends.
+
+Nyall Dawson 	2017-02-01
+
+    Add unit tests for QgsMapRendererCache
+
+    Also flip to new style connects
+
+Nyall Dawson 	2017-02-01
+
+    Make QgsMapRendererCache protected members private
+
+    This class isn't designed to be subclassed
+
+Merge: 9fcc130838 75506867aa
+Nyall Dawson 	2017-02-01
+
+    Merge pull request #4092 from nyalldawson/maprenderer_api
+
+    Make protected members in QgsMapRendererJob not part of public API
+
+Nyall Dawson 	2017-02-01
+
+    Make protected members in QgsMapRendererJob not part of public API
+
+    QgsMapRendererJob and subclasses are not designed to be subclassed
+    outside of core QGIS code. Marking them private API allows us to
+    change them after API is frozen again.
+
+Nyall Dawson 	2017-02-01
+
+    Catch transform errors for annotations
+
+Nyall Dawson 	2017-02-01
+
+    Add method to determine layers participating in a label engine
+
+Nyall Dawson 	2017-02-01
+
+    Remove some yellow squiggly lines from QtCreator
+
+Larry Shaffer 	2017-01-31
+
+    FindQGIS.cmake add build directory path support (macOS only)
+
+    This should be expanded to include Linux and Win support
+
+Larry Shaffer 	2017-01-31
+
+    FindQGIS.cmake document OSGeo4W variables
+
+Larry Shaffer 	2017-01-31
+
+    FindQGIS.cmake fix macOS search paths; add support for bundles
+
+    - Setting QGIS_MAC_PATH to any QGIS.app/Contents allows for building
+    against any bundled install
+    - Prioritizes QGIS_MAC_PATH bundles over Homebrew default in /usr/local
+    - Remove hardcoded QGIS_MAC_PATH for specific distribution
+
+Larry Shaffer 	2017-01-31
+
+    FindQGIS.cmake fix plugins search path; add QGIS_UI_INCLUDE_DIR
+
+Larry Shaffer 	2017-01-31
+
+    FindQGIS.cmake search OSGeo4W qgis locations relative to install
+
+    With newer OSGeo4W installs, the dev may have multiple ‘qgis’ installs
+    and this allows defining the subdirectory prior to searching
+
+Nyall Dawson 	2017-01-31
+
+    Flip some connects to new style
+
+Juergen E. Fischer 	2017-01-26
+
+    postgres providers: null values in array don't need curly braces
+
+Juergen E. Fischer 	2017-01-25
+
+    fix 'Set Group WMS data' layer action connection
+
+Merge: aaa8c4e492 b370c8b815
+Alessandro Pasotti 	2017-01-31
+
+    Merge pull request #4087 from elpaso/resource-sharing-plugin
+
+    Added QGIS Resource Sharing Plugin and deps
+
+Alessandro Pasotti 	2017-01-31
+
+    Do not spell-check some test QMLs
+
+Alessandro Pasotti 	2017-01-31
+
+    Resource Sharing Plugin Tests Added
+
+Jorge Gustavo Rocha 	2017-01-31
+
+    revert the SIP deleteStyleFromDatabase signature
+
+Alessandro Pasotti 	2017-01-31
+
+    Fixed spell check
+
+volaya 	2017-01-31
+
+    [processing] fixed grass tempfiles
+
+    fixes #16128
+
+Jorge Gustavo Rocha 	2017-01-31
+
+    improve deleteStyleFromDatabase signature
+
+Alessandro Pasotti 	2017-01-31
+
+    Added QGIS Resource Sharing Plugin and deps
+
+Jorge Gustavo Rocha 	2017-01-31
+
+    improve deleteStyleFromDatabase signature
+
+Nyall Dawson 	2017-01-31
+
+    [FEATURE] Expose GEOS Voronoi and delaunay triangulation to QgsGeometry
+
+Denis Rouzaud 	2017-01-31
+
+    fix version in added note
+
+Nyall Dawson 	2017-01-31
+
+    Add missing annotation api break docs, fix sip binding
+
+Martin Dobias 	2017-01-30
+
+    Add unit tests for joins - removal of joined layer, resolve refs
+
+Martin Dobias 	2017-01-30
+
+    Rework vector joins so they do not use QgsProject::instance()
+
+    The basic idea is to split reading of XML definition and resolution of layer IDs into layers.
+
+    Also includes some cleanups in QgsProject and improvements in QgsVectorLayerJoinInfo.
+
+Nyall Dawson 	2017-01-31
+
+    Add missing docs
+
+Nyall Dawson 	2017-01-31
+
+    Add unit test for processing polygonize algorithm
+
+Nyall Dawson 	2017-01-31
+
+    Remove dependance on shapely library
+
+    Port processing polygonize alg to use native QgsGeometry methods
+
+Nyall Dawson 	2017-01-31
+
+    [FEATURE] Expose GEOS polygonize operation via QgsGeometry
+
+Jorge Gustavo Rocha 	2017-01-30
+
+    make deleteStyleFromDatabase consistent with other vectorlayer's methods
+
+Merge: c4165e4eeb afcb75af51
+Nyall Dawson 	2017-01-31
+
+    Merge pull request #4078 from nyalldawson/geom_api
+
+    API changes to QgsGeometry::isEmpty()/isNull()
+
+Nyall Dawson 	2017-01-31
+
+    Remove QgsGeometry::isGeosEmpty
+
+    Use the faster native QgsGeometry::isEmpty instead
+
+Nyall Dawson 	2017-01-31
+
+    Replace deprecated assertRegexpMatches call
+
+Nyall Dawson 	2017-01-30
+
+    Implement QgsGeometry::isEmpty()
+
+    Faster than QgsGeometry::isGeosEmpty() because it avoids the
+    conversion to GEOS geometries and just uses the QgsAbstractGeometry
+    subclasses directly.
+
+    Also implements faster isEmpty() overrides for specific
+    QgsAbstractGeometry subclasses.
+
+Jorge Gustavo Rocha 	2017-01-30
+
+    Simple tests for style load, insert and remove from Postgis provider
+
+matteo 	2017-01-30
+
+    [processing] rename execute sql output
+
+LOMENEDE Jean-Daniel 	2017-01-30
+
+    [processing]Execute Sql : fix Input2.. InputN parameters
+
+Denis Rouzaud 	2017-01-30
+
+    Revert "remove GDAL_VERSION_MAJOR >= 2 test"
+
+    This reverts commit cb2e81e44623d4bde8ac9ff6d1a8ded4aef1dd9b.
+
+Denis Rouzaud 	2017-01-30
+
+    remove GDAL_VERSION_MAJOR >= 2 test
+
+Nyall Dawson 	2017-01-30
+
+    Rename QgsGeometry::isEmpty to isNull
+
+    Differentiates missing geometries from empty geometries (eg
+    empty geometry collections)
+
+Merge: 50319b1cf0 1f7758a9f9
+Nyall Dawson 	2017-01-30
+
+    Merge pull request #4073 from nyalldawson/annotations
+
+    Refactor annotations, add new annotation features + some other exciting stuff
+
+volaya 	2017-01-30
+
+    [processing] removed otb tests
+
+Merge: 8ba609e516 83f4c99eb2
+rldhont 	2017-01-30
+
+    Merge pull request #3942 from pblottiere/qgsserverprojectutils
+
+    [server] WIP clean project parsing by using QgsProject
+
+Blottiere Paul 	2017-01-30
+
+    add SERVER_EXPORT for each function in namespace
+
+Nyall Dawson 	2017-01-30
+
+    Fix failing tests
+
+Nyall Dawson 	2017-01-30
+
+    Fix rendering offset lines as part of fill symbol (outside of
+    vector layers) results in broken offset outline
+
+volaya 	2017-01-30
+
+    [processing] removed providers imports
+
+volaya 	2017-01-30
+
+    fixed Cmake file
+
+Nyall Dawson 	2017-01-30
+
+    Also registry HTML annotation when webkit isn't available
+
+Nyall Dawson 	2017-01-30
+
+    Fix failing tests
+
+volaya 	2017-01-30
+
+    [processing] removed otb and lidartools providers
+
+Nyall Dawson 	2017-01-30
+
+    Add missing docs
+
+Nyall Dawson 	2017-01-30
+
+    Add missing python bindings
+
+Nyall Dawson 	2017-01-30
+
+    Correctly handle offset when calculating symbol bleed
+
+Blottiere Paul 	2017-01-30
+
+    replace class by namespace
+
+Blottiere Paul 	2017-01-27
+
+    clean-up
+
+Blottiere Paul 	2017-01-27
+
+    rename Store into Registry
+
+Blottiere Paul 	2017-01-27
+
+    fix indent
+
+Blottiere Paul 	2017-01-27
+
+    fix indent
+
+Blottiere Paul 	2017-01-27
+
+    fix typo
+
+Blottiere Paul 	2017-01-26
+
+    fix typo
+
+Blottiere Paul 	2016-12-26
+
+    [server] WIP clean project parsing by using QgsProject
+
+Nyall Dawson 	2017-01-30
+
+    Ensure newly added annotations are selected
+
+Nyall Dawson 	2017-01-30
+
+    Ensure annotation frame is closed before rendering
+
+Nyall Dawson 	2017-01-30
+
+    Correctly add newly created annotations to manager
+
+Nyall Dawson 	2017-01-30
+
+    [composer] Remove last link between composer maps and canvas
+
+    you WILL respect the separation between core and gui!!\!
+
+Nyall Dawson 	2017-01-30
+
+    [composer] Draw annotations over grids/overviews (fix #10300)
+
+Nyall Dawson 	2017-01-30
+
+    [composer] Respect linked layer visibility when drawing annotation items (fix #10172)
+
+Nyall Dawson 	2017-01-30
+
+    Annotations are now handled at a project level
+
+    This commit implements a new QgsAnnotationManager class, which
+    handles storage, writing and retrieval of annotations.
+
+    QgsProject has an annotationManager() attached to it. Map canvases
+    sync their visible QgsMapCanvasAnnotationItems to the annotations
+    contained within the project's annotation manager.
+
+    This moves all management, storage and retrieval of annotations
+    up to core and out of app/canvas.
+
+Nyall Dawson 	2017-01-30
+
+    QgsSymbol estimateMaxBleed methods now use a QgsRenderContext
+    argument to correctly calculate bleed for mapunits/pixels/etc
+
+Nyall Dawson 	2017-01-30
+
+    [FEATURE] Annotations can be styled using fill symbol styles (fix #10552)
+
+    This changes the rendering of annotation frames to use QGIS' symbology
+    engine, which means that all the existing fill styles can now be
+    used to style annotation frames.
+
+    Also paint effects & data defined symbol parameters. Whee!
+
+Nyall Dawson 	2017-01-30
+
+    [FEATURE] Control over annotation contents margins (refs #10555)
+
+    Allows setting left/top/right/bottom margins for the contents
+    within an annotation.
+
+Nyall Dawson 	2017-01-30
+
+    Replace VisualMargin with QgsMargins
+
+Nyall Dawson 	2017-01-30
+
+    New class QgsMargins for storing margins (left/right/top/bottom)
+
+    Basically a direct port of QMarginF, but forced to always use
+    double values, and with added toString()/fromString() methods.
+
+Jorge Gustavo Rocha 	2017-01-29
+
+    Fix inconsistent-missing-override warning
+
+Nyall Dawson 	2017-01-30
+
+    Respect snapping while moving annotations (fix #10551)
+
+Nyall Dawson 	2017-01-29
+
+    Port annotation feature handling to QgsAnnotation
+
+    Not an ideal implementation (too much logic resides in the
+    gui QgsMapCanvasAnnotationItem class), but any approach
+    using current api will be dependant on some hacks.
+
+    Ideally we need a QgsVectorDataProvider method for finding
+    the closest feature(s) to a point(/line/polygon) within a
+    certain tolerance, with provider specific implementations
+    which offload this to the data store's spatial indices.
+    Then this handling could be bumped up to reside in
+    QgsAnnotation.
+
+Nyall Dawson 	2017-01-29
+
+    Handle moving annotation with different CRS to canvas
+
+Nyall Dawson 	2017-01-29
+
+    Move map layer association for annotations to QgsAnnotation
+
+    Previously only some annotations had (incomplete) support for
+    attaching to a particular vector layer and synchronising their
+    visibility with the layer's visibility.
+
+    This handling has all been moved up to QgsAnnotation, so that
+    all annotation types can be attached to layers.
+
+    This will allow selective annotation visibility based on the
+    visible layers of a particular canvas, eg in multi-canvas
+    environments.
+
+    Additionally:
+    - show the attached layer in the annotation properties
+    dialog, and allow it to be cleared to always show the
+    annotation
+    - allow attaching annotations to non-vector layers
+    - add unit tests for visibility
+
+Nyall Dawson 	2017-01-26
+
+    Refactor annotations
+
+    Splits the rendering component of annotations out from map
+    canvas item component.
+
+    A new core abstract base class QgsAnnotation handles the
+    management of the common properties associated with an
+    annotation, and handles rendering the annotation onto a
+    QgsRenderContext destination.
+
+    Existing annotation classes have been ported to this, and
+    with the exception of the form annotation moved into core.
+    Form annotations are dependant on editor widgets and must
+    remain in GUI.
+
+    A new QgsMapCanvasAnnotationItem item class implements
+    a QgsMapCanvasItem which draws an annotation inside the
+    canvas, and handles synchronising the position and size
+    of the canvas item with the QgsAnnotation position/size.
+
+    This allows annotations to be safely used in a multi-canvas
+    environment, with a single QgsAnnotation being displayed
+    in multiple canvases (even if the canvases have different
+    extent/crs/etc).
+
+    Additionally it allows annotations to be directly rendered
+    to a map (eg in composer) without going through the
+    gui based Qt graphics scene framework.
+
+    Also removes lots of duplicate code, and adds some basic
+    unit tests for annotations.
+
+Martin Dobias 	2017-01-27
+
+    Tidy up layer definitions code + removal of QgsProject::instance()
+
+    Moved code related to layer definitions away from QgsMapLayer
+
+Nyall Dawson 	2017-01-29
+
+    Update indentation
+
+lbartoletti 	2017-01-28
+
+    [FEATURE] QgsPointV2 add project with 3D support
+
+    Allows projection of a point with inclination to return a 3d point.
+
+    Expression "project" function has been extended to support a new inclination parameter.
+
+Jorge Gustavo Rocha 	2017-01-28
+
+    QMessageBox replaced by QgsMessageBar
+    "Saved styles manager" renamed to "Database styles manager"
+
+Alexander Bruy 	2017-01-26
+
+    update docs
+
+Alexander Bruy 	2017-01-26
+
+    use QgsRasterBlock instead of GDAL in zonal statistics (addresses #8736)
+
+    This should make zonal statistics usable rasters which come from
+    other providers, e.g. WCS.
+
+Alexandre Neto 	2017-01-28
+
+    More PNG to SVG replacements (#4065)
+
+Alessandro Pasotti 	2017-01-27
+
+    Fix segfault for unitilialized mAssistantPreviewSymbol
+
+Merge: aef2b00b7e 9378d20fe0
+Alexander Bruy 	2017-01-27
+
+    Merge pull request #4069 from alexbruy/zonalstatistics-tests
+
+    Zonal statistics tests
+
+Alexander Bruy 	2017-01-27
+
+    fix generation of unique field names
+
+Alexander Bruy 	2017-01-27
+
+    remove obsolete test
+
+Alexander Bruy 	2017-01-27
+
+    extend zonal statistics tests
+
+Harrissou Sant-anna 	2017-01-18
+
+    QGIS 3 is only qt5 compliant
+
+    Remove qt4 mention (for linux based processes)
+
+matteo 	2017-01-26
+
+    [processing] add test for merge gdal
+
+Merge: 0341478864 6c7e2f1b87
+Nyall Dawson 	2017-01-27
+
+    Merge pull request #4067 from nyalldawson/raster_ctor
+
+    Remove duplicate QgsRasterLayer constructor
+
+Martin Dobias 	2017-01-27
+
+    Remove code for reading of legacy (QGIS < 1.0) renderers
+
+    Also removes a bunch of unused old QMLs and upgrades one still in use
+
+pcav 	2017-01-27
+
+    Because FSM
+
+Nyall Dawson 	2017-01-27
+
+    Fix memory corruption (free address of reference) in server
+
+Nyall Dawson 	2017-01-27
+
+    Fix some coverity null pointer dereference issues
+
+Merge: c72734285b bf2d9995f0
+Alexander Bruy 	2017-01-27
+
+    Merge pull request #4066 from PedroVenancio/master
+
+    [processing] add GRASS 7.x v.out.ascii algorithm
+
+Nyall Dawson 	2017-01-27
+
+    Make QgsVectorLayer ctor default to ogr provider
+
+Martin Dobias 	2017-01-26
+
+    Fix spelling and API doc
+
+Martin Dobias 	2017-01-26
+
+    [FEATURE] API call to make geometries valid (port of ST_MakeValid)
+
+    This introduces QgsGeometry::makeValid() which will try to make a valid
+    geometry out of invalid one. This is more complicated method than just
+    doing a buffer with zero width, but it should not loose any vertices.
+
+    Finally we should have a reliable way in QGIS to fix bad geometries!
+
+    Ported the C code from lwgeom library to QGIS.
+
+Martin Dobias 	2017-01-26
+
+    Make layer tree implementation independent from QgsProject::instance()
+
+    Another bit in the project refactoring work to get rid of dependencies
+    on QgsProject singleton.
+
+    Reading of layer trees from XML is now split into two phases:
+    1. read XML and keep layer IDs
+    2. resolve layer IDs to QgsMapLayer instances (using QgsProject)
+
+    There are convenience methods to do both phases in one go.
+
+Nyall Dawson 	2017-01-27
+
+    Remove duplicate QgsRasterLayer constructor
+
+    Avoids confusing overload behavior when constructing QgsRasterLayers
+    from c++ code. This extra constructor was causing character literals
+    to be converted to a boolean loadDefaultStyle flag instead
+    of being used as the provider key. Removing the extra constructor
+    avoids this, and removes some duplicate code.
+
+Nyall Dawson 	2017-01-27
+
+    Fix some coverity before/after null deference checks
+
+Nyall Dawson 	2017-01-27
+
+    Fix some memory leaks identified by Coverity
+
+Jorge Gustavo Rocha 	2017-01-27
+
+    Sip coverage: first attempt
+
+Nyall Dawson 	2017-01-27
+
+    Fix some coverity uninitialized variable warnings
+
+Jorge Gustavo Rocha 	2017-01-26
+
+    Fix astyle
+
+Nyall Dawson 	2017-01-27
+
+    Ensure newly added composer maps show layers visible in canvas
+
+PedroVenancio 	2017-01-26
+
+    Add GRASS 7.x v.out.ascii algorithm
+
+Jorge Gustavo Rocha 	2017-01-26
+
+    Fix astyle
+
+Jorge Gustavo Rocha 	2017-01-26
+
+    Delete styles from postgres provider
+
+rldhont 	2017-01-26
+
+    [BUGFIX][Processing] Script: get output file extension
+
+Harrissou Sant-anna 	2017-01-26
+
+    Fix "Configure container" dialog (#4060)
+
+Alexandre Neto 	2017-01-26
+
+    Add title to size assistant dialog (#4056)
+
+Martin Dobias 	2017-01-25
+
+    Reading/saving labeling engine uses a particular QgsProject
+
+    ... rather than using QgsProject::instance() internally
+
+    These are small cleanups to dig out some instance() uses and move them one level up...
+
+    At some point we should maybe make labeling engine configuration a part of QgsMapSettings
+    and have default project labeling engine config accessible from QgsProject
+    in a way similar to e.g. snapping configuration.
+
+Denis Rouzaud 	2017-01-25
+
+    spelling fixes
+
+Juergen E. Fischer 	2017-01-25
+
+    spelling fixes
+
+Alexander Bruy 	2017-01-25
+
+    [processing] make additional Fusion parameters optional
+
+Merge: 0de00150d1 514e55bdce
+Alexander Bruy 	2017-01-25
+
+    Merge pull request #4053 from alexbruy/lidartools-update
+
+    [processing] fixes and new tools for LiDAR processing
+
+Alexander Bruy 	2017-01-25
+
+    fix indentation
+
+Denis Rouzaud 	2017-01-25
+
+    correctly exit spell check test to make Travis fail
+
+Alexander Bruy 	2017-01-25
+
+    [processing] fixes and new tools for LiDAR processing
+    courtesy of Niccolò Marchi
+
+Tudor Bărăscu 	2017-01-23
+
+    fix labelontop/editable when field list sorted
+
+Tudor Bărăscu 	2017-01-20
+
+    fix working on constraints when field list sorted
+
+matteo 	2017-01-24
+
+    [processing] add test for color relief gdal
+
+Mathieu Pellerin 	2017-01-25
+
+    [FEATURE] expression engine's is_layer_visible() (#4045)
+
+Juergen E. Fischer 	2017-01-25
+
+    Qt 5.2 has QComboBox::currentData
+
+Juergen E. Fischer 	2017-01-25
+
+    remove remaining QT_VERSION <=> 5 checks (also fixes b3e8d82)
+
+Juergen E. Fischer 	2017-01-25
+
+    identation fix
+
+Juergen E. Fischer 	2017-01-25
+
+    translation string fixes
+
+Juergen E. Fischer 	2017-01-25
+
+    update i18n scripts
+
+Juergen E. Fischer 	2017-01-25
+
+    debian packaging: include server modules
+
+Juergen E. Fischer 	2017-01-25
+
+    [processing] find grass >=7.0
+
+Juergen E. Fischer 	2017-01-25
+
+    fix processing MessageBarProgress initialization
+
+Nyall Dawson 	2017-01-25
+
+    Considerably lighten the burden on the overworked translation team
+
+Nyall Dawson 	2017-01-25
+
+    Rename a ui file which I can never find
+
+Nyall Dawson 	2017-01-25
+
+    Fix bad labeling strings
+
+luipir 	2017-01-25
+
+    typo
+
+luipir 	2017-01-24
+
+    fixed forgot merge conflict message
+
+Luigi Pirelli 	2017-01-17
+
+    Tests and fix to read sld:Rotation when does not have ogc sub tags
+
+Denis Rouzaud 	2017-01-24
+
+    remove QT_VERSION test in custom widgets
+
+Denis Rouzaud 	2017-01-24
+
+    more python 2 removal
+
+Nyall Dawson 	2017-01-24
+
+    Remove some leftover Python 2 code
+
+Merge: 5e1339e863 a188d14f48
+Nyall Dawson 	2017-01-24
+
+    Merge pull request #4043 from nyalldawson/layer_composer_bridge
+
+    Bridge map canvas layers to composer map layers
+
+Nyall Dawson 	2017-01-24
+
+    Remove map settings parameter from QgsComposition
+
+    Breaks the hard link between canvas and compositions!
+
+    Fix #11077
+
+Merge: 98169386d1 ea2ff06c79
+Nyall Dawson 	2017-01-24
+
+    Merge pull request #4038 from nyalldawson/shift_zoom
+
+    [FEATURE] Holding shift while using map zoom tools inverts the zoom
+
+Nyall Dawson 	2017-01-24
+
+    [composer] Don't use canvas map settings to determine canvas layers
+
+    Instead make the layer tree canvas bridge advise on layer set
+    changes, and tie this into composer. So now composer acts
+    as a go-between to sync the composer map item's layer set to
+    the layer tree/canvas layers.
+
+    It's not an ideal solution, but avoids the hard link between
+    compositions and the map canvas.
+
+Nyall Dawson 	2017-01-24
+
+    Add missing docs
+
+Nyall Dawson 	2017-01-24
+
+    Remove calls to method added in Qt 5.6
+
+Juergen E. Fischer 	2017-01-15
+
+    updates and fixes for windows qt5/py3 build
+
+Merge: 57535763d7 69d10fae0f
+Nyall Dawson 	2017-01-24
+
+    Merge pull request #2857 from nyalldawson/properties2
+
+    Properties framework
+
+Alexander Bruy 	2017-01-19
+
+    use new QgsHelp where possible instead of builtin context help
+
+Nyall Dawson 	2017-01-23
+
+    [composer] Fix page border is too wide under qt5
+
+Nyall Dawson 	2017-01-23
+
+    [composer] Holding shift while drawing polyline/polygon constrains
+    line angles
+
+Nyall Dawson 	2017-01-23
+
+    [needs-docs] Use alt modifier to reverse zoom behaviour
+
+    Previously shift-modifier was used to change zoom in to out, and
+    zoom out to in. This commit changes it to the more common alt
+    modifier.
+
+Nyall Dawson 	2017-01-23
+
+    [FEATURE] Holding shift while using map zoom tools inverts the zoom
+
+    Eg hold shift and click with zoom in tool = zoom out
+
+Nyall Dawson 	2017-01-23
+
+    [labeling] When changing font families, reset to correct regular/book
+    style if current style is not available
+
+    Previously the font would be reset to the first style alphabetically,
+    usually 'Bold'. Now it correctly resets to the standard font style.
+
+Nyall Dawson 	2017-01-23
+
+    Flip some connects to new style
+
+Nyall Dawson 	2017-01-23
+
+    [needs-docs] Remove duplicate Add Layer option from browser context menu
+
+    Instead of two actions: Add Layer & Add Selected Layers, just have
+    a single Add Selected Layers action which works on either multiple
+    selections or single selections
+
+Nyall Dawson 	2017-01-23
+
+    Update API break dox
+
+Nyall Dawson 	2017-01-23
+
+    SIP sync
+
+Nyall Dawson 	2017-01-23
+
+    Use consistent names for data defined property collections
+
+Nyall Dawson 	2017-01-23
+
+    Crazy fix to avoid shared data getting corrupted in sip bindings
+
+    Without this (should be unnecessary) virtual destructor the
+    shared data member for QgsProperty gets filled with garbage if
+    a QgsProperty is created from python code.
+
+    I can't explain it...!
+
+Nyall Dawson 	2017-01-23
+
+    Spelling fixes
+
+Nyall Dawson 	2017-01-23
+
+    Cleanups, fix tests
+
+Nyall Dawson 	2017-01-21
+
+    Remove caching from QgsPropertyCollectionStack (too fragile)
+
+Nyall Dawson 	2017-01-20
+
+    Fix failing test
+
+Nyall Dawson 	2017-01-20
+
+    Fix layer expression scope sometimes not appended to render
+    context expression scopes
+
+Nyall Dawson 	2017-01-20
+
+    Fix some failing tests
+
+Nyall Dawson 	2017-01-20
+
+    Fix tests
+
+Nyall Dawson 	2017-01-20
+
+    Add missing sip bindings
+
+Nyall Dawson 	2017-01-20
+
+    Identation update
+
+Nyall Dawson 	2017-01-20
+
+    Add missing docs
+
+Nyall Dawson 	2017-01-20
+
+    Fix unused variable warning
+
+Nyall Dawson 	2017-01-20
+
+    Rename method which causes spell check issues
+
+Nyall Dawson 	2017-01-19
+
+    Fix doxygen warnings
+
+Nyall Dawson 	2017-01-19
+
+    Clean up GUI for properties
+
+Nyall Dawson 	2017-01-18
+
+    Refactor properties
+
+    Remove QgsAbstractProperty and subclasses, and instead use a single
+    QgsProperty class which covers the use of QgsAbstractProperty
+    and its subclasses. This simplifies the API and avoids pointer
+    handling. QgsProperty is implicitly shared for memory efficiency
+    and inexpensive copies.
+
+Nyall Dawson 	2017-01-18
+
+    Stronger definitions of properties in collections
+
+    Instead of defining the suitable field types and values for
+    properties when registering them to a data defined button,
+    now properties are fully defined when the valid
+    property keys are defined.
+
+Nyall Dawson 	2017-01-17
+
+    [FEATURE][composer] Data defined scalebar colors and line width
+
+Nyall Dawson 	2017-01-17
+
+    [FEATURE][composer] Data defined legend titles and column count
+
+    (fix #11913)
+
+Nyall Dawson 	2017-01-17
+
+    Avoid slowdown when changing composer data defined properties
+
+Nyall Dawson 	2017-01-17
+
+    [FEATURE][composer] Data defined svg colors and outline width for
+    composer picture items
+
+    Especially useful when the picture is showing a north arrow!
+
+Nyall Dawson 	2017-01-17
+
+    [FEATURE][composer] Data definable item frame and background colors
+
+Nyall Dawson 	2017-01-11
+
+    Port symbology and composer to properties framework
+
+Nyall Dawson 	2017-01-10
+
+    Port labeling to properties framework
+
+Nyall Dawson 	2017-01-10
+
+    Nicer initialization of diagram property map
+
+Nyall Dawson 	2017-01-10
+
+    [labeling] Remove support for upgrading 1.x projects with
+    data defined label settings
+
+    Clean up code related to data defined properties map
+
+Nyall Dawson 	2017-01-10
+
+    Allow properties/collections to be prepared in advance
+
+Nyall Dawson 	2017-01-10
+
+    Fix sip subclassing for properties
+
+Nyall Dawson 	2017-01-04
+
+    Add a common interface for QgsPropertyCollection/QgsPropertyCollectionStack
+
+Nyall Dawson 	2016-03-17
+
+    Start on GUI for properties
+
+Nyall Dawson 	2017-01-02
+
+    Remove deprecated diagram field properties
+
+Nyall Dawson 	2017-01-02
+
+    Add support for more data definable properties to diagrams:
+
+    - Distance
+    - Priority
+    - ZIndex
+    - IsObstacle
+    - Show
+    - AlwaysShow
+    - Diagram Start Angle
+
+Nyall Dawson 	2016-03-18
+
+    Add tests for data defined diagram properties
+
+Nyall Dawson 	2017-01-02
+
+    Allow setting diagram properties collection
+
+Nyall Dawson 	2017-01-02
+
+    Remove currently unused diagram properties, add data defined
+    x/y position using properties system
+
+Nyall Dawson 	2016-03-17
+
+    Setting a property to null in collections removes property
+
+Nyall Dawson 	2017-01-02
+
+    Support @value in diagram property expressions
+
+Nyall Dawson 	2017-01-02
+
+    Port diagrams to use properties
+
+Nyall Dawson 	2016-03-10
+
+    Initial implementation of property system
+
+Nyall Dawson 	2017-01-23
+
+    Python formatting updates
+
+Nyall Dawson 	2017-01-23
+
+    Add autopep8 to Travis environment to check Python formatting
+
+Matthias Kuhn 	2017-01-20
+
+    Disable "merge lines" option with "line direction symbol"
+
+    This sometimes produces inversed lines and therefore unreliable results.
+
+Nyall Dawson 	2017-01-22
+
+    Fix tests
+
+Nyall Dawson 	2017-01-22
+
+    [FEATURE] Add inches as a measurement choice for symbology/labeling
+
+    "Make imperial great again!"
+
+Nyall Dawson 	2017-01-22
+
+    Consolidate all render context unit conversion to single methods
+    within QgsRenderContext
+
+    Fix invalid conversions, update unit tests
+
+Nyall Dawson 	2017-01-22
+
+    Fix invalid conversion from points to mm
+
+Harrissou Sant-anna 	2017-01-22
+
+    Fix tab focus order in dialogs (#4013)
+
+Nyall Dawson 	2017-01-22
+
+    [FEATURE] Expose points as valid choice for all symbol/label units
+
+Juergen E. Fischer 	2017-01-21
+
+    add link to 2.18 api documentation
+
+Juergen E. Fischer 	2017-01-21
+
+    truncate only last extension in welcome screen
+
+Juergen E. Fischer 	2017-01-21
+
+    api_break fixes
+
+Nathan Woodrow 	2017-01-21
+
+    Add keyboard shortcut to actions in the UI
+
+    Also bolds action tooltip text to make it clearer.
+    Shortcuts live inside ({shortcut-here}) in the tooltip
+
+Merge: 2bedaf869c 65c01775f6
+rldhont 	2017-01-21
+
+    Merge pull request #3996 from jgrocha/literal
+
+    SLD parsing: handling ogc:Literal within CssParameter
+
+Nathan Woodrow 	2017-01-21
+
+    Don't show prompt on empty group
+
+Nathan Woodrow 	2017-01-19
+
+    [Expressions] Move field values widget
+
+Nyall Dawson 	2017-01-18
+
+    Avoid "Failed to load file  "/style.qss"" startup error
+
+Nyall Dawson 	2017-01-21
+
+    Revert "Reenable full task manager tests following b45469f"
+
+    This reverts commit dd614451c9586ea598f93aab56a97a00f409a6cf.
+
+Denis Rouzaud 	2017-01-20
+
+    spelling fix imrovement and symboll
+
+Denis Rouzaud 	2017-01-20
+
+    run spell check on edited files only
+
+Matthias Kuhn 	2017-01-20
+
+    Remove FileName and Photo widget in favor of Attachment
+
+Matthias Kuhn 	2017-01-20
+
+    [needs-docs] Rename "External Resource" widget to "Attachment"
+
+Matthias Kuhn 	2017-01-20
+
+    Migrate Photo and FileName widgets to ExternalResource
+
+Denis Rouzaud 	2017-01-20
+
+    fix typo
+
+Denis Rouzaud 	2017-01-20
+
+    replace digitising by digitizing
+
+Denis Rouzaud 	2017-01-20
+
+    more spelling fixes
+
+Denis Rouzaud 	2017-01-20
+
+    [spellcheck] improved script
+
+Stéphane Brunner 	2017-01-20
+
+    don't apply the spell check on all the file if no changes (#4031)
+
+    Before that:
+
+    $time git commit --amend 2> log
+    real    7m19.811s
+    user    49m14.012s
+    sys     0m16.668s
+
+    $ls -lh log
+    -rw-rw-r-- 1 sbrunner sbrunner 1,8M janv. 20 14:05 log
+
+Matthias Kuhn 	2017-01-20
+
+    Fix loading of editor widgets
+
+Merge: 85146ca4be 8e025ae75e
+rldhont 	2017-01-20
+
+    Merge pull request #4029 from dmarteau/cleanup_getenv
+
+    Move request logging to request object
+
+Matthias Kuhn 	2017-01-20
+
+    Add description for starting python tests in gdb
+
+David Marteau 	2017-01-20
+
+    Move request logging to request object
+
+Matthias Kuhn 	2017-01-20
+
+    Automatically set focus on the line edit for attribute table filters
+
+    Because the obvious action after selecting a search field is to start
+    typing and not to click on the line edit with the mouse.
+
+Nyall Dawson 	2017-01-20
+
+    Reenable full task manager tests following b45469f
+
+Merge: 95ca471e22 d1f233d083
+rldhont 	2017-01-19
+
+    Merge pull request #4027 from rldhont/server-selection-tests
+
+    [Server] SELECTION tests
+
+Merge: eb7a235dc1 8776e3cf64
+Alessandro Pasotti 	2017-01-19
+
+    Merge pull request #4026 from elpaso/store-urls-in-qsettings
+
+    Store URLs in QSettings
+
+rldhont 	2017-01-19
+
+    [Server] SELECTION tests
+
+    Update GetMap SELECTION test
+    Add GetPrint SELECTION test
+
+    !GetPrint SELECTION has to be fixed!
+
+Alessandro Pasotti 	2017-01-19
+
+    Store URLs in QSettings
+
+    Make URLs overrideable through QSettings.
+    The idea is to eventually make all hardcoded URLs
+    and paths user-overrideable through a QSettings entry.
+
+Matthias Kuhn 	2017-01-19
+
+    Print messages from QgsMessageLog to the console when testing
+
+Matthias Kuhn 	2017-01-19
+
+    Add QgsApplication.instance() to python bindings
+
+Matthias Kuhn 	2017-01-19
+
+    Save readOnly state, constraints and default values to style
+
+    They should be handled equal to the edit form config.
+    Fix #15931
+
+volaya 	2017-01-19
+
+    [processing] always use only selected features in 'save selected features'
+
+Alessandro Pasotti 	2017-01-19
+
+    Replace broken WMS demo URLs with working URLs
+
+    I'd liked to add a UMN MapServer Demo too but
+    I couldn't find a working one.
+
+    Needs backporting
+
+Merge: b45469f137 a80497e3de
+rldhont 	2017-01-19
+
+    Merge pull request #4019 from dmarteau/wms_cleanup
+
+    Clean WMS service
+
+Nikolay Korotkiy 	2017-01-18
+
+    Fix some errors/typos
+
+Martin Dobias 	2017-01-19
+
+    Make the one band raster creation method return data provider
+
+Martin Dobias 	2017-01-19
+
+    Convenience API call to create empty raster file
+
+Martin Dobias 	2017-01-19
+
+    Make setEditable() return true/false to indicate success/error
+
+Martin Dobias 	2017-01-19
+
+    [FEATURE] API to enable/disable editing of raster data
+
+    To create a 2x2 raster block with one byte per pixel:
+
+    ```
+    block = QgsRasterBlock(Qgis.Byte, 2, 2)
+    block.setData(b'\xaa\xbb\xcc\xdd')
+    ```
+
+    To overwrite existing raster data at position 0,0 by the 2x2 block:
+
+    ```
+    provider.setEditable(True)
+    provider.writeBlock(block, band, 0, 0)
+    provider.setEditable(False)
+    ```
+
+Nyall Dawson 	2017-01-18
+
+    Fix 'bytes can only contain ASCII' error on python3
+
+lbartoletti 	2017-01-19
+
+    [FEATURE][processing] Add overlay option to GridLine and GridPolygon
+
+Nyall Dawson 	2017-01-19
+
+    Add missing ~ operator to expression builder
+
+Harrissou Sant-anna 	2017-01-19
+
+    Enable icons visibility in Evis dialogs (#4012)
+
+    - Add + and - icons
+    - Also move some "what's this" comments to "tooltip"
+
+David Marteau 	2017-01-18
+
+    Clean WMS service
+
+        - Remove "transitional" code
+        - Remove duplicated code (or functionaly equivalent code)
+        - Remove dead code
+        - Sanitize error checking
+        - Ensure correct build with HAVE_SERVER_PYTHON_PLUGINS not defined
+
+Merge: 7161b5a842 783fae1bc9
+Nyall Dawson 	2017-01-19
+
+    Merge pull request #4002 from tudorbarascu/fixdescription
+
+    fix setRelationId description
+
+Merge: 819c9ec03e 6bab0c6913
+Nyall Dawson 	2017-01-19
+
+    Merge pull request #4008 from jgrocha/postgisstyles
+
+    DDL update: saving layer styles on databases
+
+Merge: 2183887759 14c4dea4db
+Nyall Dawson 	2017-01-19
+
+    Merge pull request #4006 from SrNetoChan/replace_pngs
+
+    Replace pngs by SVGs
+
+Nyall Dawson 	2017-01-18
+
+    Don't use canvas mapSettings when composer maps respond to layer changes
+
+Jorge Gustavo Rocha 	2017-01-18
+
+    DDL update: saving layer styles on databases
+    Fix #11421
+
+Merge: 08e0eacfef e17a7d4e21
+rldhont 	2017-01-18
+
+    Merge pull request #4004 from dmarteau/wfs_as_module
+
+    WFS & WCS as module
+
+Alexander Bruy 	2017-01-18
+
+    [processing] return string from selection type setting when necessary
+
+Martin Dobias 	2017-01-18
+
+    Remove draw() method from QgsRasterDataProvider interface (#4017)
+
+    It was redundant in the API - one always wants to use block() to get data
+
+Merge: 433d04b68e 710a12cabd
+Nyall Dawson 	2017-01-18
+
+    Merge pull request #4005 from nyalldawson/comp_mapsettings
+
+    Remove some more QgsComposition::mapSettings use, also support different CRS in composer map items
+
+Nyall Dawson 	2017-01-18
+
+    Avoid use of composition map settings to set initial composer map extent
+
+Nyall Dawson 	2017-01-18
+
+    [needs-docs] Composer maps default to a "use project CRS" setting
+
+    And overriding projection is only done if user has manually
+    chosen a different CRS from the list.
+
+    This means that templates and compositions in server can still
+    adapt to follow the project CRS, but if desired specific map
+    items (eg an overview map) can use the CRS override to always
+    show in a particular CRS.
+
+Nyall Dawson 	2017-01-18
+
+    Avoid startup error when project template folder does not exist
+
+Martin Dobias 	2017-01-18
+
+    QgsRasterBlock::data() for efficient access to pixel data also in Python (#4009)
+
+    Also adds some unit tests and API cleanups
+
+Nyall Dawson 	2017-01-18
+
+    Fix some test failures
+
+David Marteau 	2017-01-17
+
+    Move wcs as service module
+
+David Marteau 	2017-01-16
+
+    Move wfs as service module
+
+Alessandro Pasotti 	2017-01-17
+
+    [bugfix] Fixes WFS HTTP auth basic username/password
+
+    Fixes #15360 and #15597
+
+Jorge Gustavo Rocha 	2017-01-17
+
+    DDL update: saving layer styles on databases
+    Fix #11421
+
+Nyall Dawson 	2017-01-17
+
+    More removal of QgsComposition::mapSettings use
+
+Nyall Dawson 	2017-01-17
+
+    [FEATURE][composer] Allow choice of CRS for map items
+
+    This allows the CRS for map items to differ from the canvas/project
+    CRS. It also allows different map items to have different CRS,
+    eg an overview map can be set to a different CRS to the main map.
+
+    An unfortunate side effect of this change and the ongoing work
+    to separate compositions from canvas is that datum transforms
+    are no longer supported in composer. This cannot be fixed until
+    the datum transform store is rewritten to not depend on canvas
+    (ie, it's also broken for upcoming multi-canvas work)
+
+Nyall Dawson 	2017-01-17
+
+    Remove some more QgsComposition::mapSettings use
+
+Nyall Dawson 	2017-01-17
+
+    Remove some more QgsComposition::mapSettings use
+
+Nyall Dawson 	2017-01-17
+
+    [composer] Remove more use of composition map settings
+
+    Use relevant composer map item CRS instead of composition mapsetting's
+    CRS. For items directly linked to a map (eg scalebar, legend) we
+    use that map's CRS, for others (eg labels, html items) we use the
+    composition's reference map CRS.
+
+    (Note that the CRS cannot be set for a map, and is still currently
+    linked to the canvas CRS. Fixing that is a future TODO.)
+
+Jorge Gustavo Rocha 	2017-01-17
+
+    SLD parsing: handling ogc:Literal within CssParameter
+
+Denis Rouzaud 	2017-01-16
+
+    replace cancelling, cancelled and cancellation by canceling, canceled and cancelation, respectively (#4000)
+
+    * replace cancelling and cancelled by canceling and canceled, respectively
+
+    see https://github.com/qgis/qgis3_UIX_discussion/issues/19
+
+    * replace cancellation by cancelation
+
+Denis Rouzaud 	2017-01-16
+
+    [spellcheck] properly look into various cases and add more fixes"
+
+Juergen E. Fischer 	2017-01-16
+
+    creatensis.pl: handle release names with blanks
+
+Tudor Bărăscu 	2017-01-12
+
+    Show warning when adding more than 1 part to single geometry layers
+
+Denis Rouzaud 	2017-01-16
+
+    [spellcheck] fix using whole dictionary
+
+Tudor Bărăscu 	2017-01-16
+
+    fix setRelationId description
+
+Alexandre Neto 	2017-01-16
+
+    Replaces ProjectionEnable Icons and text
+
+    Replaces the OFT enable and Disable Icons to use the same CRS Icon as in options
+
+    Changes behavior on CRS TEXT showing when OTF is off, instead of when it's ON.
+
+Denis Rouzaud 	2017-01-16
+
+    Qt 5.2 has QComboBox::currentData
+
+Merge: bf22cbfa9d 9324bdac1f
+Alessandro Pasotti 	2017-01-16
+
+    Merge pull request #3999 from elpaso/wfst-fixes-15597-16043
+
+    [bugfix] WFS-T Fixes #15597 #16043
+
+Alessandro Pasotti 	2017-01-13
+
+    [bugfix] WFS-T Fixes #15597 #16043
+
+    This commit fixes a few bugs on WFS-T with
+    servers that support WFS-T > 1.0.0 when user
+    configure version != 1.0.0 ("auto" is the default).
+
+    It also fixes WFS-T multiple operations on GeoServer
+    when an insert operation is among them and the feature
+    store does not return generated feature ids for the
+    inserted features (i.e. shapefiles).
+
+    Tested on GeoServer and QGIS Server
+
+     (cherry-picked from 502a8da40380)
+
+Alexandre Neto 	2017-01-16
+
+    Replace mActionCheckQgisVersion.PNG by SVG
+
+Denis Rouzaud 	2017-01-16
+
+    [spellcheck] fix case detection + some fixes
+
+Denis Rouzaud 	2017-01-16
+
+    [spell check] allow global replace
+
+    also fix matching case
+
+Merge: b340d7bdb6 8b0526d678
+rldhont 	2017-01-16
+
+    Merge pull request #3985 from dmarteau/revisit_server_exceptions
+
+    Server: revisit server exceptions
+
+Martin Dobias 	2017-01-16
+
+    Add willBeDeleted() signal to QgsMapLayer (#3998)
+
+    This allows pieces of code that depend on map layers to listen directly
+    to the layer's notification rather than having to listen to project's
+    layersWillBeRemoved signal (and cycle through the whole list)
+
+Merge: 5e459d7b25 e399ce36b7
+Nyall Dawson 	2017-01-16
+
+    Merge pull request #3992 from nyalldawson/distance_otf
+
+    Don't disable project ellipsoid choice when canvas OTF reprojection is disabled
+
+Merge: 49411210b0 3274e1926f
+Nyall Dawson 	2017-01-16
+
+    Merge pull request #3995 from nyalldawson/render_context
+
+    Remove rasterScaleFactor/setRasterScaleFactor from QgsRenderContext
+
+Nyall Dawson 	2017-01-16
+
+    Remove more unused raster scale factor handling
+
+Nyall Dawson 	2017-01-16
+
+    Remove unused (and not useful) QgsRenderContext::constPainter getter
+
+    Since const QPainters cannot be painted to, there's no value in
+    leaving this in the API
+
+Nyall Dawson 	2017-01-16
+
+    Small cleanups and documentation improvements for QgsRenderContext
+
+Nyall Dawson 	2017-01-15
+
+    Remove rasterScaleFactor/setRasterScaleFactor from QgsRenderContext
+
+    These were not being used by QGIS code (always left at default 1.0
+    value), and removing them from the api allows us to simplify lots
+    of code. It also makes QgsRenderContext scaling much less confusing.
+
+Nyall Dawson 	2017-01-16
+
+    [composer] Remove QgsComposerMap::storeCurrentLayerSet
+
+    This method was used to sync the canvas layers to a composer map.
+    The logic has been moved to app to avoid a dependancy between
+    compositions and the main map canvas
+
+Nyall Dawson 	2017-01-16
+
+    [composer] Cleanup handling of wms layer/advanced effect detection
+
+Nyall Dawson 	2017-01-15
+
+    [composer] Use reference map when creating render context for
+    draw shape/arrow/nodes/paper symbols
+
+    This commit removes some more instances where changes in the
+    canvas affect compositions. Previously the symbols drawn
+    in shape/arrow/etc items were using the scale from the canvas.
+    This meant that the appearance of these items in composer
+    would change depending on canvas zoom if they used symbols
+    with map unit sizes.
+
+    Now they take their map scale from the composition's reference
+    map. While this has the nice side effect that now map units
+    can be used in the appearance of these items and they're
+    guaranteed to match up with the reference map item, the main
+    intention here is to remove more of the forced links between
+    compositions (core) and the main canvas (app).
+
+Nyall Dawson 	2017-01-15
+
+    Move QgsSymbolLayerUtils::createRenderContext to QgsRenderContext::fromQPainter
+
+    This method is useful in many contexts outside of symbology
+
+Nyall Dawson 	2017-01-16
+
+    [composer] Use largest map in composition as reference map if no
+    reference map is explicitly set
+
+Nyall Dawson 	2017-01-15
+
+    [composer][needs-docs] Rename "world file map" option to "reference map"
+
+    This option will be used for more than just world file generation,
+    and instead will indicate which map should be considered the master
+    map for the composition from which any composer properties
+    calculating map units will derive the scale from.
+
+Jorge Gustavo Rocha 	2017-01-15
+
+    SLD parsing: handling ogc:Literal within CssParameter
+
+Jorge Gustavo Rocha 	2017-01-15
+
+    SLD parsing: handling ogc:Literal within CssParameter
+
+Even Rouault 	2017-01-15
+
+    GML parser: do not use layer extent as feature geometry if the feature has no geometry
+
+David Marteau 	2017-01-11
+
+    Revisit server exceptions
+
+        - Add server exception base class
+        - Enable per service exception definition
+        - Handle QgsException gracefully (error 500)
+        - Handle OGC exception versioning
+
+David Marteau 	2017-01-11
+
+    Remove dead code
+
+Merge: b412ceb109 6de4fceec2
+Even Rouault 	2017-01-14
+
+    Merge pull request #3993 from rouault/fix_16009
+
+    GML parser: fix parsing of typenames and geometry names with non-ASCII character (#16009)
+
+Even Rouault 	2017-01-14
+
+    GML parser: fix parsing of typenames and geometry names with non-ASCII character (#16009)
+
+Denis Rouzaud 	2017-01-14
+
+    Split (#3988)
+
+    * add coreutils to travis
+
+    * ppa for coreutils backport
+
+Nyall Dawson 	2017-01-14
+
+    Reword ellipsoid string to clarify that it also applies to area calculation
+
+Nyall Dawson 	2017-01-14
+
+    [needs-docs] Rename 'Parameters:' ellipsoid option to 'Custom'
+
+    To better respect UI standards
+
+Nyall Dawson 	2017-01-14
+
+    [needs-docs] Don't restrict project ellipsoid choice when
+    canvas OTF reprojection is disabled
+
+    These two settings aren't necessarily related - you may want
+    to disable OTF canvas reprojection while still wanting accurate
+    distance/area measurements using an ellipsoid.
+
+    This change should make distance/area calculation in QGIS more
+    reliable and predictable for users. Calculations are now
+    based entirely on the ellipsoid choice in project properties, so
+    it only takes checking a single setting to verify how
+    measurements are calculated.
+
+Nyall Dawson 	2017-01-12
+
+    [composer] Avoid some use of composition map settings
+
+Nyall Dawson 	2017-01-12
+
+    [composer] Remove support for upgrading pre 2.2 project atlas map
+    settings
+
+    Open the project in a recent 2.x release and resave to upgrade
+    the project
+
+Nyall Dawson 	2017-01-14
+
+    Standardise names for static variables
+
+    All non-const variables are prefixed with "s", all const
+    statics are ALL_CAPS
+
+Nyall Dawson 	2017-01-14
+
+    Don't return const references to implicitly shared Qt classes
+
+    Instead return the inexpensive copies. Should provide extra safety
+    against issues like #14822
+
+    (refs #14822)
+
+Alexandre Neto 	2017-01-14
+
+    replace PNG files by SVG
+
+    mIconProjectionDisabled.svg
+    mIconProjectionEnabled.svg
+    transformed.svg
+    copyright_label.svg
+
+Merge: 49b6c5f342 932d9fb5d3
+Hugo Mercier 	2017-01-13
+
+    Merge pull request #3987 from mhugo/servermultithread
+
+    [server] parallel map rendering
+
+Alexander Bruy 	2017-01-13
+
+    [processing] more fixes to "selection" type settings handling
+
+Alexander Bruy 	2017-01-13
+
+    Revert "[processing] handle string settings from previous install (followup 03eaad5bfd)"
+
+    This reverts commit daf65d8fdf3f8eb238c07f682c4d9a508e613f7a.
+
+Alexander Bruy 	2017-01-13
+
+    [processing] handle string settings from previous install (followup 03eaad5bfd)
+
+Alexander Bruy 	2017-01-13
+
+    [processing] extent is mandatory parameter for interpolation algorithms
+
+Alexander Bruy 	2017-01-13
+
+    [processing] raise error if cellsize is not defined in interpolation
+    algorithm
+
+matteo 	2017-01-12
+
+    processing zonal statistics
+
+matteo 	2017-01-12
+
+    processing single to multi test
+
+matteo 	2017-01-12
+
+    processing mean coordinates test
+
+matteo 	2017-01-12
+
+    processing points along lines test
+
+matteo 	2017-01-12
+
+    processing qgis count points weighted
+
+matteo 	2017-01-12
+
+    processing qgis countsuniquepoints test
+
+Alessandro Pasotti 	2017-01-13
+
+    [server] C++ 11 style default virtual destructor
+
+Alessandro Pasotti 	2017-01-13
+
+    [server] QsgServerInterface available without python
+
+Blottiere Paul 	2017-01-10
+
+    [server] parallel map rendering
+
+Denis Rouzaud 	2017-01-13
+
+    [spellcheck] remove unknown split option
+
+Alexander Bruy 	2017-01-13
+
+    [processing] allow other output formats than shapefile in GDAL
+    polygonize
+
+Merge: c484742eb7 6c74e4ea5d
+Denis Rouzaud 	2017-01-12
+
+    Merge pull request #3980 from 3nids/morespell
+
+    Interactive spelling corrections and add more words to spell check
+
+Denis Rouzaud 	2017-01-12
+
+    spelling fixes
+
+Denis Rouzaud 	2017-01-12
+
+    add interactive mode to spell checking (allow direct replace or ignore)
+
+Alessandro Pasotti 	2017-01-12
+
+    [server] Fix wrong debug output name and added HTTP_AUTHORIZATION
+
+Alexander Bruy 	2017-01-12
+
+    fix settings group capitalization
+
+Matthias Kuhn 	2017-01-12
+
+    Fix attribute table shows columns twice
+
+    If they have been defined with different capitalization
+
+Alexander Bruy 	2017-01-12
+
+    [processing] workaround for fixing broken build
+
+Alexander Bruy 	2017-01-12
+
+    [processing] fix typo in method name
+
+Alexander Bruy 	2017-01-12
+
+    [processing] fix handling of the "selection" type settings
+
+rldhont 	2017-01-11
+
+    [BUGFIX][Server] Add short names in restricted layer list
+
+    The restricted layer list contains layer names and layer ids if layer ids are used as service layer name.
+    This code adds layer  short name to the restricted layer list if layer ids are not used as service layer name.
+
+Nyall Dawson 	2017-01-12
+
+    Use feature from expression context in expression builder preview
+    instead of always getting first feature from the layer
+
+    This means that e.g. expression builder previews in composer atlas
+    will use the current atlas preview feature
+
+    Also remove an unnecessary restriction that blocks the preview if
+    a layer has no features
+
+Nyall Dawson 	2017-01-12
+
+    [composer] Fix expressions inserted into HTML item source are lost on refresh
+
+Nyall Dawson 	2017-01-12
+
+    Rename some static variables for consistency
+
+    Ensure non-const statics have "s" prefix and const statics
+    are in all caps
+
+Nyall Dawson 	2017-01-12
+
+    Nicer creation of static QMaps
+
+    c++11/Qt5 allow us to clean up the creation and initialization
+    of static QMaps and avoid the need for initialization functions
+
+Tudor Bărăscu 	2017-01-11
+
+    show field alias when presenting constraint msg
+
+    Before, when a field didn't passed the defined constraints
+    it showed a message in the form of "field name: Constraint defined message".
+
+    Now, if if a field alias is defined, the message is in the form of
+    "field alias: Constraint defined message"
+
+    See #15455
+
+Alexander Bruy 	2017-01-11
+
+    [processing] fix wrong parameter definition (fix #16063)
+
+Alexander Bruy 	2017-01-11
+
+    [FEATURE][processing] remove TauDEM provider from core Processing
+
+    TauDEM is quite specific set of tools and it requires installation of
+    some additional tools. So we decide to turn it into separate provider,
+    reducing core codebase size and maintenance efforts.
+
+    Tagged as feature to not forget mention in changelog and documentation
+
+Denis Rouzaud 	2017-01-11
+
+    respect CamelCase for enums and their values
+
+Alexander Bruy 	2017-01-11
+
+    [processing] update OTB's white- and blacklist. Drop obsolete 3.x
+    versions and add latest 5.8.0
+
+Alexander Bruy 	2017-01-11
+
+    [processing] add new MultiImageSamplingRate algorithm from OTB 5.8.0
+
+Denis Rouzaud 	2016-12-19
+
+    [spelling] replace behaviour by behavior
+
+Merge: e656c63ab7 bf73e2c240
+rldhont 	2017-01-11
+
+    Merge pull request #3960 from rldhont/server-wms-transparent-bgcolor
+
+    [BUGFIX][Server] Re-enable Transparent and Bgcolor parameter for GetMap
+
+Nyall Dawson 	2017-01-10
+
+    Remove duplicate QgsFeature::setFeatureId method
+
+    Leave just QgsFeature::setId and document api break
+
+rldhont 	2017-01-07
+
+    [BUGFIX][Server] Re-enable Transparent and Bgcolor parameter for GetMap
+
+    Fixed #15990 wms png transparency not honoured
+
+    And add tests for transparent and bgcolor in GetMap and GetLegendGraphic
+
+Merge: f8d70619db 3e2b4fc421
+alisovenko 	2017-01-11
+
+    Merged master fixed conflict.
+
+alisovenko 	2017-01-11
+
+    Add SIP bindings
+
+Merge: a7806d1a39 db1009cbfa
+Nyall Dawson 	2017-01-11
+
+    Merge pull request #3968 from nyalldawson/item_vars
+
+    [FEATURE] item_variables expression function inside compositions
+
+Nyall Dawson 	2017-01-09
+
+    [FEATURE] New expression variables for map settings
+
+    - map_crs, map_crs_definition: retrieves crs details for map
+    - map_units: retrieves units for map (eg 'meters','degrees')
+
+Nyall Dawson 	2017-01-09
+
+    [FEATURE] item_variables expression function inside compositions
+
+    This adds a new item_variables expression function when expressions
+    are used inside a composition context.
+
+    The function takes a single argument, the id for an item inside
+    the composition, and returns a map of variable name to value
+    for that item.
+
+    This allows you to do things like insert text in a label fetching
+    properties of another item in the composition, eg
+
+    Insert scale of map into a label:
+
+    map_get( item_variables( 'map'),'map_scale')
+
+    Insert x coordinate of map center into a label:
+
+    x(map_get( item_variables( 'map'),'map_extent_center'))
+
+Nyall Dawson 	2017-01-09
+
+    Add method to retrieve variables from a QgsExpressionContext as a QVariantMap
+
+Merge: 26a8a54c00 86e1138a04
+Nyall Dawson 	2017-01-11
+
+    Merge pull request #3959 from nyalldawson/processing_port_feedback
+
+    [processing] Port feedback object to c++
+
+Nyall Dawson 	2017-01-07
+
+    [processing] Correctly handle when no feedback object is passed
+
+Nyall Dawson 	2017-01-06
+
+    [processing] Port feedback object to c++
+
+    Algorithms are now passed a QgsProcessingFeedback object
+    instead of the loosely defined progress parameter.
+
+Merge: 243f01cbe9 04eb293362
+Nyall Dawson 	2017-01-11
+
+    Merge pull request #3966 from nyalldawson/proc_prov_c
+
+    [processing] Port some stuff to c++
+
+Nyall Dawson 	2017-01-09
+
+    [processing] Move some SVG icons out of plugin to themes
+
+    ...and swap to using QgsApplication methods for retrieving cached icons,
+    implement svgIconPath for providers with SVG icons
+
+Nyall Dawson 	2017-01-09
+
+    [processing] Allow providers to return path to SVG icon
+
+Nyall Dawson 	2017-01-09
+
+    Add some unit tests for QgsProcessingRegistry
+
+Nyall Dawson 	2017-01-09
+
+    [processing] New c++ QgsProcessingRegistry class
+
+    Intended as a registry for the various processing components,
+    including providers, algorithms and various parameters and outputs.
+
+    Currently handles only registration of providers, as a step toward
+    removing processing's algList (this requires first porting
+    the algorithm class to c++)
+
+    A QgsProcessingRegistry instance is attached to QgsApplication,
+    and is retrieved by QgsApplication::processingRegistry()
+
+Nyall Dawson 	2017-01-09
+
+    [processing] c++ base class for providers
+
+    Nothing particularly exciting here yet, but this commit
+    moves the definition of the provider base class to a c++
+    QgsProcessingProvider abstract base class.
+
+    As part of this some existing python methods were renamed
+    to make their use clearer and to fit with the QGIS c++
+    api conventions:
+
+    - getName was renamed to id
+    - getDescription was renamed to name
+    - getIcon was renamed to icon
+
+    These API breaks are documented
+
+Merge: 37ebcdd1cd 869573c9df
+rldhont 	2017-01-10
+
+    Merge pull request #3974 from dmarteau/cleanup_qgsrequesthandler
+
+    Remove code moved to wms service
+
+Denis Rouzaud 	2017-01-09
+
+    [spellcheck] allow inwords checks and line skipping
+
+    spell check will be done automatically in words by default (when some conditions are fulfilled)
+    possibility to avoid in words checking by adding :* at the end in spelling.dat
+
+    one can add #spellok at the end of a line of code to skip spell check on this line
+
+Alexander Bruy 	2017-01-10
+
+    [processing] add test for Distance matrix algorithm to prevent
+    TableWriter class breakage in future
+
+Alexander Bruy 	2017-01-10
+
+    [processing] restore functionality of the TableWriter class (fix #16053)
+
+Alexander Bruy 	2017-01-10
+
+    fix leak when using global expression context scope
+
+Merge: 3145a01db6 bcb69c5f34
+Matthias Kuhn 	2017-01-10
+
+    Merge pull request #3911 from alexbruy/generic-help
+
+    Generic help for QGIS
+
+Alexander Bruy 	2017-01-10
+
+    fix regex to correctly handle strings like $$$qgis_version
+
+Alexander Bruy 	2017-01-09
+
+    support escape syntax. $$qgis_version will be kept and $qgis_version
+    will be replaced with value
+
+Alexander Bruy 	2017-01-06
+
+    add missed SIP bindings
+
+Alexander Bruy 	2017-01-06
+
+    remove debug statements
+
+Alexander Bruy 	2017-01-06
+
+    add 'qgis_short_version' expression variable to retrieve QGIS version
+    in the major.minor notation (can be useful for help system and probably
+    in other places)
+
+Alexander Bruy 	2017-01-06
+
+    allow using expression variables in help path. Currently only from
+    global scope. Syntax should be '$variable_name', e.g. $qgis_version.
+    When accessing help those variables will be replaced with corresponding
+    values
+
+Alexander Bruy 	2017-01-05
+
+    [FEATURE] new global expression variable $qgis_locale
+
+    Returns current locale used by QGIS. By default this is current
+    system locale. If user enabled locale override in QGIS settings
+    overriden locale will be returned.
+
+Alexander Bruy 	2017-01-05
+
+    add support for proxies
+
+Alexander Bruy 	2017-01-03
+
+    move QgsHelp to gui
+
+Alexander Bruy 	2017-01-03
+
+    more robust check for network help location
+
+Alexander Bruy 	2016-12-29
+
+    make all QgsHelp methods static
+
+Alexander Bruy 	2016-12-28
+
+    improve QSettings handling
+
+Alexander Bruy 	2016-12-28
+
+    add SIP bindings
+
+Alexander Bruy 	2016-12-28
+
+    QgsHelp is not singletone
+
+Alexander Bruy 	2016-12-28
+
+    improve built-in "no help found" page
+
+Alexander Bruy 	2016-12-27
+
+    new QgsHelp class that uses QGIS User Guide as help source
+
+Alexander Bruy 	2016-12-27
+
+    add possibility to configure location of the QGIS help
+
+David Marteau 	2017-01-10
+
+    Remove code moved to wms service
+
+Alexander Bruy 	2017-01-10
+
+    [processing] support OTB 5.8.0
+
+Merge: 9be984c7ec eb826fb058
+Alexander Bruy 	2017-01-10
+
+    Merge pull request #3973 from ghtmtt/good_test2
+
+    [processing] other gdal tests
+
+Merge: 3a03c98a08 ff3487d957
+rldhont 	2017-01-10
+
+    Merge pull request #3866 from dmarteau/master
+
+    Implements service modules registry - Experimental
+
+David Marteau 	2017-01-10
+
+    Code quality changes and typo
+
+David Marteau 	2017-01-07
+
+    Remove wmsserver files from server code unit
+
+David Marteau 	2017-01-07
+
+    Replace headersWritten by headersSent
+
+David Marteau 	2017-01-07
+
+    Remove Testing/Temporary/CTestCostData.txt
+
+David Marteau 	2017-01-07
+
+    WMS run as a module service !
+
+David Marteau 	2017-01-07
+
+    Port bugfix from PR #3906 to service
+
+David Marteau 	2017-01-06
+
+    Fix sip syntax error
+
+David Marteau 	2017-01-06
+
+    Fix indent and documentation
+
+David Marteau 	2017-01-06
+
+    fix doc warning
+
+David Marteau 	2017-01-06
+
+    Port wmsserver changes to service
+
+David Marteau 	2017-01-06
+
+    Add plugin hook support decorator
+
+        - Add plugin hook support decorator for use in  service modules
+        - Remove handling of plugin hook with request handler (not needed
+    anymore)
+        - Reduce usage of HAVE_SERVER_PYTHON_PLUGINS by using forward opaque declaration.
+
+David Marteau 	2017-01-06
+
+    Ensure url is complete in fcgi request
+
+David Marteau 	2017-01-05
+
+    Add headers keys and value accessors
+
+David Marteau 	2017-01-05
+
+    QgsRequestHandler is now a concrete class
+
+        I/O transactions are now abstracted with QgsServerRequest/QgsServerResponse
+        So there is no need for another abstraction layer
+
+David Marteau 	2017-01-04
+
+    Implement QgsFcgiRequest and QgsFcgiResponse
+
+David Marteau 	2016-12-31
+
+    Fix DEFAULT_SERVER_MODULE_SUBDIR in CMakeLists.txt
+
+David Marteau 	2016-12-31
+
+    Fix indent
+
+David Marteau 	2016-12-31
+
+    Create module test; add more debug messages for travis
+
+David Marteau 	2016-12-31
+
+    Fix spelling
+
+David Marteau 	2016-12-30
+
+    fix prefix path setting: enable running from from build directory
+
+David Marteau 	2016-12-30
+
+    Fix 'Incomplete type' compile error
+
+David Marteau 	2016-12-30
+
+    Fix coding style
+
+David Marteau 	2016-12-22
+
+    Server: Brut force port WMS as service module
+
+        - Compile and load as service but functionality not tested
+        - Removed dependencies to QgsRequestHandler
+        - Removed dependencies to QgsOWSServer
+        - Separate requests in their own units
+
+David Marteau 	2016-12-16
+
+    Fix coding style and update comments
+
+David Marteau 	2016-12-16
+
+    Expose QgsServerInterface to service modules
+
+        * Instanciate QgsServerInterface even if HAVE_SERVER_PYTHON_PLUGINS is
+          not defined
+        * Pass QgsServerInterface in module registration methods.
+        * Add QgsServer initialisation test
+
+     #Please enter the commit message for your changes. Lines starting
+
+David Marteau 	2016-12-15
+
+    Add parameter map accessor from QgsServerRequest
+
+David Marteau 	2016-12-15
+
+    Add extra parameter QgsProject* to QgsService::executeRequest
+
+David Marteau 	2016-12-15
+
+    fix typo, use Q_UNUSED, return null/empty QString() instead literal empty string
+
+David Marteau 	2016-12-15
+
+    Removed python loader: added unRegisterService() method
+
+David Marteau 	2016-12-14
+
+    fix indent
+
+David Marteau 	2016-12-14
+
+    Server refactoring: Added sample native service module; fixed typo
+
+David Marteau 	2016-12-14
+
+    Add getHeader() method to QgsServerRequest
+
+David Marteau 	2016-12-14
+
+    Remove Service Entry class and move name/version infos in QgsService
+
+David Marteau 	2016-12-14
+
+    Server refactoring: Fix doc and comments
+
+        Fix typo in doc and comments
+        Update documentation
+        Fix return of implicitely shared objects
+        Fix order of parameters in QgsServiceRegistry::registerService
+
+David Marteau 	2016-12-07
+
+    Server refactoring: implements service modules registry
+
+        Implementation for https://github.com/qgis/QGIS-Enhancement-Proposals/issues/74
+
+Alexander Bruy 	2017-01-10
+
+    [processing] configurable URL for scripts and models repository
+
+Merge: 3c84229bff d2ff57ec38
+alisovenko 	2017-01-10
+
+    Merged master fixed conflict.
+
+Alexander Bruy 	2017-01-10
+
+    remove debug line
+
+Merge: 3fd27d1f04 7cda002ba2
+volaya 	2017-01-10
+
+    Merge pull request #3971 from alexbruy/processing-help
+
+    [processing] configurable help files location for GDAL and GRASS providers
+
+Merge: 378212cf42 29d108f38f
+volaya 	2017-01-10
+
+    Merge pull request #3926 from alexbruy/processing-gdal-opts
+
+    Processing gdal opts
+
+matteo 	2017-01-09
+
+    gdal TPI test
+
+matteo 	2017-01-09
+
+    gdal near black test
+
+matteo 	2017-01-09
+
+    gdal TRI test
+
+matteo 	2017-01-09
+
+    gdal roughness test
+
+Juergen E. Fischer 	2017-01-10
+
+    indentation update
+
+Merge: 313ec55640 4b8c5bea29
+Nyall Dawson 	2017-01-10
+
+    Merge pull request #3940 from nyalldawson/gdal2
+
+    Bump minimum GDAL version to 2.0, remove old version #ifdefs
+
+Tudor Bărăscu 	2017-01-07
+
+    deactivate "circular string.." buttons for layer without geom
+
+Marco Hugentobler 	2017-01-05
+
+    Exclude degenerated rings from polygon area calculation
+
+    (forward-port from 64b0b1)
+
+Marco Hugentobler 	2017-01-05
+
+    Change comment for QgsCurveV2::sumUpArea
+
+    (forward-port from 1c02dc7)
+
+Marco Hugentobler 	2017-01-04
+
+    Adapt numbers in test for QgsLineStringV2::sumUpArea
+
+    (forward port from df0f97)
+
+Marco Hugentobler 	2017-01-04
+
+    Add unit test that makes sure that the area of a closed compound curve ring is the same as a closed linestring with the same number of vertices
+
+    (forward port from be71066)
+
+Marco Hugentobler 	2017-01-03
+
+    Fix area calculation of compoundcurve rings if they contain a 2-vertex linestring
+
+    (forward port from 30d7423)
+
+Nyall Dawson 	2017-01-10
+
+    Fix test
+
+Nyall Dawson 	2017-01-10
+
+    Revert "[processing] added test for invalid geometry checking"
+
+    This reverts commit 306764871baab544f9566b327d2188a5b1fc8938.
+
+    Test is failing
+
+volaya 	2017-01-09
+
+    [processing] fixed usage of filter function in vector.features
+
+volaya 	2017-01-09
+
+    added missing test files
+
+Even Rouault 	2017-01-09
+
+    Layer tree view: correctly refresh greyed/ungreyed state of layers when toggling their group
+
+Alexander Bruy 	2017-01-09
+
+    [processing] configurable help files location for GDAL and GRASS providers
+
+alisovenko 	2017-01-09
+
+    Fix new method segnatures
+
+Alexander Bruy 	2017-01-09
+
+    add missed import
+
+volaya 	2017-01-05
+
+    [processing] added test for invalid geometry checking
+
+volaya 	2016-12-15
+
+    [processing] removed unnecessary code to check validity of geometries
+
+volaya 	2016-12-15
+
+    [processing] added ‘invalid feature handling’ option
+
+rldhont 	2017-01-09
+
+    Revert "Merge pull request #3886 from pblottiere/servermultithread"
+
+    This reverts commit 350a2b513446462120946241cf7fb1bb67ca828b, reversing
+    changes made to 590a981195289be702bc7bf5382ece25a09ae6bb.
+
+Merge: 590a981195 f7729b3096
+rldhont 	2017-01-09
+
+    Merge pull request #3886 from pblottiere/servermultithread
+
+    [server] parallel map rendering
+
+Nyall Dawson 	2017-01-09
+
+    Remove some more macros not needed with GDAL>=2 requirement
+
+Merge: c7130c6281 4851975478
+Denis Rouzaud 	2017-01-09
+
+    Merge pull request #3969 from 3nids/fixwebkit
+
+    fix build without QtWekKit
+
+Denis Rouzaud 	2017-01-09
+
+    fix build without QtWekKit
+
+Juergen E. Fischer 	2017-01-09
+
+    build t2tdoc text output with utf-8 encoding
+
+Nyall Dawson 	2017-01-09
+
+    Remove some core QgsProject::instance() uses
+
+Nyall Dawson 	2017-01-09
+
+    [processing] Don't use separate label for checkbox parameters
+
+    Instead embed description as checkbox label.
+
+Mathieu Pellerin 	2017-01-09
+
+    Fix for alphaBand and opacity loss upon renderer switch (style dock & properties window) (#3967)
+
+    * [styledock] maintain raster alpha band and opacity when switching renderer
+
+    * [raster] fix alphaBand/opacity loss when opening layer properties
+    (fixes #16044)
+
+Larry Shaffer 	2017-01-08
+
+    Update QCA CMake qcatool find function for macOS and Qt5
+
+Nathan Woodrow 	2017-01-08
+
+    Add word wrapping for expression builder
+
+Matthias Kuhn 	2017-01-08
+
+    Add doxymentation for field formatters
+
+Nyall Dawson 	2017-01-08
+
+    Add missing folder to doxygen build
+
+Alexander Bruy 	2017-01-07
+
+    [processing] allow raster options widget accept string parameters and outputs in modeler
+
+Matthias Kuhn 	2017-01-07
+
+    Doxymentation for QgsWkbTypes
+
+Martin Dobias 	2017-01-07
+
+    Fix avoid intersections test
+
+Alexander Bruy 	2017-01-02
+
+    skip malformed key-values pairs
+    add options example in docs
+
+Alexander Bruy 	2017-01-01
+
+    fix indentation
+
+Alexander Bruy 	2016-12-30
+
+    [processing] use custom options widget in GDAL algorithms
+
+Alexander Bruy 	2016-12-30
+
+    add method to set raster options in QgsRasterFormatOptionsWidget
+
+Martin Dobias 	2017-01-06
+
+    Make QgsGeometry independent from QgsProject + better avoid intersections API
+
+Martin Dobias 	2017-01-06
+
+    Make composition associated with QgsProject (#3957)
+
+    ... rather than using project singleton within compositions
+
+Martin Dobias 	2017-01-06
+
+    Add project/layer expression context scope only if it is available
+
+    Better to leave them out than adding dummy scopes
+
+Martin Dobias 	2017-01-06
+
+    Fix QgsExpressionContextUtils::projectScope() usage in processing
+
+Martin Dobias 	2017-01-05
+
+    Explicitly pass QgsProject object when dealing with expression contexts
+
+    Continued effort to reduce number of uses of QgsProject as singleton...
+
+Nyall Dawson 	2017-01-06
+
+    Disable flaky test
+
+Nyall Dawson 	2017-01-06
+
+    [FEATURE][processing] New algorithm to truncate tables
+
+    Irretrievably deletes all features from a table... use with caution!
+
+Nyall Dawson 	2017-01-06
+
+    [processing] Allow selection of non-spatial tables for create attribute index alg
+
+Nyall Dawson 	2017-01-06
+
+    [processing] Add test, help for create spatial index alg
+
+Nyall Dawson 	2017-01-06
+
+    [processing] Allow tests for algs which modify layers in place
+
+    Add test for Create Attribute Index algorithm
+
+Juergen E. Fischer 	2017-01-05
+
+    another header installation fix
+
+Juergen E. Fischer 	2017-01-05
+
+    oracle provider: fix warnings
+
+Juergen E. Fischer 	2017-01-05
+
+    fix install
+
+Matthias Kuhn 	2017-01-05
+
+    Fix install for generated export headers
+
+Matthias Kuhn 	2017-01-05
+
+    Add missing #include "qgis_core.h"
+
+Tom Chadwin 	2017-01-05
+
+    Constrain main nav to main column
+
+Alexander Bruy 	2017-01-05
+
+    add missed Qt package to QGIS PyQt compatibility layer
+
+Harrissou Sant-anna 	2017-01-05
+
+    Check fields by default when exporting to .kml
+
+    Unlike other formats, saving into kml format didn't have the fields automatically selected; people could end with an empty attributes file
+
+Merge: 52b004a132 c5835e9adc
+Alexander Bruy 	2017-01-05
+
+    Merge pull request #3918 from alexbruy/processing-providers
+
+    Processing providers updates
+
+Juergen E. Fischer 	2017-01-05
+
+    fix build
+
+Matthias Kuhn 	2017-01-04
+
+    Use qgis_grass_lib.h import for GRASS_LIB_EXPORT macro
+
+Matthias Kuhn 	2017-01-04
+
+    Remove *_EXPORT leftovers
+
+Matthias Kuhn 	2017-01-04
+
+    Add qgis_customwidgets with CUSTOMWIDGETS_EXPORT macro
+
+Matthias Kuhn 	2017-01-04
+
+    Add qgis_server with SERVER_EXPORT macro
+
+Matthias Kuhn 	2017-01-04
+
+    Add qgis_app.h with APP_EXPORT macro
+
+Matthias Kuhn 	2017-01-04
+
+    Add qgis_analysis.h with ANALYSIS_EXPORT macro
+
+Matthias Kuhn 	2017-01-04
+
+    Add qgis_python.h with PYTHON_EXPORT macro
+
+Matthias Kuhn 	2017-01-04
+
+    Add qgis_gui.h with GUI_EXPORT macro
+
+Matthias Kuhn 	2017-01-03
+
+    Add qgis_core.h to with CORE_EXPORT macro
+
+    This removes complexity from the compiler flags because defines
+    happen in a file.
+
+Matthias Kuhn 	2016-11-24
+
+    Cache warming
+
+Merge: 46252b5cd0 02b78a96f6
+Even Rouault 	2017-01-04
+
+    Merge pull request #3935 from rouault/group_visibility
+
+    [FEATURE] Change of ergonomy of the visibility of layers inside groups
+
+alisovenko 	2017-01-04
+
+    Fix node tool. Change geometry type for memory layer to ..ZM.
+
+Martin Dobias 	2017-01-04
+
+    fix doxygen warning
+
+Tudor Bărăscu 	2016-12-30
+
+    document building with ninja + non interactive options
+
+Martin Dobias 	2017-01-04
+
+    QgsProject: cleanup of read/write method + removal of unused bad layer handler class
+
+Merge: 9908d9cf81 d9d5bf7c28
+volaya 	2017-01-04
+
+    Merge pull request #3943 from Gustry/saga_path
+
+    skip if the SAGA folder is not defined
+
+Mathieu Pellerin 	2017-01-04
+
+    [processing] fix modeler output values in case algorithm(s)
+
+    execution modifies those (fixes #16021)
+
+Nyall Dawson 	2017-01-02
+
+    Implement some QGIS 3 TODOs for diagram API
+
+Nyall Dawson 	2017-01-04
+
+    [processing] Adjust margins, frame style in modeller to match main window style
+
+Nyall Dawson 	2017-01-04
+
+    Cosmetic improvements to procesing modeller
+
+    - always use a 1px outline around items, regardless of zoom
+    - don't change text color for selected items (too hard to read),
+    instead change outline/box color
+
+Merge: d12c41f232 48e72999ab
+Nyall Dawson 	2017-01-04
+
+    Merge pull request #3930 from nyalldawson/rename_qgsproject
+
+    Rename QgsProperty to QgsProjectProperty
+
+Matthias Kuhn 	2017-01-03
+
+    Don't add default actions multiple times
+
+    Fix #16013
+
+Etienne Trimaille 	2017-01-03
+
+    skip if the SAGA folder is not defined
+
+Merge: 47130a6758 8475fc36f3
+rldhont 	2017-01-03
+
+    Merge pull request #3906 from rldhont/server-wms-stretch-compliancy
+
+    [BUGFIX][Server] WMS compliance: stretched, distort, increase, decrease
+
+rldhont 	2017-01-03
+
+    Update [QGIS Server] CITE WMS 130 Test project
+
+rldhont 	2016-12-26
+
+    [BUGFIX][Server] WMS compliance: stretched, distort, increase, decrease
+
+    The commit d44f1eba2fed18b3fef8d8865d79b3b6d8bc4d69 seems to break some WMS 1.3.0 client and WMS compliancy.
+    The commit d44f1eba2fed18b3fef8d8865d79b3b6d8bc4d69 has been written to fix an issue with QGIS WMS Client and to render image like other WMS Server.
+
+    This commit has been written to fix issue introduce by d44f1eba2fed18b3fef8d8865d79b3b6d8bc4d69.
+    It is based on MapServer code:
+    * https://github.com/mapserver/mapserver/blob/master/mapdraw.c#L115
+    * https://github.com/mapserver/mapserver/blob/master/HISTORY.TXT#L3768
+
+    And take account of axis invertion for output CRS.
+
+Even Rouault 	2017-01-03
+
+    Make click on a unchecked layer in the tree view check all its parents.
+
+    This removes the Ctrl+clic requirement added initially.
+
+Merge: a643f4b4a6 1fb9ef6ca5
+Alexander Bruy 	2017-01-03
+
+    Merge pull request #3925 from alexbruy/shortcuts-search
+
+    [FEATURE] add search bar to the Configure Shortcuts dialog (fix #12681)
+
+Merge: 57917ab118 3dcf487485
+Alexander Bruy 	2017-01-03
+
+    Merge pull request #3941 from nirvn/processing_options_freeze
+
+    [processing] fix app freeze when closing options dialog (fixes #15550)
+
+nirvn 	2017-01-03
+
+    [processing] fix app freeze when closing options dialog (fixes #15550)
+
+Nyall Dawson 	2017-01-03
+
+    Compile some string functions
+
+Nyall Dawson 	2017-01-03
+
+    Compile some supported functions for spatialite provider
+
+Nyall Dawson 	2017-01-03
+
+    Handle division operator during expression compilation
+
+Mathieu Pellerin 	2017-01-03
+
+    [FEATURE] Zoom in/out and fit items to view actions for the modeler (#3939)
+
+Nyall Dawson 	2017-01-03
+
+    Bump minimum GDAL version to 2.0, remove old version #ifdefs
+
+nirvn 	2017-01-03
+
+    [ui] re-order zoom-related composer toolbar buttons
+    to match the ordering on the main window
+
+Blottiere Paul 	2016-12-19
+
+    [server] parallel map rendering
+
+Merge: cd970f2280 4bc06b18e9
+rldhont 	2017-01-02
+
+    Merge pull request #3863 from rldhont/postgres-compile-expression-functions
+
+    [Feature][PostgreSQL] Compile expression functions
+
+rldhont 	2016-12-19
+
+    [Feature][PostgreSQL] Tests: Compile expression functions
+
+rldhont 	2016-12-19
+
+    Sql Compiler: Add escape after IN operator
+
+rldhont 	2016-12-13
+
+    [Feature][PostgreSQL] Compile expression functions
+
+Merge: 3ba2f8e0f4 ddd5adf30a
+rldhont 	2017-01-02
+
+    Merge pull request #3897 from dmarteau/removeBase64
+
+    Server: Remove base64 encoding supports in WMS responses
+
+Even Rouault 	2016-12-20
+
+    [FEATURE] Change of ergonomy of the visibility of layers inside groups
+
+    See https://github.com/qgis/QGIS-Enhancement-Proposals/issues/86
+
+    - Checking/unchecking a group doesn't change the check state of its children.
+    A node is visible if and only if it is checked and all its parents too.
+    - There is no more a semi-checked state for a group
+    - Ctrl-clic on a unchecked group will check the group and all its descendants.
+    - Ctrl-clic on a unchecked layer will check the lager and all its parents.
+    - Ctrl-clic on a checked group will uncheck the group and all its descendants.
+    - Ctrl-clic on a checked layer will uncheck the layer and all its parents.
+    - Those actions are available in contextual menu items in the tree view.
+    - Invisible layers because they or their parent(s) is unchecked are greyed out.
+
+David Marteau 	2016-12-21
+
+    Remove base64 encoding supports in WMS responses
+
+Juergen E. Fischer 	2017-01-02
+
+    osgeo4w: update to grass72
+
+Merge: a05096d59a f54476cdda
+Mathieu Pellerin 	2017-01-02
+
+    Merge pull request #3931 from nirvn/processing_modeler_picture
+
+    [FEATURE] Export processing models as PDF/SVG
+
+Nyall Dawson 	2017-01-02
+
+    Cleanup QgsProjectProperty headers and docs
+
+nirvn 	2017-01-02
+
+    [FEATURE] Export processing models as PDF/SVG
+
+Nyall Dawson 	2017-01-02
+
+    Rename QgsProperty to QgsProjectProperty
+
+    and QgsPropertyKey/Value to QgsProjectPropertyKey/Value
+
+    The QgsProperty names are too generic to be used in this
+    context
+
+nirvn 	2017-01-02
+
+    [processing] update color scheme and position of modeler elements
+
+nirvn 	2017-01-01
+
+    [processing] convert modeler icons to pictures to kill pixels when zoomed
+
+Nyall Dawson 	2017-01-02
+
+    Add missing docs
+
+Nyall Dawson 	2017-01-02
+
+    [processing] Don't abort heatmap if adding single feature fails
+
+Nyall Dawson 	2017-01-02
+
+    Optimise destructors (pt 3)
+
+Nyall Dawson 	2017-01-02
+
+    Use c++11 '= delete' instead of private copy declarations
+
+    Switches the use of private copy constructors/copy assignment
+    operators to instead use public "=delete" declarations.
+    This results in clearer compile-time errors if these deleted
+    functions are used, vs obscure link-time errors.
+
+Merge: c6fb25375c cfe42c2f8d
+Nyall Dawson 	2017-01-02
+
+    Merge pull request #3914 from nyalldawson/bye_singletons
+
+    Remove some singletons by moving instances to QgsApplication
+
+Juergen E. Fischer 	2016-12-21
+
+    allow limiting snapping to a given area
+
+Juergen E. Fischer 	2017-01-01
+
+    find GRASS 7.2
+
+Juergen E. Fischer 	2017-01-01
+
+    remove qgis_eo.ts reference (will be pulled in automatically)
+
+Merge: 0532976a8a 37edf76de0
+Jürgen Fischer 	2017-01-01
+
+    Merge pull request #3904 from sikmir/i18n-eo
+
+    [i18n] integrate esperanto translation
+
+Merge: 248e7d1d5e 5c06997a31
+Jürgen Fischer 	2017-01-01
+
+    Merge pull request #3927 from rduivenvoorde/bonn_splash
+
+    New splash from Bonn Hackfest image
+
+Alexander Bruy 	2016-12-30
+
+    [FEATURE] add search bar to the Configure Shortcuts dialog (fix #12681)
+    Supports search by action name and by shortcut
+
+Alexander Bruy 	2016-12-29
+
+    [processing] fix test and menus after renaming GdalOgr provider
+
+Alexander Bruy 	2016-12-29
+
+    [processing] rename GdalOgr provider to Gdal provider
+    Show version numbers in providers descriptions
+
+nirvn 	2016-12-31
+
+    Followup 8849e94: add missing svg file
+
+nirvn 	2016-12-31
+
+    [processing] vectorize basic modeler images
+
+nirvn 	2016-12-31
+
+    [processing] vectorize and improve menu icons (fixes #14474)
+
+Nyall Dawson 	2016-12-31
+
+    Re-add missing doc
+
+Nyall Dawson 	2016-12-31
+
+    Remove some doxygen comments from overridden methods (pt 2)
+
+Richard Duivenvoorde 	2016-12-30
+
+    new splash
+
+Mathieu Pellerin 	2016-12-30
+
+    [raster] re-compute min/max when band(s) changed (#3923)
+
+Nyall Dawson 	2016-12-30
+
+    Fix failing doc test
+
+Nyall Dawson 	2016-12-30
+
+    Fix build
+
+Alexander Bruy 	2016-12-30
+
+    don't select any field by default in Field Calculator's "Update existing field" combobox (fix #15970)
+
+Nyall Dawson 	2016-12-30
+
+    Optimise destructors (pt 2)
+
+Nyall Dawson 	2016-12-30
+
+    Followup 850171, fix build
+
+Nyall Dawson 	2016-12-30
+
+    Optimise destructors (pt 1)
+
+    - Remove some non-base class empty destructors. These add no value
+    and it's better to let the compiler auto generate optimised versions
+    - use virtual ~Class = default instead of virtual ~Class {}
+
+Nyall Dawson 	2016-12-30
+
+    Remove "//! Destructor" doxygen comments
+
+    This documentation doesn't add any value
+
+Nyall Dawson 	2016-12-30
+
+    Remove some doxygen comments from overridden methods (pt 1)
+
+    It's nearly always better to let doxygen use the base class
+    documentation (unless the subclass docs explicitly add something
+    of value for that subclass). The overriden docs are usually
+    out of date and the duplication makes documentation maintenance
+    harder.
+
+Mathieu Pellerin 	2016-12-30
+
+    [processing] harmonize options menu item location & icon (#3922)
+
+Nyall Dawson 	2016-12-30
+
+    Remove some more redundant qt version checks
+
+Nyall Dawson 	2016-12-30
+
+    Remove some QT_VERSION >= 5 checks
+
+Merge: 4493461396 ef85cdcf83
+Nyall Dawson 	2016-12-30
+
+    Merge pull request #3921 from DelazJ/example
+
+    Spelling fix: Replace "eg" by "e.g." or "for example"
+
+Merge: 5e871557b9 2b937139b4
+Nyall Dawson 	2016-12-30
+
+    Merge pull request #3920 from DelazJ/fixtypos
+
+    Fix more typos
+
+Harrissou Sant-anna 	2016-12-30
+
+    Replace "eg" by "e.g." or "for example"
+
+Harrissou Sant-anna 	2016-12-29
+
+    More spelling checks/fixes
+
+    interactivly
+    labour
+
+Harrissou Sant-anna 	2016-12-29
+
+    Replace rasterise by rasterize
+
+Harrissou Sant-anna 	2016-12-29
+
+    Replace minimise by minimize
+
+Harrissou Sant-anna 	2016-12-29
+
+    Replace capitalise by capitalize
+
+Merge: 1d58e532b8 a920e3a950
+Nyall Dawson 	2016-12-30
+
+    Merge pull request #3917 from alexbruy/improve-settings
+
+    improve fragile settings handling
+
+Larry Shaffer 	2016-12-29
+
+    [pyqgis-console] Use python3 for editor subprocess calls
+
+alisovenko 	2016-12-29
+
+    Fix descriptions and code style. Change Z geomtry type for memory layer from ..25D to ..Z.
+
+Alexander Bruy 	2016-12-29
+
+    improve settings handling
+
+Alexander Bruy 	2016-12-29
+
+    [processing] fix GRASS provider (follow up a1642a37)
+
+Mathieu Pellerin 	2016-12-29
+
+    [ui] settings menu cleanup (#3916)
+
+    - rewording of several items for increased clarity
+    - re-ordering to have more often used items first
+    - new icons for keyboard shortcuts and interface customization
+
+Merge: 25697a1e41 828e447991
+Nyall Dawson 	2016-12-29
+
+    Merge pull request #3915 from DelazJ/fixtypos
+
+    Fix typos
+
+nirvn 	2016-12-29
+
+    improve default favorites for color ramps
+
+DelazJ 	2016-12-21
+
+    More spelling fixes
+
+    * editation
+    * definintion
+    * Unabled
+    * capitalize QGIS
+    * replace algs by algorithms
+    * queryings
+    * symbo(s)
+    * missing space after a dot
+
+Harrissou Sant-anna 	2016-12-29
+
+    Replace flavour by flavor
+
+Harrissou Sant-anna 	2016-12-29
+
+    Replace prioritise by prioritize
+
+Harrissou Sant-anna 	2016-12-29
+
+    Replace more splitted by split
+
+DelazJ 	2016-12-21
+
+    Replace unicode by Unicode
+
+DelazJ 	2016-12-21
+
+    Replace cellsize by cell size
+
+DelazJ 	2016-12-20
+
+    Some fixes of favourites --> favorites
+
+Nyall Dawson 	2016-12-29
+
+    Make sure QgsApplication members are initialized to nullptr
+
+    Just in case there's unintended dependancies between the
+    registries
+
+Nyall Dawson 	2016-12-28
+
+    Fix tests
+
+Nyall Dawson 	2016-12-28
+
+    Remove some singletons by moving instances to QgsApplication
+
+    - QgsColorSchemeRegistry
+    - QgsDataItemProviderRegistry
+    - QgsGPSConnectionRegistry
+    - QgsMessageLog
+    - QgsPaintEffectRegistry
+    - QgsPluginLayerRegistry
+    - QgsRasterRendererRegistry
+    - QgsRendererRegistry
+    - QgsSvgCache
+    - QgsSymbolLayerRegistry
+
+Merge: 97215cfae3 4f73c28c5f
+Nyall Dawson 	2016-12-28
+
+    Merge pull request #3909 from nyalldawson/select_in_edit_menu
+
+    Tweak edit/view menus
+
+nirvn 	2016-12-28
+
+    [ui] remove minimumSize on select button in select by exp. dialog
+
+Mathieu Pellerin 	2016-12-28
+
+    [ui] select by form/expression harmonization and feature parity (#3912)
+
+Larry Shaffer 	2016-12-27
+
+    Update connection to new style for macOS Preferences fix
+
+nirvn 	2016-12-28
+
+    [ui] improve search widget ordering
+
+Larry Shaffer 	2016-12-27
+
+    Fix macOS Preferences menu hijacking
+
+Nyall Dawson 	2016-12-28
+
+    Remove santa hat easter egg
+
+    It made a lot of stressed GIS people smile (and as a bonus
+    stressed out some unhappy grinches in the process!), but
+    there's nothing worse than a good easter egg which lives
+    on too long and gets tired.
+
+    RIP santa QGIS... bring on the next easter egg!
+
+Nyall Dawson 	2016-12-27
+
+    [FEATURE] Hide Deselected Layers action
+
+    Allows you to quickly hide all deselected layers. This is very handy
+    when you have a large project and want to quickly hide all except
+    for a couple of layers
+
+Nyall Dawson 	2016-12-27
+
+    [needs-docs] Move Show/Hide Layer actions to View menu
+
+    These logically belong in the view menu
+
+Nyall Dawson 	2016-12-27
+
+    [needs-docs] Move Select submenu from View menu to Edit menu
+
+    Selection tools are usually located within the edit menu directly
+    after the clipboard tools. View menu is usually populated with
+    actions which affect only the view, rather then editing the
+    document (project or layer) state.
+
+Merge: f3d618a6ed f40e914b76
+Alexander Bruy 	2016-12-27
+
+    Merge pull request #3907 from alexbruy/remove-gdaltools
+
+    [FEATURE] replace GDALTools plugin with Processing
+
+nirvn 	2016-12-27
+
+    Add between/not between to numerical fields in select by form
+
+nirvn 	2016-12-27
+
+    [ui] Ctrl+F3 shortcut to open select features by expression
+
+Harrissou Sant-anna 	2016-12-27
+
+    [ui] expression icon cleanups (#3908)
+
+    * Add expression icon to several buttons for consistency
+    * Replace mIconExpressionEditorOpen icon with mIconExpresssion
+
+nirvn 	2016-12-27
+
+    [ui] rename the min/max widget group box title
+    Since there is no more loading involved through
+    the min/max widget, rename it to:
+    "Min /max values settings"
+
+nirvn 	2016-12-27
+
+    Followup 932de2a: fix missing back icon for sub-panels
+
+Nyall Dawson 	2016-12-27
+
+    Fix build
+
+Nyall Dawson 	2016-12-27
+
+    [FEATURE] Add QgsVectorDataProvider::truncate for clearing layers
+
+    Adds a new method to QgsVectorDataProvider to truncate the layer.
+    The base implementation requires DeleteFeatures capability and
+    is not optimised. Providers can return the FastTruncate capability
+    and override the base implementation with a provider specific
+    optimised version. This is done in this commit for the Postgres
+    and Spatialite providers.
+
+Nyall Dawson 	2016-12-27
+
+    Add a base class implemention for QgsVectorDataProvider::changeFeatures
+
+    Previously this method would only succeed for providers which
+    explicitly implement it. Now, providers which do not implement
+    changeFeatures but do support both ChangeAttributeValues
+    and ChangeGeometries capabilities will use a non-optimised
+    version of changeFeatures which calls changeAttributeValues
+    and changeGeometries in turn.
+
+    This makes QgsVectorDataProvider::changeFeatures easier to use
+    in scripts - instead of writing manual fallbacks for providers
+    which do not implement it you can instead safely call this
+    method regardless of the provider and it will succeed wherever
+    both the attributes/geometries can be changed.
+
+    Also add a provider unit test covering this.
+
+Merge: 9c6883711b 239b342a3f
+Mathieu Pellerin 	2016-12-27
+
+    Merge pull request #3887 from nirvn/raster_pseudocolor_move
+
+nirvn 	2016-12-27
+
+    [FEATURE] Raster stretch toolbar actions support for pseudocolor renderer
+
+nirvn 	2016-12-26
+
+    [FEATURE] Implement raster pseudocolor updated extent auto classification
+
+nirvn 	2016-12-17
+
+    [raster] move pseudocolor renderer classification out of gui into core
+
+Nyall Dawson 	2016-12-27
+
+    Enable edit tests for Postgres provider
+
+Harrissou Sant-anna 	2016-12-27
+
+    Remove mActionDiagramProperties.svg icon (#3910)
+
+Nyall Dawson 	2016-12-27
+
+    Rename Select by Expression to Select Features by Expression
+
+    to match naming of other Select By... tools
+
+Nyall Dawson 	2016-12-27
+
+    Make Select by Form default instead of By Expression
+
+    Since it's more user-friendly for beginners
+
+Nyall Dawson 	2016-12-27
+
+    Show NULL preview text in expression editor
+
+    Makes creating/debugging expressions easier for users
+
+Nyall Dawson 	2016-12-27
+
+    Fix incorrect aggregate values returned for empty sets (fix #16008)
+
+    Now empty sets return NULL values for invalid statistics
+
+Juergen E. Fischer 	2016-12-26
+
+    fix numeric translation
+
+Juergen E. Fischer 	2016-12-26
+
+    indentation fixes
+
+Juergen E. Fischer 	2016-12-26
+
+    more spelling fixes
+
+Merge: a3faa92339 77ae8a23b6
+Nyall Dawson 	2016-12-27
+
+    Merge pull request #3880 from nyalldawson/oracle_raster
+
+    Remove orphaned oracle raster plugin
+
+Nyall Dawson 	2016-12-16
+
+    [FEATURE] Remove orphaned oracle raster plugin
+
+    Marked as feature to flag for documentation and changelog
+
+Juergen E. Fischer 	2016-12-26
+
+    spelling fixes
+
+alisovenko 	2016-12-26
+
+    Fix code style with astyle.sh
+
+Even Rouault 	2016-12-26
+
+    Contrast enhancement in 'updated extent': fix taking into account OTF mode
+
+Alexander Bruy 	2016-12-26
+
+    [FEATURE] replace GDALTools plugin with Processing
+
+    Tagged as feature to not forget mention in docs and changelog
+
+alisovenko 	2016-12-26
+
+    Add SIP binding for getDefaultZValue
+
+Alexander Bruy 	2016-12-26
+
+    [processing] include start point into service area convex hull
+
+alisovenko 	2016-12-26
+
+    Added the ability to create memory layer with 25d geometry
+
+alisovenko 	2016-12-22
+
+    Add default Z value option. Added the ability to create shape with 2.5d geometry. Change add feature tool fo create geometry with default Z value.
+
+Nikolay Korotkiy 	2016-12-25
+
+    [i18n] integrate esperanto translation
+
+Juergen E. Fischer 	2016-12-24
+
+    dxf import: fix text positions and orientation when importing DXF (fixes #16000)
+
+Even Rouault 	2016-12-23
+
+    Raster renderer GUI: fix switching between renderers, and potential infinite signal notifications.
+
+    Fixes https://github.com/qgis/QGIS/pull/3871#commitcomment-20280621, ie switching between
+    renderers in the raster layer properties dialog or in the style dock result in non optimal
+    parameters, so better switch to default parameters that would be the ones used when
+    adding a layer of the new renderer type to the canvas. This issue already existed in 2.18
+
+    Also fixes a potential infinite notification cycle when having both the style dock and
+    layer properties dialog opened, and applying changes in the layer properties dialog.
+    (related to https://github.com/qgis/QGIS/pull/3871).
+
+Merge: 80b757b6db 1a5671ecae
+Even Rouault 	2016-12-22
+
+    Merge pull request #3903 from webgeodatavore/fix-gdal-ogr-url
+
+    Update outdated URLs
+
+Thomas Gratier 	2016-12-22
+
+    Update unworking and outdated URLs
+
+    GDAL URLs and Spatialite links are outdated (404)
+
+Nyall Dawson 	2016-12-15
+
+    [FEATURE] Add zoom to features shortcut in select by form dialog
+
+    Allows very quick navigation to features which match the criteria
+    in the form
+
+Nyall Dawson 	2016-12-15
+
+    [FEATURE] Show field values in autocompleter in form filter mode
+
+    This adds a new gui widget QgsFieldValuesLineEdit which includes
+    an autocompleter populated with current field values.
+
+    The autocompleter is nicely updated in the background so that
+    the gui remains nice and responsive, even if there's millions
+    of records in the associated table.
+
+    It's now used as a search widget for text fields, so can be seen
+    in the browser window if you set the filter to a text field, or
+    if you launch the form based select/filter by selecting a layer
+    and pressing F3.
+
+Nyall Dawson 	2016-12-15
+
+    Small cleanups to QgsFloatingWidget
+
+Matthias Kuhn 	2016-12-22
+
+    [travis] Decrease maximum ccache size
+
+Matthias Kuhn 	2016-12-22
+
+    Pass variable values as QVariant
+
+Matthias Kuhn 	2016-12-21
+
+    Rename QgsProject::variables to QgsProject::customVariables
+
+Matthias Kuhn 	2016-12-21
+
+    Let QgsApplication manage global custom variables
+
+Merge: ffd67f119e 3fba3ac775
+Alexander Bruy 	2016-12-22
+
+    Merge pull request #3900 from m-kuhn/scriptParams
+
+    [processing] Fix some script parameter export/import issues
+
+Matthias Kuhn 	2016-12-22
+
+    [processing] Quote and escape script exported ParameterString
+
+Matthias Kuhn 	2016-12-21
+
+    [processing] Fix some script parameter export/import issues
+
+Merge: 835abb97b6 ea4f05d931
+Alexander Bruy 	2016-12-22
+
+    Merge pull request #3891 from alexbruy/processing-interpolation
+
+    [processing] add remaining functionalify from the interpolation plugin
+
+Chris Mayo 	2016-12-21
+
+    Add missing dependencies in INSTALL Overview
+
+Matthias Kuhn 	2016-12-21
+
+    Followup cbac49b6: fix docstring
+
+Matthias Kuhn 	2016-12-21
+
+    Add QgsProject::write( filename ) convenience function
+
+Matthias Kuhn 	2016-12-21
+
+    More build dependencies update
+
+Matthias Kuhn 	2016-12-21
+
+    Update build dependencies
+
+Matthias Kuhn 	2016-12-21
+
+    [processing] Make ParameterFixedTable scriptable
+
+Matthias Kuhn 	2016-12-21
+
+    [processing] Don't hide errors when resolving script paramters
+
+Alexandre Neto 	2016-12-21
+
+    Replace PNGs by SVGs (#3896)
+
+    - removes no longer needed SVG compounds
+    - Improves cap and join style icons
+
+Matthias Kuhn 	2016-12-20
+
+    Followup 1a648229
+
+Matthias Kuhn 	2016-12-20
+
+    Improve some asserts for more meaningful output in case of error
+
+Matthias Kuhn 	2016-12-20
+
+    Use assertIsInstance instead of assertTrue(isinstance())
+
+Alexander Bruy 	2016-12-20
+
+    [processing] fix wrong ParameterSelection definition
+
+Matthias Kuhn 	2016-12-20
+
+    Revert "[Processing] fix parameter to open the Retile algorithm"
+
+    This reverts commit 76b796b4916d4ee23dff1a50105cdf1a6635b388.
+
+Alexander Bruy 	2016-12-20
+
+    [processing] fix incorrect parameter construction
+
+Alexander Bruy 	2016-12-20
+
+    [processing] add support for custom parameter used in interpolation algs
+    to the test suite
+
+Matteo Ghetta 	2016-12-20
+
+    more gdal test for Processing (#3893)
+
+    * more gdal test for Processing
+
+matteo 	2016-12-20
+
+    [Processing] fix parameter to open the Retile algorithm
+
+Alexander Bruy 	2016-12-19
+
+    [FEATURE] remove Interpolation plugin
+
+    tagged as feature to not forget mention this in docs and changelog
+
+Alexander Bruy 	2016-12-19
+
+    [processing] add missed functionality from Interpolation plugin
+
+nirvn 	2016-12-20
+
+    [processing] fix error in MultipleInputWidgetWrapper
+
+nirvn 	2016-12-20
+
+    [processing] support non-ogr layers in merge vector layers alg
+
+Anita Graser 	2016-12-20
+
+    updated help for qgis:mergevectorlayers (#3883)
+
+    "two" => "multiple"
+
+Matthias Kuhn 	2016-12-19
+
+    [travis] Increase cache timeout
+
+    No new caches have been uploaded recently because of timeouts.
+
+Matthias Kuhn 	2016-12-19
+
+    Fix loading legacy snapping configuration
+
+Matthias Kuhn 	2016-12-19
+
+    Only spellcheck added and modified files
+
+Matthias Kuhn 	2016-12-19
+
+    Fix bindings and tests
+
+Matthias Kuhn 	2016-12-19
+
+    Expose QgsSnappingConfig to QML
+
+    Sponsored by QField
+
+Matthias Kuhn 	2016-12-14
+
+    Apply editor widget project upgrades in any case
+
+Matthias Kuhn 	2016-12-12
+
+    Allow compiling without print support
+
+Matthias Kuhn 	2016-12-07
+
+    Let all tests work with a proper QgsApplication instance
+
+Matthias Kuhn 	2016-12-07
+
+    bindings
+
+Matthias Kuhn 	2016-12-07
+
+    Move QgsConfigurationMap to QgsXmlUtils
+
+Matthias Kuhn 	2016-12-07
+
+    Make sure attribute table doesn't use deleted field formatters
+
+Matthias Kuhn 	2016-12-07
+
+    Document QgsValueMapFieldFormatter::NullValue
+
+Matthias Kuhn 	2016-12-07
+
+    Make attribute table aware of disappearing field formatters
+
+Matthias Kuhn 	2016-12-07
+
+    Manage null representation value in QgsApplication::nullRepresentation()
+
+Matthias Kuhn 	2016-12-07
+
+    Fix index-out-of-bounds crash
+
+Matthias Kuhn 	2016-12-07
+
+    Add missing bindings
+
+Matthias Kuhn 	2016-12-07
+
+    API documentation for QgsFieldFormatter caches and more
+
+Matthias Kuhn 	2016-12-07
+
+    Generic code cleanup
+
+Matthias Kuhn 	2016-12-06
+
+    Rename QgsFieldKit to QgsFieldFormatter
+
+Matthias Kuhn 	2016-12-06
+
+    Remove QgsEditFormConfig::widgetType
+
+Matthias Kuhn 	2016-12-05
+
+    Fix failing tests
+
+Matthias Kuhn 	2016-12-05
+
+    Fix warnings
+
+Matthias Kuhn 	2016-12-05
+
+    Document api breakages and add more doxymentation
+
+Matthias Kuhn 	2016-12-05
+
+    Start with empty ValueMap configuration
+
+Matthias Kuhn 	2016-12-05
+
+    Reorder attribute type dialog
+
+Matthias Kuhn 	2016-12-05
+
+    Remove editor widget project loading code from gui
+
+Matthias Kuhn 	2016-12-05
+
+    Remove QgsEditorWidgetConfig
+
+    This is replaced with a QVariantMap. It was never really more than this in the
+    past and with the switch to QgsConfigurationProperties, there is really no
+    longer any reason to assume that this will change.
+
+Matthias Kuhn 	2016-12-04
+
+    Rename `vl` parameters to `layer`
+
+Matthias Kuhn 	2016-12-04
+
+    Python bindings
+
+Matthias Kuhn 	2016-12-03
+
+    Put field kit into use
+
+Matthias Kuhn 	2016-12-03
+
+    Add field kits for a lot of common field types
+
+Matthias Kuhn 	2016-12-02
+
+    Use new-style configuration for loading widgets from the database
+
+Matthias Kuhn 	2016-12-02
+
+    Save and load new-style widget configuration
+
+Matthias Kuhn 	2016-12-01
+
+    Edit widget configuration migration
+
+Matthias Kuhn 	2016-11-14
+
+    Add QgsConfigurationProperty class
+
+    This class holds a QVariantMap to manage key-value-pairs where each
+    value can be a string, bool, int, double or itself a map and can be
+    stored to and restored from XML.
+
+Matthias Kuhn 	2016-12-19
+
+    Make QgsMapThemeCollection QML compatible
+
+    Sponsored by OPENGIS.ch/QField
+
+Denis Rouzaud 	2016-12-19
+
+    do not check in agignore
+
+Denis Rouzaud 	2016-12-19
+
+    [spelling] labelling -> labeling
+
+Merge: 735f479bc8 f71bf57b08
+rldhont 	2016-12-19
+
+    Merge pull request #3878 from dmarteau/removeSOAP
+
+    Server: Remove soap request handler
+
+David Marteau 	2016-12-15
+
+    Server: Remove soap request handler
+
+Denis Rouzaud 	2016-12-19
+
+    [spelling] granularity
+
+Denis Rouzaud 	2016-12-19
+
+    [spellcheck] generated command only replace whole words
+
+Denis Rouzaud 	2016-12-19
+
+    [spellcheck] generate sed commands to fix spelling errors
+
+Matteo Ghetta 	2016-12-19
+
+    Convex Hull processing tests (#3876)
+
+    Add two tests for convex hull
+
+Merge: f9db068fed f4f86cad63
+Alexander Bruy 	2016-12-19
+
+    Merge pull request #3885 from alexbruy/processing-relief
+
+    [processing] add missed functionality from Raster Terrain Analysis plugin
+
+Alexander Bruy 	2016-12-19
+
+    [processing] use full precision for elevation values
+    remove unused file
+
+Alexander Bruy 	2016-12-17
+
+    [FEATURE] remove Raster terrain analysis plugin
+
+    tagged as feature to not forget mention this in docs and changelog
+
+Alexander Bruy 	2016-12-17
+
+    [processing] merge two Relief algorithms into one
+
+Alexander Bruy 	2016-12-17
+
+    [processing] implement missed functionality from Raster terrain analysis
+    plugin
+
+Denis Rouzaud 	2016-12-19
+
+    [spellcheck] ag: use short option to avoid argument error due to syntax differences
+
+Juergen E. Fischer 	2016-12-17
+
+    translation string fixes
+
+Arnaud Morvan 	2016-12-16
+
+    Fix MultipleInputDialog with options not as (value, text) (#3882)
+
+Harrissou Sant-anna 	2016-12-15
+
+    Options to speed up build and launch QGIS
+
+Hannes 	2016-12-15
+
+    python3 print
+
+    QGIS would not build with the old print statements
+
+Even Rouault 	2016-12-16
+
+    QgsMultiBandColorRendererWidget: add missing widgetChanged() notification
+
+Merge: 5dc39e0a41 532eb58d1f
+Even Rouault 	2016-12-16
+
+    Merge pull request #3871 from rouault/auto_stretch
+
+    [FEATURE] Implement raster auto-stretching when updating canvas
+
+Even Rouault 	2016-12-15
+
+    [FEATURE] Implement raster auto-stretching when updating canvas
+
+    This commit implements the improvements described at:
+    https://lists.osgeo.org/pipermail/qgis-developer/2016-September/044393.html
+
+    The QgsRasterMinMaxWidget now offers a seetting to specify that the statistics
+    should be computed each time the canvas extent changes.
+
+    Other changes:
+    - the content of the QgsRasterMinMaxWidget is now persistant.
+    - there is no longer any Load button. The global Apply / OK button of the raster
+      properties dialog has this effect.
+    - the default "limits" for single band raster is now MinMax and not CumulativeCut
+    - the default "limits" can be configured for single band, multi band single byte and
+      multi band multi byte
+    - "Strech using current extent" honours the "limits" instead of forcing min/max.
+
+Even Rouault 	2016-12-15
+
+    Add QGSCOMPARENOTNEAR(value,not_expected,epsilon) macro
+
+Alexander Bruy 	2016-12-16
+
+    [processing] use point parameter in GRASS algs where possible (addresses #15983)
+
+Nyall Dawson 	2016-12-16
+
+    Add some data modification tests to providertestbase
+
+    Tests for addFeatures, deleteFeatures, changeAttributeValues
+    and changeGeometryValues
+
+    Implemented for memory, ogr and spatialite providers
+
+Tudor Bărăscu 	2016-12-16
+
+    Add missing qt5 build dependency (#3874)
+
+Juergen E. Fischer 	2016-12-15
+
+    indentation fix
+
+Juergen E. Fischer 	2016-12-15
+
+    dwg import: make curves optional (enabled by default, disabled completely with GDAL 1)
+
+Merge: 94b0de562d 1090e8b7da
+Denis Rouzaud 	2016-12-15
+
+    Merge pull request #3857 from 3nids/spellingtest
+
+    Check spelling on travis
+
+Denis Rouzaud 	2016-12-15
+
+    fix prepare commit
+
+Matthias Kuhn 	2016-12-15
+
+    Improved search for the relation reference widget
+
+Denis Rouzaud 	2016-12-15
+
+    follow p 63773034d62174961908e5e6720e60d0fd35489d avoid type check before casting
+
+Denis Rouzaud 	2016-12-15
+
+    spelling fixes
+
+Denis Rouzaud 	2016-12-12
+
+    use Travis to look for spelling errors
+
+    use silver searcher for faster search (instead of grep)
+
+Merge: 5c402b2fde 81e2f87fd0
+Alexander Bruy 	2016-12-15
+
+    Merge pull request #3861 from alexbruy/svg-cleanup
+
+    clean up SVG files from unnecessary data
+
+Martin Dobias 	2016-12-14
+
+    Fix python test
+
+Martin Dobias 	2016-12-14
+
+    Remove QgsLabelingEngineInterface base class and implementation in QgsPalLabeling
+
+    It was ready to go for some time, just waiting for QgsMapRender that still used it.
+
+nirvn 	2016-12-15
+
+    [FEATURE] toggle visibility of opened panels in main window
+    Accessible via:
+    - View menu > Toggle Panels Visibility
+    - Ctrl+Tab keyboard shortcut
+
+Denis Rouzaud 	2016-12-14
+
+    snapping layer tree: do not show layers without geometry
+
+Nyall Dawson 	2016-12-15
+
+    Fix ui build warning
+
+Juergen E. Fischer 	2016-12-14
+
+    [FEATURE] DWG import into geopackage using libdxfrw
+
+Juergen E. Fischer 	2016-12-14
+
+    dxf export: fix crash, when curve geometry can't be segmentized
+
+Juergen E. Fischer 	2016-12-14
+
+    api_break: QgsCrsCache was removed
+
+Juergen E. Fischer 	2016-12-14
+
+    typo fix
+
+Juergen E. Fischer 	2016-12-14
+
+    oracle provider: debug output on usage of 'estimated metadata'
+
+Merge: 8e9d49ad8d 56036d29fe
+Hugo Mercier 	2016-12-14
+
+    Merge pull request #3869 from mhugo/cleanup_server
+
+    Some cleanups in server
+
+matteo 	2016-12-14
+
+    reduce geometry precision from 7 to 5 digits
+
+matteo 	2016-12-14
+
+    remove temp file and update .gitignore
+
+matteo 	2016-12-14
+
+    fix error on geometry precision
+
+matteo 	2016-12-14
+
+    some Processing test
+
+Juergen E. Fischer 	2016-12-14
+
+    indentation update
+
+Alessandro Pasotti 	2016-12-14
+
+    Code cleanup: removed unused slot
+
+Alexander Bruy 	2016-12-14
+
+    update test masks
+
+Hugo Mercier 	2016-12-13
+
+    Improve wmsserver error handling and exception safety
+
+Hugo Mercier 	2016-12-13
+
+    QgsServer cleanup
+
+Hugo Mercier 	2016-12-13
+
+    QgsServerLogger cleanup
+
+nirvn 	2016-12-10
+
+    [FEATURE][raster] transparency support for paletted renderer
+
+Alexander Bruy 	2016-12-12
+
+    clean up SVG files from unnecessary data
+
+rldhont 	2016-12-13
+
+    Fix test for WMS 1.3. compliance: distort image if width/height ratio of bbox is different to WIDTH/HEIGHT of requested image
+
+Martin Dobias 	2016-12-14
+
+    Fix DB manager layer preview after my QgsMapCanvas changes
+
+rldhont 	2016-12-13
+
+    Fix test for WMS 1.3. compliance: distort image if width/height ratio of bbox is different to WIDTH/HEIGHT of requested image
+
+Merge: 9f2657414b 322a565b8b
+volaya 	2016-12-13
+
+    Merge pull request #3725 from arnaud-morvan/processing_geometry_predicate
+
+    [processing] Remove parameter geometry predicate
+
+rldhont 	2016-12-13
+
+    Fix WMS 1.3. compliance: distort image if width/height ratio of bbox is different to WIDTH/HEIGHT of requested image
+
+    Not decrease but increase image
+
+Merge: 01d5233d9e 9d9d162ddf
+Alessandro Pasotti 	2016-12-13
+
+    Merge pull request #3864 from elpaso/downloader-fixes-bad-network
+
+    [BUGFIX] Fixed a crash on bad network protocol
+
+Alessandro Pasotti 	2016-12-13
+
+    Disabled C++ test (use python instead)
+
+Merge: 56633baffc ed0e39e08b
+Alexander Bruy 	2016-12-13
+
+    Merge branch 'remove_grass_6'
+
+Alexander Bruy 	2016-12-13
+
+    [processing] also remove GRASS 6 from tests
+
+Alexander Bruy 	2016-12-13
+
+    [processing] fix CMakeLists.txt
+
+volaya 	2016-12-09
+
+    [processing] removed grass6 provider
+
+Alessandro Pasotti 	2016-12-13
+
+    [BUGFIX] Fixed a crash on bad network protocol
+
+rldhont 	2016-12-13
+
+    [QGIS Server] CITE WMS 130 Test project
+
+    Add a project for OGC CITE WMS 130 tests
+
+Alexander Bruy 	2016-12-13
+
+    [processing] maintain options order
+
+Alexander Bruy 	2016-12-10
+
+    [processing] add algorithm for calculating shortest path from multiple
+    start points defined by vector layer
+
+Alexander Bruy 	2016-12-10
+
+    [processing] add algorithm for calculating shortest path to multiple end
+    points defined by vector layer
+
+Alexander Bruy 	2016-12-10
+
+    [processing] save travel cost to output attribute table
+
+Alexander Bruy 	2016-12-10
+
+    [processing] write start and end points to output attribute table
+
+Alexander Bruy 	2016-12-10
+
+    [processing] add algorithm for calculating service areas from point
+    layer
+
+    Add start point coordinates to outputs
+
+Alexander Bruy 	2016-12-10
+
+    [processing] output service area as polygon and as multipoint
+
+Alexander Bruy 	2016-12-10
+
+    [processing] rename network analysis algs to reflect their inputs type
+
+Alexander Bruy 	2016-12-06
+
+    [FEATURE] remove RoadGraph plugin
+
+    tagged as feature to not forget mention this in docs and changelog
+
+Alexander Bruy 	2016-12-06
+
+    [processing] add tests for network analysis algorithms
+
+    Tests dissabled for now, as algorithms require access to QGIS iface.
+
+Alexander Bruy 	2016-12-04
+
+    [processing] add service area algorithm
+
+Alexander Bruy 	2016-12-03
+
+    [processing] also calculate fastest path
+
+Alexander Bruy 	2016-12-03
+
+    [processing] remove unused variables
+
+Alexander Bruy 	2016-12-03
+
+    [processing] reword algorithm name and some parameter descriptions
+
+Alexander Bruy 	2016-12-03
+
+    [processing] add icon for network analysis algorithm
+
+Alexander Bruy 	2016-12-02
+
+    [processing] adopt algorithm to changes in QGIS API
+
+Alexander Bruy 	2016-11-16
+
+    [processing] add shortest path algorithm to Processing
+
+Mathieu Pellerin 	2016-12-13
+
+    [FEATURE] allow customization of line spacing for legend item labels (#3632)
+
+    * [FEATURE] allow customization of line spacing for legend item labels
+    * add test for legend line spacing and update control images
+
+Nyall Dawson 	2016-12-13
+
+    Fix bad import
+
+Nyall Dawson 	2016-12-13
+
+    Disable another intermittent task manager test
+
+volaya 	2016-12-12
+
+    [processing] config dialog: only save menu configuration if needed
+
+    Conflicts:
+            python/plugins/processing/gui/ConfigDialog.py
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Remove ParameterGeometryPredicate
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Remove ParamaterGeometryPredicate from SelectByLocation algorithm
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Remove ParamaterGeometryPredicate from ExtractByLocation algorithm
+
+arnaud.morvan@camptocamp.com 	2016-11-05
+
+    [processing] Remove ParamaterGeometryPredicate from SpatialJoin algorithm
+
+volaya 	2016-12-08
+
+    [processing] fixes for SAGA folder configuration
+
+    This tries to address some problem with previously set SAGA paths, by always showing the SAGA path config value, and by trying to ruin a built in copy of SAGA if the current SAGA folder is wrong (as it usually happens when updating QGIS)
+
+arnaud.morvan@camptocamp.com 	2016-11-05
+
+    [processing] Support options as (value, text) in ParameterSelection
+
+Merge: 29a05dfa9c 8cda1bbb79
+rldhont 	2016-12-12
+
+    Merge pull request #3809 from pblottiere/render
+
+    replace QgsMapRenderer
+
+rldhont 	2016-12-12
+
+    Adapt WFS capabilties in server test for WMS 1.3.0 compliance
+
+Werner Macho 	2016-12-12
+
+    [TRANS] Adding Translatorname
+
+    Adding new chinese traditional translator
+
+Nyall Dawson 	2016-12-12
+
+    More flaky test disabling
+
+Nyall Dawson 	2016-12-12
+
+    Fix spelling of orthoganilize
+
+Blottiere Paul 	2016-12-09
+
+    fix getLegendGraphics when BBox parameter is used
+
+Blottiere Paul 	2016-11-25
+
+    remove QgsMapRenderer
+
+Martin Dobias 	2016-12-12
+
+    One more fix for doc test
+
+Martin Dobias 	2016-12-12
+
+    Fix doc coverage test
+
+Nyall Dawson 	2016-12-12
+
+    Temporarily disable flaky part of test
+
+Martin Dobias 	2016-12-12
+
+    Rename QgsLegendModelV2 to QgsLegendModel
+
+Martin Dobias 	2016-12-12
+
+    Rename QgsComposerLegendStyle to QgsLegendStyle
+
+Martin Dobias 	2016-12-12
+
+    Remove legacy class QgsComposerLegendItem and subclasses
+
+Martin Dobias 	2016-12-11
+
+    Make it possible to use project as non-singleton
+
+    This is just a first step - it will be a long way to get rid of all
+    the usages of singleton instance in QGIS code.
+
+Martin Dobias 	2016-12-11
+
+    Make doc coverage test happy
+
+Martin Dobias 	2016-12-11
+
+    Make map canvas independent from overview canvas, simplify QgsMapCanvas API
+
+Merge: 6eb330e2b2 04f8704ebd
+Martin Dobias 	2016-12-11
+
+    Merge pull request #3855 from wonder-sk/project-refactoring-part1
+
+    Project refactoring - part I
+
+Martin Dobias 	2016-12-11
+
+    Unit tests for utility methods from qgsmaplayerlistutils.h
+
+Andreas 	2016-12-11
+
+    Fix an array out of bounds access when committing data (#3807)
+
+    This fixes an array out of bounds access when using a layer that consists of a main table with joined in attributes.
+    The provider only tracks the attributes in the main table, but any joined in attributes is also passed to the provider.
+    As the feature attributes is used to govern loop access, there will be an out of bounds access when the first joint
+    attribute is encountered.
+
+    The fix is borrowed from the postgres provider which stops looping through the passed in feature attributes when
+    the limit of table attributes has been met.
+
+Martin Dobias 	2016-12-11
+
+    More test fixes
+
+Martin Dobias 	2016-12-11
+
+    Test fixes and further QgsProject::instance() removals
+
+Merge: fc8493f5d3 bcedb6df7e
+Alessandro Pasotti 	2016-12-10
+
+    Merge pull request #3854 from elpaso/plugin-re-enable
+
+    [SERVER][BUGFIX] Plugin re enable
+
+Alessandro Pasotti 	2016-12-10
+
+    Moved interface to main init
+
+Martin Dobias 	2016-12-10
+
+    Migrate QgsMapThemeCollection away from using layer IDs
+
+Alessandro Pasotti 	2016-12-10
+
+    Plugin re-enabled
+
+Martin Dobias 	2016-12-10
+
+    QgsMapSettings and QgsComposerMap store layers for rendering as weak pointers
+
+    ... instead of using layer IDs which need to be resolved using QgsProject
+
+Martin Dobias 	2016-12-10
+
+    Added missing api docs
+
+Martin Dobias 	2016-12-10
+
+    Merge QgsMapLayerRegistry into QgsProject
+
+    All methods/signals of QgsMapLayerRegistry moved verbatim to QgsProject.
+
+Merge: 8ec3eaf456 ffb6ba7a3e
+Mathieu Pellerin 	2016-12-10
+
+    Merge pull request #3851 from nirvn/raster_ui_improvements
+
+    Raster renderer UI improvements
+
+Merge: fdf2a9dcb7 dd0df199fc
+volaya 	2016-12-09
+
+    Merge pull request #3839 from anitagraser/patch-2
+
+    [processing] Create cost allocation map output
+
+Marco Hugentobler 	2016-12-09
+
+    Backward support for parameters 'MTVER' and 'capabilities' from WMS 1.0.0 is required for WMS 1.1.1
+
+Matthias Kuhn 	2016-12-09
+
+    Fix map canvas test
+
+Matthias Kuhn 	2016-12-07
+
+    Add support for fine-resolution mouse wheel zooming
+
+    Some mouses (notably on mac) have finer resolutions. They send mouse
+    wheel events in a higher frequency but with smaller angleDelta() values.
+    So far, zooming with such mouses was leading to unusable fast zoom
+    actions.
+
+nirvn 	2016-12-09
+
+    [FEATURE][raster] support setting of color and transparency on multiple
+    items in paletted UI
+
+nirvn 	2016-12-09
+
+    [raster] allow multiple row deletion in the singleband pseudo-color UI
+
+nirvn 	2016-12-09
+
+    [FEATURE][raster] support setting of color and transparency on multiple
+    items in the singleband pseudo-color UI
+
+volaya 	2016-12-09
+
+    [processing] made WHERE param optional and advanced in v.surf.rst algorithms
+
+    Fixes #15786
+
+Merge: c713747279 8bc980eed6
+Mathieu Pellerin 	2016-12-09
+
+    Merge pull request #3849 from SrNetoChan/png_cleanup
+
+    Cleaning unused png files and respective folder
+
+volaya 	2016-12-09
+
+    [processing] fixed GRASS algorithm descriptions
+
+Denis Rouzaud 	2016-12-08
+
+    fix #15947 style dock is not refreshed when map layer style changes
+
+Alexandre Neto 	2016-12-09
+
+    Deletes old themes folders
+
+Alexandre Neto 	2016-12-09
+
+    Deletes unused png files from default theme
+
+Nyall Dawson 	2016-12-09
+
+    [FEATURE] Show an alpha slider in color button drop down menu
+
+    Allows quick tweaks to the color alpha
+
+Merge: e41c2a7b05 4b6f3a3ee5
+Nyall Dawson 	2016-12-09
+
+    Merge pull request #3848 from nyalldawson/orthag
+
+    [FEATURE][processing] New algorithm to orthagonalize geometries
+
+Nyall Dawson 	2016-12-09
+
+    [FEATURE][processing] New algorithm to orthagonalize geometries
+
+    Adds a new QgsGeometry::orthagonalize method which tries to make
+    angles in geometries either right angles or straight lines
+
+    Also adds a processing algorithm exposing this feature.
+
+Nyall Dawson 	2016-12-08
+
+    Add some more QgsVector operators, allow use of QgsVector with QgsPointV2
+
+Nyall Dawson 	2016-12-08
+
+    Add methods to add/subtract QgsVectors
+
+volaya 	2016-12-07
+
+    [processing] allow saving custom predefined expressions
+
+Denis Rouzaud 	2016-12-08
+
+    use data rather than indexes to retrieve items
+
+nirvn 	2016-12-08
+
+    [style dock] emit widgetChanged() when raster palette labels updated
+
+Mathieu Pellerin 	2016-12-08
+
+    [ui] fix circular string button location and relocate undo/redo buttons (#3845)
+
+nirvn 	2016-12-08
+
+    [symbology] categorized renderer's default ramp should be random
+
+Merge: ed5a2bca7e 1bdb35d630
+Nyall Dawson 	2016-12-08
+
+    Merge pull request #3843 from nyalldawson/oriented
+
+    Port minimum oriented bounding box to QgsGeometry
+
+Matthias Kuhn 	2016-12-07
+
+    [offlineediting] Fix only synchronize selected features option
+
+    Fix #15830
+
+Alexander Bruy 	2016-12-07
+
+    fix import
+
+volaya 	2016-12-07
+
+    Fixed wrong import
+
+volaya 	2016-12-07
+
+    [processing] added predefined expressions to raster calculator
+
+Merge: ea661e5e3c e0912b8e2d
+Nyall Dawson 	2016-12-07
+
+    Merge pull request #3840 from DelazJ/selectedfeaturesids
+
+    Replace selectedFeaturesIds by selectedFeatureIds
+
+Harrissou Sant-anna 	2016-12-07
+
+    Update API break doc
+
+Nyall Dawson 	2016-12-07
+
+    Avoid key error on fields which should be skipped
+
+Nyall Dawson 	2016-12-07
+
+    Port processing oriented minimum bounding box alg to QgsGeometry
+
+nirvn 	2016-12-07
+
+    [options] remove string search for default snap mode combo box
+
+nirvn 	2016-12-07
+
+    fix snapping test
+
+nirvn 	2016-12-07
+
+    [snapping] move tracing action to snapping toolbar
+
+nirvn 	2016-12-07
+
+    [snapping] fix enable state of snapping widget's elements
+
+nirvn 	2016-12-07
+
+    [snapping] fix default snapping type settings
+
+nirvn 	2016-12-07
+
+    [snapping] fix default snapping enabled state
+
+Nyall Dawson 	2016-12-07
+
+    [processing][heatmap] Fix alg in batch mode, mark some params as advanced
+
+Nyall Dawson 	2016-12-07
+
+    [processing] Use newer basic stats algorithm in vector menu
+
+Merge: c558d516e6 034cc65935
+Nyall Dawson 	2016-12-07
+
+    Merge pull request #3782 from nyalldawson/heatmap
+
+    Port heatmap plugin code to analysis, add processing alg
+
+Nyall Dawson 	2016-12-07
+
+    [FEATURE] Remove c++ heatmap plugin
+
+    No longer required as plugin has been ported to analysis lib
+    with processing frontend
+
+    Marked as feature for docs + changelog notices
+
+Nyall Dawson 	2016-12-07
+
+    [processing][heatmap] custom parameter/widget for output resolution
+
+    Matches current behaviour of c++ heatmap plugin
+
+Nyall Dawson 	2016-12-07
+
+    [heatmap] Avoid gdal warnings, calculate distance from pixel centroid
+
+Harrissou Sant-anna 	2016-12-06
+
+    Replace selectedFeaturesIds by selectedFeatureIds
+
+Nyall Dawson 	2016-11-17
+
+    [FEATURE][processing] Port heatmap plugin to processing algorithm
+
+Nyall Dawson 	2016-10-26
+
+    Move heatmap generation code to analysis lib
+
+    And clean it up a lot
+
+Nyall Dawson 	2016-12-07
+
+    Prevent users from removing layers or closing projects when
+    running tasks depend on those layers
+
+    It's not foolproof because there's many ways to remove layers
+    not through the QGIS gui and tasks should be written to nicely handle
+    layers being removed mid-way through execution.
+
+    But it's still a good warning for users if they accidently try to
+    load a new project and don't realise some task is still running
+    in the background.
+
+Anita Graser 	2016-12-06
+
+    Create cost allocation map output
+
+Anita Graser 	2016-12-06
+
+    Create cost allocation map output
+
+Alexander Bruy 	2016-12-06
+
+    add more QNetwork classes to 2to3 script
+
+Anita Graser 	2016-12-06
+
+    Added second algorithm output
+
+    Second output raster contains cost allocation map, as described in https://grass.osgeo.org/grass70/manuals/r.cost.html#cost-allocation
+
+Sandro Mani 	2016-12-06
+
+    [Geometry Checker] Don't add geometry-less features to feature-pool
+
+Nyall Dawson 	2016-12-06
+
+    Cleanup QgsTask API for dependent layers
+
+nirvn 	2016-12-06
+
+    [raster] improve multiband color widget's band selection
+
+nirvn 	2016-12-06
+
+    [raster] when loading min/max, activate contrast enhancement if set to none
+
+volaya 	2016-12-06
+
+    Revert "[processing] fixed expected test hashes"
+
+    This reverts commit 5c6c18caadb9123c593db085b1c8822f7d74e9f7.
+
+volaya 	2016-12-06
+
+    [processing] In raster calculator, use filename without extension to refer to layer
+
+volaya 	2016-12-05
+
+    [processin] fixed wrong parameter type
+
+Nyall Dawson 	2016-12-06
+
+    Reenable all task manager tests
+
+Nyall Dawson 	2016-12-06
+
+    Prevent closing QGIS while tasks are running
+
+Nyall Dawson 	2016-12-06
+
+    Fix ui build warnings
+
+Alexander Bruy 	2016-12-05
+
+    [processing] prevent divizion by zero (fix #15825)
+
+Merge: abbe281bc7 5c6c18caad
+Alexander Bruy 	2016-12-05
+
+    Merge pull request #3779 from volaya/rastercalculator
+
+    [processing] add native raster calculator
+
+volaya 	2016-12-05
+
+    [processing] fixed expected test hashes
+
+Matthias Kuhn 	2016-12-04
+
+    Preprocess header file in sipdiff to reduce noise
+
+    and common sources of trouble.
+
+volaya 	2016-12-05
+
+    [processing] changed input type from vector layer to table for execute sql algorithm
+
+volaya 	2016-12-05
+
+    [processing] allow multiple selection of tables
+
+nirvn 	2016-12-05
+
+    [style dock] avoid long labels in the point pattern fill UI
+
+Alessandro Pasotti 	2016-12-05
+
+    Replaced the expired SSL certificate and re-enabled OWS PKI test
+
+Alessandro Pasotti 	2016-12-05
+
+    Typo in comment
+
+Hugo Mercier 	2016-12-05
+
+    [virtual layer] Fix xFilter for null value comparisons
+
+Alexander Bruy 	2016-12-02
+
+    fix loading of models containing user-defined scripts
+
+Merge: ab4a37f760 cc702c9c81
+Nyall Dawson 	2016-12-05
+
+    Merge pull request #3004 from nyalldawson/task_manager
+
+    [FEATURE] Task manager
+
+Nyall Dawson 	2016-12-05
+
+    Remove (probably unnecessary) copy_func usage
+
+Nyall Dawson 	2016-12-05
+
+    Add some python docstrings to QgsTask.fromFunction
+
+Nyall Dawson 	2016-12-05
+
+    Update doxygen
+
+Nyall Dawson 	2016-12-05
+
+    Consolidate mutexes
+
+Nyall Dawson 	2016-12-05
+
+    Force QgsTask::run() to fully complete
+
+    Remove support for signal based completion/termination
+
+    Also unfortunately disable a lot of the test suite as a result,
+    since it's not easily translatable
+
+Nyall Dawson 	2016-12-05
+
+    Make QgsTask::start private
+
+    Only allow starting tasks to be done by QgsTaskManager
+
+Nyall Dawson 	2016-12-05
+
+    QgsTask is no longer a QRunnable
+
+    Instead use a private wrapper class to make QgsTask compatible
+    with QThreadPool
+
+Nyall Dawson 	2016-12-05
+
+    Convert QgsTask.fromFunction to a static method
+
+Nyall Dawson 	2016-12-05
+
+    Call QgsTaskWrapper.on_finished with exception rather than result
+
+Nyall Dawson 	2016-12-05
+
+    Don't explode returned values in QgsTaskWrapper
+
+    Breaks returning list values
+
+Nyall Dawson 	2016-11-30
+
+    Remove outdated flaky test ifdefs
+
+Nyall Dawson 	2016-11-30
+
+    Nicer icons and ui for task status
+
+Nyall Dawson 	2016-11-30
+
+    Remove redundant member
+
+Nyall Dawson 	2016-11-29
+
+    Task manager GUI cleanups
+
+Nyall Dawson 	2016-11-29
+
+    Respect QgsTask::CanCancel flag in gui
+
+Nyall Dawson 	2016-11-29
+
+    Tasks are treated as progressless until they first report a progress
+
+Nyall Dawson 	2016-11-29
+
+    Allow task priority to be specified
+
+Nyall Dawson 	2016-11-29
+
+    QThreadPool::cancel was introduced in Qt5.5, so no cancellation
+    possible for Qt < 5.5
+
+    Moral of the story: if you run outdated libraries, you can't
+    expect full functionality from your apps ;)
+
+Nyall Dawson 	2016-11-29
+
+    Fix more racy conditions
+
+    Switch from QtConcurrent::run to QThreadPool::start
+
+    QtConcurrent doesn't give us anyway to cancel queued but not
+    started tasks. QThreadPool does (and also allows us to specify
+    task priority)
+
+Nyall Dawson 	2016-11-28
+
+    Avoid recursive locks
+
+Nyall Dawson 	2016-11-28
+
+    Harden everything up
+
+    And finally fix a racy condition which has been plaguing me for
+    ages
+
+Nyall Dawson 	2016-11-25
+
+    QgsTasks can have subtasks
+
+    Now, a QgsTask can have subtask QgsTasks set by calling
+    QgsTask::addSubTask. Sub tasks can have their own set of
+    dependent tasks.
+
+    Subtasks are not visible to users, and users only see the overall
+    progress and status of the parent task.
+
+    This allows creation of tasks which are themselves built off
+    many smaller component tasks. The task manager will still handle
+    firing up and scheduling the subtasks, so eg subtasks can run
+    in parallel (if their dependancies allow this).
+
+    Subtasks can themselves have subtasks.
+
+    This change is designed to allow the processing concept of
+    algorithms and modeller algorithms to be translatable
+    directly to the task manager architecture.
+
+Nyall Dawson 	2016-11-10
+
+    Remove QgsTaskManager singleton, and instead attach an instance
+    to QgsApplication.
+
+    ie instead of QgsTaskManager.instance(), use
+    QgsApplication.taskManager()
+
+Nyall Dawson 	2016-11-10
+
+    Remove delete* methods from QgsTaskManager API
+
+    On further consideration allowing external control of task
+    deletion is a bad idea.
+
+Nyall Dawson 	2016-11-09
+
+    Fix failing tests
+
+Nyall Dawson 	2016-11-09
+
+    Allow QgsTask subclasses to defined a finished function, which is
+    called when the task has completed (successfully or otherwise).
+
+    This allows for simpler task design when the signal/slot
+    based approach is not required. Just implement run() with your
+    heavy lifting, and finished() to do whatever follow up stuff
+    should happen after the task is complete. finished is always
+    called from the main thread, so it's safe to do GUI operations
+    here.
+
+    Python based tasks using the simplified QgsTask.fromFunction
+    approach can now set a on_finished argument to a function
+    to call when the task is complete.
+
+    eg:
+
+    def calculate(task):
+        # pretend this is some complex maths and stuff we want
+        # to run in the background
+        return 5*6
+
+    def calculation_finished(result, value=None):
+        if result == QgsTask.ResultSuccess:
+            iface.messageBar().pushMessage(
+                'the magic number is {}'.format(value))
+        elif result == QgsTask.ResultFail:
+            iface.messageBar().pushMessage(
+                'couldn\'t work it out, sorry')
+
+    task = QgsTask.fromFunction('my task', calculate,
+                    on_finished=calculation_finished)
+    QgsTaskManager.instance().addTask(task)
+
+    Multiple values can also be returned, eg:
+
+    def calculate(task):
+        return (4, 8, 15)
+
+    def calculation_finished(result, count=None, max=None, sum=None):
+        # here:
+        # count = 4
+        # max = 8
+        # sum = 15
+
+    task = QgsTask.fromFunction('my task', calculate,
+                    on_finished=calculation_finished)
+    QgsTaskManager.instance().addTask(task)
+
+Nyall Dawson 	2016-11-03
+
+    Rename overloaded signal, flip remaining connects to new style
+
+Nyall Dawson 	2016-11-03
+
+    Rename stopped to terminated for consistency
+
+Nyall Dawson 	2016-11-03
+
+    Simplify reporting completion of tasks
+
+    QgsTask subclasses can now return a result (success or fail)
+    directly from QgsTask::run. If they do so then there's no
+    need for them to manually call completed() or stopped()
+    to report their completion.
+
+    Alternatively, tasks can also return the ResultPending value
+    to indicate that the task is still operating and will
+    manually report its completion by calling completed() or
+    stopped(). This may be useful for tasks which rely on external
+    events for completion, eg downloading a file. In this case
+    Qt slots could be created which are connected to the download
+    completion or termination and which call completed() or
+    stopped() to indicate the task has finished operations.
+
+Nyall Dawson 	2016-11-03
+
+    Documentation updates and small API cleanups
+
+Nyall Dawson 	2016-11-03
+
+    Smaller header updates, switch connect style
+
+Nyall Dawson 	2016-05-28
+
+    Add deleteAllTasks to manager
+
+Nyall Dawson 	2016-04-29
+
+    Add python test for task manager
+
+Nyall Dawson 	2016-04-26
+
+    Improvements to task manager ui
+
+Nyall Dawson 	2016-04-26
+
+    New QgsFloatingWidget widget for easy creation of widgets which "float"
+    above a layout.
+
+    Supports setting another widget as a anchor point for the widget, eg
+    the floating widget could be set so that it's always placed to the
+    top-right of the anchor widget.
+
+Nyall Dawson 	2016-04-22
+
+    Fix some crashes
+
+Nyall Dawson 	2016-04-22
+
+    Add handling of dependent layers to task manager
+
+    If a task has dependent layers which are about to be removed,
+    the task will automatically be cancelled
+
+Nyall Dawson 	2016-04-22
+
+    Don't crash when python exceptions occur in non-main thread
+
+Nyall Dawson 	2016-04-21
+
+    Resolve circular dependencies
+
+Nyall Dawson 	2016-04-21
+
+    Improvements to QgsTaskWrapper
+
+Nyall Dawson 	2016-04-21
+
+    Support for dependent tasks
+
+    Cancelling a task on which others depend leads to all these other
+    tasks getting cancelled as well.
+
+Nyall Dawson 	2016-04-21
+
+    Don't block when deleting tasks
+
+Nyall Dawson 	2016-04-21
+
+    Add support for placing queued tasks on hold
+
+Nyall Dawson 	2016-04-20
+
+    API cleanups
+
+Nyall Dawson 	2016-04-19
+
+    Add simple python method QgsTask.fromFunction for creation of tasks
+    from a function without having to create a QgsTask subclass
+
+Nyall Dawson 	2016-04-19
+
+    Api + test cleanups
+
+Nyall Dawson 	2016-04-15
+
+    Make QgsTaskManager handle threading of tasks
+
+Nyall Dawson 	2016-04-15
+
+    Framework for task manager
+
+    Adds new classes:
+    - QgsTask. An interface for long-running background tasks
+    - QgsTaskManager. Handles groups of tasks - also available as a global
+    instance for tracking application wide tasks
+    - QgsTaskManagerWidget. A list view for showing active tasks and their
+    progress, and for cancelling them
+
+    A new dock widget has been added with a task manager widget showing
+    global tasks
+
+nirvn 	2016-12-05
+
+    [color ramp] save/restore invert state for cpt-city ramps
+
+nirvn 	2016-12-05
+
+    Followup 08ee180: more appropriate ramp type property name
+
+Nyall Dawson 	2016-12-05
+
+    Followup 59a0e2
+
+mj10777 	2016-11-11
+
+    Fix #15829 georeferencer - resolve logical error during loadGCPs
+
+Merge: 5f13cbe37b c800998df3
+Nyall Dawson 	2016-12-05
+
+    Merge pull request #3787 from nyalldawson/spatialite_index
+
+    [FEATURE] Create attribute index support for spatialite provider
+
+Nyall Dawson 	2016-12-05
+
+    Blacklist flaky PyQgsAuthManagerPKIOWSTest test
+
+Nyall Dawson 	2016-12-05
+
+    Remove goto's from qgsspatialiteprovider.cpp
+
+Nyall Dawson 	2016-11-19
+
+    [FEATURE] Create attribute index support for spatialite provider
+
+    Allows creation of attribute indexes for spatialite layers
+
+Nyall Dawson 	2016-12-05
+
+    Disable a bunch of actions which don't apply to vector layers
+    without geometry (fix #15933)
+
+Nyall Dawson 	2016-12-05
+
+    Remove unused network header includes from qgsgeometry.cpp
+
+Mathieu Pellerin 	2016-12-04
+
+    [FEATURE] cpt-city catalog support in color ramp's gradient-only mode (#3832)
+
+    cpt-city catalog ramps are now available for gradient-only:
+    - shapeburst fill
+    - gradient fill
+    - inner/outer glow effect
+
+Mathieu Pellerin 	2016-12-04
+
+    [color ramp] improve invert() for discrete gradient ramps (#3833)
+
+Merge: 6009f5a41d 0b9fbeb983
+Mathieu Pellerin 	2016-12-03
+
+    Merge pull request #3827 from nirvn/color_ramp_migration
+
+    Migration of remaining color ramp widgets
+
+nirvn 	2016-12-03
+
+    [raster] fix singleband pseudo-color crash on single-color color presets ramp
+
+nirvn 	2016-12-03
+
+    [color ramp] do not automatically save new ramps
+
+nirvn 	2016-12-03
+
+    [style manager] update ramp type naming button shortcuts
+
+Merge: 1560c7ff1d d863c449f0
+Mathieu Pellerin 	2016-12-03
+
+    Merge pull request #3829 from nirvn/colorrampbutton_save
+
+    - [FEATURE] save existing color ramp function
+    - improve new color ramp type naming
+
+nirvn 	2016-12-02
+
+    QgsColorRampComboBox is dead, long live QgsColorRampButton
+
+nirvn 	2016-12-02
+
+    [symblogy] migrate heatmap renderer color ramp widget
+
+nirvn 	2016-12-02
+
+    [effects] migrate inner/outer glow color ramp widget
+
+nirvn 	2016-12-02
+
+    [symbology] migrate shapeburst color ramp widget
+
+nirvn 	2016-12-03
+
+    improve new color ramp type naming
+
+nirvn 	2016-12-03
+
+    [FEATURE] save existing color ramp function
+
+Harrissou Sant-anna 	2016-12-03
+
+    Use a standardized size for authentication dialogs icons (#3824)
+
+Webmaster 	2016-12-02
+
+    partial revert of commit 4b680ca
+
+Mathieu Pellerin 	2016-12-02
+
+    [style dock] re-order vector layer rendering group to save vertical space (#3828)
+
+volaya 	2016-12-02
+
+    [processing] fixed gdal proximity
+
+    Fixes #15895
+
+Bernhard Ströbl 	2016-11-24
+
+    [processing][FEATURE] Return multi geometries from split alg
+
+    accept multi geometries as input
+
+Merge: eb85e3fcfa 7de1cc2f13
+Nyall Dawson 	2016-12-02
+
+    Merge pull request #3825 from nyalldawson/legend_count
+
+    QgsVectorLayer::featureCount( QgsSymbol* symbol ) to featureCount( const QString& legendKey )
+
+Mathieu Pellerin 	2016-12-02
+
+    [raster] migrate singleband pseudo-color renderer color ramp widget (#3817)
+
+Richard Schoerghofer 	2016-12-02
+
+    Update qgis_icon_xmas.svg (#3820)
+
+    the positioning of the svg was not optimal, because the xmas hat is allways cutted, now all is in the documents view area.
+
+Nyall Dawson 	2016-12-02
+
+    Removed unused QgsLayerTreeModelLegendNode::SymbolLegacyRuleKeyRole
+
+Nyall Dawson 	2016-12-02
+
+    Change QgsVectorLayer::featureCount( QgsSymbol* symbol ) to instead
+    use a legend key string
+
+    Avoids crashes due to symbol pointer lifetime issues
+
+Nyall Dawson 	2016-12-02
+
+    Fix ui build warning
+
+Nyall Dawson 	2016-12-02
+
+    Small cleanups for QgsColorRampButton
+
+drnextgis 	2016-12-01
+
+    Add QIntValidator and qVersion to fix_pyqt
+
+Merge: 3bd8a29ad5 898ca57dc6
+mhugent 	2016-12-01
+
+    Merge pull request #3812 from mhugent/wms_1_3_compliance
+
+    Wms 1 3 compliance
+
+Sandro Mani 	2016-12-01
+
+    [Geometry checker] Fix possible use of deleted geometry
+
+Harrissou Sant-anna 	2016-12-01
+
+    Show only selected features vertices by default (#3821)
+
+    * Show only selected features vertices by default
+
+    * Show only selected features vertices by default
+
+    * Show only selected features vertices by default
+
+Marco Hugentobler 	2016-12-01
+
+    Indentation
+
+drnextgis 	2016-12-01
+
+    Fix mapping for 2to3 fix_pyqt
+
+volaya 	2016-12-01
+
+    [processing] removed incompatible basestring check
+
+Marco Hugentobler 	2016-12-01
+
+    Fix access control tests such that bbox width/height ration matches image width/height
+
+Alexander Bruy 	2016-11-17
+
+    [processing] values() is a dict view object, not list
+
+Alexander Bruy 	2016-11-17
+
+    [processing] xrange() removed, should use range() instead
+
+Alexander Bruy 	2016-11-17
+
+    [processing] replace deprecated % operator with format()
+
+Alexander Bruy 	2016-11-25
+
+    [processing] indentation update
+
+Alexander Bruy 	2016-11-17
+
+    [processing] iteritems() removed, should use items() instead
+
+volaya 	2016-11-22
+
+    renamed ParameterExpression in raster calculator to avoid name clash
+
+volaya 	2016-11-17
+
+    [processing] removed debug line
+
+volaya 	2016-11-17
+
+    [processing] added tests for raster calculator
+
+    Conflicts:
+            python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
+
+volaya 	2016-11-17
+
+    [processing] added native raster calculator algorithm
+
+    Conflicts:
+            python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
+
+volaya 	2016-11-17
+
+    [processing] some fixes and changes in parameters and parameters panel
+
+Merge: 2c4eb3cb8c b30a1ff65d
+Nyall Dawson 	2016-12-01
+
+    Merge pull request #3816 from nyalldawson/processing_datetime
+
+    [processing][FEATURE] New unified basic stats algorithm
+
+volaya 	2016-11-08
+
+    [processing] allow selecting multiple file in ‘add script from file’
+
+Harrissou Sant-anna 	2016-12-01
+
+    Add new tips on startup, fix some outdated (#3806)
+
+    * Add new tips on startup, fix some outdated
+
+    and emphasize some items with bold.
+    Sur la branche patch-1
+
+    * Improve tips
+
+    * fix quotation
+
+Marco Hugentobler 	2016-12-01
+
+    WMS server: parse bounding box only if the BBOX parameter is really there
+
+Marco Hugentobler 	2016-12-01
+
+    Adapt expected capabilities / project settings response in server test for WMS 1.3.0 compliance
+
+Merge: c42dad3b1d e9b835a376
+Matthias Kuhn 	2016-12-01
+
+    Merge pull request #3818 from drnextgis/2to3
+
+    Add QEventLoop to fix_pyqt
+
+drnextgis 	2016-12-01
+
+    Add QEventLoop to fix_pyqt
+
+Nyall Dawson 	2016-11-30
+
+    [FEATURE][processing] New universal 'basic stats for field' algorithm
+
+    Replaces the existing 'Basic Stats for Numeric Fields' and
+    'Basic Stats for String Fields' algorithms and adds support
+    for date/time/datetime fields.
+
+    Having a single unified algorithm allows more flexible models
+    where a field type may not be known in advance.
+
+    Deprecate existing basic stats algorithms
+
+Nyall Dawson 	2016-11-30
+
+    [processing] Fix updating results panel to match selected item
+
+Larry Shaffer 	2016-11-30
+
+    Fix unset variable error for CHECK_GRASS_EXTRA_INCLUDE_DIRS macro
+
+Mathieu Pellerin 	2016-11-30
+
+    [symbology] migrate graduated renderer color ramp widget (#3815)
+
+Nyall Dawson 	2016-11-30
+
+    Implement time stats for QgsDateTimeStatisticalSummary
+
+Nyall Dawson 	2016-11-30
+
+    Fix QgsDateTimeStatisticalSummary handling of non-datetime values
+
+Nyall Dawson 	2016-11-30
+
+    [processing] Allow restricting fields to date/time types
+
+Nyall Dawson 	2016-11-30
+
+    [processing] Basic stats algs should allow non-spatial tables
+
+Merge: 57f17e31e2 a755f08ba6
+Mathieu Pellerin 	2016-11-30
+
+    Merge pull request #3810 from nirvn/colorrampbutton
+
+    [FEATURE] color ramp button widget
+
+nirvn 	2016-11-30
+
+    add test coverage for qgscolorramp's invert() function
+
+nirvn 	2016-11-29
+
+    color ramp button widget for gradiant fill and categorized renderer
+
+nirvn 	2016-11-29
+
+    [FEATURE] color ramp button widget
+
+nirvn 	2016-11-28
+
+    [color ramp] implement invert() function
+
+Nyall Dawson 	2016-11-30
+
+    [processing] Use QgsStringStatisticalSummary in basic stats for strings
+
+    And also further optimise the algorithm
+
+Nyall Dawson 	2016-11-30
+
+    [processing] Optimise basic stats numbers algorithm
+
+Nyall Dawson 	2016-11-30
+
+    Allow QgsStringStatisticalSummary to calculate mean string length
+
+Merge: 5b97b4ab0b 6bb4934907
+Nyall Dawson 	2016-11-30
+
+    Merge pull request #3808 from nyalldawson/processing_dupe_remove_rings
+
+    [processing] Remove duplicate fill holes algorithm
+
+Nyall Dawson 	2016-11-30
+
+    [FEATURE][processing] Remove duplicate create points along lines script
+
+    This functionality is duplicated by the PointsAlongGeometry algorithm
+
+    Keep the algorithm version, since it has unit tests and supports things
+    like progress reports.
+
+    (marked as feature for inclusion in release notes)
+
+Nyall Dawson 	2016-11-30
+
+    [FEATURE][processing] Remove duplicate fill holes algorithm
+
+    The Fill_holes script is duplicated by the DeleteHoles algorithm,
+    and the DeleteHoles algorithm has many advantages:
+    - it's a full algorithm rather than a script
+    - uses qgis geometry classes and maintains curves/z/m
+    - has unit tests
+    - doesn't rely on non-standard external library (shapely)
+
+    (marked as feature for inclusion in release notes)
+
+Merge: 61b599ed0e 4d71cf968c
+Nyall Dawson 	2016-11-30
+
+    Merge pull request #3813 from rldhont/bugfix_pointdisplacement_filter_legend
+
+    [BUGFIX] Filter Legend By Map Content doesn't maintain point displacement legend
+
+rldhont 	2016-11-29
+
+    [BUGFIX] Filter Legend By Map Content doesn't maintain point displacement legend
+
+    Fixed #11572
+    Needs to be backported and adapted to version 2.14
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3 compliance: Each OnlineResource URL intended for HTTP Get requests in the capabilities document is a URL prefix
+
+Alessandro Pasotti 	2016-11-29
+
+    Added histogram values to the bindings
+
+Marco Hugentobler 	2016-11-29
+
+    Exception format is XML, not capabilities format
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3. compliance: distort image if width/height ratio of bbox is different to WIDTH/HEIGHT of requested image
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: If a layer bounding box is there, it is not allowed to be empty (also if a layer has only one point)
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: throw exception if bbox is empty
+
+Marco Hugentobler 	2016-11-29
+
+    Fix typo
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: exception format must be advertized as 'XML', not 'text/xml'
+
+borys 	2016-11-29
+
+    [bugfix] Fix broken docks customization. Fixes #8055
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: CRS:84  needs to be supported
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: support BGCOLOR parameter
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: throw exception if feature info point is not within the WIDTH/HEIGHT parameters
+
+Marco Hugentobler 	2016-11-29
+
+    WMS 1.3.0 compliance: use the reserved word 'None' if no fees
+
+Merge: c147ee2bf3 8c8db0eb51
+Larry Shaffer 	2016-11-28
+
+    Merge pull request #3803 from dakcarto/qt5py3-more-mac-fixes
+
+Nyall Dawson 	2016-11-29
+
+    Rename minimum area paremeter, fix docs for QgsCurvePolygon::removeInteriorRing
+
+Médéric RIBREUX 	2016-11-24
+
+    Add with .. to all subprocesses
+
+Médéric RIBREUX 	2016-11-23
+
+    Fix subprocess unclosed file
+
+Nyall Dawson 	2016-11-28
+
+    [processing] Consolidate 'delete holes' algorithms
+
+    Copy min area parameter from 'Fill holes' algorithm to 'delete
+    holes' algorithm.
+
+    Also:
+
+    - make algorithm maintain z/m values
+    - make algorithm work with curved geometries
+    - add unit tests
+
+Nyall Dawson 	2016-11-28
+
+    Add method to QgsGeometry to remove interior rings from a polygon
+
+    With an optional area threshold
+
+Even Rouault 	2016-11-25
+
+    Fix previous commit
+
+Even Rouault 	2016-11-25
+
+    Replace calls to the now-deprecated-in-GDAL-trunk OGRFree() by CPLFree()
+
+Merge: 95072e9bfd 772b769403
+Alexander Bruy 	2016-11-25
+
+    Merge pull request #3799 from nyalldawson/processing_grids
+
+    [processing] Unify duplicate grid creation algorithms
+
+Larry Shaffer 	2016-11-24
+
+    Ensure GRASS plugin CMake extra includes macro works for all versions
+
+Larry Shaffer 	2016-11-24
+
+    [processing] Ensure reading of shortHelp yaml files as UTF-8
+
+    On macOS 10.11 with Py 3.5.2, .yaml files defaulted to ASCII and failed.
+
+Larry Shaffer 	2016-11-24
+
+    Add GRASS plugin CMake macro to find extra includes of GRASS compilation
+
+    Such includes may need found again when including some GRASS headers.
+
+Larry Shaffer 	2016-11-24
+
+    Add default sip directory to search for Qsci sip files
+
+    Handles instance where Qsci directory is outside of PyQt5 sip directory.
+    The default sip directory is logical additional place to search.
+
+Larry Shaffer 	2016-11-24
+
+    Flip CMake finds for Qt-based frameworks, to ensure Headers are searched
+
+    Search for libraries first, before includes, so any frameworks found can
+    have their Headers subdirectory added to search paths for includes.
+
+    - Reintroduce qwt and qscintilla2 base library names for searching.
+
+Merge: fdc0a3f874 f83351be25
+Alexander Bruy 	2016-11-24
+
+    Merge pull request #3802 from alexbruy/processing-scripts
+
+    [processing] script editor UI improvements
+
+Alexander Bruy 	2016-11-24
+
+    [processing] remove statusbar from script editor
+
+Alexander Bruy 	2016-11-24
+
+    [processing] improve script editor dialog
+
+    Use QMainWindow instead of QDialog, add normal toolbar instead of
+    QToolButtons. Also fix some issues caused by Qt5 switch.
+
+Merge: ac721d3344 a6ebe830b0
+Alexander Bruy 	2016-11-24
+
+    Merge pull request #3800 from nirvn/processing_modeler_panels
+
+    [processing] upgrade modeler to make use of qgsdockwidgets
+
+nirvn 	2016-11-24
+
+    [processing] python3/pyqt5 fixes for get scripts and models dialog
+
+nirvn 	2016-11-24
+
+    [processing] upgrade modeler to make use of qgsdockwidgets
+
+Nyall Dawson 	2016-11-24
+
+    [processing] Hide redundant grid creation algorithms
+
+    Condenses the duplicate grid algorithms into single algorithms
+    (one for line, one for polygon), taking the best bits from both
+    and adding tests
+
+Nyall Dawson 	2016-11-24
+
+    Fix QgsFields::lookupField returns bad result for empty field name
+
+    QString::isNull vs ::isEmpty strikes again!
+
+Germán Carrillo 	2016-10-27
+
+    Adding test to Line Intersection algorithm
+
+    Since both input and intersect layers have only one field (fid), the result is the same for both (existing and new) tests. The result now comes with the intersect field, renamed to fid_1 (previously not kept).
+
+Germán Carrillo 	2016-10-27
+
+    Make QGIS Line Intersections algorithm able to keep all attributes.
+
+Nyall Dawson 	2016-11-24
+
+    [processing] Fix file format combo showing formats in random orders
+
+Nyall Dawson 	2016-11-24
+
+    [FEATURE][processing] New 'drop geometries' algorithm
+
+    Simply removes any geometries from an input layer and returns
+    the features with attributes only
+
+Nyall Dawson 	2016-11-24
+
+    Small tweaks to processing split algorithm, add tests
+
+Bernhard Ströbl 	2016-09-28
+
+    [processing] [FEATURE] SplitWithLines
+
+    Rename algorithm SplitLinesWithLines to SplitWithLines
+    Accept polygon as input, too
+    Use only selected lines to split with (if processing is set to use selection only)
+    Issue log message if trying to split multi geometries
+    Update help
+
+Nyall Dawson 	2016-11-24
+
+    [processing] Tweak test precision
+
+Nyall Dawson 	2016-11-24
+
+    Add another .aux.xml to .gitignore
+
+Nyall Dawson 	2016-11-24
+
+    [processing] Add tests for create points from table alg
+
+Nyall Dawson 	2016-11-24
+
+    [processing] Allow alg tests to use ParameterTable inputs
+
+Matthias Kuhn 	2016-11-23
+
+    Followup f3482d2: mapThemeStyleOverrides is plural
+
+Matthias Kuhn 	2016-11-23
+
+    Some more adjustments for the attribute type dialog
+
+Harrissou Sant-anna 	2016-11-16
+
+    Rework the Edit widget properties dialog
+
+Merge: 0a0de8012e f2fa7bd473
+volaya 	2016-11-23
+
+    Merge pull request #3768 from DelazJ/patch-19
+
+    Typo fix in Processing help file
+
+Merge: d559d7ff25 6e2288dccb
+volaya 	2016-11-23
+
+    Merge pull request #3796 from nirvn/processing_modeler_msgbar
+
+    [processing] switch a couple of modeler pop up dialogs to message bars
+
+nirvn 	2016-11-23
+
+    [processing] switch a couple of modeler pop up dialogs to message bars
+
+Matthias Kuhn 	2016-11-23
+
+    Partially revert 9bb3235
+
+    The -DCMAKE_POSITION_INDEPENDENT_CODE=ON resolves to -fPIE instead
+    of -fPIC (on some platforms?) rendering cmake broken.
+
+Merge: 489e00df8d 2652aa50c9
+Alexander Bruy 	2016-11-23
+
+    Merge pull request #3795 from nirvn/modeler_toolbar
+
+    [processing] improve the modeler dialog UI and icons
+
+nirvn 	2016-11-23
+
+    [processing] improve the modeler dialog UI and icons
+    - use a proper toolbar to match other parts of QGIS
+    - show keyboard shortcuts in toolbar action tooltips
+    - create vector icons to replace PNG ones
+
+Nyall Dawson 	2016-11-23
+
+    [processing] Enhance create points layer alg
+
+    Clean up code, allow setting z/m columns
+
+Nyall Dawson 	2016-11-23
+
+    [processing] Fix very broken delete columns algorithm
+
+Merge: 311f482725 eca83e3c0f
+Larry Shaffer 	2016-11-22
+
+    Merge pull request #3790 from dakcarto/qt5py3-mac-fixes
+
+    Qt5py3 Mac fixes
+
+Nathan 	2016-06-05
+
+    Move profiler instance to QgsApplication
+
+Nyall Dawson 	2016-11-23
+
+    Fix misleading indentation warnings caused by messy qtermwidget code formatting
+
+Alexander Bruy 	2016-11-22
+
+    fix typo
+
+Hugo Mercier 	2016-11-22
+
+    [db manager] Fix virtual layer uid handling
+
+Hugo Mercier 	2016-11-22
+
+    [virtual] disable FilterRect when no unique id is present. Should fix #15134
+
+Merge: d716640403 e2265290b0
+Matthias Kuhn 	2016-11-22
+
+    Merge pull request #3793 from nirvn/default_styles_imp
+
+    [style manager] new default symbols shipped with QGIS & add a set of pre-defined tags
+
+nirvn 	2016-11-21
+
+    [style manager] refresh symbols shipped by default & add tags
+
+nirvn 	2016-11-21
+
+    [style] speed up importXML() by using SQL transaction
+    Gains are significant, importing 100 symbols would take 2.86s,
+    but takes only 0.18s when using transaction.
+
+nirvn 	2016-11-21
+
+    [style] improve creation of default style db
+    Instead of copyign a pre-existing .db shipped with QGIS, create
+    a new .db and import an .xml file containing our default  symbols.
+
+    On the UX front, the main benefit is being able to ship with
+    pre-defined tags and favorite flags for the default symbols.
+
+    On the developer side, it means we get rid of the requirement
+    to maintain both an .xml and a binary .db in the source tree.
+    We also say aurevoir to the symbol_xml2db.py script and the
+    need to update the (obsolete) script every time we add a new
+    feature to QgsStyle.
+
+nirvn 	2016-11-21
+
+    package symbology-ng-style.xml instead of the .db file
+
+Martin Dobias 	2016-11-22
+
+    Remove usage of legendInterface() from plugins (followup e5f62e49)
+
+Mathieu Pellerin 	2016-11-22
+
+    [symbology] respect mixed unit when applying symbol from list widget (#3792)
+
+Merge: e5f62e49ce 20dc7fb266
+Nyall Dawson 	2016-11-22
+
+    Merge pull request #3766 from nyalldawson/processing_context2
+
+    [processing] Fix hangs when running algorithms
+
+Nyall Dawson 	2016-11-22
+
+    [FEATURE] raster_statistic expression function for retrieving
+    raster band stats from a loaded layer
+
+    Allows raster band stats (eg min, max, avg) to be used in
+    expressions
+
+Nyall Dawson 	2016-11-16
+
+    Remove layer extent and statistic variables from processing contexts
+
+    These variables take a lot of time to calculate and cause lots of
+    lengthy hangs in processing. (Eg add some moderately large rasters
+    to a project, then try to run any processing algorithm and QGIS
+    will freeze).
+
+    The layer extent can already be used in expressions via the
+    layer_property function, which only evalutes the extent if required
+    and only for layers it is used for.
+
+    The band stats for raster layers should be moved to a
+    band_statistic function in core which behaves the same way.
+
+Nyall Dawson 	2016-11-16
+
+    [processing] Use real map settings scope instead of custom canvasextent variables
+
+Martin Dobias 	2016-11-21
+
+    Remove legacy QgsLegendInterface, move still valid methods to QgisInterface
+
+Nyall Dawson 	2016-11-22
+
+    [FEATURE] Expression variables for project CRS
+
+    Adds @project_crs and @project_crs_definition variables
+    for retrieving the current project CRS
+
+Nyall Dawson 	2016-11-22
+
+    [processing] Fix import to postgis alg when table name not set (fix #15869, 15097)
+
+Merge: 8c8be007b9 82082b44f6
+Nyall Dawson 	2016-11-22
+
+    Merge pull request #3773 from alexbruy/network-analysis
+
+    Network analysis
+
+Nyall Dawson 	2016-11-21
+
+    Remove redundant setLayer slots from QgsField(ComboBox|ExpressionWidget)
+
+    and switch uses of remaining slot to new style connects
+
+Matthias Kuhn 	2016-11-21
+
+    Enable WFS test with a fix to prevent crash on exit (#3774)
+
+    * Revert "Disable failing PyQgsOfflineEditingWFS test"
+
+    This reverts commit 33ee514b5dfdc1b57558cb9007df5b455a59fc17.
+
+    * Let lifetime of layers be controlled by QGIS
+
+Alexander Bruy 	2016-11-21
+
+    add doxygen note
+
+Alexander Bruy 	2016-11-21
+
+    remove word "road" from doxygen comments
+
+Alexander Bruy 	2016-11-21
+
+    rename QgsLineVectorLayerDirector to QgsVectorLayerDirector
+
+Alexander Bruy 	2016-11-21
+
+    rename enum and its values
+
+Alexander Bruy 	2016-11-19
+
+    replace hardcoded magic numbers with enum
+
+Alexander Bruy 	2016-11-19
+
+    rename QgsStrategy to QgsNetworkStrategy to avoid possible future
+    confusion when we will have other stuff with strategies. Also
+    rename corresponding subclasses
+
+Alexander Bruy 	2016-11-19
+
+    make cost() method pure virtual
+
+Alexander Bruy 	2016-11-17
+
+    fix warnings
+
+Alexander Bruy 	2016-11-17
+
+    add note to doxygen comments
+
+Alexander Bruy 	2016-11-17
+
+    update API breaks document
+
+Alexander Bruy 	2016-11-17
+
+    [API] rename QgsArcProperter to QgsStrategy
+
+    Also update subclasses names and do some more refactoring.
+
+Alexander Bruy 	2016-11-17
+
+    add note to the API breaks doc
+
+Alexander Bruy 	2016-11-16
+
+    doxymentation
+
+Alexander Bruy 	2016-11-16
+
+    remove references to networkanalysis from scrips and packaging files
+
+Alexander Bruy 	2016-11-16
+
+    [API][network analysis] move network analysis into analysis library to
+    be consistent with other analysis stuff
+
+Alexander Bruy 	2016-11-16
+
+    [network analysis] expose speed properter in C++ and Python API
+
+    This allows users to calculate shortest path using travel time
+    as optimization criteria in addition to travel distance.
+
+Merge: eda412d98c 2260780402
+Nyall Dawson 	2016-11-21
+
+    Merge pull request #3789 from nirvn/style_import_export_imp
+
+    [style manager] imporve import and export experience, save symbols' tags & favorite flag
+
+Nyall Dawson 	2016-11-21
+
+    Fix ui build warning
+
+Nyall Dawson 	2016-11-21
+
+    Make max canvas scale 1600% (fix #15861)
+
+    Max canvas sacle should be a multiple of 2 so that zooming in
+    to the max and then back out again results in 100% zoom option.
+
+    Additionally, make the min/max zoom level not come from QSettings
+    as these aren't exposed anywhere
+
+Larry Shaffer 	2016-11-20
+
+    Add CMAKE_POSITION_INDEPENDENT_CODE flag to QCA test for OSSL plugin
+
+Merge: 9679b6a68a b4533cdec0
+Nyall Dawson 	2016-11-21
+
+    Merge pull request #3788 from nyalldawson/rel_dialog
+
+    Add relation dialog improvements
+
+Larry Shaffer 	2016-11-20
+
+    Add a CMake debug include, with simple variables dump for development
+
+Larry Shaffer 	2016-11-20
+
+    Skip missing functionality in identity dialog if QWebKit not installed
+
+Larry Shaffer 	2016-11-20
+
+    Remove Python framework options/finding for Mac; add Homebrew support
+
+    Instead of finding Python interpreter, library and framework on Mac,
+    rely upon the reported paths of the interpreter (executable) to decipher
+    whether a framework is being used, then ensure any such framework has
+    its versioned subdirectory Headers used for includes and the base
+    Python library used directly in linking. This removes ambiguity in
+    framework searching, allowing just the PYTHON_EXECUTABLE (user-defined
+    or from FindPythonInterp module) to control which Python is used.
+
+Larry Shaffer 	2016-11-20
+
+    [auth] Remove dependency on SSL cert utils from auth config class
+
+Larry Shaffer 	2016-11-20
+
+    Update finding QCA OSSL plugin for Qt5 and C++11
+
+Larry Shaffer 	2016-11-20
+
+    Check for Qt5-specific version of Mac qca framework
+
+Larry Shaffer 	2016-11-20
+
+    Check for Qt5 subdirectory in PYQT5_SIP_DIR
+
+Larry Shaffer 	2016-11-20
+
+    Use Qt5 non-OpenSSL define in testing for SSL support
+
+nirvn 	2016-11-20
+
+    [style manager] decrease font size and add name & tags tooltip
+    for the import/export symbol preview list
+
+nirvn 	2016-11-19
+
+    use temporary memory db for style tests (avoids clash with default symbols)
+
+nirvn 	2016-11-19
+
+    [style manager] inform users of successful import
+
+nirvn 	2016-11-19
+
+    [FEATURE][style manager] import/export of symbols' tags
+    and favorite flag
+
+Harrissou Sant-anna 	2016-11-15
+
+    typo fix
+
+nirvn 	2016-11-19
+
+    [style] add createMemoryDB() to QgsStyle to create temporary db
+
+Nyall Dawson 	2016-11-19
+
+    Use standard map layer and field combo boxes in relation add dialog
+
+Nyall Dawson 	2016-11-19
+
+    Swap order of layers in relation add dialog
+
+    Make parent layer come before child layer
+
+Mathieu Pellerin 	2016-11-19
+
+    [style dock] add minimum height to svg image list (#3786)
+
+Alexander Bruy 	2016-11-18
+
+    [processing] move custom parameter definition inside corresponding
+    algorithm
+
+Merge: 72b4e72f05 8fcf8345bd
+Nyall Dawson 	2016-11-18
+
+    Merge pull request #3778 from nirvn/style_manager_ui_imp
+
+    [style manager] improve UI
+
+nirvn 	2016-11-18
+
+    tests for two additional QgsStyle functions: tag() & symbolHasTag()
+
+nirvn 	2016-11-18
+
+    [style manager] sort displayed symbols, insure tags are added only once
+
+Merge: 263ba81c70 5e1a69fc88
+Alexander Bruy 	2016-11-18
+
+    Merge pull request #3783 from nyalldawson/create_attribute_index
+
+    [FEATURE][processing] Create attribute index algorithm
+
+nirvn 	2016-11-18
+
+    [style manager] improve UI
+    - create a dedicated set of buttons for addition of tags and smartgroups
+    to make those actions more visible as well as getting rid of th need to
+    select a tag/smartgroup to create those (turns out to be quite confusing
+    for newcomers)
+    - move UI elements around, regroup {add,remove,edit} symbol buttons to
+    harmonize with other parts of QGIS; the elements' placement feels much
+    more natural now
+
+Nyall Dawson 	2016-11-18
+
+    [FEATURE][processing] Create attribute index algorithm
+
+    Allows creation of an index on an attribute in a layer for faster
+    attribute based filtering
+
+    Support depends on the underlying data provider for the layer
+
+Nyall Dawson 	2016-11-18
+
+    Fix ui build warnings
+
+Matthias Kuhn 	2016-11-17
+
+    Fix some leftover faulty attribute scopes
+
+Matthias Kuhn 	2016-11-17
+
+    Add a simple layer scoped action example
+
+Matthias Kuhn 	2016-11-17
+
+    Fix attribute table actions
+
+Werner Macho 	2016-11-17
+
+    typo change Ctl to Ctrl
+
+    writing convention
+
+Werner Macho 	2016-11-17
+
+    typo fix
+
+    small typo fix
+
+Matthias Kuhn 	2016-11-16
+
+    [travis] Preload libSegFault to debug crashes
+
+Merge: 24ffa15ecf a8a05ba751
+Nyall Dawson 	2016-11-17
+
+    Merge pull request #3777 from nirvn/symbols_preview_padding
+
+    [symbology] add padding value for symbol/coloramp preview
+
+nirvn 	2016-11-17
+
+    [symbology] add padding value for symbol/coloramp preview
+
+Nyall Dawson 	2016-11-17
+
+    [FEATURE][processing] Extract by attribute can extract for null/notnull values
+
+    Adds support for filtering where an attribute value is null or not null
+
+Nyall Dawson 	2016-11-17
+
+    [processing] Fix error with field widget wrapper
+
+Merge: 964ecfd743 5e487cfea4
+Nyall Dawson 	2016-11-17
+
+    Merge pull request #3755 from nirvn/style_manager_upgrade
+
+    [FEATURE] Style management re-work and upgrade
+
+Nyall Dawson 	2016-11-17
+
+    Fix build
+
+Nyall Dawson 	2016-11-16
+
+    Show layer path tooltips in QgsMapLayerComboBox
+
+    Handy for differentiating between multiple layers with the
+    same name
+
+Nyall Dawson 	2016-11-16
+
+    Rename enum values for consistency
+
+Nyall Dawson 	2016-11-16
+
+    [processing] Add file picker to vector/raster/table parameters
+    in modeller
+
+    Makes it obvious that users can set an algorithm vector/raster/
+    table input to a fixed table
+
+Nyall Dawson 	2016-11-16
+
+    [processing] Use native QGIS map layer combobox
+
+    Switches the custom map layer combo box used in the run algorithm
+    dialog across to the standard QGIS map layer combo box
+
+Nyall Dawson 	2016-11-16
+
+    Allow filtering QgsMapLayerComboBox by data provider
+
+Nyall Dawson 	2016-11-16
+
+    Allow showing additional items in QgsMapLayerComboBox
+
+    These may represent additional layers such as layers which
+    are not included in the map layer registry, or paths to
+    layers which have not yet been loaded into QGIS.
+
+Nyall Dawson 	2016-11-16
+
+    Allow showing CRS in QgsMapLayerComboBox
+
+Nyall Dawson 	2016-11-16
+
+    Allow not set choice in QgsMapLayerComboBox
+
+Juergen E. Fischer 	2016-11-16
+
+    oracle provider: allow switching workspaces through property
+
+    (cherry picked from commit 2dc448dfb8c568c20e69fc9e3955e5df63d9a880)
+
+Matthias Kuhn 	2016-11-16
+
+    Disable failing PyQgsOfflineEditingWFS test
+
+Nyall Dawson 	2016-11-14
+
+    Don't use auto generated widgets for fields with provider default
+    value clause
+
+    Using auto widgets may cause the default value clause to be mangled,
+    eg by converting it to a number
+
+Nyall Dawson 	2016-11-14
+
+    Avoid double-evaluating postgres default values
+
+Nyall Dawson 	2016-11-14
+
+    Prioritise provider default literals over reused values when
+    creating a new feature
+
+Nyall Dawson 	2016-11-09
+
+    Port remaining map tools, paste features, offline editing
+    to use new constraint/default clause handling methods
+
+Nyall Dawson 	2016-11-09
+
+    Make sure primary keys are always marked with a unique, not null
+    constraint for all providers
+
+Nyall Dawson 	2016-11-08
+
+    [FEATURE] Improve handling of defaults (inc provider default clauses,
+    literal defaults, and qgis expression defaults) and automatically
+    handle unique value constraints on layers
+
+    Add a new method QgsVectorLayerUtils::createFeature which returns
+    a new feature which includes all relevant defaults. Any fields
+    with unique value constraints will be guaranteed to have a value
+    which is unique for the field.
+
+    Currently only in use by the split feature tool.
+
+    Sponsored by Canton of Zug and the QGEP project
+
+Nyall Dawson 	2016-11-08
+
+    Fix clearing constraints
+
+Nyall Dawson 	2016-11-08
+
+    New method QgsVectorLayerUtils::createUniqueValue
+
+    Returns a new unique attribute value for a layer. For numeric
+    fields this is the max attribute value + 1, for strings we
+    attempt to create a unique value by append _1, _2, etc to either
+    a specified 'seed' value, or failing that to the end of the
+    value of that field from the first feature in the layer.
+
+Nyall Dawson 	2016-11-08
+
+    Add QgsVectorLayer::uniqueStringsMatching() to retrieve
+    a list of unique strings matching a substring for a field
+
+Nyall Dawson 	2016-08-22
+
+    [FEATURE] Add method to get list of unique strings matching
+    a substring from a vector data provider
+
+    Base implementation iterates through all features, but
+    providers can override with optimised versions. Native
+    implementations for postgres, spatialite and OGR included.
+
+Merge: 582a56d85c a3ae0b28fc
+volaya 	2016-11-16
+
+    Merge pull request #3747 from nyalldawson/num_input
+
+    [processing] Restore spin box widget for number inputs outside modeller
+
+Juergen E. Fischer 	2016-11-16
+
+    fix f2e3d53 indentation
+
+Juergen E. Fischer 	2016-11-16
+
+    oracle provider: fix retrieval of column comments for geometryless tables (fixes #15853)
+
+    (cherry picked from commit a62fdb085d741da898f2bbb048c33b58aee9d630)
+
+nirvn 	2016-11-15
+
+    [symbology] draw effect(s) when rendering preview icon
+
+Matthias Kuhn 	2016-11-08
+
+    More api break documentation
+
+Matthias Kuhn 	2016-11-03
+
+    Rename listActions to actions and fix test
+
+Matthias Kuhn 	2016-11-03
+
+    Convert action ids to uuid
+
+Matthias Kuhn 	2016-11-03
+
+    Fix bindings and docs
+
+Matthias Kuhn 	2016-11-03
+
+    Rename scopes to "Field", "Feature", "Layer"
+
+Matthias Kuhn 	2016-10-31
+
+    [feature] Add layer scoped actions
+
+    Within the attribute table, there is a new button to trigger actions
+    which are not based on individual features but instead on the whole layer.
+    Normally they will perform actions based on all features or the selection.
+
+    In addition to this, a lot of cleanup has been done.
+
+nirvn 	2016-11-07
+
+    [FEATURE] Style management re-work and upgrade
+    - A new favorite grouping system was added, which the symbols list
+    widget defaults to
+    - The selected tag / smartgroup in the symbols list widget now
+    persists when switching layers (and across sessions)
+    - The symbols list widget will update the tag / smartgroup combo
+    box when users add / rename / remove categories
+    - Users can now directly tag, as well as add to favorites, symbols
+    while saving those to the style database
+    - To streamline style management, groups have been removed and
+    fully replaced by tags
+    - Tags have been integrated into the import/export user interface
+
+Merge: 87d2ac3525 8f8624a333
+Nyall Dawson 	2016-11-16
+
+    Merge pull request #3764 from nyalldawson/cache_fix2
+
+    Cache fixes
+
+Nyall Dawson 	2016-11-16
+
+    Add @map_extent variable containing geometry of current map extent
+
+    ...Because I've seen a lot of ugly workarounds to recreate this
+    extent using wkt/buffers/etc
+
+Werner Macho 	2016-11-15
+
+    Add Translator
+
+    Add new italian translator
+
+Juergen E. Fischer 	2016-11-15
+
+    fix build of qspatialite and ocispatial sql drivers
+
+Merge: adcb77266b 4a4ffa4c1b
+Alexander Bruy 	2016-11-15
+
+    Merge pull request #3762 from nirvn/processing_fix_grass
+
+    [processing] fix grass/grass7 installation check
+
+Merge: 6bfd0fd79e c87839f054
+Alexander Bruy 	2016-11-15
+
+    Merge pull request #3761 from nirvn/processing_parameterextent_fix
+
+    [processing] fix ExtentSelectionPanel's getValue()
+
+aroche 	2016-11-15
+
+    fix exception when selecting string function
+
+    just a typo causing an exception when selecting a string function in query builder dialog
+
+Denis Rouzaud 	2016-11-01
+
+    [FEATURE] add functionnality to copy/move feature to move feature map tool
+
+Richard Duivenvoorde 	2016-11-15
+
+    minimal textual fix
+
+Nyall Dawson 	2016-11-15
+
+    Improve test debugging
+
+Nyall Dawson 	2016-08-10
+
+    QgsCacheIndexFeatureId can also handle non-FilterFid requests
+    in certain circumstances
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-08-10
+
+    Don't query list of visible features when showing selected features
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-08-10
+
+    Avoid warning noise during attribute table load
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-08-10
+
+    Increase maximum number of cached features
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-08-10
+
+    Use cached feature iterator if cache has all needed features
+
+    Previously a cached feature iterator would only be returned
+    if cache was either full or used a cache index
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-08-10
+
+    Recognise that a cache can be filled using a FilterNone request
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-08-10
+
+    Fix test for request size vs cache size
+
+    On behalf of Faunalia, sponsored by ENEL
+
+nirvn 	2016-11-15
+
+    [processing] fix grass/grass7 installation check
+
+nirvn 	2016-11-15
+
+    [processing] fix ExtentSelectionPanel's getValue()
+
+Martin Dobias 	2016-11-15
+
+    Fix rubber band in node tool not getting updated correctly
+
+Nyall Dawson 	2016-11-15
+
+    Followup 29d33b4
+
+Nyall Dawson 	2016-11-15
+
+    [processing] Polygons to line fixes
+
+    - Maintain Z/M values
+    - Handle curved geometries without segmentizing
+    - Retain null geometries
+
+Nyall Dawson 	2016-11-14
+
+    Remove duplicate QgsDataProvider::dataChanged( int ) signal
+
+    Was not needed and not emitted anywhere
+
+Nyall Dawson 	2016-11-14
+
+    Remove duplicate selectionChanged signal from QgsVectorLayer
+
+    If you don't want the extra info, just don't capture it...
+
+Nyall Dawson 	2016-11-14
+
+    [processing] Use standard field combo box for field choices
+
+Nyall Dawson 	2016-11-14
+
+    Allow empty field name ('not set' option) in QgsFieldModel, QgsFieldComboBox
+
+Werner Macho 	2016-11-14
+
+    Update tsstat.pl
+
+    just a small intendation fix
+
+Martin Dobias 	2016-11-15
+
+    Fix build
+
+Martin Dobias 	2016-11-15
+
+    Remove setLayerName(), layerName() from QgsLayerTreeLayer
+
+    (replaced by setName(), name() overridden from the parent)
+
+Martin Dobias 	2016-11-14
+
+    Fix missing docs and sip coverage (followup 968e02d6)
+
+Alexander Bruy 	2016-11-14
+
+    [processing] fix test
+
+rldhont 	2016-11-14
+
+    Fix setDestinationCRS
+
+rldhont 	2016-11-14
+
+    Fix QGIS Server build error
+
+Martin Dobias 	2016-11-14
+
+    Propagate layer/group name changes in the layer tree (fixes #15844)
+
+rldhont 	2016-11-14
+
+    Fix typo
+
+rldhont 	2016-11-14
+
+    [BUGFIX][QGIS Server] Transform feature collections bbox to ESPG:4326
+
+Merge: 798bc09130 d81533e05a
+Alexander Bruy 	2016-11-14
+
+    Merge pull request #3701 from alexbruy/processing-ogr-tests
+
+    [processsing] tests for GDAL algorithms
+
+Martin Dobias 	2016-11-14
+
+    Fix conversion from WKB to string in postgres provider (follow up d729951)
+
+Nyall Dawson 	2016-11-11
+
+    [FEATURE] pole_of_inaccessibility expression function
+
+    Exposes calculation of pole of inaccessiblity to expression
+    engine
+
+Nyall Dawson 	2016-11-10
+
+    Add some tags to algorithm
+
+Nyall Dawson 	2016-11-10
+
+    Fix test failure, report distance from pole
+
+Nyall Dawson 	2016-11-10
+
+    [FEATURE] Add method to calculate pole of inaccessibility for polygons
+
+    Implements a method in QgsGeometry and a processing algorithm to
+    calculate the pole of inaccessibility for a surface, which is the
+    most distant internal point from the boundary of the surface. This function
+    uses the 'polylabel' algorithm (Vladimir Agafonkin, 2016), which is an iterative
+    approach guaranteed to find the true pole of inaccessibility within a specified
+    tolerance. More precise tolerances require more iterations and will take longer
+    to calculate.
+
+Nyall Dawson 	2016-11-10
+
+    Add method to find distance from a point to a poylgon's boundary
+
+Nyall Dawson 	2016-11-10
+
+    Fix QgsGeometryUtils::sqrDistToLine returns bad values (eg nan values)
+
+Martin Dobias 	2016-11-14
+
+    Fix oracle provider and remove dead code
+
+Martin Dobias 	2016-11-14
+
+    Remove caching of GEOS representation within QgsGeometry (legacy)
+
+Martin Dobias 	2016-11-13
+
+    Remove caching of WKB from QgsGeometry (was kept just for compatibility)
+
+    Also improves the API to export/import WKB as QByteArray
+
+Merge: dbf6107b14 9cd39e79dd
+Even Rouault 	2016-11-13
+
+    Merge pull request #3635 from arnaud-morvan/processing_postgis_connect
+
+    [processing][db_manager] Fix connection to postgis
+
+Nyall Dawson 	2016-11-13
+
+    [processing] Add button for projection selection dialog to
+    Crs parameters in algorithm settings in modeler
+
+    This makes it easier to pick static CRSes for the parameter,
+    and also makes it obvious to users that they can use a fixed
+    CRS parameter in their model (as opposed to one taken from
+    a layer or input)
+
+Nyall Dawson 	2016-11-13
+
+    [processing] Add unit tests for retrieving param from script code
+
+    And fix number param retrieving from script code
+
+Nyall Dawson 	2016-11-11
+
+    [processing] Use standard QGIS projection selection widget for CRS params
+
+Nyall Dawson 	2016-11-11
+
+    Allow showing 'not set' in QgsProjectionSelectionWidget
+
+Alexander Bruy 	2016-11-12
+
+    fix failing test
+
+Alexander Bruy 	2016-11-11
+
+    [processing] mark buffer lines test as expected failure
+
+    This test failed as result and expected WKT geometries differ
+    only because of 0 vs. -0 in one coordinates pair
+
+Alexander Bruy 	2016-11-11
+
+    [processing] don't print Processing version
+
+Alexander Bruy 	2016-11-11
+
+    [processing] fix indentation
+
+Alexander Bruy 	2016-11-11
+
+    [processing] restore and fix extraction of OGR layer names
+
+Alexander Bruy 	2016-11-11
+
+    [processing] fix parameter definition in offset curve algorithm
+
+Alexander Bruy 	2016-11-11
+
+    [processing] compare only geometry in tests
+
+Alexander Bruy 	2016-11-10
+
+    [processing] improve temp file names generation
+
+Alexander Bruy 	2016-11-10
+
+    [processing] cleanup OGR dissolve algorithm code
+    Avoid double extensions when creating temp files
+
+Alexander Bruy 	2016-11-02
+
+    [processing] cleanup test data
+
+Alexander Bruy 	2016-11-01
+
+    [processing] don't pass layer name when '-sql' parameter is used
+
+Alexander Bruy 	2016-11-01
+
+    [processing] use numeric parameter for buffer distance
+
+Alexander Bruy 	2016-11-01
+
+    [processing] remove unnecessary schemas from test data
+
+Alexander Bruy 	2016-11-01
+
+    [processing] friendly names for some QGIS tests
+
+Alexander Bruy 	2016-11-01
+
+    [processing] test for OGR one-side buffer
+
+Alexander Bruy 	2016-11-01
+
+    [processing] add test for OGR offset lines
+
+Alexander Bruy 	2016-11-01
+
+    [processing] fix OGR offset curve and one-side buffer
+
+Alexander Bruy 	2016-11-01
+
+    [processing] add test for points along lines
+
+Alexander Bruy 	2016-11-01
+
+    [processing] disable polygonize test, as it is not stable
+
+Alexander Bruy 	2016-11-01
+
+    [processing] fix deprecation warnings in GDAL test
+
+Alexander Bruy 	2016-11-01
+
+    [processing] add test for OGR buffer with dissolve
+
+Alexander Bruy 	2016-11-01
+
+    [processing] add test for OGR polygon buffering
+
+Alexander Bruy 	2016-11-01
+
+    Revert "Fix extraction of ogr LayerName from multi-layer dataset URIs"
+
+    This reverts commit 6c5364186dd8d45ac51e5bd1a72c6a542f032cb1.
+
+    As it breaks all OGR geoprocessing algoroithms.
+
+Alexander Bruy 	2016-10-27
+
+    [processing] simple test for ogr buffering
+
+Alexander Bruy 	2016-10-27
+
+    [processing] add test for gdal_polygonize
+
+Merge: c180cf3208 be2223fed3
+Nyall Dawson 	2016-11-12
+
+    Merge pull request #3742 from nirvn/processing_fix_hasdependencies
+
+    [processing] check for parent alg dependencies in hasDependencies()
+
+Merge: fb124baaf6 b069e955ae
+Werner Macho 	2016-11-11
+
+    Merge pull request #3753 from DelazJ/patch-17
+
+    typo fix
+
+Harrissou Sant-anna 	2016-11-11
+
+    typo fix
+
+Merge: 4981bfcf18 4e96912c91
+Alessandro Pasotti 	2016-11-11
+
+    Merge pull request #3751 from elpaso/downloader_master
+
+    [bugfix][forwardport] File downloader for identify dialog hyperlinks
+
+Alessandro Pasotti 	2016-11-09
+
+    [bugfix][forwardport] File downloader for identify dialog hyperlinks
+
+    fixes #14703
+
+    Include C++ and Python tests
+
+    Travis won: ported all test cases to Python
+    and disabled C++ companion test (still useful locally and
+    for debugging)
+
+    For the curious: QTemporaryFile is not working as expected
+
+    Moved to Qt5 new style signals
+
+    Disabled C++ test and connected cancel to progress
+
+    Make string comparison on SSL errors more robust
+
+Matthias Kuhn 	2016-11-11
+
+    Fix memory leak
+
+Matthias Kuhn 	2016-11-11
+
+    Fix more Qt5.7 warnings
+
+Matthias Kuhn 	2016-11-11
+
+    [spatialite] Don't skip default values
+
+    When inserting multiple features in a single prepared statement, the spatialite
+    provider would skip any default for individual features, even though they have
+    been specified in the field list, resulting in missing fields.
+
+Nyall Dawson 	2016-11-11
+
+    Some fixes to processing expression parameters
+
+Merge: 35d106bf64 f3d7e39abb
+Alexander Bruy 	2016-11-11
+
+    Merge pull request #3748 from nirvn/processing_harmony
+
+    [processing] harmonize modeler UI/UX behavior with QGIS
+
+nirvn 	2016-11-11
+
+    [processing] harmonize modeler UI behavior with QGIS
+    - use [close without saving][cancel][save] option when closing
+    a modeler with unsaved changes
+    - invert mouse wheel zoom in/out to match that of QGIS' main
+    canvas window
+    - holding the mouse middle click and dragging will pan the
+    modeler view
+
+Matthias Kuhn 	2016-11-11
+
+    Fix Qt 5.7 build warnings
+
+nirvn 	2016-11-11
+
+    [processing] check for parent alg dependencies in hasDependencies()
+
+Nyall Dawson 	2016-11-11
+
+    Add unit tests for processing expression parameter
+
+Nyall Dawson 	2016-11-11
+
+    Expression parameters don't have to have parent layers
+
+Nyall Dawson 	2016-11-03
+
+    [FEATURE][processing] New input type for expressions
+
+    This adds a new input type for expression inputs. Expression
+    inputs can be linked to a parent layer so that the builder
+    shows the correct fields and layer variables.
+
+    It's designed for two use cases:
+
+    1. to be used when an algorithm specifically requires an expression,
+    eg Select by Expression and Extract by Expression.
+
+    2. to be potentially used as a replacement input instead of string
+    or number literals in algorithms. Eg - if the simplify algorithm
+    tolerance parameter was replaced with an expression paremeter, then
+    this expression would be evaluated for every feature before
+    simplifying that feature. It would allow parameters to be calculated
+    per feature, as opposed to the current approach of calculating
+    a parameter once before running the algorithm. It would also
+    mean algorithms like "variable distance buffer" would no longer
+    be needed, as a single "buffer" algorithm could then be used
+    for either a fixed distance, field based, or expression based
+    distance.
+
+Nyall Dawson 	2016-11-09
+
+    [processing] When an algorithm has string parameters, also
+    accept numeric, file and table field inputs in modeler
+
+    This allows a non-string parameter to be reused as a string
+    parameter in contexts where it makes sense.
+
+Merge: cc0b2e64a2 701d4440ac
+Nyall Dawson 	2016-11-11
+
+    Merge pull request #3703 from aaime/svg_params
+
+    Export parametric SVG, will fallback symbols for the systems that cannot understand them
+
+Nyall Dawson 	2016-11-11
+
+    [processing] Restore spin box widget for number inputs outside modeller
+
+    This commit restores some pre 3.0 processing behaviour for number inputs.
+    Now, if a number input is required outside of modeller than a spin box
+    will be shown instead of a free text input.
+
+    Clicking the expression builder button results in an expression
+    which is evaluated immediately to avoid users expecting that
+    the expression will be evaluated per feature.
+
+Merge: 10648dfb0c dc800dbab7
+Nyall Dawson 	2016-11-11
+
+    Merge pull request #3746 from ahuarte47/Issue_SinglePartsToMultiparts
+
+    [FIXBUG] Fix iteration of features in SinglePartsToMultiparts algorithm
+
+Alvaro Huarte 	2016-11-11
+
+    Fix iteration of features
+
+Nyall Dawson 	2016-11-11
+
+    [processing] Start of tests for modeler
+
+Merge: 73b283c0b5 88587fdeb7
+mhugent 	2016-11-10
+
+    Merge pull request #3745 from mhugent/server_datasources
+
+    WMS server: add user setting if custom datasources are allowed in wms…
+
+Marco Hugentobler 	2016-11-10
+
+    Add override keywords
+
+Marco Hugentobler 	2016-11-10
+
+    WMS server: add user setting if custom datasources are allowed in wms requests
+
+Juergen E. Fischer 	2016-11-10
+
+    update FindQCA.cmake for Arch Linux
+
+Merge: be6672ddbd a6a09d9ae2
+Alexander Bruy 	2016-11-10
+
+    Merge pull request #3727 from arnaud-morvan/processing_ogr2ogr_defaults
+
+    [processing] fix Ogr2OgrToPostGisList algorithm
+
+Merge: 6ea0049b17 45711d372e
+Alexander Bruy 	2016-11-10
+
+    Merge pull request #3741 from nirvn/processing_dependencies_improvement
+
+    [processing] use algorithm description in modeler dependencies dialog
+
+Merge: 164a85acdb 6b2b4c578a
+Nyall Dawson 	2016-11-10
+
+    Merge pull request #3732 from nirvn/strpos_regexp_match_upgrade
+
+    [expression] strpos() and regexp_match() improvements
+
+nirvn 	2016-11-08
+
+    [FEATURE][expression] strpos() and regexp_match() improvements
+    - strpos() now relies on a simple string within a string search
+    - regexp_match() now returns pos of a matching regular expression
+
+nirvn 	2016-11-10
+
+    [processing] use algorithm description in modeler dependencies dialog
+
+Hugo Mercier 	2016-11-09
+
+    [virtual] Fix encoding issue
+
+Matthias Kuhn 	2016-10-27
+
+    Improve num_selected and is_selected function help
+
+Matthias Kuhn 	2016-10-27
+
+    Use QPointer for storing layer pointers in expression scope
+
+Stéphane Brunner 	2016-11-08
+
+    Apply some @m-kuhn comments (#3736)
+
+    * Use QgsStringMap
+
+    * Better description
+
+    * Use new translated metadata methods
+
+rldhont 	2016-11-08
+
+    [BUGFIX][QGIS Server] Revert layer order in WMS GetContext request
+
+Patrick Valsecchi 	2016-11-08
+
+    Relation managment: enable the remove button when selection
+
+    If nothing is selected, this button is doing nothing.
+
+Patrick Valsecchi 	2016-11-08
+
+    Multi relation removal
+
+    Let the user select multiple relations and delete them.
+
+Merge: 7c4e66b360 78236c0be1
+volaya 	2016-11-08
+
+    Merge pull request #3470 from arnaud-morvan/refactor_fields_context_generator
+
+    [Processing] Fix processing refactor fields algorithm using expression context generators
+
+Merge: db35b38bdb 4a62699472
+volaya 	2016-11-08
+
+    Merge pull request #3726 from arnaud-morvan/processing_various_fixes
+
+    [processing] small fixes
+
+Merge: 0189609dcf 3550cc99a6
+volaya 	2016-11-08
+
+    Merge pull request #3731 from nyalldawson/alg_tags
+
+    [processing] Allow algorithms to specify tags
+
+Juergen E. Fischer 	2016-11-08
+
+    dxf export: skip nan z coordinates
+
+Nyall Dawson 	2016-11-08
+
+    Make provider default value clauses exempt from unique constraint checks
+
+    Otherwise the check fails when the provider has a default value clause
+    like 'nextval(...)' even though the actual committed value will be
+    unique.
+
+Nyall Dawson 	2016-11-08
+
+    Return false from QgsVectorLayer::addFeatures if adding features failed
+
+Nyall Dawson 	2016-11-08
+
+    Fix some incorrect return values from QgsFeature python bindings
+
+Nyall Dawson 	2016-11-08
+
+    Add method to QgsAttributes to convert to QgsAttributeMap
+
+Nyall Dawson 	2016-11-08
+
+    Avoid some QgsGeometry pointer use in QgsGeometry API
+
+Nyall Dawson 	2016-11-08
+
+    [processing] Allow algorithms to specify tags
+
+    Tags are used while searching in the toolbox. This should help with
+    finding algorithms when the exact name is not known, eg
+    you could search for "envelope" or "bounds" and find the
+    'Polygon from Layer Extent' algorithm.
+
+    At the moment it's quite hard to discover algorithms which exist
+    when you don't know what their called and have to instead search
+    for every possible naming variant which could exist...
+
+Nyall Dawson 	2016-11-08
+
+    [processing] When searching in toolbox, ignore order of words
+
+    Eg, allows you to search "line merge" and find the "Merge lines"
+    algorithm. Should make it easier for users who don't know the
+    exact name to find algorithms.
+
+Nyall Dawson 	2016-11-08
+
+    Add missing API break documentation
+
+Nyall Dawson 	2016-11-08
+
+    Fix typos
+
+Nyall Dawson 	2016-11-08
+
+    Update indentation
+
+Nyall Dawson 	2016-11-08
+
+    Add another file to .gitignore
+
+Nyall Dawson 	2016-11-08
+
+    Prepare commit ensures empty line before doxygen block
+
+Nyall Dawson 	2016-11-08
+
+    Update identation
+
+Nyall Dawson 	2016-11-08
+
+    Avoid crash in testqgsexpression.cpp
+
+Nyall Dawson 	2016-11-08
+
+    Avoid lazy evaluation for substr expression function
+
+    Better solution is to set handlesNull to true to avoid the default
+    null parameter = null result behaviour, and handle null values
+    in params 1 and 2 manually
+
+nirvn 	2016-11-04
+
+    [FEATURE] upgrade the substr() function
+    - support negative start value (e.g. substr('hello',-2) returns 'lo')
+    - support negative length value (e.g. substr('hello',3,-1) returns 'll')
+    - length parameter now optional, defaults to end of string
+      (e.g. substr('hello world',7) returns 'world')
+
+Nyall Dawson 	2016-11-07
+
+    Fix range widget wrapper not correctly respecting default allow
+    null setting
+
+Nyall Dawson 	2016-11-07
+
+    Show literal defaults in add feature form
+
+Nyall Dawson 	2016-11-07
+
+    [FEATURE] Detect default literal values from OGR layers
+
+    Requires GDAL >= 2
+
+Nyall Dawson 	2016-11-07
+
+    [FEATURE] Detect literal default values for spatialite provider
+
+Nyall Dawson 	2016-11-07
+
+    Split handling of literal default values from provider side
+    default value SQL clauses
+
+    QgsVectorDataProvider now has two methods:
+
+    - defaultValueClause: returns SQL fragment which must be evaluated
+    by the provider to obtain the default value, eg sequence values
+    - defaultValue: returns the literal constant default value
+    for a field
+
+Merge: 8e7ae8f04d bc1ad2ce82
+Stéphane Brunner 	2016-11-07
+
+    Merge pull request #3720 from sbrunner/WFS-provider-metadata
+
+    Add metadata for WFS provider in layer metadata informations
+
+Stéphane Brunner 	2016-11-04
+
+    Add metadata for WFS provider in layer metadata informations
+
+Patrick Valsecchi 	2016-11-07
+
+    Avoid having duplicated relations in the discovery
+
+Juergen E. Fischer 	2016-11-07
+
+    debian packaging: drop trusty support
+
+Patrick Valsecchi 	2016-10-10
+
+    Better reading/writting of editor widget config.
+
+    Avoid saving config parameters that are not set and support not
+    having them in the XML.
+
+Nyall Dawson 	2016-11-07
+
+    Fix coverity uninitialized variable warnings
+
+Merge: 4e4bb2bf6b 1d245b2ef6
+Nyall Dawson 	2016-11-07
+
+    Merge pull request #3723 from nirvn/regexp_matches
+
+    [FEATURE] add regexp_matches() function
+
+nirvn 	2016-11-05
+
+    [FEATURE] add regexp_matches() function
+    The new function returns an array of strings captured by capturing
+    groups in a supplied regular expression. For e.g., the following
+    expression: regexp_matches('qgis=>rocks','(.*)=>(.*)')
+    will return the following array: 'qgis', 'rocks'.
+
+Merge: 9b667d1e8a 0484769b7d
+Nyall Dawson 	2016-11-07
+
+    Merge pull request #3728 from nyalldawson/open
+
+    Cleanup processing file handling
+
+Nyall Dawson 	2016-11-07
+
+    [FEATURE] Remove c++ geometry snapper plugin
+
+    All functionality is now available through analysis lib + processing
+    algorithm.
+
+    Marked as feature for documentation + changelog flagging
+
+Nyall Dawson 	2016-11-07
+
+    [FEATURE] Snap to layer algorithm accepts a mode parameter
+
+    With a new option to prefer to snap to closest point on geometry.
+    The old behaviour was to prefer to snap to nodes, even if a node
+    was further from the input geometry than a segment. The new option
+    allows you to snap geometries to the closest point, regardless
+    of whether it's a node or segment.
+
+Nyall Dawson 	2016-11-05
+
+    Port some API from QgsPoint to QgsPointV2
+
+Nyall Dawson 	2016-11-05
+
+    [FEATURE][processing] Snap geometries algorithm allows snapping
+    to other layer types, supports point/line layers
+
+    Fix #14791, #15313
+
+Nyall Dawson 	2016-11-04
+
+    [FEATURE][processing] Snap geometries to layer algorithm
+
+    Port the Geometry Snapper plugin across to the analysis lib, and
+    expose to python bindings
+
+    Add a new algorithm which performs the snapping to layers
+
+Nyall Dawson 	2016-11-07
+
+    [processing] Use subprocess.DEVNULL instead of open(os.devnull)
+
+Nyall Dawson 	2016-11-07
+
+    [processing] Use with ... when opening files
+
+Nyall Dawson 	2016-11-07
+
+    [processing] Don't try to force load files which don't exist
+
+Nyall Dawson 	2016-11-07
+
+    Fix python deprecation warning
+
+Nyall Dawson 	2016-11-07
+
+    Fix crash when trying to render polygon with no exterior ring
+
+    Should only occur with very badly corrupted layers, but we
+    shouldn't crash in this case
+
+Nyall Dawson 	2016-11-07
+
+    Fix processing tests
+
+Nyall Dawson 	2016-11-07
+
+    Fix processing tests weren't actually comparing resultant features
+
+    .... oops (my fault - copy/paste error)
+
+Nyall Dawson 	2016-11-07
+
+    [processing] Fix invalid geometries made by densify when input geom is null
+
+arnaud.morvan@camptocamp.com 	2016-09-08
+
+    Use contextGenerator in refactor fields algorithm
+
+arnaud.morvan@camptocamp.com 	2016-09-08
+
+    Add QgsExpressionContextGenerator inheritances in sip
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Fix Ogr2OgrToPostGisList with 8798c42339 and 3472ac80d8bd
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Log gdal calls
+
+arnaud.morvan@camptocamp.com 	2016-10-19
+
+    [db_manager] Fix connection to postgis
+
+arnaud.morvan@camptocamp.com 	2016-10-19
+
+    [processing] Fix connection to postgis
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Fix TableWidgetWrapper in batch dialog
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Fix BatchOutputSelectionPanel with QgsMapLayer instances
+
+arnaud.morvan@camptocamp.com 	2016-11-06
+
+    [processing] Fix import error in FieldsMappingPanel
+
+Juergen E. Fischer 	2016-11-05
+
+    fix customwidgets includes path
+
+Matthias Kuhn 	2016-11-05
+
+    Fill image with 0 in rendering thread (#3722)
+
+    Calling QImage::fill( 0 ) on rendering start takes about 40% of the
+    time required for setting up a new job.
+    Since this is done on the main thread, the interface feels more
+    snappy the quicker the setup process is completed.
+
+Andrea Aime 	2016-10-09
+
+    Export parametric SVG parameters, will fallback symbols for the system that cannot understand them
+
+Martin Dobias 	2016-11-05
+
+    Add missing /Factory/ annotations to geometry classes
+
+Merge: 16a88e6c36 a0e0fcf9a9
+Alessandro Pasotti 	2016-11-04
+
+    Merge pull request #3721 from elpaso/auth_tests_pki_ows_master
+
+    [tests] WMS/WFS PKI authentication test
+
+Alessandro Pasotti 	2016-11-04
+
+    [tests] WMS/WFS PKI authentication test
+
+Merge: ea43ce0e00 f587defde2
+Alessandro Pasotti 	2016-11-04
+
+    Merge pull request #3719 from elpaso/auth_tests_more_master
+
+    Auth tests more master
+
+Alessandro Pasotti 	2016-11-04
+
+    [tests][bugfix] Check for result diff existance before accessing to it
+
+Alessandro Pasotti 	2016-11-04
+
+    [tests] Authmanager Postgres PKI test
+
+Matthias Kuhn 	2016-11-04
+
+    Always create a main network access manager
+
+    Or threaded networking - like XYZ layers - will crash in standalone apps.
+
+Martin Dobias 	2016-11-04
+
+    Remove per-pixel debug msg slowing down reprojection (fixes #15796)
+
+    Even at level 5, the debug string would still be built and thrown away,
+    and affects both debug builds and RelWithDebugInfo (used for windows -dev builds).
+
+    (cherry picked from commit db0e7d57218f29dd5a6f386b8b4ce40f11a3ab59)
+
+Martin Dobias 	2016-11-04
+
+    Fix crash with tiled WMS (fixes #15799)
+
+    (cherry picked from commit 16719b3f0f166667fdead8731a9ffe7227ab39f8)
+
+Merge: 100667ace0 9b9a002be5
+Nyall Dawson 	2016-11-04
+
+    Merge pull request #3673 from nyalldawson/constraints
+
+    [FEATURE] Improved constraint handling, pt 1
+
+Nyall Dawson 	2016-11-04
+
+    Fix dialogs which violate HIG (use of : at end of label)
+
+rldhont 	2016-11-03
+
+    [BUGFIX][QGIS Server] No flags in QgsFeatureRequest if expression needs geometry
+
+Alexander Bruy 	2016-11-03
+
+    [processing] add missed description files for OTB 5.4.0
+
+Merge: 777fc86001 373e591a80
+Alexander Bruy 	2016-11-03
+
+    Merge pull request #3035 from alexbruy/global-startup-script
+
+    Add global python startup script support in addition to per-user scripts
+
+Alexander Bruy 	2016-11-03
+
+    drop old user startup script in favour of the new system
+
+    User script should be placed into $HOME/.local/share/QGIS.
+    Additionally global scripts from /usr/local/share and
+    /usr/share will be loaded if present
+
+Alexander Bruy 	2016-04-26
+
+    Add global python startup script support in addition to per-user scripts (fix #6297)
+
+Merge: 9cd29f39d8 769c82b579
+Nyall Dawson 	2016-11-03
+
+    Merge pull request #3712 from nirvn/pal_zero_width_char_fix
+
+    [pal] fix curved labels failure with zero-width characters
+
+nirvn 	2016-11-03
+
+    [pal] fix curved labels failure with zero-width characters
+    (fixes 15801)
+
+Nyall Dawson 	2016-11-03
+
+    [processing] Fix batch panel under Qt5
+
+Merge: 962166c4b5 a7ffecd878
+Nyall Dawson 	2016-11-03
+
+    Merge pull request #3710 from DelazJ/patch-16
+
+    Make collapsible the "Curve segmentation" frame
+
+Merge: a44ea22880 03e29d4f01
+Nyall Dawson 	2016-11-03
+
+    Merge pull request #3708 from nirvn/singlepart_to_multi
+
+    [processing] optimise singlepart to multipart algorithm
+
+nirvn 	2016-11-02
+
+    [processing] optimise singlepart to multipart algorithm
+    - keep z/m/curved geometries intact
+    - rewrite loop to avoid the cost of nb. feature x unique values
+
+Nyall Dawson 	2016-11-02
+
+    Small refinement to multipart to singlepart alg
+
+rldhont 	2016-11-02
+
+    [BUGFIX][QGIS Server] Apply filter element
+
+Alexander Bruy 	2016-11-02
+
+    document undocumented method
+
+Alexander Bruy 	2016-11-02
+
+    more doxygen fixes
+
+Alexander Bruy 	2016-11-02
+
+    fix doxygen comments
+
+Alexander Bruy 	2016-11-02
+
+    fix typo in comment
+
+Alexander Bruy 	2016-09-19
+
+    default value does not need to be explicitly set
+
+Alexander Bruy 	2016-09-16
+
+    fix formatting
+
+Alexander Bruy 	2016-09-16
+
+    use default QString() constructor instead of ""
+    improve doxygen docs
+
+Alexander Bruy 	2016-09-15
+
+    update Python bindings
+
+Alexander Bruy 	2016-09-08
+
+    [FEATURE] save and restore color ramp used for singleband pseudocolor rendering
+
+Merge: 06dc501139 b48d20220e
+Alexander Bruy 	2016-11-02
+
+    Merge pull request #3695 from nirvn/processing_modeler_dblclick
+
+    [processing] resurrect editing of modeler item on double-click
+
+Even Rouault 	2016-11-02
+
+    test_provider_ogr_gpkg.py: Test disabling walForSqlite3 setting
+
+Merge: 4f5337fce5 54f312fa7f
+Denis Rouzaud 	2016-11-02
+
+    Merge pull request #3689 from rduivenvoorde/getPlugins3
+
+    Temporarily hardcode plugins version in url ?qgis=3.0
+
+Harrissou Sant-anna 	2016-11-02
+
+    Make collapsible the "Curve segmentation" frame
+
+    in Settings --> Options --> Rendering dialog (for coherence with other frames)
+
+    also fix a typo
+
+Merge: 5d877fd888 28457ed49c
+Nyall Dawson 	2016-11-02
+
+    Merge pull request #3704 from pvalsecc/fix_collapsing
+
+    Fix saving of the collapsed state for relations
+
+Merge: f65e770242 18fc0c6fad
+Alexander Bruy 	2016-11-02
+
+    Merge pull request #3707 from nyalldawson/multipart_to_single
+
+    [processing] optimise multipart to singlepart algorithm
+
+Patrick Valsecchi 	2016-11-01
+
+    Fix saving of the collapsed state for relations
+
+    In the attribute form, the collapsed state of RelationReference
+    was not loaded correctly and was interfering with the collapsed
+    state of the relation editor.
+
+    Plus, the state was saved globally for a reference. Meaning that
+    if a reference was used (through other references) from other
+    layers, it was sharing the same state.
+
+Nyall Dawson 	2016-11-02
+
+    [processing] optimise multipart to singlepart algorithm
+
+    - simplify code
+    - keep z/m/curved geometries intact
+    - might be a bit faster
+
+Nyall Dawson 	2016-10-31
+
+    [FEATURE[processing] New algorithm to compute geometry by expression
+
+    This algorithm updates existing geometries (or creates new
+    geometries) for input features by use of a QGIS expression. This
+    allows complex geometry modifications which can utilise all the
+    flexibility of the QGIS expression engine to manipulate and create
+    geometries for output features.
+
+Nyall Dawson 	2016-11-02
+
+    Update api break docs
+
+Nyall Dawson 	2016-11-02
+
+    Respect non-enforced constraints when editing/adding features
+
+    Warnings are shown, but features can be committed. Fields which
+    fail an unenforced constraint are now shaded in yellow to differentiate
+    from the red failure for enforced constraints.
+
+Nyall Dawson 	2016-11-02
+
+    [FEATURE] Field constraints can be enforced or not
+
+    Non-enforced constraints just show a warning to the user, but
+    do not prevent committing the feature. Enforced constraints
+    block users from comitting non compliant features.
+
+    Any constraints detected by the provider are always
+    enforced.
+
+Nyall Dawson 	2016-11-01
+
+    fix test
+
+Nyall Dawson 	2016-11-01
+
+    Fix some untranslatable strings
+
+Nyall Dawson 	2016-11-01
+
+    Move constraint handling to QgsFieldConstraints
+
+    Avoids cluttering QgsField API
+
+Nyall Dawson 	2016-11-01
+
+    Color a few pixels slightly differently
+
+Nyall Dawson 	2016-11-01
+
+    [FEATURE] Not null constraint detection for ogr provider
+
+    Implements not null constraint detection for the OGR layers, where
+    supported for the data format by OGR.
+
+    (only available for GDAL >= 2.0)
+
+Nyall Dawson 	2016-10-26
+
+    Fix failing unit test
+
+Nyall Dawson 	2016-10-26
+
+    Update API break docs
+
+Nyall Dawson 	2016-10-26
+
+    If the layer is NOT being edited then only check layer based constraints
+    and not any constraints enforced by the provider
+
+    Because:
+
+    1. we want to keep browsing features nice and responsive. It's nice to give
+     feedback as to whether the value checks out, but not if it's too slow to
+     do so. Some constraints (eg unique) can be expensive to test. A user can
+     freely remove a layer-based constraint if it proves to be too slow to
+     test, but they are unlikely to have any control over provider-side
+     constraints
+
+    2. the provider has already accepted the value, so presumably it doesn't
+     violate the constraint and there's no point rechecking!
+
+Nyall Dawson 	2016-10-26
+
+    Move responsibility for testing for attribute against constraints
+    to QgsVectorLayerUtils::validateAttribute()
+
+    Also clean up some strings shown to the user when a constraint
+    check fails
+
+Nyall Dawson 	2016-10-26
+
+    Move responsibility for storage of constraint expressions to QgsVectorLayer
+
+Nyall Dawson 	2016-10-26
+
+    Refactor constraint handling
+
+    - store constraint origin in QgsField
+    - move handling of constraint expressions to QgsField
+
+Nyall Dawson 	2016-10-26
+
+    Enforce unique constraints in attribute form
+
+Nyall Dawson 	2016-10-25
+
+    New class QgsVectorLayerUtils
+
+    Contains static helper methods for working with vector layers.
+    Initially only contains a method to test whether a value
+    exists within a layer's attributes.
+
+Nyall Dawson 	2016-10-25
+
+    Implement constraint detection for spatialite provider
+
+Nyall Dawson 	2016-10-19
+
+    Select all text after reset line edit to null
+
+Nyall Dawson 	2016-10-19
+
+    Move handling of not null constraint from edit form to layer
+
+Nyall Dawson 	2016-10-19
+
+    Allow constraints to be added at a QgsVectorLayer level
+
+Nyall Dawson 	2016-10-19
+
+    Move constraints to QgsField
+
+Nyall Dawson 	2016-10-19
+
+    Add gui for setting/exposing constraints in field properties
+
+    Provider set constraints cannot be changed by users, ie
+    if a not null constraint is set on the field at the database
+    then QGIS users cannot clear this constraint.
+
+Nyall Dawson 	2016-10-19
+
+    Add method to fetch constraints from a vector data provider
+
+    Implemented for unique and not null constraints for postgres
+    provider
+
+Nyall Dawson 	2016-11-02
+
+    Fix QgsFeatureRequest with expression not using provider fields
+    and limit (fix #15771)
+
+Matthias Kuhn 	2016-10-31
+
+    Add test for QgsFeatureRequest.setLimit and feature variable
+
+Nyall Dawson 	2016-11-02
+
+    Avoid unexpected gpkg test success with older GDAL versions
+
+Nyall Dawson 	2016-11-02
+
+    Speed up inserting features into memory layers by ~65%
+
+    By avoiding an unnecessary map lookup
+
+Juergen E. Fischer 	2016-11-01
+
+    fix typo
+
+    (cherry picked from commit 658cfe68c91ec24f04f8ebda307fbec7d55a412f)
+
+Juergen E. Fischer 	2016-11-01
+
+    fix typos
+
+Patrick Valsecchi 	2016-11-01
+
+    [feature] Editor widget auto config for foreign keys (#3699)
+
+    Automatically pick RelationReference widgets for foreign keys.
+
+Nyall Dawson 	2016-11-01
+
+    Fix some no such signal/slot warnings
+
+    ... in such a way that they'll never appear again
+
+Martin Dobias 	2016-10-21
+
+    Fix import of shapefiles to postgres - regression introduced in 5abdfcb (#3652)
+
+    (cherry picked from commit a965a132c52df9308b5a58be92c04a285826485a)
+
+Martin Dobias 	2016-10-21
+
+    Hide import/export buttons for arcgis services as they do not work (fixes #15637)
+
+    (cherry picked from commit 1c2f0de9fbea8e90c9d20036bfa1601c1d192a89)
+
+Martin Dobias 	2016-11-01
+
+    Fixed legend renderer expected images
+
+Martin Dobias 	2016-10-20
+
+    Fix reordering and removal of legend nodes in composer legend
+
+    (cherry picked from commit f4e1e6f6eefec74fcf61542c3c9e236c4fb3054f)
+
+Martin Dobias 	2016-10-20
+
+    Fix building of legend node tree if embedded widgets are used in the layer
+
+    (cherry picked from commit 10cab93c3652c38db27553616f36290f7b820c48)
+
+Martin Dobias 	2016-10-20
+
+    Fix display of diagram legend entries (fixes #15448)
+
+    To make the implementation saner, the legend node that may be embedded within parent
+    layer node is kept separately from activeNodes.
+
+    (cherry picked from commit b385ebd9ba9272516eed61e5825a603fcee969e9)
+
+Nyall Dawson 	2016-11-01
+
+    Flip some connects to new style
+
+Nyall Dawson 	2016-11-01
+
+    Describe some dependancy changes in API break docs
+
+Even Rouault 	2016-10-31
+
+    [OGR provider] Use constBegin() / constEnd()
+
+Even Rouault 	2016-10-31
+
+    [OGR provider] Make addAttributes() return the requested field type, precision and width so as to make  QgsVectorLayerEditBuffer::commitChanges() API
+
+    Fixes #15614
+
+Matthias Kuhn 	2016-10-31
+
+    Followup cc6b1e3: also respect subexp vars in presence of filter
+
+Matthias Kuhn 	2016-10-31
+
+    Fix @parent variable detection in aggregate subExpression
+
+Matthias Kuhn 	2016-10-31
+
+    More test for referencedVariables
+
+Matthias Kuhn 	2016-10-31
+
+    Revert "[ogr] Ignore request limit if unable to compile expression"
+
+    This reverts commit e7333f68145f27a74aacd8f75939623e37fc4510.
+
+Matthias Kuhn 	2016-10-31
+
+    [ogr] Ignore request limit if unable to compile expression
+
+    Fix #15771
+
+Matthias Kuhn 	2016-10-31
+
+    Fix caching aggregate expressions with @parent usage
+
+Matthias Kuhn 	2016-10-31
+
+    Break oneliners
+
+Merge: fa3663907a 8e663309c0
+Nyall Dawson 	2016-10-31
+
+    Merge pull request #3696 from nirvn/processing_otb_silent
+
+    [processing] remove console error message when optional otb provider not installed
+
+nirvn 	2016-10-31
+
+    [processing] remove console error message when optional otb provider not installed
+
+Nyall Dawson 	2016-10-31
+
+    Fix 'enable macros' button does not run open macro (fix #9523)
+
+Martin Dobias 	2016-10-14
+
+    Fix layer tree expanded state when used expand/collapse all (fixes #15691)
+
+    (cherry picked from commit de85fdd6e8fa3d4f38196376aabccce317cbf341)
+
+Martin Dobias 	2016-10-07
+
+    Fix crash in node tool after deleting the whole geometry (fixes #15659)
+
+    Made sure that both closestVertex() and closestSegment() return negative
+    distance on error (e.g. with null or emtpy geometry).
+
+    Also fixes snapping when dealing with layers with null/invalid geometries
+
+    (cherry picked from commit c093d5188fad685c4a596ff23c27aad7d151dac2)
+
+Nyall Dawson 	2016-10-31
+
+    [processing] Modeller should not be modal
+
+nirvn 	2016-10-31
+
+    [processing] resurrect editing of modeler item on double-click
+
+Merge: 3caccd531d bec379249e
+Nyall Dawson 	2016-10-31
+
+    Merge pull request #3694 from nirvn/processing_sort_model_inputs
+
+    [processing] sort model input parameters to avoid random ordering
+
+nirvn 	2016-10-31
+
+    [processing] sort model input parameters to avoid random ordering
+
+Nyall Dawson 	2016-10-31
+
+    [processing] Fix handling of multiple field input in modeller
+
+Merge: 29ce141dc4 121f48d654
+Nyall Dawson 	2016-10-31
+
+    Merge pull request #3656 from nirvn/processing_import_to_spatialite
+
+    [processing] add "Import into Spatialite" algorithm
+
+Merge: d5698be69f ddc44dfd89
+Nyall Dawson 	2016-10-31
+
+    Merge pull request #3657 from nirvn/processing_modeler_mandatory
+
+    [processing] fix modeler parameter mandatory checkbox logic
+
+Nyall Dawson 	2016-10-31
+
+    Fix some processing breakage
+
+Nyall Dawson 	2016-10-31
+
+    Rename visible "favourite" strings to "favorite", change API to
+    use "favorite"
+
+Nyall Dawson 	2016-10-30
+
+    [FEATURE][processing] New algorithm to extract specific nodes
+
+    This algorithm allows you to extract specific nodes from geometries.
+    Eg you can extract the first or last node in the geometry.
+
+    The algorithm accepts a comma separated list of node indices to
+    extract, eg 0 = first node, 1 = second node, etc. Negative indices
+    can be used to extract nodes from the end of the geometry. Eg
+    -1 = last node, -2 = second last node.
+
+Nyall Dawson 	2016-10-29
+
+    [FEATURE][processing] New algorithm to extend lines
+
+    Allows extending linestrings by a set distance at the start
+    and end of the line
+
+Nyall Dawson 	2016-10-29
+
+    [FEATURE] New expression function 'extend'
+
+    Extends linestrings by a specified amount at the start and
+    end of the line
+
+Nyall Dawson 	2016-10-29
+
+    Add method to QgsGeometry to extend the start/end of a linestring
+
+Merge: 9166142181 74e64645e4
+Nyall Dawson 	2016-10-30
+
+    Merge pull request #3690 from nyalldawson/extract_by_exp
+
+    [FEATURE][processing] New extract by expression algorithm
+
+nirvn 	2016-10-22
+
+    [processing] add import into spatialite algorithm
+
+Nyall Dawson 	2016-10-29
+
+    [FEATURE][processing] New extract by expression algorithm
+
+    Filters an input layer by expression
+
+Richard Duivenvoorde 	2016-10-28
+
+    Temporarily hardcode plugins version in url ?qgis=3.0
+
+    If QGIS 3.0 is actually released this line should be removed.
+
+Merge: 7a05a7a8c4 9ecdf61014
+Hugo Mercier 	2016-10-28
+
+    Merge pull request #3688 from mhugo/fix_15737
+
+    Don't delete QgsAttributeDialog too early. Fixes #15737
+
+Matthias Kuhn 	2016-10-28
+
+    Fix caching of aggregate values with @parent
+
+    And add a test for referencedVariables
+
+Matthias Kuhn 	2016-10-28
+
+    Merge duplicated api doc break section titles
+
+Martin Dobias 	2016-10-28
+
+    fix indentation
+
+Hugo Mercier 	2016-10-28
+
+    Don't delete QgsAttributeDialog too early. Fixes #15737
+
+Martin Dobias 	2016-10-05
+
+    Cancel WCS requests just like it is done in WMS
+
+    (cherry picked from commit 50258e6f01ef7dededbf057c03813ecf3442f5b9)
+
+Martin Dobias 	2016-10-05
+
+    Fix crash when loading WCS layers (fixes #15595)
+
+    The problem is that some providers would still issue network
+    requests in prepareJobs() - this should be ideally avoided,
+    because it is run in main thread - all the work should be deferred
+    to be done in worker thread.
+
+    (cherry picked from commit 08f4a0f40cce21d5730653a75bdd44f175f3b0b8)
+
+Martin Dobias 	2016-10-03
+
+    Fix identify tool for WMS if webkit is not available (fixes #15596)
+
+    (cherry picked from commit 430694ba9a2beb5fe23d5814b63aaecdbee7a3d7)
+
+Martin Dobias 	2016-10-28
+
+    Fix WMS identify when using "Feature" format and the layer has named CRS
+
+    (cherry picked from commit 9ef91ea6294cdab762ffb2543d02473bcccbed80)
+
+Paolo Cavallini 	2016-10-28
+
+    Update RegularPoints.py
+
+    Fixes #15773
+
+Nyall Dawson 	2016-10-28
+
+    Fix color picker does not show previous color
+
+Nyall Dawson 	2016-10-28
+
+    Fix color pickers opens in dock layout when editing rules via
+    layer properties
+
+Martin Dobias 	2016-10-03
+
+    Fix listing of WMTS layers in browser (fixes #15350)
+
+    (cherry picked from commit 29d2bef7954d4e2b2cf21611c1398d0a7666e4c6)
+
+Merge: 0b3646b252 17fc7dbe53
+Nyall Dawson 	2016-10-28
+
+    Merge pull request #3685 from nirvn/array_unique
+
+    [FEATURE] add array_distinct() function
+
+nirvn 	2016-10-28
+
+    [FEATURE] add array_distinct() function
+
+Matthias Kuhn 	2016-10-27
+
+    Expression functions can dynamically report geometry and columns
+
+Matthias Kuhn 	2016-10-25
+
+    Add documentation for @parent aggregate filter
+
+Matthias Kuhn 	2016-10-25
+
+    Add test for @parent aggregate filter
+
+Matthias Kuhn 	2016-10-25
+
+    Fetch attributes and geometry for aggregate function
+
+Matthias Kuhn 	2016-10-25
+
+    Always cache values and add fid to feature hash
+
+Matthias Kuhn 	2016-10-25
+
+    [FEATURE] Expose @parent variable in aggregate functions
+
+    This makes it possible to access attributes and geometry from the parent
+    feature when in the filter of the "aggregate" expression function.
+
+    With this in place aggregates can be calculated per feature.
+
+    E.g. max "measurement" for each point_station per polygon_research_area.
+
+    Or a default attribute value when digitizing features:
+
+        aggregate(layer:='countries', aggregate:='max', expression:=\"code\",
+    filter:=intersects( $geometry, geometry(@parent) ) )
+
+Merge: 0f7babb682 7373036edf
+Nyall Dawson 	2016-10-28
+
+    Merge pull request #3678 from nirvn/string_to_array_to_string
+
+    [FEATURE] add string_to_array() and array_to_string() functions
+
+Matthias Kuhn 	2016-10-27
+
+    Convert API break document to markdown
+
+Even Rouault 	2016-10-27
+
+    Vector layer properties GUI: tweak message to be "Save in database (GeoPackage)" for GeoPackage
+
+Matthias Kuhn 	2016-10-27
+
+    [FEATURE] Add is_selected and num_selected functions
+
+    * is_selected() returns if the current feature is selected
+    * num_selected() returns the number of selected features on the current layer
+    * is_selected(layer, feature) returns if the "feature" is selected. "feature"
+      must be on "layer".
+    * num_selected(layer) returns the number of selected features on "layer"
+
+Matthias Kuhn 	2016-10-27
+
+    [expressions] Variable length arguemnt functions accept 0 params
+
+nirvn 	2016-10-27
+
+    [FEATURE] add string_to_array() and array_to_string() functions
+
+Even Rouault 	2016-10-27
+
+    [OGR provider] Fix declaration of types (master regression) and update more sensible values for min/max length
+
+Even Rouault 	2016-10-27
+
+    [DBManager GPKG] Set appropriate icon for line layers
+
+volaya 	2016-10-27
+
+    indentation fix
+
+volaya 	2016-10-27
+
+    [processing] fixed field loading in field calculator
+
+    fixes #15767
+
+    Conflicts:
+            python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
+
+Even Rouault 	2016-10-27
+
+    [OGR provider] Do not list qgis_projects (from QgisGeoPackage plugin) as sublayer
+
+Merge: 1d09538c5c 8a809b8700
+Nyall Dawson 	2016-10-27
+
+    Merge pull request #3677 from nirvn/map_themes_signal_fix
+
+    [map themes] fix composer signal name
+
+Merge: 642e4a48c7 3fb2d9e4e3
+Nyall Dawson 	2016-10-27
+
+    Merge pull request #3670 from nirvn/expression_replace_array
+
+    [FEATURE] array support for the replace() expression function
+
+nirvn 	2016-10-27
+
+    [map themes] fix composer signal name
+
+nirvn 	2016-10-26
+
+    [expression] further improve replace() to support a map argument
+
+Denis Rouzaud 	2016-10-26
+
+    Revert "[Postgres] fix writing default value when primary key has varchar columns"
+
+    This reverts commit f456932514c750d4b077a9daaea5ddfbbad3f1c8.
+
+Denis Rouzaud 	2016-10-26
+
+    [Postgres] fix writing default value when primary key has varchar columns
+
+    kudos to @m-kuhn to find and solve this
+
+Nyall Dawson 	2016-10-26
+
+    Followup 858978, fix failing tests
+
+nirvn 	2016-10-25
+
+    [FEATURE] array support for the replace() expression function
+
+Nyall Dawson 	2016-10-26
+
+    Use QgsExpressionContextScope::addVariable instead of setVariable
+
+    ...where appropriate (ie, read-only, non user set variables).
+    It's much faster as it doesn't need to check whether the
+    variable already exists.
+
+    Results in ~10% improvement in rendering speed. Refs #15752.
+
+Merge: 469f07c071 3bb7d5cccf
+Even Rouault 	2016-10-26
+
+    Merge pull request #3665 from rouault/save_style_gpkg
+
+     [FEATURE] [OGR provider] Load/save style in database for GPKG and Spatialite
+
+Matthias Kuhn 	2016-10-26
+
+    Use fallback default mode for snapping with bad configuration
+
+Matthias Kuhn 	2016-10-26
+
+    Remove snapping settings from status bar
+
+Juergen E. Fischer 	2016-10-26
+
+    include qgsactionmanager.h in install
+
+    (cherry picked from commit 5d7f8e9565541660d6ae080f520f38a3259173ce)
+
+Nyall Dawson 	2016-10-26
+
+    Optimise QgsAbstractGeometry
+
+    Make nCoordinates virtual, and provide shortcuts for some
+    geometry types. The base method which calls coordinateSequence()
+    is quite slow in certain circumstances.
+
+    Speeds up rendering point layers by ~25%, also likely to
+    speed up lots of geometry heavy operations throughout QGIS
+
+    Refs #15752
+
+Nyall Dawson 	2016-10-26
+
+    Speed up point layer rendering - don't calculate unused label obstacles
+
+    Cuts render time by ~60%. Fix #15752.
+
+Nyall Dawson 	2016-10-26
+
+    [expressions] Allow non-greedy regex by switching to QRegularExpression
+
+Alexander Bruy 	2016-10-25
+
+    [processing] add workaround for GDAL regression with cutlines (fix #15746)
+
+Even Rouault 	2016-10-25
+
+    [DB Manager] Fix refresh issue when renaming GPKG table, and disable add geometry column button if already one existing
+
+rldhont 	2016-10-25
+
+    [BUGFIX][QGIS Server] Do not cache invalid layer
+
+    After readLayerXml, the server stored layers in cache and in registry without verifying validity.
+
+Matthias Kuhn 	2016-10-25
+
+    Address snapping config UX problems
+
+    See https://github.com/qgis/QGIS/pull/3617#issuecomment-255114425
+
+rldhont 	2016-10-25
+
+    Clean QgsVectorLayer: remove duplicated writeSld method
+
+Even Rouault 	2016-10-24
+
+    [OGR provider] More uses of QStringLiteral / QLatin1String
+
+Even Rouault 	2016-10-18
+
+    [FEATURE] [OGR provider] Load/save style in database for GPKG and Spatialite
+
+Even Rouault 	2016-10-18
+
+    QgsVectorLayer::writeSymbology(): fix crash when called with invalid data provider
+
+Even Rouault 	2016-10-18
+
+    QgsVectorLayer::loadNamedStyle(): make it work with non database URI
+
+    Such as OGR GPKG
+
+Even Rouault 	2016-10-18
+
+    SIP QgsVectorLayer: fix signatures for output parameter
+
+    saveStyleToDatabase() and getStyleFromDatabase() should define errMsg as
+    output parameter
+    And loadNamedStyle() also for theResultFlag.
+
+Paolo Cavallini 	2016-10-25
+
+    Enable CROP_TO_CUTLINE by default
+
+    Fixes https://hub.qgis.org/issues/15750
+    Please backport it where appropriate.
+
+Nyall Dawson 	2016-10-25
+
+    Fix a qt warning message on startup
+
+Nyall Dawson 	2016-10-25
+
+    Make welcome page layout align with other panels + docks
+
+Nyall Dawson 	2016-10-25
+
+    Update qt5 build instructions for Fedora
+
+Nyall Dawson 	2016-10-24
+
+    [FEATURE] Remove zonal stats plugin
+
+    This is now fully exposed via processing, which is the logical
+    place for this feature to reside.
+
+    One less c++ plugin is a good thing!
+
+    (marked as feature so we remember to mention this in changelog!)
+
+Nyall Dawson 	2016-10-24
+
+    [FEATURE] Remove dxf2shp converter plugin
+
+    This functionality is available in OGR and there is no longer
+    a need for a dedicated QGIS plugin to do this task
+
+    Marked as feature for documentation + changelog reminder
+
+Nyall Dawson 	2016-10-25
+
+    Prepare commit converts single line doxygen block format
+
+    Flips single line doxygen comments to use the proper single line
+    format:
+
+    /*!< comment */   to   //!< Comment
+
+    and
+
+    /** comment */    to   //! Comment
+
+Nyall Dawson 	2016-10-25
+
+    Minor doxygen improvements
+
+Nyall Dawson 	2016-10-25
+
+    Followup 4166a3, don't use QStringLiteral in definitions
+
+    Causes linker errors in some random cases
+
+Even Rouault 	2016-10-24
+
+    [DB_Manager GPKG] Fix creating and changing default values of columns
+
+Even Rouault 	2016-10-24
+
+    [DB_Manager GPKG] Fix logic inversion in GDAL 1.X vs GDAL 2.X cases
+
+Matthias Kuhn 	2016-10-24
+
+    Add a hyperlink to the processing tests readme
+
+Harrissou Sant-anna 	2016-10-24
+
+    typo fix
+
+Sandro Santilli 	2016-10-24
+
+    Add more links to test-relted README files
+
+Sandro Santilli 	2016-10-24
+
+    Add link to processing test document
+
+Merge: 72229c1c2b d32a949bf8
+Even Rouault 	2016-10-24
+
+    Merge pull request #3628 from rouault/dbmanager_gpkg
+
+    [DBManager] Add dedicated GeoPackage plugin
+
+Merge: bb9e276d59 8ee25cdfa8
+Alexander Bruy 	2016-10-24
+
+    Merge pull request #3658 from nirvn/processing_modeler_mousewheel
+
+    [processing] fix modeleter mouse wheel zoom under qt5
+
+Merge: f6a344c2c1 4166a3ea62
+Nyall Dawson 	2016-10-24
+
+    Merge pull request #3660 from nyalldawson/qstringallc
+
+    Fix literal QString construction for Qt5/c++11
+
+Nyall Dawson 	2016-10-23
+
+    Fix most clazy qstring-unneeded-heap-allocations warnings
+
+    By flipping string literals to QStringLiteral/QLatin1String
+
+    see
+
+    https://woboq.com/blog/qstringliteral.html
+
+Nyall Dawson 	2016-10-12
+
+    Add QgsTextFormatPanelWidget for text format control inside panel
+
+Nyall Dawson 	2016-10-05
+
+    Add a simple dialog for configuring text formatting
+
+Nyall Dawson 	2016-10-05
+
+    Respect render context antialiasing setting in text renderer
+
+Nyall Dawson 	2016-10-04
+
+    Split QgsLabelingGui off into QgsTextFormatWidget
+
+    New widget allows for setting just the formatting properties
+    of text
+
+Nyall Dawson 	2016-10-04
+
+    [FEATURE] Allow label font size in mm/pixels
+
+    And all other label sizes (eg buffer size) now accept sizes in
+    pixels too
+
+Nyall Dawson 	2016-10-04
+
+    Remove unused QgsLabelPreview class
+
+Nyall Dawson 	2016-10-01
+
+    New widget QgsTextPreview for previewing all formatting for QgsTextRenderer
+
+    Switch the labeling gui to use this widget, which has the benefits:
+    - previews all label settings, including shadow and background
+    - previews at a specified scale, so that any sizes using map units
+    will be correct
+
+Nyall Dawson 	2016-10-04
+
+    Fix text renderer not respecting min/max mm scale for map units (fix #14698)
+
+Nyall Dawson 	2016-09-30
+
+    Test masks
+
+Nyall Dawson 	2016-10-02
+
+    Fix unit handling for labeling dialog
+
+Nyall Dawson 	2016-09-27
+
+    [FEATURE] QgsTextRenderer class for rich text rendering
+
+    Moves all the drawing code out of labeling into a new class
+    which just handles rendering text. This allows other parts
+    of the code to utilise all the advanced formatting options
+    that labeling supports, eg rendering text with shadows,
+    buffers and backgrounds.
+
+Nyall Dawson 	2016-09-27
+
+    Restore separate handling of label component opacity
+
+    ...in a way that avoids unnecessary detachments of the
+    settings objects
+
+Nyall Dawson 	2016-09-27
+
+    Minor refactor of label drawing
+
+    Remove use of scale factors from PAL layer settings and use
+    render context factors directly
+
+Nyall Dawson 	2016-09-27
+
+    Remove option to show label shadow rectangles from GUI
+
+    ...and instead just make it #ifdef out
+
+Nyall Dawson 	2016-09-26
+
+    Flip QgsPalLayerSettings to use QgsTextRenderer classes
+
+Nyall Dawson 	2015-09-15
+
+    Implicitly shared text settings classes
+
+Nyall Dawson 	2016-09-24
+
+    Add Points as valid render unit (for font sizes)
+
+Merge: b4e310120f 2fab1b8bbe
+Nyall Dawson 	2016-10-24
+
+    Merge pull request #3663 from nyalldawson/clazy3
+
+    Clazy qt5 optimisations - round 2
+
+Nyall Dawson 	2016-10-24
+
+    Fix doxygen warnings/missing docs
+
+Nyall Dawson 	2016-10-24
+
+    Fix bad snapping signal names
+
+Nyall Dawson 	2016-10-24
+
+    [processing] Add algorithm to strip null geometries
+
+Nyall Dawson 	2016-10-24
+
+    Use isEmpty() rather than size() to check for empty lists
+
+Nyall Dawson 	2016-10-24
+
+    Optimise passing of variables by ref/value
+
+Nyall Dawson 	2016-10-24
+
+    Fix some clazy container-inside-loop warnings
+
+    From the clazy docs:
+
+    "Finds places defining containers inside loops. Defining them
+    outside the loop and using resize(0) will save memory allocations."
+
+Nyall Dawson 	2016-10-24
+
+    Fix clazy reserve-candidates suggestions
+
+    Avoids repeated memory allocations
+
+Nyall Dawson 	2016-10-24
+
+    Fix clazy missing-typeinfo warnings
+
+    From the clazy docs:
+
+    "Suggests usage of Q_PRIMITIVE_TYPE or Q_MOVABLE_TYPE in cases where
+    you're using QList and sizeof(T) > sizeof(void*) or using
+    QVector, unless they already have a type info classification."
+
+Nyall Dawson 	2016-10-24
+
+    Fix classes which violate the rule-of-three
+
+    (identified using clazy analyser)
+
+Nyall Dawson 	2016-10-24
+
+    [processing] Fix qgis zonal stats algorithm
+
+Matthias Kuhn 	2016-10-23
+
+    Add missing bindings
+
+Matthias Kuhn 	2016-10-21
+
+    Cleanup and modernize QgsProject code
+
+Juergen E. Fischer 	2016-10-23
+
+    add *.py to .gitattributes
+
+Paolo Cavallini 	2016-10-23
+
+    Update r.mapcalc.txt
+
+    Better description of r.mapcalc
+
+Matthias Kuhn 	2016-10-21
+
+    QgsVectorDataProvider API cleanup
+
+Merge: 6acf0f745f 1dca938306
+Nyall Dawson 	2016-10-23
+
+    Merge pull request #3659 from nyalldawson/clazy3
+
+    Fix clazy level 0 checks
+
+Nyall Dawson 	2016-10-22
+
+    Fix some clazy "inefficient-qlist-soft" warnings
+
+    From the clazy docs:
+
+    Finds QList where sizeof(T) > sizeof(void*).
+    QVector should be used instead.
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy qstring-left warnings
+
+    From the clazy docs:
+
+    Finds places where you're using QString::left(0) instead
+    of QString::at(0). The later form is cheaper.
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy "detaching-temporary" warnings
+
+    From the clazy docs:
+
+    Finds places where you're calling non-const member functions on
+    temporaries. For example getList().first(), which would detach
+    if the container is shared.
+
+Nyall Dawson 	2016-10-22
+
+    Add missing references in Q_FOREACH loops
+
+Nyall Dawson 	2016-10-22
+
+    Fix issues with writing to temporary objects
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy qmap-with-pointer-key warnings
+
+    From the clazy docs:
+
+    Finds cases where you're using QMap and K is a pointer.
+
+    QMap has the particularity of sorting it's keys, but sorting
+    by memory address makes no sense. Use QHash instead, which
+    provides faster lookups.
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy qvariant-template-instantiation warning
+
+    From the clazy docs:
+
+    Detects when you're using QVariant::value() instead
+    of QVariant::toFoo().
+
+    The former results in more code being generated.
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy temporary-iterator warning
+
+    Calling constBegin/constEnd on temporary container can result
+    in endless loop
+
+Nyall Dawson 	2016-10-22
+
+    Remove unused variables
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy qstring-arg warnings
+
+    Avoid chained QString::arg() calls and instead use the multi-arg
+    overload to save memory allocations
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy qfileinfo-exists warnings
+
+    From the clazy docs:
+
+    Finds places using QFileInfo("foo").exists() instead of the faster
+    version QFileInfo::exists("foo"). According to Qt's docs: "Using
+    this function is faster than using QFileInfo(file).exists() for
+    file system access."
+
+Nyall Dawson 	2016-10-22
+
+    Fix clazy "qstring-ref" warnings
+
+    From the clazy docs:
+
+    Finds places where QString::fooRef() should be used instead of
+    QString::foo(), to avoid temporary heap allocations
+
+    eg
+
+    str.mid(5).toInt(ok) // BAD
+
+    str.midRef(5).toInt(ok) // GOOD
+
+Juergen E. Fischer 	2016-07-10
+
+    msvc: use /bigobj for sip modules
+
+    (cherry picked from commit d0b3e39cdab1da17d7a977ba3def5ce1b64ff707)
+
+Juergen E. Fischer 	2016-10-21
+
+    release.pl: stay on same master* branch
+
+    (cherry picked from commit cc429785edd16a91f7118cb7a1b964492988546f)
+
+nirvn 	2016-10-22
+
+    [processing] fix modeleter mouse wheel zoom under qt5
+
+nirvn 	2016-10-22
+
+    [processing] fix modeler parameter mandatory checkbox logic
+
+Nyall Dawson 	2016-10-22
+
+    Fix missing doc warning
+
+Nyall Dawson 	2016-10-22
+
+    Indentation
+
+Merge: bde0f6ee2e 85818c684c
+Nyall Dawson 	2016-10-22
+
+    Merge pull request #3655 from sebastic/patch-1
+
+    Fix copyright in 2017
+
+Bas Couwenberg 	2016-10-21
+
+    Fix copyright in 2017
+
+    Match copyright header with python code.
+
+Merge: 2b9f475a84 d83e650ae4
+Alexander Bruy 	2016-10-21
+
+    Merge pull request #3650 from nirvn/processing_spatialite_sql
+
+    [processing] add a "Spatialite execute SQL" algorithm
+
+rldhont 	2016-10-21
+
+    [BUGFIX][QGIS-Server] Don't failed when transform boundingbox
+
+Matthias Kuhn 	2016-10-17
+
+    Allow 0 (infinite) for scale dependent visibility
+
+    Fix #15414
+
+Matthias Kuhn 	2016-10-17
+
+    Restore layer variables when loading QML
+
+    Fix #14452
+
+Matthias Kuhn 	2016-10-18
+
+    Hide constraint warnings when there are no constraints
+
+Matthias Kuhn 	2016-10-18
+
+    Fix icon size for constraint warning
+
+Matthias Kuhn 	2016-10-18
+
+    Fix form constraints and group visibility
+
+    When a relation editor was shown (or more generally a widget which is not an
+    editor widget), constraints and group visibility were silently disabled.
+
+Matthias Kuhn 	2016-10-18
+
+    [postgres] Avoid crash when fetching default value fails
+
+Merge: 89fa21e5fa bd7149ce16
+volaya 	2016-10-21
+
+    Merge pull request #3651 from nirvn/processing_modeler_fix
+
+    [processing] fix broken modeler under pyqt5/python3 (fixes #15734)
+
+nirvn 	2016-10-21
+
+    [processing] fix broken modeler under pyqt5/python3 (fixes #15734)
+
+nirvn 	2016-10-21
+
+    [processing] make spatialite connector work with python3
+
+nirvn 	2016-10-21
+
+    [processing] add a spatialite execute SQL algorithm
+
+Alexander Bruy 	2016-10-20
+
+    [processing] more complete support for int64 fields (follow up 8d2cc8806b)
+
+    (cherry picked from commit 649d41f1ecd4b8d22110e11cb9e693231bec8ed2)
+
+Germán Carrillo 	2016-10-20
+
+    Using QVariant.Type enum instead of numbers for readability.
+
+    (cherry picked from commit 6df926dfe6e3e8f7ac330fbb9206dc69492da6ed)
+
+Germán Carrillo 	2016-10-19
+
+    Fixing issue with 'Eliminate sliver polygons' and fields of type long.
+
+    (cherry picked from commit be25a29da196fac687f95abffb71e34138e3d20c)
+
+Juergen E. Fischer 	2016-10-20
+
+    release.pl:
+    * allow minor releases from master_2 branch
+    * convert windows splash screen to BMP3 from PNG
+
+    (cherry picked from commit 09db6e4a00dda3b573cda7be938d46e8def66bef)
+
+Juergen E. Fischer 	2016-10-20
+
+    fix translation strings
+
+Matthias Kuhn 	2016-10-20
+
+    Followup a6a4f2ed: clean pre-cxx-11 garbage
+
+Matthias Kuhn 	2016-10-20
+
+    Fix build warning
+
+Matthias Kuhn 	2016-10-20
+
+    Expose QgsUnitTypes to QML
+
+Matthias Kuhn 	2016-10-19
+
+    Rename visibility presets to map themes part 2
+
+Matthias Kuhn 	2016-10-19
+
+    Q_PROPERTYze QgsCoordinateReferenceSystem::unitType
+
+Matthias Kuhn 	2016-10-19
+
+    Update snapping settings widget when avoid intersection list changes
+
+Matthias Kuhn 	2016-10-18
+
+    Move snapping options to project menu
+
+Matthias Kuhn 	2016-10-18
+
+    Remove QgsSnappingDialog
+
+Matthias Kuhn 	2016-10-18
+
+    Move management of avoidIntersectionLayers to QgsProject
+
+Matthias Kuhn 	2016-10-18
+
+    Move topological editing setting management fully to QgsProject
+
+Matthias Kuhn 	2016-10-08
+
+    Enable C++11 by default
+
+Matthias Kuhn 	2016-10-08
+
+    Make QgsPoint a Q_GADGET
+
+Denis Rouzaud 	2016-08-26
+
+    Use toolbar or status bar for snapping config
+
+Matthias Kuhn 	2016-10-20
+
+    Rename visibility presets to map themes part 2 (#3641)
+
+Matthias Kuhn 	2016-10-20
+
+    Improve db_manager README
+
+Matthias Kuhn 	2016-10-20
+
+    Rename README to README.md
+
+Merge: a3ebc7bdb6 df90e6b964
+Alexander Bruy 	2016-10-20
+
+    Merge pull request #3646 from alexbruy/processing-otb-test
+
+    [processing] add tests for OTB algorithms
+
+Alexander Bruy 	2016-10-19
+
+    [processing] add test for ParameterSelection
+
+Alexander Bruy 	2016-10-12
+
+    [processing] add icon for zonal statistics tool
+
+Alexander Bruy 	2016-10-12
+
+    [processing] expose zonal statistics from Zonal statistics plugin in toolbox
+
+Sandro Santilli 	2016-10-20
+
+    Do not pass None to len()
+
+Sandro Santilli 	2016-10-19
+
+    Make Extent and Extent CRS GDAL parameters optional
+
+    Specify what the default is when extent CRS is not specified.
+    Allow using "auto" to have extent automatically set to min covering extent.
+
+    Fixes #15685
+
+Merge: 2d4e3da8f5 58f31f1a82
+Alexander Bruy 	2016-10-20
+
+    Merge pull request #3592 from alexbruy/processing-interpolation
+
+    [processing] add interpolation tools
+
+Alexander Bruy 	2016-10-20
+
+    [processing] remove unused test data
+
+Alexander Bruy 	2016-10-19
+
+    [processing] minor formatting fixes to the OTB README
+
+Alexander Bruy 	2016-10-19
+
+    [processing] remove unused file
+
+Alexander Bruy 	2016-10-19
+
+    fix conflicts
+
+Merge: 47222749f6 69e8da0fb1
+Nyall Dawson 	2016-10-20
+
+    Merge pull request #3647 from nirvn/composer_attribute_table_fix
+
+    [composer] fix attribute table widget connect warning
+
+Nyall Dawson 	2016-10-20
+
+    Fix calculation of transparent region
+
+nirvn 	2016-10-20
+
+    [composer] fix attribute table widget connect warning
+
+Nyall Dawson 	2016-10-20
+
+    Fix missing commit
+
+Nyall Dawson 	2016-10-20
+
+    Followup c9251c, fix crash
+
+Merge: 8c7d772f22 3212d393c1
+Nyall Dawson 	2016-10-20
+
+    Merge pull request #3645 from nirvn/linefillpattern_fix
+
+    [symbology] prevent creation of a zero width/height line pattern image (fixes #15728)
+
+Manuel Grizonnet 	2016-08-23
+
+    TEST: add a test for otb conversion application (simpler than bandmath)
+
+nirvn 	2016-10-20
+
+    [symbology] prevent creation of a zero width/height line pattern image (fixes #15728)
+
+Alexander Bruy 	2016-10-20
+
+    Install OTB in QGIS Travis CI script to be able to run OTB test
+
+Alexander Bruy 	2016-10-20
+
+    update readme for otb maintenance script
+
+Manuel Grizonnet 	2016-08-23
+
+    BUG: add version 5.4 to supported version
+
+Manuel Grizonnet 	2016-08-22
+
+    TEST: add test of OTB BandMath application in processing
+
+Nyall Dawson 	2016-10-20
+
+    Further optimisations to nonTransparentImageRect calculation
+
+Nyall Dawson 	2016-10-20
+
+    Avoid creating multiple render contexts when calculating legend
+    node size
+
+    Partial fix for qgis slowdown when using layer with large
+    number of legend nodes
+
+Alexander Bruy 	2016-10-12
+
+    [processing] add tests for interpolation tools
+
+Mathieu Pellerin 	2016-10-19
+
+    [processing] ensure that outputs of vector overlay operations are multiparts (#3622)
+
+rldhont 	2016-10-19
+
+    Fix [DB Manager] Allow lowercase field names for homogenize PostGIS Import
+
+Alexander Bruy 	2016-10-11
+
+    [processing] add icons for interpolation tools
+
+Alexander Bruy 	2016-10-11
+
+    [processing] expose TIN interpolation from interpolation plugin in toolbox
+
+Alexander Bruy 	2016-10-10
+
+    [processing] expose IDW interpolation from Interpolation plugin in toolbox
+
+Merge: c130372730 a9795ad8ea
+rldhont 	2016-10-19
+
+    Merge pull request #3625 from rldhont/db_manager_lowercaseFieldNames
+
+    [DB Manager] Allow lowercase field names for homogenize PostGIS Import
+
+rldhont 	2016-10-18
+
+    [DB Manager] Allow lowercase field names for homogenize PostGIS Import
+
+    PostGIS provider has an option to lowercase field names. This options is available for user in QGIS algorithm ImportIntoPostGIS and not in DB Mananger.
+
+    This commit fix it.
+
+Jaka Kranjc 	2016-10-19
+
+    doc: fixed processing's description for v.extract (#3637)
+
+Piotr Pociask 	2016-10-17
+
+    [processing] Update voronoi classes for Python3; update expected data for multipoint Delaunay traingulation test
+
+Piotr Pociask 	2016-10-17
+
+    Test for multipoint Delaunay triangulation
+
+Piotr Pociask 	2016-10-16
+
+    [processing] support MultiPoint geometries in Delaunay triangulation
+
+Alexander Bruy 	2016-10-19
+
+    [processing] add missed spatial index constructor (follow up 700441eec9)
+
+Merge: 4bcd97066f 455874258c
+Nyall Dawson 	2016-10-19
+
+    Merge pull request #3631 from nirvn/legend_vertical_alignment_2
+
+    [legend] insure multi-line labels are vertically centered with tall symbols
+
+nirvn 	2016-10-14
+
+    [legend] insure multi-line labels are vertically centered with tall symbols
+
+Nyall Dawson 	2016-10-19
+
+    Fix more occurances of drawPolygon issues on Windows
+
+Nyall Dawson 	2016-10-19
+
+    Fix badly worded string
+
+Nyall Dawson 	2016-10-19
+
+    Optimise creation of spatial indexes
+
+    Use constructor which takes an iterator instead of manually
+    adding features, and don't request attributes for spatial
+    index features
+
+Even Rouault 	2016-10-18
+
+    Blacklist PyQgsDBManagerGpkg test
+
+    The test consistently segfaults on Travis, but run fine locally,
+    normally or under Valgrind.
+    Trying to run it under Valgrind on Travis runners does not succeed:
+    https://travis-ci.org/rouault/Quantum-GIS/builds/168674938
+
+    So blacklist for now
+
+Even Rouault 	2016-10-18
+
+    [DBManager] Remove geopackage support from spatialite plugin
+
+Even Rouault 	2016-10-18
+
+    [DBManager] Add tests for GPKG plugin
+
+Even Rouault 	2016-10-18
+
+    [FEATURE] [DBManager] Add a GeoPackage dedicated plugin
+
+Even Rouault 	2016-10-18
+
+    [OGR provider] Support full SELECT subset string
+
+    This will be useful for DBManager SQL request layer.
+
+Alexander Bruy 	2016-10-18
+
+    [processing] add missed imports
+
+Merge: 8c37370310 a51ef42924
+rldhont 	2016-10-18
+
+    Merge pull request #3595 from rldhont/fix_server_legend_layertitle
+
+    [BUGFIX][QGIS Server] GetLegendGraphic: if LAYERTITLE is false disable layer name in legend
+
+Even Rouault 	2016-10-18
+
+    Fix 70ae301310c7a58134ac699fae70af7fd1176684
+
+    70ae301310c7a58134ac699fae70af7fd1176684 requires a recent enough GDAL trunk
+    or GDAL 2.1.2
+
+Alexander Bruy 	2016-10-18
+
+    [processing] remove debug line and fix spatial index creation
+
+volaya 	2016-10-17
+
+    [processing] fixed handling of None param values in ogr2ogrtopostgis.py
+
+    Conflicts:
+            python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
+
+volaya 	2016-10-17
+
+    [processing] made connection params optional in ogr2ogrtopostgis.py
+
+volaya 	2016-10-17
+
+    [processing] fixes for 'import into PostGIS' alg
+
+    fixes #15097
+
+Sandro Santilli 	2016-10-15
+
+    Add test for setting up connection string
+
+    Conflicts:
+            python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
+
+Sandro Santilli 	2016-10-15
+
+    [processing] Allow using libpq defaults for host,port,user,pass and dbname
+
+    Fixes #15706
+
+volaya 	2016-10-13
+
+    [processing] warn if extent might not be in the expected CRS
+
+volaya 	2016-10-04
+
+    [processing] fixed iterative execution
+
+    fixes #15650
+
+volaya 	2016-09-21
+
+    [processing] don't use full path for naming layers when loaded in dataobjects.load
+
+volaya 	2016-09-21
+
+    [processing] alternative way of copying algorithms in a model.
+
+    should fix #15060 and #15480
+
+volaya 	2016-09-21
+
+    [processing] dont use hidden outputs when exporting to python or displaying alg help
+
+    fixes #14998
+
+    Conflicts:
+            python/plugins/processing/core/GeoAlgorithm.py
+
+volaya 	2016-09-20
+
+    [processing] use only selected features for spatial index
+
+    fixes #15584
+
+volaya 	2016-09-29
+
+    [processing] better update of expression widget when layer is changed in fields calculator
+
+volaya 	2016-09-27
+
+    [processing] added short help for saga raster calculator
+
+volaya 	2016-09-27
+
+    [processing] fixed wrong import in i_aster_toar
+
+    Conflicts:
+            python/plugins/processing/algs/grass7/ext/i_aster_toar.py
+
+Matthias Kuhn 	2016-10-18
+
+    Show commit errors in transaction mode
+
+Even Rouault 	2016-10-18
+
+    [OGR provider] Update layer extent for GPKG layers
+
+    When moving or deleting a geometry that previously touched the layer extent,
+    the layer extent was never shrinked.
+
+    This fix requires GDAL 2.1.2 or above as well.
+
+    Fixes #15273
+
+Even Rouault 	2016-10-18
+
+    test_provider_ogr_gpkg.py: remove stuff that shouldn't have gone in 348af7ed5267f66f5ac2426be303a4ea69edd96f
+
+Even Rouault 	2016-10-18
+
+    test_provider_ogr_gpkg.py: pyflakes fixes
+
+Even Rouault 	2016-10-18
+
+    DBManager: python3 fix in create table dialog
+
+    The setAutoCompletion() method of QComboBox was deprecated in QT 4 and
+    has been removed in QT 5. Auto completion is enabled by default.
+
+Marco Hugentobler 	2016-10-18
+
+    WMS Server: catch QgsCSException and don't add null bounding boxes to the capabilities
+
+rldhont 	2016-10-10
+
+    [BUGFIX][QGIS Server] GetLegendGraphic: if LAYERTITLE is false disable layer name in legend
+
+    If the layer has only one legend node, it is embedded in parent.
+    In QGIS Server the user can specify no layer title, so the layer title has not be displayed.
+
+Juergen E. Fischer 	2016-10-18
+
+    qgm2cpp.pl fix
+
+Sandro Santilli 	2016-10-18
+
+    [processing] Fix handling of None shapeEncoding
+
+    Fixes #15719 -- object of type 'NoneType' has no len()
+
+Merge: 8843de88c7 76d17ca55b
+Alexander Bruy 	2016-10-18
+
+    Merge pull request #3624 from ghtmtt/master
+
+    [processing] porting some small fixes to master
+
+Sandro Santilli 	2016-10-18
+
+    Fix ogrLayerName handling of PostgreSQL dataset URIs
+
+    Also document "uri" parameter semantic, and add more tests.
+    See for background
+    https://lists.osgeo.org/pipermail/qgis-developer/2016-October/045311.html
+    REF #15698
+
+matteo 	2016-10-18
+
+    update ScriptEditorDialog for py3
+
+Matteo Ghetta 	2016-10-18
+
+    [processing] fix button font size in script editor
+
+    fixes the zooming of the font size in script editor dialog using another method
+
+Matteo Ghetta 	2016-10-18
+
+    [processing] avoid overlapping UI
+
+    multi field widget doesn't overlap anymore with other widgets
+
+Matteo Ghetta 	2016-10-18
+
+    [processing] Missing import fixed for R algorithm
+
+Nyall Dawson 	2016-10-18
+
+    Followup e8be0e, fix rotation when disabling sync
+
+Merge: 89cc6454b9 730b5b79ab
+volaya 	2016-10-18
+
+    Merge pull request #3619 from nirvn/processing_tinyfix
+
+    [processing] fix missing argument when calling getMinCoveringExtent()
+
+Merge: 2835cad6eb e8be0ed988
+Nyall Dawson 	2016-10-18
+
+    Merge pull request #3618 from nyalldawson/true_north
+
+    [composer] Allow syncing pictures to true north (fixes #192)
+
+nirvn 	2016-10-18
+
+    [processing] fix missing argument when calling getMinCoveringExtent()
+
+Nyall Dawson 	2016-10-18
+
+    [composer] Allow syncing pictures to true north
+
+    Previously pictures could only be synced to grid north, which
+    can be totally wrong for many CRSes (especially in polar areas)
+
+    Users now are given a choice of grid or true north, and can also
+    enter an optional offset to apply if eg magnetic north is instead
+    desired.
+
+    When synced to true north the bearing is calculated using the
+    centre point of the linked map item.
+
+    Fix #192, #4711
+
+    This fix was sponsored by the Norwegian Polar Institute's
+    Quantarctica project (http://quantarctica.npolar.no) and
+    coordinated by Faunalia.
+
+Nyall Dawson 	2016-10-18
+
+    New class QgsBearingUtils with method to calculate true north
+
+Nyall Dawson 	2016-10-17
+
+    Grey out disabled symbol layers in tree
+
+Nyall Dawson 	2016-10-17
+
+    [FEATURE] Data defined symbol layer visibility
+
+    Adds a data defined override to control a symbol layer's
+    visibility. Allows users to disable drawing certain symbol layers
+    for matching features.
+
+Nyall Dawson 	2016-10-13
+
+    [FEATURE] Allow symbol layers to be temporarily disabled
+
+    Adds a new checkbox at the bottom of each symbol layer's
+    properties which allows you to control whether the layer is
+    enabled or not.
+
+    Disabled layers are not drawn, but are saved and can be
+    enabled at a later stage.
+
+    This makes it easier to tweak symbol appearance without
+    having to totally delete a symbol layer.
+
+Nyall Dawson 	2016-10-17
+
+    Fix effects lost on geometry generator symbol layer
+
+Nyall Dawson 	2016-10-14
+
+    Defer processing of dropped files
+
+    On Windows (and maybe other platforms) Qt locks the dragging
+    application for the duration of dropEvent. This means that
+    dropping large files or projects onto QGIS results in
+    Explorer windows being locked and unresponsive until
+    the entire file/project is loaded.
+
+    There does not seem to be any Qt method for releasing this lock
+    early, so instead we return from dropEvent as quickly as possible
+    and defer the actual file loading to a slot which is fired up
+    immediately after dropEvent concludes.
+
+Nyall Dawson 	2016-10-18
+
+    Followup ecee438
+
+Nyall Dawson 	2016-10-18
+
+    Fix changing project CRS from legend doesn't correctly set CRS
+
+    Also avoid fragile duplicated code for setting/retrieving
+    common project properties
+
+    Fixes #15717
+
+Nyall Dawson 	2016-10-18
+
+    Add processing test .aux.xml to .gitignore
+
+Merge: a6c04fc44c 17e318bd95
+borys 	2016-10-17
+
+    Merge branch 'master' of github.com:qgis/QGIS
+
+borys 	2016-10-17
+
+    [Plugin Manager] Fix font size also in master (issue #15302)
+
+Nyall Dawson 	2016-10-14
+
+    [FEATURE] Drag qpt to QGIS to create new composer from template
+
+Juergen E. Fischer 	2016-10-17
+
+    windows: prefer spatialite_i over spatialite
+
+    (cherry picked from commit 219a97c35b7c1d8a8943d4e2e47a8956288320b4)
+
+Merge: e158ecad95 697cd1bb7d
+rldhont 	2016-10-17
+
+    Merge pull request #3606 from rldhont/fix_server_featureinfo_nogeometry
+
+    [BUGFIX][QGIS Server] GetFeatureInfo: Feature with no geometry is not…
+
+Juergen E. Fischer 	2016-10-17
+
+    scripts/scandeps.pl run and t2tdoc
+
+Juergen E. Fischer 	2016-10-17
+
+    scripts/scandeps.pl: avoid duplicate build depends
+
+volaya 	2016-10-17
+
+    [processing] fixed creating params and outputs from description strings
+
+rldhont 	2016-10-14
+
+    [BUGFIX][QGIS Server] GetFeatureInfo: Feature with no geometry is not returned even if FILTER param is set
+
+Sandro Santilli 	2016-10-17
+
+    Fix extraction of ogr LayerName from database dataset URIs
+
+    See https://github.com/qgis/QGIS/commit/6c5364186dd8d45ac51e5bd1a72c6a542f032cb1#commitcomment-19439676
+    Includes testcase.
+
+    REF #15698
+
+Merge: 03f08a6c79 34894c6f5a
+Even Rouault 	2016-10-17
+
+    Merge pull request #3597 from rouault/saveas_overwrite_append
+
+    [FEATURE] Vector layer save as: offer file/layer overwriting, new layer creation, feature and field appending
+
+Matthias Kuhn 	2016-10-17
+
+    Fix QgsMapLayer ConvertToSubClassCode (#3611)
+
+    Fix #15683
+
+Matthias Kuhn 	2016-10-17
+
+    Don't rely on RTTI to convert symbol layer to sip objects
+
+Matthias Kuhn 	2016-10-17
+
+    Minimal improvement for processing tests README
+
+Matthias Kuhn 	2016-10-17
+
+    Fix python calls to inexistent methods
+
+Merge: 688d1a5eba 8f9fe00671
+volaya 	2016-10-17
+
+    Merge pull request #3610 from NaturalGIS/processing_grass7_v_voronoi_skeleton
+
+    Processing grass7 v voronoi skeleton
+
+Nyall Dawson 	2016-10-17
+
+    [processing] Speed up dissolve when not using fields
+
+Nyall Dawson 	2016-10-17
+
+    [processing] Use prepared geometries for intersects tests
+
+    Wherever possible use prepared geometry engines for intersects
+    type tests, as it's much faster
+
+Nyall Dawson 	2016-10-17
+
+    [processing] Optimise feature requests within qgis algs
+
+    - don't use setFilterFid() within loops to fetch features one
+    at time (as it's extremely slow), instead use setFilterFids()
+    outside the loop
+    - don't fetch unused attributes/geometry when it can be
+    avoided
+
+Nyall Dawson 	2016-10-17
+
+    Always clear pen/brush before drawing layer effects (fix #15696)
+
+Giovanni Manghi 	2016-10-16
+
+    add paramter to v.voronoi.skeleton
+
+Giovanni Manghi 	2016-10-16
+
+    Add a GRASS7 tool to compute skeletons of areas, using v.voronoi
+
+Sandro Santilli 	2016-10-14
+
+    Fix extraction of ogr LayerName from multi-layer dataset URIs
+
+    Adds supports for "layerid" when present.
+    Drop special handling for "table=" portions found in URI,
+    making the code more generic.
+
+    Includes testcase.
+
+    Fixes #15698 - import geodatabase to postgis via processing
+
+Sandro Santilli 	2016-10-14
+
+    Python scripts have 4-spaces indent
+
+Sandro Santilli 	2016-10-13
+
+    Revert "postgres provider: quote compound key columns in uri"
+
+    This reverts commit daa6510970e9afbc4d41d28e0c94b4f238eb372d.
+
+    I've tested that reverting this does not re-introduce bug
+    http://hub.qgis.org/issues/13710
+
+Sandro Santilli 	2016-10-13
+
+    Fix PostgreSQL import of layers with multi-column or quoted-column keys
+
+    Fixes #15226 (drag & drop of postgresql views)
+    Includes test
+
+Juergen E. Fischer 	2016-10-14
+
+    debian packaging: add support for yakkety
+
+Nyall Dawson 	2016-10-14
+
+    Fix build
+
+Nyall Dawson 	2016-10-14
+
+    Fix bad fills when using marker line with render effects (fix #15696)
+
+Merge: 721d3c5bfb ec2d7fea0c
+Nyall Dawson 	2016-10-14
+
+    Merge pull request #3602 from nirvn/composer_table_custom_grid
+
+    [FEATURE] control over drawing of composer table grid horizontal & vertical lines
+
+Nyall Dawson 	2016-10-14
+
+    Fix color widget opens in wrong panel (fix #15705)
+
+nirvn 	2016-10-14
+
+    [FEATURE] control over drawing of composer table grid horizontal & vertical lines
+
+Merge: b7321ecde6 20d006e101
+Nyall Dawson 	2016-10-14
+
+    Merge pull request #3584 from nirvn/db_manager_fixes
+
+    [db manager] non-spatial import & spatialite error reporting fixes
+
+Nyall Dawson 	2016-10-14
+
+    Fix incorrect selection rect drawn for composer items on windows
+
+Nyall Dawson 	2016-10-14
+
+    Add default shortcut to open attribute table (F6)
+
+Merge: d30a8c1fc2 a629deef30
+Larry Shaffer 	2016-10-13
+
+    Merge pull request #3577 from dakcarto/master-ows-fixes
+
+Sandro Santilli 	2016-10-13
+
+    Add hint about running specific test methods in python unit tests
+
+Larry Shaffer 	2016-10-06
+
+    [auth] Reinstate auth system reply expansions for OWS providers
+
+    - Apparently this was lost during a git squash of commits for 2.12 PR
+
+Larry Shaffer 	2016-10-05
+
+    [WFS provider] Fix auth config extra expansion and auth prioritization
+
+Merge: 0f4cba5c2d a356bac1a5
+volaya 	2016-10-13
+
+    Merge pull request #3581 from alexbruy/processing-terrain-analysis
+
+    [processing] add raster terrain analysis tools
+
+Even Rouault 	2016-10-13
+
+    [FEATURE] Vector layer save as: offer file/layer overwriting, new layer creation, feature and field appending
+
+    When saving a vector layer into an existing file, depending on the capabilities
+    of the output driver, the user can now decide whether:
+    - to overwrite the whole file
+    - to overwrite only the target layer (layer name is now configurable)
+    - to append features to the existing target layer
+    - to append features, add new fields if there are any.
+
+    All above is available for drivers like GPKG, SpatiaLite, FileGDB, ...
+    For drivers like Shapefile, MapInfo .tab, feature append is also available.
+
+Sandro Santilli 	2016-10-11
+
+    Fix bogus precision/scale in PostgreSQL for double values
+
+    This reverts commit 92f71b696ca93c792ae5602ed82863fcef0e5006,
+    which broke import of legit shapefiles by assuming wrong
+    semantic for the non-constraining QgsField length/precision
+    attributes.
+
+    Closes #15188
+
+    Includes test
+
+rldhont 	2016-10-11
+
+    Last Redo [BUGFIX][QGIS Server] Joins was not reloaded if the layer is in cache
+
+    Add an accessor to QgsVectorLayer join buffer, to not duplicate QgsVectorLayerJoinBuffer::readXml code
+
+Alexander Bruy 	2016-10-12
+
+    [processing] avoid division by zero (fix #15521)
+
+Nyall Dawson 	2016-10-12
+
+    [processing] Optimise uniqueValues method
+
+    Now it uses the standard QgsVectorLayer.uniqueValues() method
+    where possible so that provider side optimisations are used
+
+    Also add test, and optimise request when using selected
+    features only
+
+Nyall Dawson 	2016-10-12
+
+    [processing] Fix inefficient values() method
+
+    Method was iterating over ever feature in a layer, including
+    geometries and all attributes for EVERY attribute requested
+
+    Add test and refactor so only one optimised iteration (eg no
+    geometry, only required attributes) is used
+
+Nyall Dawson 	2016-10-12
+
+    Correctly handle edit buffer when using request with limit (fix #15505)
+
+Nyall Dawson 	2016-10-12
+
+    Fix HTML annotation does not display HTML (fix #8609)
+
+    Annotation was only rendering html when it was associated with a
+    map layer. Now if it isn't associated with a map layer it will
+    always render the html.
+
+Merge: 75405293e0 c96d8b200e
+Even Rouault 	2016-10-11
+
+    Merge pull request #3589 from gacarrillor/patch-1
+
+    Adding contribution details.
+
+rldhont 	2016-10-11
+
+    [QGIS Server] Loss qobject_cast when it's usefull
+
+Alexander Bruy 	2016-10-11
+
+    [processing] restore Points in Polygons algorithm menu entry (follow up d4323addf0)
+
+Alexander Bruy 	2016-10-06
+
+    [procesing] add tests for raster terrain analysis algorithms
+
+Alexander Bruy 	2016-10-06
+
+    [processing] add icons for raster terrain analysis algorithms
+
+Alexander Bruy 	2016-10-06
+
+    [processing] remove unused imports
+
+Alexander Bruy 	2016-10-06
+
+    [processing] expose Relief from Raster terrain analysis plugin in toolbox
+
+Alexander Bruy 	2016-10-06
+
+    [processing] expose Hillshade from Raster terrain analysis plugin in toolbox
+
+Alexander Bruy 	2016-10-06
+
+    [processing] expose Ruggedness from Raster terrain analysis plugin in toolbox
+
+Alexander Bruy 	2016-10-06
+
+    [processing] expose Slope from Raster terrain analysis plugin in toolbox
+
+Alexander Bruy 	2016-10-06
+
+    [processing] expose Aspect from Raster terrain analysis plugin in toolbox
+
+Nyall Dawson 	2016-10-11
+
+    Add perceptually uniform colormaps to default styles
+
+    Adds the Viridis, Magma, Plasma and Inferno uniform color ramps
+    created by Stéfan van der Walt and Nathaniel Smith
+
+    See https://bids.github.io/colormap/ for more details
+
+    Note that I've thinned out the stops here, and only kept
+    every 5th stop from the original ramps
+
+Nyall Dawson 	2016-10-11
+
+    [composer] Move all grid settings into seperate panel
+
+    Now grid settings are accessed by clicking "Modify grid"
+    from the composer map properties panel. This opens a new
+    stacked panel with all the grid settings.
+
+    This helps make the composer map widget less confusing.
+    Before it was absolutely jammed with controls, including
+    lots of nested groups.
+
+Nyall Dawson 	2016-10-11
+
+    Fix unused variable warning
+
+Nyall Dawson 	2016-10-11
+
+    [composer] Port remaining symbol pickers to inline panels
+
+Nyall Dawson 	2016-10-11
+
+    [labeling] When in line orientation placement mode, rename above/
+    below options to left of line/right of line
+
+    Makes their meaning clearer
+
+Nyall Dawson 	2016-10-11
+
+    [labeling] Fix line orientation option gets checked randomly
+
+Nyall Dawson 	2016-10-11
+
+    [processing] Fix missing points in polygons menu item (fix #15670)
+
+    Also add a unit test
+
+Nyall Dawson 	2016-10-11
+
+    [processing] Add geometry info should add z/m values (fix #14659)
+
+rldhont 	2016-10-10
+
+    [QGIS Server] Use qobject_cast when it's usefull
+
+Germán 	2016-10-10
+
+    Adding contribution details.
+
+    Grabbed from former OSGeo trac: https://trac.osgeo.org/qgis/
+
+rldhont 	2016-10-10
+
+    Redo [BUGFIX][QGIS Server] Joins was not reloaded if the layer is in cache
+
+    With the commit f6aad8b, the QgsMapLayerRegistry signal `layersWillBeRemoved` is always emit. This imply that the vector layer join buffer is empty and not reloaded if the layer is in cache.
+
+    To fix it, the QgsServerProjectParser has to have the same method as QgsVectorLayerJoinBuffer::readXml.
+
+    This commit fixed #15522 Qgis Server doesnt' respect the styling from Desktop
+
+rldhont 	2016-10-10
+
+    Revert "[BUGFIX][QGIS Server] Joins was not reloaded if the layer is in cache"
+
+    This reverts commit 1df9d7e1a60b3e6c913fae1414a6b397a1dc6aae.
+
+rldhont 	2016-10-10
+
+    Revert "fix typo 1df9d7e1a60b3e6c913fae1414a6b397a1dc6aae"
+
+    This reverts commit db1b52a249e7f5187e5ec2462bdf88ca91c5c988.
+
+rldhont 	2016-10-10
+
+    Revert "Fix QGIS server for PyQgsServerAccessControl"
+
+    This reverts commit 8648bd12f39e17e3e656101e5b12a13b170e59c5.
+
+rldhont 	2016-10-10
+
+    Revert "fix 1df9d7e"
+
+    This reverts commit 3b9316dae919a3debd31440eab18b51116cf478d.
+
+Merge: 6d2ab9edf3 2c9fdae414
+Alexander Bruy 	2016-10-10
+
+    Merge branch 'processing_parameters_refactoring'
+
+Alexander Bruy 	2016-10-10
+
+    move imports to the top
+
+Merge: 6d2ab9edf3 fba87f79f3
+Alexander Bruy 	2016-10-10
+
+    Merge branch 'processing_parameters_refactoring' of https://github.com/volaya/QGIS into processing_parameters_refactoring
+
+Merge: 6fd5815523 12a8891b15
+Nyall Dawson 	2016-10-10
+
+    Merge pull request #3582 from fritsvanveen/fix_illegible_labels
+
+    Fix illegible labels
+
+Nyall Dawson 	2016-10-10
+
+    @cluster_color should default to null, not empty string
+
+Nyall Dawson 	2016-10-10
+
+    Fix @geometry_point_num and @geometry_point_count for marker lines
+
+    Fixes #15673
+
+Nyall Dawson 	2016-10-10
+
+    Fix first marker is drawn twice for marker line interval mode
+
+Nyall Dawson 	2016-10-10
+
+    Fix invalid values for @map_extent_width/height (fix #15672)
+
+Nyall Dawson 	2016-10-10
+
+    Fix escaping in regexp function help
+
+Nyall Dawson 	2016-10-10
+
+    Allow expression functions to appear in multiple groups (fix #15682)
+
+    Now functions which make sense for multiple contexts (eg length,
+    to_date) can appear in more than one group.
+
+Merge: 9b75746003 3b1dfa7071
+volaya 	2016-10-10
+
+    Merge branch 'master' of https://github.com/qgis/QGIS into processing_parameters_refactoring
+
+    Conflicts:
+            python/plugins/processing/gui/ExtentSelectionPanel.py
+
+volaya 	2016-10-10
+
+    [processing] made -te parameter optional in gdal warp
+
+Juergen E. Fischer 	2016-10-10
+
+    fix warning
+
+    (cherry picked from commit cd3adc077eda76f1503ed7d4e29b1b2e41218d47)
+
+Nyall Dawson 	2016-10-09
+
+    [composer] Use inline panels for grid and overview symbol style selectors
+
+Juergen E. Fischer 	2016-10-09
+
+    fix typos
+
+Nyall Dawson 	2016-10-09
+
+    Fix renaming a virtual field leads to crash (fix #15669)
+
+Juergen E. Fischer 	2016-10-08
+
+    fix 1df9d7e
+
+Merge: 8648bd12f3 a8d08891ce
+Jürgen Fischer 	2016-10-08
+
+    Merge pull request #3586 from p0cisk/master
+
+    Fix VSIUnlink in QgsOgrUtils::stringToFeatureList
+
+Piotr Pociask 	2016-10-08
+
+    Fix VSIUnlink in QgsOgrUtils::stringToFeatureList
+
+rldhont 	2016-10-07
+
+    Fix QGIS server for PyQgsServerAccessControl
+
+Alexander Bruy 	2016-10-06
+
+    [processing] remove obsolete import
+
+rldhont 	2016-10-07
+
+    fix typo 1df9d7e1a60b3e6c913fae1414a6b397a1dc6aae
+
+rldhont 	2016-10-07
+
+    [BUGFIX][QGIS Server] Joins was not reloaded if the layer is in cache
+
+    With the commit f6aad8bad6db72d0b1e573998ac7dcb2405dce55, the QgsMapLayerRegistry signal `layersWillBeRemoved` is always emit. This imply that the vector layer join buffer is empty and not reloaded if the layer is in cache.
+
+    To fix it, the layer XML element has to be read each time the layer is used.
+
+    This commit fixed #15522 Qgis Server doesnt' respect the styling from Desktop
+
+Juergen E. Fischer 	2016-10-07
+
+    osgeo4w: really use package name (fixes 6db9a371)
+
+Even Rouault 	2016-10-07
+
+    Remove useless debug trace
+
+Even Rouault 	2016-10-07
+
+    [OGR provider] Make feature iterator work on GeometryCollection sublayers
+
+    When trying to reproduce http://hub.qgis.org/issues/10485, I noticed a regression.
+    Now attribute table no longer shows features with OGR GeometryCollection.
+
+    Fixes also issues where sublayer geometry type is too strict regarding 2D vs 2.5D
+    geometry types.
+
+    Fixes #15675
+
+Even Rouault 	2016-10-07
+
+    [OGR provider] Force REPACK at the first edit action.
+
+    In the case where we deal with a shapefile, it is possible that it has
+    pre-existing holes in the DBF (see #15407), so if using a GDAL version
+    recent enough (>=2.1.2) to have reliable packing, do a packing at the
+    first edit action.
+
+    Fixes #15407
+
+Juergen E. Fischer 	2016-10-07
+
+    osgeo4w: use package name in build directory
+
+    (cherry picked from commit 706431e31d6f0a288856ceeff39d7ce432c20633)
+
+Merge: 2c92152c7d 893263952d
+Even Rouault 	2016-10-07
+
+    Merge pull request #3583 from rouault/fix_15419
+
+    QgsSymbol::renderFeature(): render larger parts of multipolygon first
+
+Juergen E. Fischer 	2016-10-07
+
+    debian packaging: run tests with ninja too (followup b4f3126)
+
+Frits van Veen 	2016-09-05
+
+    Fix curved labels
+
+nirvn 	2016-10-07
+
+    [db manager] fix spatialite error reporting
+
+nirvn 	2016-10-07
+
+    [db manager] fix non-spatial import
+
+Merge: e5f7cdcba4 521cc3becd
+Nyall Dawson 	2016-10-07
+
+    Merge pull request #3579 from nyalldawson/composer_dock
+
+    Port composer item configuration widgets to inline dock
+
+Even Rouault 	2016-10-06
+
+    [WFS provider] Be robust to field names ending with spaces in DescribeFeatureType
+
+    Fixes #3426
+
+Even Rouault 	2016-10-06
+
+    QgsSymbol::renderFeature(): render larger parts of multipolygon first
+
+    When drawing an invalid multipolygon, that has a part inside another one,
+    there is a chance we draw first the smaller part and then the larger part,
+    making it invisible.
+    Change the drawing order to start with larger parts.
+
+    Fixes #15419
+
+Even Rouault 	2016-10-06
+
+    Properly deal with empty cache/directory in WFS provider, server and globe plugin
+
+    Fixes #15111
+
+Even Rouault 	2016-10-06
+
+    [WFS provider] Do not append crs at end of BBOX in WFS 1.0
+
+    Fixes #15464
+
+Even Rouault 	2016-10-06
+
+    [WFS provider] Force refresh of GetCapabilities when pressing Connect
+
+    The cached response to GetCapabilities was always used, even when
+    pressing Connect. Now a new request is sent over the network.
+
+    Fixes #15647
+
+Even Rouault 	2016-10-06
+
+    Fix exception in GDALTools.doRasterize.loadFields due to Python 3 conversion
+
+Even Rouault 	2016-10-06
+
+    [OGR provider] Check if REPACK has emitted errors
+
+    Refs #15393 and #15570
+    Real fix for the REPACK issues has been committed per
+    GDAL ticket https://trac.osgeo.org/gdal/ticket/6672 (GDAL 2.1.2 or above)
+
+    Add test to simulate the situations that caused problems.
+
+Juergen E. Fischer 	2016-10-06
+
+    fix PyQgsAppStartup (followup d9349e5)
+
+Alexander Bruy 	2016-10-06
+
+    [processing] show error message instead of Python error if output raster is temp output and test can not be created
+
+Mathieu Pellerin 	2016-10-06
+
+    [travis] fix grass7 plugin build by adding GRASS_PREFIX7 (#3578)
+
+    * [travis] fix grass7 plugin build by adding GRASS_PREFIX7
+
+    * Followup 3n0486c: fix grass plugin build, take 2
+
+Juergen E. Fischer 	2016-10-05
+
+    osgeo4w: switch to ninja
+
+Juergen E. Fischer 	2016-10-04
+
+    debian packages
+    * remove outdated conditionals
+    * switch to ninja
+
+Juergen E. Fischer 	2016-10-06
+
+    grass plugin fix (followup 3b0486c)
+
+Juergen E. Fischer 	2016-10-04
+
+    update configuration settings to qgis3
+
+Nyall Dawson 	2016-10-06
+
+    [composer] Merge color change undo commands
+
+    Avoids color modifications spamming the undo stack
+
+Nyall Dawson 	2016-10-06
+
+    [FEATURE] Port composer config widgets to QgsPanelWidgets
+
+    Brings the inline (ie, no modal dialogs!) color modification
+    and symbol editing from the layer styling panel to
+    composer item configuration.
+
+Nyall Dawson 	2016-10-06
+
+    Make modifications through the style dock much faster
+
+    Before any change in the style dock would invalidate the cache
+    for ALL map layers, resulting in every layer being redrawn.
+
+    Now only the affected layer is redrawn and all others just use
+    the cached render.
+
+Merge: dcdf91b09a 7c59e41177
+Alexander Bruy 	2016-10-06
+
+    Merge pull request #3574 from mbernasocchi/master
+
+    [processing] fix save to postgis table
+
+Merge: 5d64a8b55c eeb8269464
+Alexander Bruy 	2016-10-06
+
+    Merge pull request #3507 from alexbruy/memory-provider-25d
+
+    Add support for 2.5D geometries to memory provider
+
+Merge: 702eace76c 52a78def7f
+rldhont 	2016-10-06
+
+    Merge pull request #3551 from rldhont/ogcutils_propertyIsLike_attributs
+
+    [BUGFIX] Support OGC PropertyIsLike attributs
+
+Merge: 37e3dd76c4 ecba254303
+Even Rouault 	2016-10-06
+
+    Merge pull request #3532 from pvalsecc/discover_relations
+
+    Add auto-discovery of relations for PostgresQL and SpatiaLite
+
+Nyall Dawson 	2016-10-06
+
+    When taking main widget from QgsPanelWidgetStack, auto accept
+    all open child panel widgets
+
+    Avoids the stack state becoming inconsistent because child
+    panel widgets from a different main panel are still present
+
+    And add unit tests for QgsPanelWidgetStack
+
+Nyall Dawson 	2016-10-06
+
+    Rename methods in QgsPanelWidgetStack for consistency
+
+Matthias Kuhn 	2016-10-05
+
+    Followup 722fdef: fix grass plugin build
+
+Marco Bernasocchi 	2016-10-05
+
+    fix save to postgis table in processing
+
+Matthias Kuhn 	2016-10-05
+
+    Remove fields from default value configuration widget
+
+Matthias Kuhn 	2016-10-05
+
+    Fix crash in QgsEncodingFileDialog
+
+Matthias Kuhn 	2016-10-05
+
+    [processing] Fix extent selection widget
+
+Matthias Kuhn 	2016-10-03
+
+    referencedColumns returns QSet instead of QStringList
+
+    The order of the elements is irrelevant and duplicate elements are unwanted. It
+    is therefore a perfect candidate for a set instead of a list. This prevents
+    filtering for duplicates manually be replacing some filer codes with (more
+    performant) builtin methods of QSet.
+
+Matthias Kuhn 	2016-10-03
+
+    Debloat QgsExpression header
+
+    it's used throughout the project and keeping it slick should keep compile time a
+    little lower.
+    These methods are also normally used while building the request or preparing, so
+    inlining them shouldn't make much difference.
+
+Matthias Kuhn 	2016-10-05
+
+    Show fields in "default value" expression editor
+
+volaya 	2016-10-04
+
+    [processing] fixed expressions dialog when not in modeler
+
+volaya 	2016-10-04
+
+    [processing] fixed handling of integer values
+
+arnaud.morvan@camptocamp.com 	2016-09-27
+
+    [processing] Apply 2to3 on changes
+
+volaya 	2016-09-21
+
+    [processing] [modeler] show options of MultipleInputParameter sorted in alphabetical order
+
+    fixes # 4836
+
+volaya 	2016-09-20
+
+    [processing] fixed table fields in batch processing interface
+
+    Conflicts:
+            python/plugins/processing/gui/BatchInputSelectionPanel.py
+
+volaya 	2016-09-19
+
+    [processing] connect signal in multipleinput widget
+
+volaya 	2016-09-19
+
+    [processing] removed debug line
+
+volaya 	2016-09-19
+
+    [processing] correctly resolve values for hidden outputs
+
+volaya 	2016-09-19
+
+    [processing] renamed wrongly named signal in InputLayerSelectionPanel
+
+volaya 	2016-09-19
+
+    [processing] use cmp_to_key to ensure Python3 compatibility
+
+    Conflicts:
+            python/plugins/processing/gui/wrappers.py
+
+Alexander Bruy 	2016-09-19
+
+    add missed comma
+
+Alexander Bruy 	2016-09-19
+
+    fix indentation
+
+    Conflicts:
+            python/plugins/processing/gui/BatchInputSelectionPanel.py
+            python/plugins/processing/gui/wrappers.py
+
+volaya 	2016-09-19
+
+    [processing] use InputLayerSelectorPanel for vector layers
+
+volaya 	2016-09-19
+
+    [processing] some minor changes for batch processing interface
+
+arnaud.morvan@camptocamp.com 	2016-09-18
+
+    Fix StringWidgetWrapper.value method
+
+arnaud.morvan@camptocamp.com 	2016-09-18
+
+    Call postInitialise in BatchAlgorithmDialog
+
+arnaud.morvan@camptocamp.com 	2016-09-18
+
+    Support layer objects in BatchInputSelectionPanel
+
+arnaud.morvan@camptocamp.com 	2016-09-18
+
+    Simplify TableFieldWidgetWrapper
+
+    Conflicts:
+            python/plugins/processing/gui/ParametersPanel.py
+            python/plugins/processing/gui/wrappers.py
+
+arnaud.morvan@camptocamp.com 	2016-09-18
+
+    Fix PointWidgetWrapper with modeler
+
+arnaud.morvan@camptocamp.com 	2016-09-18
+
+    Call postInitialise in modeler Dialog
+
+arnaud.morvan@camptocamp.com 	2016-09-17
+
+    Create FieldMappingWrapper
+
+volaya 	2016-09-19
+
+    [processing] correctly return widget in TableFieldWidgetWrapper
+
+volaya 	2016-09-19
+
+    [processing]minor code cleaning
+
+    Conflicts:
+            python/plugins/processing/core/parameters.py
+
+volaya 	2016-09-19
+
+    [processing] improvements for modeler UI
+
+    Do not show help tab if there is no help
+
+    add "optional" tag for optional parameters
+
+volaya 	2016-09-19
+
+    [processing] use original filename when possible when exporting vector layer
+
+    Conflicts:
+            python/plugins/processing/tools/dataobjects.py
+
+volaya 	2016-09-18
+
+    [processing] improved widgets for raster and vector layers in modeler
+
+volaya 	2016-09-18
+
+    [processing] fixed typo in modeler/ModelerParameterDefinitionDialog.py
+
+volaya 	2016-09-16
+
+    [processing] allow multiple values in ParameterSelection
+
+volaya 	2016-09-16
+
+    [processing] removed unused imports
+
+volaya 	2016-09-16
+
+    [processing] use QgsMessage bar in algorithm dialogs
+
+volaya 	2016-09-16
+
+    [processing] fixed batch processing interface
+
+    Conflicts:
+            python/plugins/processing/gui/BatchAlgorithmDialog.py
+
+volaya 	2016-09-16
+
+    [processing] UI improvement for defining model parameters
+
+volaya 	2016-09-15
+
+    [processing] return copy of object dictionary in parameter todict method
+
+volaya 	2016-09-15
+
+    [processing] added missing return statement in getParameterFromString
+
+volaya 	2016-09-15
+
+    [processing] fixed evaluation of output values
+
+volaya 	2016-09-15
+
+    [processing] fixed error in constructor of ParameterTableField
+
+volaya 	2016-09-14
+
+    [processing] removed debug lines
+
+volaya 	2016-09-14
+
+    [processing] changes to allow custom parameter dialog adapt to new parameter architecture
+
+volaya 	2016-09-14
+
+    [processing] moved output value evaluation to output object itself
+
+volaya 	2016-09-14
+
+    [processing] Asumme standard dialog when wrapper’s parent dialog is of unknown class
+
+volaya 	2016-09-13
+
+    [processing] removed commented lines
+
+volaya 	2016-09-13
+
+    [processing] richer expressions in number parameters
+
+volaya 	2016-09-12
+
+    [processing] removed message dialog when saving model. Using message bar instead
+
+volaya 	2016-09-12
+
+    [processing] added missing validators for param values in modeler
+
+volaya 	2016-09-12
+
+    [processing] fixed advanced parameters in modeler
+
+volaya 	2016-09-12
+
+    [processing] fixed loading of parameters for grass algorithms
+
+volaya 	2016-09-12
+
+    [processing] support for expressions in numerical values in modeler
+
+    includes cleanup of modeler, to adapt to latest changes in parameters architecture
+
+volaya 	2016-09-09
+
+    [processing] added multiple option to ParameterTableFIeld
+
+    removed ParameterTableMultipleField and did some cleanup
+
+volaya 	2016-09-09
+
+    [processing] more work on parameter wrappers
+
+volaya 	2016-09-09
+
+    [processing] evaluate parameters before executing algorithm
+
+    This allows a better use of expressions
+
+volaya 	2016-09-08
+
+    [processing] improvements for scripts and R scripts
+
+volaya 	2016-09-08
+
+    [processing] fixes for new parameters architecture
+
+    includes better managing of crd and extent parameters in models, not requiring now the use of modeler-only lags
+
+volaya 	2016-09-07
+
+    [processing] implemented parameter widget wrappers
+
+    Conflicts:
+            python/plugins/processing/core/GeoAlgorithm.py
+            python/plugins/processing/gui/ExtentSelectionPanel.py
+            python/plugins/processing/modeler/ModelerParametersDialog.py
+
+volaya 	2016-09-05
+
+    [processing] moved script syntax from script algorithm class to parameters classes
+
+arnaud.morvan@camptocamp.com 	2016-09-03
+
+    Create dedicated widget wrapper for modeler
+
+arnaud.morvan@camptocamp.com 	2016-08-24
+
+    Add CrsWidgetWrapper
+
+arnaud.morvan@camptocamp.com 	2016-08-23
+
+    Use boolean wrapper in modeler algorithm dialog
+
+arnaud.morvan@camptocamp.com 	2016-08-23
+
+    Use boolean wrapper in batch algorithm dialog
+
+    Conflicts:
+            python/plugins/processing/gui/BatchPanel.py
+
+arnaud.morvan@camptocamp.com 	2016-08-23
+
+    Use boolean wrapper in standard algorithm dialog
+
+    Conflicts:
+            python/plugins/processing/gui/AlgorithmDialog.py
+
+arnaud.morvan@camptocamp.com 	2016-08-23
+
+    Create the boolean widget wrapper
+
+arnaud.morvan@camptocamp.com 	2016-09-03
+
+    Remove metadata from parameter.todict (do not save in model)
+
+arnaud.morvan@camptocamp.com 	2016-08-23
+
+    Add metadata property to parameters
+
+volaya 	2016-07-25
+
+    [processing] fixed add model from file
+
+    fixes #15335
+
+Sandro Santilli 	2016-10-05
+
+    Force use of estimated metadata upon loading topologies
+
+Alexander Bruy 	2016-10-05
+
+    [processing] drop GEOM_TYPE_MAP in favour of QgsWkbTypes.displayString()
+
+Alexander Bruy 	2016-10-04
+
+    fix handling of layers without geometry
+
+Alexander Bruy 	2016-10-04
+
+    add new geometry types to memory layer tests
+
+Alexander Bruy 	2016-10-04
+
+    use QgsWkbTypes methods to simplify code
+
+Alexander Bruy 	2016-10-04
+
+    remove extra QString wrapper
+
+Alexander Bruy 	2016-09-16
+
+    [processing] support more geometry types in memory layers (fix #15508)
+
+Alexander Bruy 	2016-09-16
+
+    don't flatten geometries when pasting them as new memory layer
+
+Alexander Bruy 	2016-09-16
+
+    [FEATURE] support for 2.5D geometries in memory provider
+
+Nyall Dawson 	2016-10-05
+
+    Fix missing live updates when raster colorize color changes
+
+Nyall Dawson 	2016-10-05
+
+    Fix raster style dock widgets not opened with dock mode flag
+
+    Makes the color picker and ramp editors open inline for
+    the raster properties pages
+
+Nyall Dawson 	2016-10-05
+
+    Fix crash in raster transparency widget on close
+
+    mPixelSelectorTool is owned by canvas, which may be deleted
+    before the QgsRasterTransparencyWidget on QGIS exit
+
+nirvn 	2016-07-04
+
+    [pseudocolor renderer] fix invert check box in continous mode
+    (fixes #15209)
+
+Nyall Dawson 	2016-10-05
+
+    Fix crash when validating geometry (fix #15660)
+
+    Also fix python bindings for QgsGeometryValidator
+
+Nyall Dawson 	2016-10-03
+
+    Correctly emit panelAccepted when panel is not in dock mode
+
+    Fixes #15373 - refine current rule not working when symbol widgets
+    are not used in the style dock
+
+    This fixes a behavioural difference when new panels are opened
+    in a QgsPanelWidget when in docked/undocked mode. When in
+    docked mode, the newly opened panel will emit panelAccepted
+    when it is accepted. But for undocked mode, the parent
+    panel was emitting the panelAccepted signal and so the
+    connection to update the renderer was never
+    triggered. Now both docked/undocked panels will always
+    emit panelAccepted ONLY from the newly opened panel itself.
+
+    This also fixes memory leaks as the clean up code was never
+    run in undocked mode.
+
+    I've updated the docs to clarify this behaviour.
+
+Nyall Dawson 	2016-10-05
+
+    Fix last segment length in measure dialog is incorrect after
+    completing measurement with right mouse click
+
+Nyall Dawson 	2016-10-05
+
+    Fix measure dialog shows wrong results when changing units
+
+    If the measurement was not finished (ie right click occurred)
+    then the last length would be missing from the table
+
+    Fix #15433
+
+Alexander Bruy 	2016-10-04
+
+    [processing] add icon caching for other providers
+
+Alexander Bruy 	2016-10-04
+
+    [processing] correct GRASS 7 detection on Mac (fix #15645)
+    follow up e1ff6e896a
+
+rldhont 	2016-10-04
+
+    Reactivate ogcutils tests and update its
+
+rldhont 	2016-09-30
+
+    [BUGFIX] Support OGC PropertyIsLike attributs
+
+    The OGC PropertyIsLike element can have 4 attributs:
+    * matchCase to specify LIKE or ILIKE
+    * wildCard to specify a wildcard char symbol
+    * signleChar to specify a single char symbol
+    * escape to specify an escape char symbol
+
+rldhont 	2016-10-03
+
+    Fix testqgsogcutils
+
+Merge: 7332dda0d8 3abded3186
+Nyall Dawson 	2016-10-04
+
+    Merge pull request #3565 from nyalldawson/svg_background
+
+    Fix SVG preview blocks QGIS (fix #14255)
+
+Matthias Kuhn 	2016-10-04
+
+    Remove visitor pattern from QgsExpression (#3569)
+
+    It is not in use anywhere and can easily be reintroduced if there is a use case
+    where it is an appropriate fit.
+
+    Fix https://github.com/qgis/qgis3.0_api/issues/64
+
+Mathieu Pellerin 	2016-10-04
+
+    [qt5] setConfirmOverwrite is gone, use setOption (#3567)
+
+Nyall Dawson 	2016-10-04
+
+    Fix cannot modify diagram attribute expression (fix #15514)
+
+    Also clean up some code
+
+Nyall Dawson 	2016-10-04
+
+    Keep the user set order for svg paths
+
+Merge: d3f8763bd9 377de52b38
+Nyall Dawson 	2016-10-04
+
+    Merge pull request #3559 from nyalldawson/fix_render_flashing
+
+    Fix layers with layer wide opacity "flashing" while rendering
+
+Nyall Dawson 	2016-10-04
+
+    Small optimisations to model/views
+
+Nyall Dawson 	2016-10-04
+
+    Guard against circular symbolic links in SVG selector widget
+
+Nyall Dawson 	2016-10-04
+
+    Fix SVG preview blocks QGIS (fix #14255)
+
+    Now SVG preview loading occurs in a background thread so that
+    dialogs can open instantly
+
+Nyall Dawson 	2016-10-04
+
+    Port generate_test_mask_image.py to python3
+
+Nyall Dawson 	2016-10-03
+
+    Fix layers with layer wide opacity "flashing" by rendering
+    intermediate states without opacity
+
+Merge: 368c1cead3 9761a86e4f
+Alessandro Pasotti 	2016-10-03
+
+    Merge pull request #3564 from elpaso/test-wait-for-network3
+
+    Yet another strategy to get a free port from the server
+
+Alessandro Pasotti 	2016-10-03
+
+    Renamed constants for consistency
+
+Alessandro Pasotti 	2016-10-03
+
+    Yet another strategy to get a free port from the server
+
+Merge: 4fd5c014f2 28f547ea81
+Alessandro Pasotti 	2016-10-03
+
+    Merge pull request #3563 from elpaso/test-wait-for-network2
+
+    Wait for server ready (and times out) before starting the tests
+
+Matthias Kuhn 	2016-10-03
+
+    Synchronize edit button state with read only mode (#3562)
+
+Alessandro Pasotti 	2016-10-03
+
+    Wait for server ready (and times out) before starting the tests
+
+Merge: 8e54acf7b7 5284fefcde
+Hugo Mercier 	2016-10-03
+
+    Merge pull request #3511 from nyalldawson/depend_redraw
+
+    If a dependent layer is redrawn, then also redraw child layer
+
+Matthias Kuhn 	2016-10-03
+
+    [travis] fixme
+
+Merge: 456069207e 1f78393404
+Hugo Mercier 	2016-10-03
+
+    Merge pull request #3558 from nirvn/layers_relation_icon
+
+    [gui] improve the layer dependencies icon
+
+Merge: ce37f9c654 a07a57e608
+Nyall Dawson 	2016-10-03
+
+    Merge pull request #3554 from nyalldawson/parse_dash
+
+    New script to handle multiple render results from a dash results page
+
+Matthias Kuhn 	2016-10-03
+
+    Disable flaky PyQgsServerWFST test
+
+Nyall Dawson 	2016-10-03
+
+    Fix leak in edit form config (#3556)
+
+Nyall Dawson 	2016-10-03
+
+    Fix identify menu highlight only works with simple geometry types
+
+    Fix #15625
+
+Nyall Dawson 	2016-10-03
+
+    Fix data defined buttons sometimes incorrectly show error state
+
+Nyall Dawson 	2016-10-03
+
+    [labeling] Fix data defined placement with rotated maps
+
+    For layers requiring reprojection and with rotated maps any
+    labels with data defined x/y would not be rendered
+
+    Fix #14236
+
+nirvn 	2016-10-03
+
+    [gui] improve the layer dependencies icon
+
+Nyall Dawson 	2016-10-03
+
+    Fix rule based renderer shows 0 count on first click of "show counts"
+
+Nyall Dawson 	2016-10-03
+
+    Fix oracle build
+
+Nyall Dawson 	2016-10-03
+
+    Fix invalid debugging noise
+
+Nyall Dawson 	2016-10-03
+
+    Fix many labeling unit settings are lost on closing dialog
+
+    (and also don't trigger auto preview)
+
+Nyall Dawson 	2016-10-03
+
+    Fix build with GDAL < 2
+
+Nyall Dawson 	2016-10-03
+
+    Default to WITH_QWTPOLAR OFF
+
+    Since it's not compatible with Qt5 builds
+
+Nyall Dawson 	2016-10-02
+
+    Add method to create QgsMapToPixel from scale/dpi/mapunits
+
+Nyall Dawson 	2016-10-03
+
+    Fix some Coverity null derefence warnings
+
+Nyall Dawson 	2016-10-02
+
+    Fix Coverity uninitialized variable warnings
+
+Juergen E. Fischer 	2016-10-01
+
+    fix typos
+
+Matthias Kuhn 	2016-10-01
+
+    Fix compile errorr
+
+Matthias Kuhn 	2016-09-27
+
+    setAttributeAlias is now setFieldAlias
+
+Matthias Kuhn 	2016-09-27
+
+    Rename setAttributeAlias and removeAttributeAlias
+
+Matthias Kuhn 	2016-09-22
+
+    Add safety check to avoid crash
+
+Matthias Kuhn 	2016-09-22
+
+    Update python code
+
+Matthias Kuhn 	2016-09-22
+
+    Rename QgsFields::fieldNameIndex() to lookupField()
+
+    To have two clearly different names for tolerant/intolerant index lookup
+
+Matthias Kuhn 	2016-09-19
+
+    QgsFields::fieldNameIndex also matches field alias
+
+    This method is also doing case insensitive "fuzzy" matching now, this
+    just adds yet another level of tolerance.
+    This changes the expressions to also take the alias into account if no
+    matches have been found.
+
+Juergen E. Fischer 	2016-10-01
+
+    debian packaging: re-enable server
+
+Juergen E. Fischer 	2016-10-01
+
+    only include server bindings in sip coverage tests if they are built
+
+Juergen E. Fischer 	2016-10-01
+
+    debian packaging: add libqca-qt5-2-plugins build dependency
+
+Juergen E. Fischer 	2016-10-01
+
+    server sip sync
+
+Merge: 437d785c72 87039204b0
+Nyall Dawson 	2016-10-01
+
+    Merge pull request #3548 from nirvn/wordwrap_zerowidthspace
+
+    [expression] make wordwrap work with complex scripts (Indic, Arabic, etc.)
+
+Juergen E. Fischer 	2016-10-01
+
+    debian packaging: reorder build dependencies and add python3-pyqt5.qtsvg
+
+rldhont 	2016-10-01
+
+    [Processing] Uses os.path.join instead of + os.sep + (#3552)
+
+Nyall Dawson 	2016-10-01
+
+    Add new script to handle multiple render results from a dash
+    results page in an interactive way
+
+    Allows generation and tweaking of mask images while previewing
+    the result
+
+Juergen E. Fischer 	2016-10-01
+
+    update INSTALL
+
+Juergen E. Fischer 	2016-09-30
+
+    debian packaging: add ca-certificates as build dependency for dash upload (followup 19378c2)
+
+Merge: c9d25b276d f47a7320d1
+rldhont 	2016-09-30
+
+    Merge pull request #3535 from rldhont/expression_like_escape
+
+    [BUGFIX] Expression in like escape % and _
+
+Merge: a5b83e4950 19378c2280
+Jürgen Fischer 	2016-09-30
+
+    Merge pull request #3550 from julienmalik/patch-1
+
+    CDash submissions should be done with https now
+
+julienmalik 	2016-09-30
+
+    CDash submissions should be done with https now
+
+rldhont 	2016-09-28
+
+    [BUGFIX] Expression in like escape % and _
+
+    The Expression LIKE binary operator does not care about escape % and _ char.
+    No-one has already open an issue about it but in the OGC element PropertyIsLike the user can defined is own wild and single char. This mean that QGIS has to escape % and _ if they are not used as wild and single char.
+
+nirvn 	2016-09-30
+
+    [expression] make wordwrap work with complex scripts (Indic, Arabic, etc)
+
+Merge: 38a811b377 84981ee1f2
+Jürgen Fischer 	2016-09-30
+
+    Merge pull request #3543 from sebastic/icons-subdirectory
+
+    Move icons to subdirectory.
+
+Nyall Dawson 	2016-09-30
+
+    [composer] Fix save world file does not work (fix #15268)
+
+Merge: 19585ee1aa 168688c889
+Nyall Dawson 	2016-09-30
+
+    Merge pull request #3536 from nyalldawson/cluster_marker
+
+    [FEATURE] Cluster marker renderer
+
+Nyall Dawson 	2016-09-30
+
+    Don't draw empty labels for displacement renderer
+
+    Is inefficient and also causes QThreadPool crash on exit in python
+    test (related to creation of QFontMetrics in a thread?)
+
+Nyall Dawson 	2016-09-29
+
+    Fix Travis warnings and missing docs/sip
+
+Nyall Dawson 	2016-09-19
+
+    Fix point distance renderer handling of crs transform
+
+Nyall Dawson 	2016-09-19
+
+    Better default cluster symbol
+
+Nyall Dawson 	2016-09-12
+
+    Refactor symbol/renderer widgets to use QgsSymbolWidgetContext
+    instead of individually setting map canvas, expression context, etc
+
+    Will make it more easy in future to add additional parameters
+    to the widget context
+
+Nyall Dawson 	2016-09-12
+
+    Add missing test images
+
+Nyall Dawson 	2016-09-12
+
+    Better default cluster symbol
+
+Nyall Dawson 	2016-09-12
+
+    Fix panel titles
+
+Nyall Dawson 	2016-09-12
+
+    Icon for cluster renderer
+
+Nyall Dawson 	2016-09-12
+
+    Expose renderer variables to users
+
+Nyall Dawson 	2016-09-12
+
+    Make @cluster_size, @cluster_color usable in displacement renderer too
+
+Nyall Dawson 	2016-09-12
+
+    Make sure all attributes are fetched for distance based renderers
+
+Nyall Dawson 	2016-09-08
+
+    Unit tests for displacement and cluster renderer
+
+Nyall Dawson 	2016-09-12
+
+    Keep as many settings as possible when changing between displacement and cluster renderer
+
+Nyall Dawson 	2016-09-12
+
+    Make distance based renderers much faster when filters are present
+
+Nyall Dawson 	2016-09-07
+
+    Use group centroid for nearest group test
+
+Nyall Dawson 	2016-08-15
+
+    [FEATURE] Point cluster renderer
+
+    Groups nearby points into a single rendered marker symbol.
+
+    QgsPointDisplacementRenderer has been split into a new
+    pure virtual QgsPointDistanceRenderer base class which handles the
+    detection of clusters and grouping of points. The new cluster
+    renderer reuses this base class to avoid code duplication.
+
+    Additionally, some improvements have been made to the
+    displacement renderer, specifically:
+    - points are now assigned to the group which is "nearest" them,
+    rather then just assigning them first group within the search
+    distance. In some cases this was assigning features to a more
+    distant cluster, resulting in less predictable cluster patterns
+    - individual points are now correctly shown in their own
+    selection state
+
+    Lots of code cleanup + documentation too.
+
+    Sponsored by:
+    - Andreas Neumann
+    - Qtibia Engineering (Tudor Barascu)
+    - Karl-Magnus Jönsson
+    - Geonesia (Nicolas Ponzo)
+    - Plus numerous additional anonymous backers whose generous
+    contributions are also highly valued!
+
+Bas Couwenberg 	2016-09-29
+
+    Move icons to subdirectory.
+
+Alessandro Pasotti 	2016-09-29
+
+    [Server 3.0] Typo in test name and removed obsolete comments
+
+Merge: 6b2799414a 4feeab85a5
+volaya 	2016-09-29
+
+    Merge pull request #3493 from rldhont/processing_rscripts_temprscritpfilename
+
+    [Processing][Rscripts] Use temp script filename
+
+Juergen E. Fischer 	2016-09-29
+
+    nodetool: use exact intersect when picking features (fixes #15294)
+
+Merge: 67d5e19303 49ae0206f4
+Alessandro Pasotti 	2016-09-29
+
+    Merge pull request #3540 from elpaso/auth-integration-test
+
+    Auth integration test + more reliable server tests
+
+Alessandro Pasotti 	2016-09-29
+
+    [Server 3.0] Tests reliability + new auth test
+
+    - Local server searches for a free port before binding
+    - Server tests now ignore attributes order
+    - Updated reference docs
+    - Renamed projects ("+" -> "_")
+    - Added a smoke test for auth manager and WMS/WFS providers
+
+Patrick Valsecchi 	2016-09-28
+
+    Add relation discovery for SpatiaLite
+
+Nyall Dawson 	2016-09-27
+
+    Update test masks (Qt5 on Fedora)
+
+Nyall Dawson 	2016-09-29
+
+    Disable flaky qgis_ogcutilstest test on Travis
+
+Juergen E. Fischer 	2016-09-28
+
+    fix #15634
+
+    (cherry picked from commit be167761c44a3622ed28c9f679226dcb6b51dc68)
+
+Juergen E. Fischer 	2016-09-28
+
+    gdal tools: disconnect canvas signal after building vrt (fixes #15389)
+
+    (cherry picked from commit e963fff346aafdb87494c9a33c4cddd3754ab5b1)
+
+Juergen E. Fischer 	2016-09-28
+
+    categorized renderer: also setup symbol render context for hashed symbols
+
+Merge: 89d4998510 34588f3f8c
+Jürgen Fischer 	2016-09-28
+
+    Merge pull request #3534 from dmarteau/master
+
+    Fix python3 pyspatialite import
+
+rldhont 	2016-09-15
+
+    [Processing][Rscripts] Use temp script filename
+
+    The build RScript is stored in the User folder, so the script is erased at each RAlgorithm execute.
+    Server side or for debugging this could be a problem.
+    So processing_script.r will be stored in temp folder.
+
+Alessandro Pasotti 	2016-09-28
+
+    [Server 3.0] Resurrect PyQgsServerWFST
+
+David Marteau 	2016-09-27
+
+    Fix python3 pyspatialite import
+
+Matthias Kuhn 	2016-09-27
+
+    [travis] Disable flaky qgis_ziplayertest
+
+Patrick Valsecchi 	2016-09-26
+
+    Add auto-discovery of relations for PostgresQL
+
+    Fixed the add relation functionnality: the table is sorted. When the code
+    was setting the sorted column, the row was sorted and the other columns it was
+    setting were set on the wrong row.
+
+Alessandro Pasotti 	2016-09-27
+
+    No need to decode a str
+
+Alessandro Pasotti 	2016-09-27
+
+    No need to decode a str
+
+Matthias Kuhn 	2016-09-27
+
+    Disable flaky PyQgsWFSProviderGUI test
+
+Matthias Kuhn 	2016-09-27
+
+    Remove Qt4 travis test scripts
+
+David Marteau 	2016-09-27
+
+    Fix python print statement for python 3 in cmake/MacBundleMacros.cmake (#3531)
+
+Harrissou Sant-anna 	2016-09-27
+
+    Rename Style tab into Symbology in layer properties dialog (#3522)
+
+Even Rouault 	2016-09-27
+
+    Fix shapefile test failures if locale is C (#3523)
+
+    QString::localeAwareCompare() is case insensitive for common locales,
+    but case sensitive for the C locale. So use an explicit case
+    insensitive comparison in that later case to avoid test failures.
+
+Merge: 7d8fba8b8c e795393e65
+Alessandro Pasotti 	2016-09-27
+
+    Merge pull request #3528 from elpaso/server-needs-qgsapp
+
+    [Server 3.0] now needs a qApp and tests are back
+
+Alessandro Pasotti 	2016-09-27
+
+    [Server 3.0] added missing QgsApplication
+
+Nyall Dawson 	2016-09-27
+
+    Preserve edits for multiline editor when length exceeds field size
+
+    Previously when using the multiline option for text edit widgets
+    the entire contents of the field would be discarded if the entered
+    value exceeded the maximum length for a string field.
+
+    Now the entered string is truncated to the maximum field length.
+
+Nyall Dawson 	2016-09-27
+
+    Rename duplicate menu item causing Qt warning
+
+Nyall Dawson 	2016-09-27
+
+    Fix arrow and filled marker symbols don't show selection state
+
+Nyall Dawson 	2016-09-27
+
+    Avoid unused variable warnings
+
+Nyall Dawson 	2016-09-27
+
+    Fix right aligned contents in label spin boxes
+
+Orion Poplawski 	2016-09-26
+
+    Cast to qreal for arm support
+
+Alessandro Pasotti 	2016-09-26
+
+    [Server 3.0] re-enable server tests
+
+Alessandro Pasotti 	2016-09-26
+
+    [Server 3.0] migrate more tests
+
+Alessandro Pasotti 	2016-09-25
+
+    [Server 3.0] migrate tests
+
+Alessandro Pasotti 	2016-09-25
+
+    [Server 3.0] strict check for QgsApplication
+
+Juergen E. Fischer 	2016-09-25
+
+    debian packaging update: add experimental build
+
+Alessandro Pasotti 	2016-09-25
+
+    [Server 3.0] now needs a qApp
+
+Juergen E. Fischer 	2016-09-24
+
+    debian packaging: also in control (followup 07c3801)
+
+Juergen E. Fischer 	2016-09-24
+
+    debian packaging: include python3-sip-dev in build dependencies (fixes #15609)
+
+Merge: 911af05a17 b6b8759efb
+Even Rouault 	2016-09-23
+
+    Merge pull request #3524 from rouault/fix_15351
+
+    Fix database locking when editing GeoPackage
+
+Merge: eefeef573d 67c05b51c2
+Hugo Mercier 	2016-09-23
+
+    Merge pull request #3460 from mhugo/fix_sip
+
+    Fix some /Transfer/ annotations
+
+Even Rouault 	2016-09-22
+
+    Fix database locking when editing GeoPackage
+
+    Concurrent read and write can lock a GeoPackage database given
+    the default journaling mode of SQLite (delete). Use WAL when
+    possible to avoid that.
+
+    Fixes #15351
+
+Hugo Mercier 	2016-09-05
+
+    Fix some /Transfer/ annotations
+
+Mathieu Pellerin 	2016-09-23
+
+    fix a couple of python warnings (#3526)
+
+Nyall Dawson 	2016-09-23
+
+    Make counting and testing filters in rule based renderers faster
+
+    Hand filters off to the provider where possible and avoid fetching
+    unnecessary attributes/geometry
+
+Merge: a21946abd9 1a71ee5a00
+Nyall Dawson 	2016-09-23
+
+    Merge pull request #3518 from pvalsecc/qt5_json
+
+    Use the Qt5 JSON classes
+
+Frits van Veen 	2016-09-23
+
+    Fix curved labels sometimes shown upside down
+
+    And improve handling of perimeter based labels
+
+Nyall Dawson 	2016-09-23
+
+    Update test masks
+
+Nyall Dawson 	2016-09-23
+
+    Set initial effect selection in layer effects widget to
+    first enabled effect
+
+    Hopefully makes the widget a bit more user friendly - otherwise
+    the initial settings shown may be for a disabled effect and the
+    users is left wondering why changes have no impact
+
+Nyall Dawson 	2016-09-23
+
+    Change default label buffer join style to round
+
+    Looks much nicer and is more appropriate for buffers
+
+Mathieu Pellerin 	2016-09-22
+
+    [plugin manager] fix broken QDirIterator next() call, make it pyqt5 5.7 compatible (#3517)
+
+Juergen E. Fischer 	2016-09-21
+
+    rebuild api documentation only when necessary
+
+Juergen E. Fischer 	2016-03-20
+
+    pyspatialite: port to python3
+
+Juergen E. Fischer 	2016-05-27
+
+    update debian packaging to qt5/python3
+
+Juergen E. Fischer 	2016-09-21
+
+    run 2to3 on source
+
+Matthias Kuhn 	2016-09-21
+
+    [Feature] Allow configuring link/unlink feature buttons on relation editor widget
+
+rldhont 	2016-09-21
+
+    [Server] GetStyles: no more needs to add units in SLD
+
+    After @aaime works on SLD, no more needs to add units in SLD send by GetStyles
+
+Patrick Valsecchi 	2016-09-21
+
+    Use the Qt5 JSON classes
+
+Merge: 26b61a2d7c 2fda177c0e
+volaya 	2016-09-21
+
+    Merge pull request #3514 from volaya/grass_icon_fix
+
+    [processing] fixed grass icon loading
+
+volaya 	2016-09-21
+
+    [processing] fied issue with grass icons slowing down toolbox
+
+    fixes #15550
+
+Merge: 6653e77996 db0b787e4e
+Tom Kralidis 	2016-09-21
+
+    Merge pull request #3515 from rcoup/patch-1
+
+    MetaSearch: Update LINZ Data Service default URL
+
+Denis Rouzaud 	2016-09-21
+
+    Qt 5.2 has QComboBox::currentData()
+
+Merge: 9a10047b3c 6260f9dea5
+Even Rouault 	2016-09-21
+
+    Merge pull request #3499 from pvalsecc/spatialite_arrays
+
+    Add support for arrays in the spatialite provider
+
+Matthias Kuhn 	2016-09-21
+
+    Update Qt docs link to version 5
+
+Matthias Kuhn 	2016-09-21
+
+    Chained filters for relation reference search widget
+
+    Fix #15589
+
+Nyall Dawson 	2016-09-21
+
+    Fix invalid QString arg warning
+
+Nyall Dawson 	2016-09-21
+
+    Remove icon with bad sRGB profile (causing Qt warnings)
+
+Nyall Dawson 	2016-09-21
+
+    Fix Qt warning following removal of deprecated class
+
+Nyall Dawson 	2016-09-21
+
+    [FEATURE] Enable tabbed floating docks for Qt >= 5.6
+
+Nyall Dawson 	2016-09-21
+
+    Fix QCA configuration on Qt5
+
+Mathieu Pellerin 	2016-09-21
+
+    [snapping] fix default advanced mode values for added layers (#3513)
+
+Merge: 03923ebb75 ee57c1fc43
+Nyall Dawson 	2016-09-21
+
+    Merge pull request #3510 from nyalldawson/qt5_tests
+
+    Require python 3 and qt5
+
+Sandro Mani 	2016-09-21
+
+    [ArcGIS REST] Port to Qt5
+
+Nyall Dawson 	2016-09-21
+
+    Switch QT4_* macros to QT5
+
+Nyall Dawson 	2016-09-21
+
+    Drop minimum Qt version to 5.2
+
+Nyall Dawson 	2016-09-20
+
+    Move deprecated QgsHttpTransaction to server
+
+Nyall Dawson 	2016-09-20
+
+    Remove more code disabled under Qt5
+
+    Add todo note for QgsHttpTransaction and disable under docs and
+    sip bindings
+
+Nyall Dawson 	2016-09-20
+
+    Disable ArcGIS providers (require porting to qt5)
+
+Nyall Dawson 	2016-09-20
+
+    Require Qt >= 5.5
+
+Nyall Dawson 	2016-09-20
+
+    Remove qt4 tests from Travis
+
+Nyall Dawson 	2016-09-20
+
+    Update qt5 test blacklist
+
+Nyall Dawson 	2016-09-20
+
+    Fix crash in TestQgsNetworkContentFetcher under qt5
+
+Nyall Dawson 	2016-09-20
+
+    Some server test python3 updates
+
+Nyall Dawson 	2016-09-20
+
+    Fix crash on QgsServer exit
+
+    QgsApplication must be gracefully exited under Qt5 or a segfault
+    occurs due to the auth manager not releasing database connections
+
+    Also fix crash in QgsServerAccessControl test by explicitly
+    deleting the server instance to trigger this shutdown
+
+Nyall Dawson 	2016-09-20
+
+    Permantly convert python tests to python 3
+
+Merge: 49e76a81cf 758bc72337
+Nyall Dawson 	2016-09-21
+
+    Merge pull request #3500 from pvalsecc/array_exprs
+
+    Add expression functions for arrays and maps
+
+Patrick Valsecchi 	2016-09-20
+
+    Build the list of builtin functions automatically
+
+    The old way was error prone, not thread safe and cumbersome.
+
+Matthias Kuhn 	2016-09-20
+
+    Less debug noise
+
+Matthias Kuhn 	2016-09-20
+
+    Hide proper column in attribute table
+
+    Fix #15458
+
+Robert Coup 	2016-09-20
+
+    MetaSearch: Update LINZ Data Service default URL
+
+    The existing CSW URL is still supported for backwards compatibility, but `/services/csw/` is the preferred path going forward. They're backed by the same code and results will be identical.
+
+    Current url is shown at eg. https://data.linz.govt.nz/layer/767-nz-topo50-maps/webservices/
+
+Patrick Valsecchi 	2016-09-12
+
+    Add expression functions for arrays and maps
+
+Patrick Valsecchi 	2016-09-08
+
+    Add support for arrays in the spatialite provider
+
+    New versions of GDAL/OGR (since trunk@35289) convert list types (StringList,
+    IntegerList, Integer64List and RealList) to a JSON string when it stores a
+    Spatialite table. It sets the column type as JSONSTRINGLIST, JSONINTEGERLIST,
+    JSONINTEGER64LIST or JSONREALLIST.
+
+Matthias Kuhn 	2016-09-20
+
+    Disable flaky WFST server test
+
+Matthias Kuhn 	2016-09-20
+
+    Fix sorting of expressions in relation reference widget
+
+    Fix #15451
+
+Mathieu Pellerin 	2016-09-20
+
+    [db manager] python3 support (#3512)
+
+Matthias Kuhn 	2016-09-20
+
+    Rename QgsEditFormConfig::expression to constraintExpression (#3509)
+
+    And QgsEditFormConfig::expressionDescription to constraintDescription.
+    Because only a verbose API is a good API.
+
+Nyall Dawson 	2016-09-20
+
+    If a dependent layer is redrawn, then also redraw child layer
+
+Juergen E. Fischer 	2016-09-20
+
+    fix b91d93e
+
+Juergen E. Fischer 	2016-09-19
+
+    fix 62ea90c and globe plugin
+
+Nyall Dawson 	2016-09-20
+
+    Fix build
+
+    (was using api from the mid 1970's... well.. a few weeks ago anyway)
+
+Juergen E. Fischer 	2016-09-19
+
+    [FEATURE] dxf export: support reprojection
+
+Mathieu Pellerin 	2016-09-19
+
+    fix diagram crash (fixes #15575) (#3504)
+
+Merge: f5ffbbf801 3661bc39db
+Alexander Bruy 	2016-09-19
+
+    Merge pull request #3503 from rldhont/processing_algs_qgis_intersection
+
+    [processing] bugfix: intersection QGIS algorithm
+
+rldhont 	2016-09-16
+
+    [Processing] bugfix: intersection QGIS algorithm
+
+    fixing this by testing int_com.
+    ```
+    Traceback (most recent call last):
+    File "C:/PROGRA~1/QGIS2~1.17/apps/qgis/./python/plugins\processing\core\GeoAlgorithm.py", line 203, in execute
+    self.processAlgorithm(progress)
+    File "C:/PROGRA~1/QGIS2~1.17/apps/qgis/./python/plugins\processing\algs\qgis\Intersection.py", line 100, in processAlgorithm
+    int_geom = QgsGeometry(int_com.difference(int_sym))
+    ```
+
+    AttributeError: 'NoneType' object has no attribute 'difference'
+
+Nyall Dawson 	2016-09-19
+
+    Fix server error when no log file set
+
+Nyall Dawson 	2016-09-19
+
+    Server access control test masks (Qt5)
+
+Nyall Dawson 	2016-09-19
+
+    Update test masks (ubuntu 16.04 qt5)
+
+Juergen E. Fischer 	2016-09-17
+
+    fix warnings on windows
+
+    (cherry picked from commit bf0087832fe6059b7a886dea6d10b24ae2fc7be8)
+
+Juergen E. Fischer 	2016-09-17
+
+    show command line help as message box on windows
+
+    (cherry picked from commit bd23bf1a2368fa68fe692d451f61bfe3095619bd)
+
+Nyall Dawson 	2016-09-17
+
+    Fix constant background CPU usage
+
+Merge: 1ad2a3efb2 03907605e3
+Nyall Dawson 	2016-09-17
+
+    Merge pull request #3489 from nyalldawson/preset_color_ramp
+
+    [FEATURE] "Preset colors" color ramp
+
+Juergen E. Fischer 	2016-09-16
+
+    fix mIconClose.svg
+
+    (cherry picked from commit 546ae28d7ca74e97543bf732a9a37c5bf88277e2)
+
+Juergen E. Fischer 	2016-09-16
+
+    fix typo
+
+    (cherry picked from commit 9ae12c811d7d8bcb1cba93f1ff14f46e747e3039)
+
+Sandro Santilli 	2016-09-16
+
+    Use nullSymbol for label-only layers in topology viewer
+
+Merge: a9105b7e7a 2a9e5206e9
+Nyall Dawson 	2016-09-16
+
+    Merge pull request #3494 from nyalldawson/deprecated
+
+    Remove remaining deprecated methods
+
+Martin Dobias 	2016-09-16
+
+    Remove QgsMapLayer::draw() method from API (replaced by createMapRenderer()) (#3501)
+
+Martin Dobias 	2016-09-16
+
+    Added {q} for XYZ tile layers to support Bing maps
+
+Alexander Bruy 	2016-09-16
+
+    [processing] allow all field types as unique ID field in Mean coords alg
+
+Alexander Bruy 	2016-09-16
+
+    [processing] refactor ogr buffer algorithm
+
+Matthias Kuhn 	2016-09-16
+
+    Disable flaky PyQgsWFSProviderGUI test
+
+Marco Bernasocchi 	2016-09-16
+
+    Add qgis.PyQt.Qt compat files (#3491)
+
+    * added PyQt.Qt
+
+    * fix matthias comments
+
+Merge: 1b0efa3f20 d1103e59cd
+Matthias Kuhn 	2016-09-16
+
+    Merge pull request #3492 from ahuarte47/Issue_RemoveStrlenWarnings
+
+    Remove strlen warnings on windows/vstudio
+
+Merge: 8746932193 da6848d4be
+Nyall Dawson 	2016-09-16
+
+    Merge pull request #3497 from chau-intl/patch-1
+
+    Small correction of documenation in qgspointlocator.h
+
+Merge: 6f6979ab0b 57d00949f7
+Nyall Dawson 	2016-09-16
+
+    Merge pull request #3467 from pvalsecc/arrays
+
+    [FEATURE] Add support for array attributes
+
+Alexander Bruy 	2016-09-15
+
+    [processing] remove obsolete methods
+
+Alexander Bruy 	2016-09-15
+
+    [processing] fix search by alg name (fix #15562)
+
+Nyall Dawson 	2016-09-15
+
+    Catch exceptions in transform() expression function
+
+Nyall Dawson 	2016-09-15
+
+    Disable checkboard temporary image for xyz layers
+
+Casper 	2016-09-15
+
+    Update qgspointlocator.h
+
+    A very small but important change to the comments/API documentation. The nearestEdge method does not return multiple edges but only one edge.
+
+Merge: ab6d796e08 4fc29de41c
+Matthias Kuhn 	2016-09-15
+
+    Merge pull request #3495 from bstroebl/documentProcessing
+
+    Document processing
+
+Bernhard Ströbl 	2016-09-15
+
+    [processing] Fix typos
+
+Bernhard Ströbl 	2016-09-15
+
+    [processing] Update description for dissolve
+
+Matthias Kuhn 	2016-09-15
+
+    Improve selected features offline editing performance
+
+rldhont 	2016-09-15
+
+    GdalTools: In widgetBatchBase runItem method, refreshArgs is not a SIGNAL
+
+    The commit 9db908ccbc2257d466c0593738944a08cea8a8bc GdalTools: new style signals generates a regression
+    In the widgetBatchBase runItem method, refreshArgs is not a SIGNAL
+
+Matthias Kuhn 	2016-09-15
+
+    [feature] Add flag to only copy selected features
+
+    This extends the offline editing possibilities to only work on subset of
+    large layers
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-09-15
+
+    Remove deprecated QgsAttributeEditor
+
+Nyall Dawson 	2016-09-15
+
+    Remove many deprecated methods
+
+Alexander Bruy 	2016-09-15
+
+    [processing] correct error message (fix #15511)
+
+Alvaro Huarte 	2016-09-15
+
+    Remove strlen warnings in windows/vstudio
+
+Juergen E. Fischer 	2016-09-14
+
+    fix windows build
+
+Juergen E. Fischer 	2016-09-14
+
+    fix windows build (tests & bindings)
+
+    (cherry picked from commit 0c1792a55dd880b2f3f2acf7b5ef89e8fbd5412d)
+
+Nyall Dawson 	2016-09-15
+
+    Undeprecate provider CreateAttributeIndex capability
+
+    This capability is still used in QGIS and has value for
+    plugins
+
+Merge: de7475ae72 06d2d79185
+Nyall Dawson 	2016-09-15
+
+    Merge pull request #3487 from nyalldawson/truncate
+
+    Make sure files are truncated before writing
+
+Merge: aac7e9aa39 b7111775e8
+Nyall Dawson 	2016-09-15
+
+    Merge pull request #3486 from nyalldawson/symbol
+
+    Symbology QGIS 3.0 todos
+
+Merge: da8fc02287 6cfe562759
+Nyall Dawson 	2016-09-15
+
+    Merge pull request #3485 from nyalldawson/composer_dep
+
+    Remove deprecated methods from composer
+
+Etienne Trimaille 	2016-09-14
+
+    replace exp10 by pow on mac (#3490)
+
+Juergen E. Fischer 	2016-09-14
+
+    fix cdaec5a
+
+Juergen E. Fischer 	2016-09-14
+
+    Enable plugins (eg. to show PDFs) in webview widgets used on feature info in identify or in forms
+
+Alexander Bruy 	2016-09-14
+
+    fix indentation
+
+Alexander Bruy 	2016-09-14
+
+    [processing] split offset curve and single-side buffer alg into two separate algs
+
+Alexander Bruy 	2016-09-14
+
+    [processing] refactor offset curve GDAL algorithm (fix #15478)
+
+Alexander Bruy 	2016-09-14
+
+    [processing] fix substitution of the original layers in GDAL commands
+
+Alexander Bruy 	2016-09-14
+
+    [processing] use hex representation of uuid
+
+Alexander Bruy 	2016-09-14
+
+    [processing] add test for gdalinfo algorithm
+
+Alexander Bruy 	2016-09-14
+
+    [processing] remove obsolete OGRAlgorithm class
+
+Matthias Kuhn 	2016-09-14
+
+    Fix drag and drop designer issue with field alias
+
+Matthias Kuhn 	2016-09-14
+
+    Export QgsOptional to dll/so
+
+Nyall Dawson 	2016-09-14
+
+    Avoid new colors in ramp overwriting old colors
+
+Nyall Dawson 	2016-09-14
+
+    Fix qt4 build
+
+Nyall Dawson 	2016-09-14
+
+    Ensure that colors are always added to recent color list from style panel
+
+Nyall Dawson 	2016-09-14
+
+    Allow editing colors in a color list inline in the style panel
+
+Nyall Dawson 	2016-09-14
+
+    [FEATURE] New "preset" colors color ramp option
+
+    Allows use of a color ramp consisting of a list of selected colors.
+    Currently there's no way in QGIS to classify a renderer using
+    some list of colors you've previously selected. So you can modify
+    the colors manually after classifying, but that's a pain
+    if you're regularly using the same color scheme.
+
+    Basically, it's like the color brewer color ramp options but
+    allowing users to pick their own preset list of colors to use*
+
+    (Because Cynthia Brewer isn't the only cartographic color expert!)
+
+Alexander Bruy 	2016-09-13
+
+    [processing] fix progress reporting (fix #15521)
+
+Nyall Dawson 	2016-09-14
+
+    Consolidate some duplicate code
+
+Nyall Dawson 	2016-09-14
+
+    Make sure files are truncated before writing
+
+Nyall Dawson 	2016-09-14
+
+    When a panel widget opens a new panel, the new panel should inherit (#3479)
+
+    the dock mode of the previous panel
+
+Nyall Dawson 	2016-09-14
+
+    Add method to retrieve most recently used color
+
+Nyall Dawson 	2016-09-14
+
+    Don't continually refresh map while editing rule label/desc
+
+Nyall Dawson 	2016-09-14
+
+    Avoid excessive margins on rule based rule props widget
+
+Nyall Dawson 	2016-09-11
+
+    When a panel widget opens a new panel, the new panel should inherit
+    the dock mode of the previous panel
+
+Nyall Dawson 	2016-09-14
+
+    Fix excessive margins on color picker when in style dock
+
+Nyall Dawson 	2016-09-14
+
+    Fix some QGIS 3.0 symbology todos
+
+Nyall Dawson 	2016-09-14
+
+    Make QgsMarkerSymbolLayer::bounds pure virtual
+
+Nyall Dawson 	2016-09-14
+
+    Change QgsSymbol and QgsSymbolRenderContext render hint to use a
+    QgsSymbol::RenderHints QFlags value instead of a raw int
+
+    Also rename DataDefinedRotation to DynamicRotation since
+    it is no longer used for data defined rotation
+
+Merge: 0f07556ba5 bb4e6b8fb8
+Nyall Dawson 	2016-09-14
+
+    Merge pull request #3478 from mbernasocchi/patch-2
+
+    qgsmessagebar.pushMessage timeout is not respected in python
+
+Merge: 5617dbc612 5180b20807
+Nyall Dawson 	2016-09-14
+
+    Merge pull request #3484 from ahuarte47/Issue_RemoveDuplicateImageEntry
+
+    Remove duplicate entry of mActionRemove.svg
+
+Nyall Dawson 	2016-09-14
+
+    Add api/user break notes
+
+Nyall Dawson 	2016-09-13
+
+    Remove deprecated composer methods
+
+Nyall Dawson 	2016-09-14
+
+    Revert "[processing] cache icons to speed up toolbox rendering"
+
+    This reverts commit d265f3334142853a7f04fbda5bf6a62e3b5f672d.
+
+    Was causing failure on Travis
+
+Merge: 9215fca239 ffa10a16fe
+Nyall Dawson 	2016-09-14
+
+    Merge pull request #3480 from nyalldawson/symbol
+
+    Remove deprecated members from symbology
+
+Merge: 92ed3befa6 7d4d9ab46c
+Matthias Kuhn 	2016-09-13
+
+    Merge pull request #3481 from GeoCat/master
+
+    - Replaced use of deprecated QgsMapCanvas attribute "mapRenderer" by mapSettings
+
+Merge: 717e7162f3 b3e3108718
+Chris Crook 	2016-09-14
+
+    Merge pull request #3483 from nirvn/fix_delimited_text_file
+
+    [delimitertext] fix watcher check ignored and harmful watcher created for iterator (fixes #15558)
+
+    @nirvn Many thanks for fixing this
+
+Merge: 1f715c1acd adc88f247a
+Martin Dobias 	2016-09-13
+
+    [FEATURE] Preview of WMTS layers + add XYZ tile layers (PR #3473)
+
+    This introduces live preview when rendering WMTS layers - as soon as individual tiles are loaded, they are shown in map canvas... no need to wait with a blank map until all tiles are fully downloaded. Additionally, if there are already locally cached tiles of other zoom levels, they may be used in the preview while the tiles with best matching zoom level are being downloaded. This greatly improves the user experience when working with WMTS layers.
+
+    Additionally, I have added native support for XYZ tile layers into WMS provider (based on existing implementation of WMTS tiling). This allows loading of various new raster tile sources (e.g. OpenStreetMap tiles) that were before available only with QuickMapServices or OpenLayers plugins. To use XYZ tile layers, open the browser dock in QGIS and look for "Tile Servers (XYZ)" root entry. Right-clicking will open a menu to add connections. For example for OpenStreetMap the URL would be http://c.tile.openstreetmap.org/{z}/{x}/{y}.png
+
+    The work on WMTS live preview has been funded by Land Information New Zealand.
+
+    The work on XYZ tile layers has been funded by Lutra Consulting.
+
+Alexander Bruy 	2016-09-13
+
+    add tests for Plugin Manager version compare function
+
+Alvaro Huarte 	2016-09-13
+
+    Remove duplicate entry of mActionRemove.svg
+
+volaya 	2016-09-13
+
+    [processing] cache icons to speed up toolbox rendering
+
+    fixes #15550
+
+Nyall Dawson 	2016-09-13
+
+    Restore missing doc
+
+Patrick Valsecchi 	2016-09-07
+
+    Add an editor widget for QVariantList
+
+Martin Dobias 	2016-09-13
+
+    Bump up the tile request limit in WMS provider
+
+    Max. 100 tiles is just too low. The max request area is currently 2000x2000 pixels
+    which boils down to approx 8x8 tiles of size 256x256, therefore max 64 tiles.
+    However this is the ideal case if the view scale matches the scale of tiles.
+    If the map view scale is approx in between two levels, we may need 12x12 tiles
+    to serve the request, so bumping the maximum to 256 should be enough.
+
+nirvn 	2016-09-13
+
+    [delimitertext] fix watcher check ignored and harmful watcher created for iterator
+    (fixes #15558)
+
+Nyall Dawson 	2016-09-13
+
+    Remove DataDefinedSizeScale symbol RenderHint
+
+    This flag is no longer set anywhere in QGIS itself
+
+Nyall Dawson 	2016-09-13
+
+    Remove sizeScaleField and sizeScaleMethods from renderers
+
+    These were unused (since they were moved to data defined properties
+    at the symbol layer level) and were not set anywhere in
+    core QGIS (ie, the only way to set them was by manually calling
+    this api)
+
+Nyall Dawson 	2016-09-13
+
+    Remove unused size/scale slots from renderer widgets
+
+Nyall Dawson 	2016-09-13
+
+    Remove redundant (and outdated) docstrings from overriden members
+
+Nyall Dawson 	2016-09-13
+
+    Remove last deprecated methods from symbology
+
+Nyall Dawson 	2016-09-13
+
+    Remove more deprecated symbol methods
+
+Nyall Dawson 	2016-09-13
+
+    Remove more deprecated methods from symbology
+
+Nyall Dawson 	2016-09-12
+
+    Remove deprecated method from getDataValues()
+
+Nyall Dawson 	2016-09-12
+
+    Remove deprecated members and fix TODOs for QgsFeatureRenderer
+
+Martin Dobias 	2016-09-13
+
+    Fix crash on QMap iteration in Qt5
+
+Martin Dobias 	2016-09-12
+
+    Fix tile previews with Qt5
+
+Merge: 93afbe12e0 7335482030
+mhugent 	2016-09-12
+
+    Merge pull request #3469 from mhugent/fix_joins_over_several_tables2
+
+    Sort joins by dependency
+
+doublebyte1 	2016-09-12
+
+    - Replaced use of deprecated QgsMapCanvas attribute "mapRenderer" by mapSettings
+
+Patrick Valsecchi 	2016-09-06
+
+    Add support for arrays in PostgresQL
+
+    Fix parsing of PostgresQL hstore. Had problems when the key or values were
+    containing comas.
+
+Juergen E. Fischer 	2016-09-12
+
+    fix build errors (followup 13e37d4)
+
+Juergen E. Fischer 	2016-09-11
+
+    dxf export: segmentize curves
+
+    (forward ported from cc3a053)
+
+Merge: 6b8130d54d d85de7ccd8
+volaya 	2016-09-12
+
+    Merge pull request #3471 from arnaud-morvan/processing_geometry_predicate_as_commandline
+
+    [Processing] Fix ParameterGeometryPredicate.getValueAsCommandLineParameter
+
+Juergen E. Fischer 	2016-09-11
+
+    remove pngs which are available as svg
+
+    (cherry picked from commit 1cbb842feb393b7bab2b31b2e970c48816c58d3c)
+
+Marco Bernasocchi 	2016-09-11
+
+    qgsmessagebar timeout is not respected in python
+
+    the default timeout is not respected in python
+
+    gui/qgsmessagebar.sip:51:    void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 0 );
+
+
+    https://qgis.org/api/qgsmessagebar_8h_source.html#l00090
+    void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 5 ) { return pushMessage( QString::null, text, level, duration ); }
+
+Merge: 4d0453eb52 e3313fac95
+Nyall Dawson 	2016-09-10
+
+    Merge pull request #3477 from nyalldawson/legend_col_align
+
+    Fixes to multicolumn legends
+
+Nyall Dawson 	2016-09-10
+
+    Test masks
+
+Nyall Dawson 	2016-09-10
+
+    Make sure items in legend always occupy the set number of columns
+
+    In some cases (eg a legend with 4 items and 3 columns) less
+    columns were being created
+
+Nyall Dawson 	2016-09-10
+
+    Fix multi column legends with odd number of items would place
+    more items in rightmost columns instead of leftmost columns
+
+    Eg a 2 column legend with 3 items would put 1 item in
+    the first column and 2 in the second. This was ugly, and now
+    it places 2 in the first column and 1 in the second.
+
+    The legend column assigner was incorrectly adding padding above
+    the first item in a column during column size calculation
+    (padding which is not present when actually rendering the column)
+
+Nyall Dawson 	2016-09-10
+
+    Add a bunch of tests for legend grouping into columns
+
+Nyall Dawson 	2016-09-10
+
+    Fix test try #5
+
+Matthias Kuhn 	2016-09-10
+
+    Testing the new online IDE github
+
+Matthias Kuhn 	2016-09-10
+
+    One more try to get green light
+
+Matthias Kuhn 	2016-09-09
+
+    Fix tabwidget test for Qt5
+
+Matthias Kuhn 	2016-09-09
+
+    Less debug noise
+
+Matthias Kuhn 	2016-09-09
+
+    Some doxymentation updates
+
+Matthias Kuhn 	2016-09-09
+
+    [tests] Accept brief tags with erences
+
+Matthias Kuhn 	2016-09-09
+
+    Fix python bindings for QgsExpression::checkExpression
+
+Matthias Kuhn 	2016-09-09
+
+    Bindings and API docs
+
+Matthias Kuhn 	2016-09-08
+
+    [Feature] conditional visibility for tabs and groupboxes
+
+    This adds a new configuration option to conditionally show or hide
+    tabs and groupboxes in drag and drop designer forms.
+
+    Configuration is done via a double click in the designer tree in the
+    fields configuration interface.
+
+    An expression can be entered to control the visibility. The expression
+    will be re-evaluated everytime values in the form change and the tab or
+    groupbox shown/hidden accordingly.
+
+Matthias Kuhn 	2016-09-09
+
+    Add QgsTabWidget
+
+    This is almost like the QTabWidget but has additional methods for
+    showing and hiding individual tabs
+
+Matthias Kuhn 	2016-09-08
+
+    Add all applicable scopes for editor widget constraint validation
+
+Matthias Kuhn 	2016-09-08
+
+    Small code beautification
+
+Matthias Kuhn 	2016-09-08
+
+    Add QgsOptional and QgsOptionalExpression
+
+Matthias Kuhn 	2016-09-07
+
+    Public default constructor and comparison operator for QgsExpression
+
+Martin Dobias 	2016-09-09
+
+    Fix a warning in release build
+
+Martin Dobias 	2016-09-09
+
+    Add missing SIP bits
+
+Martin Dobias 	2016-09-09
+
+    Use QgsDebugMsg instead of qDebug
+
+Martin Dobias 	2016-09-09
+
+    Clean up QgsRasterBlockFeedback class
+
+Martin Dobias 	2016-09-09
+
+    Move tile cache to a new file
+
+Martin Dobias 	2016-09-09
+
+    Use cached tiles from other resolutions if available
+
+    This makes it easier to get at least basic preview without having to wait
+    until new tiles are downloaded. The strategy is to use tiles up to two levels
+    lower resolution tiles and one level higher resolution tiles.
+
+Nyall Dawson 	2016-09-09
+
+    Use tooltips in identify results dialog for values
+
+    Makes it possible to see full value even when columns are too
+    narrow to display the value
+
+Merge: a90217db16 f16b3870fa
+Nyall Dawson 	2016-09-09
+
+    Merge pull request #3468 from nyalldawson/spin_box_v2
+
+    Rework Qgs(Double)SpinBox clear handling
+
+arnaud.morvan@camptocamp.com 	2016-09-08
+
+    Fix ParameterGeometryPredicate.getValueAsCommandLineParameter
+
+Marco Hugentobler 	2016-09-08
+
+    Indentation
+
+Nyall Dawson 	2016-09-08
+
+    Use QgsFilterLineEdit for Qgs(Double)SpinBox
+
+    Fixes issues with the current approach:
+    - poor appearance on certain environments (esp OSX)
+    - large area on spin boxes' right which "swallows" clicks
+    and blocks interactivity
+
+    Fix #12920
+
+Nyall Dawson 	2016-09-08
+
+    Fix cursor not always reset when clearing widget
+
+Nyall Dawson 	2016-09-08
+
+    Allow hiding clear button in QgsFilterLineEdit
+
+Nyall Dawson 	2016-09-08
+
+    Add ability to set default values for QgsFilterLineEdit
+    and have clearing the widget reset to default rather than
+    null
+
+Nyall Dawson 	2016-09-08
+
+    Add unit tests for QgsFilterLineEdit, improve docs, add clearValue slot
+
+Nyall Dawson 	2016-09-08
+
+    Remove min size from QgsFilterLineEdit
+
+    Now the widget gracefully handles shrinking
+
+Marco Hugentobler 	2016-09-08
+
+    Sort joins by dependency
+
+Merge: 74cceb4e1b e533f0ccf8
+Matthias Kuhn 	2016-09-08
+
+    Merge pull request #3459 from pvalsecc/hstore
+
+    [FEATURE] hstore
+
+Matthias Kuhn 	2016-09-08
+
+    Remove duplicated call to parse editform config
+
+Patrick Valsecchi 	2016-09-07
+
+    Add widget to edit QVariantMap
+
+Patrick Valsecchi 	2016-08-26
+
+    Add hstore support to the postgres provider
+
+Merge: 845b2a04bf 98f25f59e7
+Nyall Dawson 	2016-09-08
+
+    Merge pull request #3461 from nyalldawson/filter_line_edit
+
+    Rework QgsFilterLineEdit handling of clear button
+
+Merge: 03f0b44e4e 5eb70d3382
+Nyall Dawson 	2016-09-07
+
+    Merge pull request #3462 from pvalsecc/fix_auto_rangewidget
+
+    Fix auto conf of QgsRangeWidgetWrapper
+
+Patrick Valsecchi 	2016-09-07
+
+    Fix auto conf of QgsDateTimeEditWrapper
+
+Matthias Kuhn 	2016-09-07
+
+    Typo
+
+Matthias Kuhn 	2016-09-07
+
+    Map renderer sends signal on layers finished but before labeling
+
+Patrick Valsecchi 	2016-09-06
+
+    Fix auto conf of QgsRangeWidgetWrapper
+
+    The default range was 0..100, made it to min..max of the type.
+    QgsRangeWidgetWrapper is auto selected only for Int and Double QVariants,
+    now. The used widgets don't support 64 bits and Uint ranges.
+
+Merge: 9ccbe179a4 a3af3fc41e
+Denis Rouzaud 	2016-09-07
+
+    Merge pull request #3458 from 3nids/parallel
+
+    parallel rendering enabled by default
+
+Nyall Dawson 	2016-09-07
+
+    Increase some test timeouts to handle when Travis is slow
+
+Nyall Dawson 	2016-09-06
+
+    Rework QgsFilterLineEdit handling of clear button
+
+    Don't use a child button but instead paint the icon when
+    required. Improves interaction with the widget/clear
+    button.
+
+Nyall Dawson 	2016-09-06
+
+    Fix crash when 'use popup' is selected for time based datetime widgets
+
+Nyall Dawson 	2016-09-06
+
+    Fix some editor widget config dialogs don't show default settings
+
+Merge: e1f21b003c 82da555c79
+Nyall Dawson 	2016-09-06
+
+    Merge pull request #3457 from nyalldawson/pygments
+
+    Upgrade internal pygments to 2.1.3
+
+Matthias Kuhn 	2016-09-05
+
+    Add missing headers
+
+Patrick Valsecchi 	2016-07-15
+
+    Smarter default edit widgets with plugins to pick them
+
+    Now the widgets factories can give a score on how good they could handle
+    a widget.
+
+    Additionaly, plugins can be added to choose a widget factory in function
+    of an external information. One of them uses a table in PostgresQL to
+    allow specification of the widget type and configuration.
+
+    I took the opportunity to remove a few deprecated method in relation to
+    this.
+
+Hugo Mercier 	2016-09-02
+
+    Fix signal names
+
+Hugo Mercier 	2016-09-02
+
+    Restore virtual layer tests in PyQt5
+
+Hugo Mercier 	2016-09-02
+
+    Fix PyQgsLayerDependencies with pyqt5
+
+Hugo Mercier 	2016-09-01
+
+    Fix spatialite access with python3
+
+Martin Dobias 	2016-09-05
+
+    Fix crashes in styling dock when dealing with WMTS / XYZ
+
+Matthias Kuhn 	2016-09-05
+
+    Fix loading of editor widget configuration
+
+Merge: 8de9757f54 b18cfc99e6
+volaya 	2016-09-05
+
+    Merge pull request #3454 from arnaud-morvan/processing_modeler_parameter_extent
+
+    [Processing] Fix on extent parameter in modeler parameters dialog
+
+Merge: 2fbc3266ff c369710667
+volaya 	2016-09-05
+
+    Merge pull request #3456 from arnaud-morvan/processing_apply_use_coverge_on_execution
+
+    [Processing] Calculate min coverage on execution
+
+Martin Dobias 	2016-09-05
+
+    Fix doxygen warnings
+
+Denis Rouzaud 	2016-09-05
+
+    parallel rendering enabled by default
+
+Merge: 1819b313ef 9d22440c56
+Matthias Kuhn 	2016-09-05
+
+    Merge pull request #3452 from nirvn/pyqt5_57
+
+    fix to support PyQt5 5.7
+
+Martin Dobias 	2016-09-05
+
+    Add missing docs
+
+Martin Dobias 	2016-09-05
+
+    Fix loading of projects with XYZ tile layers
+
+Martin Dobias 	2016-09-05
+
+    Better tile loading order + small internal refactoring
+
+Merge: 6dbdd4c24b 5f394550de
+Nyall Dawson 	2016-09-05
+
+    Merge pull request #3289 from dgoedkoop/valuemapsearchnull
+
+    Add handling of null value in value map to search widget
+
+Nyall Dawson 	2016-09-05
+
+    Update test masks for qt5
+
+Nyall Dawson 	2016-09-05
+
+    Fix some errors when using python3 tempfile
+
+Martin Dobias 	2016-09-05
+
+    Always use XYZ tile layers with smooth image transform
+
+    It would make sense to have it enabled by default with WMTS too
+
+Nyall Dawson 	2016-09-05
+
+    Fix broken python save/open dialogs under PyQt5
+
+    Will break stuff under PyQt4... oh well, better stuff working on Qt5
+    then Qt4
+
+Nyall Dawson 	2016-09-05
+
+    Fix PyQgsMapUnitScale test under qt5
+
+Nyall Dawson 	2016-09-05
+
+    Fix error when executing python code under python 3
+
+Nyall Dawson 	2016-09-05
+
+    Fix incorrect QtGui import
+
+Nyall Dawson 	2016-09-05
+
+    Upgrade internal pygments to 2.1.3
+
+Nyall Dawson 	2016-09-05
+
+    If vector layer renderer cannot be loaded, fallback to default
+
+    Eg if loading a project which used a plugin based renderer which
+    is not available, qgis would not renderer the layer and
+    eventually crash. Now if the saved renderer could not be
+    restored we fallback to a default renderer for the layer.
+
+arnaud.morvan@camptocamp.com 	2016-09-04
+
+    Calculate min coverage on execution
+
+arnaud.morvan@camptocamp.com 	2016-09-04
+
+    Fix on extent parameter in modeler parameters dialog
+
+Webmaster 	2016-09-04
+
+    fix to support PyQt5 5.7
+
+Merge: 0036274a41 679797e22b
+Nyall Dawson 	2016-09-04
+
+    Merge pull request #3451 from nyalldawson/smoooooth
+
+    [FEATURE] New simplify + smoothing expression functions
+
+Juergen E. Fischer 	2016-09-03
+
+    oracle provider: add updates on lob fields
+
+    (cherry picked from commit b61d932fc4b44669bf0094d76089d8c6bc129da6)
+
+Juergen E. Fischer 	2016-09-03
+
+    processing: use main vector menu translation (fixes #14535)
+
+    (cherry picked from commit 11289a0d973e6e4a3f7f81972dd08f2e6d82941e)
+
+Juergen E. Fischer 	2016-09-03
+
+    translation string fix
+
+    (cherry picked from commit 02af8b5566cba2271404e91d694d239bcdd3aedd)
+
+Nyall Dawson 	2016-09-03
+
+    [FEATURE] New simplify + smoothing expression functions
+
+    Exposes simplification and smoothing algorithms to expression
+    engine, via:
+
+    - simplify(): applies Douglas-Peucker geometry simplification
+    - simplify_vw(): applies Visvalingam-Whyatt geometry simplification
+    - smooth(): smoothes a geometry
+
+    Carto tip: use smooth along with geometry generators to minimise
+    the typical "GIS" noded look of rendered geometries!
+
+Nyall Dawson 	2016-09-03
+
+    Improve wording and fix build warning
+
+Matthias Kuhn 	2016-09-03
+
+    Add qgsmaplayerdependency.h to installed headers
+
+Merge: 795b52e906 4d60d0cdb5
+Nyall Dawson 	2016-09-03
+
+    Merge pull request #3450 from nyalldawson/smoooooth
+
+    [FEATURE] Extra control when smoothing geometries
+
+Nyall Dawson 	2016-09-03
+
+    Followup 80653c7, add missed algorithm
+
+Nyall Dawson 	2016-09-01
+
+    [FEATURE] Add option to QgsGeometry::smooth to not smooth
+    segments shorter than a certain threshold or sharp corners
+    with an angle exceeding a threshold
+
+    Expose the angle threshold to processing smooth algorithm
+
+    Also:
+    - optimise QgsGeometry::smooth for new geometry classes
+    - Fix smooth does not work with geometries containing Z/M
+
+Merge: 31c3739460 4aac75ff9b
+Matthias Kuhn 	2016-09-02
+
+    Merge pull request #3447 from epifanio/patch-1
+
+    fix typo
+
+epifanio 	2016-09-02
+
+    fix typo
+
+    fix typo in python/plugins/processing/algs/qgis/Polygonize.py
+
+Merge: 7ddaf9039d e38401e759
+Matthias Kuhn 	2016-09-02
+
+    Merge pull request #3420 from yjacolin/rewordWMSConnexion
+
+    Reword delete button in service connection dialog
+
+Merge: 6054bb9518 65db336eaf
+volaya 	2016-09-02
+
+    Merge pull request #3430 from alexbruy/output-vector
+
+    [processing] support for explicit output vector types
+
+Alexander Bruy 	2016-08-23
+
+    [processing] move some constants to the dataobjects module
+
+Alexander Bruy 	2016-08-08
+
+    [processing] adopt native algs to use output geomerty
+
+Alexander Bruy 	2016-08-08
+
+    [processing] split some native algs to take advantage of explicit output types
+
+Alexander Bruy 	2016-08-08
+
+    [processing] support for output geometry types in scripts and modeler
+
+Alexander Bruy 	2016-08-08
+
+    [processing] support for output geometry types (work in progress)
+
+Merge: 8c3537bff2 e716bae82f
+volaya 	2016-09-02
+
+    Merge pull request #3415 from arnaud-morvan/processing_reset_menus
+
+    [processing] Add a reset menus button
+
+Martin Dobias 	2016-09-02
+
+    Small code cleanups
+
+Even Rouault 	2016-09-01
+
+    [DBManager] Fix exception raised when adding a new Spatialite connection
+
+    This was accidentaly broken since 1f0fce7852e9f6a27af967d7ac7ee3989dce7b45
+
+    Fixes #15274
+
+Larry Shaffer 	2016-09-01
+
+    [auth] Fix return value for plugins that do not support an expansion
+
+    Bug not evident until there were providers with multiple credential
+    expansions (now supported in OWS providers). Lack of support for an
+    expansion should only trigger a debug message, not a failure.
+
+Merge: 665df5fbd6 af0d6b93a6
+Hugo Mercier 	2016-09-01
+
+    Merge pull request #3445 from mhugo/fix_virtual
+
+    Fix virtual layer queries with accents in layer name
+
+Martin Dobias 	2016-09-01
+
+    Make sure we do not miss cancellation request at the beginning
+
+Hugo Mercier 	2016-09-01
+
+    Fix virtual layer queries with accents in layer name
+
+Merge: 4a52351127 a25b0257a5
+Matthias Kuhn 	2016-09-01
+
+    Merge pull request #3436 from aaime/scaledep
+
+    Export map level scale based dependencies in most vector symbology
+
+Merge: ffe358179e 7e92d09c5f
+Matthias Kuhn 	2016-09-01
+
+    Merge pull request #3443 from bstroebl/documentProcessing
+
+    [processing] Add help for Eliminate sliver polygons
+
+Matthias Kuhn 	2016-09-01
+
+    Export main() when building for android
+
+Merge: 798817eee0 56b77db88c
+Nyall Dawson 	2016-09-01
+
+    Merge pull request #3441 from nyalldawson/simplify
+
+    Simplify features + fixes
+
+Martin Dobias 	2016-09-01
+
+    Fix incorrect raster reprojection after drawing raster previews
+
+    Moved all temporary projector members to a private class,
+    so even recursive block() calls will not affect each other
+    (there is no new performance penalty as block() call always
+    recomputes the temporary control point matrix anyway)
+
+Merge: 7a8ab40717 a86611b626
+Hugo Mercier 	2016-09-01
+
+    Merge pull request #3442 from mhugo/fix_dependencies
+
+    Cleanup layer dependency api
+
+Bernhard Ströbl 	2016-09-01
+
+    [processing] Add help for Eliminate sliver polygons
+
+Hugo Mercier 	2016-09-01
+
+    Cleanup layer dependency api
+
+Martin Dobias 	2016-09-01
+
+    Raster projector constructor cleanup
+
+    Marked raster interface as uncopiable (it should have always been uncopiable)
+
+Andrea Aime 	2016-08-26
+
+    Export map level scale based dependencies in most vector symbology
+
+Martin Dobias 	2016-09-01
+
+    Order tile requests according to their distance from view center
+
+    ... so we first receive tiles in the middle rather those at the border
+
+Merge: d5377dbc2e 08f5ae67b1
+Nyall Dawson 	2016-09-01
+
+    Merge pull request #3440 from nirvn/qt5_fix_freeze
+
+    Remove composer window visibiliy state restoration upon project load (fixes #15495)
+
+Nyall Dawson 	2016-09-01
+
+    [FEATURE][processing] Add choice of simplification method to simplify
+
+    This change allows users to choose which method to use when running
+    the simplify geometries algorithm, with choices of the existing
+    distance based (Douglas Peucker) algorithm, area based (Visvalingam)
+    algorithm and snap-to-grid.
+
+    Visvaligam in particular usually results in more cartographically
+    pleasing simplification over the standard distance based methods.
+
+Nyall Dawson 	2016-09-01
+
+    Add missing sip binding
+
+Nyall Dawson 	2016-09-01
+
+    [processing] Fix simplify alg handling of null goemetry, add tests
+
+Nyall Dawson 	2016-09-01
+
+    [processing] More efficient point count for simplify algorithm
+
+Nyall Dawson 	2016-09-01
+
+    Bump max pixel distance for OTF simplification
+
+Nyall Dawson 	2016-09-01
+
+    Fix crash using Visvalingam simplification, add test
+
+Matthias Kuhn 	2016-08-31
+
+    Support pre-CXX11 compilers
+
+    I'll update the toolchain one day, I promise!
+
+Merge: 504badb41f 0749ba43ba
+Hugo Mercier 	2016-08-31
+
+    Merge pull request #3320 from mhugo/fix_snapping2
+
+    Data dependency between layers + snapping fix
+
+Hugo Mercier 	2016-08-31
+
+    Rework layer dependencies
+
+    A new class QgsMapLayerDependency allows to represent different kinds
+    of dependencies between layers.
+
+Martin Dobias 	2016-08-31
+
+    Fix loading of XYZ tile layer data item provider
+
+Matthias Kuhn 	2016-08-31
+
+    Fix saving field configurations
+
+Martin Dobias 	2016-08-31
+
+    GUI for XYZ tile layers: browser items + actions to add/remove them
+
+Martin Dobias 	2016-08-31
+
+    [FEATURE] Native support for XYZ tile layers
+
+    Yes, that means OpenStreetMap tiles and various other sources!
+
+    No GUI so far...
+
+Hugo Mercier 	2016-07-21
+
+    [Feature] Data dependencies between layers
+
+    This allows to declare data dependencies between layers. A data
+    dependency occurs when a data modification in a layer, not by direct
+    user manipulation may modify data of other layers.
+    This is the case for instance when geometry of a layer is updated by a
+    database trigger after modification of another layer's geometry.
+
+Martin Dobias 	2016-08-31
+
+    Housekeeping in WMS provider - move some calculations to utility functions
+
+Juergen E. Fischer 	2016-08-30
+
+    db manager: don't consider added layer w/o a dataProvider
+
+    (cherry picked from commit 28aa9ebdb75eb099b83a3596b3f3c5c6e5c6f591)
+
+Matthias Kuhn 	2016-08-30
+
+    Fix doxygen
+
+Matthias Kuhn 	2016-08-30
+
+    Expose QgsCoordinateReferenceSystem to QML
+
+Hugo Mercier 	2016-07-21
+
+    Snapping: destroy index on dataChanged signal
+
+    Snapping caches on layers that have been changed by the provider or
+    by external sources are now invalidated.
+
+nirvn 	2016-08-30
+
+    Remove composer window visibiliy state restoration upon project load
+    (fixes #15495)
+
+Nyall Dawson 	2016-08-30
+
+    Fix Capitalize First Letter fails with curved labels (fix #14875)
+
+    Instead of using QFont's inbuilt capitalization support, which
+    applies only on rendering and accordingly fails for curved
+    labels which are drawn one character at a time, we now manually
+    capitalize label text while registering features.
+
+    The capitalize first method from Qt was reimplemented in QgsStringUtils
+    (together with what I expect is better handling of unicode characters
+    over the Qt method).
+
+    This change also makes it possible to implement other capitalization
+    methods not directly supported by Qt
+
+Martin Dobias 	2016-08-30
+
+    WMTS preview - require a temporary image for updates of the raster
+
+    Otherwise we would end up with rendering artifacts due to overpainting
+
+Merge: 891370fd68 97d7b7339e
+Nyall Dawson 	2016-08-30
+
+    Merge pull request #3418 from nyalldawson/default_values2
+
+    [FEATURE] Client side default values
+
+Nyall Dawson 	2016-08-30
+
+    Move storage of field alias and default value to QgsField
+
+    This is a partial implementation - QMaps are still used internally
+    within QgsVectorLayer to track the alias/default values
+    between attribute edit operations.
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-08-29
+
+    Add a changed signal to QgsEditorConfigWidget
+
+    And update default value expression preview whenever editor
+    config changes
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-08-23
+
+    Use widget representValue to preview default expression results
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-08-23
+
+    Optimise expression context creation
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-08-22
+
+    Use client side default values when creating new features
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-07-21
+
+    Add UI for setting default field value expressions in the
+    field property dialog
+
+    Sponsored by DB Fahrwegdienste GmbH
+
+Nyall Dawson 	2016-08-18
+
+    [FEATURE] Client side default field values
+
+    Allows an expression to be set for a vector layer field which
+    is used to evaluate a default value for this field.
+
+    A new method,
+    QgsVectorLayer::defaultValue( int index,
+                                  const QgsFeature& feature = QgsFeature(),
+                                  QgsExpressionContext* context = nullptr )
+    has been added which evaluates the default value for a given field
+    using the optionally passed feature and expression context. This
+    allows default values to utilise properties of the feature
+    which exist at the time of calling, such as digitized geometries.
+    The expression context parameter allows variables to be used
+    in default value expressions, making it easier to eg insert
+    a user's name, current datetime, project path, etc
+
+    Default values are set using QgsVectorLayer::setDefaultValueExpression()
+    and retrieved using defaultValueExpression()
+
+Nyall Dawson 	2016-08-29
+
+    [FEATURE] Substitution list support for labeling
+
+    Adds the ability to specify a list of text substitutes to make
+    which apply to label text. Eg abbrevating street types.
+
+    Users can export and import lists of substitutes to make
+    reuse and sharing easier.
+
+Merge: 4a89b7c470 46fba7ce80
+Nyall Dawson 	2016-08-30
+
+    Merge pull request #3438 from nyalldawson/replace
+
+    [FEATURE] Substitution list support for labeling
+
+Matthias Kuhn 	2016-08-29
+
+    Fix dimension detection in postgres provider
+
+Matthias Kuhn 	2016-08-29
+
+    Revert "Merge pull request #3338 from pvalsecc/editor_widgets_selection"
+
+    This reverts commit bbafbf48872eda48a2be8876cc89a0770552c6ad, reversing
+    changes made to 13ac0434e10fc7edd1eca665ea7c8b6cb5fd212d.
+
+Matthias Kuhn 	2016-08-29
+
+    Move QgsMapLayerProxyModel and QgsMapLayerProxyModel to core
+
+    Because it's also useful for non-widget applications
+
+Merge: 13ac0434e1 24bde35ce6
+Matthias Kuhn 	2016-08-29
+
+    Merge pull request #3338 from pvalsecc/editor_widgets_selection
+
+    Smarter default edit widgets with plugins to pick them
+
+Juergen E. Fischer 	2016-08-29
+
+    creatensis.pl: use passed in version number
+
+    (cherry picked from commit 88540c120e933715c397593f498e3a32ff5fb315)
+
+volaya 	2016-08-29
+
+    [processing] fixed dialog for selecting scripts
+
+Matthias Kuhn 	2016-08-29
+
+    If QgsRectangle is empty when combined, replace
+
+    It makes no sense to use an empty rectangle to combine with
+
+Nyall Dawson 	2016-08-29
+
+    [FEATURE] Substitution list support for labeling
+
+    Adds the ability to specify a list of text substitutes to make
+    which apply to label text. Eg abbrevating street types.
+
+    Users can export and import lists of substitutes to make
+    reuse and sharing easier.
+
+Merge: 235204fc3d db91330b66
+Nyall Dawson 	2016-08-29
+
+    Merge pull request #3434 from pvalsecc/lessWKB
+
+    Avoid back and forth with WKB in rendering
+
+Patrick Valsecchi 	2016-07-15
+
+    Smarter default edit widgets with plugins to pick them
+
+    Now the widgets factories can give a score on how good they could handle
+    a widget.
+
+    Additionaly, plugins can be added to choose a widget factory in function
+    of an external information. One of them uses a table in PostgresQL to
+    allow specification of the widget type and configuration.
+
+    I took the opportunity to remove a few deprecated method in relation to
+    this.
+
+Patrick Valsecchi 	2016-08-21
+
+    Avoid back and forth with WKB in rendering
+
+Nyall Dawson 	2016-08-29
+
+    Followup 9ba41e9, SQL convention is sum of no records=NULL
+
+Merge: 9ba41e9f27 da78ddeb7c
+Nyall Dawson 	2016-08-29
+
+    Merge pull request #3435 from nyalldawson/interpolate_angle
+
+    Expression functions to Interpolate angle (+ related processing improvements)
+
+Nyall Dawson 	2016-08-29
+
+    Fix calculation of certain aggregates from expressions when no
+    matching features exist
+
+    Eg sum and count should return 0 in this case rather than
+    null
+
+Nyall Dawson 	2016-08-25
+
+    [FEATURE] New expression functions for angle/distance interpolation
+
+    angle_at_vertex: returns average (bisector) angle to a geometry
+    at a specified vertex index
+    distance_to_vertex: returns distance along geometry to a specified
+    vertex index
+    line_interpolate_angle: calculates the angle parallel to a geometry
+    at the specified distance along the geometry
+
+    Sponsored by Andreas Neumann
+
+Nyall Dawson 	2016-08-25
+
+    [FEATURE][processing] Extract nodes algorithm now saves node
+    index, distance along line and angle at node
+
+    Also correctly handles null geometries
+
+Nyall Dawson 	2016-08-25
+
+    Add QgsGeometry method to get bisector of angle at vertex
+
+    Sponsored by Andreas Neumann
+
+Nyall Dawson 	2016-08-25
+
+    [FEATURE][processing] Optimised points along geometry algorithm
+
+    Supports also polygon geometries, handles null geometries,
+    and records the original line angle along with the distance
+    for each point.
+
+Nyall Dawson 	2016-08-25
+
+    Make QgsGeometry::interpolate handle polygon geometries
+
+Nyall Dawson 	2016-08-24
+
+    Add geometry methods for interpolating angle along geometry
+
+    Sponsored by Andreas Neumann
+
+Juergen E. Fischer 	2016-08-28
+
+    processing: fix population of commander combobox (fixes #15283)
+
+    (cherry picked from commit d3882d5)
+
+Juergen E. Fischer 	2016-08-28
+
+    dxf export: link vertices to polyline (fixes #15484)
+
+    (cherry picked from commit 052d3ef851beef7cbbfa3c699c1c95b0d84dc3e2)
+
+Nyall Dawson 	2016-08-25
+
+    Fix potential crash
+
+Merge: e71e743c9d 9471a6bf3f
+mhugent 	2016-08-25
+
+    Merge pull request #3411 from mhugent/feature_info_segmentized_geometry
+
+    [FEATURE]: possibility to segmentize feature info geometry in server
+
+Marco Hugentobler 	2016-08-25
+
+    Whitespace change
+
+Merge: 1387695002 5ac50353ef
+Nyall Dawson 	2016-08-25
+
+    Merge pull request #3432 from nyalldawson/ramps
+
+    Color ramp API improvements, fixes + some style dock inlining
+
+Juergen E. Fischer 	2016-08-25
+
+    fix globe build
+
+Martin Dobias 	2016-08-25
+
+    WMTS preview functionality - early work
+
+Nyall Dawson 	2016-08-24
+
+    Indentation and docs
+
+Merge: 014409d025 f0413e36d6
+Alexander Bruy 	2016-08-24
+
+    Merge pull request #3431 from arnaud-morvan/processing_batch_none
+
+    [processing] do not set "None" value in batch panel string widgets
+
+Nyall Dawson 	2016-08-24
+
+    [FEATURE] Make color brewer and limited random ramp editors show
+    inline in style panel
+
+Nyall Dawson 	2016-08-24
+
+    Fix limited random color ramp always returns 1 less color than set
+
+Nyall Dawson 	2016-08-24
+
+    Docs + cleanups for color ramp dialogs
+
+Nyall Dawson 	2016-08-24
+
+    Color ramp dialogs no longer edit ramps in place
+
+    Now the dialogs use a copy of the ramp, and the edited
+    ramp is retrieved by calling ramp() on the dialog after
+    it is executed.
+
+    Avoids pointer lifetime issues by storing and working
+    on a ramp pointer which the dialog does not have ownership
+    on.
+
+    Also fix a bunch of leaks relating to cloning color ramps.
+
+Nyall Dawson 	2016-08-24
+
+    Rename color ramp dialogs to match new ramp class names
+
+Nyall Dawson 	2016-08-24
+
+    Rename color ramp classes to more sensible names
+
+    QgsVectorColorRamp -> QgsColorRamp
+    QgsVectorGradientColorRamp -> QgsGradientColorRamp
+    QgsRandomColors -> QgsRandomColorRamp
+    QgsRandomColorRamp -> QgsLimitedRandomColorRamp
+    QgsVectorColorBrewerColorRamp -> QgsColorBrewerColorRamp
+
+    These color ramps are used throughout all of QGIS (not
+    just in vector symbology) and the current names are
+    misleading.
+
+Merge: 5d38dcbaff 2a326ef8ad
+Nyall Dawson 	2016-08-24
+
+    Merge pull request #3419 from nirvn/aggregate_collect_geom
+
+    [expression] support collection of geometry in the aggregate() function
+
+nirvn 	2016-08-22
+
+    [FEATURE] support aggregation of geometry
+    This feature adds a 'collect' aggregation method resulting in a
+    single multipart geometry from a list of geometries. This is exposed
+    in the expression engine via the existing aggregate() function,
+    as well as a new collect() function.
+
+Merge: 005147b284 5735be131f
+Nyall Dawson 	2016-08-24
+
+    Merge pull request #3427 from nyalldawson/inline_map_unit
+
+    [FEATURE] Make map unit scaling dialog show inline in style dock
+
+Nyall Dawson 	2016-08-24
+
+    Fix oracle provider build
+
+    [ci skip]
+
+Merge: 6475fd2129 2040cdf29f
+Nyall Dawson 	2016-08-24
+
+    Merge pull request #3404 from DelazJ/patch-13
+
+    Keep base units as default behavior (fix #15434)
+
+Nyall Dawson 	2016-08-23
+
+    [FEATURE] Make map unit scaling dialog show inline in style dock
+
+Alexander Bruy 	2016-08-23
+
+    fix typo
+
+Merge: f156b1f64d cb313761ca
+Nyall Dawson 	2016-08-24
+
+    Merge pull request #3423 from nyalldawson/remove_deprecated
+
+    Remove unused QgsProvider(Count|ExtentCalc)Event classes
+
+Juergen E. Fischer 	2016-08-23
+
+    fix switching of projects within unicode folders
+
+    (cherry picked from commit 3951f15b6481a85b551e2f33f26c2aeb6687a24a)
+
+arnaud.morvan@camptocamp.com 	2016-08-23
+
+    Do not set "None" value in batch panel string widgets
+
+Denis Rouzaud 	2016-08-23
+
+    followup 579ec8b18e3dc8b6365bb8668fbd90a2d281935a
+
+Denis Rouzaud 	2016-08-23
+
+    remove bitmap cursors
+
+    use window system cursors instead
+    followup 3624d7b4d818628b7d7d446ff642f5be1cc16773
+
+Denis Rouzaud 	2016-08-23
+
+    rename QgsFieldProxyModel::Filter All to AllTypes
+
+Denis Rouzaud 	2016-08-23
+
+    sort api_break document
+
+Denis Rouzaud 	2016-08-23
+
+    remove some deprecated methods, rename QgsAnnotation::mapPositionFixed() to hasFixedMapPosition()
+
+Alexander Bruy 	2016-08-23
+
+    fix open() call
+
+volaya 	2016-08-23
+
+    [processing] fixed extent selection from batch processing interface
+
+    fixes #15408
+
+Denis Rouzaud 	2016-08-23
+
+    add missing inclue of qgslogger
+
+Alexander Bruy 	2016-08-23
+
+    add missed codecs import
+
+Alexander Bruy 	2016-08-23
+
+    remove unused imports
+
+Merge: a10b8fc3e5 a0adcc22e7
+Matthias Kuhn 	2016-08-23
+
+    Merge pull request #3414 from aaime/uom_rescale
+
+    Emit valid SLD when mm are used as symbol unit
+
+Nyall Dawson 	2016-08-23
+
+    Make QgsVectorDataProvider defaults methods more efficient
+
+Nyall Dawson 	2016-08-23
+
+    Restore cancel button in color dialog when used from layer properties
+
+Alexander Bruy 	2016-08-23
+
+    forgot to remove import
+
+Alexander Bruy 	2016-08-23
+
+    [processing] add missed error() method
+
+Alexander Bruy 	2016-08-22
+
+    [processing] update TauDEM tools to latest TauDEM version
+
+Alexander Bruy 	2016-08-22
+
+    [processing] fix CMakeLists.txt
+
+Alexander Bruy 	2016-08-12
+
+    [processing] remove obsolete TauDEM multifile stuff
+
+Harrissou Sant-anna 	2016-08-17
+
+    Keep base units as default behavior (fix #15434)
+
+Merge: 3251eced69 df248dbe93
+Alexander Bruy 	2016-08-23
+
+    Merge branch 'otb_apps_export_improvment'
+
+Alexander Bruy 	2016-08-23
+
+    fix indentation
+
+Merge: 3251eced69 ce0a2ae062
+Alexander Bruy 	2016-08-23
+
+    Merge branch 'otb_apps_export_improvment' of https://github.com/grizonnetm/QGIS into otb_apps_export_improvment
+
+Andrea Aime 	2016-08-23
+
+    Emit valid SLD when on screen mm are used
+
+    SLD does not have a notion of on screen mm, rescale them to pixels to get an equivalent, more valid and more widely usable, output
+
+Nyall Dawson 	2016-08-23
+
+    Remove unused QgsProvider(Count|ExtentCalc)Event classes
+
+Manuel Grizonnet 	2016-08-22
+
+    forget to commit xml descriptors for otb 5.6
+
+Manuel Grizonnet 	2016-08-22
+
+    Update otb processing maintenance files to version 5.6.0
+
+Yves Jacolin 	2016-08-22
+
+    Reword delete button in service connection dialog
+
+    Similar to c7a4e5a065bdf1c606e5f24d728978f0789cff17
+
+arnaud.morvan@camptocamp.com 	2016-08-21
+
+    Process deleteLater events before recreating processing menus
+
+Denis Rouzaud 	2016-08-22
+
+    run astyle
+
+Tim Sutton 	2016-08-22
+
+    Spatialise error message fix (#3416)
+
+    * Fixed issue where opening an invalid spatialite db fails and gives and poor warning message
+
+    * Fix formatting
+
+Nyall Dawson 	2016-08-22
+
+    [browser] Correctly refresh postgres schemas when dropping tables
+
+Martin Dobias 	2016-08-21
+
+    [FEATURE] Drag'n'drop layers from layer tree view to browser dock
+
+    Makes it easy to e.g. store your temporary layers in PostGIS
+
+Merge: 86feb6d376 c468a0471c
+Nyall Dawson 	2016-08-22
+
+    Merge pull request #3417 from nyalldawson/expression_line_edit
+
+    Expression line edit widget
+
+Nyall Dawson 	2016-08-22
+
+    Use QgsExpressionLineEdit for geometry generator expression
+
+    The full expression builder widget is too large to fit
+    comfortable in the geometry generator setting widget,
+    especially when used in layer styling dock mode.
+
+Nyall Dawson 	2016-08-22
+
+    Remove minimum size from QgsCodeEditor (seems unnecessary)
+
+Nyall Dawson 	2016-08-18
+
+    New QgsExpressionLineEdit widget
+
+    Consists of a filter line edit + button to open expression builder
+
+    This widget is a bit like the existing QgsFieldExpressionWidget,
+    but for cases where a combo box does not make sense. Eg, when
+    no fields are available for the expression to use.
+
+    It also has an optional multiline mode, which allows it to be
+    used in place of the full-blown QgsExpressionBuilderWidget when
+    space is a problem.
+
+Nyall Dawson 	2016-08-22
+
+    Indentation
+
+Merge: f64adb9675 e110ba7d54
+Nyall Dawson 	2016-08-22
+
+    Merge pull request #3413 from nyalldawson/line_locate_point
+
+    Linear referencing functions
+
+Manuel Grizonnet 	2016-08-21
+
+    ENH: update log info when parsing otb apps
+
+Manuel Grizonnet 	2016-08-21
+
+    ENH: remove useless QApplication and prefer to use QGIS_PREFIX_PATH
+
+arnaud.morvan@camptocamp.com 	2016-08-21
+
+    Add button to reset processing menus in config dialog
+
+Merge: 1df8474795 ee87b0dbc9
+Matthias Kuhn 	2016-08-21
+
+    Merge pull request #3412 from medspx/PyQtQFileDialogFix
+
+    [PyQt] Add a lib2to3 custom fix to handle QFileDialog methods in PyQt5
+
+Nyall Dawson 	2016-08-21
+
+    [FEATURE] Add linear referencing functions to expression engine
+
+    Adds new functions
+    - line_interpolate_point: interpolates a point by a given distance
+    along a linestring geometry
+    - line_locate_point: returns the distance along a linestring to
+    the closest position on the linestring to a given point
+
+Nyall Dawson 	2016-08-21
+
+    [FEATURE] Expose GEOS linear referencing function to QgsGeometry
+
+    Adds a new QgsGeometry::lineLocatePoint() function for
+    retrieving the distance along a linestring to the nearest
+    position on the linestring to a given point.
+
+Médéric RIBREUX 	2016-08-21
+
+    [PyQt] Add a lib2to3 custom fix to handle QFileDialog methods in PyQt5
+
+Even Rouault 	2016-08-21
+
+    [arcgisrest] Fix compilation issue with QgsDebugMsg not being defined
+
+Matthias Kuhn 	2016-08-20
+
+    Fix server compilation
+
+Matthias Kuhn 	2016-08-20
+
+    Followup 1fda77c: Don't reference private headers in public ones
+
+Nyall Dawson 	2016-08-20
+
+    Disable PyQgsOfflineEditingWFS test on Travis
+
+    The test regularly fails on unrelated commits.
+
+    Possible the test should be reworked to reuse the server
+    launching routines from the labeling server test, which
+    seem more robust and work consistently across platforms
+
+Matthias Kuhn 	2016-08-19
+
+    Fix doxygen
+
+Matthias Kuhn 	2016-08-19
+
+    Small doc fix
+
+Matthias Kuhn 	2016-08-19
+
+    Add readOnly property to QgsVectorLayer
+
+Matthias Kuhn 	2016-08-19
+
+    Private headers should not be installed
+
+Matthias Kuhn 	2016-08-17
+
+    Add == and != operator to QgsFeature and add QML bindings
+
+Marco Hugentobler 	2016-08-19
+
+    [FEATURE]: possibility to segmentize feature info geometry in server
+
+Matthias Kuhn 	2016-08-19
+
+    Respect the "showLabel" flag on attribute editor elements
+
+Matthias Kuhn 	2016-08-19
+
+    [feature] Allow controlling labels for individual edit widgets
+
+    In the drag and drop designer, a double click on an item will allow
+    controlling if the label should be shown for each item individually.
+
+    Fix #15450
+
+Matthias Kuhn 	2016-08-19
+
+    Improve wording
+
+    Fix #15456
+
+Matthias Kuhn 	2016-08-19
+
+    Sort values in chained filter comboboxes (relation reference)
+
+    Fix #15454
+
+Matthias Kuhn 	2016-08-19
+
+    Hide invalid constraints label when it's unused
+
+    Fix #15452
+
+Merge: 72cbff918f fd4fe83641
+Matthias Kuhn 	2016-08-19
+
+    Merge pull request #3410 from m-kuhn/editformconfig-refactor
+
+    Refactor edit form config
+
+Matthias Kuhn 	2016-08-19
+
+    Doxymentation and sip bindings
+
+Matthias Kuhn 	2016-08-18
+
+    Create a default tab layout if none is configured
+
+Matthias Kuhn 	2016-08-18
+
+    Cleanup QgsEditFormConfig
+
+     * It's now implicitly shared, meaning that changes to the config
+       can be supervised and a signal is sent from QgsVectorLayer and
+       there is no risk of elements suddenly being deleted.
+     * Remove a bunch of methods that were in QgsVectorLayer for legacy
+       reasons.
+
+Juergen E. Fischer 	2016-08-18
+
+    dxf export: avoid symbology scale 0 (fixes #14138)
+
+    (cherry picked from commit 0a07fee15297e18a73b63f194f5aeecffd76800c)
+
+Matthias Kuhn 	2016-08-18
+
+    [travis] Allow failing mac osx builds
+
+    Seems to be a (temporary?) problem with sip in homebrew
+
+Harrissou Sant-anna 	2016-08-17
+
+    Remove mention of "panning" in the title as the frame is only about zooming (#3406)
+
+    Unless the "zoom factor" option in the frame applies also to panning (or an upcoming option will refer to it), mentioning panning in the title sounds erroneous.
+    The other option that refered to panning has been removed from 2.14 to 2.16.
+
+Matthias Kuhn 	2016-08-17
+
+    Replace obsolete QString::toAscii with QString::toLatin1
+
+Alexia Mondot 	2016-08-17
+
+    ENH update readme
+
+Alexia Mondot 	2016-08-17
+
+    BUG NameError: name OTBSpecific_XMLcreation is not defined on exec
+
+Alexia Mondot 	2016-08-17
+
+    ENH update for OTB 5.4
+
+Matthias Kuhn 	2016-08-17
+
+    [travis] Explicitly install missing homebrew deps
+
+Nyall Dawson 	2016-08-17
+
+    Add missing doc
+
+Matthias Kuhn 	2016-08-16
+
+    Add isNumeric and QML bindings to QgsField
+
+Frits van Veen 	2016-08-04
+
+    'Using perimeter (curved)' labels on polygon layers will now respect 'Show upside-down labels' setting.
+
+Nyall Dawson 	2016-08-17
+
+    Simplify handling of composer data defined buttons
+
+Nyall Dawson 	2016-08-17
+
+    Add method to reset vector layer for data defined button
+
+Nyall Dawson 	2016-08-17
+
+    Fix some missing autoupdates for raster psuedo color widget
+
+Nyall Dawson 	2016-08-17
+
+    Don't crash raster shader with nan or inf values (fix #15444)
+
+Nyall Dawson 	2016-08-17
+
+    Avoid warning
+
+Merge: 40b70a3ddf d193574ba7
+Nyall Dawson 	2016-08-17
+
+    Merge pull request #3391 from nyalldawson/single_sided
+
+    Single sided buffers
+
+Nyall Dawson 	2016-08-14
+
+    Fix doxygen warning
+
+Nyall Dawson 	2016-08-14
+
+    [FEATURE][processing] New algorithm for single sided buffers
+
+Nyall Dawson 	2016-08-14
+
+    [FEATURE] Expression functions for offset_curve and single_sided_buffer
+
+    Especially useful with geometry generators!
+
+Nyall Dawson 	2016-08-14
+
+    Fix potential crash when using default expression parameters
+
+Nyall Dawson 	2016-08-13
+
+    [FEATURE] Expose GEOS single sided buffer through QgsGeometry
+
+    Makes it easy for PyQGIS code to perform a single sided buffer
+    operation
+
+Nyall Dawson 	2016-08-13
+
+    Bump minimum GEOS version to 3.3
+
+Merge: cd4bc8887b 5ee97adc16
+Stéphane Brunner 	2016-08-16
+
+    Merge pull request #3326 from pvalsecc/perf
+
+    Add heuristic to not simplify geometries for nothing
+
+Patrick Valsecchi 	2016-07-19
+
+    Add heuristic to not simplify geometries for nothing
+
+    Tested with a release binary and Swiss OSM roads in PostGIS at several zoom
+    levels (the higher, the less features), values in ms (average over at
+    least 100 queries):
+
+    Level | Before | After | % improvement
+    -------------------------------------------
+    7     |  37    |  36   | 2.7
+    6     |  41    |  38   | 7.32
+    5     |  48    |  46   | 4.17
+    4     |  70    |  64   | 8.57
+    3     | 114    | 109   | 4.39
+
+    Not much improvement (I'm quite dispointed, here), but not much change in
+    the code.
+
+Nyall Dawson 	2016-08-16
+
+    Vertically stack the color widget when in dock mode
+
+Merge: 282f406e5b 001ae44b67
+Alexander Bruy 	2016-08-16
+
+    Merge pull request #3392 from nyalldawson/processing_temp
+
+    [processing] If supported, use memory layers instead of shapefiles
+
+Matthias Kuhn 	2016-08-16
+
+    Disable builtin pyyaml package with python 3
+
+    It's not compatible
+
+Tudor Bărăscu 	2016-08-16
+
+    in readme: addded geopackage as data source + macOS naming (#3394)
+
+    Before this commit it was somehow implied that OS X is not an
+    UNIX platform when in fact it is. Also, starting with macOS Sierra,
+    Apple has dropped the naming of OS X towards macOS.
+
+Merge: a3149b14d9 5407ae8a6a
+Nyall Dawson 	2016-08-16
+
+    Merge pull request #3398 from nyalldawson/grad
+
+    FEATURE: Open color dialog inside layer style panel
+
+Merge: 0f2723542b 42ebb4f7d7
+Nyall Dawson 	2016-08-16
+
+    Merge pull request #3396 from nyalldawson/displace_widget
+
+    Use panels for displacement renderer settings
+
+Nyall Dawson 	2016-08-16
+
+    Python 3 update
+
+Martin Dobias 	2016-08-15
+
+    Fix cache size setting in options dialog
+
+    The bug disabled network caching for all new QGIS installs...
+
+Nyall Dawson 	2016-08-16
+
+    Make QgsVectorLayer uniqueValues/min/maxValue consider edits
+
+    Previously these methods would inconsistently handle the
+    edit buffer, eg uniqueValues would consider changed attributes
+    but not added features. Now uniqueValues, minimumValue and
+    maximumValue all consider both added features and changed
+    attribute values when performing their calculation.
+
+    The most noticable effect of this fix is that the unique
+    values widget now correctly shows values for features which
+    have been added but not yet committed to the provider.
+
+Denis Rouzaud 	2016-08-15
+
+    fix layout
+
+Denis Rouzaud 	2016-08-11
+
+    enable relation editor widget test on Qt5
+
+Merge: 4e82767fcf 0f268bf27a
+Alexander Bruy 	2016-08-15
+
+    Merge pull request #3393 from nyalldawson/processing_translate
+
+    [FEATURE][processing] New algorithm for translating (moving) points
+
+Merge: 1cb48ddd65 1140437f55
+Alessandro Pasotti 	2016-08-15
+
+    Merge pull request #3366 from aaime/sld_filter_fix
+
+    Do not generate a ogc:Filter where a ogc:Expression is expected.
+
+Merge: ea4e5cb7c0 be3c780f16
+Denis Rouzaud 	2016-08-15
+
+    Merge pull request #3384 from wonder-sk/fix-postgres-qt5
+
+    Fix postgres pkey map in Qt5 (fixes #15223)
+
+Denis Rouzaud 	2016-08-15
+
+    additional fields should be placed at the end
+
+Nyall Dawson 	2016-08-15
+
+    Add provider test for postgres with compound key
+
+Nyall Dawson 	2016-08-15
+
+    [FEATURE] Color dialog can be embedded in layer style panel
+
+    Now clicking color buttons inside the layer style panel causes
+    the color picker dialog to be opened inside the style panel itself
+    rather than as a separate dialog
+
+Nyall Dawson 	2016-08-15
+
+    New method to find parent QgsPanelWidget for a widget
+
+Merge: 297664631e 5a25c71eb6
+Nyall Dawson 	2016-08-15
+
+    Merge pull request #3390 from nirvn/raster_properties_fix_qt5
+
+    fix crash when opening raster properties window under qt5
+
+Nyall Dawson 	2016-08-14
+
+    [composer] Fix guide sizing under qt5 (fix #15432)
+
+Nyall Dawson 	2016-08-15
+
+    Use panels for displacement renderer settings
+
+Nyall Dawson 	2016-08-15
+
+    Implement move assignment operator for QgsExpressionContext
+
+Nyall Dawson 	2016-08-15
+
+    Fix uninitialized members
+
+Nyall Dawson 	2016-08-15
+
+    Remove QgsGeometry pointers from QgsGeometryAnalyzer
+
+Nyall Dawson 	2016-08-15
+
+    Fix leak caused by missing virtual destructor
+
+Nyall Dawson 	2016-08-15
+
+    [oracle] Fix build warnings
+
+Nyall Dawson 	2016-08-14
+
+    [processing] Fix some potential errors in clip algorithm
+
+Nyall Dawson 	2016-08-14
+
+    [FEATURE][processing] New algorithm for translating (moving) points
+
+    Allows geometries to be shifted by a x/y displacement
+
+Nyall Dawson 	2016-08-14
+
+    [processing] If supported, use memory layers instead of shapefiles
+    when writing to a temporary result
+
+    Avoids truncation of field names and other format specific
+    limitations
+
+nirvn 	2016-08-13
+
+    fix crash when opening raster properties window under qt5
+
+Alessandro Pasotti 	2016-08-12
+
+    Stop the timer when the reply finish
+
+    This should fix a few reported and unreported issues
+    with false positive timeout errors.
+
+    Fixes: #12243
+
+     (cherry-picked from ace9d2b0f661849106f0448189cb233710754f12)
+
+Andrea Aime 	2016-08-07
+
+    Do not generate a ogc:Filter where a ogc:Expression is expected. Fixes #10076 and #11202
+
+Merge: 915afcf8fa 99ed790820
+Denis Rouzaud 	2016-08-12
+
+    Merge pull request #3375 from 3nids/movetoolcad
+
+    [FEATURE] Move feature now benefits from Advanced Digitizing
+
+Denis Rouzaud 	2016-08-12
+
+    rename enum to avoid confusion
+
+Merge: 4ae7b6f8dd 754ccefabc
+Alexander Bruy 	2016-08-12
+
+    Merge pull request #3372 from anitagraser/patch-1
+
+    [processing] fixed failure to insert only one point in Densify geometries alg
+
+Merge: d0faca16a7 e9423dc4dd
+Alexander Bruy 	2016-08-12
+
+    Merge pull request #3385 from nyalldawson/centrods
+
+    [processing] Rework centroid algorithm to handle non-polygon layers
+
+Martin Dobias 	2016-08-12
+
+    Make it work with Qt5 < 5.6
+
+Nyall Dawson 	2016-08-12
+
+    [processing] Rework centroid algorithm to handle non-polygon layers
+
+    The existing polygoncentroids algorithm has been deprecated
+    (and hidden from the toolbox), and a new, generic centroids
+    algorithm added which works with lines and multipoints
+
+Merge: b6d03209b9 9bc61e77c7
+Nyall Dawson 	2016-08-12
+
+    Merge pull request #3381 from nyalldawson/processing_layer
+
+    [processing] Create vector files using default dataset/layer options
+
+Nyall Dawson 	2016-08-11
+
+    [processing] Create vector files using default dataset/layer options
+
+    Fixes missing CRS when saving to GML (fix #14544)
+
+Martin Dobias 	2016-08-11
+
+    Fix closest segment for points (#3383)
+
+    * Make closestSegment() behave as expected by QgsGeometry::closestSegmentWithContext
+
+    This fixes a bug that QgsPointLocator::nearestEdge() would return valid match even for point layers.
+
+    * Shortcut if using QgsPointLocator with a wrong layer type
+
+Martin Dobias 	2016-08-11
+
+    Fix postgres pkey map in Qt5 (fixes #15223)
+
+    Switching from QVariant to QVariantList solves the underlying Qt issue:
+    - comparison of QVariantList objects works fine
+    - comparison of QVariantList objects wrapped in QVariant does not work
+
+    The extra wrapping of QVariantList into another QVariant seems unnecessary anyway,
+    so we may as well save a tiny bit of memory and cpu
+
+Denis Rouzaud 	2016-08-11
+
+    remove extra includes
+
+Denis Rouzaud 	2016-08-11
+
+    remove old code in comment (old QgsFeatureId class and 32bit IDs)
+
+Denis Rouzaud 	2016-08-11
+
+    debug output for QgsRelation::isValid()
+
+Merge: 8a31576d3a 5025c828e5
+Alexander Bruy 	2016-08-11
+
+    Merge pull request #3380 from nyalldawson/processing
+
+    [processing] Offset curve follow ups
+
+Nyall Dawson 	2016-08-11
+
+    [processing] Expose buffer settings (cap/join style/mitre limit)
+
+    Also make fixed distance buffer correctly handle null geometries
+    (copy the row as a geometryless row)
+
+Merge: 7ee55a78f1 82f4a82c66
+Alexander Bruy 	2016-08-11
+
+    Merge pull request #3379 from nyalldawson/processing
+
+    [FEATURE][processing] New algorithm for offsetting lines
+
+Nyall Dawson 	2016-08-11
+
+    Make QgsGeometry::offsetCurve handle multi* geometries
+
+Denis Rouzaud 	2016-08-10
+
+    Move feature now benefits from Advanced Digitizing
+
+    QgsMapToolMoveFeature now inherits QgsMapToolAdvancedDigitizing
+    this allows to specify distance, angles, complex and multiple moves at once
+    it is now a click and click operation (similarly to the rotate feature map tool): so it can be cancelled once enabled with the right click
+
+Nyall Dawson 	2016-08-11
+
+    [FEATURE][processing] New algorithm for offsetting lines
+
+Matthias Kuhn 	2016-08-10
+
+    [pyqt5] Aliases for indistinguishable method overloads (#3099)
+
+    See
+    https://www.riverbankcomputing.com/pipermail/pyqt/2016-May/037500.html
+
+Matthias Kuhn 	2016-08-10
+
+    Fix db_manager
+
+Merge: 58ea21124e fb346ecf4f
+Nyall Dawson 	2016-08-11
+
+    Merge pull request #3374 from nirvn/label_repeat_improvement
+
+    [pal] fix repeated labels on curved lines when label width > repeat distance
+
+Matthias Kuhn 	2016-08-10
+
+    Streamline expression context generation (#3350)
+
+    * Save more data to QML
+
+     * Virtual fields
+     * Map tips
+     * Display expression
+     * Read only flag
+
+    * Streamline expression context generation
+
+    Whenever an object is able to generate an expression context it
+    implements the method createExpressionContext() declared in
+    QgsExpressionContextGenerator.
+
+    This makes a cleaner API and allows using QgsFieldExpressionWidget and
+    QgsDataDefinedButton from python because standard OO programming
+    approaches are used instead of callbacks and void pointers.
+
+    * Colorize output of doc and sip tests
+
+    * Fix build
+
+    * Fix sip complaints
+
+    * Fix rebase problems
+
+    * Workaround failing bindings test
+
+Larry Shaffer 	2016-08-10
+
+    [auth] Add missing auth system ui headers for external C++ apps
+
+Juergen E. Fischer 	2016-08-10
+
+    creatensis.pl: exclude point release component from path
+
+Harrissou Sant-anna 	2016-08-10
+
+    Remove duplicate example (#3360)
+
+Merge: 4267a19658 c24692cd5c
+Jürgen Fischer 	2016-08-10
+
+    Merge pull request #3359 from jef-n/api-updates-v2
+
+    Replace V2 in API
+
+Matthias Kuhn 	2016-08-10
+
+    Fix crash when clicking in empty relation editor
+
+nirvn 	2016-08-10
+
+    fix repeated labels on curved lines when label width > repeat distance
+
+Juergen E. Fischer 	2016-08-10
+
+    update after slot renames (followup 4cfacf1)
+
+Juergen E. Fischer 	2016-08-07
+
+    rename test images
+
+Juergen E. Fischer 	2016-08-07
+
+    another scripts/replacev2.sh with minor manual fixes
+
+Juergen E. Fischer 	2016-08-07
+
+    rename QgsAttributeTypeDialog::setWidgetV2Config & QgsAttributeTypeDialog::setWidgetV2Type
+
+Juergen E. Fischer 	2016-08-07
+
+    replacev2.sh: add file renames
+
+Juergen E. Fischer 	2016-08-06
+
+    fix PyQgsSymbolLayer test
+
+Juergen E. Fischer 	2016-08-06
+
+    TestQgsGeometry renames:
+    lineStringV2() to lineString()
+    pointV2() to point()
+    polygonV2() to polygon()
+
+Juergen E. Fischer 	2016-08-06
+
+    rename QgsComposerSymbolItem::symbolV2() to symbol()
+
+Juergen E. Fischer 	2016-08-06
+
+    rename QgsVectorLayerEditUtils::deleteVertexV2
+
+Juergen E. Fischer 	2016-08-06
+
+    remove deprecated stuff from QgsVectorLayer and editor widgets
+
+Juergen E. Fischer 	2016-08-06
+
+    document api breaks by scripts/replacev2.sh
+
+Juergen E. Fischer 	2016-08-06
+
+    scripts/replacev2.sh run
+
+Juergen E. Fischer 	2016-08-06
+
+    replacev2.sh: replace V2 classes and methods
+
+Merge: 0a2dd93813 142de7cb08
+Nyall Dawson 	2016-08-10
+
+    Merge pull request #3371 from nyalldawson/processing
+
+    [processing] New algs + a fix
+
+Merge: 56400b147b b2cfb19720
+Nyall Dawson 	2016-08-10
+
+    Merge pull request #3364 from nyalldawson/expression_dep
+
+    Clean QgsExpression for 3.0
+
+Nyall Dawson 	2016-08-07
+
+    Fix doxygen warnings
+
+Nyall Dawson 	2016-08-07
+
+    Update TestQgsComposerLabel
+
+Nyall Dawson 	2016-08-06
+
+    QgsExpression::setGeomCalculator now takes a pointer
+
+    This allows the calculator to be cleared
+
+Nyall Dawson 	2016-08-06
+
+    Standardise capitalisation in some QgsExpression methods
+
+Nyall Dawson 	2016-08-06
+
+    Remove substitution map from QgsExpression::replaceExpressionText
+
+    Since expression context variables should now be used instead. Also
+    remove all the deprecated methods which relied on this API.
+
+Nyall Dawson 	2016-08-06
+
+    Remove deprecated QgsAttributeAction from sip bindings
+
+Nyall Dawson 	2016-08-06
+
+    Add missing variable help for @layout_page
+
+Nyall Dawson 	2016-08-06
+
+    Remove deprecated methods from QgsExpression
+
+    Now all evaluate/prepare/etc methods must be called using QgsExpressionContexts
+
+    Also remove most remaining traces of special variables. This brings some
+    user facing changes, such that existing expressions may need to be
+    updated if they used these old special variables (eg $scale,
+    $feature). These changes are noted in doc/qgis3_user_changes.dox
+    so that we can include them in the release notes.
+
+Anita Graser 	2016-08-10
+
+    fixed failure to insert only one point
+
+    Previously, if pointsNumber was 1, it wouldn't insert a new point in the middle.
+
+Nyall Dawson 	2016-08-10
+
+    [FEATURE][processing] Point on surface algorithm
+
+Nyall Dawson 	2016-08-10
+
+    [FEATURE][processing] New algorithm for geometry boundary
+
+Nyall Dawson 	2016-08-10
+
+    [processing] Fix broken output of multipoint since WKB type merge
+
+Nyall Dawson 	2016-08-10
+
+    [FEATURE][processing] New algorithm for calculating feature bounding boxes
+
+Alessandro Pasotti 	2016-08-08
+
+    [WFS] Fixes #15360 and other issues
+
+    - fixes authcfg params not passed to requests
+    - fixes backward URI compatibility
+    - fixes version parameter ignored in old style URI
+    - check for "user" in addition to "username" in WFS URI
+
+      (cherry-picked from f49bd5ca449e332aa547f9dac31b391e438d2b31)
+
+Nyall Dawson 	2016-08-09
+
+    Label test mask updates
+
+Nyall Dawson 	2016-08-09
+
+    Reset layers for each pal placement test, avoids all tests failing
+    because of one
+
+Nyall Dawson 	2016-08-09
+
+    Fix warning
+
+Nyall Dawson 	2016-08-09
+
+    [pal] Only apply distance from line midpoint penalty to non closed linestrings
+
+    Sponsored by Andreas Neumann
+
+Nyall Dawson 	2016-08-09
+
+    Further tweaks to line labeling, add tests
+
+    Sponsored by Andreas Neumann
+
+Nyall Dawson 	2016-08-09
+
+    [pal] Also prefer above -> below for parallel line placement
+
+Nyall Dawson 	2016-08-09
+
+    Labeling tests
+
+Nyall Dawson 	2016-08-09
+
+    Add missing sip binding
+
+Nyall Dawson 	2016-08-09
+
+    [pal] Improve line placement algorithm
+
+    Avoid placing labels over jagged sections of lines
+
+    Sponsored by Andreas Neumann
+
+Nyall Dawson 	2016-08-08
+
+    Slightly increase default maximum angles for curved labels
+
+    The recent improvements to curve label rendering make this possible
+
+Nyall Dawson 	2016-08-08
+
+    Default to follow placement alignment for labels
+
+Nyall Dawson 	2016-07-27
+
+    Default to cartographic label placement for point layers
+
+    It's much nicer than "around point"
+
+Nyall Dawson 	2016-07-27
+
+    Bump default number of label candidates
+
+    Results in much nicer label placement and little to no speed
+    regression in most cases
+
+Nyall Dawson 	2016-08-08
+
+    [pal] When labels can be placed both above and below the line, prefer above
+
+Nyall Dawson 	2016-08-08
+
+    Avoid labels being marked as overlapping obstacles when features
+    neighbour each other
+
+Nyall Dawson 	2016-08-08
+
+    [pal] Respect user set number of line candidates
+
+    The number of positions used for generating line label candidates
+    was hardcoded and was not using the pal number of line candidate
+    setting.
+
+    This change means the number of line candidates can be bumped up
+    resulting in more candidates actually being generated and
+    a better final label placement
+
+Nyall Dawson 	2016-08-08
+
+    Fix "label only inside polygon" mode when used with perimeter placement
+
+    The option was not working with perimeter placements as perimeter placements alter
+    the label feature geometry to be a boundary linestring - hence no labels where
+    ever inside this boundary.
+
+    Accordingly this refactors how the force label inside polygon option functions.
+    Now QgsLabelFeatures can have a permissible zone geometry set, such that any
+    label candidates outside of this permissible zone are discarded.
+
+    This approach is more flexible as it could also be used for more labeling options
+    in future, eg discarding label candidates which are too far from a centroid or
+    something.
+
+    Sponsored by Andreas Neumann
+
+Martin Dobias 	2016-08-09
+
+    [FEATURE] API to allow drag'n'drop of custom browser items
+
+    QgsDataItem implementations may provide hasDragEnabled(), mimeUri()
+    and QgsCustomDropHandler implementation to deal with drop of custom items.
+
+Juergen E. Fischer 	2016-08-09
+
+    globe: fix build
+
+Juergen E. Fischer 	2016-08-07
+
+    fix disconnect (followup aceddae)
+
+Juergen E. Fischer 	2016-08-08
+
+    fix 772f593
+
+Even Rouault 	2016-08-08
+
+    [QgsVectorFileWriter + OGR provider] Create Integer64 fields as Real fields when output driver doesn't support Integer64
+
+    Fix #15405
+
+Even Rouault 	2016-08-08
+
+    [WFS provider] Succesfully analyze DescribeFeatureType response with  as inline element of  (#15395)
+
+Alexander Bruy 	2016-08-08
+
+    [processing] fix available inputs selection for multiple input
+
+Alexander Bruy 	2016-08-08
+
+    [processing] add missed multiple input parameter to modeler
+
+Denis Rouzaud 	2016-08-08
+
+    fix server build, follow up 772f59349e563357a4f38f92e734d31e67c94ec8 again
+
+    sorry for the noise
+
+Denis Rouzaud 	2016-08-08
+
+    fix build, follow up 772f59349e563357a4f38f92e734d31e67c94ec8
+
+Denis Rouzaud 	2016-08-08
+
+    rename QgsComposerLegend::modelV2() to model()
+
+Denis Rouzaud 	2016-08-08
+
+    remove deprecated private helpers QgsMapToolIdentify::convertMeasurement and displayUnits
+
+Denis Rouzaud 	2016-08-08
+
+    remove QgisInterface::actionLayerSelectionSaveAs
+
+    this has been deprecated since 2.4 and returns null pointer since then.
+    did not write this in api_break to not overload the document
+
+Denis Rouzaud 	2016-08-08
+
+    remove deprecated QgisInterface::fileMenu
+
+Merge: e72389601d 26c1e09a58
+Nyall Dawson 	2016-08-08
+
+    Merge pull request #3361 from nyalldawson/color_dialog
+
+    Remove QgsColorDialog, rename QgsColorDialogV2 to QgsColorDialog
+
+Nyall Dawson 	2016-08-07
+
+    Remove unused QgsRendererV2DataDefinedMenus
+
+    Was not exposed to python api, so not a PyQGIS api break
+
+Nyall Dawson 	2016-08-06
+
+    Remove QgsColorDialog, rename QgsColorDialogV2 to QgsColorDialog
+
+    The last bits of missing functionality (handling native dialogs
+    and live updates) were ported across.
+
+Nyall Dawson 	2016-08-06
+
+    More comment updates
+
+Nyall Dawson 	2016-08-06
+
+    Fix some comments
+
+Nyall Dawson 	2016-08-05
+
+    Followup 19ab72c, add unit test
+
+    Adds a unit test to ensure that all providers ignore invalid
+    ids when passed a FilterFids request.
+
+    Spoiler: they do
+
+Merge: e82ce54a8e bbb9b5322d
+Denis Rouzaud 	2016-08-05
+
+    Merge pull request #3356 from 3nids/remove_legendmodel
+
+    remove QgsLegendModel
+
+Denis Rouzaud 	2016-08-05
+
+    remove QgsLegendModel
+
+Matthias Kuhn 	2016-08-05
+
+    Don't rely on a particular order in filterFids tests (#3357)
+
+Alexander Bruy 	2016-08-05
+
+    [processing] more clean in QGIS algs
+
+Alexander Bruy 	2016-08-05
+
+    [processing] more cleanups (follow up 06c4b07222)
+
+Merge: 4c39bd12e8 c1649ebef4
+Alexander Bruy 	2016-08-05
+
+    Merge pull request #3353 from nyalldawson/processing
+
+    [Processing] QGIS alg cleanups
+
+Alexander Bruy 	2016-08-05
+
+    [processing] introduce OutputCrs output and add algorithms to get layer CRS in modeler
+
+Alexander Bruy 	2016-08-05
+
+    [processing] add missed CRS parameter to modeler (refs #11781)
+
+Matthias Kuhn 	2016-08-05
+
+    QgsExpression "round" don't convert to QVariant twice
+
+Merge: 19ab72c937 acbf5cddb4
+Denis Rouzaud 	2016-08-05
+
+    Merge pull request #3355 from 3nids/V2removal
+
+    remove V2 in some classes
+
+Denis Rouzaud 	2016-08-05
+
+    renamed QgsSymbologyV2Conversion to QgsSymbologyConversion
+
+Denis Rouzaud 	2016-08-05
+
+    renamed QgsSymbolLevelsV2Dialog to QgsSymbolLevelsDialog
+
+Denis Rouzaud 	2016-08-05
+
+    removed V2 from QgsSymbolV2*
+
+Denis Rouzaud 	2016-08-05
+
+    removed V2 from QgsSymbolLayerV2*
+
+Nyall Dawson 	2016-08-05
+
+    Follow up 1f02fd
+
+Nyall Dawson 	2016-08-05
+
+    Implement provider side FilterFids iterators for OGR provider
+
+    Makes some operations with OGR sources magnitudes faster, ie
+    zoom to 20 selected features in a 4 million point dataset:
+
+    before: 14 seconds of blocked gui
+    after: instant
+
+    Win!
+
+Nyall Dawson 	2016-08-04
+
+    [processing] pendingFields() -> fields()
+
+    Does the same thing, but pendingFields() is ugly
+
+Nyall Dawson 	2016-08-04
+
+    [processing] Use layer crs/fields instead of provider crs/fields
+
+    Since the layer has more complete knowledge of the crs (ie, when
+    provider could not determine crs and user has selected it from
+    the list), and also better knowledge of layer fields (virtual
+    fields, joined fields) we should use these rather than the
+    provider methods.
+
+Merge: 23909a123a c40d6d3f28
+Nyall Dawson 	2016-08-05
+
+    Merge pull request #3351 from nyalldawson/feature_geom
+
+    QgsFields cleanup
+
+Nyall Dawson 	2016-08-02
+
+    Add missing docs
+
+Nyall Dawson 	2016-08-02
+
+    Avoid potential QgsFields detachments
+
+Nyall Dawson 	2016-08-02
+
+    QgsFields returns QgsField value instead of const references
+
+    (since QgsField is implicitly shared)
+
+Nyall Dawson 	2016-08-02
+
+    QgsFeature::fields() returns a value, not a pointer
+
+    Also remove all other QgsFields pointers and replace with
+    references/values, since QgsFields objects are implicitly shared
+
+Martin Dobias 	2016-08-04
+
+    Fix crashes when accessing null map layer renderer
+
+    (obviously cached layers have null renderer)
+
+    Thanks @nyalldawson for tracking it down
+
+Denis Rouzaud 	2016-08-04
+
+    fix case
+
+Denis Rouzaud 	2016-08-04
+
+    remove QgsColorButton in favor of V2
+
+Denis Rouzaud 	2016-08-04
+
+    remove old folder
+
+Nyall Dawson 	2016-08-04
+
+    Fix build
+
+Matthias Kuhn 	2016-08-04
+
+    Remove deprecated Qgis::WKBType and API cleanup (#3325)
+
+    * Remove deprecated Qgis::WKBType and API cleanup
+
+    Renames QgsWKBTypes to QgsWkbTypes
+
+    Replaces usage of the enums:
+
+    * Qgis::WKBType with QgsWkbTypes::Type
+    * Qgis::GeometryType with QgsWkbTypes::GeometryType
+
+    Their values should be forward compatible (a fact that was already
+    explited up to now by casting between the types)
+
+    Renames some SSLxxx to SslXxx and URIxxx to UriXxx
+
+    * Fix build warnings and simplify type handling
+
+    * Add a fixer to rewrite imports
+
+    * The forgotten rebase conflictThe forgotten rebase conflicts
+
+    * QgsDataSourcURI > QgsDataSourceUri
+
+    * QgsWKBTypes > QgsWkbTypes
+
+    * Qgis.WKBGeom > QgsWkbTypes.Geom
+
+    * Further python fixes
+
+    * Guess what... Qgis::wkbDimensions != QgsWkbTypes::wkbDimensions
+
+    * Fix tests
+
+    * Python 3 updates
+
+    * [travis] pull request caching cannot be disabled
+
+    so at least use it in r/w mode
+
+    * Fix python3 print in plugins
+
+Matthias Kuhn 	2016-08-03
+
+    Don't show scrollbar in embedded drag and drop designer form
+
+Sandro Mani 	2016-08-03
+
+    [Geometry checker] Fix default value for thinness threshold
+
+Merge: f7e7ecff05 2b8b8ae0cc
+Sandro Mani 	2016-08-03
+
+    Merge pull request #3339 from manisandro/spatialite_ftablecatalog
+
+    [Spatialite] Only store database filename in f_table_catalog, not entire path
+
+Sandro Mani 	2016-07-27
+
+    [Spatialite] Remove t_table_catalog WHERE clause when searcing for layer styles in db
+
+    This sanity check is unnecessary and breaks styling if the sqlite file is moved or renamed.
+    The t_table_catalog column is kept for backwards compatibility.
+
+Juergen E. Fischer 	2016-08-03
+
+    fix build
+
+Juergen E. Fischer 	2016-08-03
+
+    fix crash when QSQLITE is unavailable (fixes #15358)
+
+Merge: 420917bf5b d1aa03a09b
+Nyall Dawson 	2016-08-03
+
+    Merge pull request #3304 from nyalldawson/processing_clip
+
+    [FEATURE] Optimise processing clip algorithm
+
+Nyall Dawson 	2016-08-03
+
+    Sort api doc file by class name
+
+Nyall Dawson 	2016-08-03
+
+    Better clip for very separate features
+
+Nyall Dawson 	2016-07-13
+
+    [FEATURE] Optimise processing clip algorithm
+
+    Before the algorithm was written to optimise clipping a few
+    features against thousands of mask features. The revised algorithm
+    is optimised for clipping thousands of input features against
+    a few mask features.
+
+    Given that this second operation is much more likely, it makes
+    sense to optimise for this use case.
+
+    I've also applied some other optimisations like taking advantage
+    of spatial indexes on the providers, using prepared geometries
+    and also only applying an intersection operation if the geometry
+    isn't wholly contained by the mask geometry.
+
+    Benchmarks:
+
+    clipping roads layer with 1 million lines against 2 polygons
+
+    before: 5 mins 30 seconds
+    after: 10 seconds
+
+    clipping address layer with 5 million points against 2 polygons
+
+    before: 50 minutes
+    after: 30 seconds
+
+Matthias Kuhn 	2015-12-20
+
+    QgsFeatureRendererV2::Capabilities to flags
+
+Matthias Kuhn 	2016-08-02
+
+    Split displayField into displayExpression and mapTipTemplate (#1973)
+
+    Previously there was the expressionField (a field name or an expression)
+    mainly used for the feature list in the form view of the dual view.
+    On the other hand there was the displayField which could contain either
+    a simple field name or a complex HTML structure with embedded expressions.
+    And to know what it was you could compare it's content with the field names, if
+    a field name matched, you used it as a displayField (original purpose) and
+    if not... well, you could deal with HTML if you had a use for it.
+
+    The main problem is that there are two different usages for this kind of
+    thing
+
+     * plain text identifier (field or expression)
+     * pretty, rich text feature info
+
+    This commit cleans up with this. You want rich text and a lot of info:
+    go for mapTipTemplate.
+    You want a plain text string to identify features: go for
+    the displayExpression.
+
+Alexander Bruy 	2016-08-02
+
+    [dbmanager] fix signal/slot connection
+
+Merge: 2482a6bbd0 b7f4fe36e7
+Denis Rouzaud 	2016-08-02
+
+    Merge pull request #3352 from 3nids/rubberband_ispolygon
+
+    QgsRubberBand: remove constructor and method with bool isPolygon
+
+Denis Rouzaud 	2016-08-02
+
+    QgsRubberBand: remove constructor and method with bool isPolygon
+
+    use methods with Qgis::GeometryType instead
+
+Martin Dobias 	2016-08-02
+
+    Small cleanup in data items
+
+Alexander Bruy 	2016-08-02
+
+    [processing] fix import
+
+Alexander Bruy 	2016-08-01
+
+    expand all groups if filter applied
+
+Alexander Bruy 	2016-06-23
+
+    [FEATURE][processing] add search to Get Scripts and Models dialog (fix #12067)
+
+Martin Dobias 	2016-08-02
+
+    Merge duplicate sections in API breaks doc
+
+Merge: f9fabb86d9 a89fea13fd
+Martin Dobias 	2016-08-02
+
+    Raster MTR improvements - part one (PR #3334)
+
+Merge: e259e62941 4bfdcf0927
+Nyall Dawson 	2016-08-02
+
+    Merge pull request #3346 from nyalldawson/processing
+
+    Some processing features + fixes
+
+Nyall Dawson 	2016-08-02
+
+    Fix expected test data
+
+Nyall Dawson 	2016-08-02
+
+    Remove use of constGeometry
+
+Nyall Dawson 	2016-07-29
+
+    [FEATURE] Make processing dissolve algorithm accept multiple fields
+
+    This allows you to dissolve based on more than one field value
+
+Nyall Dawson 	2016-07-29
+
+    Make test layer comparison handle different order of features
+
+Nyall Dawson 	2016-07-29
+
+    [processing] Fix broken multi field selection widget
+
+Nyall Dawson 	2016-07-29
+
+    [processing] Fix multipart to singlepart handling of null geometry
+
+Nyall Dawson 	2016-07-29
+
+    [processing] Add test for dissolve using field values
+
+Nyall Dawson 	2016-07-29
+
+    Add processing test .aux.xml to .gitignore
+
+Nyall Dawson 	2016-07-29
+
+    [FEATURE][processing] New algorithm for merging connected lines
+
+    This algorithm joins all connected parts of MultiLineString
+    geometries into single LineString geometries.
+
+    If any parts of the input MultiLineString geometries are not
+    connected, the resultant geometry will be a MultiLineString
+    containing any lines which could be merged and any non-connected
+    line parts.
+
+Merge: f7a3fd7368 b7ca001c9c
+Nyall Dawson 	2016-08-02
+
+    Merge pull request #3349 from nyalldawson/feature_geom
+
+    Mega API break - fix QgsFeature geometry getters/setters
+
+Nyall Dawson 	2016-08-02
+
+    Add __nonzero__ and __bool__ methods to QgsGeometry
+
+Nyall Dawson 	2016-08-02
+
+    Add missing docs
+
+Martin Dobias 	2016-08-01
+
+    Added note about api break
+
+Martin Dobias 	2016-08-01
+
+    Fix doc coverage test for "added in XXX" check
+
+Merge: ea0f4da58c 4649e52cad
+Tom Kralidis 	2016-08-01
+
+    Merge pull request #3348 from tomkralidis/fix-requests-dep
+
+    ensure python-requests is available in the build
+
+Matthias Kuhn 	2016-08-01
+
+    Sort attribute table by value for numerical columns
+
+    Fix #15318
+    Fix #15295
+
+Nyall Dawson 	2016-08-01
+
+    Make all QgsGeometry methods return values, not pointers
+
+    Reduces likelihood of crashes and leaks
+
+Alexander Bruy 	2016-08-01
+
+    [processing] don't apply additional parameter if offset curve operation is used (fix #15342)
+
+Tom Kralidis 	2016-07-31
+
+    ensure python-requests is available in the build
+
+Alexander Bruy 	2016-08-01
+
+    [processing] add missed import (fix #15359)
+
+Matthias Kuhn 	2016-07-22
+
+    Rename visibility presets to map themes
+
+    Because it is not only more descriptive for what it does but also
+    sounds more interesting.
+
+    [needs-docs]
+
+Nyall Dawson 	2016-08-01
+
+    Refine QgsFeature geometry getters/setters
+
+    All pointer based methods have been removed.
+
+    Now we have only:
+
+      void setGeometry( const QgsGeometry& geom )
+
+    and
+
+      QgsGeometry geometry() const
+
+    Benefits include avoiding a whole lot of tricky pointer lifetime
+    issues, potential memory leaks, and finally closing #777, which
+    has survived for over 9 years!...
+
+    Impacts on PyQGIS code:
+    - no more need for the messy
+      g = QgsGeometry( feature.geometry() )
+      workaround, just use g = feature.geometry() instead
+    - IMPORTANT: you can no longer test whether a feature has geometry
+     using `if f.geometry():`, since QgsFeature::geometry() will
+     *always* return an object. Instead, use
+     `if not f.geometry().isEmpty():`, or preferably the new method
+     `if not f.hasGeometry():`
+
+    Fix #777
+
+radosuav 	2016-08-01
+
+    [Processing] Fix exception on right click ToolboxAction (#3347)
+
+Harrissou Sant-anna 	2016-07-31
+
+    fix typo in api docs (#3345)
+
+Nyall Dawson 	2016-07-31
+
+    QgsFeature cleanup, part 1
+
+    Deprecate some QgsFeature methods which take or return pointers,
+    update other classes as required
+
+Nathan 	2016-07-30
+
+    Swtich to ~/.qgis-dev for user folder
+
+    Avoids errors on QGIS 2.x API plugins now we have broken
+    API in for 3.x
+
+Merge: d87f2abf56 58856fe82f
+Nyall Dawson 	2016-07-29
+
+    Merge pull request #3335 from nyalldawson/vector_layer
+
+    QgsVectorDataProvider::Capability improvements
+
+Merge: 7f6bae1f5e 10c92394e7
+Nyall Dawson 	2016-07-29
+
+    Merge pull request #3344 from nyalldawson/line_merge
+
+    [FEATURE] API + expression function for merging linestrings
+
+Alexander Bruy 	2016-07-28
+
+    [processing] use '-te_crs' parameter only if supported by GDAL
+
+Alexander Bruy 	2016-07-28
+
+    [GdalTools] add missed signals (fix #15348)
+    follow up 9db908ccbc
+
+Nyall Dawson 	2016-07-28
+
+    [FEATURE] API + expression function for merging linestrings
+
+    Adds a new method to QgsGeometry for merging linestrings.
+    By passing a multilinestring, any connected lines will
+    be joined into single linestrings. Behind the scenes this
+    uses GEOS' line merge.
+
+    A corresponding expression function "line_merge" has also
+    been added.
+
+Merge: 27697e6efc 6bd15ff79e
+Nyall Dawson 	2016-07-28
+
+    Merge pull request #3343 from nirvn/statusbar_imp
+
+    [gui] gray lock icon, and flat style for extent button
+
+nirvn 	2016-07-28
+
+    [gui] gray lock icon, and flat style for extent button
+
+Nyall Dawson 	2016-07-28
+
+    Improve polygon perimeter labeling
+
+    This commit changes the way polygon perimeter labeling works.
+    Previously the polygon would be clipped to the view extent, and
+    then the boundary of the clipped polygon used for perimeter
+    labeling.
+
+    This tended to push the labels to the outside of the map extent
+    (the clip boundary), since that's the longest straight section
+    of the resultant geometry.
+
+    Now, the boundary is taken *before* the clip, so that perimeter
+    based labels will never be placed on the artificial boundary
+    created at the map's extent.
+
+Merge: d3af8a1ed6 1a4ceb1680
+Nyall Dawson 	2016-07-28
+
+    Merge pull request #3341 from nyalldawson/boundary
+
+    New method for calculating geometry boundary
+
+Nyall Dawson 	2016-07-28
+
+    [FEATURE] Expression function for calculating geometry boundary
+
+    The new 'boundary(...)' function returns a geometry's topological
+    boundary, ie for polygons this is a multilinestring representing
+    the polygons rings
+
+Nyall Dawson 	2016-07-27
+
+    Add method to QgsAbstractGeometryV2 for boundary
+
+    Returns the closure of the combinatorial boundary of the
+    geometry (ie the topological boundary of the geometry).
+    For instance, a polygon geometry will have a boundary
+    consisting of the linestrings for each ring in the polygon.
+
+    Follows OGC / SQL/MM specs for boundary calculation
+
+Merge: ee09131df8 6c6f279044
+Tom Kralidis 	2016-07-27
+
+    Merge pull request #3336 from tomkralidis/owslib-0.11.2
+
+    upgrade OWSLib to 0.11.2
+
+Nyall Dawson 	2016-07-27
+
+    Revert "Bump default number of label candidates"
+
+    AKA f***ing label tests!!!
+
+    This reverts commit cd22d4fbc3962ee6772fde588b34c9a2efdc1f3a.
+
+Nyall Dawson 	2016-07-27
+
+    Revert "Default to cartographic label placement for point layers"
+
+    This reverts commit e0609d675af69ea6d90477456ff4561bd95fa9e6.
+
+Nyall Dawson 	2016-07-27
+
+    Default to cartographic label placement for point layers
+
+    It's much nicer than "around point"
+
+Nyall Dawson 	2016-07-27
+
+    Bump default number of label candidates
+
+    Results in much nicer label placement and little to no speed
+    regression in most cases
+
+Nyall Dawson 	2016-07-27
+
+    [FEATURE] Label polygons using curved labels along perimeter
+
+    This adds a new mode for labeling polygons, where the perimeter
+    of the polygon is labeled using curved labeling.
+
+Frits van Veen 	2016-07-26
+
+    Fix labeling using perimeter with repeating label distance set
+
+    If the visible part of a polygon is clipped and becomes a multipolygon, only
+    one label is plotted on the wrong side of the polygon.
+
+    Settings:
+    Placement: Using Perimeter
+    Allowed positions: Below line / Line orientation dependent position checked
+    Repeat: 100 mm
+
+    Fix #15341
+
+Nyall Dawson 	2016-07-27
+
+    Fix map not refreshed after using pan to selected (fix #15324)
+
+Merge: 6c0d97a06b 4a3924ca3f
+Nyall Dawson 	2016-07-27
+
+    Merge pull request #3332 from nyalldawson/transform2
+
+    Remove the extra QgsCoordinateTransform constructors
+
+Merge: 3d6688cce5 ba26bc887a
+Nyall Dawson 	2016-07-27
+
+    Merge pull request #3337 from nyalldawson/remove_psuedo_shader
+
+    Remove the broken, unused QgsPseudoColorShader class
+
+Nyall Dawson 	2016-07-24
+
+    Remove the extra QgsCoordinateTransform constructors
+
+    ...and leave only:
+
+    QgsCoordinateTransform( const QgsCoordinateReferenceSystem& source,
+                            const QgsCoordinateReferenceSystem& destination );
+
+    The other constructors were not used anyway in QGIS code,
+    had awkward/confusing API, and no unit tests.
+
+Nyall Dawson 	2016-07-20
+
+    Add labeling tests for letter/word spacing
+
+Nyall Dawson 	2016-07-26
+
+    Update curved label test reference images
+
+Nyall Dawson 	2016-07-26
+
+    [labels] Fix word and letter spacing truncated to integers
+
+Frits van Veen 	2016-07-17
+
+    [labeling] Curved labels are now angled per character
+
+    ...instead of shifted along base line (fix #15210)
+
+Merge: b3a38f4018 c1cdfe860d
+rldhont 	2016-07-26
+
+    Merge pull request #3322 from rldhont/db_manager_update_sql_layer
+
+    [DB Manager] Add the ability to update SQL Layer
+
+Alexander Bruy 	2016-07-26
+
+    [processing] fix issues with exported layers in GDAL provider
+
+Alexander Bruy 	2016-07-26
+
+    [processing] fix condition in warp alg
+
+Juergen E. Fischer 	2016-07-26
+
+    fix build (followup f6b09ea)
+
+Nyall Dawson 	2016-07-26
+
+    Fix text annotation edit background should match frame background
+
+    Otherwise white text is not visible. Fix #10553.
+
+Merge: 68b621ace6 1e9274adbb
+Nyall Dawson 	2016-07-26
+
+    Merge pull request #3329 from nyalldawson/annotations
+
+    Add an interface class for annotations, remove some hacks
+
+Merge: 156c09880b 813ed5e96f
+Nyall Dawson 	2016-07-26
+
+    Merge pull request #3314 from nyalldawson/units
+
+    Consolidate unit handling in QgsUnitTypes
+
+Nyall Dawson 	2016-07-26
+
+    Docs
+
+Nyall Dawson 	2016-07-23
+
+    Fix annotation position when maps are rotated, remove hacks
+
+    Adds a new interface class QgsAnnotation, and allows for removal
+    of a bunch of hacks in QgsComposerMap without breaking 2.x API
+
+Nyall Dawson 	2016-07-26
+
+    Remove the broken, unused QgsPseudoColorShader class
+
+Nyall Dawson 	2016-07-26
+
+    Add missing docs
+
+Nyall Dawson 	2016-07-26
+
+    Mark some QgsUnitType arguments as /Out/
+
+Nyall Dawson 	2016-07-25
+
+    Add Distance*, Area*, Angle* prefixes to QgsUnitTypes enum values
+
+Alexander Bruy 	2016-07-25
+
+    [plugin manager] mark installed plugins as trusted (fix #15338)
+
+Tom Kralidis 	2016-07-25
+
+    upgrade OWSLib to 0.11.2
+
+Alexander Bruy 	2016-07-25
+
+    [processing] fix dialog title
+
+Alexander Bruy 	2016-07-25
+
+    [processing] always use user-defined default folder for scripts/models
+
+Alexander Bruy 	2016-07-25
+
+    [processing] use default models folder when adding model from file (fix #15335)
+
+Alexander Bruy 	2016-07-25
+
+    [processing] different shortcut for commander (fix #15334)
+
+Nyall Dawson 	2016-07-25
+
+    Remove some unneeded qgssymbolv2.h includes
+
+Nyall Dawson 	2016-07-18
+
+    Add missing docs
+
+Nyall Dawson 	2016-07-17
+
+    Remove QgsSymbolLayerV2Utils::encodeOutputUnit() and decodeOutputUnit()
+
+    QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should
+    be used instead.
+
+Nyall Dawson 	2016-07-17
+
+    Move QgsSymbolV2::OutputUnit enum to QgsUnitTypes
+
+    And rename to QgsUnitTypes::RenderUnits. This enum is used in
+    much more contexts than just symbols, so QgsUnitTypes is a
+    better fit for it.
+
+    All methods which previously accepted QgsSymbolV2::OutputUnit
+    parameters or QgsSymbolV2::OutputUnitList parameters now take
+    QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList
+    parameters respectively.
+
+Nyall Dawson 	2016-07-17
+
+    Move QGis::UnitType to QgsUnitTypes::DistanceUnit
+
+    This change consolidates more unit handling and conversion into
+    QgsUnitTypes.
+
+    Additionally, UnknownUnit was renamed to UnknownDistanceUnit.
+    All methods which accepted QGis::UnitType parameters have been
+    updated to take QgsUnitTypes::DistanceUnit instead.
+
+    ALso remove the unit handling methods toLiteral, fromLiteral, tr,
+    fromTr, and fromUnitToUnitFactor from QGis. Their corresponding
+    counterparts in QgsUnitTypes should be used instead.
+
+Nyall Dawson 	2016-07-17
+
+    Remove deprecated units from QGis
+
+    - DecimalDegrees
+    - DegreesMinutesSeconds
+    - DegreesDecimalMinutes
+
+    all these were replaced long ago by QGis::Degrees
+
+Nyall Dawson 	2016-07-25
+
+    Remove some deprecated QgsVectorDataProvider::Capabilities
+
+    Also make capabilities() return a QFlags
+    QgsVectorDataProvider::Capabilities, rather than an integer
+    value (for type safety)
+
+Merge: 2b8b979216 6dac8e18bd
+Nyall Dawson 	2016-07-25
+
+    Merge pull request #3331 from nyalldawson/crs
+
+    QgsCoordinateReferenceSystem - API fixes + internal caching
+
+Nyall Dawson 	2016-07-25
+
+    Clean up handling of inverted axis for CRS, fix detachment issue
+
+Nyall Dawson 	2016-07-24
+
+    Remove QgsCRSCache
+
+    No longer required now that QgsCoordinateReferenceSystem
+    internally uses caches for CRS initialization.
+
+Martin Dobias 	2016-07-25
+
+    One more try to make PyQgsDocCoverage happy
+
+Nyall Dawson 	2016-07-23
+
+    Make QgsCoordinateReferenceSystem use an internal cache
+    for initializing CRS objects.
+
+    This avoids the need for the separate QgsCRSCache class,
+    and means that the caching benefits are available without the
+    need for calling methods from QgsCrsCache.
+
+Nyall Dawson 	2016-07-23
+
+    Add some static methods for creating QgsCoordinateReferenceSystem
+
+    This avoids the need for
+
+      QgsCoordinateReferenceSystem crs;
+      crs.createFromSrsId(...)
+
+    and instead can be replaced with
+
+      QgsCoordinateReferenceSystem crs = QgsCoordinateReferenceSystem::fromSrsId(...)
+
+Nyall Dawson 	2016-07-23
+
+    Rename some QgsCoordinateReferenceSystem methods
+
+    - geographicFlag() -> isGeographic()
+    - axisInverted() -> hasAxisInverted()
+
+Martin Dobias 	2016-07-25
+
+    Added "added" note
+
+Martin Dobias 	2016-07-25
+
+    Final fixes for tests
+
+Martin Dobias 	2016-07-24
+
+    Fix the build
+
+Martin Dobias 	2016-07-24
+
+    Finally add forgotten SIP file
+
+Martin Dobias 	2016-07-23
+
+    Code for cancellation of raster reading with GDAL 2 - disabled for now
+
+    There are still some questions around it and I need to find some data
+    for thorough testing (many GDAL drivers do not support cancellation)
+
+Martin Dobias 	2016-07-23
+
+    Make sure that backtrace dump from multiple threads does not cause deadlocks
+
+Martin Dobias 	2016-07-22
+
+    [FEATURE] Ability to cancel rendering of rasters + WMS/WCS support
+
+    The improvement allows immediate cancellation of raster rendering
+    in progress. Until now, even when map rendering got cancelled
+    (e.g. by zooming of panning canvas), the GUI got blocked while waiting
+    for raster layers to finish their rendering (only vector layers have
+    had support for cancellation). This should allow for much smoother
+    user experience while browsing maps including rasters.
+
+    The cancellation is supported currently by WMS/WMTS and WCS providers.
+    GDAL provider may also get support thanks to improvements in GDAL 2.
+
+    Funded by Land Information New Zealand.
+
+Juergen E. Fischer 	2016-07-24
+
+    fix build
+
+Martin Dobias 	2016-07-24
+
+    Wrap QgsMapCanvasMap in PRIVATE condition to avoid sip/doc testing
+
+Martin Dobias 	2016-07-24
+
+    Goodbye to QgsMapRenderer  (#3333)
+
+    For the time being the class is kept in the server code while it is still being used there.
+
+Juergen E. Fischer 	2016-07-24
+
+    update splash
+
+Juergen E. Fischer 	2016-07-23
+
+    oracle provider: fix binding of output values
+
+Matthias Kuhn 	2016-07-23
+
+    Pass enums by value
+
+Matthias Kuhn 	2016-07-22
+
+    Miss fixing docs
+
+Matthias Kuhn 	2016-07-22
+
+    Fix inadequate usage of nullptr
+
+Juergen E. Fischer 	2016-07-22
+
+    more QGis -> QGis renames
+
+    git grep -l "QGis::" src/ | xargs perl -pe "s/QGis::/Qgis::/g" -i.bak
+
+Juergen E. Fischer 	2016-07-22
+
+    fix build
+
+Alexander Bruy 	2016-07-22
+
+    [processing] also fix case without dissolving
+
+Alexander Bruy 	2016-07-22
+
+    [processing] fix buffer tool
+
+Juergen E. Fischer 	2016-07-22
+
+    debian packing build with webkit on xenial
+
+Merge: 39da9d1402 8f203c9a87
+Nyall Dawson 	2016-07-22
+
+    Merge pull request #3324 from nyalldawson/qgis
+
+    QGis class rename and cleanup
+
+Nyall Dawson 	2016-07-22
+
+    Allow shift-drag zooming with touch tool
+
+Nyall Dawson 	2016-07-22
+
+    Use closed hand cursor when dragging canvas with middle mouse button
+
+Nyall Dawson 	2016-07-22
+
+    Make filename in project properties a readonly line edit
+
+    (Because it's nice to be able to copy the project path easily)
+
+Nyall Dawson 	2016-07-22
+
+    Fix annotation colors are modified when cancel is clicked
+
+Nyall Dawson 	2016-07-21
+
+    Add apply buttons to annotation dialogs
+
+Nyall Dawson 	2016-07-22
+
+    Avoid dialog 'flashing' when opening annotation properties
+
+Nyall Dawson 	2016-07-22
+
+    Always keep full precision when saving annotation properties
+
+Nyall Dawson 	2016-07-22
+
+    [composer] Fix position of annotations in rotated maps
+
+    (AKA "stack some hacks on top of existing hacks")
+
+Nyall Dawson 	2016-07-22
+
+    [FEATURE] Add an option to show user color schemes menus
+
+    This adds the ability for users to set whether a user created
+    color scheme should show up in the color button drop-down menus.
+
+    It's accessed through the color picker dialog, on the lists tab.
+    Just add a new color scheme, then from the scheme menu tick the
+    new "show in buttons" option.
+
+    Handy if you have sets of common palettes and want them to be
+    instantly available through the color menu.
+
+Nyall Dawson 	2016-07-21
+
+    Remove some unused constants
+
+Even Rouault 	2016-07-21
+
+    Try another method to avoid XML serialization issues with QT5 (#3323)
+
+Nyall Dawson 	2016-07-21
+
+    Move some methods out of Qgis class
+
+Nyall Dawson 	2016-07-21
+
+    Rename QGis class to Qgis, for capitalisation consistency
+
+Juergen E. Fischer 	2016-07-21
+
+    doc/TRANSLATORS in an output file (followup 156db22)
+
+Nyall Dawson 	2016-07-21
+
+    Move field contraint config widgets into a group box
+
+Nyall Dawson 	2016-07-21
+
+    Remove deprecated labeling tab
+
+volaya 	2016-07-21
+
+    [processing] use SilentProgress by default if no progress object is passed
+
+volaya 	2016-07-21
+
+    [processing] changed saga decorated group name
+
+Harrissou Sant-anna 	2016-07-21
+
+    Replace nicknames by real names (#3287)
+
+Merge: 44c8680b00 2685a90397
+Nyall Dawson 	2016-07-21
+
+    Merge pull request #3319 from nyalldawson/consistency
+
+    Make API naming more consistent
+
+Nyall Dawson 	2016-07-19
+
+    Make doc coverage test acceptable list case insensitive
+
+Nyall Dawson 	2016-07-19
+
+    Make API more consistent
+
+    - rename methods with XML to Xml, CRS to Crs, WMS to Wms, ID to Id
+    - rename methods with SRS to Crs
+    - rename methods with abbreviations like "dest" to "destination"
+    - rename methods with abbreviations like "src" to "source"
+
+Nyall Dawson 	2016-07-20
+
+    Remove canvas rotation option + API, now always enabled
+
+Nyall Dawson 	2016-07-20
+
+    Remove deprecated QgsDataDefinedSymbolDialog class (#3315)
+
+    It's not used anymore, and QgsDataDefinedButton should be used
+    in its place.
+
+Martin Dobias 	2016-07-20
+
+    Remove QgsLabel and QgsLabelAttributes + remove QgsPalLabeling from renderer jobs
+
+rldhont 	2016-07-20
+
+    [DB Manager] Add the ability to update SQL Layer
+
+Nyall Dawson 	2016-07-20
+
+    Revert "Fix label word and letter spacing cannot be decimals"
+
+    This reverts commit 48f090ca79f0d2d9ae341ae3617f20b2fe3fe14f.
+
+    Causes issues with font sizes/spacing
+
+Nyall Dawson 	2016-07-20
+
+    Revert "[labeling] Curved labels are now angled per character"
+
+    This reverts commit f6d07a33b71a9b19579d19dadbe777b1f14c6842.
+
+Nyall Dawson 	2016-07-20
+
+    Revert "Update labeling reference images"
+
+    This reverts commit 1aec78145f7553ca62584a9bb626b8a531a01a8e.
+
+Nyall Dawson 	2016-07-20
+
+    Revert "Add labeling tests for letter/word spacing"
+
+    This reverts commit 9dfdfc645f327b38ef90974751104c4b1523736e.
+
+Nyall Dawson 	2016-07-20
+
+    Fix features are not labeled when using merged connected lines and
+    lines are touching but not at endpoints
+
+Nyall Dawson 	2016-07-20
+
+    Add labeling tests for letter/word spacing
+
+Nyall Dawson 	2016-07-19
+
+    Update labeling reference images
+
+Frits van Veen 	2016-07-17
+
+    [labeling] Curved labels are now angled per character
+
+    ...instead of shifted along base line (fix #15210)
+
+Nyall Dawson 	2016-07-08
+
+    Fix label word and letter spacing cannot be decimals
+
+Nyall Dawson 	2016-07-20
+
+    [composer] Fix editing of map item variables
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Radim Blazek 	2016-07-19
+
+    [GRASS] 7.1 versions of t.rast.what.*
+
+Radim Blazek 	2016-07-19
+
+    fixed python scripts indentation
+
+Merge: 3142c846e5 3608799b04
+Radim Blazek 	2016-07-19
+
+    Merge pull request #3164 from NINAnor/add_grass_tools
+
+    New modules for the GRASS plugin
+
+Juergen E. Fischer 	2016-07-19
+
+    fix windows build and some warnings
+
+Matthias Kuhn 	2016-07-19
+
+    Fix build
+
+Matthias Kuhn 	2016-07-14
+
+    Add methods to vectorlayercache and tests
+
+Matthias Kuhn 	2016-07-14
+
+    Add shorthands to get features by fid, fids and expression
+
+    Adds new methods overloads to QgsVectorLayer
+
+      getFeatures( expression )
+      getFeatures( ids )
+      getFeature( id )
+
+    These three methods to query features are by far the most used ones
+    and with this patch it is much easier to write and read code.
+
+Nyall Dawson 	2016-07-19
+
+    [composer] Load all composition properties from template/duplicate
+
+    Previously some settings where not being correctly restore, eg
+    page size, grid settings, expression variables
+
+    On behalf of Faunalia, sponsored by ENEL
+
+    Fix #8705
+
+Nyall Dawson 	2016-07-19
+
+    [composer] Simplify and consolidate loading of templates
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-07-19
+
+    Add missing function help (fix #15264)
+
+Nyall Dawson 	2016-07-19
+
+    Make sure variable editor widgets always show current variables
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-07-19
+
+    Correctly sort identify results when url links are shown
+
+Nyall Dawson 	2016-07-12
+
+    Replace QgsNumericSortTreeWidgetItem with upgraded QgsTreeWidgetItem
+
+    QgsNumericSortTreeWidgetItem had a giant TODO saying "make it work".
+    This makes it work, and adds some other useful features like
+    being able to specify custom sort value and force items to always
+    sort on top.
+
+Nyall Dawson 	2016-07-19
+
+    [composer] Avoid crash when atlas page name field has spaces
+
+    Fix #15297
+
+Merge: cca4e32e70 7352df6935
+Nyall Dawson 	2016-07-19
+
+    Merge pull request #3309 from nirvn/html_label_fix
+
+    [composer] fix html label stylesheet's margin (fixes #15290)
+
+Nyall Dawson 	2016-07-19
+
+    Fix doxygen for QgsAttributeTableConfig
+
+Nyall Dawson 	2016-07-19
+
+    Use flat style for scale lock button
+
+Nyall Dawson 	2016-07-19
+
+    Remove "restart required" from "open table as dock" option
+
+    Since it seems that a restart *isn't* required!
+
+Nyall Dawson 	2016-07-19
+
+    Fix build
+
+Martin Dobias 	2016-07-19
+
+    Improve QgsCoordinateReferenceSystem API documentation (#3311)
+
+Juergen E. Fischer 	2016-07-18
+
+    update after QgsMapLayer layerNameChanged => nameChanged signal rename
+
+Merge: c628c0f434 20a2a20025
+Alexander Bruy 	2016-07-18
+
+    Merge pull request #3316 from akbargumbira/master
+
+    [processing] fix add script from file
+
+Akbar Gumbira 	2016-07-18
+
+    [processing] Fix add script from file.
+
+Nyall Dawson 	2016-07-18
+
+    Rework includes to forward declare as much as possible
+
+    Should speed up recompilation when headers change
+
+Merge: a0bfc4c99e 872cfb7825
+Stéphane Brunner 	2016-07-18
+
+    Merge pull request #3140 from sbrunner/fix-cache-host
+
+    Have a capabilities cache per hostname
+
+volaya 	2016-07-18
+
+    [processing] do not remove menus when exiting config dialog
+
+Merge: cd3f54057d e6df492fdb
+Nyall Dawson 	2016-07-17
+
+    Merge pull request #3312 from nyalldawson/transfer
+
+    Make QgsCoordinateTransform implicitly shared, no longer a QObject
+
+Nyall Dawson 	2016-07-17
+
+    Add missing docs, refine docs for QgsCoordinateTransform
+
+Nyall Dawson 	2016-07-16
+
+    Avoid all use of QgsCoordinateTransform pointers, replace with
+    copies or references
+
+    Makes the code more robust, fixes leaks and avoids potential
+    null pointer dereferencing
+
+Nyall Dawson 	2016-07-16
+
+    API breaks and cleanups for QgsCoordinateTransform
+
+    - isInitialised() has been renamed to isValid()
+    - theCRS parameter in setSourceCrs has been renamed to 'crs'
+    - setDestCRS() has been renamed to setDestinationCrs() for consistency
+    - destCRS() has been renamed to destinationCrs() for consistency
+    - theSource, theDest, theSourceSrsId, theDestSrsId, theSourceWkt,
+    theDestWkt, theSourceCRSType parameters in the QgsCoordinateTransform
+    constructors have been renamed to source, destination, sourceSrsId,
+    destinationSrsId, sourceWkt, destinationWkt, sourceCrsType respectively
+    - 'p' argument in transform() has been renamed to 'point', 'theRect' to
+    'rectangle', 'poly' to 'polygon'
+    - setDestCRSID has been removed, use setDestinationCrs() instead
+    - 'theNode', 'theDoc' parameters in readXML and writeXML have been
+    renamed to 'node' and 'document' respectively
+    - readXML() and writeXML() have been renamed to readXml() and writeXml()
+    for consistency
+
+Nyall Dawson 	2016-07-16
+
+    Fix build
+
+Nyall Dawson 	2016-07-16
+
+    Remove QgsCoordinateTransform::clone()
+
+    Just use direct copies instead
+
+nirvn 	2016-07-15
+
+    [composer] fix html label stylesheet's margin (fixes #15290)
+
+Nyall Dawson 	2016-07-16
+
+    Make QgsCoordinateTransform implicitly shared, no longer a QObject
+
+    There was no code in core using the signals/slots associated with
+    QgsCoordinateTransform, and little reason to keep the class a
+    QObject. Making it not a QObject simplifies code and allows
+    QgsCoordinateTransform objects to be easily copied and passed
+    around without complication.
+
+Juergen E. Fischer 	2016-07-15
+
+    creatensis.pl: use version number instead of release name for installation path
+
+    (cherry picked from commit 87843120c52777cd15d8af0e7eee99f682e6049e)
+
+Juergen E. Fischer 	2016-07-15
+
+    oracle provider: update for 1bafa80 and e683101
+
+Nyall Dawson 	2016-07-15
+
+    Fix test under Python 3
+
+Merge: 21eab8c2ea 93db165ae9
+mhugent 	2016-07-15
+
+    Merge pull request #3308 from mhugent/pan_to_feature
+
+    [FEATURE]: pan to current feature in attribute table
+
+Marco Hugentobler 	2016-07-15
+
+    Api doc for parameter
+
+Nyall Dawson 	2016-07-15
+
+    Add missing docs
+
+Nyall Dawson 	2016-07-15
+
+    Rename edit buffer methods to is..., add tests
+
+Nyall Dawson 	2016-07-15
+
+    Fix build
+
+Nyall Dawson 	2016-07-11
+
+    Const correctness for QgsVectorLayer methods
+
+Nyall Dawson 	2016-07-11
+
+    Make QgsMapLayer::metadata() const
+
+Nyall Dawson 	2016-07-11
+
+    Cleanup QgsMapLayer for 3.0
+
+    - implement QGIS 3.0 TODOs
+    - mark methods as const correct
+    - rename 'the...' parameters to remove 'the'
+    - mark QgsVectorLayer::getFeatures as const
+
+Nyall Dawson 	2016-07-11
+
+    Make QgsVectorLayerEditBuffer methods const correct
+
+    Also add some optimisations to avoid iterations over all
+    contents of the buffers
+
+Nyall Dawson 	2016-07-11
+
+    Remove deprecated members from QgsMapLayer
+
+Nyall Dawson 	2016-07-11
+
+    Fix most remaining methods which return a reference to
+    QgsCoordinateReferenceSystem or which take a pointer to a
+    CRS
+
+Nyall Dawson 	2016-07-11
+
+    QgsMapLayer::crs() now returns a copy, not a reference
+
+    (desirable because QgsCoordinateReferenceSystem is implicitly shared)
+
+Nyall Dawson 	2016-07-11
+
+    Make QgsVectorLayerImport use QgsCoordinateReferenceSystem
+    references, not pointers
+
+Nyall Dawson 	2016-07-10
+
+    Make QgsVectorDataProvider::fields() return a copy
+
+    Implements a QGIS 3.0 TODO
+
+Nyall Dawson 	2016-07-10
+
+    Const correctness for numerous data provider methods
+
+Nyall Dawson 	2016-07-08
+
+    Use reference rather than pointer for crs in QgsVectorFileWriter
+
+    Since QgsCoordinateReferenceSystem is implicitly shared, it's a
+    safer approach
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Re-add explicit refresh when changing extent in QgsGeometryCheckerResultTab::highlightErrors
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Fix result table corruption when adding newly found errors
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Fix incorrect QgsGeometryCheckerUtils::filter1DTypes
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Trigger repaint instead of explicit refresh
+
+Sandro Mani 	2016-07-14
+
+    [Geometry snapper] Trigger repaint instead of explicit refresh
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Fix possible data provider errors due to referring to deleted features
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Remove redundant include
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Ignore zero-length edges when searching for shared edges
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Don't make minimal angle fix produce duplicate nodes
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Clear rubberbands when disabling result tab
+
+Marco Hugentobler 	2016-07-14
+
+    Update sip binding
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] If fixing an error produced changes, treat newly detected errors which are the same as the error fixed as actual new errors
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Fix possible crash when checking for removed layer
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] Guard against producing degenerate geometries
+
+Sandro Mani 	2016-07-14
+
+    [Geometry checker] QgsGeomUtils -> QgsGeometryCheckerUtils
+
+Marco Hugentobler 	2016-07-14
+
+    [FEATURE]: pan to current feature in attribute table
+
+Matthias Kuhn 	2016-07-14
+
+    Reclassify debug messages while rendering
+
+Nyall Dawson 	2016-07-14
+
+    Fix crash in QgsGeometry::unaryUnion with empty geometries
+
+Nyall Dawson 	2016-07-14
+
+    [processing] Add tests for clip algorithm
+
+Sandro Mani 	2016-07-13
+
+    [Geometry snapper] Don't delete vertices if this would result in a degenerate geometry
+
+Merge: 7f2bdcf342 05ced6797d
+Nyall Dawson 	2016-07-14
+
+    Merge pull request #3303 from nyalldawson/identify_url
+
+    Make links in identify results clickable
+
+Nyall Dawson 	2016-07-14
+
+    Update legend test masks, fix for PyQt5
+
+Matthias Kuhn 	2016-07-13
+
+    Followup 2675c4248
+
+Matthias Kuhn 	2016-07-13
+
+    Don't warn for "System" codec not found
+
+    No need to reload a codec that just has not been found. And no reason to
+    warn the user because in the end we will return the system codec
+    obtained by a different method in any case.
+
+Merge: 76e55ce72e efb2be2a39
+Sandro Mani 	2016-07-13
+
+    Merge pull request #3301 from Gustry/qscintilla
+
+    add qscintilla to cmakelists
+
+Martin Dobias 	2016-07-13
+
+    Improve the way how fake events are generated in CAD tools (#3302)
+
+    In my custom tool in python, the generated fake event received in cadCanvasMoveEvent()
+    was actually QMouseEvent instance instead of QgsMapMouseEvent, suggesting something
+    dodgy going on behind the scenes. The actual reason was that first argument was
+    QMouseEvent::Move instead of QEvent::MouseMove (not sure why the cast did not work though)
+
+    The new approach seems safer as the event goes through the ordinary event processing
+
+Nyall Dawson 	2016-07-13
+
+    Fix use of : in label (violation of HIG)
+
+Nyall Dawson 	2016-07-13
+
+    [composer] Add a checkbox for legends to prevent automatic resizing
+
+    A new checkbox has been added to the legend settings to control
+    whether or not a legend should be automatically resized to fit
+    its contents.
+
+    If unchecked, then the legend will never resize and instead just
+    stick to whatever size the user has set. Any content which
+    doesn't fit the size is cropped out.
+
+    Refs #10556
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-07-12
+
+    [composer] Fix setting legend content by map not resizing legend
+
+    When a legend was set to filter content by map, it wasn't
+    consistently being resized to fit the legend contents. This caused
+    issues for atlas exports where legends could grow but never
+    shrink.
+
+    Fix #14707
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-07-12
+
+    [composer] Fix initial size of legend is wrong if symbol size in
+    map units is used (fix #11921)
+
+    On behalf of Faunalia, sponsored by ENEL
+
+Nyall Dawson 	2016-07-11
+
+    Followups and fixes to identify results linking
+
+Merge: f34c79c04b 9e1ddcb54d
+volaya 	2016-07-13
+
+    Merge pull request #3305 from nyalldawson/processing_get_features
+
+    [processing] Allow modification of feature request when using vector.features
+
+Nyall Dawson 	2016-07-13
+
+    [processing] Allow modification of feature request when using
+    vector.features
+
+    Allows for optimising the request through subsets of attributes
+    or no geometry fetching
+
+Sandro Mani 	2015-09-03
+
+    [FEATURE] Make links in feature identify results clickable
+
+Matthias Kuhn 	2016-07-12
+
+    Use Q_FOREACH
+
+Matthias Kuhn 	2016-07-12
+
+    [server] Fix crash in WMS server when... bad things happen
+
+    No idea what exactly the reason is, and it was only discovered by
+    countless hours of printf-debugging. So I'm just pushing the fix
+    for everyone else who might be affected.
+
+Matthias Kuhn 	2016-07-12
+
+    Fix single process build
+
+    A race condition triggered that sometimes the file
+    output/python/qgis/__init__.py was not created before a python uic
+    compiler started and therefore the required module could not be
+    imported.
+
+    This leads to errors like
+
+    [ 82%] Generating ui_dialogAbout.py
+    Traceback (most recent call last):
+      File "../../../../../scripts/pyuic-wrapper.py", line 26, in 
+        import qgis.PyQt.uic.pyuic
+    ImportError: No module named qgis.PyQt.uic.pyuic
+    python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/build.make:117:
+    recipe for target 'python/plugins/GdalTools/tools/ui_dialogAbout.py'
+    failed
+    make[2]: *** [python/plugins/GdalTools/tools/ui_dialogAbout.py] Error 1
+    CMakeFiles/Makefile2:5074: recipe for target
+    'python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all'
+    failed
+    make[1]: ***
+    [python/plugins/GdalTools/tools/CMakeFiles/zzz-GdalTools-2-depend.dir/all]
+    Error 2
+    Makefile:160: recipe for target 'all' failed
+    make: *** [all] Error 2
+
+Merge: 2ccc7e1291 b5f02e3d25
+Alessandro Pasotti 	2016-07-12
+
+    Merge pull request #3298 from elpaso/offline_editing_tests2
+
+    [offline editing] Added insert and update tests
+
+Alessandro Pasotti 	2016-07-12
+
+    [offline editing] Wait for the WFS server to stop
+
+Alessandro Pasotti 	2016-07-11
+
+    [offline editing] Added insert and update tests
+
+Nyall Dawson 	2016-07-12
+
+    [oracle] Fix potential crash on exit
+
+Nyall Dawson 	2016-07-12
+
+    Avoid some unnecessary composer legend updates
+
+Etienne Trimaille 	2016-07-12
+
+    add qscintilla to cmakelists
+
+Daan Goedkoop 	2016-07-11
+
+    Change to just not display null choice in search widget value list
+
+Daan Goedkoop 	2016-07-09
+
+    Add handling of null value in value map to search widget
+
+Matthias Kuhn 	2016-07-11
+
+    [travis] Report compiler correctly for qt5: clang
+
+Martin Dobias 	2016-07-11
+
+    Added missing & in setTitle in SIP
+
+Matthias Kuhn 	2016-07-11
+
+    [travis] Blacklist failing osx tests
+
+Matthias Kuhn 	2016-07-05
+
+    [travis] Add GRASS_PREFIX7 to osx build
+
+Matthias Kuhn 	2016-06-27
+
+    [travis] Modernize Mac OSX dependencies
+
+Merge: 2efe684d94 de6320279a
+Jürgen Fischer 	2016-07-11
+
+    Merge pull request #3296 from nirvn/splashscreen_fix
+
+    [splashscreen] fix pixelated scaling
+
+Juergen E. Fischer 	2016-07-10
+
+    fix 39d6e79
+
+    (cherry picked from commit 2f9ed29d9a5ec7fa79c7f902f036a81c43b8a2da)
+
+Nyall Dawson 	2016-07-11
+
+    Show tooltips for layer style dock labeling tabs
+
+nirvn 	2016-07-11
+
+    [splashscreen] fix pixelated scaling
+
+Merge: d3582abbf6 b08dd47091
+Nyall Dawson 	2016-07-11
+
+    Merge pull request #3294 from nyalldawson/brief_test
+
+    Add a doxygen test to ensure all classes have a brief description
+
+Nyall Dawson 	2016-07-11
+
+    [FEATURE] Mouse wheel over sliders in color dialog to change value by
+    increments
+
+Nyall Dawson 	2016-07-10
+
+    Add a doxygen test to ensure all classes have a brief description
+
+Nyall Dawson 	2016-07-11
+
+    Add missing SIP bindings
+
+Nyall Dawson 	2016-07-11
+
+    Fix minor Coverity issues
+
+Nyall Dawson 	2016-07-11
+
+    [oracle] Fix minor Coverity issues
+
+Matthias Kuhn 	2016-07-05
+
+    Create some properties on QgsProject
+
+Juergen E. Fischer 	2016-07-10
+
+    release.pl: use 99 instead of 999 for premajor minor
+
+Merge: 2eee2e5c9c 3a419c054b
+Jürgen Fischer 	2016-07-10
+
+    Merge pull request #3293 from timlinux/fix-osx-build
+
+    Fix build issue on OSX caused by minor version of 999
+
+Tim Sutton 	2016-07-10
+
+    Fix build issue on OSX caused by minor version of 999
+
+Juergen E. Fischer 	2016-07-10
+
+    fix typos and debian/copyright
+
+Juergen E. Fischer 	2016-07-10
+
+    support utf-8 encoded release names
+
+    (cherry picked from commit c9838ccea481c8ca87c4e1647099cfe78777e795)
+
+Merge: 831337c95a f5b8623012
+Jürgen Fischer 	2016-07-09
+
+    Merge pull request #3288 from sebastic/scalable-icons
+
+    Fix installation path of scalable icons.
+
+Bas Couwenberg 	2016-07-09
+
+    Fix installation path of scalable icons.
+
+Matthias Kuhn 	2016-07-09
+
+    Initialize variables
+
+    Coverity fixe
+
+Matteo 	2016-07-09
+
+    Just added a new person to the contrib map and list (#3285)
+
+    * Add Me in the map
+
+    * Add Me in the contrib list
+
+Alexandre Neto 	2016-07-09
+
+    Add current documentation contributers (#3283)
+
+    Alexandre Neto,
+    Harrissou Sant-anna
+    Yves Jacolin
+
+Matthias Kuhn 	2016-07-09
+
+    Shutup build warning with Qt 5.6
+
+Daan Goedkoop 	2016-07-09
+
+    Add null handling to value map edit widget (fixes #15215) (#3274)
+
+    * Add null handling to value map edit widget (fixes #15215)
+
+    * Return QVariant type
+
+    * Use hardcoded value for 'null' representation
+
+    * Detect "null" value when loading value map from csv; use null QString constructor
+
+    * Use configured "null" representation for display in value map
+
+    * Use single definition for value map null representation guid
+
+    * Added unit test for value map widget and fixed value displaying bug
+
+Juergen E. Fischer 	2016-07-08
+
+    Bump version to 2.999
+
+Juergen E. Fischer 	2016-07-08
+
+    changelog and news update for 2.16
+
 Juergen E. Fischer 	2016-07-08
 
     translation update for 2.16 from transifex
@@ -54,7 +66381,7 @@ Nathan 	2016-07-08
 
     [style dock] Add tooltips
 
-Merge: 326786b 2ac9ad5
+Merge: 326786b499 2ac9ad55bd
 Nyall Dawson 	2016-07-08
 
     Merge pull request #3279 from ahuarte47/Issue_MeasureDialog_2
@@ -94,7 +66421,7 @@ Matthias Kuhn 	2016-07-07
     Fix #15096
     And aligns some edge-cases of sort behavior
 
-Merge: 564c02e 2257d71
+Merge: 564c02e93f 2257d711ed
 Hugo Mercier 	2016-07-07
 
     Merge pull request #3278 from mhugo/master
@@ -172,7 +66499,7 @@ Martin Dobias 	2016-07-06
 
     Fix undo/redo for rule-based renderer/labeling in styling dock
 
-Merge: 3e183a2 4057c3a
+Merge: 3e183a27d5 4057c3a6b4
 Nyall Dawson 	2016-07-07
 
     Merge pull request #3261 from ahuarte47/Issue_DestinationCrsChanged
@@ -283,7 +66610,7 @@ Nyall Dawson 	2016-07-06
 
     Make browser less noisy on debug
 
-Merge: e985f2c 70d2c9b
+Merge: e985f2c924 70d2c9b780
 Nyall Dawson 	2016-07-06
 
     Merge pull request #3262 from ahuarte47/Issue_MeasureDialog
@@ -385,7 +66712,7 @@ Nyall Dawson 	2016-07-04
 
     Temporarily disable doxygen group test
 
-Merge: 0a0c5e4 a058c36
+Merge: 0a0c5e4271 a058c36bce
 Alessandro Pasotti 	2016-07-04
 
     Merge pull request #3258 from elpaso/offline_editing_tests
@@ -426,7 +66753,7 @@ Matthias Kuhn 	2016-07-04
 
     https://travis-ci.org/qgis/QGIS/jobs/142140038#L1537-L1539
 
-Merge: 5d4836e 5daa546
+Merge: 5d4836e9b1 5daa546f6f
 rldhont 	2016-07-04
 
     Merge pull request #3250 from rldhont/qgsmaplayerregistry_check_layers_before_removed
@@ -591,7 +66918,7 @@ Juergen E. Fischer 	2016-06-30
 
     mssql provider: make mapping of import fields case-insensitive
 
-Merge: 0409f5e 4ad50a7
+Merge: 0409f5e30c 4ad50a708b
 Even Rouault 	2016-06-30
 
     Merge branch 'fix_release_conn_on_ogr_and_spatialite_closing'
@@ -689,14 +67016,14 @@ Martin Dobias 	2016-06-29
 
     Add notification in case a map tool does notthing (fixes #15160)
 
-Merge: 0f6e8da ef4a0d8
+Merge: 0f6e8da645 ef4a0d8d08
 Alexander Bruy 	2016-06-29
 
     Merge pull request #3238 from medspx/processing_g7_raster_tests
 
     [processing] more grass7 unit tests and their fixes
 
-Merge: 0083291 bb81568
+Merge: 00832918ff bb81568362
 Alexander Bruy 	2016-06-29
 
     Merge pull request #3234 from aharfoot/GDALTools_bugfix
@@ -721,7 +67048,7 @@ rldhont 	2016-06-23
 
     Probably fixed #15088 Segmentation fault when using layersRemoved SIGNAL
 
-Merge: a231466 50ab699
+Merge: a231466d88 50ab699097
 Nyall Dawson 	2016-06-29
 
     Merge pull request #3249 from nirvn/raster_renderer_layout
@@ -788,7 +67115,7 @@ Nathan Woodrow 	2016-06-28
 
     Fix windows build
 
-Merge: f0e0ba5 83683be
+Merge: f0e0ba5bb0 83683be3dc
 Even Rouault 	2016-06-28
 
     Merge pull request #3244 from rouault/fix_transformCoords
@@ -849,7 +67176,7 @@ Sandro Santilli 	2016-06-28
     See #13635
     The test passes
 
-Merge: e02661c 663333d
+Merge: e02661cd09 663333de7d
 mhugent 	2016-06-27
 
     Merge pull request #3242 from mhugent/full_circle
@@ -898,7 +67225,7 @@ Marco Hugentobler 	2016-06-27
 
     Fix full circle area calculation
 
-Merge: eabdb65 3ece8ac
+Merge: eabdb656a2 3ece8aca11
 Alexander Bruy 	2016-06-27
 
     Merge pull request #3233 from alexbruy/paste-style-fix
@@ -1045,7 +67372,7 @@ Nyall Dawson 	2016-06-26
 
     Capitalisation
 
-Merge: c4d620a a91697e
+Merge: c4d620a7b6 a91697e5bb
 Nyall Dawson 	2016-06-26
 
     Merge pull request #3237 from nirvn/form_view_icon_p2
@@ -1110,7 +67437,7 @@ Alexander Bruy 	2016-06-24
 
     don't apply raster style to vectors (fix #15001)
 
-Merge: 66c47d7 f7c1506
+Merge: 66c47d7ae4 f7c1506973
 Richard Duivenvoorde 	2016-06-24
 
     Merge pull request #3226 from rduivenvoorde/legendsizefix
@@ -1129,7 +67456,7 @@ Alexander Bruy 	2016-06-24
 
     align icons on the Manage layers toolbar (fix #15074) (#3232)
 
-Merge: 92bfcd4 9edab1e
+Merge: 92bfcd4802 9edab1e0a8
 Alexander Bruy 	2016-06-24
 
     Merge pull request #3231 from arnaud-morvan/processing_menu_translation
@@ -1168,7 +67495,7 @@ arnaud.morvan@camptocamp.com 	2016-06-23
 
     [Processing] Translate alg names in menu and options dialog
 
-Merge: e6970ba 8976c9d
+Merge: e6970ba597 8976c9de02
 Hugo Mercier 	2016-06-23
 
     Merge pull request #3229 from mhugo/fix_15113
@@ -1364,7 +67691,7 @@ Marco Bernasocchi 	2016-06-22
 
     this is done by listening to the linkClicked signal
 
-Merge: 3c06341 eaff966
+Merge: 3c06341aa9 eaff966286
 Denis Rouzaud 	2016-06-21
 
     Merge pull request #3227 from m-kuhn/FixToplevelGroupBoxes
@@ -1540,7 +67867,7 @@ Even Rouault 	2016-06-19
 
     Fixes #14844
 
-Merge: 63cbf87 43bdcdb
+Merge: 63cbf8778e 43bdcdb7ca
 Nyall Dawson 	2016-06-20
 
     Merge pull request #3221 from nirvn/bookmark_ui_imp
@@ -1555,7 +67882,7 @@ Mathieu Pellerin 	2016-06-20
 
     [styledock] open via double click action legend setting (#3220)
 
-Merge: 1053c5e aae8fef
+Merge: 1053c5e126 aae8fefd91
 Nyall Dawson 	2016-06-20
 
     Merge pull request #3219 from nirvn/composer_icons
@@ -1677,7 +68004,7 @@ Even Rouault 	2016-06-18
 
     Proper fix is either to force WFS 1.0, or upgrade to MapServer 7.0 with WFS 2.0
 
-Merge: a211c98 2a82caf
+Merge: a211c982cf 2a82caf173
 Nyall Dawson 	2016-06-18
 
     Merge pull request #3215 from nirvn/raster_icons
@@ -1797,7 +68124,7 @@ Mathieu Pellerin 	2016-06-16
 
     fix bookmarks editing regression (fixes #15034) (#3204)
 
-Merge: c783475 f6998e2
+Merge: c7834751ba f6998e2722
 Nyall Dawson 	2016-06-16
 
     Merge pull request #3203 from nirvn/move_feature_icon_imp
@@ -1830,7 +68157,7 @@ Nathan Woodrow 	2016-06-15
 
     Clean up showPanel API. Open dialog if not in dock mode
 
-Merge: 3a91d92 127386a
+Merge: 3a91d92d56 127386a1f1
 Denis Rouzaud 	2016-06-15
 
     Merge pull request #3201 from nirvn/more_icons
@@ -1865,7 +68192,7 @@ Mathieu Pellerin 	2016-06-15
 
     [gui/hidpi] vectorize attribute toolbar icons (#3200)
 
-Merge: ae93ee3 5eb14a9
+Merge: ae93ee3ca7 5eb14a9b0e
 Nyall Dawson 	2016-06-15
 
     Merge pull request #3199 from nirvn/annotation_icons
@@ -1935,7 +68262,7 @@ Matthias Kuhn 	2016-06-14
 
     Followup bbbc9d0: Fix tests
 
-Merge: bbbc9d0 8ddae27
+Merge: bbbc9d0abf 8ddae27130
 Alexander Bruy 	2016-06-14
 
     Merge pull request #3118 from arnaud-morvan/processing_gdal_postgis_credentials
@@ -1946,7 +68273,7 @@ Matthias Kuhn 	2016-06-14
 
     QgsDockWidget add openedStateChanged and openedStateChanged signals
 
-Merge: 834ab1c 5d37cc3
+Merge: 834ab1c702 5d37cc3549
 Alexander Bruy 	2016-06-14
 
     Merge pull request #3130 from arnaud-morvan/processing_gdal_shapeencoding
@@ -2227,12 +68554,12 @@ Even Rouault 	2016-06-12
 
     Standalone browser: call QgsNetworkAccessManager::instance() to avoid assertion in setupDefaultProxyAndCache() on start-up on WFS connections due to smMainNAM being not initialized (#15006)
 
-Merge: 7ed1a7f 1d6dfc5
+Merge: 7ed1a7ff79 1d6dfc5aed
 Even Rouault 	2016-06-12
 
     Merge branch 'master' of github.com:qgis/QGIS
 
-Merge: f1ec121 054604b
+Merge: f1ec12133e 054604bc70
 Nyall Dawson 	2016-06-12
 
     Merge pull request #3196 from nirvn/fix_right_click
@@ -2263,22 +68590,22 @@ Médéric RIBREUX 	2016-06-11
 
     Blacklist qt5 tests for Travis
 
-Merge: 5839a3a 7a3a38b
+Merge: 5839a3a8cd 7a3a38b659
 Even Rouault 	2016-06-11
 
     Merge branch 'master' of github.com:qgis/QGIS
 
-Merge: f7cf974 270938c
+Merge: f7cf974774 270938cbd3
 Even Rouault 	2016-06-11
 
     Merge branch 'master' of github.com:qgis/QGIS
 
-Merge: 7040ad4 690e554
+Merge: 7040ad41d2 690e554b61
 Even Rouault 	2016-06-11
 
     Merge remote branch 'origin/wfs_geomedia_fixes'
 
-Merge: edace8d 7040ad4
+Merge: edace8d0e6 7040ad41d2
 Even Rouault 	2016-06-11
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -2385,7 +68712,7 @@ Denis Rouzaud 	2016-06-10
     fix crash of QtDesigner with custom widgets
     kudos to @m-kuhn
 
-Merge: 37598bd 14342ce
+Merge: 37598bdf52 14342ce65a
 Alexander Bruy 	2016-06-10
 
     Merge pull request #3166 from nirvn/fix_processing_refactor_fields
@@ -2457,7 +68784,7 @@ Nyall Dawson 	2016-06-10
     No benefit as yet, but future proofing for when QgsDockWidget
     gains additional fixes/tweaks over QDockWidget
 
-Merge: a376867 7c34c53
+Merge: a3768672c8 7c34c53709
 Nyall Dawson 	2016-06-10
 
     Merge pull request #3193 from nirvn/pal_fix_quadrant
@@ -2554,7 +68881,7 @@ Sandro Santilli 	2016-04-26
 
     NOTE: signed int64 keys would still fail
 
-Merge: 03de74d 3213c81
+Merge: 03de74dc89 3213c81b60
 Nyall Dawson 	2016-06-09
 
     Merge pull request #3188 from nirvn/icon_offset_rotate
@@ -2976,7 +69303,7 @@ Marco Hugentobler 	2016-06-06
 
     Typo
 
-Merge: f279183 e5253f8
+Merge: f2791836e9 e5253f88ee
 mhugent 	2016-06-06
 
     Merge pull request #3127 from sbrunner/add-version-warning
@@ -3124,7 +69451,7 @@ Matthias Kuhn 	2016-06-03
 
     Add support for toplevel widgets in drag and drop designer
 
-Merge: 04e1e96 a4a0c9b
+Merge: 04e1e96859 a4a0c9b2fb
 rldhont 	2016-06-03
 
     Merge pull request #3172 from dmarteau/master
@@ -3143,7 +69470,7 @@ Juergen E. Fischer 	2016-06-03
 
     add missing copyright headers
 
-Merge: 45989f7 19f83ae
+Merge: 45989f7f36 19f83ae28d
 Martin Dobias 	2016-06-03
 
     [FEATURE] Layer tree embedded widgets
@@ -3182,7 +69509,7 @@ Nathan 	2016-06-03
 
     [feature] Add runtime profiler class to profile code
 
-Merge: f9ab722 8792443
+Merge: f9ab7223fc 879244360f
 Alexander Bruy 	2016-06-03
 
     Merge pull request #3169 from medspx/processing_grass7_rinlidar
@@ -3245,6 +69572,14 @@ Nathan Woodrow 	2016-06-03
 
     [styledock] Add saved style manager
 
+ninsbl 	2016-06-03
+
+    small format cleaning in default.qgc
+
+ninsbl 	2016-06-02
+
+    More modules for the GRASS plugin (including addons)
+
 Martin Dobias 	2016-06-02
 
     Added python bindings
@@ -3289,7 +69624,7 @@ Martin Dobias 	2016-06-02
 
     Integrate into layer dialogs, save in layer's properties
 
-Merge: 3351f55 94077b2
+Merge: 3351f5533a 94077b2a9d
 Even Rouault 	2016-06-02
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -3340,7 +69675,7 @@ Sandro Mani 	2016-06-02
 
     Remove unused code
 
-Merge: 49eaf07 1f02d4a
+Merge: 49eaf07440 1f02d4a43d
 Sandro Mani 	2016-06-02
 
     Merge pull request #3122 from manisandro/arcgis_rest
@@ -3420,7 +69755,7 @@ volaya 	2016-06-02
 
     [processing] added activateProvider method in Processing class
 
-Merge: 732b1cb 38e9435
+Merge: 732b1cb172 38e9435df4
 Matthias Kuhn 	2016-06-02
 
     Merge pull request #3165 from nirvn/fix_attributetable_sort
@@ -3485,6 +69820,10 @@ Matthias Kuhn 	2016-06-01
     Makes sure that repeated calls return the same value for a given editor widget.
     This avoids unstable behavior and unrequired updates of serial numbers.
 
+ninsbl 	2016-06-02
+
+    New modules for the GRASS plugin
+
 Piers Titus van der Torren 	2016-04-18
 
     Reduce color map display decimals to max 15
@@ -3595,7 +69934,7 @@ Marco Bernasocchi 	2016-05-31
     Maptips are non intrusive, so this shouldn't be
     disturbing.
 
-Merge: 29170d9 ef292e6
+Merge: 29170d918b ef292e6ada
 Nyall Dawson 	2016-06-02
 
     Merge pull request #3155 from ahuarte47/Rendering_DrawingMarkersFaster2
@@ -3628,7 +69967,7 @@ Nyall Dawson 	2016-06-02
 
     Cosmetic fixups to organize table columns dialog
 
-Merge: 0c73542 857d544
+Merge: 0c735420fc 857d544e55
 Nyall Dawson 	2016-06-02
 
     Merge pull request #3157 from manisandro/geomchecker_fixes
@@ -3685,7 +70024,7 @@ Juergen E. Fischer 	2016-06-01
 
     fix recommends (followup 8c14165)
 
-Merge: 73ab289 759dd9d
+Merge: 73ab289e1b 759dd9d121
 Martin Dobias 	2016-06-01
 
     Merge pull request #3120 from manisandro/rendering_crash
@@ -3700,7 +70039,7 @@ Even Rouault 	2016-06-01
 
     Fix Coverity warnings in testqgsogcutils.cpp and testqgsgdalprovider.cpp
 
-Merge: 61e26fd 8774ad2
+Merge: 61e26fd8f3 8774ad21b8
 Matthias Kuhn 	2016-06-01
 
     Merge pull request #3079 from pblottiere/constraints
@@ -3746,7 +70085,7 @@ volaya 	2016-06-01
 
     [processing] fixed wrong call to splitext in dataobjects.py
 
-Merge: f20e28d 925746d
+Merge: f20e28d98f 925746daf7
 Nyall Dawson 	2016-06-01
 
     Merge pull request #3159 from DelazJ/patch-4
@@ -3950,21 +70289,21 @@ Even Rouault 	2016-05-30
 
     [WFS provider] Fix build problem due to signature change of QgsRectangle::combineExtentWith()
 
-Merge: 86f6e7e 2ac20c6
+Merge: 86f6e7eb0d 2ac20c665f
 Even Rouault 	2016-05-30
 
     Merge pull request #3148 from rouault/wfs_better_behaviour_with_wrong_capability_extent
 
     [WFS Provider] Implement workarounds to better behave when extent reported by capabilities is wrong
 
-Merge: 4b130cb 9fe2102
+Merge: 4b130cbf42 9fe210283c
 Even Rouault 	2016-05-30
 
     Merge pull request #3142 from rouault/identify_result_float_precision
 
     Do not print excessive decimals when identifying value on a Float32 raster
 
-Merge: df6410e f3b635d
+Merge: df6410ec35 f3b635dcbb
 Even Rouault 	2016-05-30
 
     Merge pull request #3134 from rouault/do_not_write_nodata_if_not_existing
@@ -3995,7 +70334,7 @@ Alexander Bruy 	2016-05-30
 
     [processing] fix .ui file loading (follow up b52828fac7)
 
-Merge: 3bdbf79 47cf924
+Merge: 3bdbf79b4d 47cf9240b3
 Nyall Dawson 	2016-05-30
 
     Merge pull request #3138 from sbrunner/limit
@@ -4036,7 +70375,7 @@ Nyall Dawson 	2016-05-30
     feature on it's own, or it may go unnoticed in the other
     globe related changes!
 
-Merge: b52828f 75461aa
+Merge: b52828fac7 75461aa181
 Alexander Bruy 	2016-05-30
 
     Merge pull request #3119 from arnaud-morvan/processing_fix_postgis_overwrite
@@ -4051,14 +70390,14 @@ volaya 	2016-05-28
 
     [processing] added ‘supported’ parameter to exportVectorLayer
 
-Merge: 12cbcfc 69bed21
+Merge: 12cbcfc7fd 69bed21837
 Matthias Kuhn 	2016-05-30
 
     Merge pull request #3077 from pvalsecc/legend_url
 
     WMS: Better logic to pick the legend URL
 
-Merge: 72b55b7 62c814c
+Merge: 72b55b7ef4 62c814cb45
 Denis Rouzaud 	2016-05-30
 
     Merge pull request #3147 from pblottiere/fix_diagram
@@ -4079,7 +70418,7 @@ arnaud.morvan@camptocamp.com 	2016-05-20
 
     [db_manager] Fix #14796 - Quote values depending on data type in query builder
 
-Merge: 79d6407 cdbd4e4
+Merge: 79d640715e cdbd4e45d4
 Sandro Mani 	2016-05-29
 
     Merge pull request #3126 from manisandro/globe
@@ -4140,7 +70479,7 @@ Blottiere Paul 	2016-05-29
 
     fix pin/unpin diagrams when no labels
 
-Merge: c7a4e5a 92f71b6
+Merge: c7a4e5a065 92f71b696c
 Jürgen Fischer 	2016-05-29
 
     Merge pull request #3098 from arnaud-morvan/postgresql_decimal_fields
@@ -4198,13 +70537,23 @@ Nyall Dawson 	2016-05-29
 
     Fix incorrect tooltips in effects widget
 
-Merge: 1b06324 59faf95
+Merge: 1b06324d24 59faf95c1d
 Matthias Kuhn 	2016-05-29
 
     Merge pull request #3062 from medspx/processing_imagery
 
     [Processing] GRASS7 complete i.* modules (implements Redmine #5722)
 
+Stéphane Brunner 	2016-05-29
+
+    Have a capabilities cache per hostname
+
+    Actually if I get
+    http://127.0.0.1/qgis?REQUEST=GetCapabilities&VERSION=1.1.0&SERVICE=WFS
+    then
+    http://localhost/qgis?REQUEST=GetCapabilities&VERSION=1.1.0&SERVICE=WFS
+    the onlineResource will be wrong in the second request...
+
 Stéphane Brunner 	2016-05-27
 
     Add a warning on QGIS server when the versions don't corresponds
@@ -4479,7 +70828,7 @@ Nyall Dawson 	2016-05-29
 
     Fix doxygen warnings
 
-Merge: bae8a0e c3e7a56
+Merge: bae8a0e5e0 c3e7a56b05
 Denis Rouzaud 	2016-05-28
 
     Merge pull request #3131 from 3nids/lockscale
@@ -4571,7 +70920,7 @@ Even Rouault 	2016-05-28
     Make QgsRasterChecker check for nodata consistency between source and target, and
     add a test file that shows the issue.
 
-Merge: 27c5f78 7132209
+Merge: 27c5f78f4d 7132209fa0
 Alexander Bruy 	2016-05-28
 
     Merge pull request #3100 from alexbruy/add-db-table
@@ -4586,7 +70935,7 @@ Sandro Mani 	2016-05-26
 
     Revived globe, compatible with OsgEarth 2.7
 
-Merge: 3d95712 8592a7e
+Merge: 3d95712009 8592a7e3ac
 rldhont 	2016-05-28
 
     Merge branch 'processing_shortHelp'
@@ -4613,7 +70962,7 @@ Denis Rouzaud 	2016-05-28
 
     move scale widget in its own class (away from qgisapp)
 
-Merge: 2c1f2ce 88c8d35
+Merge: 2c1f2ce1c0 88c8d352e8
 Even Rouault 	2016-05-28
 
     Merge pull request #3121 from rouault/pyramids
@@ -4699,7 +71048,7 @@ Nyall Dawson 	2016-05-28
 
     Avoid warning
 
-Merge: cbbc535 6969a1a
+Merge: cbbc53570c 6969a1a401
 Nyall Dawson 	2016-05-27
 
     Merge pull request #2900 from ahuarte47/Issue_QPainterSimplification
@@ -4714,7 +71063,7 @@ Marco Hugentobler 	2016-05-27
 
     Postgres simplification does not work with curved types
 
-Merge: 70c5ab6 fb2d5e7
+Merge: 70c5ab6a05 fb2d5e727e
 Jürgen Fischer 	2016-05-27
 
     Merge pull request #3114 from SrNetoChan/new_icons
@@ -4759,7 +71108,7 @@ Denis Rouzaud 	2016-05-26
 
     add missing include in DB2
 
-Merge: 84c0241 eeea18e
+Merge: 84c0241776 eeea18ecba
 Nyall Dawson 	2016-05-27
 
     Merge pull request #3112 from ThomasG77/qgsannotationitemcast
@@ -4786,14 +71135,14 @@ Alexandre Neto 	2016-05-26
 
     Add QGIS file types Icons for Linux
 
-Merge: a389862 586e9bf
+Merge: a389862721 586e9bfabc
 Alexander Bruy 	2016-05-26
 
     Merge pull request #3096 from arnaud-morvan/processing_fix_updatedependentfields
 
     [BUGFIX] [Processing] Fix updateDependentFields
 
-Merge: 36161fc aef3dd4
+Merge: 36161fc05d aef3dd4da4
 pcav 	2016-05-26
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -4810,7 +71159,7 @@ Juergen E. Fischer 	2016-05-26
 
     remove svn references from prepare-commit.sh and make it work from anywhere in the repository
 
-Merge: ef3de28 5308918
+Merge: ef3de28538 53089188d5
 volaya 	2016-05-26
 
     Merge pull request #3109 from rldhont/bugfix_processing_getParameterDescriptions
@@ -4821,7 +71170,7 @@ rldhont 	2016-05-26
 
     [BUGFIX][Processing] Add getParameterDescriptions to R, Model and Script algo
 
-Merge: d783635 8cd6be5
+Merge: d783635a40 8cd6be57ed
 volaya 	2016-05-26
 
     Merge pull request #3110 from NaturalGIS/master
@@ -4856,12 +71205,12 @@ pcav 	2016-05-26
 
     Another typo in INSTALL
 
-Merge: eb275ea b5b0145
+Merge: eb275ea49b b5b0145c8f
 Alexander Bruy 	2016-05-26
 
     Merge branch 'pluginmanager-fix-strings'
 
-Merge: 322da8b ed90055
+Merge: 322da8b2cf ed90055e19
 Alexander Bruy 	2016-05-26
 
     Merge branch 'worlfile-ext'
@@ -4905,7 +71254,7 @@ Alvaro Huarte 	2016-02-21
 
     Remove FeatureIterator simplification
 
-Merge: d19767d 997a368
+Merge: d19767d590 997a3683a0
 Alexander Bruy 	2016-05-25
 
     Merge pull request #3105 from volaya/processing_cleanup
@@ -4916,7 +71265,7 @@ pcav 	2016-05-25
 
     Typos in INSTALL
 
-Merge: 98ede7f 0469ffc
+Merge: 98ede7fecf 0469ffc13e
 pcav 	2016-05-25
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -4933,7 +71282,7 @@ Alexander Bruy 	2016-05-25
 
     [pluginmanager] reword link to plugin bugtracker (fix #11582)
 
-Merge: 0627ac3 6b715c5
+Merge: 0627ac3f42 6b715c5bd6
 Alessandro Pasotti 	2016-05-25
 
     Merge pull request #3106 from boundlessgeo/wfs-t-tests-2
@@ -5047,14 +71396,14 @@ Nyall Dawson 	2016-05-25
 
     Search widget wrapper for relation reference widget
 
-Merge: 1cddf8d 3b7c0fc
+Merge: 1cddf8db00 3b7c0fc04f
 volaya 	2016-05-25
 
     Merge pull request #3103 from rldhont/bugfix_processing_rscript_output_table
 
     [BUGFIX][Processing][Rscript] Write output Table
 
-Merge: 94d88e6 f470c53
+Merge: 94d88e65d8 f470c531d8
 volaya 	2016-05-25
 
     Merge pull request #3102 from rldhont/bugfix_processing_rscript_crs
@@ -5117,7 +71466,7 @@ arnaud.morvan@camptocamp.com 	2016-05-24
 
     Keep numeric fields type, length and precision in postgresql provider
 
-Merge: 2bba191 5d7e218
+Merge: 2bba1917e1 5d7e218b04
 Alexander Bruy 	2016-05-24
 
     Merge pull request #3097 from rldhont/bugfix_processing_rscript_extent
@@ -5130,7 +71479,7 @@ rldhont 	2016-05-24
 
     Add support for extent parameter to Rscript command.
 
-Merge: ff38f27 386fcc6
+Merge: ff38f27dea 386fcc67ab
 Nyall Dawson 	2016-05-24
 
     Merge pull request #3095 from DelazJ/patch-3
@@ -5436,7 +71785,7 @@ Nathan 	2016-05-19
 
     [Style dock] Add support for raster layers
 
-Merge: b692375 88db4f9
+Merge: b6923758bc 88db4f9ad3
 Matthias Kuhn 	2016-05-22
 
     Merge pull request #3084 from nyalldawson/single_click_ediit
@@ -5447,7 +71796,7 @@ pcav 	2016-03-31
 
     Replaced Grid with Raster for coherence
 
-Merge: ff4532c 17fd3d8
+Merge: ff4532c3ac 17fd3d8cb9
 mhugent 	2016-05-20
 
     Merge pull request #3087 from arnaud-morvan/maptooladdfeature_avoidintersections_nullgeometry
@@ -5496,14 +71845,14 @@ Alessandro Pasotti 	2016-05-19
 
     Fixes #8656
 
-Merge: 0078b33 c0d12dc
+Merge: 0078b33ed2 c0d12dcdeb
 mhugent 	2016-05-19
 
     Merge pull request #3081 from mhugent/curve_segmentize_parameters
 
     Curve segmentize parameters
 
-Merge: a19741b 1ab2977
+Merge: a19741b297 1ab29771b7
 Even Rouault 	2016-05-19
 
     Merge pull request #3082 from rouault/vectorfilewriter_cleanup_and_encoding_improvement
@@ -5518,7 +71867,7 @@ volaya 	2016-05-18
 
     [processing] correctly switch to description tab if help tab exists
 
-Merge: d73210a cd9f47a
+Merge: d73210a5f8 cd9f47ae45
 Nyall Dawson 	2016-05-19
 
     Merge pull request #3080 from nyalldawson/select_tools
@@ -5565,7 +71914,7 @@ Juergen E. Fischer 	2016-05-19
     * debian packaging update
     * include qch download link on api index page
 
-Merge: c0799d4 9d59f9c
+Merge: c0799d4764 9d59f9ce76
 Jürgen Fischer 	2016-05-19
 
     Merge pull request #3048 from nyalldawson/qt_doxygen
@@ -5606,7 +71955,7 @@ Nyall Dawson 	2016-05-19
 
     Generate QCH compiled help with qgis-api-doc package
 
-Merge: daa23b5 f15197d
+Merge: daa23b59fc f15197da73
 Denis Rouzaud 	2016-05-19
 
     Merge pull request #3009 from pblottiere/magnifier
@@ -5637,7 +71986,7 @@ Nyall Dawson 	2016-04-30
     api docs available under the "Help" tab and by pressing F1
     on a QGIS class/method
 
-Merge: 23a3a77 69a8c38
+Merge: 23a3a7717e 69a8c381ab
 Nyall Dawson 	2016-05-19
 
     Merge pull request #3078 from 3nids/scaledenomhelp
@@ -5710,7 +72059,7 @@ Blottiere Paul 	2016-05-18
 
     scale is the same whatever the level of magnification
 
-Merge: a9c1996 7847f97
+Merge: a9c1996bbc 7847f971d4
 volaya 	2016-05-18
 
     Merge pull request #3044 from arnaud-morvan/processing_output_vectortable
@@ -5721,7 +72070,7 @@ Denis Rouzaud 	2016-05-18
 
     Precise that scale function returns the denominator and not the scale itself
 
-Merge: 5dd88c9 292a8a4
+Merge: 5dd88c990b 292a8a4fc1
 Martin Dobias 	2016-05-18
 
     Merge pull request #3064 from wonder-sk/composer-map-follow-preset
@@ -5788,7 +72137,7 @@ Juergen E. Fischer 	2016-05-17
 
     fix about box (followup 0b940cac, fixes #14832)
 
-Merge: 8ee697b 902953c
+Merge: 8ee697bf2d 902953ca9a
 Even Rouault 	2016-05-17
 
     Merge pull request #3076 from rouault/delimitedtext_qt5_fix
@@ -6000,14 +72349,14 @@ Nyall Dawson 	2016-05-16
 
     Fix debug build
 
-Merge: c4819ad 202420c
+Merge: c4819adea4 202420c70a
 Nyall Dawson 	2016-05-16
 
     Merge pull request #3072 from rouault/qt5_fix_testqgsfield
 
     Make qgis_fieldtest all Qt 5.X compatible
 
-Merge: 63cab56 9a49c6a
+Merge: 63cab56839 9a49c6aace
 Even Rouault 	2016-05-15
 
     Merge remote-tracking branch 'rouault/fix_qt5_wfs_ogcutils_tests'
@@ -6094,7 +72443,7 @@ Even Rouault 	2016-05-14
 
     Fixes in qgswebframe.h and qgswebpage.h to fix building without QtWebKit
 
-Merge: 45e7da1 666050c
+Merge: 45e7da15e1 666050c57c
 Jürgen Fischer 	2016-05-14
 
     Merge pull request #3070 from sebastic/qtermwidget-hurd
@@ -6125,7 +72474,7 @@ Even Rouault 	2016-05-14
 
     qgsgml & WFS provider: fix Coverity warnings introduced in recent WFS works
 
-Merge: cfb6100 90cc0ed
+Merge: cfb6100389 90cc0ed495
 Even Rouault 	2016-05-14
 
     Merge pull request #3061 from rouault/saveas_human_readable_values
@@ -6144,7 +72493,7 @@ aharfoot 	2016-02-19
 
     Disable FEATURE_DATASET layer option if its value is not set
 
-Merge: c530875 f94bb6f
+Merge: c5308754eb f94bb6ffc7
 Matthias Kuhn 	2016-05-14
 
     Merge pull request #2621 from simonsonc/georef-crosshairs
@@ -6192,7 +72541,7 @@ Matthias Kuhn 	2016-05-11
 
     Introduce NULL QVariant to PyQt5
 
-Merge: b1f59f3 d038218
+Merge: b1f59f3ed6 d03821866e
 Matthias Kuhn 	2016-05-13
 
     Merge pull request #3069 from sbrunner/connect
@@ -6203,14 +72552,14 @@ Stéphane Brunner 	2016-05-11
 
     Directly use function connect, remove no more existing signals
 
-Merge: 8360936 9a48886
+Merge: 8360936e89 9a48886412
 Matthias Kuhn 	2016-05-13
 
     Merge pull request #3068 from sebastic/qtermwidget-kfreebsd
 
     Add support for kFreeBSD to GRASS plugin.
 
-Merge: ab3fef9 95b5548
+Merge: ab3fef97aa 95b5548def
 Matthias Kuhn 	2016-05-13
 
     Merge pull request #3059 from arnaud-morvan/canvas_saveasimage_with_annotations
@@ -6229,7 +72578,7 @@ Alexander Bruy 	2016-05-13
 
     [processing] fix import
 
-Merge: 19f8060 65a37db
+Merge: 19f80601bf 65a37dbe07
 Even Rouault 	2016-05-13
 
     Merge pull request #3018 from rouault/wfs_sql
@@ -6252,14 +72601,14 @@ Alexander Bruy 	2016-05-13
 
     fix indentation and typo
 
-Merge: b51d70a 2535c0a
+Merge: b51d70ab95 2535c0a9c1
 Alexander Bruy 	2016-05-13
 
     Merge branch 'processing_exps' of https://github.com/volaya/QGIS into processing_exps
 
     Conflicts:
-python/plugins/processing/gui/NumberInputPanel.py
-python/plugins/processing/gui/OutputSelectionPanel.py
+            python/plugins/processing/gui/NumberInputPanel.py
+            python/plugins/processing/gui/OutputSelectionPanel.py
 
 Nyall Dawson 	2016-05-13
 
@@ -6432,7 +72781,7 @@ Nyall Dawson 	2016-05-10
     Calculates summary statistics on lists of datetime values, such
     as count, count distinct, min, max and range
 
-Merge: ab7a07a 66b1416
+Merge: ab7a07a64e 66b1416dfe
 Matthias Kuhn 	2016-05-11
 
     Merge pull request #3058 from arnaud-morvan/processing_postgis_errors
@@ -6463,7 +72812,7 @@ Matthias Kuhn 	2016-05-09
 
     Followup 59db4d0: Cleanup
 
-Merge: 5177d93 cf45742
+Merge: 5177d93b5a cf45742fe8
 Matthias Kuhn 	2016-05-11
 
     Merge pull request #3063 from DelazJ/fields
@@ -6530,14 +72879,14 @@ Nathan 	2016-05-11
 
     Talk about a noob error :)
 
-Merge: 0f6838d 75cfb32
+Merge: 0f6838df2a 75cfb32683
 Nyall Dawson 	2016-05-11
 
     Merge pull request #3056 from rouault/gdal_make_autowarpedvrt_for_rpc
 
     [GDAL provider] Use GDALAutoCreateWarpedVRT() when the dataset has only RPC
 
-Merge: 7ae80b1 52de4fb
+Merge: 7ae80b106d 52de4fb9ba
 Nyall Dawson 	2016-05-11
 
     Merge pull request #3034 from rouault/ogr_concurrent_opening
@@ -6615,14 +72964,14 @@ Nyall Dawson 	2016-05-10
 
     Temporarily fix generate_test_mask_image.py by rolling back to Qt4
 
-Merge: 81e72b7 90d116c
+Merge: 81e72b782f 90d116c6f5
 Nyall Dawson 	2016-05-09
 
     Merge pull request #3051 from nyalldawson/cad_fixes
 
     Improvements and fixes to advanced digitising dock
 
-Merge: 794ab06 ea20149
+Merge: 794ab065dc ea20149239
 Nyall Dawson 	2016-05-09
 
     Merge pull request #3060 from nyalldawson/filled_marker
@@ -6731,7 +73080,7 @@ Alexander Bruy 	2016-05-09
 
     [processing] add support for int64 fields (fix #14777)
 
-Merge: fa11390 9470c36
+Merge: fa11390dd3 9470c36aa0
 Matthias Kuhn 	2016-05-09
 
     Merge pull request #3013 from pierstitus/pseudocolor_renderer
@@ -6752,7 +73101,7 @@ Matthias Kuhn 	2016-05-09
     Fix #14765
     Fix #14766
 
-Merge: a65d9c5 0b4961c
+Merge: a65d9c522f 0b4961c224
 mhugent 	2016-05-09
 
     Merge pull request #3045 from mhugent/convert_geometry_2
@@ -6885,7 +73234,7 @@ Even Rouault 	2016-04-11
     - Implements QgsOGRProvider:reloadData()
     - Robustify OGR provider methods so they don't crash if dataset re-opening fails.
 
-Merge: 919c54e f261888
+Merge: 919c54ef5f f2618884fd
 Sandro Mani 	2016-05-04
 
     Merge pull request #3057 from manisandro/ogrpool_datasourceuri
@@ -7093,7 +73442,7 @@ Even Rouault 	2016-05-02
 
     Fix PyQt import to qgis.pyQt in test_qgsnewgeopackagelayerdialog.py
 
-Merge: 563d75c 7703ad8
+Merge: 563d75c1ec 7703ad88ac
 Nyall Dawson 	2016-05-02
 
     Merge pull request #3031 from rouault/gpkg_improvements
@@ -7222,7 +73571,7 @@ Alexander Bruy 	2016-04-28
 
     [processing] always use original algorithm name for scripts and models (follow up abda90fe0d)
 
-Merge: 93d984e 4a11a1a
+Merge: 93d984e504 4a11a1a319
 rldhont 	2016-04-28
 
     Merge branch 'processing_modeler_default_value'
@@ -7231,7 +73580,7 @@ Marco Hugentobler 	2016-04-28
 
     Fix crash
 
-Merge: d69910a fef8c1f
+Merge: d69910a12b fef8c1fef2
 Nyall Dawson 	2016-04-28
 
     Merge pull request #3026 from nirvn/centroid_fill_parts
@@ -7255,7 +73604,7 @@ Alexander Bruy 	2016-04-27
 
     fix indentation
 
-Merge: c96f66e bee4068
+Merge: c96f66ecae bee4068b89
 Alexander Bruy 	2016-04-27
 
     Merge pull request #3038 from volaya/provider_add_remove
@@ -7274,7 +73623,7 @@ Even Rouault 	2016-04-27
 
     Put QgsSQLiteExpressionCompiler class inside Doxygen PRIVATE tag
 
-Merge: 42e386f 10e3c19
+Merge: 42e386f8c8 10e3c1914e
 Jürgen Fischer 	2016-04-27
 
     Merge pull request #3040 from 3nids/debian_install_qgis_testing
@@ -7297,7 +73646,7 @@ Martin Dobias 	2016-04-27
 
     Gracefully handle topology errors when tracing (fixes #14447)
 
-Merge: e9bc8ae 572bd19
+Merge: e9bc8ae4c5 572bd195a5
 Martin Dobias 	2016-04-27
 
     [FEATURE] Make labeling map tools work with rule-based labeling
@@ -7355,7 +73704,7 @@ Alexander Bruy 	2016-04-26
 
     [processing] don't write NaN's to attribute table (fix #14639)
 
-Merge: 2ba252b 6b88ec8
+Merge: 2ba252b344 6b88ec81e6
 Sandro Mani 	2016-04-26
 
     Merge pull request #2991 from manisandro/ogr_options
@@ -7376,7 +73725,7 @@ Sandro Mani 	2016-04-10
 
     This fixes corrupt rendering when loading the same dataset twice with different options (i.e. layers), see issue #14560.
 
-Merge: 9a05558 793b712
+Merge: 9a05558aff 793b712eb9
 Alexander Bruy 	2016-04-26
 
     Merge pull request #3033 from rldhont/processing_gdal_optional
@@ -7393,7 +73742,7 @@ rldhont 	2016-04-26
 
     Because EXTRA and NO_DATA parameters are optional, the value can be `None` which is the same as `''`.
 
-Merge: 8a9cb05 a4b2cde
+Merge: 8a9cb05dbb a4b2cde5bb
 Alexander Bruy 	2016-04-26
 
     Merge pull request #3030 from NaturalGIS/processing_fix_raster_clip_nodata
@@ -7437,7 +73786,7 @@ Nyall Dawson 	2016-04-26
 
     Fix crash in relation reference widget (fix #14732)
 
-Merge: ff85bfe ba2601f
+Merge: ff85bfe461 ba2601ff45
 volaya 	2016-04-26
 
     Merge pull request #3032 from NaturalGIS/processing_remove_wrong_raster_clip_parameter
@@ -7571,7 +73920,7 @@ Juergen E. Fischer 	2016-04-25
 
     fix warnings
 
-Merge: 0cd5f6a ee5548b
+Merge: 0cd5f6afce ee5548b27a
 Werner Macho 	2016-04-24
 
     Merge pull request #3027 from Cracert/trans2
@@ -7661,7 +74010,7 @@ Alessandro Pasotti 	2016-04-21
 
     Funded by Boundless
 
-Merge: 90613ca 9735c13
+Merge: 90613ca5d3 9735c13e33
 Nyall Dawson 	2016-04-22
 
     Merge pull request #3017 from nirvn/font_marker_outline
@@ -7770,7 +74119,7 @@ Nathan Woodrow 	2016-04-20
 
     [Style dock] Move layer label inside widget
 
-Merge: 8f0f9cc 79442b6
+Merge: 8f0f9ccbb2 79442b6ccb
 Alessandro Pasotti 	2016-04-19
 
     Merge pull request #3015 from boundlessgeo/wfs-getfeatures-offline-crash
@@ -7802,7 +74151,7 @@ Matthias Kuhn 	2016-04-19
 
     Server test: URLError has no code
 
-Merge: 831e7cd 81a6ccf
+Merge: 831e7cd236 81a6ccf05b
 Hugo Mercier 	2016-04-19
 
     Merge pull request #2955 from mhugo/arrows
@@ -7858,7 +74207,7 @@ Matthias Kuhn 	2016-04-18
 
     [Processing] Retry gdal commands if they are interrupted
 
-Merge: a44d0c1 81b6493
+Merge: a44d0c1fac 81b6493155
 Matthias Kuhn 	2016-04-18
 
     Merge pull request #2990 from DelazJ/style
@@ -7928,7 +74277,7 @@ Matthias Kuhn 	2016-04-17
 
     Add debug for failing gdal subprocess
 
-Merge: a669d3c ae719c0
+Merge: a669d3c884 ae719c0917
 Nathan Woodrow 	2016-04-17
 
     Merge pull request #3007 from nirvn/svg_marker_disability_v2
@@ -7939,7 +74288,7 @@ Webmaster 	2016-04-17
 
     [svg] add accessibility and low vision symbols
 
-Merge: fc6559a 8421590
+Merge: fc6559aa05 842159036a
 Matthias Kuhn 	2016-04-16
 
     Merge pull request #3005 from m-kuhn/osx-sip-417
@@ -7957,7 +74306,7 @@ Matthias Kuhn 	2016-04-15
 
     [travis] OSX: Force sip version 4.17 due to build problems
 
-Merge: b95d6c1 449fad3
+Merge: b95d6c1d94 449fad3582
 Matthias Kuhn 	2016-04-15
 
     Merge pull request #3006 from m-kuhn/Qt5ConsoleTests
@@ -7996,7 +74345,7 @@ Juergen E. Fischer 	2016-04-15
 
     debian packaging drop ubuntu vivid support
 
-Merge: 78725fe 816c322
+Merge: 78725feda4 816c322df5
 Matthias Kuhn 	2016-04-15
 
     Merge pull request #3003 from m-kuhn/py3next
@@ -8086,7 +74435,7 @@ Nyall Dawson 	2016-04-15
     - set initial find string to selection when opening find
     - pressing Escape closes the find bar
 
-Merge: a7f08fd 69235e6
+Merge: a7f08fd7b7 69235e6755
 Nyall Dawson 	2016-04-15
 
     Merge pull request #3000 from nirvn/diamond_ellipse_marker
@@ -8101,7 +74450,7 @@ Alessandro Pasotti 	2016-04-08
 
     Funded by Boundless
 
-Merge: 0f048b5 0232819
+Merge: 0f048b55eb 023281907f
 Hugo Mercier 	2016-04-14
 
     Merge pull request #2956 from pblottiere/diagrams
@@ -8155,7 +74504,7 @@ elpaso 	2016-04-14
 
     Also fixes #14649
 
-Merge: cbf7b5c 70863ec
+Merge: cbf7b5c0df 70863ecaf0
 mhugent 	2016-04-14
 
     Merge pull request #2999 from mhugent/server_ntv2_2
@@ -8234,7 +74583,7 @@ Matthias Kuhn 	2016-04-13
 
     QgsSymbolV2: only pop expression scope if it was really added
 
-Merge: 9a161ac 6da1899
+Merge: 9a161ac449 6da18991eb
 Nyall Dawson 	2016-04-13
 
     Merge pull request #2997 from nirvn/more_n_more_markers
@@ -8365,7 +74714,7 @@ Sandro Santilli 	2016-04-11
 
     See http://editorconfig.org
 
-Merge: 0c5fa81 25a162c
+Merge: 0c5fa81126 25a162c05a
 Alexander Bruy 	2016-04-11
 
     Merge pull request #2982 from alexbruy/cancel-style-loading
@@ -8398,7 +74747,7 @@ Alexander Bruy 	2016-04-07
 
     [processing] don't ask for MSYS folder for GRASS7 (fix #14431)
 
-Merge: 7d235d2 ae59b73
+Merge: 7d235d2b0c ae59b733c3
 Alexander Bruy 	2016-04-10
 
     Merge pull request #2988 from nyalldawson/dissolve
@@ -8410,7 +74759,7 @@ Nyall Dawson 	2016-04-10
     [processing] Use unary union in dissolve (much faster for many
     complex geometry inputs)
 
-Merge: f90f999 a72fcb8
+Merge: f90f999eb4 a72fcb8fe1
 Jürgen Fischer 	2016-04-10
 
     Merge pull request #2987 from rouault/wfs_uppercase_attribute
@@ -8515,7 +74864,7 @@ Nyall Dawson 	2016-04-08
 
     Also clean up some code
 
-Merge: d07bc18 a0b9877
+Merge: d07bc18353 a0b9877b3d
 Nyall Dawson 	2016-04-09
 
     Merge pull request #2985 from manisandro/geom_checker_fixes
@@ -8530,7 +74879,7 @@ Juergen E. Fischer 	2016-04-08
 
     fix python future installation (followup 5895780)
 
-Merge: 9b9377f d30836e
+Merge: 9b9377fa87 d30836ea1a
 Jürgen Fischer 	2016-04-08
 
     Merge pull request #2984 from rouault/fix_thread_unsafe_init_of_QgsExpression_functions
@@ -8587,7 +74936,7 @@ rldhont 	2016-04-08
 
     Fixes #14619
 
-Merge: c397ae6 2eb660a
+Merge: c397ae652e 2eb660a00c
 Matthias Kuhn 	2016-04-08
 
     Merge pull request #2954 from tomchadwin/master
@@ -8610,7 +74959,7 @@ Denis Rouzaud 	2016-04-08
 
     regroup duplicated code
 
-Merge: a6a77ee f0a2d60
+Merge: a6a77ee46b f0a2d60c81
 Nyall Dawson 	2016-04-08
 
     Merge pull request #2981 from nirvn/symbol_label_diagram_sync
@@ -8683,7 +75032,7 @@ volaya 	2016-04-07
 
     [processing] fixed wild import
 
-Merge: 794ef72 4f87525
+Merge: 794ef72520 4f87525eec
 Nyall Dawson 	2016-04-07
 
     Merge pull request #2980 from nirvn/diagram_ui_improvement
@@ -8722,7 +75071,7 @@ Nyall Dawson 	2016-04-07
 
     Remove use of c style function(void)
 
-Merge: 5895780 9040ec1
+Merge: 5895780553 9040ec1baf
 Jürgen Fischer 	2016-04-07
 
     Merge pull request #2977 from rouault/wfs
@@ -8733,7 +75082,7 @@ Juergen E. Fischer 	2016-04-07
 
     fix internal future install (fixes #14577, take II)
 
-Merge: 99980be 100c96c
+Merge: 99980bea0c 100c96c3a8
 Jürgen Fischer 	2016-04-07
 
     Merge pull request #2946 from sebastic/debian
@@ -8842,7 +75191,7 @@ Matthias Kuhn 	2016-04-04
 
     Make string translatable
 
-Merge: 9c0a291 7b233e5
+Merge: 9c0a291046 7b233e514c
 Nyall Dawson 	2016-04-06
 
     Merge pull request #2976 from nirvn/more_markers
@@ -8950,14 +75299,14 @@ Nyall Dawson 	2016-04-05
 
     Tweak some API and docs, and fix overlapping UI widgets
 
-Merge: 410a438 dc5d7ab
+Merge: 410a43814b dc5d7ab985
 Nyall Dawson 	2016-04-05
 
     Merge pull request #2974 from nirvn/diagram_line_unit
 
     [diagram] add unit type setting for outlines (fixes #14614)
 
-Merge: f683803 f696b0a
+Merge: f6838032fa f696b0a34d
 Nyall Dawson 	2016-04-05
 
     Allow relative links in composer labels
@@ -9080,7 +75429,7 @@ Juergen E. Fischer 	2016-04-04
     debian packaging: no internal future only stretch sid wily xenial
     (fixes #14577)
 
-Merge: 2adfbb0 14c7900
+Merge: 2adfbb078a 14c7900e1a
 Denis Rouzaud 	2016-04-04
 
     Merge pull request #2971 from DelazJ/patch-9
@@ -9139,7 +75488,7 @@ Alexander Bruy 	2016-04-04
 
     [processing] fix looping over features in Join Attributes alg (fix #14428)
 
-Merge: 5414637 5a72bc7
+Merge: 541463718d 5a72bc7d52
 Alessandro Pasotti 	2016-04-04
 
     Merge pull request #2963 from elpaso/server-fix-qs-encoding
@@ -9221,7 +75570,7 @@ Nyall Dawson 	2016-04-04
 
     Followup 99d5e4, add unit tests
 
-Merge: c08d359 3a2a099
+Merge: c08d3592dd 3a2a099c59
 Nyall Dawson 	2016-04-03
 
     Merge pull request #2964 from nirvn/simple_marker_join_style
@@ -9257,7 +75606,7 @@ Juergen E. Fischer 	2016-04-03
 
     fix indentation
 
-Merge: 42e42f7 3e7553c
+Merge: 42e42f77b4 3e7553c1f2
 Jürgen Fischer 	2016-04-02
 
     Merge pull request #2965 from DelazJ/patch-8
@@ -9377,7 +75726,7 @@ Tom Kralidis 	2016-03-31
 
     [MetaSearch] fix version referencing
 
-Merge: 1e85772 3dffb7b
+Merge: 1e85772e03 3dffb7b743
 Tom Kralidis 	2016-03-31
 
     Merge pull request #2959 from geopython/master
@@ -9412,7 +75761,7 @@ Marco Hugentobler 	2016-03-31
 
     Adapt qgswmsconfigparser.sip
 
-Merge: afa20ec 2fb71b0
+Merge: afa20ec28d 2fb71b02c4
 Matthias Kuhn 	2016-03-31
 
     Merge pull request #2958 from mbernasocchi/master
@@ -9460,7 +75809,7 @@ Nyall Dawson 	2016-03-31
 
     Fix generate_test_mask_image script
 
-Merge: dccd731 7684163
+Merge: dccd731070 768416340f
 Alessandro Pasotti 	2016-03-30
 
     Merge pull request #2957 from boundlessgeo/wfs-t-fixes-14139
@@ -9540,7 +75889,7 @@ Nyall Dawson 	2016-03-30
 
     Highlight today's date in date time calendar popup
 
-Merge: 4ece916 8c3155f
+Merge: 4ece916728 8c3155fbe8
 Nyall Dawson 	2016-03-30
 
     Merge pull request #2952 from rouault/fix_indentation
@@ -9601,7 +75950,7 @@ Tom Chadwin 	2016-03-29
 
     Use doxygen HTML_COLORSTYLE_HUE = 113 instead
 
-Merge: 26df41f 9b198f1
+Merge: 26df41f950 9b198f1f1b
 Matthias Kuhn 	2016-03-29
 
     Merge pull request #2950 from rouault/INSTALL_note_about_msinttypes
@@ -9619,7 +75968,7 @@ Tom Chadwin 	2016-03-29
 
     Correct search box position in menu bar
 
-Merge: 944db6d bf83f4e
+Merge: 944db6d2be bf83f4ebd0
 Alexander Bruy 	2016-03-29
 
     Merge pull request #2945 from sept-en/master
@@ -9727,14 +76076,14 @@ Anita Graser 	2016-03-23
 
     added buffer tests
 
-Merge: 060019c 2c6d4ba
+Merge: 060019cbb4 2c6d4ba35e
 Matthias Kuhn 	2016-03-27
 
     Merge pull request #2942 from rouault/missing_sqlite3_include_tests_analysis
 
     Add missing SQLITE3_INCLUDE_DIR in tests/src/analysis/CMakeLists.txt
 
-Merge: fbf4d67 6ac1398
+Merge: fbf4d675ca 6ac13988b1
 Matthias Kuhn 	2016-03-27
 
     Merge pull request #2947 from rouault/minmax_longlong
@@ -9860,7 +76209,7 @@ Sandro Mani 	2016-03-24
 
     [Geometry checker] Make QgsGeometryCheckError::geometry return the geometry of the affected part only, if a part is defined
 
-Merge: ea4a0e2 2b15eaa
+Merge: ea4a0e27d9 2b15eaa14d
 Jürgen Fischer 	2016-03-24
 
     Merge pull request #2944 from rouault/fix_crash_on_invalid_spatialite_iterator
@@ -9899,7 +76248,7 @@ Juergen E. Fischer 	2016-03-24
 
     don't strip utf8 in log
 
-Merge: 140b517 f387291
+Merge: 140b51728a f3872914ce
 Jürgen Fischer 	2016-03-24
 
     Merge pull request #2943 from rouault/fix_networkTimeout
@@ -9913,7 +76262,7 @@ Tom Chadwin 	2016-03-24
     No idea where this should live in the repo - just putting it here for
     now
 
-Merge: 30b2e58 3755c3b
+Merge: 30b2e58a0c 3755c3b1d5
 Tom Chadwin 	2016-03-24
 
     Merge remote-tracking branch 'refs/remotes/qgis/master'
@@ -9934,7 +76283,7 @@ Even Rouault 	2016-03-24
 
     For OSM test
 
-Merge: 15b3600 7dbc0bf
+Merge: 15b36005ad 7dbc0bf819
 Hugo Mercier 	2016-03-24
 
     Merge pull request #2915 from mhugo/fix_vlayers
@@ -9954,7 +76303,7 @@ Matthias Kuhn 	2016-03-23
 
     Some style improvements for test
 
-Merge: 40611d7 8d9443b
+Merge: 40611d7885 8d9443bdca
 Jürgen Fischer 	2016-03-23
 
     Merge pull request #2923 from nyalldawson/fix_14407
@@ -9965,7 +76314,7 @@ Juergen E. Fischer 	2016-03-23
 
     Reenable fcgi and server on osx (followup 53d40e8)
 
-Merge: 70e2696 2e04162
+Merge: 70e2696be5 2e04162e37
 Jürgen Fischer 	2016-03-23
 
     Merge pull request #2940 from rouault/spatialite_bind_blob_fix
@@ -10015,14 +76364,14 @@ Hugo Mercier 	2016-03-14
 
     Fix the virtual layer icon text
 
-Merge: 4b57964 f0be045
+Merge: 4b5796497a f0be0457d5
 Alexander Bruy 	2016-03-23
 
     Merge pull request #2936 from sept-en/master
 
     [processing] fix filter in Processing settings dialog. Add ability to specify mininal required number of items for MultipleInput parameter (fix #11469, fix #12580)
 
-Merge: 8fdf485 d830d91
+Merge: 8fdf48507b d830d91764
 Matthias Kuhn 	2016-03-23
 
     Merge pull request #2939 from rouault/missing_sqlite3_include_pyspatialite
@@ -10047,28 +76396,28 @@ Septen 	2016-03-23
 
     Typo fixes.
 
-Merge: 48104d5 b073111
+Merge: 48104d5737 b073111f8a
 volaya 	2016-03-23
 
     Merge pull request #2893 from NaturalGIS/processing_gdalwarp_extent
 
     processing: add extent parameter to gdal_warp
 
-Merge: 2e6fcf5 48e20cf
+Merge: 2e6fcf57d6 48e20cf08f
 volaya 	2016-03-23
 
     Merge pull request #2891 from csandor/patch-1
 
     Table names in postgresql can be max 63 characters long
 
-Merge: bec849c eb186c4
+Merge: bec849c4f5 eb186c4928
 volaya 	2016-03-23
 
     Merge pull request #2865 from medspx/processing_raster_bunch
 
     [Processing] Add the last GRASS7 r.* algorithms
 
-Merge: e6c5301 097b181
+Merge: e6c5301cf8 097b18190c
 Matthias Kuhn 	2016-03-23
 
     Merge pull request #2935 from matakuka/dissolve
@@ -10110,7 +76459,7 @@ Maximilian Krambach 	2016-03-22
 
     identation errors and wrong file paths
 
-Merge: 6c31d89 f197b7c
+Merge: 6c31d89a51 f197b7cac4
 Septen 	2016-03-22
 
     Merge branch 'master' of git://github.com/qgis/QGIS
@@ -10119,7 +76468,7 @@ Septen 	2016-03-22
 
     (ref #14469) Processing options: search optimized. Cleanups.
 
-Merge: c8cb3fb a5ab9d2
+Merge: c8cb3fb856 a5ab9d22ac
 Matthias Kuhn 	2016-03-22
 
     Merge pull request #2934 from rouault/missing_sqlite3_include
@@ -10138,7 +76487,7 @@ Matthias Kuhn 	2016-03-22
 
     Add python-future to debian dependencies
 
-Merge: 5fb64bd 45a364e
+Merge: 5fb64bd4a6 45a364eb2b
 Matthias Kuhn 	2016-03-22
 
     Merge pull request #2921 from m-kuhn/py33
@@ -10298,7 +76647,7 @@ Juergen E. Fischer 	2016-03-20
 
     fix warnings
 
-Merge: a3c76c6 4f18701
+Merge: a3c76c617a 4f18701d31
 Matthias Kuhn 	2016-03-20
 
     Merge pull request #2863 from pvalsecc/minMaxScale
@@ -10351,21 +76700,21 @@ Juergen E. Fischer 	2016-03-18
 
     use link to release branch in about box for exported sources (fixeds #14525)
 
-Merge: 2942ce5 d7c477b
+Merge: 2942ce576b d7c477b078
 volaya 	2016-03-18
 
     Merge pull request #2901 from bartnv/fix-iterating-import
 
     [processing] Fix extension removal in exportVectorLayer
 
-Merge: 839db0a d318981
+Merge: 839db0a505 d318981f3d
 volaya 	2016-03-18
 
     Merge pull request #2904 from medspx/processing_vector_bunch
 
     [Processing] GRASS7 complete v.* algorithms (implements Redmine #5725)
 
-Merge: 1fdd177 e1ff6e8
+Merge: 1fdd177c81 e1ff6e896a
 volaya 	2016-03-18
 
     Merge pull request #2871 from NaturalGIS/processing_fix_grass7_detection_osx
@@ -10387,7 +76736,7 @@ Patrick Valsecchi 	2016-03-03
     Now, the maxScale is forced to minScale if the user tries to
     set it to a lower value.
 
-Merge: 68f0e83 6ea7368
+Merge: 68f0e832ec 6ea736805d
 Matthias Kuhn 	2016-03-18
 
     Merge pull request #2924 from nyalldawson/qt5_fix
@@ -10421,7 +76770,7 @@ Nyall Dawson 	2016-03-18
     See https://trac.osgeo.org/gdal/ticket/6415 for GDAL dev recommendation
     to use default OGR dialect in place of "SQL" dialect.
 
-Merge: cc650f9 0780527
+Merge: cc650f9370 0780527428
 Nyall Dawson 	2016-03-18
 
     Merge pull request #2862 from nyalldawson/server_test_gdal
@@ -10439,7 +76788,7 @@ Matthias Kuhn 	2016-03-17
     Followup 3fd3dae
     Fix #14515
 
-Merge: 09f6b91 cd267b0
+Merge: 09f6b918a5 cd267b066c
 Matthias Kuhn 	2016-03-17
 
     Merge pull request #2920 from bstroebl/testEliminate
@@ -10577,7 +76926,7 @@ Juergen E. Fischer 	2016-03-15
 
     2to3: remove empty imports
 
-Merge: a9cb990 fffc4a0
+Merge: a9cb9906a2 fffc4a0276
 Nyall Dawson 	2016-03-16
 
     Merge pull request #2918 from DelazJ/patch-6
@@ -10607,7 +76956,7 @@ Juergen E. Fischer 	2016-03-15
       python/console/console_sci.py:547 QsciScintillaCompat?
       python/plugins/db_manager/dlg_query_builder.py:304 pop_up_error?
 
-Merge: 74b5e12 6acdfc6
+Merge: 74b5e12e37 6acdfc6e84
 Matthias Kuhn 	2016-03-15
 
     Merge pull request #2916 from mach0/p3_clean
@@ -10713,7 +77062,7 @@ Nyall Dawson 	2016-03-14
     - move calculation of referenced fields to diagram classes, out
     of QgsVectorLayerDiagramProvider
 
-Merge: 13d407e f9c736c
+Merge: 13d407e367 f9c736c9f8
 Hugo Mercier 	2016-03-14
 
     Merge pull request #2557 from mhugo/fix_13959
@@ -10726,7 +77075,7 @@ Hugo Mercier 	2015-12-08
 
     Keep unchecked legend items when filtered by expression
 
-Merge: d6fca7e 34bd124
+Merge: d6fca7e2e3 34bd124023
 Sandro Mani 	2016-03-14
 
     Merge pull request #2905 from manisandro/checker_crash
@@ -10789,14 +77138,14 @@ Marco Hugentobler 	2016-03-14
 
     Fix attribute creation in transect sample
 
-Merge: bd6508a e2c83ae
+Merge: bd6508aabc e2c83aeca4
 Matthias Kuhn 	2016-03-14
 
     Merge pull request #2903 from sebastic/qt5-qspatialite
 
     Add support for Qt5 to qspatialite provider.
 
-Merge: 1f8e94e c7e675c
+Merge: 1f8e94e2d4 c7e675c343
 Matthias Kuhn 	2016-03-14
 
     Merge pull request #2908 from SebDieBln/Test_ImprovePanningTest
@@ -10972,14 +77321,14 @@ Médéric RIBREUX 	2016-03-12
 
     Add v.build algorithm, only for topology checking
 
-Merge: 9167e1b b253a29
+Merge: 9167e1b679 b253a29aa4
 Matthias Kuhn 	2016-03-12
 
     Merge pull request #2894 from rouault/fix_spatialite_insert
 
     Fix spatialite insert
 
-Merge: 3fd3dae 2c5d564
+Merge: 3fd3dae35a 2c5d56484a
 Matthias Kuhn 	2016-03-12
 
     Merge pull request #2902 from sebastic/qt5-globe-plugin
@@ -11006,21 +77355,21 @@ Matthias Kuhn 	2016-03-11
 
     Run more tests in Qt5 setup
 
-Merge: 145f246 4c88fc0
+Merge: 145f24676f 4c88fc0372
 Sandro Santilli 	2016-03-11
 
     Merge pull request #2892 from SebDieBln/Test_CanvasPanByKeyboard
 
     added a test for panning the canvas by keyboard
 
-Merge: 6805ba9 455a473
+Merge: 6805ba955b 455a473a28
 Hugo Mercier 	2016-03-11
 
     Merge pull request #2895 from rouault/missing_include_path_in_virtual_provider
 
     [virtual provider] Add SQLITE3_INCLUDE_DIR to CMakeLists.txt
 
-Merge: e6785ba cd96169
+Merge: e6785ba513 cd96169579
 Matthias Kuhn 	2016-03-11
 
     Merge pull request #2896 from m-kuhn/container-qt5
@@ -11095,7 +77444,7 @@ Matthias Kuhn 	2016-03-10
 
     [processing] Fix default argument is SilentProgress for GeoAlgorithm.execute()
 
-Merge: 9b35a98 72764b2
+Merge: 9b35a9885a 72764b2937
 Matthias Kuhn 	2016-03-10
 
     Merge pull request #2889 from m-kuhn/py3improvements
@@ -11106,7 +77455,7 @@ Giovanni Manghi 	2016-03-10
 
     processing: add extent parameter to gdal_warp
 
-Merge: 52621b9 c4c67b0
+Merge: 52621b9a55 c4c67b0b59
 Alexander Bruy 	2016-03-10
 
     Merge pull request #2890 from NaturalGIS/processing_better_grass7_r_cost
@@ -11157,7 +77506,7 @@ Nyall Dawson 	2016-03-10
 
     Followup 01f615d
 
-Merge: c55ef38 556b621
+Merge: c55ef386de 556b621ad6
 Nyall Dawson 	2016-03-10
 
     Merge pull request #2888 from pvalsecc/scaleDenom
@@ -11212,7 +77561,7 @@ Matthias Kuhn 	2016-03-09
 
     Python compatibility patch for 3.0-3.2
 
-Merge: 5bb1723 9c611c9
+Merge: 5bb17235c5 9c611c98e8
 volaya 	2016-03-09
 
     Merge pull request #2883 from radosuav/zonal_statistics_fix
@@ -11273,14 +77622,14 @@ Nyall Dawson 	2016-03-08
 
     Correctly set title for label svg selector dialog
 
-Merge: dc137d7 5c20b33
+Merge: dc137d771e 5c20b33a58
 Alexander Bruy 	2016-03-08
 
     Merge pull request #2881 from NaturalGIS/processing_missing_saga_shapes_polygons_tools
 
     [processing] add missing SAGA 2.2.x shapes_polygons_tools tools
 
-Merge: e08130d 2c7f40b
+Merge: e08130d716 2c7f40b65c
 Alexander Bruy 	2016-03-08
 
     Merge pull request #2873 from NaturalGIS/processing_add_extent_gdal_rasterize
@@ -11291,7 +77640,7 @@ Giovanni Manghi 	2016-03-08
 
     try fix indentation
 
-Merge: c6ebb8c cc19a57
+Merge: c6ebb8cbb8 cc19a57818
 Matthias Kuhn 	2016-03-08
 
     Merge pull request #2827 from SebDieBln/AllowNullInRelationRef
@@ -11332,7 +77681,7 @@ nirvn 	2016-03-07
 
     [svg] add fill and outline parameters to all arrows
 
-Merge: ed3cb12 b1f5b5f
+Merge: ed3cb12008 b1f5b5fd51
 Jürgen Fischer 	2016-03-07
 
     Merge pull request #2880 from rouault/avoid_busy_loop_in_QgsVectorLayerRenderer_drawRendererV2
@@ -11386,28 +77735,28 @@ Juergen E. Fischer 	2016-03-07
 
     de-plenk question and exclamation marks
 
-Merge: d30ad84 278b7f2
+Merge: d30ad84cda 278b7f2037
 Alexander Bruy 	2016-03-07
 
     Merge pull request #2878 from NaturalGIS/processing_fix_saga_2_2_x_resampling
 
     [processing] fix SAGA 2.2.x resampling
 
-Merge: 6292789 35c81b4
+Merge: 6292789f56 35c81b4b40
 Alexander Bruy 	2016-03-07
 
     Merge pull request #2877 from NaturalGIS/processing_fix_saga_2_2_x_grid_spline
 
     [processing] fix SAGA 2.2.x grid_spline tools
 
-Merge: 6d0fa65 5104438
+Merge: 6d0fa652df 5104438706
 Alexander Bruy 	2016-03-07
 
     Merge pull request #2875 from neteler/patch-74
 
     [processing] include target elevation above the ground parameter in GRASS7 r.viewshed
 
-Merge: bd140a7 6a0606b
+Merge: bd140a75bb 6a0606b6db
 Alexander Bruy 	2016-03-07
 
     Merge pull request #2874 from NaturalGIS/processing_saga_mask
@@ -11422,7 +77771,7 @@ Giovanni Manghi 	2016-03-07
 
     processing fix SAGA 2.2.* grid_spline tools
 
-Merge: a89b510 b07bbd0
+Merge: a89b51076c b07bbd043d
 Nyall Dawson 	2016-03-07
 
     Merge pull request #2852 from ahuarte47/Labeling_CheckBoundingBoxes
@@ -11459,7 +77808,7 @@ Juergen E. Fischer 	2016-03-06
 
     update qgis_labelingenginev2 test mask for ubuntu xenial
 
-Merge: 42d8884 1e90786
+Merge: 42d88848f3 1e90786be7
 Nyall Dawson 	2016-03-07
 
     Merge pull request #2868 from manisandro/next_vertex
@@ -11488,21 +77837,21 @@ Salvatore Larosa 	2016-02-06
 
     raster layer properties: fix add values from display action
 
-Merge: 7464d4d ce69d21
+Merge: 7464d4df14 ce69d21bc1
 Alexander Bruy 	2016-03-06
 
     Merge pull request #2872 from medspx/processing_localdoc
 
     [processing] use local GRASS7 help files if they exist (fix #7745)
 
-Merge: 6289786 8bdd4f3
+Merge: 6289786b86 8bdd4f336e
 Alexander Bruy 	2016-03-06
 
     Merge pull request #2870 from NaturalGIS/processing_fix_grass7_v_buffer
 
     [processing] fix GRASS7 v.buffer.column
 
-Merge: 2eb8243 f8ea9d9
+Merge: 2eb82430bb f8ea9d9268
 Alexander Bruy 	2016-03-06
 
     Merge pull request #2869 from NaturalGIS/processing_fix_saga_223_changed_modules
@@ -11554,14 +77903,14 @@ Nyall Dawson 	2016-03-05
     - test that geometry is fetched by default, but empty when
     NoGeometry flag is passed
 
-Merge: b63461c 88bddb8
+Merge: b63461c1e3 88bddb8727
 Jürgen Fischer 	2016-03-04
 
     Merge pull request #2867 from dzolo/master
 
     [FEATURE] Adds support for GNSS receivers by handling $GPRMC message (implements #12980)
 
-Merge: 61b8896 4e904f7
+Merge: 61b8896367 4e904f7e6e
 Larry Shaffer 	2016-03-04
 
     Merge pull request #2847 from alexbruy/plugin-manager-auth
@@ -11638,7 +77987,7 @@ Médéric RIBREUX 	2016-03-03
 
     Fix MS-Windows implementation for r.li.* algorithms
 
-Merge: 193fedf 3039f13
+Merge: 193fedf6c1 3039f13ea9
 volaya 	2016-03-03
 
     Merge pull request #2804 from Gustry/processing-error
@@ -11669,7 +78018,7 @@ Nyall Dawson 	2016-03-03
     these so the expression compiler needs to handle them before handing
     off to GDAL.
 
-Merge: 30449e5 0389a36
+Merge: 30449e577f 0389a36c63
 Nathan Woodrow 	2016-03-03
 
     Merge pull request #2707 from pvalsecc/layer_tooltips
@@ -11692,7 +78041,7 @@ Radim Blazek 	2016-03-02
 
     [GRASS] set PATH and PYTHONPATH in startModule() for t.list, #14241
 
-Merge: b766ac1 c0f0bd5
+Merge: b766ac1c8f c0f0bd552d
 Matthias Kuhn 	2016-03-02
 
     Merge pull request #2853 from ahuarte47/Rendering_DrawingMarkersFaster
@@ -11707,28 +78056,28 @@ Juergen E. Fischer 	2016-03-02
 
     update debian/ubuntu build dependencies in INSTALL using scripts/scandeps.pl
 
-Merge: 0061dcc 4196293
+Merge: 0061dccd91 4196293f06
 Alexander Bruy 	2016-03-02
 
     Merge pull request #2787 from medspx/processing_vdistance
 
     [processing] add GRASS7 v.distance (fix #12817)
 
-Merge: 91e222e b780d7c
+Merge: 91e222e1c0 b780d7caf1
 Alexander Bruy 	2016-03-02
 
     Merge pull request #2782 from medspx/processing_r_reclass
 
     [processing] add GRASS7 r.reclass inline rules (fix #5583)
 
-Merge: b2189f2 4772837
+Merge: b2189f22dc 477283770f
 Alexander Bruy 	2016-03-02
 
     Merge pull request #2781 from medspx/processing_grass7_rnull
 
     [processing] add r.null GRASS7 algorithm (fix #6893)
 
-Merge: 697a25d a39d258
+Merge: 697a25dd92 a39d25835c
 Alexander Bruy 	2016-03-02
 
     Merge pull request #2747 from medspx/processing_grass_vwhatrast
@@ -11844,7 +78193,7 @@ Matthias Kuhn 	2016-02-29
 
     Fix processing test readme markdown
 
-Merge: e097d6e 8a47b5c
+Merge: e097d6e69c 8a47b5cad0
 Matthias Kuhn 	2016-02-29
 
     Merge pull request #2855 from gvellut/master
@@ -11857,7 +78206,7 @@ Matthias Kuhn 	2016-02-29
 
     FLT_MIN is the smallest positive float
 
-Merge: 5090491 ee53653
+Merge: 5090491998 ee53653151
 Matthias Kuhn 	2016-02-29
 
     Merge pull request #2854 from rouault/fix_typo_in_spelling_fix
@@ -11900,7 +78249,7 @@ Juergen E. Fischer 	2016-02-29
 
     add api doc link to 2.14
 
-Merge: 4e92a13 b8948a1
+Merge: 4e92a132d2 b8948a1792
 Médéric RIBREUX 	2016-02-28
 
     Merge branch 'processing_raster_bunch' of https://github.com/medspx/QGIS into processing_raster_bunch
@@ -12141,7 +78490,7 @@ Médéric RIBREUX 	2016-02-27
 
     Add r.topmodel algorithm
 
-Merge: 6800c8d 716b17d
+Merge: 6800c8d9da 716b17d216
 Alexander Bruy 	2016-02-27
 
     Merge pull request #2840 from vpoughon/processing_plugin_otb_fixes
@@ -12156,7 +78505,7 @@ Médéric RIBREUX 	2016-02-27
 
     Add r.solute.transport algorithm
 
-Merge: 8125f61 1ce66b7
+Merge: 8125f61e21 1ce66b75d8
 Alexander Bruy 	2016-02-27
 
     Merge branch 'master' of https://github.com/ninsbl/QGIS into processing-r
@@ -12177,14 +78526,14 @@ Médéric RIBREUX 	2016-02-27
 
     Add r.ros algorithm
 
-Merge: b0643ea c931e1e
+Merge: b0643eab5c c931e1e715
 Alexander Bruy 	2016-02-27
 
     Merge pull request #2776 from medspx/processing_split_vgeneralize
 
     [processing] split v.generalize (fix #5707)
 
-Merge: eefb046 e38222b
+Merge: eefb046dab e38222b0a4
 Alexander Bruy 	2016-02-27
 
     Merge pull request #2772 from NaturalGIS/processing_grass7_v_surf_rst_line
@@ -12243,7 +78592,7 @@ Juergen E. Fischer 	2016-02-26
 
     release.pl: warn about mis-sized splash and rescale it
 
-Merge: 5b7cfbc 31e43a9
+Merge: 5b7cfbc37c 31e43a9869
 Jürgen Fischer 	2016-02-26
 
     Merge pull request #2842 from jef-n/pg-new-sslmodes
@@ -12254,7 +78603,7 @@ Juergen E. Fischer 	2016-02-26
 
     release.pl: fix tar ball creation for ltr releases
 
-Merge: c79aeba be1fd07
+Merge: c79aeba0db be1fd07733
 Matthias Kuhn 	2016-02-26
 
     Merge pull request #2630 from SrNetoChan/master
@@ -12318,7 +78667,7 @@ Patrick Valsecchi 	2016-01-20
     * abstract (if not empty)
     * URL
 
-Merge: 5a0d0bc 3e5e108
+Merge: 5a0d0bcaf2 3e5e108b1a
 Matthias Kuhn 	2016-02-26
 
     Merge pull request #2834 from m-kuhn/procStatTranslate
@@ -12345,7 +78694,7 @@ rldhont 	2016-02-25
 
     For the next release, it will be interesting to allow users to specify whether the geometries are multi.
 
-Merge: 58c85bb 3a714cc
+Merge: 58c85bb8c0 3a714ccb27
 Hugo Mercier 	2016-02-26
 
     Merge pull request #2845 from pvalsecc/column_name_validation
@@ -12383,7 +78732,7 @@ Nyall Dawson 	2016-02-26
 
     Temporarily disable test which unexpectedly fails on Travis
 
-Merge: 4e4743a 8490786
+Merge: 4e4743a2cd 8490786b03
 Nyall Dawson 	2016-02-26
 
     Merge pull request #2844 from nirvn/gps_icon_refresh
@@ -12414,7 +78763,7 @@ Nyall Dawson 	2016-02-26
 
     Always show map units as an option in coordinate format combo box
 
-Merge: 76fcb1f 8769abe
+Merge: 76fcb1f7c9 8769abe1f3
 Nyall Dawson 	2016-02-26
 
     Merge pull request #2838 from wonder-sk/fix-wgs-coords
@@ -12530,7 +78879,7 @@ Juergen E. Fischer 	2016-02-25
 
     debian packaging update
 
-Merge: 31c788d 689cbad
+Merge: 31c788d7f7 689cbad891
 Alessandro Pasotti 	2016-02-25
 
     Merge pull request #2836 from elpaso/bugfix-13291
@@ -12555,7 +78904,7 @@ Juergen E. Fischer 	2016-02-24
 
     add update-news.pl to update NEWS file from changelog.qgis.org
 
-Merge: 1af724f 630836d
+Merge: 1af724f78a 630836dfe0
 Tim Sutton 	2016-02-24
 
     Merge pull request #2837 from timlinux/master
@@ -12570,7 +78919,7 @@ elpaso 	2016-02-24
 
     [bugfix][server] Fixes #13291
 
-Merge: 395bae6 d2665826
+Merge: 395bae6fae d2665826a1
 Alessandro Pasotti 	2016-02-24
 
     Merge pull request #2829 from elpaso/server-static-initializers-construct-on-firts-use
@@ -12608,7 +78957,7 @@ Nyall Dawson 	2016-02-24
     - Rename "settings" to "options" for consistency with main window
     - Remove some excessive use of separators
 
-Merge: d11e667 61bb01b
+Merge: d11e66749b 61bb01b5b6
 Nyall Dawson 	2016-02-24
 
     Merge pull request #2745 from medspx/gdal_invalid_messagebar
@@ -12647,7 +78996,7 @@ Matthias Kuhn 	2016-02-23
 
     Update README.md
 
-Merge: 5085204 58751b5
+Merge: 5085204c51 58751b5063
 Matthias Kuhn 	2016-02-23
 
     Merge pull request #2832 from m-kuhn/checkXmlKeys
@@ -12662,7 +79011,7 @@ Matthias Kuhn 	2016-02-23
 
     More documentation for processing tests
 
-Merge: 50aa805 5f0173e
+Merge: 50aa805832 5f0173ed82
 Matthias Kuhn 	2016-02-23
 
     Merge pull request #2761 from m-kuhn/ptest
@@ -12675,7 +79024,7 @@ Matthias Kuhn 	2016-02-23
 
     Fixes #14136
 
-Merge: b97e86d e99ccb7
+Merge: b97e86da41 e99ccb7930
 Matthias Kuhn 	2016-02-23
 
     Merge pull request #2778 from SebDieBln/FixOrphanedWidgetConfigs
@@ -12798,7 +79147,7 @@ Sandro Santilli 	2016-02-22
     Greatly improves performances on topology loading.
     See http://hub.qgis.org/issues/14356
 
-Merge: 3a8c1c7 3df100f
+Merge: 3a8c1c76ae 3df100f9a0
 Alessandro Pasotti 	2016-02-22
 
     Merge pull request #2830 from elpaso/server-fix-info_format2
@@ -12878,14 +79227,14 @@ Radim Blazek 	2016-02-22
 
     [GRASS] new mapset: re-enable set extent button if canvas extent is valid
 
-Merge: 70ff8b5 3f9263b
+Merge: 70ff8b5b3e 3f9263b4b8
 Alexander Bruy 	2016-02-22
 
     Merge pull request #2819 from NaturalGIS/processing_fix_grass_grass7_r_sunmask
 
     [processing] fix GRASS and GRASS7 r.sunmask
 
-Merge: a1672da e4dba1e
+Merge: a1672da17c e4dba1e4ce
 Richard Duivenvoorde 	2016-02-22
 
     Merge pull request #2826 from DelazJ/patch-1
@@ -12931,7 +79280,7 @@ Nyall Dawson 	2016-02-16
 
     Fix slow filter rect requests with server python plugins (refs #13919)
 
-Merge: 4485d3a e503c70
+Merge: 4485d3abcf e503c705a1
 Jürgen Fischer 	2016-02-21
 
     Merge pull request #2817 from jef-n/geometryv2-cache-cs
@@ -12956,14 +79305,14 @@ Médéric RIBREUX 	2016-02-21
 
     Add r.series.interp algorithm
 
-Merge: 959952e 6116fdc
+Merge: 959952e134 6116fdcdb4
 Jürgen Fischer 	2016-02-21
 
     Merge pull request #2824 from nyalldawson/geombbox
 
     Optimise storage/calculation of geometry bounding boxes
 
-Merge: a0a20ea 607642a
+Merge: a0a20eaf60 607642a562
 Matthias Kuhn 	2016-02-21
 
     Merge pull request #2820 from NaturalGIS/processing_fix_saga_223_detection
@@ -12976,7 +79325,7 @@ Harrissou Sant-anna 	2016-02-21
 
     Given that the canvas rotation is in QGIS for many releases, it may be time to remove the "experimental" attribute in the label
 
-Merge: 4c63c85 23802eb
+Merge: 4c63c85cca 23802eb5b7
 Matthias Kuhn 	2016-02-21
 
     Merge pull request #2825 from m-kuhn/processingTestFiles
@@ -13054,7 +79403,7 @@ Sebastian Dietrich 	2016-01-23
     remove the accompanying QgsEditorWidgetConfig when removing a field
     (refs #14136)
 
-Merge: 07240e3 7431ec6
+Merge: 07240e31c2 7431ec6528
 Matthias Kuhn 	2016-02-20
 
     Merge pull request #2816 from SebDieBln/FixDuplicateJoins
@@ -13073,7 +79422,7 @@ Médéric RIBREUX 	2016-02-20
 
     Add r.latlong algorithm
 
-Merge: 1e80a98 ec0be3c
+Merge: 1e80a984df ec0be3ca6c
 Jürgen Fischer 	2016-02-20
 
     Merge pull request #2813 from rouault/avoid_astyle_writing_unmodified_files
@@ -13092,7 +79441,7 @@ Alexander Bruy 	2016-02-19
 
     fix failing indenation test
 
-Merge: db1142e 141a0a2
+Merge: db1142e4fe 141a0a26fb
 Alexander Bruy 	2016-02-19
 
     Merge pull request #2815 from NaturalGIS/processing_fix_grass7_r_water_outlet
@@ -13103,7 +79452,7 @@ Giovanni Manghi 	2016-02-19
 
     processing fox GRASS7 r.water.outlet
 
-Merge: 7f56c5d 3215247
+Merge: 7f56c5d104 3215247c71
 Alexander Bruy 	2016-02-19
 
     Merge pull request #2814 from NaturalGIS/processing_fix_gdal_rasterize
@@ -13138,7 +79487,7 @@ Juergen E. Fischer 	2016-02-19
     also log rendering times of individual layers when debugging output is
     enabled
 
-Merge: 410fe32 bbc8feb
+Merge: 410fe32b08 bbc8feb835
 Alessandro Pasotti 	2016-02-19
 
     Merge pull request #2812 from elpaso/accesscontrol-api-docs
@@ -13149,7 +79498,7 @@ elpaso 	2016-02-19
 
     Added new plugin filters to server api docs
 
-Merge: 6f39375 1a29030
+Merge: 6f393751aa 1a29030383
 Jürgen Fischer 	2016-02-19
 
     Merge pull request #2802 from ahuarte47/Issue_RemoveMap2screenMethods
@@ -13183,7 +79532,7 @@ Nyall Dawson 	2016-02-19
 
     Fix "feature rendering order" checkbox is not honored (fix #14323)
 
-Merge: d8a5e0f bcd3d92
+Merge: d8a5e0fc45 bcd3d92fa9
 Alexander Bruy 	2016-02-18
 
     Merge pull request #2808 from m-kuhn/proclogtitle
@@ -13203,7 +79552,7 @@ Médéric Ribreux 	2016-02-15
 
     Add r.category algorithms
 
-Merge: 30a738f 5c62a17
+Merge: 30a738f981 5c62a1750e
 Alexander Bruy 	2016-02-18
 
     Merge branch 'saga-223'
@@ -13230,7 +79579,7 @@ Hugo Mercier 	2016-02-17
 
     Keep Z/M information when digitizing from a snapped point (fixes #14318)
 
-Merge: 9bf3b2e 97ab3d9
+Merge: 9bf3b2ef99 97ab3d957d
 Nyall Dawson 	2016-02-18
 
     Merge pull request #2807 from SebDieBln/FixOrderByDialogParent
@@ -13337,7 +79686,7 @@ Hugo Mercier 	2016-02-16
     Happens for instance when a embedded layer is added but
     dependent layers cannot be resolved
 
-Merge: 8353698 40c6505
+Merge: 8353698633 40c65059b4
 Matthias Kuhn 	2016-02-17
 
     Merge pull request #2798 from SebDieBln/Fix_cboRenderingOrder
@@ -13348,7 +79697,7 @@ Radim Blazek 	2016-02-17
 
     [GRASS] disable new mapset action if init failed
 
-Merge: d40d887 24a07de
+Merge: d40d8875e5 24a07de336
 Nyall Dawson 	2016-02-17
 
     Merge pull request #2801 from nirvn/virtual_layer_icon
@@ -13359,7 +79708,7 @@ nirvn 	2016-02-17
 
     [ui] improve new memory layer icon
 
-Merge: 9141360 dcc1511
+Merge: 91413609cb dcc1511ecd
 Nyall Dawson 	2016-02-17
 
     Merge pull request #2800 from nirvn/virtual_layer_icon
@@ -13370,7 +79719,7 @@ nirvn 	2016-02-17
 
     [ui] improve virtual layer icon
 
-Merge: f468f65 5ae2105
+Merge: f468f65d47 5ae21054d8
 Nyall Dawson 	2016-02-17
 
     Merge pull request #2799 from nirvn/additional_selection_icons
@@ -13381,7 +79730,7 @@ nirvn 	2016-02-17
 
     [ui] update a few more selection-related icons
 
-Merge: d2679d6 b4ee36d
+Merge: d2679d6dbd b4ee36d86d
 Nyall Dawson 	2016-02-17
 
     Merge pull request #2791 from nirvn/labeling_icons_v2
@@ -13407,7 +79756,7 @@ Sandro Santilli 	2016-02-10
     Fixes #13958
     Includes test for signed integer attributes
 
-Merge: 103856c 8e9b8c7
+Merge: 103856c976 8e9b8c77cf
 Alexander Bruy 	2016-02-16
 
     Merge pull request #2788 from medspx/processing_fix_vdbselect
@@ -13438,7 +79787,7 @@ Juergen E. Fischer 	2016-02-16
 
     add sip bindings to QgsCredentialsNone (followup 42bc9387)
 
-Merge: 42bc938 f99ed7a
+Merge: 42bc938700 f99ed7a0e7
 Matthias Kuhn 	2016-02-16
 
     Merge pull request #2783 from SebDieBln/FixVectorDialogTitle
@@ -13582,7 +79931,7 @@ Nyall Dawson 	2016-02-15
     Add square nautical miles as a supported areal unit, add API
     method for converting a distance unit to corresponding area unit
 
-Merge: 3600046 8359bfe
+Merge: 36000463ff 8359bfe40c
 Jürgen Fischer 	2016-02-15
 
     Merge pull request #2790 from SebDieBln/ImproveVersionCheck
@@ -13637,7 +79986,7 @@ Juergen E. Fischer 	2016-02-14
 
     fix git marker detection (fixes #13680)
 
-Merge: ddbdcf8 0ab3653
+Merge: ddbdcf8ab1 0ab3653831
 Jürgen Fischer 	2016-02-14
 
     Merge pull request #2789 from SebDieBln/DbManager_FixMoveToSchema
@@ -13701,7 +80050,7 @@ Juergen E. Fischer 	2016-02-14
 
     sip sync
 
-Merge: be49097 77bd695
+Merge: be4909776b 77bd6953a6
 Werner Macho 	2016-02-13
 
     Merge pull request #2784 from Cracert/trans2
@@ -13819,7 +80168,7 @@ Hugo Mercier 	2016-02-12
 
     Fix DependencySorter.sortedLayerIds. Fixes #14281
 
-Merge: a111889 384da56
+Merge: a111889973 384da5665e
 Martin Dobias 	2016-02-12
 
     Merge pull request #2729 from dgoedkoop/digitisecrs2
@@ -13866,7 +80215,7 @@ Radim Blazek 	2016-02-11
 
     [GRASS] fixed module search on windows, fixes #14241
 
-Merge: 169d35f 5d19a3b
+Merge: 169d35f319 5d19a3b21b
 Alexander Bruy 	2016-02-11
 
     Merge pull request #2774 from medspx/processing_fix_parameternumber
@@ -13885,7 +80234,7 @@ Juergen E. Fischer 	2016-02-10
 
     adapt wfs capabilities test data to d11c689e
 
-Merge: 9e0043c e9e4954
+Merge: 9e0043cd4b e9e4954c58
 Alexander Bruy 	2016-02-10
 
     Merge pull request #2775 from NaturalGIS/processing_fix_saga_default_extent
@@ -13929,7 +80278,7 @@ Juergen E. Fischer 	2016-02-09
 
     fix windows build (followup 58beed24)
 
-Merge: ded1ebb d05c31e
+Merge: ded1ebb33b d05c31ea19
 Jürgen Fischer 	2016-02-09
 
     Merge pull request #2748 from jef-n/wkb-bounds-check
@@ -13974,21 +80323,21 @@ Juergen E. Fischer 	2016-02-09
 
     indentation fixes
 
-Merge: 686ad24 3593a3a
+Merge: 686ad242c1 3593a3a12c
 Alexander Bruy 	2016-02-09
 
     Merge pull request #2768 from NaturalGIS/processing_fix_gdal_string
 
     [processing] fix non-translatable string in GDAL/Aspect
 
-Merge: a5ddf92 7072db4
+Merge: a5ddf92dfb 7072db4c47
 Alexander Bruy 	2016-02-09
 
     Merge pull request #2769 from NaturalGIS/processing_fix_gdal_optional_parameters
 
     [processing] fix a few GDAL/OGR optional parameters
 
-Merge: 41ac88a 24ce6d2
+Merge: 41ac88ad3e 24ce6d239b
 Alexander Bruy 	2016-02-09
 
     Merge pull request #2770 from NaturalGIS/processing_fix_ogr_convert_format
@@ -14027,14 +80376,14 @@ Juergen E. Fischer 	2016-02-09
 
     indentation fix
 
-Merge: 4309b86 5e5ddaf
+Merge: 4309b86207 5e5ddafb0e
 volaya 	2016-02-09
 
     Merge pull request #2767 from NaturalGIS/processing_fix_gdal_nearblack
 
     fix Processing GDAL near black tool
 
-Merge: 63d9fec f49dbdc
+Merge: 63d9fec54b f49dbdc299
 volaya 	2016-02-09
 
     Merge pull request #2771 from medspx/fix_processing_grass_overwrite
@@ -14073,7 +80422,7 @@ volaya 	2016-02-08
 
     [processing] fixed typo in saga supported versions
 
-Merge: b712f3c ed06bb6
+Merge: b712f3cf4b ed06bb67cc
 Nyall Dawson 	2016-02-08
 
     Merge pull request #2766 from nirvn/composer_icon_improvements
@@ -14093,7 +80442,7 @@ Nyall Dawson 	2016-02-07
     - Fix display of calculation details, was misleading and
     inaccurate for many CRS/unit combinations
 
-Merge: 0044666 4755f7b
+Merge: 0044666486 4755f7b89b
 Nyall Dawson 	2016-02-07
 
     Merge pull request #2756 from Gustry/transparency
@@ -14121,7 +80470,7 @@ nirvn 	2016-02-07
 
     [gui] update selection icons for composer windows
 
-Merge: 093eb41 1b85829
+Merge: 093eb419df 1b858292af
 Nyall Dawson 	2016-02-07
 
     Merge pull request #2764 from nirvn/select_icons_refresh
@@ -14136,7 +80485,7 @@ Webmaster 	2016-02-06
 
     [gui] refresh selection-related icons
 
-Merge: 1ae03be b625a1d
+Merge: 1ae03be59b b625a1dc81
 Nyall Dawson 	2016-02-06
 
     Merge pull request #2763 from nirvn/selection_toolbar_improvement_v3
@@ -14152,7 +80501,7 @@ Juergen E. Fischer 	2016-02-04
     add internal nose2 (not available on precise) and update internal six
     for processing tests
 
-Merge: 070b28a 95030d6
+Merge: 070b28a800 95030d61dc
 Jürgen Fischer 	2016-02-05
 
     Merge pull request #2757 from manisandro/pool_invalidate_release
@@ -14169,7 +80518,7 @@ Nyall Dawson 	2016-02-05
     Improve QgsDistanceArea API to make it easier to determine units
     for returned distances, add unit tests
 
-Merge: 57b5eb9 7fc88c2
+Merge: 57b5eb954e 7fc88c26ea
 Alexander Bruy 	2016-02-05
 
     Merge pull request #2700 from alexbruy/actions-encoding
@@ -14196,7 +80545,7 @@ Juergen E. Fischer 	2016-02-04
 
     field expression widget: silence connect/disconnect noise
 
-Merge: dbd83b3 c4addc2
+Merge: dbd83b3ee1 c4addc2d02
 Matthias Kuhn 	2016-02-04
 
     Merge pull request #2759 from ar-jan/typo-fix-attribute-table-help
@@ -14207,21 +80556,21 @@ Arjan Mossel 	2016-02-04
 
     Fix typo in attribute table context help
 
-Merge: c35567b 427b9c9
+Merge: c35567b327 427b9c9734
 Alexander Bruy 	2016-02-04
 
     Merge pull request #2733 from nirvn/processing_memory_datetime
 
     [processing] add date, datetime, time fields to memory output
 
-Merge: 3b2a76f 191c011
+Merge: 3b2a76f4c4 191c011a0a
 Alexander Bruy 	2016-02-04
 
     Merge pull request #2746 from NaturalGIS/fix_grass_r_slope_aspect
 
     [processing] add parameter to GRASS 64/70 r.slope.aspect to allow use region resolution (ref #9979)
 
-Merge: 27f1637 8b84f3a
+Merge: 27f1637fb1 8b84f3adb0
 Matthias Kuhn 	2016-02-04
 
     Merge pull request #2648 from m-kuhn/processingtests
@@ -14489,7 +80838,7 @@ Juergen E. Fischer 	2016-02-02
 
     spelling fixes
 
-Merge: 68e3fdc 0bb5b5b
+Merge: 68e3fdcfc6 0bb5b5bba8
 Nyall Dawson 	2016-02-02
 
     Merge pull request #2752 from rouault/ogr_curve_geometries
@@ -14541,14 +80890,14 @@ Nyall Dawson 	2016-02-01
 
     Fix memory leak
 
-Merge: 2797ed7 f8a50b5
+Merge: 2797ed79b0 f8a50b510e
 Nyall Dawson 	2016-02-01
 
     Merge pull request #2749 from pvalsecc/add_selectall
 
     Add select all button to the attribute table dialog
 
-Merge: 793e7b2 d6169b8
+Merge: 793e7b28fc d6169b8d3d
 Denis Rouzaud 	2016-02-01
 
     Merge pull request #2743 from 3nids/testfieldwidget2
@@ -14636,14 +80985,14 @@ Nyall Dawson 	2016-01-31
     Add polygon layers to provider tests, so we can test ExactIntersect
     feature requests
 
-Merge: c1f7257 f1f0b0a
+Merge: c1f7257b24 f1f0b0a341
 Alexander Bruy 	2016-01-31
 
     Merge pull request #2742 from NaturalGIS/fix_grass_v_dissolve
 
     [processing] GRASS dissolve works only with areas
 
-Merge: df88a9f 9d473aa
+Merge: df88a9f5c6 9d473aaec2
 Nyall Dawson 	2016-01-31
 
     Merge pull request #2682 from alexbruy/field-precision
@@ -14657,7 +81006,7 @@ Nyall Dawson 	2016-01-31
     Also add some additional tests to ProviderTestCase for closed iterators
     and subset string handling.
 
-Merge: 4c8fcc5 84e8b10
+Merge: 4c8fcc522a 84e8b10d2d
 Nyall Dawson 	2016-01-31
 
     Merge pull request #2730 from PeterPetrik/13669_duplicate_circular_string_nodes
@@ -14694,7 +81043,7 @@ Salvatore Larosa 	2016-01-30
 
     change toolbar icon size to 24x24 for the customization dialog
 
-Merge: 772dc1d 65c6e36
+Merge: 772dc1d28f 65c6e362f7
 Salvatore Larosa 	2016-01-30
 
     Merge pull request #2740 from DelazJ/btnNewLinePushButton
@@ -14711,7 +81060,7 @@ Juergen E. Fischer 	2016-01-30
 
     oracle provider: enable server-side simplification only with Locator >=11g or Spatial
 
-Merge: 0e4520f 6f70953
+Merge: 0e4520fc73 6f70953451
 Jürgen Fischer 	2016-01-30
 
     Merge pull request #2738 from ahuarte47/OracleSimplifyProviderSide
@@ -14766,7 +81115,7 @@ volaya 	2016-01-29
 
     [processing] added option to not show disabled providers tooltip
 
-Merge: 70d5c1b e15c7fb
+Merge: 70d5c1b74e e15c7fb96c
 Tim Sutton 	2016-01-29
 
     Merge pull request #2734 from timlinux/master
@@ -14792,7 +81141,7 @@ Matthias Kuhn 	2016-01-28
     GDAL arguments need to be str since they are passed as unencoded const
     char*.
 
-Merge: ecfcd31 b66002d
+Merge: ecfcd319ef b66002d0ab
 Alexander Bruy 	2016-01-28
 
     Merge pull request #2592 from alexbruy/layertree-drag-n-drop
@@ -14864,7 +81213,7 @@ volaya 	2016-01-28
 
     [processing] fixed group names in lidar provider
 
-Merge: 9f52046 e707091
+Merge: 9f52046618 e707091932
 rldhont 	2016-01-28
 
     Merge branch 'marcel-dancak-master-bugfix_13527'
@@ -14902,7 +81251,7 @@ Nyall Dawson 	2016-01-28
     Now that the test has been improved we can safely bump the timeout
     up a lot
 
-Merge: bc4d16e 4c24792
+Merge: bc4d16e8d9 4c24792b42
 Nathan Woodrow 	2016-01-28
 
     Merge pull request #2509 from SebDieBln/FixTipWindow
@@ -14924,7 +81273,7 @@ Denis Rouzaud 	2016-01-27
 
     use digitizing color for label editing rubber band
 
-Merge: cce4b2d d6bd8d0
+Merge: cce4b2db9e d6bd8d0c32
 Denis Rouzaud 	2016-01-27
 
     Merge pull request #2726 from medspx/bugfix_external_resource
@@ -14976,14 +81325,14 @@ Alexander Bruy 	2016-01-27
     Having Processing modeler non-modal risky as user can add/remove
     new providers and this changes will not be reflected in the modeler
 
-Merge: 80e3f8f b4561a9
+Merge: 80e3f8fc74 b4561a9283
 Martin Dobias 	2016-01-27
 
     Merge pull request #2496 from SebDieBln/App_OptionsAsFiles
 
     Accept option '--' to mark all following arguments as files (refs #3714)
 
-Merge: 0d433b0 6731ddf
+Merge: 0d433b092e 6731ddfcdc
 Nathan Woodrow 	2016-01-27
 
     Merge pull request #2704 from SebDieBln/FixFieldCalcDialogParent
@@ -15073,7 +81422,7 @@ Sebastian Dietrich 	2016-01-22
     [DbManager] fetch type of view (materialized or not) and show in info
     (refs #13829)
 
-Merge: 7b01b41 9c0aaa9
+Merge: 7b01b414fd 9c0aaa9dbe
 Nyall Dawson 	2016-01-27
 
     Merge pull request #2713 from nirvn/fix_memory_layer_datetime
@@ -15098,7 +81447,7 @@ Nyall Dawson 	2016-01-27
 
     Fix crash when opening new virtual layer dialog
 
-Merge: 99b9a49 f8d5938
+Merge: 99b9a495b8 f8d593855f
 Nyall Dawson 	2016-01-27
 
     Merge pull request #2723 from mhugo/fix_vlayer_ui
@@ -15115,14 +81464,14 @@ Hugo Mercier 	2016-01-26
 
     Fix virtual layer creation GUI
 
-Merge: 21b095d e4ee315
+Merge: 21b095d7a3 e4ee3156b2
 Alexander Bruy 	2016-01-26
 
     Merge pull request #2705 from SebDieBln/FixVectorGridLock
 
     [fTools] restore 1:1 ratio when checking 'Lock 1:1 ratio' checkbox
 
-Merge: 24d9c65 3418dd0
+Merge: 24d9c65494 3418dd003d
 Hugo Mercier 	2016-01-26
 
     Merge pull request #2719 from mhugo/fix_wkbtype
@@ -15143,7 +81492,7 @@ Martin Dobias 	2016-01-25
 
     Improve renderer class documentation (refs #14025)
 
-Merge: 82eabb1 fe2503d
+Merge: 82eabb1976 fe2503dab3
 Matthias Kuhn 	2016-01-25
 
     Merge pull request #2702 from alexbruy/styles-bindings
@@ -15232,7 +81581,7 @@ Nyall Dawson 	2016-01-24
     it makes sense for them to be written in a way that makes it easy
     for the compiler to optimise them/inline them.
 
-Merge: bbfcbca da43fb7
+Merge: bbfcbcae10 da43fb70e7
 Matthias Kuhn 	2016-01-24
 
     Merge pull request #2715 from SebDieBln/FixWarnDualViewLayout
@@ -15254,7 +81603,7 @@ Nyall Dawson 	2016-01-24
     which caused issues for the python bindings (eg, they had a choice of
     either leaking or being crashy).
 
-Merge: 764c649 df4c0c1
+Merge: 764c649842 df4c0c1247
 Jürgen Fischer 	2016-01-24
 
     Merge pull request #2716 from SebDieBln/LoadShowPlusSign
@@ -15370,14 +81719,14 @@ Nyall Dawson 	2016-01-22
     using server access control (refs #13919), and a potential crash with
     diagrams
 
-Merge: 68cbb44 a453f72
+Merge: 68cbb44c38 a453f72c17
 Matthias Kuhn 	2016-01-22
 
     Merge pull request #2711 from SebDieBln/HideWelcomeOnLoadProject
 
     [Bugfix] Always hide the welcome screen when the first project is loaded
 
-Merge: 28b541a 36d2e7b
+Merge: 28b541ab4b 36d2e7b1bb
 Nyall Dawson 	2016-01-22
 
     Merge pull request #2712 from nirvn/renderer_icons_v2
@@ -15466,7 +81815,7 @@ Nyall Dawson 	2016-01-22
 
     astyle fix
 
-Merge: c7231c3 b00950b
+Merge: c7231c3703 b00950b9d6
 Sandro Mani 	2016-01-21
 
     Merge pull request #2709 from manisandro/geom_checker_fixes
@@ -15497,7 +81846,7 @@ Alexander Bruy 	2016-01-21
 
     [fTools] use QErrorMessage for long errors (fix #11810)
 
-Merge: c38ee41 0012761
+Merge: c38ee41f5b 0012761ab3
 Jürgen Fischer 	2016-01-21
 
     Merge pull request #2708 from boundlessgeo/postgis-pki-fix
@@ -15568,7 +81917,7 @@ Alexander Bruy 	2016-01-20
 
     [processing] exclude commented R libraries when generating dependencies list (fix #14143)
 
-Merge: 45d5b1c fc6f2cb
+Merge: 45d5b1c875 fc6f2cbf21
 Matthias Kuhn 	2016-01-20
 
     Merge pull request #2691 from m-kuhn/fixrulebased
@@ -15595,7 +81944,7 @@ Alexander Bruy 	2016-01-20
 
     [processing] register Processing menu items in the Shortcuts Manager (addresses #13715)
 
-Merge: cc33c12 13ccf70
+Merge: cc33c12660 13ccf70e1a
 Denis Rouzaud 	2016-01-20
 
     Merge pull request #2699 from 3nids/test_join_pg
@@ -15635,14 +81984,14 @@ Martin Dobias 	2016-01-20
     Also, the warning "too many features" is hidden immediately when there
     is reasonable amount of features (before it would stick there until timeout).
 
-Merge: 1c3f066 af30b29
+Merge: 1c3f066edf af30b292bc
 Alexander Bruy 	2016-01-20
 
     Merge pull request #2634 from alexbruy/wfs-dialog
 
     option to keep WFS dialog open after adding layer(s)
 
-Merge: 9fda6aa 77a0b88
+Merge: 9fda6aaf53 77a0b88a6f
 Alexander Bruy 	2016-01-20
 
     Merge pull request #2643 from alexbruy/sublayers
@@ -15675,7 +82024,7 @@ Nyall Dawson 	2016-01-11
 
     Add some tolerance to font marker test
 
-Merge: 81448f8 01603d7
+Merge: 81448f8541 01603d728c
 Denis Rouzaud 	2016-01-19
 
     Merge pull request #2697 from SebDieBln/FixVectorJoinDialog
@@ -15694,7 +82043,7 @@ Martin Dobias 	2016-01-19
 
     Move tracing action creation to qgis app
 
-Merge: 69cb0c4 aa3e550
+Merge: 69cb0c4ed3 aa3e550a2f
 mhugent 	2016-01-19
 
     Merge pull request #2666 from mhugent/symbology_brush_transform
@@ -15732,14 +82081,14 @@ Martin Dobias 	2016-01-19
 
     Fix crash while tracing and a layer is removed (fixes #14130)
 
-Merge: 472fa9b 47aeb59
+Merge: 472fa9bb08 47aeb596b5
 Sandro Mani 	2016-01-19
 
     Merge pull request #2688 from manisandro/geom_checker_fixes
 
     Geom checker fixes
 
-Merge: 670ded3 bae8651
+Merge: 670ded3d06 bae865153f
 Giuseppe Sucameli 	2016-01-19
 
     Merge pull request #2696 from mdouchin/debug_dbmanager_sqlite_layer_info
@@ -15822,7 +82171,7 @@ volaya 	2016-01-19
 
     fixes #14129
 
-Merge: 7e642df 9159573
+Merge: 7e642df52b 9159573f1a
 Jürgen Fischer 	2016-01-19
 
     Merge pull request #2694 from nirvn/kml_improve_default
@@ -15855,7 +82204,7 @@ Sebastian Dietrich 	2016-01-19
 
     Hide excepted layers even if all types of layers are allowed.
 
-Merge: e2e3604 9d5617d
+Merge: e2e3604784 9d5617deea
 Nyall Dawson 	2016-01-19
 
     Merge pull request #2693 from SebDieBln/FixAllLayersFilterConstant
@@ -15899,7 +82248,7 @@ Hugo Mercier 	2016-01-18
 
     Fix quotedValue in postgres sql expression compiler
 
-Merge: 1474c07 57ee08e
+Merge: 1474c0783f 57ee08e023
 Nyall Dawson 	2016-01-19
 
     Merge pull request #2687 from whatnick/master
@@ -16004,7 +82353,7 @@ Juergen E. Fischer 	2016-01-18
 
     fix warnings
 
-Merge: f966c42 ed80951
+Merge: f966c422c5 ed80951db2
 Jürgen Fischer 	2016-01-17
 
     Merge pull request #2686 from SebDieBln/FixPostgresWarnings
@@ -16020,7 +82369,7 @@ Alexander Bruy 	2016-01-15
 
     don't allow field precision greater than field width (fix #14019, #5154)
 
-Merge: ed5284f dc22820
+Merge: ed5284f1df dc2282091b
 Jürgen Fischer 	2016-01-17
 
     Merge pull request #2684 from SebDieBln/AstyleOptionsFile
@@ -16039,7 +82388,7 @@ Nyall Dawson 	2016-01-17
 
     Update test mask
 
-Merge: 1cd4570 52442f5
+Merge: 1cd4570136 52442f5ed9
 Jürgen Fischer 	2016-01-16
 
     Merge pull request #2683 from SebDieBln/FixNonVectorQLR
@@ -16155,7 +82504,7 @@ Matthias Kuhn 	2016-01-14
 
         setValue( QString( "40" ) )
 
-Merge: 01434e8 8ee25b7
+Merge: 01434e8754 8ee25b7e17
 Matthias Kuhn 	2016-01-15
 
     Merge pull request #2678 from m-kuhn/transaction-group
@@ -16225,14 +82574,14 @@ Marco Hugentobler 	2016-01-15
 
     Disable unit tests and add enum value to sip
 
-Merge: df27c07 b68ee3d
+Merge: df27c07d5f b68ee3d8f9
 volaya 	2016-01-15
 
     Merge pull request #2669 from volaya/otb_version
 
     [processing] improved version detection mechanism for OTB
 
-Merge: 864e192 b146c3e
+Merge: 864e1921e6 b146c3edfc
 volaya 	2016-01-15
 
     Merge pull request #4 from alexbruy/otb-indentation
@@ -16255,7 +82604,7 @@ Nyall Dawson 	2016-01-14
 
     Sponsored by Andreas Neumann
 
-Merge: 275eb94 2a12f01
+Merge: 275eb9463d 2a12f0189b
 Larry Shaffer 	2016-01-14
 
     Merge pull request #2674 from boundlessgeo/postgis-pki-pr
@@ -16388,7 +82737,7 @@ Nyall Dawson 	2016-01-14
 
     Use constGeometry to avoid some QgsFeature detachments
 
-Merge: 184db1a 9dc7662
+Merge: 184db1aa28 9dc7662e17
 Nyall Dawson 	2016-01-14
 
     Merge pull request #2670 from pvalsecc/xlsx_ods
@@ -16455,7 +82804,7 @@ Matthias Kuhn 	2015-12-24
 
     Add rendering extent information to expression context
 
-Merge: ea92e11 89a1ad5
+Merge: ea92e110ff 89a1ad5ede
 Alexander Bruy 	2016-01-13
 
     Merge pull request #2628 from medspx/work_vnet_processing
@@ -16475,7 +82824,7 @@ Martin Dobias 	2016-01-13
 
     [tracer] Renaming to camelCase, no actual code changes
 
-Merge: b0bfa5f 17f85f6
+Merge: b0bfa5feb5 17f85f62fe
 Martin Dobias 	2016-01-13
 
     Merge pull request #2665 from wonder-sk/auto-trace
@@ -16498,7 +82847,7 @@ Martin Dobias 	2016-01-13
 
     Original specs for the curious ones (the interaction with QGIS is slightly improved from what has been specified): http://www.lutraconsulting.co.uk/crowdfunding/autotrace-phase-2/specification.pdf
 
-Merge: c69afc9 1c44122
+Merge: c69afc9e6d 1c44122e29
 Hugo Mercier 	2016-01-13
 
     Merge pull request #2662 from mhugo/vlayer_expr
@@ -16626,14 +82975,14 @@ Nyall Dawson 	2016-01-13
 
     Reorder label modes combo box
 
-Merge: 21cdefa ab83b82
+Merge: 21cdefa7e8 ab83b82593
 Nyall Dawson 	2016-01-13
 
     Merge pull request #2542 from SebDieBln/RefreshStyleWidgetOnLoadStyle
 
     Refresh the label style widget when loading a new style (fixes #13667)
 
-Merge: 7495d9e e5f1d87
+Merge: 7495d9eada e5f1d87506
 Nyall Dawson 	2016-01-13
 
     Merge pull request #2667 from SebDieBln/ZoomToFeatureIds
@@ -16644,7 +82993,7 @@ Nyall Dawson 	2016-01-13
 
     Followup 9dccce8, nicer error messages
 
-Merge: 9dccce8 7b5c96c
+Merge: 9dccce87ee 7b5c96c6ff
 Nyall Dawson 	2016-01-13
 
     Merge pull request #2492 from SebDieBln/NoCopyPasteOnDuplicateLayer
@@ -16708,14 +83057,14 @@ Alexander Bruy 	2016-01-12
 
     [processing] allow multiple threshold values for GRASS v.clean.advanced algorithm (fix #13748)
 
-Merge: 3febba2 e45603a
+Merge: 3febba279d e45603a96f
 mhugent 	2016-01-12
 
     Merge pull request #2595 from SebDieBln/ImproveDigitizingTools
 
     Improve digitizing tools for circular strings
 
-Merge: e351d24 fb996ae
+Merge: e351d24a7d fb996ae7fa
 mhugent 	2016-01-12
 
     Merge pull request #2619 from mhugent/zoom_to_feature
@@ -16726,21 +83075,21 @@ Matthias Kuhn 	2016-01-08
 
     More types support for QgsVectorFileWriter
 
-Merge: 0491996 653a1e6
+Merge: 04919963f7 653a1e655f
 Nyall Dawson 	2016-01-12
 
     Merge pull request #2644 from nirvn/move_save_btn
 
     [ui] move the save symbol button
 
-Merge: b828062 d26bd46
+Merge: b82806218d d26bd46d99
 Matthias Kuhn 	2016-01-12
 
     Merge pull request #2616 from SebDieBln/FixLayerCountAttribute
 
     Remove the 'layercount' attribute in a project file
 
-Merge: e26ef82 fe71a3f
+Merge: e26ef82890 fe71a3f5e1
 Matthias Kuhn 	2016-01-12
 
     Merge pull request #2663 from radosuav/fix_AlgorithmDialogBase_closeEvent
@@ -16847,7 +83196,7 @@ Martin Dobias 	2016-01-11
 
     [tracer] improved reporting of warnings
 
-Merge: 716664e 9472c98
+Merge: 716664e749 9472c98686
 Alexander Bruy 	2016-01-11
 
     Merge pull request #2650 from mhugo/processing_vlayer
@@ -16908,7 +83257,7 @@ Alexander Bruy 	2016-01-11
 
     [processing] try to fix HiDPI issue with Help tab
 
-Merge: be5d657 bbf2137
+Merge: be5d657c27 bbf2137940
 Hugo Mercier 	2016-01-11
 
     Merge pull request #2647 from mhugo/vlayer_gui
@@ -16923,7 +83272,7 @@ volaya 	2016-01-11
 
     [processing] removed unused constant
 
-Merge: 2ac5fab cbb426b
+Merge: 2ac5fabee9 cbb426b5f2
 Denis Rouzaud 	2016-01-11
 
     Merge pull request #2658 from SebDieBln/FixWarningQLayout
@@ -16943,7 +83292,7 @@ volaya 	2016-01-10
 
     [processing] removed unused code
 
-Merge: 312de68 b30d339
+Merge: 312de68331 b30d3396eb
 Nyall Dawson 	2016-01-11
 
     Merge pull request #2657 from SebDieBln/AddToContributors
@@ -17032,14 +83381,14 @@ Radim Blazek 	2016-01-09
 
     [GRASS] slot fix, fixes #13816
 
-Merge: f3d1f8b 7b2d03b
+Merge: f3d1f8b8dc 7b2d03ba56
 Nyall Dawson 	2016-01-09
 
     Merge pull request #2649 from SebDieBln/StyleManager_ImportGroupName
 
     [StyleManager] Respect entered groupname when importing symbols (fixes #14048)
 
-Merge: 8fc9994 9af7986
+Merge: 8fc9994e25 9af7986204
 Nyall Dawson 	2016-01-09
 
     Merge pull request #2655 from SebDieBln/FixButtonLockLayerColors
@@ -17050,7 +83399,7 @@ Radim Blazek 	2016-01-09
 
     missing spatialite include dir
 
-Merge: 4e1cf3c 6ef2f5d
+Merge: 4e1cf3c081 6ef2f5ddb8
 Nyall Dawson 	2016-01-09
 
     Merge pull request #2653 from SebDieBln/MemoryLayerNoGeometry
@@ -17120,7 +83469,7 @@ Alexander Bruy 	2016-01-08
 
     [processing] correctly write html output in utf-8
 
-Merge: 95a56b9 931ca4d
+Merge: 95a56b9c65 931ca4d6d6
 Alexander Bruy 	2016-01-08
 
     Merge pull request #2546 from volaya/ux_improvements
@@ -17131,14 +83480,14 @@ volaya 	2016-01-08
 
     [processing] indentation fixes
 
-Merge: e0a557a 97b8a72
+Merge: e0a557a9c8 97b8a72b82
 Matthias Kuhn 	2016-01-08
 
     Merge pull request #2646 from Roel/wfs_decimal
 
     Interpret 'decimal' fields as double in WFS provider.
 
-Merge: 6230237 4137437
+Merge: 62302377db 4137437f2c
 volaya 	2016-01-08
 
     Merge pull request #2 from alexbruy/processing-ux
@@ -17226,7 +83575,7 @@ Hugo Mercier 	2016-01-05
 
     Add a basic GUI for virtual layer creation and add it to the main app
 
-Merge: 2b7c5c1 7e5915e
+Merge: 2b7c5c1d1c 7e5915ec79
 Hugo Mercier 	2016-01-07
 
     Merge pull request #2635 from mhugo/layer_dependencies
@@ -17319,7 +83668,7 @@ Nyall Dawson 	2016-01-07
 
     (doxygen version does not support @cond)
 
-Merge: 34bc4ad 2031ce0
+Merge: 34bc4ad788 2031ce0208
 Nyall Dawson 	2016-01-07
 
     Merge pull request #2638 from SebDieBln/FixStyleManagerUI
@@ -17365,7 +83714,7 @@ Juergen E. Fischer 	2016-01-06
 
     fix virtuallayer tests on windows
 
-Merge: f76bbeb 17d2214
+Merge: f76bbeba76 17d2214508
 Nyall Dawson 	2016-01-07
 
     Merge pull request #2640 from nirvn/diagram_tiny_fixes_v2
@@ -17376,7 +83725,7 @@ Nyall Dawson 	2016-01-07
 
     More debugging for server access control tests
 
-Merge: 41c9da9 62cdb27
+Merge: 41c9da9b0b 62cdb27160
 Hugo Mercier 	2016-01-06
 
     Merge pull request #2642 from mhugo/vlayer_fix
@@ -17397,14 +83746,14 @@ volaya 	2016-01-06
 
     linked signal with GdalAlgorithmDialog
 
-Merge: b46a593 006a161
+Merge: b46a593e32 006a1614cf
 volaya 	2016-01-06
 
     Merge pull request #2633 from medspx/processing_gdal_retile
 
     [Processing]Add gdal_retile.py and gdal2tiles.py algorithms
 
-Merge: 946f4e4 c136f9f
+Merge: 946f4e4814 c136f9f550
 Hugo Mercier 	2016-01-06
 
     Merge pull request #2617 from SebDieBln/FixLayerDefVectorJoins
@@ -17479,7 +83828,7 @@ Sebastian Dietrich 	2016-01-01
 
     added functions to QgsStyleV2 for getting groups by id
 
-Merge: e961a52 47d9307
+Merge: e961a52c6a 47d93078ba
 Nyall Dawson 	2016-01-06
 
     Merge pull request #2622 from duncan-r/feature4273_and_3756
@@ -17544,7 +83893,7 @@ Nyall Dawson 	2016-01-05
 
     Fix more clang warnings
 
-Merge: c55cfc0 16aeb3f
+Merge: c55cfc0560 16aeb3f1eb
 Matthias Kuhn 	2016-01-05
 
     Merge pull request #2636 from nirvn/orderby_fix
@@ -17559,21 +83908,21 @@ nirvn 	2016-01-05
 
     fix orderby not saved in several symbologies (fixes #14043)
 
-Merge: 115cc48 70f6e15
+Merge: 115cc483dd 70f6e15ab1
 Nyall Dawson 	2016-01-05
 
     Merge pull request #2615 from nirvn/natural_break_max_increase
 
     [symbology] increase maximum size of natural break classification
 
-Merge: 90eaba9 62cc59c
+Merge: 90eaba9f4f 62cc59c380
 Nyall Dawson 	2016-01-05
 
     Merge pull request #2627 from SebDieBln/FixNewStyleGroup
 
     Initialize a style group upon creation instead of upon renaming (fixes #14050)
 
-Merge: adf8385 a943d95
+Merge: adf83850d0 a943d9510d
 Nyall Dawson 	2016-01-05
 
     Merge pull request #2629 from SebDieBln/FixStyleManagerGroupingMode
@@ -17643,7 +83992,7 @@ Alexander Bruy 	2016-01-04
 
     option to keep WFS dialog open after adding layer(s)
 
-Merge: 164739f 375ae60
+Merge: 164739f205 375ae60c49
 mhugent 	2016-01-04
 
     Merge pull request #2632 from mhugent/nodetool_remove_lines
@@ -17655,7 +84004,7 @@ Médéric RIBREUX 	2016-01-04
     [Processing]Add gdal_retile.py and gdal2tiles.py algorithms
     This should fix Redmine #3331
 
-Merge: 73945c0 856be9b
+Merge: 73945c0c56 856be9ba44
 mhugent 	2016-01-04
 
     Merge pull request #2606 from nyalldawson/close_rings
@@ -17674,21 +84023,21 @@ Marco Hugentobler 	2016-01-04
 
     Update qgsmapcanvas.sip
 
-Merge: 49eaf16 899c57a
+Merge: 49eaf16f52 899c57a91f
 Matthias Kuhn 	2016-01-04
 
     Merge pull request #2631 from spatialthoughts/patch-1
 
     Change comparison back to NULL
 
-Merge: 1c464d6 6b42bad
+Merge: 1c464d69fc 6b42bad753
 Matthias Kuhn 	2016-01-04
 
     Merge pull request #2623 from cjmayo/no-pyqtconfig
 
     [pyqgis-console] Don't import pyqtconfig
 
-Merge: aacb37d 09e23ee
+Merge: aacb37d258 09e23ee93b
 mhugent 	2016-01-04
 
     Merge pull request #2611 from mhugent/shapefile_sbn_remove
@@ -17771,7 +84120,7 @@ Nyall Dawson 	2016-01-02
 
     Fix test for QWT_POLAR
 
-Merge: 5a42728 9cd1edf
+Merge: 5a42728f3e 9cd1edfda1
 Nyall Dawson 	2016-01-02
 
     Merge pull request #2625 from SebDieBln/FixAppendingNotSupported
@@ -17791,7 +84140,7 @@ Sebastian Dietrich 	2015-12-27
 
     make vector joins work within layer-definition-files
 
-Merge: 368223a 836ea81
+Merge: 368223ad0a 836ea81b77
 Nyall Dawson 	2016-01-02
 
     Merge pull request #2624 from SebDieBln/SaveMemoryLayerFields
@@ -17885,7 +84234,7 @@ Carl Simonson 	2015-12-29
     objects from the project, the "snap to background layers" checkbox has
     been removed.
 
-Merge: 416c004 02e9272
+Merge: 416c004a08 02e92727d9
 Jürgen Fischer 	2015-12-29
 
     Merge pull request #2620 from SebDieBln/FixCsvSaveStyle
@@ -17928,7 +84277,7 @@ Juergen E. Fischer 	2015-12-26
 
     debian packaging: upgrade python-qgis recommends to depends
 
-Merge: 917dd05 9be51c4
+Merge: 917dd05519 9be51c43b1
 Jürgen Fischer 	2015-12-26
 
     Merge pull request #2614 from SebDieBln/UpdateCachedProjectEmbedLayers
@@ -17940,14 +84289,14 @@ Sebastian Dietrich 	2015-12-26
     reread cached project file when its contents have changed
     When embedding layers, reread the external project file if its lastModified timestamp changed.
 
-Merge: 6fed1ae 87d742d
+Merge: 6fed1ae441 87d742d18d
 Matthias Kuhn 	2015-12-26
 
     Merge pull request #2604 from SebDieBln/NoNewFilesOnSaveProject
 
     [App] Use the existing files when saving an existing project.
 
-Merge: 71dc339 8ff4c78
+Merge: 71dc339106 8ff4c78e7a
 Nathan Woodrow 	2015-12-26
 
     Merge pull request #2613 from nirvn/fix_graduated_values_v3
@@ -17962,7 +84311,7 @@ Juergen E. Fischer 	2015-12-25
 
     more stl to qt ports and size_t => int fixups
 
-Merge: 036eada 7ccbe1b
+Merge: 036eada990 7ccbe1bfc3
 Jürgen Fischer 	2015-12-25
 
     Merge pull request #2612 from SebDieBln/FixWarningsOnWindows
@@ -18043,7 +84392,7 @@ Michael Kirk 	2015-11-29
     - Test BooleanParameter
 
     Conflicts:
-python/plugins/processing/core/parameters.py
+            python/plugins/processing/core/parameters.py
 
 rldhont 	2015-12-23
 
@@ -18055,7 +84404,7 @@ rldhont 	2015-12-16
 
     To finalize commit 3472ac80d8bdd030090ce81cb686f3cfcbd913cd update processing to well manage default value
 
-Merge: 447121e 46bc85a
+Merge: 447121eb24 46bc85ae63
 Matthias Kuhn 	2015-12-24
 
     Merge pull request #2610 from SebDieBln/ReadAlphaSelectionColor
@@ -18079,7 +84428,7 @@ Juergen E. Fischer 	2015-12-24
 
     fix windows build and some warnings
 
-Merge: c9e9289 076c2a0
+Merge: c9e928932a 076c2a09b7
 Jürgen Fischer 	2015-12-23
 
     Merge pull request #2609 from sebastic/bug-9818
@@ -18108,7 +84457,7 @@ Daan Goedkoop 	2015-11-28
     is not enough, because then the rubber band will still not be updated after
     an undo operation.
 
-Merge: b602c5c e8ef77e
+Merge: b602c5c588 e8ef77e781
 Denis Rouzaud 	2015-12-23
 
     Merge pull request #2584 from SebDieBln/MapCanvas_EnterLeave
@@ -18125,7 +84474,7 @@ Matthias Kuhn 	2015-12-23
 
     QgsGeometry to datastream -> avoid extra data copy
 
-Merge: a32587b 409a59f
+Merge: a32587bcd1 409a59ff2a
 Matthias Kuhn 	2015-12-23
 
     Merge pull request #2608 from sbrunner/fill-select
@@ -18161,7 +84510,7 @@ rldhont 	2015-12-07
 
     If a short name has been set for layers, groups and project it is used by QGIS Sever as the layer name.
 
-Merge: 52a39fc d5585ff
+Merge: 52a39fc286 d5585ffdcd
 Matthias Kuhn 	2015-12-22
 
     Merge pull request #2600 from m-kuhn/orderby-renderer
@@ -18176,7 +84525,7 @@ Marco Hugentobler 	2015-12-22
 
     Intendention
 
-Merge: 644960e bf4ad79
+Merge: 644960e50a bf4ad792e5
 Alessandro Pasotti 	2015-12-22
 
     Merge pull request #2607 from elpaso/bugfix-14021-dvanced-settings-editor-crash
@@ -18243,7 +84592,7 @@ Matthias Kuhn 	2015-12-20
 
     Also properly closes the iterator when a fallback orderby is used
 
-Merge: 5838819 809c925
+Merge: 5838819d9a 809c925581
 Chris Crook 	2015-12-22
 
     Merge pull request #2605 from nyalldawson/delimited
@@ -18318,7 +84667,7 @@ Juergen E. Fischer 	2015-12-21
 
     osgeo4w: include grass7 plugin
 
-Merge: 7afa9e3 f756671
+Merge: 7afa9e3161 f7566710af
 Matthias Kuhn 	2015-12-21
 
     Merge pull request #2601 from rldhont/update_qgsmaplayer_doc
@@ -18370,14 +84719,14 @@ Nyall Dawson 	2015-12-21
 
     Fix more warnings
 
-Merge: a42bfea 1199a25
+Merge: a42bfea944 1199a25a98
 Matthias Kuhn 	2015-12-21
 
     Merge pull request #2599 from nyalldawson/order_by
 
     Order by fixes and Mssql provider implementation
 
-Merge: d31e610 c28c493
+Merge: d31e61084f c28c493b65
 Nyall Dawson 	2015-12-21
 
     Merge pull request #2598 from SebDieBln/NoSingleStatementLines
@@ -18426,7 +84775,7 @@ Médéric Ribreux 	2015-12-14
     Add a startup tip on VRT files (fix Redmine #4346)
     (fix indentation problem)
 
-Merge: 02696c7 1d42ac5
+Merge: 02696c71d4 1d42ac568b
 Matthias Kuhn 	2015-12-19
 
     Merge pull request #2596 from pavlova-marina/patch-1
@@ -18445,7 +84794,7 @@ Juergen E. Fischer 	2015-12-19
 
     avoid core relinking on cmake changes
 
-Merge: 13f4081 6ffec81
+Merge: 13f4081d07 6ffec81b53
 Hugo Mercier 	2015-12-18
 
     Merge pull request #2568 from mhugo/vlayers
@@ -18587,7 +84936,7 @@ Juergen E. Fischer 	2015-12-16
 
     more nullptr updates (folloup 320c696)
 
-Merge: 18614e1 66061e0
+Merge: 18614e11e3 66061e0ef2
 Alessandro Pasotti 	2015-12-16
 
     Merge pull request #2588 from elpaso/python-server-exception-hook
@@ -18671,12 +85020,12 @@ George Shegunov 	2015-07-10
 
     The providers plugin path can be changed in the applications.
 
-Merge: 1138253 7101b5b
+Merge: 1138253dd2 7101b5beb0
 rldhont 	2015-12-15
 
     Merge branch 'AsgerPetersen-wfstests'
 
-Merge: 95b92c7 c9b7552
+Merge: 95b92c7960 c9b75528af
 Jürgen Fischer 	2015-12-15
 
     Merge pull request #2486 from SebDieBln/CMake_FixFindPythonLibraryWindows
@@ -18725,7 +85074,7 @@ Nyall Dawson 	2015-12-10
 
     Fix calculation of spatialite SelectAtId capability
 
-Merge: 08a8b60 9096a64
+Merge: 08a8b6095f 9096a64a6c
 volaya 	2015-12-15
 
     Merge pull request #2566 from radosuav/processing_fixes
@@ -18782,28 +85131,28 @@ Radim Blazek 	2015-12-15
 
     [GRASS] new input combo in mapcalc
 
-Merge: 9c0ee36 079de32
+Merge: 9c0ee36c49 079de32d46
 volaya 	2015-12-15
 
     Merge pull request #2451 from spono/patch-5
 
     [Processing] Update GridMetrics.py
 
-Merge: 7f3cc35 41538e6
+Merge: 7f3cc35b10 41538e6dec
 volaya 	2015-12-15
 
     Merge pull request #2469 from spono/patch-13
 
     [Processing] Update FilterData.py
 
-Merge: 34ccc34 d4ba0c7
+Merge: 34ccc345cc d4ba0c77f8
 volaya 	2015-12-15
 
     Merge pull request #2467 from spono/patch-11
 
     [Processing] Update Cover.py
 
-Merge: 576875e 8a40dda
+Merge: 576875e998 8a40dda2e5
 Nathan Woodrow 	2015-12-15
 
     Merge pull request #2580 from nirvn/projection_selector_dbl_click_v5
@@ -18863,7 +85212,7 @@ rldhont 	2015-12-14
 
     Update commit da5e73ef4a4508c4b215dd726380a8a94bd73ada
 
-Merge: 36267f5 8c4d810
+Merge: 36267f5935 8c4d81023b
 Alessandro Pasotti 	2015-12-14
 
     Merge pull request #2579 from elpaso/bugfix-13984
@@ -18895,14 +85244,14 @@ Denis Rouzaud 	2015-12-14
     followup 6e9ff364bb794c59ac2c6c72173d59b4e0731b92
     can be reverted once files are added
 
-Merge: b64ebfb bca8356
+Merge: b64ebfb2e2 bca8356ea0
 Nathan Woodrow 	2015-12-14
 
     Merge pull request #2576 from SebDieBln/DefaultLayerActions_on_selected_layers
 
     Apply default layer actions to all selected layers (fixes #9714)
 
-Merge: 805d9d4 afef14b
+Merge: 805d9d4f86 afef14bf3c
 Nathan Woodrow 	2015-12-14
 
     Merge pull request #2543 from SebDieBln/SortLayerTreeMimedata
@@ -18935,7 +85284,7 @@ Nyall Dawson 	2015-12-13
 
     Returns whether a linestring is closed
 
-Merge: 262514d f0aeee8
+Merge: 262514d97d f0aeee8c5b
 Nyall Dawson 	2015-12-13
 
     Merge pull request #2575 from slarosa/style_grp_layers
@@ -18957,14 +85306,14 @@ Nyall Dawson 	2015-12-13
     generator symbology for styling only the exterior ring of
     polygons.
 
-Merge: 7f674a4 111393e
+Merge: 7f674a4e96 111393e055
 Nyall Dawson 	2015-12-13
 
     Merge pull request #2551 from SebDieBln/RestoreEmtpyShortcuts
 
     Do not reapply default value to shortcuts that are set to "none" (fixes #7905)
 
-Merge: 710b9d2 edea51b
+Merge: 710b9d25d1 edea51b675
 Nyall Dawson 	2015-12-13
 
     Merge pull request #2558 from SebDieBln/OrderScales
@@ -18975,7 +85324,7 @@ Nyall Dawson 	2015-12-13
 
     Drop test thresholds
 
-Merge: 666eda6 66a83bd
+Merge: 666eda6856 66a83bd205
 Nyall Dawson 	2015-12-13
 
     Merge pull request #2537 from SebDieBln/ReprojectAnnotations
@@ -18986,14 +85335,14 @@ Sebastian Dietrich 	2015-12-01
 
     make annotations aware of crs (fixes #3618)
 
-Merge: f8c4b3a dd2a422
+Merge: f8c4b3a21c dd2a422e9b
 Jürgen Fischer 	2015-12-12
 
     Merge pull request #2574 from SebDieBln/GDALtools_removeMenuItemsOnUnload
 
     Remove menu items when GDALtools plugin is unloaded (fixes #13642)
 
-Merge: 6a7f786 72c5e37
+Merge: 6a7f786126 72c5e375a7
 Jürgen Fischer 	2015-12-12
 
     Merge pull request #2571 from medspx/work_newfile_extensions
@@ -19015,7 +85364,7 @@ Sebastian Dietrich 	2015-12-12
 
     Remove menu items when GDALtools plugin is unloaded (fixes #13642)
 
-Merge: 62f90d0 35fea9c
+Merge: 62f90d0c5e 35fea9c986
 Nyall Dawson 	2015-12-12
 
     Merge pull request #2570 from nirvn/point_on_surface_v3
@@ -19026,7 +85375,7 @@ nirvn 	2015-12-11
 
     [expression] add point_on_surface function
 
-Merge: 6e3b1da ac1ee1c
+Merge: 6e3b1da10e ac1ee1cd50
 Nyall Dawson 	2015-12-12
 
     Merge pull request #2569 from SebDieBln/Improve_CrsReadXML
@@ -19280,7 +85629,7 @@ Nyall Dawson 	2015-12-10
 
     Fix coverity issues
 
-Merge: 50092eb 94b5e60
+Merge: 50092ebbb3 94b5e609de
 Alessandro Pasotti 	2015-12-09
 
     Merge pull request #2555 from elpaso/bugfix-pg-inherits
@@ -19420,7 +85769,7 @@ Matthias Kuhn 	2015-11-22
 
     Save feature form configuration in QgsEditFormConfig
 
-Merge: f13104b ec20db7
+Merge: f13104be37 ec20db7ade
 Hugo Mercier 	2015-12-08
 
     Merge pull request #2556 from mhugo/fix_nullp
@@ -19470,7 +85819,7 @@ Juergen E. Fischer 	2015-12-08
 
     [FEATURE] postgres provider: refine warning about estimated metadata (fixes #13947)
 
-Merge: 9118050 ab0736a
+Merge: 91180501bc ab0736a1d8
 Jürgen Fischer 	2015-12-08
 
     Merge pull request #2554 from vmora/order_pk_candidates
@@ -19510,7 +85859,7 @@ Sebastian Dietrich 	2015-12-07
     respect shortcuts set to none (fixes #7905)
     Shortcuts, that have been set to none by the user, are no longer restored to their default value on application startup.
 
-Merge: 4f0b9dd 564a063
+Merge: 4f0b9dda79 564a06370d
 rldhont 	2015-12-07
 
     Merge pull request #2517 from rldhont/raster_open_adf
@@ -19622,7 +85971,7 @@ Juergen E. Fischer 	2015-12-05
 
     fix precise build
 
-Merge: de3ce15 3ca5441
+Merge: de3ce1560c 3ca5441076
 Alessandro Pasotti 	2015-12-05
 
     Merge pull request #2498 from elpaso/pythoninitcode
@@ -19717,7 +86066,7 @@ elpaso 	2015-12-04
 
     Added failing test for tables with INHERITS
 
-Merge: ab3542a 984d1f2
+Merge: ab3542abf8 984d1f21cb
 Alessandro Pasotti 	2015-12-04
 
     Merge pull request #2534 from mhugo/fix_nullp
@@ -19815,7 +86164,7 @@ Matthias Kuhn 	2015-12-03
 
     And hope for less timeouts
 
-Merge: e9eb233 b498094
+Merge: e9eb233e0a b498094780
 Nathan Woodrow 	2015-12-03
 
     Merge pull request #2502 from SebDieBln/RuleBasedRendererWidgetDisableButtons
@@ -19838,28 +86187,28 @@ Matthias Kuhn 	2015-12-03
 
     Add QGIS3 todo
 
-Merge: 85cc180 ec9f086
+Merge: 85cc1807df ec9f086222
 volaya 	2015-12-03
 
     Merge pull request #2514 from spono/patch-14
 
     [Processing] Update CanopyModel.py
 
-Merge: bbde581 c622457
+Merge: bbde581457 c622457fc5
 volaya 	2015-12-03
 
     Merge pull request #2468 from spono/patch-12
 
     [processing] Update ClipData.py
 
-Merge: 3d5f33a dd8826f
+Merge: 3d5f33abfa dd8826f372
 volaya 	2015-12-03
 
     Merge pull request #2466 from spono/patch-10
 
     [processing] Update GroundFilter.py
 
-Merge: 4dafbc0 706e651
+Merge: 4dafbc0f08 706e651484
 Matthias Kuhn 	2015-12-03
 
     Merge pull request #2410 from mdouchin/postgis_2_2_server_simplification
@@ -19909,7 +86258,7 @@ Juergen E. Fischer 	2015-12-02
 
     indentation update
 
-Merge: 9e5528b 2305b90
+Merge: 9e5528b111 2305b90ab1
 Jürgen Fischer 	2015-12-02
 
     Merge pull request #2511 from tomtor/master
@@ -19990,7 +86339,7 @@ Matthias Kuhn 	2015-12-01
 
     Add API to QgsMapLayerRegistry to rely less on ids
 
-Merge: bb9eb79 34df72c
+Merge: bb9eb79021 34df72c75b
 Alexander Bruy 	2015-12-01
 
     Merge pull request #2516 from radosuav/zonal_stats
@@ -20036,7 +86385,7 @@ Nyall Dawson 	2015-12-01
 
     [geometry] Add method to drop z/m from wkb types
 
-Merge: 4ea0c56 30d7795
+Merge: 4ea0c56e9b 30d7795ff3
 Matthias Kuhn 	2015-11-30
 
     Merge pull request #2506 from SebDieBln/MakeDirtyOnAnnotation
@@ -20068,7 +86417,7 @@ Nyall Dawson 	2015-11-30
 
     Consolidate QgsGeometryUtils tests
 
-Merge: 0b9ac8b 1bf8997
+Merge: 0b9ac8bd9b 1bf8997cce
 Matthias Kuhn 	2015-11-30
 
     Merge pull request #2520 from nicanor-b/master
@@ -20164,7 +86513,7 @@ Giuseppe Sucameli 	2015-11-30
         Merge branch 'gdaltools_buildvrt_asrs' of https://github.com/giohappy/QGIS into giohappy-gdaltools_buildvrt_asrs
 
         Conflicts:
-python/plugins/GdalTools/tools/doBuildVRT.py
+            python/plugins/GdalTools/tools/doBuildVRT.py
 
     commit 6d3df91f0226fa71356da45b9b5ef1c9f9796ebd
     Author: giohappy 
@@ -20176,7 +86525,7 @@ Giuseppe Sucameli 	2015-11-30
 
     [DbManager] delete layer passed to querybuilder to set sql layer filter (follow f6e31613)
 
-Merge: df30571 f6e3161
+Merge: df3057122f f6e3161317
 Giuseppe Sucameli 	2015-11-30
 
     Merge branch 'DbManager_SetFilter' of https://github.com/SebDieBln/QGIS
@@ -20221,7 +86570,7 @@ Juergen E. Fischer 	2015-11-27
 
     indentation update
 
-Merge: 5473c33 174a0dd
+Merge: 5473c3394f 174a0ddeb7
 Matthias Kuhn 	2015-11-29
 
     Merge pull request #2510 from SebDieBln/FixDeleteCategories
@@ -20276,7 +86625,7 @@ volaya 	2015-11-27
 
     [processing] fixed missing colon in function definition
 
-Merge: 0a21d91 c58981f
+Merge: 0a21d91be5 c58981fd5e
 volaya 	2015-11-27
 
     Merge pull request #2505 from radosuav/processing_extent
@@ -20287,21 +86636,21 @@ volaya 	2015-11-27
 
     [processing] allow manually add scripts to scripts provider
 
-Merge: ae748d3 4f9244d
+Merge: ae748d3b7d 4f9244d6f0
 volaya 	2015-11-27
 
     Merge pull request #2472 from spono/patch-8
 
     [Processing] Update TinSurfaceCreate.py
 
-Merge: 5375522 ea526a2
+Merge: 5375522ce1 ea526a2924
 volaya 	2015-11-27
 
     Merge pull request #2463 from spono/patch-7
 
     [proessing]small correction on FUSION internal commands
 
-Merge: a6d147f ec204c3
+Merge: a6d147f63e ec204c357f
 volaya 	2015-11-27
 
     Merge pull request #2465 from spono/patch-9
@@ -20364,7 +86713,7 @@ Nic 	2015-11-26
 
     fixed some syntax errors and added an output option (ASCII)
 
-Merge: 114b04e 06357dd
+Merge: 114b04ece1 06357dd31e
 volaya 	2015-11-26
 
     Merge pull request #2504 from saberraz/master
@@ -20614,7 +86963,7 @@ Juergen E. Fischer 	2015-11-22
 
     fix PyQgsServerAccessControl in nightlies
 
-Merge: 7d600bd caab4c1
+Merge: 7d600bdaed caab4c12f5
 Matthias Kuhn 	2015-11-22
 
     Merge pull request #2493 from SebDieBln/AttrTableHideSortIndicator
@@ -20662,7 +87011,7 @@ Sebastian Dietrich 	2015-11-21
 
     Moved export/import vector geometry type to QgsMaplayer
 
-Merge: 531fec0 a4b61fb
+Merge: 531fec039c a4b61fbd1f
 Matthias Kuhn 	2015-11-21
 
     Merge pull request #2327 from DelazJ/ConsistentTerms2
@@ -20750,14 +87099,14 @@ Juergen E. Fischer 	2015-11-20
 
     also update strpos function help (followup 2a557db)
 
-Merge: d795e50 a5b2a06
+Merge: d795e508cc a5b2a06981
 Matthias Kuhn 	2015-11-20
 
     Merge pull request #2487 from SebDieBln/CopyPasteScaleBasedVisibility
 
     Make copy/paste style aware of scale based visibility (fixes #13746)
 
-Merge: c6460a3 0132a3e
+Merge: c6460a3d7d 0132a3e173
 Matthias Kuhn 	2015-11-20
 
     Merge pull request #469 from olivierdalang/SanitizeEntryNames
@@ -20788,7 +87137,7 @@ Matthias Kuhn 	2015-11-20
 
     Constification
 
-Merge: ecfdde5 8c24e1e
+Merge: ecfdde5797 8c24e1e2d4
 Alessandro Pasotti 	2015-11-20
 
     Merge pull request #2489 from elpaso/qgseditorwidgetwrapper-config-added
@@ -20807,7 +87156,7 @@ rldhont 	2015-11-20
 
     Clean [BUGFIX] Multipoint asJSON
 
-Merge: 00ea968 54cf64b
+Merge: 00ea968347 54cf64bcdc
 Matthias Kuhn 	2015-11-20
 
     Merge pull request #2488 from nyalldawson/clang
@@ -20853,7 +87202,7 @@ Juergen E. Fischer 	2015-11-19
 
     install qgsfeaturefilterprovider.h (followup c9f0d83)
 
-Merge: 313fe6a 174fbb9
+Merge: 313fe6a98f 174fbb97ce
 olivierdalang 	2015-11-19
 
     Merge pull request #1 from SebDieBln/SanitizeEntryNames
@@ -20914,7 +87263,7 @@ Nyall Dawson 	2015-11-19
 
     Fix build
 
-Merge: 8c0fe47 c9f0d83
+Merge: 8c0fe47d8e c9f0d83aaf
 mhugent 	2015-11-19
 
     Merge pull request #2056 from sbrunner/qgis-server-security
@@ -20942,7 +87291,7 @@ Matthias Kuhn 	2015-11-19
 
     Do not require manual CMakeCache intervention
 
-Merge: f6e4e75 cfa308d
+Merge: f6e4e75cd6 cfa308d5ac
 Jürgen Fischer 	2015-11-18
 
     Merge pull request #2458 from SebDieBln/Postgres_GeomTypeDirect
@@ -20987,7 +87336,7 @@ Stéphane Brunner 	2015-05-19
       Cache key to used to create the capabilities cache, "" for no cache,
       shouldn't contains any "-", default to ""
 
-Merge: e0bedc2 d0625b8
+Merge: e0bedc2b17 d0625b8b35
 alexbruy 	2015-11-18
 
     Merge pull request #2481 from nyalldawson/processing
@@ -21012,7 +87361,7 @@ Matthias Kuhn 	2015-11-18
 
     Add Saga 2.2.2 descriptions
 
-Merge: 86c1ffa 26b3685
+Merge: 86c1ffa0aa 26b3685757
 Matthias Kuhn 	2015-11-18
 
     Merge pull request #2460 from nyalldawson/ogr_compiler
@@ -21098,7 +87447,7 @@ Nyall Dawson 	2015-11-17
     should make it easier to add additional expression compilers (eg
     spatialite, MS SQL, etc)
 
-Merge: dc0639c e04d5e4
+Merge: dc0639c794 e04d5e4d70
 Jürgen Fischer 	2015-11-17
 
     Merge pull request #2478 from SebDieBln/DbManager_Fix13731
@@ -21146,7 +87495,7 @@ Nyall Dawson 	2015-11-15
     OGR SQL supports only basic expressions, so this is really only
     enabled for "attribute"='value' type expressions.
 
-Merge: fd50136 48afc42
+Merge: fd50136e87 48afc425dc
 alexbruy 	2015-11-17
 
     Merge pull request #2471 from nyalldawson/processing_fixes
@@ -21155,7 +87504,7 @@ alexbruy 	2015-11-17
      - use QgsStatisticalSummary for statistic calculations
      -  faster expression request for ExtractByAttribute alg
 
-Merge: 79616fd 5065b80
+Merge: 79616fd8d8 5065b80042
 alexbruy 	2015-11-17
 
     Merge pull request #2456 from NaturalGIS/fix_saga_222_kriging
@@ -21209,14 +87558,14 @@ Nic 	2015-11-16
 
     minor adjustments and some funtionalities added (first return selection, output as .asc)
 
-Merge: 56b8ce0 ce8c454
+Merge: 56b8ce0f89 ce8c4540a1
 volaya 	2015-11-16
 
     Merge pull request #2462 from spono/patch-6
 
     [processing] add new tools to lidar provider
 
-Merge: 3daa404 594e5a2
+Merge: 3daa40446d 594e5a2bf6
 Matthias Kuhn 	2015-11-16
 
     Merge pull request #2455 from sbrunner/refersh-attribut-table
@@ -21259,7 +87608,7 @@ Matthias Kuhn 	2015-11-08
 
     [py3] CMake updates to support Python3 and PyQt5
 
-Merge: 526b8fc ebf132e
+Merge: 526b8fc635 ebf132edb8
 Matthias Kuhn 	2015-11-16
 
     Merge pull request #2470 from SebDieBln/postgrestest
@@ -21362,7 +87711,7 @@ Alexander Bruy 	2015-11-14
 
     [processing] update plugin metadata
 
-Merge: ee44bc8 56de17e
+Merge: ee44bc8925 56de17e74b
 Matthias Kuhn 	2015-11-14
 
     Merge pull request #2457 from medspx/work_update_ogr_file_formats
@@ -21446,7 +87795,7 @@ Denis Rouzaud 	2015-11-12
 
     should be backported to 2.12
 
-Merge: d8f5dbe a10936f
+Merge: d8f5dbeb4e a10936f06a
 alexbruy 	2015-11-13
 
     Merge pull request #2452 from nyalldawson/processing_select
@@ -21500,14 +87849,14 @@ Radim Blazek 	2015-11-12
 
     [GRASS] fixed cat shift when importing vectors via browser, fixes #13815
 
-Merge: be8c7da 325f099
+Merge: be8c7dac4f 325f0992e7
 Alessandro Pasotti 	2015-11-12
 
     Merge pull request #2443 from elpaso/bugfix-11794
 
     SQLITE ask for a new name if already exists
 
-Merge: c483411 ad2caed
+Merge: c483411034 ad2caed3b2
 Alessandro Pasotti 	2015-11-12
 
     Merge pull request #2449 from elpaso/bugfix-11517
@@ -21530,7 +87879,7 @@ elpaso 	2015-11-12
     Also removed UI connect in favour of QMetaObject::connectSlotsByName
     to be consistent with other methods in the same class
 
-Merge: 6b3eddd 1937677
+Merge: 6b3eddd0d0 19376770af
 alexbruy 	2015-11-12
 
     Merge pull request #2447 from NaturalGIS/fix_saga_220_kriging
@@ -21545,7 +87894,7 @@ Giovanni Manghi 	2015-11-12
 
     missing parameter
 
-Merge: 0461cbd be56358
+Merge: 0461cbdd22 be563584ed
 alexbruy 	2015-11-12
 
     Merge pull request #2444 from NaturalGIS/fix_saga_212_kriging
@@ -21607,7 +87956,7 @@ Juergen E. Fischer 	2015-11-12
 
     fix windows build (followup 2175e7a)
 
-Merge: b741986 cfb932a
+Merge: b741986041 cfb932afa9
 Matthias Kuhn 	2015-11-12
 
     Merge pull request #2437 from bstroebl/improveDissolve
@@ -21674,7 +88023,7 @@ Juergen E. Fischer 	2015-11-10
 
     fix 81bbb82
 
-Merge: 9a89408 c050571
+Merge: 9a89408b72 c05057158b
 Jürgen Fischer 	2015-11-10
 
     Merge pull request #2436 from dgoedkoop/linePointDifferenceFix
@@ -21768,14 +88117,14 @@ volaya 	2015-11-09
 
     fixes error introduced in last commit
 
-Merge: b36566b e4996d7
+Merge: b36566b045 e4996d77cd
 volaya 	2015-11-09
 
     Merge pull request #2423 from rldhont/processing_spatialite_output
 
     [processing] allow output directly on Spatialite tables
 
-Merge: 658c584 0652955
+Merge: 658c5842c1 0652955224
 volaya 	2015-11-09
 
     Merge pull request #2429 from NaturalGIS/fix_saga_idw
@@ -21866,7 +88215,7 @@ Giovanni Manghi 	2015-11-08
 
     fix SAGA 2.2.* Inverse Distance Weighted
 
-Merge: 36672c4 d4e1c85
+Merge: 36672c47ab d4e1c85d9f
 Jürgen Fischer 	2015-11-08
 
     Merge pull request #2428 from sebastic/gsl-2.0
@@ -21890,14 +88239,14 @@ Juergen E. Fischer 	2015-11-08
 
     oracle provider: add/fix support for multiple geometry columns (fixes #13158)
 
-Merge: 9172767 d73ef5b
+Merge: 9172767a79 d73ef5b189
 Matthias Kuhn 	2015-11-07
 
     Merge pull request #2388 from sbrunner/node-tool-select-feature
 
     Allow to select the feature on which the node tool works
 
-Merge: 71a6a3d 8030746
+Merge: 71a6a3d6ba 8030746674
 Denis Rouzaud 	2015-11-07
 
     Merge pull request #2427 from 3nids/findqt5lib
@@ -21924,7 +88273,7 @@ Radim Blazek 	2015-11-07
 
     [GRASS] fixed new mapset region, fixes #13784
 
-Merge: f77d6cd dbd9b9b
+Merge: f77d6cd0d0 dbd9b9bc33
 Alessandro Pasotti 	2015-11-07
 
     Merge pull request #2426 from elpaso/bugfix-13747-bis
@@ -22046,7 +88395,7 @@ Nyall Dawson 	2015-11-06
     Fix delimited text layers set to unknown geometry type if first row has
     null geometry (fix #13749)
 
-Merge: fd48501 7964772
+Merge: fd485010a5 79647728bd
 Jürgen Fischer 	2015-11-05
 
     Merge pull request #2418 from nyalldawson/postgres_in
@@ -22063,7 +88412,7 @@ Werner Macho 	2015-11-05
 
     cleanup after consolidating chinese
 
-Merge: 700fc04 cf4693e
+Merge: 700fc043a4 cf4693e326
 Alessandro Pasotti 	2015-11-05
 
     Merge pull request #2420 from elpaso/bugfix-13410
@@ -22082,7 +88431,7 @@ Stéphane Brunner 	2015-10-21
 
     When we use the node tool we able to select a feature
 
-Merge: faeedfb 6d1d213
+Merge: faeedfb5b8 6d1d213973
 Vincent Mora 	2015-11-05
 
     Merge pull request #2414 from vmora/varying_width_assistant
@@ -22196,7 +88545,7 @@ Alessandro Pasotti 	2015-11-04
 
     Removed Q_UNUSED
 
-Merge: 8187ad5 086525b
+Merge: 8187ad50c9 086525b01b
 Alessandro Pasotti 	2015-11-04
 
     Merge pull request #2417 from elpaso/bugfix-11266
@@ -22359,14 +88708,14 @@ Nyall Dawson 	2015-11-04
     Fix data defined overrides for sub symbols in line and marker fill
     are not being applied (fix #13707)
 
-Merge: 37e9443 7a789d3
+Merge: 37e94433ae 7a789d3bfc
 Alessandro Pasotti 	2015-11-03
 
     Merge pull request #2416 from elpaso/bugfix-13747
 
     Fixes #13747
 
-Merge: 5addc0c 547d1e3
+Merge: 5addc0ca4b 547d1e3936
 Tom Kralidis 	2015-11-03
 
     Merge pull request #2415 from kalxas/master
@@ -22385,7 +88734,7 @@ Tom Kralidis 	2015-11-03
 
     add national geodata.gov.gr CSW
 
-Merge: 16def06 d16cdcf
+Merge: 16def06daf d16cdcf449
 Hugo Mercier 	2015-11-03
 
     Merge pull request #2189 from mhugo/legend_filter
@@ -22439,7 +88788,7 @@ rldhont 	2015-10-29
     * Default AccessConstraints is None
     * Calculate boundingBox for all CRSes
 
-Merge: 03eaafe f2e527f
+Merge: 03eaafe603 f2e527f033
 volaya 	2015-11-02
 
     Merge pull request #2403 from medspx/processing_get_scripts_proxy
@@ -22595,7 +88944,7 @@ Nyall Dawson 	2015-10-29
 
     Fix crash when deleting last node in a geometry (fix #13674)
 
-Merge: feab3ad 636b0f9
+Merge: feab3ad8ec 636b0f9410
 Nathan Woodrow 	2015-10-29
 
     Merge pull request #2407 from DelazJ/patch-2
@@ -22606,7 +88955,7 @@ Harrissou Sant-anna 	2015-10-28
 
     fix 'serch' typo, replace with 'search'
 
-Merge: 6a4544f a141ffb
+Merge: 6a4544fc4c a141ffb390
 Alessandro Pasotti 	2015-10-28
 
     Merge pull request #2405 from elpaso/symbol-export-select-by-group
@@ -22630,14 +88979,14 @@ Juergen E. Fischer 	2015-10-28
 
     (followup 70bff3f)
 
-Merge: b339ad1 f443bb8
+Merge: b339ad13c8 f443bb8c03
 volaya 	2015-10-28
 
     Merge pull request #2398 from mdouchin/patch-1
 
     [processing] Debug ConcaveHull.py
 
-Merge: c866dcc 77451f9
+Merge: c866dcce8f 77451f962c
 volaya 	2015-10-28
 
     Merge pull request #2399 from NaturalGIS/processing_fix_grass7_v_out_ogr
@@ -22648,7 +88997,7 @@ Salvatore Larosa 	2015-10-28
 
     [pyqgis-console] fixes #13693: fix default value in settings for the last used directory when opening a script file
 
-Merge: 0799e09 a18a0ad
+Merge: 0799e09a67 a18a0ada55
 Richard Duivenvoorde 	2015-10-28
 
     Merge pull request #2400 from anitagraser/patch-10
@@ -22711,7 +89060,7 @@ Giuseppe Sucameli 	2015-10-26
 
     Add myself to developer map (!)
 
-Merge: 7997c02 87e6f34
+Merge: 7997c02112 87e6f34c30
 Jürgen Fischer 	2015-10-26
 
     Merge pull request #2401 from volter/master
@@ -22763,7 +89112,7 @@ Anita Graser 	2015-10-26
 
     suggesting currently used names
 
-Merge: 3d93237 22aea32
+Merge: 3d932376c8 22aea3201b
 Giuseppe Sucameli 	2015-10-26
 
     Merge pull request #2394 from PedroVenancio
@@ -22776,13 +89125,13 @@ Giuseppe Sucameli 	2015-10-17
 
     [GdalTools] minor changes to ui and code (follow 32be4756)
 
-Merge: 3d93237 5057f76
+Merge: 3d932376c8 5057f761fa
 Giuseppe Sucameli 	2015-10-25
 
     Merge branch 'clipper' of https://github.com/PedroVenancio/Quantum-GIS into PedroVenancio-clipper
 
     Conflicts:
-python/plugins/processing/algs/gdal/ClipByMask.py
+            python/plugins/processing/algs/gdal/ClipByMask.py
 
 mdouchin 	2015-10-25
 
@@ -22815,7 +89164,7 @@ volaya 	2015-10-22
     [processing] fixed SAGA version handling
 
     Conflicts:
-python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
+            python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
 
 volaya 	2015-10-22
 
@@ -22837,35 +89186,35 @@ volaya 	2015-10-23
 
     [processing] correctly enable buttons in FixedTableDialog
 
-Merge: 88d4605 fa12502
+Merge: 88d4605ad9 fa12502995
 volaya 	2015-10-24
 
     Merge pull request #2341 from arnaud-morvan/processing_precisionmodel
 
     [Processing] Add precision parameter to by location algorithms
 
-Merge: 1dd8e79 524f6ab
+Merge: 1dd8e79baf 524f6ab460
 volaya 	2015-10-24
 
     Merge pull request #2355 from om-henners/master
 
     [processing] Update OGR tools
 
-Merge: fd26acd 03333c8
+Merge: fd26acd2f8 03333c8502
 volaya 	2015-10-24
 
     Merge pull request #2389 from NaturalGIS/gdal_advanced
 
     Processing gdal translate and warp advanced parameters as such
 
-Merge: 07bd3ff ebd51b2
+Merge: 07bd3ffedd ebd51b2c79
 volaya 	2015-10-24
 
     Merge pull request #2390 from NaturalGIS/processing_gdal_clip_raster
 
     Processing advanced parameters for gdal clip raster
 
-Merge: cd0eb05 c0919e0
+Merge: cd0eb05ded c0919e0ac0
 volaya 	2015-10-24
 
     Merge pull request #2391 from NaturalGIS/processing_gdal_rasterize_advanced
@@ -22892,7 +89241,7 @@ Juergen E. Fischer 	2015-10-23
 
     better fix for phantom labels: consider rules out of visibility range as inactive (followup d6f66ee)
 
-Merge: d6f66ee 0aa0b4c
+Merge: d6f66ee488 0aa0b4c804
 Jürgen Fischer 	2015-10-23
 
     Merge pull request #2395 from medspx/dbmanager_oracle_timestamp
@@ -22991,7 +89340,7 @@ Nyall Dawson 	2015-10-23
 
     Fix composer scale bar when crs units are non-meters and OTF is off (fix #13610)
 
-Merge: 18df003 b33ab1a
+Merge: 18df00375e b33ab1af66
 Radim Blazek 	2015-10-23
 
     Merge pull request #2393 from PedroVenancio/grass7_plugin
@@ -23091,7 +89440,7 @@ Giuseppe Sucameli 	2015-10-22
     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)
 
-Merge: 54e2a51 8e45da9
+Merge: 54e2a5112a 8e45da9d7e
 Giuseppe Sucameli 	2015-10-22
 
     Merge pull request #2382 from SebDieBln/MultiColumnPK_DbManagerQuery
@@ -23196,7 +89545,7 @@ Nyall Dawson 	2015-10-21
 
     Fix a LOT of leaks relating to geometry and GEOS operations
 
-Merge: 55babc3 c7aeb77
+Merge: 55babc3ee3 c7aeb774ce
 Hugo Mercier 	2015-10-21
 
     Merge pull request #2322 from mhugo/fix_tin
@@ -23222,7 +89571,7 @@ Juergen E. Fischer 	2015-10-20
 
     avoid duplicate qgisstyle run
 
-Merge: 898a738 48aeb8c
+Merge: 898a738451 48aeb8c03c
 volaya 	2015-10-20
 
     Merge pull request #2372 from om-henners/ogrsql_fix
@@ -23241,7 +89590,7 @@ Radim Blazek 	2015-10-20
 
     [GRASS] fixed multilayer editing
 
-Merge: c45fc09 3bc11b1
+Merge: c45fc090d9 3bc11b1947
 Matthias Kuhn 	2015-10-20
 
     Merge pull request #2386 from arnaud-morvan/processing-fix-importfromproj4
@@ -23274,7 +89623,7 @@ Anita Graser 	2015-10-10
 
     as suggested in https://hub.qgis.org/issues/9868
 
-Merge: 1969e09 64bf3a8
+Merge: 1969e09b6f 64bf3a80b2
 Matthias Kuhn 	2015-10-20
 
     Merge pull request #2384 from bstroebl/undoChangesInDissolve
@@ -23440,7 +89789,7 @@ Radim Blazek 	2015-10-18
 
     [GRASS] cmake fix
 
-Merge: d8deb8c cc9c789
+Merge: d8deb8c081 cc9c789760
 Sebastian Dietrich 	2015-10-18
 
     Merge branch 'master' into MultiColumnPK_DbManagerQuery
@@ -23466,7 +89815,7 @@ Nyall Dawson 	2015-10-18
     - add unit tests for CircularStrings, CompoundCurves, CurvePolygon,
     tests with geometries with Z/M values
 
-Merge: cc9c789 c7e732b
+Merge: cc9c789760 c7e732b2c7
 Matthias Kuhn 	2015-10-18
 
     Merge pull request #2374 from slarosa/editor_widget_take_2
@@ -23652,7 +90001,7 @@ Nyall Dawson 	2015-10-16
     - fix GeometryCollection to support collections with multi* children
     and GeometryCollection children (allowed by spec)
 
-Merge: 34dc314 f3a45cd
+Merge: 34dc314345 f3a45cd400
 Nathan Woodrow 	2015-10-16
 
     Merge pull request #2377 from nirvn/toolbar_icon_improvements
@@ -23670,7 +90019,7 @@ Nyall Dawson 	2015-10-16
     Child types were incorrectly being dropped when the collection
     consisted of mixed geometry types (eg line & polygon) (refs #13608)
 
-Merge: d19165b ec3fb23
+Merge: d19165b7c9 ec3fb23afb
 Paolo Cavallini 	2015-10-15
 
     Merge pull request #2375 from NaturalGIS/saga_flow_accu
@@ -23785,14 +90134,14 @@ Radim Blazek 	2015-10-14
 
     [GRASS] prepared off_t fix on windows
 
-Merge: 52c5067 cfdf5cf
+Merge: 52c50673f7 cfdf5cf609
 Paolo Cavallini 	2015-10-14
 
     Merge pull request #2369 from neteler/patch-73
 
     Update to GRASS GIS 7.0.x
 
-Merge: 24b6e63 47565a9
+Merge: 24b6e6387e 47565a949f
 Paolo Cavallini 	2015-10-14
 
     Merge pull request #2370 from neteler/patch-72
@@ -23895,7 +90244,7 @@ Paolo Cavallini 	2015-10-13
 
     Fixes a broken module. Possibly more broken ones around.
 
-Merge: 9556a76 07db984
+Merge: 9556a760da 07db984830
 Nyall Dawson 	2015-10-13
 
     Merge pull request #2337 from stevenmizuno/fix_3400
@@ -23910,14 +90259,14 @@ Radim Blazek 	2015-10-13
 
     [GRASS] editing test
 
-Merge: ff43a5d 537d195
+Merge: ff43a5dc1f 537d195957
 Nyall Dawson 	2015-10-13
 
     Merge pull request #2368 from nirvn/welcome_page_fix_resize
 
     [welcome page] fix recent project list not resizing on window / docked panel size change
 
-Merge: 3daa57f 2ddc071
+Merge: 3daa57f8c8 2ddc07163d
 Nyall Dawson 	2015-10-13
 
     Merge pull request #2367 from manisandro/qgsround
@@ -23998,7 +90347,7 @@ Larry Shaffer 	2015-10-09
 
     [auth] Fix #13550; add auth support to Server; read master password file
 
-Merge: de8b045 c1028ef
+Merge: de8b045b26 c1028efeb0
 mhugent 	2015-10-12
 
     Merge pull request #2365 from manisandro/geom_checker_fixes
@@ -24047,7 +90396,7 @@ Nyall Dawson 	2015-10-12
 
     Fix refining rule based renderer using expression (fix #10815)
 
-Merge: 4d35175 c927073
+Merge: 4d351756cb c927073e20
 mhugent 	2015-10-12
 
     Merge pull request #2353 from manisandro/geos_snap
@@ -24062,7 +90411,7 @@ Radim Blazek 	2015-10-12
 
     [GRASS] hide save layer edits action
 
-Merge: 160f172 7e2ffd4
+Merge: 160f172b42 7e2ffd46d8
 Salvatore Larosa 	2015-10-12
 
     Merge pull request #2364 from arnaud-morvan/processing-fix-field-calculator
@@ -24202,7 +90551,7 @@ Nyall Dawson 	2015-10-10
 
     Fix curved labels ignore line orientation placement flag (fix #5778)
 
-Merge: 80ccb39 b82c146
+Merge: 80ccb39ae5 b82c146cdb
 Nyall Dawson 	2015-10-10
 
     Merge pull request #2361 from m-kuhn/fix13549
@@ -24352,14 +90701,14 @@ Radim Blazek 	2015-10-09
 
     [GRASS] fixed crash when adding table for existing features
 
-Merge: 5426ebe b379e93
+Merge: 5426ebe8be b379e93b95
 alexbruy 	2015-10-09
 
     Merge pull request #2357 from spatialthoughts/patch-1
 
     [processing] remove unused argument
 
-Merge: b11b73c 391d60c
+Merge: b11b73cbbe 391d60c0e2
 alexbruy 	2015-10-09
 
     Merge pull request #2343 from PedroVenancio/grass7_plugin
@@ -24421,7 +90770,7 @@ Ujaval Gandhi 	2015-10-08
 
     getConsoleCommands takes only 1 arg. The extra arg in the method definition causes an error when running the algorithm
 
-Merge: de20495 844578d
+Merge: de20495911 844578d02d
 Alessandro Pasotti 	2015-10-08
 
     Merge pull request #2356 from elpaso/hidpi-improvements8
@@ -24705,7 +91054,7 @@ Radim Blazek 	2015-10-05
 
     [GRASS] disabled editing of cat and topo symbol
 
-Merge: 32e6d9c 26c1311
+Merge: 32e6d9c564 26c1311c54
 Radim Blazek 	2015-10-05
 
     Merge pull request #2349 from NINAnor/grass7_pluginupdate
@@ -24724,7 +91073,7 @@ Nyall Dawson 	2015-10-05
 
     [diagrams] Fix initial value of transparency slider not set (fix #13434)
 
-Merge: e8d1247 296ae9f
+Merge: e8d1247063 296ae9fadc
 ninsbl 	2015-10-05
 
     Merge branch 'grass7_pluginupdate' of https://github.com/NINAnor/QGIS into grass7_pluginupdate
@@ -24829,7 +91178,7 @@ Larry Shaffer 	2015-10-02
 
     Update bundling of qspatialite and postgres Qt SQL plugins for Mac
 
-Merge: 48ce385 1fdfe30
+Merge: 48ce385cd8 1fdfe30126
 Nathan Woodrow 	2015-10-02
 
     Merge pull request #2344 from nirvn/welcome_page_hidpi_fix
@@ -25141,7 +91490,7 @@ Tom Kralidis 	2015-09-29
 
     [MetaSearch] add guidance as comment
 
-Merge: a4151d7 22b1c08
+Merge: a4151d7770 22b1c087cc
 Tom Kralidis 	2015-09-29
 
     Merge pull request #2340 from NaturalGIS/pt_csw
@@ -25164,7 +91513,7 @@ Marco Hugentobler 	2015-09-29
 
     Disable add curve tools for point/raster layers
 
-Merge: fed74b2 8b17e8b
+Merge: fed74b2dfa 8b17e8b50c
 volaya 	2015-09-29
 
     Merge pull request #2339 from NaturalGIS/fix_grass7_v_sample
@@ -25294,21 +91643,21 @@ Juergen E. Fischer 	2015-09-27
 
     debian packaging update
 
-Merge: 4dd6d67 9cb18c6
+Merge: 4dd6d670f0 9cb18c6f39
 alexbruy 	2015-09-27
 
     Merge pull request #2332 from NaturalGIS/fix_ogr_tools
 
     [processing] fix some OGR-based tools
 
-Merge: 5f10b70 5211423
+Merge: 5f10b70b71 5211423df5
 alexbruy 	2015-09-27
 
     Merge pull request #2331 from radosuav/parameterString_fix
 
     [processing] fix setting of "multiline" setting for ParameterString
 
-Merge: a77e3bf ea0dc6e
+Merge: a77e3bf7d5 ea0dc6e2d4
 alexbruy 	2015-09-27
 
     Merge pull request #2283 from arnaud-morvan/processing-translate-parameterselection-content
@@ -25399,7 +91748,7 @@ Radim Blazek 	2015-09-25
 
     use layer items paramWidget() in browser properties
 
-Merge: caf12e7 12de332
+Merge: caf12e7e4b 12de332ebd
 Nyall Dawson 	2015-09-26
 
     Merge pull request #2330 from boundlessgeo/master-2_11-auth-system
@@ -25500,7 +91849,7 @@ Nyall Dawson 	2015-09-07
 
     Sponsored by NIWA
 
-Merge: 8cec2c9 d493a69
+Merge: 8cec2c935f d493a69069
 Nyall Dawson 	2015-09-25
 
     Merge pull request #2336 from slarosa/sortfilter_fieldvalues
@@ -25515,7 +91864,7 @@ Larry Shaffer 	2015-09-24
 
     [auth] Add authcfg ID edit widget and support for changing the ID
 
-Merge: e655c26 2ea4ee9
+Merge: e655c2617a 2ea4ee9a21
 mhugent 	2015-09-25
 
     Merge pull request #2302 from manisandro/geometry_plugins
@@ -25689,7 +92038,7 @@ Radim Blazek 	2015-09-23
 
     install app lib and link qgis to it
 
-Merge: 6a6adc9 055d968
+Merge: 6a6adc9a98 055d968f6f
 Matthias Kuhn 	2015-09-23
 
     Merge pull request #2334 from nirvn/welcome_page_style_v2
@@ -26047,7 +92396,7 @@ DelazJ 	2015-09-20
 
     enforces consistency
 
-Merge: 82b34af ada8ffd
+Merge: 82b34afe03 ada8ffdd2c
 Radim Blazek 	2015-09-20
 
     Merge pull request #2323 from PedroVenancio/grass7_plugin
@@ -26100,7 +92449,7 @@ Juergen E. Fischer 	2015-09-19
 
     fix precise build
 
-Merge: 11f683d 8b9e0b6
+Merge: 11f683d27d 8b9e0b65d6
 DelazJ 	2015-09-18
 
     Merge remote-tracking branch 'upstream/master' into ConsistentTerms2
@@ -26250,7 +92599,7 @@ Radim Blazek 	2015-09-17
 
     [GRASS] vector min/max and qtermwidget fixes
 
-Merge: 4897cdf 7a41a2d
+Merge: 4897cdf5ed 7a41a2da16
 Nathan Woodrow 	2015-09-17
 
     Merge pull request #2318 from slarosa/fix_crash_export_ramp
@@ -26283,7 +92632,7 @@ Sandro Santilli 	2015-09-16
 
     Add number of vertices to derived fields in identify tool
 
-Merge: 0daf6dd c823bcd
+Merge: 0daf6dd10f c823bcd63a
 Matthias Kuhn 	2015-09-16
 
     Merge pull request #2316 from slarosa/fix_return_pressed_we
@@ -26341,7 +92690,7 @@ Marco Hugentobler 	2015-09-16
 
     Replace foreach with Q_FOREACH
 
-Merge: c7a3ea3 9c2d701
+Merge: c7a3ea3271 9c2d70186f
 mhugent 	2015-09-16
 
     Merge pull request #2315 from mhugent/nodetool_no_clickclick
@@ -26470,7 +92819,7 @@ Nyall Dawson 	2015-09-14
 
     Update acceptable missing doc coverage
 
-Merge: e186331 0c58f9c
+Merge: e1863318a8 0c58f9c829
 Nathan Woodrow 	2015-09-14
 
     Merge pull request #2310 from slarosa/ml_icon
@@ -26546,7 +92895,7 @@ Nyall Dawson 	2015-09-10
     Regardless of the underlying layer geometry type, the tool was
     always reporting that geometries were not multipart
 
-Merge: 8731065 285c1d3
+Merge: 8731065715 285c1d3ee1
 mhugent 	2015-09-11
 
     Merge pull request #2298 from nyalldawson/fix_13099
@@ -26637,7 +92986,7 @@ Salvatore Larosa 	2015-09-10
 
     [processing] save modeler dialog/splitter geometry to settings
 
-Merge: 3d7b6fb 2b5f59c
+Merge: 3d7b6fb916 2b5f59c835
 Nyall Dawson 	2015-09-10
 
     Merge pull request #2306 from ahuarte47/developersmap_ahuarte47
@@ -26656,7 +93005,7 @@ nirvn 	2015-09-10
 
     [recent project] make use of baseName() in the file menu too
 
-Merge: 7ac5222 8826857
+Merge: 7ac5222556 8826857ef3
 Radim Blazek 	2015-09-10
 
     Merge pull request #2303 from PedroVenancio/grass7_plugin
@@ -26668,7 +93017,7 @@ Nyall Dawson 	2015-09-10
     [travis] deeper git clone, allows re-running earlier commits
     when dash submission fails
 
-Merge: e2dc8bf d7103df
+Merge: e2dc8bfe14 d7103dfb1b
 Denis Rouzaud 	2015-09-10
 
     Merge pull request #2300 from vmora/fix13302
@@ -26699,7 +93048,7 @@ Augustin 	2015-01-29
 
     Add "import only selected features" option to db manager
 
-Merge: 23a9922 3e7dba2
+Merge: 23a9922c06 3e7dba2be4
 Matthias Kuhn 	2015-09-09
 
     Merge pull request #2175 from anitagraser/patch-8
@@ -26789,7 +93138,7 @@ Matthias Kuhn 	2015-09-09
 
     Clarify wording of "Expression Variables" title
 
-Merge: ac97a0b 10170f4
+Merge: ac97a0b2b9 10170f4f3e
 Matthias Kuhn 	2015-09-09
 
     Merge pull request #2287 from nyalldawson/json
@@ -26866,7 +93215,7 @@ Nyall Dawson 	2015-09-08
     evaluated using QgsExpressions. Made possible through the use
     of Expression Contexts(tm)!
 
-Merge: 94badce 4c81803
+Merge: 94badce431 4c81803ea7
 Nathan Woodrow 	2015-09-08
 
     Merge pull request #2297 from nirvn/fix_recent_project_sort
@@ -26901,7 +93250,7 @@ Matthias Kuhn 	2015-09-07
     This increases portability of a qgs project with multimedia
     information attached.
 
-Merge: 5ae2881 f56054f
+Merge: 5ae2881c81 f56054f049
 Alessandro Pasotti 	2015-09-07
 
     Merge pull request #2296 from elpaso/qgsserver-return-pair
@@ -26971,7 +93320,7 @@ elpaso 	2015-09-07
 
     Convert to type works for QPair of QByteArray
 
-Merge: b006298 45554ec
+Merge: b00629882d 45554ec7f8
 Radim Blazek 	2015-09-07
 
     Merge pull request #2291 from PedroVenancio/grass7_plugin
@@ -27029,7 +93378,7 @@ PedroVenancio 	2015-09-05
 
     Changing r.info and v.info icons by metadata.svg icon already present in QGIS (images/themes/default/propertyicons/)
 
-Merge: cb5054f 557701c
+Merge: cb5054f9aa 557701ca9e
 mhugent 	2015-09-05
 
     Merge pull request #2290 from mhugent/geometry_marker
@@ -27072,14 +93421,14 @@ Juergen E. Fischer 	2015-09-04
 
     fix deprecation warnings
 
-Merge: 1ad2b76 2856981
+Merge: 1ad2b7693b 2856981ebd
 Nyall Dawson 	2015-09-04
 
     Merge pull request #2288 from nirvn/labelling_fix_fill_rule
 
     [labelling] set fill rule of qpainterpath for text/buffer rendering
 
-Merge: c0a8958 781bffa
+Merge: c0a89584be 781bffa408
 Radim Blazek 	2015-09-04
 
     Merge pull request #2285 from PedroVenancio/grass7_plugin
@@ -27090,7 +93439,7 @@ Radim Blazek 	2015-09-04
 
     [GRASS] qgm dbcolumn field check only if not hidden
 
-Merge: 6a5d9da 4ab2fba
+Merge: 6a5d9dacb7 4ab2fba7a5
 Nathan Woodrow 	2015-09-04
 
     Merge pull request #2289 from nirvn/fix_menu_recent_project
@@ -27336,7 +93685,7 @@ Radim Blazek 	2015-08-31
 
     [GRASS] catch fatal error in mapRegion()
 
-Merge: 5abb560 649b1eb
+Merge: 5abb560bc7 649b1eb949
 mhugent 	2015-08-31
 
     Merge pull request #2282 from mhugent/snapper_backward_compatibility
@@ -27355,22 +93704,22 @@ Radim Blazek 	2015-08-31
 
     [GRASS] outputType module attribute
 
-Merge: 6b16826 5eac108
+Merge: 6b16826989 5eac10857f
 Radim Blazek 	2015-08-31
 
     Merge branch 'NINAnor-grass7_pluginupdate'
 
-Merge: 6b16826 09076de
+Merge: 6b16826989 09076de5e0
 Radim Blazek 	2015-08-31
 
     [GRASS] default.qgm indentation
 
-Merge: 9a12012 539c952
+Merge: 9a120126df 539c95283f
 Radim Blazek 	2015-08-31
 
     Merge branch 'PedroVenancio-grass7_plugin'
 
-Merge: 9a12012 6e4c4f3
+Merge: 9a120126df 6e4c4f3e8d
 Radim Blazek 	2015-08-31
 
     [GRASS] Update and adaptation of GRASS plugin modules to GRASS 7
@@ -27391,7 +93740,7 @@ Nyall Dawson 	2015-08-31
 
     Fix leaks in QgsCodeEditor
 
-Merge: a60c8fc 8b82584
+Merge: a60c8fc2ba 8b8258442a
 mhugent 	2015-08-31
 
     Merge pull request #2275 from mhugent/rubberband_fixes
@@ -27507,7 +93856,7 @@ PedroVenancio 	2015-08-29
 
     Update and adaptation of GRASS plugin modules to GRASS 7 (default.qgc, db.out.ogr.qgm, r.basins.fill.qgm, r.carve.qgm, r.circle.qgm, r.fill.dir.qgm, r.lake.seed.qgm, r.lake.xy.qgm, r.plane.qgm, r.random.qgm, r.random.raster.qgm, r.reclass.area.greater.qgm, r.reclass.area.lesser.qgm, r.water.outlet.qgm, v.in.ogr.loc.qgm, v.kernel.qgm, v.surf.bspline.qgm, v.surf.rst.qgm, v.what.rast.qgm, v.what.vect.qgm, v.db.addcolumn.1.png, v.db.addcolumn.qgm, v.db.dropcolumn.1.png, v.db.dropcolumn.qgm)
 
-Merge: b789fab eadb83b
+Merge: b789fabf0a eadb83ba60
 Radim Blazek 	2015-08-29
 
     Merge pull request #2276 from spaceof7/grass
@@ -27518,12 +93867,12 @@ Juergen E. Fischer 	2015-08-29
 
     fix precise build
 
-Merge: 5c0921c d07cad9
+Merge: 5c0921c555 d07cad9304
 Andrew McAninch 	2015-08-28
 
     Merge branch 'master' into grass
 
-Merge: a16ad98 0099f22
+Merge: a16ad98a12 0099f2293c
 Andrew McAninch 	2015-08-28
 
     Merge remote-tracking branch 'upstream/master'
@@ -27630,7 +93979,7 @@ Juergen E. Fischer 	2015-08-27
 
     debian packaging: support multiple conditions
 
-Merge: f95ea58 a16ad98
+Merge: f95ea58b9c a16ad98a12
 Andrew McAninch 	2015-08-27
 
     Merge branch 'master' into grass
@@ -27663,14 +94012,14 @@ Radim Blazek 	2015-08-27
 
     [GRASS] allow major version only in qgm version_min/max
 
-Merge: f0871e2 42e7092
+Merge: f0871e20fe 42e709221b
 Radim Blazek 	2015-08-27
 
     Merge pull request #2274 from PedroVenancio/grass7_plugin
 
     Update and adaptation of some GRASS plugin modules
 
-Merge: 349b68b f95ea58
+Merge: 349b68b586 f95ea58b9c
 Radim Blazek 	2015-08-27
 
     Merge pull request #2273 from spaceof7/grass
@@ -27705,17 +94054,17 @@ Nyall Dawson 	2015-08-27
 
     Fix build
 
-Merge: b404ae2 6809835
+Merge: b404ae2048 6809835426
 Andrew McAninch 	2015-08-26
 
     Merge branch 'grass'
 
-Merge: 05b8a98 0fb356e
+Merge: 05b8a985a5 0fb356e822
 Andrew McAninch 	2015-08-26
 
     Merge remote-tracking branch 'qgis/master'
 
-Merge: 05b8a98 0fb356e
+Merge: 05b8a985a5 0fb356e822
 Andrew McAninch 	2015-08-26
 
     Merge remote-tracking branch 'qgis/master' into grass
@@ -27812,13 +94161,13 @@ Nathan Woodrow 	2015-08-25
 
     Add missing doc strings
 
-Merge: 01d635a 385a608
+Merge: 01d635a9ae 385a608a0b
 Nathan Woodrow 	2015-08-25
 
     Merge branch 'master' of https://github.com/qgis/QGIS
 
     Conflicts:
-src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
+            src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
 
 Nyall Dawson 	2015-08-25
 
@@ -27850,7 +94199,7 @@ Nyall Dawson 	2015-08-25
 
     Fix leak in diagram renderer
 
-Merge: 2f60a5f 039b4fb
+Merge: 2f60a5f85c 039b4fbcf9
 Nathan Woodrow 	2015-08-25
 
     Merge remote-tracking branch 'origin'
@@ -27921,7 +94270,7 @@ Radim Blazek 	2015-08-24
 
     [GRASS] add auto relation between column and layer option (disabled)
 
-Merge: 2c4f02a ed69f1c
+Merge: 2c4f02ad06 ed69f1c026
 mhugent 	2015-08-24
 
     Merge pull request #2268 from mhugent/curve_capture_tool
@@ -27952,7 +94301,7 @@ Nyall Dawson 	2015-08-24
 
     Fix crash in geometry serialisation when no geometry set
 
-Merge: d594a56 20f0a5a
+Merge: d594a56f37 20f0a5a99e
 Radim Blazek 	2015-08-24
 
     Merge pull request #2264 from NINAnor/grass7_pluginupdate
@@ -28004,19 +94353,19 @@ Juergen E. Fischer 	2015-08-23
 
     fix typo
 
-Merge: b39055b b87073e
+Merge: b39055b39c b87073e146
 Nathan Woodrow 	2015-08-23
 
     Merge row style support for attribute table
 
     Conflicts:
-python/core/qgsconditionalstyle.sip
-python/core/qgsfielduiproperties.sip
-src/core/qgsfielduiproperties.cpp
-src/core/qgsfielduiproperties.h
-src/gui/attributetable/qgsattributetablemodel.cpp
-src/ui/qgsfieldconditionalformatwidget.ui
-tests/src/python/test_qgsconditionalstyle.py
+            python/core/qgsconditionalstyle.sip
+            python/core/qgsfielduiproperties.sip
+            src/core/qgsfielduiproperties.cpp
+            src/core/qgsfielduiproperties.h
+            src/gui/attributetable/qgsattributetablemodel.cpp
+            src/ui/qgsfieldconditionalformatwidget.ui
+            tests/src/python/test_qgsconditionalstyle.py
 
 Nathan Woodrow 	2015-08-23
 
@@ -28292,7 +94641,7 @@ Nathan Woodrow 	2015-08-22
 
     Add cell style on top of row
 
-Merge: b110c0e a8bd999
+Merge: b110c0eafc a8bd9995e1
 Tom Kralidis 	2015-08-21
 
     Merge pull request #2267 from geopython/master
@@ -28383,14 +94732,14 @@ Nathan Woodrow 	2015-08-20
 
     [FEATURE] Conditional formatting for attribute table cells
 
-Merge: bf7cf6a 94d3bdd
+Merge: bf7cf6ac6b 94d3bdd01a
 volaya 	2015-08-20
 
     Merge pull request #2247 from spencerrecneps/master
 
     [Processing] Fixed bad variable references
 
-Merge: b578fc1 424d3d3
+Merge: b578fc14f8 424d3d337e
 volaya 	2015-08-20
 
     Merge pull request #2262 from neteler/patch-72
@@ -28493,14 +94842,14 @@ Matthias Kuhn 	2015-08-18
 
     Fix dos2unix as flip alternative
 
-Merge: d5d7c58 ff15e84
+Merge: d5d7c580ab ff15e84020
 Matthias Kuhn 	2015-08-19
 
     Merge pull request #2259 from elpaso/hidpi-improvements4
 
     Scale attribute table cells to content
 
-Merge: fd23859 1f81109
+Merge: fd23859f33 1f81109b4a
 Matthias Kuhn 	2015-08-19
 
     Merge pull request #2260 from bstroebl/fixDissolve
@@ -28519,7 +94868,7 @@ elpaso 	2015-08-19
 
     Adjust column size
 
-Merge: b87e5f7 8c652eb
+Merge: b87e5f7573 8c652eb1f6
 Radim Blazek 	2015-08-19
 
     Merge pull request #2258 from NINAnor/grass7_pluginupdate
@@ -28640,7 +94989,7 @@ Nyall Dawson 	2015-08-18
     or scripts with changes by transparently saving them out to a
     temporary file.
 
-Merge: 7527638 0a93f94
+Merge: 7527638d43 0a93f94bbe
 Martin Dobias 	2015-08-18
 
     Merge pull request #2245 from vmora/issue13078
@@ -28767,7 +95116,7 @@ Marco Hugentobler 	2015-08-13
 
     Use compound curve in capture tool to store captured geometry
 
-Merge: e9ff061 446410e
+Merge: e9ff061f05 446410ee78
 Nathan Woodrow 	2015-08-13
 
     Merge pull request #2243 from michaelkirk/feature/crs_help
@@ -28908,7 +95257,7 @@ Nyall Dawson 	2015-08-08
 
     Cleanup QgsVectorLayer tests
 
-Merge: 71e7aab e48b6e8
+Merge: 71e7aabbde e48b6e8910
 Alessandro Pasotti 	2015-08-07
 
     Merge pull request #2239 from elpaso/move-conversions-sip
@@ -28963,7 +95312,7 @@ Matthias Kuhn 	2015-08-04
     QgsMarkerSymbolV2 in a QgsDataDefined. This commit fixes the legacy API and
     redirects calls to the new API.
 
-Merge: c4ea8de dc2de77
+Merge: c4ea8de5ed dc2de774c2
 Chris Crook 	2015-08-07
 
     Merge pull request #2237 from ccrook/csv_field_name_fix
@@ -28974,7 +95323,7 @@ Chris Crook 	2015-08-07
 
     Removing unnecessary restriction on field names
 
-Merge: 2a14ffd 1b06c0c
+Merge: 2a14ffd281 1b06c0c3b8
 Alessandro Pasotti 	2015-08-06
 
     Merge pull request #2236 from elpaso/sip-server-filters-bindings
@@ -29083,7 +95432,7 @@ Juergen E. Fischer 	2015-07-31
 
     database provider: fix andWhereClauses
 
-Merge: 745f91d 9aae680
+Merge: 745f91d249 9aae680d47
 Alessandro Pasotti 	2015-08-04
 
     Merge pull request #2233 from elpaso/carolinux-python-init-less-verbose
@@ -29310,7 +95659,7 @@ Juergen E. Fischer 	2015-07-29
 
     indentation update
 
-Merge: 4660182 86329f0
+Merge: 466018214c 86329f0170
 mhugent 	2015-07-29
 
     Merge pull request #2223 from mhugent/measurement_from_geometry
@@ -29371,7 +95720,7 @@ Juergen E. Fischer 	2015-07-27
 
     processing: simple interface translation fix
 
-Merge: 8680259 10d262f
+Merge: 8680259818 10d262f3f1
 Marco Hugentobler 	2015-07-27
 
     Merge branch 'master' into measurement_from_geometry
@@ -29406,7 +95755,7 @@ Juergen E. Fischer 	2015-07-26
 
     spelling fixes
 
-Merge: 7439db1 bda76e5
+Merge: 7439db1e66 bda76e5750
 Jürgen Fischer 	2015-07-26
 
     Merge pull request #2222 from medspx/dbmanager-oracle
@@ -29470,7 +95819,7 @@ Matthias Kuhn 	2015-07-24
 
     Add QgsRelation::getReferencedFeature to access parent feature
 
-Merge: 6cccd21 69eb7eb
+Merge: 6cccd21738 69eb7ebe62
 mhugent 	2015-07-24
 
     Merge pull request #2217 from mhugent/node_tool_changes
@@ -29624,7 +95973,7 @@ Juergen E. Fischer 	2015-07-21
 
     osgeo4w: switch to grass 7.0.1RC2
 
-Merge: 268feb5 336248e
+Merge: 268feb5c16 336248eef1
 Nyall Dawson 	2015-07-21
 
     Merge pull request #2215 from landryb/remove_bom
@@ -29639,7 +95988,7 @@ Nyall Dawson 	2015-07-21
 
     [pal] Use GEOS methods for label position conflict tests
 
-Merge: e2df800 b0dd2af
+Merge: e2df800f11 b0dd2afb40
 alexbruy 	2015-07-20
 
     Merge pull request #2213 from arnaud-morvan/processing-translation
@@ -29670,14 +96019,14 @@ Nyall Dawson 	2015-07-20
 
     [pal] Fixes to geometry handling for point sets
 
-Merge: 49d0f3a 0dfb156
+Merge: 49d0f3a12f 0dfb1561c6
 volaya 	2015-07-20
 
     Merge pull request #2214 from radosuav/numberInputPanel_range_fix
 
     [Processing] Fix limits in NumberInputPanel when the limiting value is 0
 
-Merge: dc4049d e751592
+Merge: dc4049ddff e751592a4d
 volaya 	2015-07-20
 
     Merge pull request #2204 from Gustry/processing
@@ -29773,7 +96122,7 @@ Nyall Dawson 	2015-07-16
 
     Add test for handling invalid WKT with z values (refs #13055)
 
-Merge: 6ee1d67 6788fba
+Merge: 6ee1d67e8a 6788fbaa6a
 mhugent 	2015-07-15
 
     Merge pull request #2211 from mhugent/transect_sample_extension
@@ -29854,7 +96203,7 @@ Juergen E. Fischer 	2015-07-13
 
     osgeo4w: run nightly tests with separate temporary directories
 
-Merge: 48e4fb8 42137e4
+Merge: 48e4fb85c8 42137e4adc
 Jürgen Fischer 	2015-07-13
 
     Merge pull request #2197 from manisandro/dropconnections
@@ -29988,7 +96337,7 @@ Marco Hugentobler 	2015-07-10
 
     Use advanced editing for node tool
 
-Merge: 2b5ea36 0312dbf
+Merge: 2b5ea3669e 0312dbf3cb
 Alessandro Pasotti 	2015-07-10
 
     Merge pull request #2206 from elpaso/server-docs-server-iface-fix
@@ -30107,7 +96456,7 @@ Nyall Dawson 	2015-07-08
     Previously only the priority for the entire layer could be specified
     (fix #4606)
 
-Merge: c74754e f0835ec
+Merge: c74754ed8d f0835ec3e5
 mhugent 	2015-07-08
 
     Merge pull request #2200 from mhugent/server_content_disposition
@@ -30169,7 +96518,7 @@ Nyall Dawson 	2015-07-07
     [pal] 'Follow placement' alignment should also work for offset
     from point placements
 
-Merge: 099faec 659f0d6
+Merge: 099faec597 659f0d661c
 Nathan Woodrow 	2015-07-07
 
     Merge branch 'export_symbols'
@@ -30188,7 +96537,7 @@ Nyall Dawson 	2015-07-07
 
     Minor coverity fixes
 
-Merge: 4f212d3 06cc8ba
+Merge: 4f212d3983 06cc8bada7
 mhugent 	2015-07-07
 
     Merge pull request #2199 from mhugent/wkt_fix
@@ -30281,7 +96630,7 @@ Nyall Dawson 	2015-07-04
     Fix setting symbol width/size/rotation from right click menu
     (fix #13070)
 
-Merge: 29aaf1b fe1a032
+Merge: 29aaf1bad8 fe1a032181
 Jürgen Fischer 	2015-07-03
 
     Merge pull request #2192 from Gustry/fix-13067
@@ -30296,7 +96645,7 @@ Juergen E. Fischer 	2015-07-03
 
     skip blanks between wkt child blocks (fixes #13053)
 
-Merge: f92d9c1 127dd64
+Merge: f92d9c1176 127dd64db6
 mhugent 	2015-07-03
 
     Merge pull request #2191 from mhugent/server_cache_multi_projects
@@ -30321,7 +96670,7 @@ Radim Blazek 	2015-07-03
 
     This reverts commit 57ffaa7d0a2610f0fe67f5983ad10ad38274f99f.
 
-Merge: 2083d6d 132fa0d
+Merge: 2083d6db25 132fa0d25b
 Jürgen Fischer 	2015-07-03
 
     Merge pull request #2190 from elpaso/server-test-update
@@ -30406,12 +96755,12 @@ Sandro Santilli 	2015-07-02
 
     Fixes #12802
 
-Merge: cce6c8b 89b275c
+Merge: cce6c8bad3 89b275c3a2
 Marco Hugentobler 	2015-07-02
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 738260a a9c830e
+Merge: 738260a7de a9c830e67b
 Marco Hugentobler 	2015-07-02
 
     [FEATURE]: getMap in dxf format
@@ -30526,7 +96875,7 @@ Nyall Dawson 	2015-06-30
 
     Tweak raster calc test
 
-Merge: 3094297 a9c6396
+Merge: 3094297f51 a9c63968bf
 Hugo Mercier 	2015-06-30
 
     Merge pull request #2183 from mhugo/master
@@ -30567,21 +96916,21 @@ Juergen E. Fischer 	2015-06-29
 
     edit widget: fix ranges (followup 91e44eaf; fixes #12421)
 
-Merge: 9b69825 f8133cc
+Merge: 9b69825d28 f8133cc524
 mhugent 	2015-06-29
 
     Merge pull request #2179 from elpaso/patch-3
 
     Added myself
 
-Merge: 2b444ac 0a93b17
+Merge: 2b444ac9c8 0a93b171f9
 mhugent 	2015-06-29
 
     Merge pull request #2178 from elpaso/patch-2
 
     Added myself
 
-Merge: 1dfe005 540165d
+Merge: 1dfe005e67 540165d041
 mhugent 	2015-06-29
 
     Merge pull request #2092 from elpaso/server-refactoring-3
@@ -30672,7 +97021,7 @@ Denis Rouzaud 	2015-06-29
 
     added QgsExtentGroupBox to custom widgets
 
-Merge: 355fc91 4420b3b
+Merge: 355fc91a6c 4420b3bf99
 Pirmin Kalberer 	2015-06-29
 
     Merge pull request #2173 from cedi4155476/dbmanager-geopackage_2
@@ -30897,14 +97246,14 @@ Nathan Woodrow 	2015-06-26
 
     Fix crash on user.py import of expressions
 
-Merge: 04439fe c62b52b
+Merge: 04439fe2a9 c62b52bc67
 Vincent Mora 	2015-06-26
 
     Merge pull request #2167 from vmora/keep_data_defined_at_marker_level_on_property_change
 
     fix loss of expression when subsymbol is changed
 
-Merge: 7b31f12 9bf1ec2
+Merge: 7b31f12405 9bf1ec2136
 Jürgen Fischer 	2015-06-26
 
     Merge pull request #2171 from Gustry/changelog
@@ -30980,7 +97329,7 @@ Juergen E. Fischer 	2015-06-26
 
     processing: fix installation of saga 2.1.3 descriptions
 
-Merge: e6556a2 3387d6f
+Merge: e6556a2d8d 3387d6f632
 Jürgen Fischer 	2015-06-26
 
     Merge pull request #2118 from jef-n/postgres-like-concat
@@ -31055,7 +97404,7 @@ volaya 	2015-06-24
 
     [processing] fixed a couple of wrong SAGA algorithm descriptions for 2.1.4
 
-Merge: aab071d 5a9df7e
+Merge: aab071de9a 5a9df7eba3
 volaya 	2015-06-24
 
     Merge pull request #2164 from Gustry/fix-replace
@@ -31141,7 +97490,7 @@ Juergen E. Fischer 	2015-06-24
 
     indentation and spelling fixes
 
-Merge: 8656b2d 028c083
+Merge: 8656b2d03b 028c083685
 Nyall Dawson 	2015-06-24
 
     Merge pull request #2163 from carolinux/master
@@ -31425,7 +97774,7 @@ Salvatore Larosa 	2015-06-21
 
     fix plus icon for relation widget in project properties
 
-Merge: eaaa98f b39cb7b
+Merge: eaaa98fd45 b39cb7bac6
 Salvatore Larosa 	2015-06-21
 
     Merge pull request #2154 from slarosa/custom_dialog
@@ -31469,7 +97818,7 @@ Nyall Dawson 	2015-06-21
 
     Fix typo
 
-Merge: 88629a6 72c56df
+Merge: 88629a6b19 72c56dffdb
 alexbruy 	2015-06-21
 
     Merge pull request #2151 from NaturalGIS/fix_grass_r_drain
@@ -31503,7 +97852,7 @@ Radim Blazek 	2015-06-20
 
     [GRASS] alloc enough space for Map_info on Windows, fixes #13002
 
-Merge: 5dc0db6 a811cbc
+Merge: 5dc0db634b a811cbce15
 Nathan Woodrow 	2015-06-20
 
     Merge pull request #2153 from nirvn/georef_icon_size
@@ -31590,7 +97939,7 @@ Juergen E. Fischer 	2015-06-19
 
     oracle provider: fix ExactIntersect check if spatial extension is available and there is no spatial index (fixes #13005)
 
-Merge: 61f39d6 22082d6
+Merge: 61f39d6ff3 22082d6587
 Salvatore Larosa 	2015-06-19
 
     Merge pull request #2146 from slarosa/new_sharing_icons
@@ -31635,14 +97984,14 @@ elpaso 	2015-06-05
 
     Fix interpolation tool crashes qgis #12855
 
-Merge: 705eb74 72369fd
+Merge: 705eb74ec5 72369fd973
 Martin Dobias 	2015-06-19
 
     Merge pull request #2101 from mhugo/fix_cache_enabling
 
     Wait for the current rendering to finish before touching the cache
 
-Merge: a316290 a0c04d1
+Merge: a316290ada a0c04d1edb
 Jürgen Fischer 	2015-06-19
 
     Merge pull request #2150 from nyalldawson/fix_cmake_warnings
@@ -31801,7 +98150,7 @@ Martin Dobias 	2015-06-18
     Both SVGs had an extra path out of specified bounds which was getting
     clipped out when rendering to canvas, but not in other places.
 
-Merge: 1bdb426 395d630
+Merge: 1bdb426115 395d630486
 Nathan Woodrow 	2015-06-18
 
     Merge pull request #2149 from slarosa/func_sel_first_item
@@ -32006,7 +98355,7 @@ Matthias Kuhn 	2015-06-15
 
     Use ppa for newer doxygen
 
-Merge: 77c3e86 cf5b454
+Merge: 77c3e867d8 cf5b454390
 volaya 	2015-06-15
 
     Merge pull request #2139 from nachouve/patch-1
@@ -32036,7 +98385,7 @@ Nyall Dawson 	2015-06-15
     Fixes loss of font styles when restoring projects. Credit to @nirvn
     for the initial implementation.
 
-Merge: 8fbee12 12c1c86
+Merge: 8fbee12106 12c1c869ee
 Jürgen Fischer 	2015-06-15
 
     Merge pull request #2141 from radosuav/processing_warp
@@ -32128,7 +98477,7 @@ Jürgen Fischer 	2015-06-13
 
     also makes gitter evenly prominent.
 
-Merge: 5321894 ef0e3c3
+Merge: 53218948b1 ef0e3c33d5
 Tim Sutton 	2015-06-13
 
     Merge pull request #2135 from gitter-badger/gitter-badge
@@ -32245,7 +98594,7 @@ Denis Rouzaud 	2015-06-11
 
     missing meta-object declaration for Behaviour enum
 
-Merge: 61698fc 100de72
+Merge: 61698fc63c 100de728e2
 mhugent 	2015-06-11
 
     Merge pull request #2079 from manisandro/mutex
@@ -32298,7 +98647,7 @@ Juergen E. Fischer 	2015-06-10
     * don't destroy order just remove duplicate includes
     * run after astyle
 
-Merge: 86a4820 2b7d3d3
+Merge: 86a4820f48 2b7d3d3c73
 Denis Rouzaud 	2015-06-10
 
     Merge pull request #2131 from 3nids/test_sort_include_2
@@ -32469,7 +98818,7 @@ Nyall Dawson 	2015-06-09
     Bump number of decimal places for offset tool spinbox, otherwise
     offset tool only allows coarse adjustments in certain CRSs.
 
-Merge: 03ad6ac cf6de0f
+Merge: 03ad6aca8a cf6de0f336
 Nyall Dawson 	2015-06-09
 
     Merge pull request #2126 from nirvn/lock_icon_refresh
@@ -32480,7 +98829,7 @@ nirvn 	2015-06-09
 
     [gui] refresh the symbology and composer lock icons
 
-Merge: 558f0b2 3e17d56
+Merge: 558f0b2808 3e17d5631c
 Nathan Woodrow 	2015-06-09
 
     Merge pull request #2125 from nirvn/symbology_arrows_refresh-v3
@@ -32499,7 +98848,7 @@ Juergen E. Fischer 	2015-06-08
 
     mssql provider: improve datetime support (fixes #12461)
 
-Merge: 77bf10b 941107d
+Merge: 77bf10b752 941107dfa4
 volaya 	2015-06-08
 
     Merge pull request #2121 from slarosa/algname_messagebar
@@ -32526,7 +98875,7 @@ Nyall Dawson 	2015-06-08
 
     Fix another issue with reshape tool and polygons with rings
 
-Merge: 77d68b0 fab465a
+Merge: 77d68b0d6c fab465aa16
 alexbruy 	2015-06-08
 
     Merge pull request #2110 from NaturalGIS/fix_grass7_v_voronoi
@@ -32547,14 +98896,14 @@ Nyall Dawson 	2015-06-08
     tables through the browser. Also add confirmation before dropping
     connections (fix #12853).
 
-Merge: ea31c68 4075979
+Merge: ea31c680f9 4075979e0d
 Nathan Woodrow 	2015-06-07
 
     Merge pull request #2119 from nirvn/browser_toolbar_improvement
 
     [browser] slight re-ordering and icon improvements
 
-Merge: 624d142 cc8c7ab
+Merge: 624d142ec4 cc8c7ab0ae
 Nathan Woodrow 	2015-06-07
 
     Merge pull request #2120 from nirvn/layer_legend_icon_updates
@@ -32597,7 +98946,7 @@ Juergen E. Fischer 	2015-06-06
 
     expression: let concat handle NULL like empty string (like in postgres)
 
-Merge: 7aae459 6ef5fb7
+Merge: 7aae459fa9 6ef5fb7215
 Martin Dobias 	2015-06-06
 
     Merge pull request #2117 from nirvn/osm_area_more_improvements
@@ -32616,7 +98965,7 @@ Juergen E. Fischer 	2015-06-05
 
     enable c++11 support for MSVC>2010 (although that's still what's used for the packages)
 
-Merge: 1cd4fd6 fb107f1
+Merge: 1cd4fd6e73 fb107f1d4f
 Jürgen Fischer 	2015-06-05
 
     Merge pull request #2114 from geometalab/master
@@ -32639,7 +98988,7 @@ Marco Hugentobler 	2015-06-05
 
     More geos exceptions
 
-Merge: 0df62b7 65a57ed
+Merge: 0df62b7aad 65a57edc64
 Nyall Dawson 	2015-06-05
 
     Merge pull request #2111 from vmora/issue_12876
@@ -32678,7 +99027,7 @@ Werner Macho 	2015-06-04
 
     Signed-off-by: Werner Macho 
 
-Merge: 8cdd617 12134a0
+Merge: 8cdd6173b0 12134a0283
 pcav 	2015-06-04
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -32774,7 +99123,7 @@ Juergen E. Fischer 	2015-06-02
 
     debian packaging update: include links to qt4 in api docs
 
-Merge: afa389f 9fcbbc3
+Merge: afa389fcbe 9fcbbc3d70
 mhugent 	2015-06-02
 
     Merge pull request #2104 from mhugent/geomtype_render_fix
@@ -32828,7 +99177,7 @@ Nyall Dawson 	2015-06-02
 
     Add a few more geometry docs
 
-Merge: ddfb9d1 c859127
+Merge: ddfb9d1094 c859127c4e
 alexbruy 	2015-06-02
 
     Merge pull request #2099 from NaturalGIS/grass_v_voronoi_advanced
@@ -32843,7 +99192,7 @@ Matthias Kuhn 	2015-06-01
 
     Add some doxymentation to collapsible group boxes
 
-Merge: ae11a73 92b1439
+Merge: ae11a731ae 92b14399b5
 Martin Dobias 	2015-06-02
 
     Merge pull request #2100 from nirvn/osm_closed_way_improvement-v2
@@ -32926,7 +99275,7 @@ Matthias Kuhn 	2015-06-01
 
     Fix sip bindings for QgsTransaction
 
-Merge: ded11b3 43cf6b0
+Merge: ded11b3256 43cf6b040f
 alexbruy 	2015-06-01
 
     Merge pull request #2098 from NaturalGIS/fix_several_modules
@@ -32962,7 +99311,7 @@ Nyall Dawson 	2015-06-01
     - Fix broken distance method
     - Fix broken split method
 
-Merge: 738838a 3273365
+Merge: 738838acd4 327336517d
 alexbruy 	2015-06-01
 
     Merge pull request #2097 from NaturalGIS/fix_grass_r_horizon
@@ -33014,7 +99363,7 @@ Juergen E. Fischer 	2015-05-31
 
     include user.py in translations
 
-Merge: 51bd0b2 f7401c9
+Merge: 51bd0b2bc5 f7401c9b27
 Jürgen Fischer 	2015-05-31
 
     Merge pull request #2096 from slarosa/fix_crash_user_expressions
@@ -33043,14 +99392,14 @@ elpaso 	2015-05-30
 
     Added documentation and QgsServer to doxy template
 
-Merge: 0c9c631 f8ae76b
+Merge: 0c9c63176a f8ae76b7b5
 alexbruy 	2015-05-30
 
     Merge pull request #2094 from NaturalGIS/fix_grass_r_stream
 
     [processing] remove r.stream modules that are addons, fix r.stream.extract in grass7
 
-Merge: 2dc5d95 2b1b9f5
+Merge: 2dc5d95f00 2b1b9f53ac
 alexbruy 	2015-05-30
 
     Merge pull request #2093 from NaturalGIS/fix_grass7
@@ -33149,7 +99498,7 @@ Juergen E. Fischer 	2015-05-29
 
     indentation update
 
-Merge: 7db5272 62c837e
+Merge: 7db5272f31 62c837eb90
 Nathan Woodrow 	2015-05-29
 
     Merge pull request #2091 from nirvn/fix_tool_button_size
@@ -33177,21 +99526,21 @@ Nyall Dawson 	2015-05-29
     Avoid unnecessary detach of QgsFeature when renderering non-curved
     geometries
 
-Merge: bd3b173 b16b6bb
+Merge: bd3b173817 b16b6bbb98
 Tim Sutton 	2015-05-28
 
     Merge pull request #2085 from timlinux/master
 
     Updated splash for Nødebo
 
-Merge: c61d5f2 aba4fe0
+Merge: c61d5f2cfc aba4fe0fe2
 alexbruy 	2015-05-28
 
     Merge pull request #2065 from arnaud-morvan/processing-parameter-table
 
     [processing] fix setting value in the ParameterTable
 
-Merge: 352e824 8c624a3
+Merge: 352e82487c 8c624a3452
 alexbruy 	2015-05-28
 
     Merge pull request #2063 from HenningJagd/master
@@ -33279,7 +99628,7 @@ Matthias Kuhn 	2015-05-28
     Refs #11398
     Refs #11296
 
-Merge: a02e694 7b94fc5
+Merge: a02e694818 7b94fc548d
 Nyall Dawson 	2015-05-28
 
     Merge pull request #2088 from nirvn/refresh_icons
@@ -33308,7 +99657,7 @@ Juergen E. Fischer 	2015-05-28
 
     include more geometry headers in install
 
-Merge: bfabb85 89477af
+Merge: bfabb852fb 89477af1b9
 Nathan Woodrow 	2015-05-28
 
     Merge pull request #2087 from slarosa/fix_function_editor
@@ -33421,7 +99770,7 @@ Martin Dobias 	2015-05-27
     - in PostGIS < 1.5 such function does not exist
     - in PostGIS >=1.5 the function is st_curvetoline()
 
-Merge: 26e6725 a0a1cea
+Merge: 26e6725af6 a0a1cea0e1
 Nathan Woodrow 	2015-05-27
 
     Merge pull request #2071 from nirvn/fix_dock_tool_button
@@ -33495,7 +99844,7 @@ Giuseppe Sucameli 	2015-05-27
 
     Create a view from the selected query (PR#1999)
 
-Merge: c729a75 596b126
+Merge: c729a753c5 596b126b94
 Alexander Bruy 	2015-05-27
 
     Merge branch 'processing-r.stat'
@@ -33504,13 +99853,13 @@ Alexander Bruy 	2015-05-27
 
     fix conflicts
 
-Merge: c729a75 a3454e7
+Merge: c729a753c5 a3454e7548
 Alexander Bruy 	2015-05-27
 
     Merge branch 'master' of https://github.com/scubbx/QGIS into processing-r.stat
 
     Conflicts:
-python/plugins/processing/algs/grass7/Grass7Algorithm.py
+            python/plugins/processing/algs/grass7/Grass7Algorithm.py
 
 Nyall Dawson 	2015-05-27
 
@@ -33548,7 +99897,7 @@ Matthias Kuhn 	2015-05-26
 
     Followup cec5bdeb : Add tests for expression compiler
 
-Merge: 13d67c0 ae6b290
+Merge: 13d67c09cc ae6b290a4f
 alexbruy 	2015-05-26
 
     Merge pull request #2064 from arnaud-morvan/processing-check-validity
@@ -33575,7 +99924,7 @@ Martin Dobias 	2015-05-26
 
     Support overriden layer styles also in the composer legend
 
-Merge: 9e5b2ba 6e4b883
+Merge: 9e5b2ba511 6e4b883ac5
 alexbruy 	2015-05-26
 
     Merge pull request #2076 from NaturalGIS/fix_grass7_r_surf_area
@@ -33594,7 +99943,7 @@ Matthias Kuhn 	2015-05-26
 
     Coverity fixes
 
-Merge: b5801af e015a7e
+Merge: b5801afe29 e015a7ec1f
 Matthias Kuhn 	2015-05-26
 
     Merge pull request #2059 from carolinux/search-widgets
@@ -33607,7 +99956,7 @@ Marco Hugentobler 	2015-05-26
 
     Update python bindings for QgsGeometry
 
-Merge: e2edc54 a6bf6e9
+Merge: e2edc54f11 a6bf6e9a6b
 mhugent 	2015-05-26
 
     Merge pull request #2078 from manisandro/connpoolfixes
@@ -33626,7 +99975,7 @@ Radim Blazek 	2015-05-26
 
     new class QgsAnimatedIcon
 
-Merge: f31abe4 b4f4663
+Merge: f31abe4dfe b4f4663b7d
 mhugent 	2015-05-26
 
     Merge pull request #2069 from manisandro/ogrpool
@@ -33671,14 +100020,14 @@ Juergen E. Fischer 	2015-05-25
     * 3d geometries from oracle
     * windows build
 
-Merge: 0b9ea9a e440dee
+Merge: 0b9ea9a616 e440dee1bd
 Hugo Mercier 	2015-05-25
 
     Merge pull request #2025 from mhugo/db_manager_dev
 
     db manager SQL window enhancements
 
-Merge: 4e14f8d a5351fc
+Merge: 4e14f8d62e a5351fc18a
 Hugo Mercier 	2015-05-25
 
     Merge pull request #2057 from Hvitnov/fix12655
@@ -33701,14 +100050,14 @@ Juergen E. Fischer 	2015-05-25
 
     fix some warnings
 
-Merge: b7a2a79 a62adfe
+Merge: b7a2a79de2 a62adfe45a
 mhugent 	2015-05-25
 
     Merge pull request #2048 from alexbruy/fix-curvature-filter
 
     fix total curvature calculation (fix #5967)
 
-Merge: bb80c63 68fe5f5
+Merge: bb80c63805 68fe5f5791
 mhugent 	2015-05-25
 
     Merge pull request #2055 from mhugent/geometry_mmsql_2_8
@@ -33719,21 +100068,21 @@ Marco Hugentobler 	2015-05-15
 
     [FEATURE:] New geometry classes
 
-Merge: 12883f5 cee47d6
+Merge: 12883f50a7 cee47d66b4
 alexbruy 	2015-05-25
 
     Merge pull request #2074 from NaturalGIS/fix_saga_contour
 
     [processing] fix SAGA 2.1.4 contour lines from grid
 
-Merge: 6596adc 4f87af0
+Merge: 6596adc8e6 4f87af0851
 alexbruy 	2015-05-25
 
     Merge pull request #2072 from NaturalGIS/fix_grass7_r_relief2
 
     [processing] fix grass7 r.relief2
 
-Merge: cec5bde d591ac4
+Merge: cec5bdeb0d d591ac4da1
 alexbruy 	2015-05-25
 
     Merge pull request #2073 from NaturalGIS/fix_grass7_r_flow
@@ -33774,7 +100123,7 @@ Mathieu Pellerin 	2015-05-24
 
     [gui] apply icon size user preference to dock widget tool buttons (fix #12816)
 
-Merge: dbdfe40 7822927
+Merge: dbdfe40bf9 782292720d
 volaya 	2015-05-23
 
     Merge pull request #2066 from luipir/master
@@ -33826,7 +100175,7 @@ Matthias Kuhn 	2015-05-22
      * Forces people on linux to use the {LIB}_EXPORT defines and therefore will
        make Windows nightlies more reliable
 
-Merge: 10239a0 adb5b64
+Merge: 10239a0e60 adb5b643f5
 alexbruy 	2015-05-23
 
     Merge pull request #2067 from NaturalGIS/fix_grass7_r_relief
@@ -33903,7 +100252,7 @@ Luigi Pirelli 	2015-05-22
     This is useful for that commands that have multiple inputs but that have to be contained
     in a single vrt
 
-Merge: e25fb2d e2ff8ed
+Merge: e25fb2de6d e2ff8edc79
 pcav 	2015-05-22
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -33937,7 +100286,7 @@ rldhont 	2015-05-22
 
     This reverts commit 7ab336f2064b59df9ca42b7b822324bbd26e96ff.
 
-Merge: 9031e98 cb4d518
+Merge: 9031e9849f cb4d5189ef
 mhugent 	2015-05-22
 
     Merge pull request #2054 from arnaud-morvan/join_memory_cache
@@ -33956,7 +100305,7 @@ pcav 	2015-05-22
 
      Uniform and informative output names for Processing (QGIS, final)
 
-Merge: 00f6497 7ab336f
+Merge: 00f64971f7 7ab336f206
 pcav 	2015-05-22
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -33969,7 +100318,7 @@ rldhont 	2015-05-22
 
     [BUGFIX] Remove extra line after header
 
-Merge: 7dacddc 06ae01e
+Merge: 7dacddc08a 06ae01e009
 pcav 	2015-05-22
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -33988,7 +100337,7 @@ Pirmin Kalberer 	2015-05-22
 
     This reverts commit a64ffc495e4099759dcfce292154b15f51814ba9.
 
-Merge: d33bf3d 81e21b5
+Merge: d33bf3dd33 81e21b56ef
 carolinux 	2015-05-22
 
     Merge branch 'search-widgets' of https://github.com/carolinux/QGIS into search-widgets
@@ -34016,14 +100365,14 @@ Nyall Dawson 	2015-05-22
 
     Small optimisation to data defined symbology
 
-Merge: ce7b1d3 278141f
+Merge: ce7b1d31ac 278141f331
 Nyall Dawson 	2015-05-22
 
     Merge pull request #2062 from vmora/add_tooltip
 
     add tooltip to graduated method (color or size)
 
-Merge: f337d41 a64ffc4
+Merge: f337d4137a a64ffc495e
 Jürgen Fischer 	2015-05-22
 
     Merge pull request #2060 from manisandro/ogrpool
@@ -34034,7 +100383,7 @@ carolinux 	2015-05-22
 
     Works now for the default case
 
-Merge: f81d808 e0098a5
+Merge: f81d808ca7 e0098a5d62
 Nyall Dawson 	2015-05-22
 
     Merge pull request #2061 from vmora/convert_old_size_scale
@@ -34151,7 +100500,7 @@ Juergen E. Fischer 	2015-05-22
 
     debian packaging update
 
-Merge: f5054ce c19a4a7
+Merge: f5054ce702 c19a4a70bd
 volaya 	2015-05-22
 
     Merge pull request #2058 from arnaud-morvan/processing-model-help
@@ -34233,7 +100582,7 @@ Nyall Dawson 	2015-05-21
 
     [symbology] Fix potential crash in data defined symbol rotation
 
-Merge: a6f1ece fd6dc0d
+Merge: a6f1ece73b fd6dc0d8eb
 Hugo Mercier 	2015-05-21
 
     Merge pull request #1970 from mhugo/fix_spatialite
@@ -34325,7 +100674,7 @@ Juergen E. Fischer 	2015-05-21
 
     feature: fix crash when feature 'owns' no geometry
 
-Merge: d14c4aa 27c2b5c
+Merge: d14c4aa41e 27c2b5c034
 pcav 	2015-05-20
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -34364,7 +100713,7 @@ pcav 	2015-05-20
 
     Uniform and informative output names for Processing (GRASS-v.* modules take #1 - up to v.lidar*)
 
-Merge: 7cc38ae 9a32c28
+Merge: 7cc38aee84 9a32c282ad
 pcav 	2015-05-20
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -34393,7 +100742,7 @@ Nyall Dawson 	2015-05-20
 
     Implicit sharing for QgsFeature
 
-Merge: 7e69bd1 df039ee
+Merge: 7e69bd1286 df039ee267
 Martin Dobias 	2015-05-20
 
     Merge pull request #2049 from Hvitnov/fix12787
@@ -34431,7 +100780,7 @@ Alexander Bruy 	2015-05-20
 
     [processing] fix axis orientation in the Vector Scatterplot alg (fix #12705)
 
-Merge: eaeea21 9b34202
+Merge: eaeea21a2d 9b34202dba
 Nathan Woodrow 	2015-05-20
 
     Merge pull request #2047 from alexbruy/attrtable-paste
@@ -34493,7 +100842,7 @@ Nyall Dawson 	2015-05-20
 
     Add legend text for new diagram attributes by default
 
-Merge: d978f3f b8bc181
+Merge: d978f3fd9b b8bc1811d5
 Martin Dobias 	2015-05-20
 
     Merge pull request #2035 from vmora/multivariate_legend
@@ -34545,14 +100894,14 @@ Juergen E. Fischer 	2015-05-19
 
     doxygen fixes (followup f314522)
 
-Merge: f782e77 3e39783
+Merge: f782e77380 3e3978333d
 volaya 	2015-05-20
 
     Merge pull request #2034 from Gustry/fix-lines-inter
 
     [processing] Set the parameter table field optional in "Line intersections" algo
 
-Merge: a495c8c 5729227
+Merge: a495c8c2ab 5729227ca0
 volaya 	2015-05-20
 
     Merge pull request #2037 from NaturalGIS/fix_saga_split_rgb
@@ -34657,7 +101006,7 @@ Juergen E. Fischer 	2015-05-17
 
     fix doxygen warning
 
-Merge: 24974e0 0b32606
+Merge: 24974e0dee 0b326069bd
 pcav 	2015-05-18
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -34934,7 +101283,7 @@ Paolo Cavallini 	2015-05-07
 
     Better default for output type. Fixes http://hub.qgis.org/issues/12695
 
-Merge: c9897ab 8a98934
+Merge: c9897ab29f 8a9893428e
 alexbruy 	2015-05-07
 
     Merge pull request #2033 from NaturalGIS/fix_12683
@@ -34977,7 +101326,7 @@ Nyall Dawson 	2015-05-07
 
     The change broke parsing of colors in the format 0,0,255,255
 
-Merge: c6735cc 15323b8
+Merge: c6735cc893 15323b8b8b
 Paolo Cavallini 	2015-05-07
 
     Merge pull request #2032 from NaturalGIS/remove_broken_r_scripts
@@ -35026,35 +101375,35 @@ Paolo Cavallini 	2015-05-06
 
     Backport from 2.1.3
 
-Merge: 410e6f3 48e9be9
+Merge: 410e6f36bf 48e9be96d6
 volaya 	2015-05-06
 
     Merge pull request #1990 from ricardogsilva/processing_provider_changes
 
     [Processing] Changed default value of argument updateList in Processing.addProvider
 
-Merge: e58e8ac 9d6b280
+Merge: e58e8ac6bd 9d6b280a7e
 volaya 	2015-05-06
 
     Merge pull request #1997 from Gustry/delete-holes
 
     [Processing][Feature] Add new algo to remove holes in a polygon layer
 
-Merge: c4eb1fb 70d3907
+Merge: c4eb1fb13b 70d390727c
 volaya 	2015-05-06
 
     Merge pull request #2028 from ninsbl/master
 
     Provide option for R_LIBS_USER in Processing
 
-Merge: 6fbb2d6 b8c2525
+Merge: 6fbb2d6c26 b8c25251df
 volaya 	2015-05-06
 
     Merge pull request #1910 from radosuav/obt_fix
 
     [Processing] Fix bug in reading ParameterMultipleInput in OTB algorithms.
 
-Merge: 79c0d5b d1985b3
+Merge: 79c0d5b59d d1985b3d34
 volaya 	2015-05-06
 
     Merge pull request #1965 from radosuav/processing_models
@@ -35147,14 +101496,14 @@ Denis Rouzaud 	2015-05-05
 
     change user input toolbar to a user input dockwidget
 
-Merge: 69aa115 51c180b
+Merge: 69aa115294 51c180b5db
 Nathan Woodrow 	2015-05-05
 
     Merge pull request #2024 from tecoholic/8212
 
     fixes #8212
 
-Merge: eb964f9 57d5d07
+Merge: eb964f9f36 57d5d0796e
 Martin Dobias 	2015-05-04
 
     Merge pull request #2026 from kiselev-dv/pull/osm-not-null
@@ -35165,7 +101514,7 @@ kiselev-dv 	2015-05-05
 
     fix typo
 
-Merge: 8902a86 314bf4e
+Merge: 8902a86fe4 314bf4e14d
 kiselev-dv 	2015-05-04
 
     Merge branch 'master' of github.com:kiselev-dv/QGIS
@@ -35218,7 +101567,7 @@ Radim Blazek 	2015-05-04
 
     [GRASS][feature] delete vector layer browser action
 
-Merge: 72eb1aa 51c5931
+Merge: 72eb1aae97 51c5931bae
 Martin Dobias 	2015-05-04
 
     Merge pull request #1975 from rduivenvoorde/sldfix_11863
@@ -35241,7 +101590,7 @@ Nyall Dawson 	2015-05-04
 
     Fix legend text not customisable for QgsSimpleLegendNode items
 
-Merge: 6004c14 edeafa9
+Merge: 6004c142eb edeafa95ac
 kiselev-dv 	2015-05-04
 
     Merge branch 'master' of github.com:kiselev-dv/QGIS
@@ -35371,7 +101720,7 @@ Nyall Dawson 	2015-04-29
 
     Fix typos
 
-Merge: c2fb5e1 f7e46ee
+Merge: c2fb5e19e2 f7e46ee59a
 alexbruy 	2015-04-28
 
     Merge pull request #2017 from rldhont/processing_remove_print_from_help
@@ -35416,7 +101765,7 @@ Denis Rouzaud 	2015-04-28
     * uses click-click behavior
     * rotation anchor is defined on CTRL+click and not on mouse move (TODO: snapping for anchor placement)
 
-Merge: 9f2c544 3c22aff
+Merge: 9f2c544bff 3c22aff0b0
 Matthias Kuhn 	2015-04-28
 
     Merge pull request #2014 from elpaso/hidpi-improvements
@@ -35463,7 +101812,7 @@ volaya 	2015-02-12
 
     [processing] fixed wrong creation of error message in script algorithm
 
-Merge: 0f35192 f9ee7a3
+Merge: 0f35192f3f f9ee7a3b3d
 Matthias Kuhn 	2015-04-28
 
     Merge pull request #1966 from olivierdalang/show_selected_features_ALL_IF_NO_SEL
@@ -35498,28 +101847,28 @@ vmora 	2015-04-27
 
     Checks whether expression consists of solely a field reference
 
-Merge: 09020dc f51941b
+Merge: 09020dc136 f51941b79b
 alexbruy 	2015-04-27
 
     Merge pull request #2008 from NaturalGIS/remove_grass_modules
 
     [processing] remove r.mapcalculator from GRASS7 modules
 
-Merge: 5fe7f3d9 b3d8fc2
+Merge: 5fe7f3d9fe b3d8fc2be9
 alexbruy 	2015-04-27
 
     Merge pull request #2005 from NaturalGIS/fix_grass7_v_to_rast_attribute
 
     [processing] fix grass7 v.to.rast.attribute
 
-Merge: b413271 ac2d817
+Merge: b413271af7 ac2d817974
 alexbruy 	2015-04-27
 
     Merge pull request #2004 from NaturalGIS/fix_grass7_slope_aspect
 
     [processing] fix grass7 r.slope.aspect
 
-Merge: 80a65b9 b8dcb88
+Merge: 80a65b9b1a b8dcb88101
 alexbruy 	2015-04-27
 
     Merge pull request #2009 from NaturalGIS/remove_grass_v_distance
@@ -35542,7 +101891,7 @@ Juergen E. Fischer 	2015-04-26
 
     db manager: fix BaseError handing (fixes #12645)
 
-Merge: e7e0279 031f9a9
+Merge: e7e027944e 031f9a9fe9
 Paolo Cavallini 	2015-04-26
 
     Merge pull request #2006 from NaturalGIS/grass7_better_default_raster_resolution
@@ -35633,7 +101982,7 @@ Nyall Dawson 	2015-04-22
 
     Start modernising diagram ui
 
-Merge: 9c5cbd4 c246fec
+Merge: 9c5cbd4373 c246fec2df
 alexbruy 	2015-04-22
 
     Merge pull request #1998 from radosuav/missing_html_tags
@@ -35660,7 +102009,7 @@ vmora 	2015-01-21
 
     Add unit test for QgsDataDefined copy
 
-Merge: 8ccae4f af64ae9
+Merge: 8ccae4fef1 af64ae966f
 alexbruy 	2015-04-21
 
     Merge pull request #1994 from bstroebl/bugInEliminate
@@ -35717,7 +102066,7 @@ Nyall Dawson 	2015-04-20
 
     [FEATURE] Allow selection of wanted stats for zonal stats (fix #4429)
 
-Merge: d78bc7d 265c253
+Merge: d78bc7d1b0 265c253995
 Matthias Kuhn 	2015-04-20
 
     Merge pull request #1993 from manisandro/fldidx
@@ -35787,7 +102136,7 @@ Sandro Mani 	2015-04-14
 
     Fix primary key search
 
-Merge: cfe397e ed6d8dc
+Merge: cfe397e718 ed6d8dcab7
 alexbruy 	2015-04-14
 
     Merge pull request #1992 from NaturalGIS/fix_grass7_v_generalize
@@ -35874,7 +102223,7 @@ Nyall Dawson 	2015-04-11
 
     Some UI tweaks to graduated renderer widget
 
-Merge: 325b824 ed784d9
+Merge: 325b82423f ed784d94f9
 alexbruy 	2015-04-11
 
     Merge pull request #1988 from NaturalGIS/master
@@ -35885,7 +102234,7 @@ Nyall Dawson 	2015-04-11
 
     Fix setting min in raster histogram using mouse also zooms chart
 
-Merge: 04324fd 84af60a
+Merge: 04324fd665 84af60ad56
 Nyall Dawson 	2015-04-11
 
     Merge pull request #1974 from vmora/graduated_by_size
@@ -35978,7 +102327,7 @@ Alexander Bruy 	2015-04-09
     bump version number of the Processing plugin to avoid masking by the
     version from repository
 
-Merge: c801c50 7097a50
+Merge: c801c503b2 7097a5035e
 Alexander Bruy 	2015-04-09
 
     Merge branch 'fix-gdal_rasterize'
@@ -35987,26 +102336,26 @@ Alexander Bruy 	2015-04-09
 
     remove duplicate condition
 
-Merge: c801c50 5bc9a7e
+Merge: c801c503b2 5bc9a7ef35
 Alexander Bruy 	2015-04-09
 
     Merge branch 'fix_gdal_rasterize' of https://github.com/NaturalGIS/QGIS into fix-gdal_rasterize
 
-Merge: 33d973f f94d92f
+Merge: 33d973f5e4 f94d92f014
 alexbruy 	2015-04-09
 
     Merge pull request #1976 from radosuav/otb_double_quotes
 
     [processing] avoid consecutive quotes when calling OTB algorithms
 
-Merge: b83eb9f a23a30c
+Merge: b83eb9f51c a23a30cb94
 alexbruy 	2015-04-09
 
     Merge pull request #1980 from NaturalGIS/gdal_rasterize_to_write_over_existing_rasters
 
     [processing] add gdal_rasterize tool to easily allow write over existing raster (fix #12523)
 
-Merge: 7d812dd c78374b
+Merge: 7d812dd0c2 c78374b66b
 Paolo Cavallini 	2015-04-09
 
     Merge pull request #1984 from NaturalGIS/fix_saga_interpolations
@@ -36021,7 +102370,7 @@ Giovanni Manghi 	2015-04-09
 
     fix saga interpolations modules
 
-Merge: 1973c97 4548fbb
+Merge: 1973c97775 4548fbb3d0
 Paolo Cavallini 	2015-04-09
 
     Merge pull request #1983 from NaturalGIS/fix_saga_catchment_area
@@ -36032,7 +102381,7 @@ Giovanni Manghi 	2015-04-09
 
     fix saga catchment area modules
 
-Merge: dc7542c d9f19de
+Merge: dc7542cb51 d9f19deaff
 Paolo Cavallini 	2015-04-09
 
     Merge pull request #1982 from NaturalGIS/fix_saga_shapes_to_grid
@@ -36043,7 +102392,7 @@ Giovanni Manghi 	2015-04-09
 
     fix saga shapes to grid
 
-Merge: 7c419bf 33655a0
+Merge: 7c419bf269 33655a0e5b
 Paolo Cavallini 	2015-04-09
 
     Merge pull request #1981 from NaturalGIS/fix_saga_contour
@@ -36106,7 +102455,7 @@ Nyall Dawson 	2015-04-09
 
     Fix diagrams not initially showing when toggling on/off layers
 
-Merge: 77ede9c ed005c0
+Merge: 77ede9ca61 ed005c0172
 Nyall Dawson 	2015-04-09
 
     Merge pull request #1978 from m-kuhn/composerremoved
@@ -36181,7 +102530,7 @@ Radim Blazek 	2015-04-02
 
     [GRASS] multi version build
 
-Merge: f055db1 6850ce6
+Merge: f055db1e02 6850ce6205
 Sandro Santilli 	2015-04-07
 
     Merge pull request #1972 from naihil/rubberband-visibility-fix
@@ -36252,7 +102601,7 @@ Alexander Bruy 	2015-04-02
 
     [processing] median calculation for zonal statistics
 
-Merge: a844bfa 9b83b53
+Merge: a844bfa174 9b83b53c79
 Alexander Bruy 	2015-04-02
 
     Merge branch 'ftools-enhancements'
@@ -36261,13 +102610,13 @@ Alexander Bruy 	2015-04-02
 
     minor fixes
 
-Merge: a844bfa fe37600
+Merge: a844bfa174 fe3760032b
 Alexander Bruy 	2015-04-02
 
     Merge branch 'master' of https://github.com/gbd-consult/QGIS into ftools-enhancements
 
     Conflicts:
-python/plugins/fTools/tools/doPointsInPolygon.py
+            python/plugins/fTools/tools/doPointsInPolygon.py
 
 Anatoliy Golubev 	2015-04-01
 
@@ -36319,7 +102668,7 @@ Matthias Kuhn 	2015-03-30
 
     ValueRelation autocompleter: case insensitivity
 
-Merge: 1cce091 9c2f572
+Merge: 1cce091e17 9c2f5725a4
 Nathan Woodrow 	2015-03-30
 
     Merge pull request #1932 from ccrook/Field_calculator_expression_fix
@@ -36431,7 +102780,7 @@ olivierdalang 	2015-03-26
 
     [feature] filter the attribute table only if there is a selection (feature #7541)
 
-Merge: 837c7ee 4a52750
+Merge: 837c7ee8d3 4a52750a48
 Matthias Kuhn 	2015-03-26
 
     Merge pull request #1964 from mhugo/fix_querybuilder_joins2
@@ -36495,7 +102844,7 @@ Martin Dobias 	2015-03-24
     the qgis python support recognizes them as valid plugins - so let's have the same
     behavior in the installer.
 
-Merge: 25e4e4d d2d1d51
+Merge: 25e4e4d3d6 d2d1d513b5
 Matthias Kuhn 	2015-03-24
 
     Merge pull request #1960 from manisandro/nitpick
@@ -36544,7 +102893,7 @@ Chris Crook 	2015-03-22
 
     Fixed timing/dangling pointer error in delimited text provider
 
-Merge: 297a94f 99e6a62
+Merge: 297a94fc58 99e6a6253f
 Chris Crook 	2015-03-22
 
     Merge branch 'carolinux-5605-types'
@@ -36561,7 +102910,7 @@ Nathan Woodrow 	2015-03-21
 
     Fix formatting of db manager python code
 
-Merge: 250eb74 48591df
+Merge: 250eb744fd 48591dffbb
 Chris Crook 	2015-03-21
 
     Merge branch '5605-types' of git://github.com/carolinux/QGIS into carolinux-5605-types
@@ -36593,7 +102942,7 @@ Larry Shaffer 	2015-03-19
 
     Fix typo about becoming a translator
 
-Merge: e57136c f17755c
+Merge: e57136ccb8 f17755cec4
 Tom Kralidis 	2015-03-19
 
     Merge branch 'master' of https://github.com/QGIS/qgis
@@ -36654,7 +103003,7 @@ Juergen E. Fischer 	2015-03-19
 
     also update INSTALL.t2t output files (followup d53fbe8)
 
-Merge: 65378e6 d53fbe8
+Merge: 65378e6a10 d53fbe88b7
 Matthias Kuhn 	2015-03-19
 
     Merge pull request #1953 from carolinux/doc-fix
@@ -36669,7 +103018,7 @@ Juergen E. Fischer 	2015-03-19
 
     vector layer: connect missing edit buffer signals
 
-Merge: b8dc08f 54ce784
+Merge: b8dc08f8ef 54ce784d31
 Nyall Dawson 	2015-03-19
 
     Merge pull request #1956 from Gustry/add-way
@@ -36756,7 +103105,7 @@ pcav 	2015-03-17
 
     Added to contributors
 
-Merge: 554a63a 66335b0
+Merge: 554a63aa5b 66335b090f
 Matthias Kuhn 	2015-03-16
 
     Merge pull request #1948 from NaturalGIS/add_fix_credits
@@ -36882,7 +103231,7 @@ Tom Kralidis 	2015-03-08
 
     Update connections-default.xml
 
-Merge: a3811ec 31e57d0
+Merge: a3811ecf8f 31e57d03ff
 Tom Kralidis 	2015-03-08
 
     Merge pull request #1942 from ninsbl/master
@@ -36901,14 +103250,14 @@ Juergen E. Fischer 	2015-03-07
 
     add LD_LIBRARY_PATH note to INSTALL
 
-Merge: 0be193d c68e604
+Merge: 0be193d6f7 c68e60427c
 Jürgen Fischer 	2015-03-07
 
     Merge pull request #1943 from sebastic/pyspatialite
 
     Don't build internal pyspatialite on Debian jessie & sid
 
-Merge: 37a7831 88e1d7a
+Merge: 37a7831d2a 88e1d7afde
 Nyall Dawson 	2015-03-07
 
     Merge pull request #1938 from manisandro/dangling
@@ -37002,7 +103351,7 @@ Juergen E. Fischer 	2015-03-04
 
     postgres provider: use min()/max() before casting (followup bf56457; fixes #12306)
 
-Merge: 2844005 b566587
+Merge: 2844005e80 b5665872a6
 volaya 	2015-03-04
 
     Merge pull request #1939 from gioman/fix_saga_213_kernel
@@ -37054,7 +103403,7 @@ Juergen E. Fischer 	2015-03-01
 
     translation string fix
 
-Merge: 3628b43 1fd43c4
+Merge: 3628b43a84 1fd43c44f1
 alexbruy 	2015-03-01
 
     Merge pull request #1935 from gioman/processing_ogr_better_quotes
@@ -37126,7 +103475,7 @@ Alexander Bruy 	2015-02-26
     [processing] correctly handle tiny polygons smaller than raster cell
     size in Hypsometric curves algorithm (fix #12278)
 
-Merge: 919b8b6 63f612f
+Merge: 919b8b6183 63f612f9fe
 Chris Crook 	2015-02-26
 
     Merge pull request #1931 from ccrook/delimited_text_field_types
@@ -37145,7 +103494,7 @@ Juergen E. Fischer 	2015-02-26
 
     remove obsolete python ts removal
 
-Merge: 97ace3c 159f577
+Merge: 97ace3cf38 159f577583
 Jürgen Fischer 	2015-02-25
 
     Merge pull request #1930 from sebastic/debian
@@ -37230,7 +103579,7 @@ Alexander Bruy 	2015-02-25
 
     [processing] add method for generating help for single algorithm
 
-Merge: 0b874ce 701cd1c
+Merge: 0b874ce3a9 701cd1ca3a
 Tom Kralidis 	2015-02-24
 
     Merge pull request #1926 from geopython/master
@@ -37241,7 +103590,7 @@ Tom Kralidis 	2015-02-24
 
     MetaSearch: fix plugin zipfile
 
-Merge: a292914 94f9ae2
+Merge: a292914cc4 94f9ae2359
 Tom Kralidis 	2015-02-24
 
     Merge branch 'master' of https://github.com/QGIS/qgis
@@ -37286,7 +103635,7 @@ Tom Kralidis 	2015-02-24
 
     update release packaging to be built from QGIS core
 
-Merge: c1e1a7e be07f23
+Merge: c1e1a7ed93 be07f239e9
 Alexander Bruy 	2015-02-24
 
     Merge branch 'geometry-less-import'
@@ -37295,15 +103644,15 @@ Alexander Bruy 	2015-02-24
 
     formatting fixes
 
-Merge: c1e1a7e 53712c7
+Merge: c1e1a7ed93 53712c78b5
 Alexander Bruy 	2015-02-24
 
     Merge branch 'processing_import_geomless_tables_in_postgresql_2' of https://github.com/gioman/QGIS into geometry-less-import
 
     Conflicts:
-python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
+            python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
 
-Merge: 8ab014d b4f2568
+Merge: 8ab014d4f8 b4f25684ae
 Alexander Bruy 	2015-02-24
 
     Merge branch 'ogr-tools'
@@ -37312,12 +103661,12 @@ Alexander Bruy 	2015-02-24
 
     make parameter descriptions translatable
 
-Merge: 8ab014d a6af682
+Merge: 8ab014d4f8 a6af682b8b
 Alexander Bruy 	2015-02-24
 
     Merge branch 'new_processing_ogr_tools' of https://github.com/gioman/QGIS into ogr-tools
 
-Merge: b7ad288 5260ef3
+Merge: b7ad288c77 5260ef3992
 Alexander Bruy 	2015-02-24
 
     Merge branch 'gdal_calc'
@@ -37326,15 +103675,15 @@ Alexander Bruy 	2015-02-24
 
     unify algorithm name and source file name, formatting fixes
 
-Merge: b7ad288 67e4a9a
+Merge: b7ad288c77 67e4a9a170
 Alexander Bruy 	2015-02-24
 
     Merge branch 'processing_add_gdal_raster_calc' of https://github.com/gioman/QGIS into gdal_calc
 
     Conflicts:
-python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
+            python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
 
-Merge: 33c6051 bf08b7b
+Merge: 33c6051f58 bf08b7b871
 alexbruy 	2015-02-24
 
     Merge pull request #1924 from gioman/processing_add_gdal_tileindex
@@ -37361,7 +103710,7 @@ Giovanni Manghi 	2015-02-24
 
     processing: add gdal tileindex
 
-Merge: 0ccc07a 6c142ed
+Merge: 0ccc07af0e 6c142ede0a
 Jürgen Fischer 	2015-02-23
 
     Merge pull request #1923 from sebastic/debian
@@ -37409,7 +103758,7 @@ Tom Kralidis 	2015-02-23
 
     prevent CSW connection names with "/" to be set
 
-Merge: f9c1db8 8d87f35
+Merge: f9c1db8073 8d87f35304
 volaya 	2015-02-23
 
     Merge pull request #1921 from anitagraser/patch-7
@@ -37469,7 +103818,7 @@ Werner Macho 	2015-02-21
 
     Signed-off-by: Werner Macho 
 
-Merge: da76270 23a3746
+Merge: da76270174 23a3746731
 Tim Sutton 	2015-02-21
 
     Merge pull request #1919 from timlinux/master
@@ -37492,7 +103841,7 @@ Juergen E. Fischer 	2015-02-20
 
     oracle provider: consider srid when looking trying spatial index (followup 991f94d; fixes #12230)
 
-Merge: c2bc279 c1b68a5
+Merge: c2bc2795d4 c1b68a52c3
 Tim Sutton 	2015-02-20
 
     Merge pull request #1918 from isedwards/isedwards-license-info-update
@@ -37535,7 +103884,7 @@ Juergen E. Fischer 	2015-02-20
 
     fix syntax error (followup 7ffdef2)
 
-Merge: 10d2ce4 8fe1fa8
+Merge: 10d2ce4584 8fe1fa8785
 Tim Sutton 	2015-02-20
 
     Merge pull request #1917 from timlinux/master
@@ -37555,14 +103904,14 @@ Sandro Santilli 	2015-02-19
     Include tests for raster layers, SVG and simple markers
     with data-defined or fixed rotation, parallel line labels.
 
-Merge: 34a6a36 494c36a
+Merge: 34a6a368a8 494c36a102
 mhugent 	2015-02-20
 
     Merge pull request #1860 from marcel-dancak/getfeatureinfo-bbox-fix
 
     Mapserver: using bbox filter on features in GetFeatureInfo only when BBOX parameter is given
 
-Merge: c69f153 e1508c1
+Merge: c69f153327 e1508c1e6a
 Tim Sutton 	2015-02-20
 
     Merge pull request #1861 from timlinux/master
@@ -37633,7 +103982,7 @@ Martin Dobias 	2015-02-19
 
     Added Ivan Mincik and Marcel Dancak also to the other list of contributors
 
-Merge: 9e83ed8 13d77f4
+Merge: 9e83ed8367 13d77f4cca
 Martin Dobias 	2015-02-19
 
     Merge pull request #1914 from imincik/contributors
@@ -37783,7 +104132,7 @@ Juergen E. Fischer 	2015-02-18
 
     identation update
 
-Merge: b6dd1e4 b1bc3cd
+Merge: b6dd1e4119 b1bc3cd77b
 Jürgen Fischer 	2015-02-18
 
     Merge pull request #1909 from nirvn/memorylayer_uid_fix
@@ -37875,7 +104224,7 @@ Juergen E. Fischer 	2015-02-17
 
     processing: fix unused variable error
 
-Merge: da0822c e62a7fa
+Merge: da0822c588 e62a7fa7c3
 alexbruy 	2015-02-17
 
     Merge pull request #1904 from gioman/fix_ogr2ogr_clip
@@ -37897,7 +104246,7 @@ Martin Dobias 	2015-02-17
     The map was being rendered with wrong parameters when width or height
     exceeded 5000 pixels.
 
-Merge: f64730e 3bb448a
+Merge: f64730e8d1 3bb448a077
 Matthias Kuhn 	2015-02-17
 
     Merge pull request #1893 from rutsky/patch-2
@@ -37954,7 +104303,7 @@ Juergen E. Fischer 	2015-02-16
 
     dxf export: fix encoding for japanese (take II; followup ce0fd7a)
 
-Merge: b3bd32f 1144f3e
+Merge: b3bd32ff96 1144f3e638
 Matthias Kuhn 	2015-02-16
 
     Merge pull request #1901 from m-kuhn/fixrendering
@@ -38068,7 +104417,7 @@ Juergen E. Fischer 	2015-02-14
 
     fixes #10619
 
-Merge: f69e0bb 221ba9c
+Merge: f69e0bbf54 221ba9c336
 Jürgen Fischer 	2015-02-14
 
     Merge pull request #1900 from mhugo/fix_spatialite2
@@ -38164,7 +104513,7 @@ Nyall Dawson 	2015-02-12
 
     Coverity fixes
 
-Merge: b26556e 3c93827
+Merge: b26556e551 3c938275eb
 volaya 	2015-02-12
 
     Merge pull request #1897 from arnaud-morvan/fix_fieldsmapper
@@ -38451,7 +104800,7 @@ Juergen E. Fischer 	2015-02-08
 
     nine cell filter: restore defaults
 
-Merge: d6bfe7c e5a6a08
+Merge: d6bfe7c17f e5a6a088d1
 Nathan Woodrow 	2015-02-09
 
     Merge pull request #1890 from rutsky/patch-1
@@ -38498,21 +104847,21 @@ Juergen E. Fischer 	2015-02-08
 
     fix build error
 
-Merge: afd21cd 9e51488
+Merge: afd21cd79f 9e51488a88
 volaya 	2015-02-08
 
     Merge pull request #1753 from arnaud-morvan/processing_managefields
 
     Create FieldMapper GeoAlgorithm
 
-Merge: b1a2ccd 84936e5
+Merge: b1a2ccdc90 84936e59e7
 volaya 	2015-02-08
 
     Merge pull request #1759 from arnaud-morvan/processing_bylocation_operators
 
     Processing bylocation operators
 
-Merge: 6ed695a a18286f
+Merge: 6ed695aa73 a18286fa3d
 alexbruy 	2015-02-08
 
     Merge pull request #1892 from neteler/master
@@ -38587,7 +104936,7 @@ Nathan Woodrow 	2015-02-07
     Anyone who forks QGIS and has Travis will also send stuff to IRC which is annoying.
     See https://github.com/travis-ci/travis-ci/issues/1094
 
-Merge: b60221a 2612715
+Merge: b60221a375 261271518c
 Nyall Dawson 	2015-02-07
 
     Merge pull request #1858 from vmora/symbol_list_refacto
@@ -38644,14 +104993,14 @@ Nyall Dawson 	2015-02-06
 
     (improves Coverity signal-to-noise ratio)
 
-Merge: 6f338d7 f6d533a
+Merge: 6f338d75aa f6d533a807
 volaya 	2015-02-06
 
     Merge pull request #1886 from radosuav/processing_fix
 
     [Processing] Don't fill empty fields in batch mode with 0.
 
-Merge: 59b758b 5c5cb40
+Merge: 59b758bb27 5c5cb4066a
 volaya 	2015-02-06
 
     Merge pull request #1887 from gioman/fix_processing_ogr_clip
@@ -38685,7 +105034,7 @@ Sandro Santilli 	2015-02-05
     Update expected results and configuration of new image
     Add rendering anomalies, as determined by travis ubuntu 12.02
 
-Merge: e4fb95f 3749867
+Merge: e4fb95fad1 3749867c8f
 alexbruy 	2015-02-05
 
     Merge pull request #1885 from gioman/processing_add_gdal_tiff_compression_options
@@ -38724,7 +105073,7 @@ Nathan Woodrow 	2015-02-05
 
     Fix #12100 - Expression tab by default
 
-Merge: 91c4e7a 1fe580c
+Merge: 91c4e7a37e 1fe580ca91
 alexbruy 	2015-02-04
 
     Merge pull request #1881 from gioman/fix_processing_gdal_dstnodata
@@ -38735,7 +105084,7 @@ Giovanni Manghi 	2015-02-04
 
     fix processing gdalwarp dstnodata
 
-Merge: 7e66e33 98fb59b
+Merge: 7e66e33485 98fb59b3da
 alexbruy 	2015-02-04
 
     Merge pull request #1880 from gioman/processing_fix_gdal_a_nodata
@@ -38796,14 +105145,14 @@ Juergen E. Fischer 	2015-02-03
 
     relation reference widget: add methods to sip (followup 52c2e4e90)
 
-Merge: 3c2a92b 52c2e4e
+Merge: 3c2a92b9ee 52c2e4e90a
 Jürgen Fischer 	2015-02-03
 
     Merge pull request #1870 from m-kuhn/relref-orderbyvalue
 
     Allow "order features by value" for relation reference widget
 
-Merge: 6f2ba0f 035229f
+Merge: 6f2ba0f0d7 035229f3d9
 alexbruy 	2015-02-03
 
     Merge pull request #1879 from gioman/fix_processing_encoding_split_vector_layer
@@ -38838,7 +105187,7 @@ Alexander Bruy 	2015-02-03
 
     [processing] restore missed icons in various dialogs
 
-Merge: a2d430e 2a33908
+Merge: a2d430eba2 2a339082c4
 alexbruy 	2015-02-03
 
     Merge pull request #1878 from gioman/fix_processing_encoding
@@ -38907,14 +105256,14 @@ Juergen E. Fischer 	2015-02-02
 
     fix pep8 warnings
 
-Merge: db89a04 de2b3ea
+Merge: db89a045ab de2b3ea81d
 alexbruy 	2015-02-02
 
     Merge pull request #1874 from gioman/fix_processing_ogr_postgis_import_2
 
     new fixes for processing/ogr import in postgis tools
 
-Merge: cd86710 9edff14
+Merge: cd86710d87 9edff1430f
 alexbruy 	2015-02-02
 
     Merge pull request #1873 from gioman/processing_remove_unsupported_raster_formats
@@ -38972,14 +105321,14 @@ Juergen E. Fischer 	2015-02-01
 
     remove duplicate separator in test diff pngs
 
-Merge: 9a4612e 8d7c2d7
+Merge: 9a4612e931 8d7c2d7a8d
 alexbruy 	2015-02-01
 
     Merge pull request #1872 from gioman/processing_fix_qgis_raster_tools
 
     [processing] add support for rasters other than float32 in qgis/processing raster tools
 
-Merge: fe27b63 bb97dcc
+Merge: fe27b63576 bb97dcc8d1
 alexbruy 	2015-02-01
 
     Merge pull request #1871 from gioman/fix_processing_ogr_postgis_import
@@ -39002,7 +105351,7 @@ Juergen E. Fischer 	2015-01-30
 
     database providers: cope with empty attribute changes (fixes #12040)
 
-Merge: 7246b83 34d5394
+Merge: 7246b8308f 34d5394409
 Nyall Dawson 	2015-01-31
 
     Merge pull request #1867 from nyalldawson/travis_coverage_v2
@@ -39073,7 +105422,7 @@ Nyall Dawson 	2015-01-27
 
     Add some missing tests for QgsImageOperation
 
-Merge: 1cd7dc6 d6c969c
+Merge: 1cd7dc6aea d6c969c02e
 Nathan Woodrow 	2015-01-27
 
     Merge pull request #1864 from michaelkirk/feature/export-png-first-8493
@@ -39084,13 +105433,13 @@ Michael Kirk 	2015-01-26
 
     test for original createFileFilter
 
-Merge: 262a5b2 1cd7dc6
+Merge: 262a5b2b18 1cd7dc6aea
 Michael Kirk 	2015-01-26
 
     Merge remote-tracking branch 'upstream/master' into feature/export-png-first-8493
 
     Conflicts:
-src/gui/qgisgui.h
+            src/gui/qgisgui.h
 
 Juergen E. Fischer 	2015-01-27
 
@@ -39115,7 +105464,7 @@ Michael Kirk 	2015-01-25
 
     FIXES: #8493
 
-Merge: 609db7d b835f40
+Merge: 609db7d2af b835f406fa
 volaya 	2015-01-26
 
     Merge pull request #1852 from radosuav/changes
@@ -39213,7 +105562,7 @@ Denis Rouzaud 	2015-01-23
 
     fix combo index
 
-Merge: 01fd4f3 b1b3614
+Merge: 01fd4f3365 b1b3614fea
 alexbruy 	2015-01-23
 
     Merge pull request #1859 from rduivenvoorde/xmin_rename
@@ -39236,7 +105585,7 @@ Richard Duivenvoorde 	2015-01-23
     use these field names. Because this makes it impossible to create
     a vector grid and transfer it to Postgis
 
-Merge: 743f72d 5c89fdf
+Merge: 743f72d08c 5c89fdfea3
 mhugent 	2015-01-23
 
     Merge pull request #1857 from rldhont/server_wms_sld_describe_layer
@@ -39307,14 +105656,14 @@ Juergen E. Fischer 	2015-01-22
 
     indentation update
 
-Merge: 2bb6f2a 5369ce0
+Merge: 2bb6f2a253 5369ce0498
 Nyall Dawson 	2015-01-23
 
     Merge pull request #1854 from vmora/fix_dd_line_offset
 
     fix type and helpstring of line offset
 
-Merge: 65a3bed 8d98c79
+Merge: 65a3bed5bd 8d98c7997f
 Tim Sutton 	2015-01-22
 
     Merge pull request #1851 from timlinux/master
@@ -39404,7 +105753,7 @@ Matthias Kuhn 	2015-01-15
 
     Make offline editing warnings use message bar and more verbose
 
-Merge: ff6b7de fff15e5
+Merge: ff6b7decea fff15e5ba6
 alexbruy 	2015-01-22
 
     Merge pull request #1855 from gioman/fix_processing_grass
@@ -39497,14 +105846,14 @@ volaya 	2015-01-22
 
     [processing] fixed model help editing
 
-Merge: 7c71a26 e26eae9
+Merge: 7c71a263a4 e26eae9496
 alexbruy 	2015-01-22
 
     Merge pull request #1850 from SrNetoChan/Bug_12001
 
     fix Processing Keep n biggest parts algorithm (fix #12001)
 
-Merge: ee0e90a 2db2c5c
+Merge: ee0e90a44b 2db2c5cb7f
 alexbruy 	2015-01-22
 
     Merge pull request #1849 from gioman/fix_ogr2ogr_convert_format
@@ -39581,7 +105930,7 @@ Giovanni Manghi 	2015-01-21
 
     fix Processing ogr2ogr convert format tool
 
-Merge: 43213a3 8499242
+Merge: 43213a37ec 8499242b82
 alexbruy 	2015-01-21
 
     Merge pull request #1848 from gioman/fix_postgis_import
@@ -39600,7 +105949,7 @@ Juergen E. Fischer 	2015-01-21
 
     fix building of app test with internal qwtpolar
 
-Merge: e49adad 6a66d31
+Merge: e49adad1de 6a66d3156d
 Matthias Kuhn 	2015-01-21
 
     Merge pull request #1846 from naihil/master
@@ -39615,7 +105964,7 @@ Matthias Kuhn 	2015-01-21
      * fix #11744
      * fix #11546
 
-Merge: ea54b3c 3752be66
+Merge: ea54b3c661 3752be6678
 Matthias Kuhn 	2015-01-21
 
     Merge pull request #1847 from m-kuhn/oq
@@ -39636,14 +105985,14 @@ Matthias Kuhn 	2015-01-21
 
     Make QwtPolar optional
 
-Merge: f5b10ba 61b0291
+Merge: f5b10ba15f 61b0291042
 volaya 	2015-01-21
 
     Merge pull request #1680 from tmizu23/r_utils
 
     fix Empty console Output on R under processing. refs #7643
 
-Merge: 678f1ab 3ce5275
+Merge: 678f1ab4c0 3ce5275800
 Matthias Kuhn 	2015-01-21
 
     Merge pull request #1752 from mhugo/fix_11948
@@ -39662,7 +106011,7 @@ Radim Blazek 	2015-01-21
 
     fixed ziplayertest, b843f8189 follow up
 
-Merge: 8f6b014 82f043c
+Merge: 8f6b0145e5 82f043c28c
 volaya 	2015-01-21
 
     Merge pull request #1843 from radosuav/processing_sublayers
@@ -39673,14 +106022,14 @@ Matthias Kuhn 	2015-01-21
 
     SIP update: QgsVectorLayer::applyNamedStyle, errorMsg is /Out/
 
-Merge: 7796b15 a95e28f
+Merge: 7796b157f1 a95e28fb0a
 volaya 	2015-01-21
 
     Merge pull request #1844 from gioman/fix_saga_rastercalc
 
     fix different issues in SAGA grid calculator module and add a couple of useful options
 
-Merge: 723f7be c5c970e
+Merge: 723f7be9b4 c5c970e829
 Matthias Kuhn 	2015-01-21
 
     Merge pull request #1839 from rduivenvoorde/identify_color_11996
@@ -39773,14 +106122,14 @@ Radim Blazek 	2015-01-20
 
     browser save/restore state moved to new class QgsBrowserTreeView
 
-Merge: cae4eb3 7b31a17
+Merge: cae4eb3383 7b31a17e44
 mhugent 	2015-01-20
 
     Merge pull request #1830 from manisandro/transaction
 
     [FEATURE] Transactional editing for postgres layers
 
-Merge: b029198 8177bbe
+Merge: b0291985ac 8177bbef1a
 Martin Dobias 	2015-01-20
 
     [FEATURE] New snapping API with improved indexing (QEP 13)
@@ -40079,7 +106428,7 @@ Juergen E. Fischer 	2015-01-18
 
     improve i18n of topology checker plugin
 
-Merge: c26cfe2 8911d6b
+Merge: c26cfe2f34 8911d6b472
 Tim Sutton 	2015-01-17
 
     Merge pull request #1837 from timlinux/master
@@ -40099,7 +106448,7 @@ Alexander Bruy 	2015-01-17
     [processing] enable algs that require 3rd party Python modules when
     possible
 
-Merge: e3e42f0 d8a224d
+Merge: e3e42f02a2 d8a224d896
 Alexander Bruy 	2015-01-17
 
     Merge branch 'processing-i18n'
@@ -40342,7 +106691,7 @@ Martin Dobias 	2015-01-14
 
     Fix bbox-based GetLegendGraphic for CRS with inverted axes (e.g. EPSG:4326)
 
-Merge: b49da36 224b2c8
+Merge: b49da36c7f 224b2c87b3
 Martin Dobias 	2015-01-14
 
     Merge pull request #1831 from giohappy/wms_legend_fix
@@ -40452,14 +106801,14 @@ Juergen E. Fischer 	2015-01-10
 
     delimited text provider: only add finite points to spatial index (fixes #11708)
 
-Merge: 6e60d67 29f8b23
+Merge: 6e60d67ace 29f8b2399a
 alexbruy 	2015-01-10
 
     Merge pull request #1760 from gioman/fix_scripts
 
     fix a few qgis processing scripts
 
-Merge: d9042f5 ee9c368
+Merge: d9042f590f ee9c3689f1
 Nathan Woodrow 	2015-01-10
 
     Merge pull request #1747 from NathanW2/measure_dialog
@@ -40584,7 +106933,7 @@ Nathan Woodrow 	2015-01-08
 
     Right align header in ui file. Add info in groupbox
 
-Merge: 09074ad c11319b
+Merge: 09074ad69f c11319b859
 Nathan Woodrow 	2015-01-08
 
     Merge branch 'master' into measure_dialog
@@ -40626,14 +106975,14 @@ Nyall Dawson 	2015-01-08
 
     Rename projection selector's button box to avoid this conflict.
 
-Merge: 3ce9c70 2ad2781
+Merge: 3ce9c70cc4 2ad2781cc8
 Sandro Santilli 	2015-01-07
 
     Merge pull request #1756 from strk/travis-modeltest
 
     Have travis build with model test enabled
 
-Merge: 0b954c1 2144be0
+Merge: 0b954c10f0 2144be0ac1
 Martin Dobias 	2015-01-07
 
     Merge pull request #1755 from wonder-sk/multiple-styles
@@ -40759,7 +107108,7 @@ Denis Rouzaud 	2015-01-05
 
     dedicated class for projection selection widget
 
-Merge: b905f6b ea00b36
+Merge: b905f6bb79 ea00b36985
 Matthias Kuhn 	2015-01-05
 
     Merge pull request #1743 from naihil/master
@@ -40770,7 +107119,7 @@ Juergen E. Fischer 	2015-01-04
 
     remove unused define (followup 841af773e)
 
-Merge: 841af77 fbe7551
+Merge: 841af773e3 fbe755111a
 Nyall Dawson 	2015-01-05
 
     Merge pull request #1751 from andreabedini/patch-1
@@ -40851,14 +107200,14 @@ rldhont 	2015-01-02
     To fix it, I just store the layers name and reset them at the end of
      GetLegendGraphic request.
 
-Merge: c0b94cf bbed705
+Merge: c0b94cf2bf bbed705e72
 Nathan Woodrow 	2015-01-02
 
     Merge pull request #1735 from strk/wmslegend
 
     Add support for map-contextual WMS legend
 
-Merge: 2b7e49b a0ffad2
+Merge: 2b7e49b9d1 a0ffad2532
 Nathan Woodrow 	2015-01-02
 
     Merge pull request #1744 from rldhont/expression_get_transform_geom
@@ -40960,7 +107309,7 @@ Nathan Woodrow 	2014-12-30
 
     Fix #11928 - import os for las tools
 
-Merge: 5acd35e b9f8176
+Merge: 5acd35e928 b9f8176e66
 Giuseppe Sucameli 	2014-12-29
 
     Merge pull request #1705 from marcel-dancak/db_manager-spatialite-index-tables
@@ -40978,7 +107327,7 @@ Salvatore Larosa 	2014-12-28
 
     [developers map] open link on external web browser instead of webview widget
 
-Merge: 68743f9 2aa2292
+Merge: 68743f9b8a 2aa2292156
 Nathan Woodrow 	2014-12-27
 
     Merge pull request #1634 from slarosa/usermap_about
@@ -41006,7 +107355,7 @@ Anatoliy Golubev 	2014-12-24
 
     Change Q_WS_X11 to Q_OS_UNIX for Qt5 compatibility
 
-Merge: 32079ed 2efda5d
+Merge: 32079ed3cf 2efda5def5
 mhugent 	2014-12-23
 
     Merge pull request #1310 from manisandro/adjust_crs_drop_from_browser
@@ -41081,35 +107430,35 @@ Juergen E. Fischer 	2014-12-21
 
     debian packaging update
 
-Merge: f3bcaf4 0e4b7e6
+Merge: f3bcaf43a6 0e4b7e6358
 Martin Dobias 	2014-12-21
 
     Merge pull request #1734 from strk/zoom-by-wheel-glitch2
 
     Fix zoomwheel regression (temporary hack)
 
-Merge: 07182b6 c4c36dd
+Merge: 07182b6c01 c4c36dd943
 Nathan Woodrow 	2014-12-21
 
     Merge pull request #1706 from slarosa/share_bookmarks
 
     Allows to import/export bookmarks to XML file
 
-Merge: df06057 729bdec
+Merge: df06057282 729bdec028
 Nathan Woodrow 	2014-12-21
 
     Merge pull request #1738 from mbernasocchi/emit-saved-as
 
     added layerSavedAs signal
 
-Merge: 099e0b9 06c6ca0
+Merge: 099e0b9b6c 06c6ca0044
 Nathan Woodrow 	2014-12-21
 
     Merge pull request #1741 from Gustry/master
 
     [DB Manager] Allow execution of the selected text in the SQL window
 
-Merge: 028fd04 09400d1
+Merge: 028fd043a5 09400d15d8
 Nathan Woodrow 	2014-12-21
 
     Merge pull request #1742 from anitagraser/patch-6
@@ -41156,7 +107505,7 @@ Sandro Santilli 	2014-12-19
 
     Add ENABLE_MODELTEST cmake variable/define, default to false
 
-Merge: 984324b e4a8fd8
+Merge: 984324b0ee e4a8fd8c78
 Tom Kralidis 	2014-12-19
 
     Merge pull request #1740 from geopython/MetaSearch-core-merge-no-tests
@@ -41250,7 +107599,7 @@ Radim Blazek 	2014-12-16
 
     browser items parent (moving to thread) fix (crash when dragging postgres layer)
 
-Merge: e7dcd48 8afbe83
+Merge: e7dcd48597 8afbe83c74
 alexbruy 	2014-12-16
 
     Merge pull request #1737 from gioman/fix_gdal_rasterize
@@ -41273,7 +107622,7 @@ Radim Blazek 	2014-12-15
 
     safely delete browser items if createChildren() is running in thread
 
-Merge: f79dbcd 368fc67
+Merge: f79dbcd897 368fc674bb
 Salvatore Larosa 	2014-12-15
 
     Merge pull request #1724 from slarosa/dd_wrapword
@@ -41296,7 +107645,7 @@ Landry Breuil 	2014-12-11
 
     Fix build failure with gcc < 4.4 (bug #10762)
 
-Merge: fc00baf dbc801f
+Merge: fc00baf0f1 dbc801f62f
 Denis Rouzaud 	2014-12-15
 
     Merge pull request #1736 from mbernasocchi/QgsMessageBar-SUCCESS
@@ -41530,7 +107879,7 @@ Sandro Santilli 	2014-12-09
 
     Add unit test for QgsMapToPixel (legacy only for now)
 
-Merge: 2b1b79d d39a854
+Merge: 2b1b79dbcb d39a854a2c
 Denis Rouzaud 	2014-12-09
 
     Merge pull request #1624 from 3nids/cadtool_single
@@ -41564,14 +107913,14 @@ Nyall Dawson 	2014-12-09
 
     Ensure all items are deleted from TestQgsComposerTableV2
 
-Merge: 7ca7239 a5dbb66
+Merge: 7ca723920f a5dbb66d95
 Paolo Cavallini 	2014-12-09
 
     Merge pull request #1517 from imincik/dbmanager_icons
 
     dbmanager: rotating layer import and export icons to more intuitive sense
 
-Merge: 28c3443 232aaac
+Merge: 28c344325f 232aaaca66
 Nyall Dawson 	2014-12-09
 
     Merge pull request #1721 from nyalldawson/integer_divide
@@ -41596,7 +107945,7 @@ Juergen E. Fischer 	2014-12-08
     * show busy cursor while exporting
     * fix duplicate end of entities section
 
-Merge: 535661d da17656
+Merge: 535661d63a da17656fe0
 alexbruy 	2014-12-08
 
     Merge pull request #1719 from bstroebl/splitLines
@@ -41636,7 +107985,7 @@ Alexander Bruy 	2014-12-07
 
     [processing] load documentation from online QGIS User Guide
 
-Merge: 759a148 c522112
+Merge: 759a148312 c522112534
 alexbruy 	2014-12-07
 
     Merge pull request #1720 from neteler/patch-6
@@ -41683,7 +108032,7 @@ Nyall Dawson 	2014-12-05
 
     Clean up QgsMapLayer scale based visibility api
 
-Merge: 0fa40a6 a7de4da
+Merge: 0fa40a657b a7de4dad77
 mhugent 	2014-12-05
 
     Merge pull request #1715 from rldhont/server_wms_getcapabilities_compliance
@@ -41842,7 +108191,7 @@ Matthias Kuhn 	2014-12-03
     http://dash.orfeo-toolbox.org/buildSummary.php?buildid=165433
     http://dash.orfeo-toolbox.org/buildSummary.php?buildid=165427
 
-Merge: b1de41c f94b800
+Merge: b1de41ca49 f94b80012e
 Matthias Kuhn 	2014-12-03
 
     Merge pull request #1482 from serialc/patch-1
@@ -41862,7 +108211,7 @@ Matthias Kuhn 	2014-12-02
     ParagraphSeparators in QTextCursor)
     See http://qt-project.org/doc/qt-4.8/qtextcursor.html#selectedText
 
-Merge: d034a66 81895f9
+Merge: d034a6677c 81895f9ca0
 Jürgen Fischer 	2014-12-02
 
     Merge pull request #1717 from manisandro/int_ogrwkbgeometrytype
@@ -41887,7 +108236,7 @@ Nyall Dawson 	2014-12-02
 
     Should finally fix troublesome composer html tests
 
-Merge: 974511f 29d0166
+Merge: 974511f4e3 29d0166475
 Matthias Kuhn 	2014-12-01
 
     Merge pull request #1714 from manisandro/intsafe_doublesafe
@@ -41898,7 +108247,7 @@ Sandro Mani 	2014-12-01
 
     Fix isIntSafe and isDoubleSafe not considering QVariant::UInt, QVariant::LongLong, QVariant::ULongLong (Funded by Sourcepole)
 
-Merge: 6da0058 cb32d31
+Merge: 6da0058f6f cb32d31c3a
 alexbruy 	2014-12-01
 
     Merge pull request #1710 from mach0/master
@@ -42087,7 +108436,7 @@ Nyall Dawson 	2014-11-28
 
     Fix size scaling ignored for line symbology (fix #11751)
 
-Merge: 9491851 a790f7f
+Merge: 949185179e a790f7fa2c
 mhugent 	2014-11-27
 
     Merge pull request #1701 from elpaso/serverpython2
@@ -42273,7 +108622,7 @@ Sandro Santilli 	2014-11-25
 
     Remove useless statement
 
-Merge: 9cf3e7f 03faafa
+Merge: 9cf3e7f002 03faafa4a2
 alexbruy 	2014-11-25
 
     Merge pull request #1698 from jdugge/MergetoolEmptyGeometries
@@ -42395,7 +108744,7 @@ Gillian Milani 	2014-11-12
 
     add a save button for subform (1-n relations)
 
-Merge: 484e162 e7a8994
+Merge: 484e16254d e7a8994503
 Matthias Kuhn 	2014-11-23
 
     Merge pull request #1697 from mbernasocchi/patch-1
@@ -42551,7 +108900,7 @@ Giovanni Manghi 	2014-11-05
 
     [Processing] A new tool to import data in PostGIS based on ogr2ogr and a few other ogr related fixes
 
-Merge: 6c836f0 d663599
+Merge: 6c836f0e9d d6635994df
 mhugent 	2014-11-21
 
     Merge pull request #1689 from rldhont/server_cache_project_config
@@ -42601,7 +108950,7 @@ Juergen E. Fischer 	2014-11-21
 
     sip sync
 
-Merge: afd32fd 631341b
+Merge: afd32fdc68 631341b56d
 Nyall Dawson 	2014-11-21
 
     Merge pull request #1681 from nyalldawson/sort_api
@@ -42620,7 +108969,7 @@ Radim Blazek 	2014-11-20
 
     browser favourites fix
 
-Merge: a57066a d80b660
+Merge: a57066a48d d80b6608cb
 Radim Blazek 	2014-11-20
 
     Merge pull request #1583 from slarosa/qdockwidget_browser
@@ -42686,7 +109035,7 @@ Juergen E. Fischer 	2014-11-19
 
     fix warnings
 
-Merge: 256b265 c8ad99b
+Merge: 256b2652c3 c8ad99bf6a
 Jürgen Fischer 	2014-11-19
 
     Merge pull request #1695 from nyalldawson/fix_api
@@ -42701,21 +109050,21 @@ Matthias Kuhn 	2014-11-19
 
     Fix some warnings
 
-Merge: edd8d9b 0a5c3cc
+Merge: edd8d9bc64 0a5c3cc8c6
 mhugent 	2014-11-19
 
     Merge pull request #1691 from m-kuhn/slv
 
     Enable PyQgsSymbolLayerV2 test. Followup 5957b0a
 
-Merge: d66c927 36869f0
+Merge: d66c927f60 36869f075a
 Paolo Cavallini 	2014-11-19
 
     Merge pull request #1692 from neteler/patch-4
 
     Delete r.average.txt
 
-Merge: 5215985 9c2a113
+Merge: 52159851bf 9c2a1131f8
 Paolo Cavallini 	2014-11-19
 
     Merge pull request #1693 from neteler/patch-5
@@ -42754,7 +109103,7 @@ Marco Hugentobler 	2014-11-18
 
     Hopefully fix sld test
 
-Merge: eef435e da91a9e
+Merge: eef435e979 da91a9ee58
 volaya 	2014-11-18
 
     Merge pull request #1614 from radosuav/small_fixes
@@ -42781,7 +109130,7 @@ Nyall Dawson 	2014-11-18
 
     [composer] Fix overview tooltips (fix #11655)
 
-Merge: 1f41364 b2494fd
+Merge: 1f41364c2e b2494fd9ef
 alexbruy 	2014-11-18
 
     Merge pull request #1605 from ghtmtt/patch-1
@@ -42881,7 +109230,7 @@ Matthias Kuhn 	2014-11-17
 
     And add travis build status
 
-Merge: 150aa53 ad88108
+Merge: 150aa53a63 ad881089ef
 alexbruy 	2014-11-17
 
     Merge pull request #1686 from alexbruy/dbmanager-sqleditor
@@ -42911,13 +109260,13 @@ Martin Dobias 	2014-11-15
 
     Add note about QgsMapCanvas::refresh() behavior
 
-Merge: b28cc14 40c5ae4
+Merge: b28cc1410b 40c5ae4407
 Martin Dobias 	2014-11-15
 
     Merge remote-tracking branch 'rldhont/filter_legend_displacement_point2'
 
     Conflicts:
-src/core/qgsmaphittest.cpp
+            src/core/qgsmaphittest.cpp
 
 Matthias Kuhn 	2014-11-14
 
@@ -43049,7 +109398,7 @@ Juergen E. Fischer 	2014-11-14
 
     pull_ts.sh: verify lrelease is available
 
-Merge: d4f64d9 3e3f1fb
+Merge: d4f64d9bde 3e3f1fb16c
 Paolo Cavallini 	2014-11-14
 
     Merge pull request #1687 from gioman/master
@@ -43091,7 +109440,7 @@ Radim Blazek 	2014-11-13
 
     re-enabled init expand to last expanded in browser
 
-Merge: 9cb157a 4254d4e
+Merge: 9cb157a7e5 4254d4e615
 Nyall Dawson 	2014-11-13
 
     Merge pull request #1684 from manisandro/armbuild
@@ -43238,7 +109587,7 @@ Martin Dobias 	2014-11-08
 
     This reverts commit 7ee05afd366cebf3c8f44354067c34223346f835.
 
-Merge: 2417a82 b4824ab
+Merge: 2417a82bd7 b4824abb20
 Paolo Cavallini 	2014-11-07
 
     Merge pull request #1678 from ghtmtt/patch-2
@@ -43374,7 +109723,7 @@ Tom Kralidis 	2014-11-05
 
     https://github.com/geopython/OWSLib/commit/4e5e24840372028be2858c5c6897818bf6059282
 
-Merge: 47e3dc9 7976d94
+Merge: 47e3dc9d8d 7976d9488e
 volaya 	2014-11-05
 
     Merge pull request #1670 from gioman/saga_fixes1
@@ -43389,7 +109738,7 @@ Matthias Kuhn 	2014-11-04
 
     Fix app startup test
 
-Merge: 1d3f8a7 a4fb2a1
+Merge: 1d3f8a73b5 a4fb2a102e
 mhugent 	2014-11-04
 
     Merge pull request #1671 from elpaso/requesthandler-refactoring2
@@ -43426,7 +109775,7 @@ elpaso 	2014-10-09
       response headers and body
 
     Conflicts:
-src/mapserver/qgswmsserver.cpp
+            src/mapserver/qgswmsserver.cpp
 
     Funded by ItOpen - http://www.itopen.it
 
@@ -43622,7 +109971,7 @@ Juergen E. Fischer 	2014-10-31
 
     fix more graduate renderer crashes (followup d99d2fd97)
 
-Merge: d99d2fd 9024bad
+Merge: d99d2fd97c 9024badc60
 alexbruy 	2014-10-31
 
     Merge pull request #1669 from gioman/tmp_fix_modeller_saga
@@ -43685,7 +110034,7 @@ Werner Macho 	2014-10-29
 
     Signed-off-by: Werner Macho 
 
-Merge: 4cf08c5 a7f889d
+Merge: 4cf08c5c11 a7f889dc53
 Jürgen Fischer 	2014-10-29
 
     Merge pull request #1668 from m-kuhn/action-menu-crash
@@ -43736,7 +110085,7 @@ Juergen E. Fischer 	2014-10-28
 
     db manager: show error message in bar when adding a layer fails (fixes #8148)
 
-Merge: 4bc4636 6de53e5
+Merge: 4bc4636aeb 6de53e51b4
 Nathan Woodrow 	2014-10-28
 
     Merge pull request #1667 from elpaso/bugfix11510
@@ -43753,7 +110102,7 @@ elpaso 	2014-10-28
 
     Funded by ItOpen - http://www.itopen.it
 
-Merge: c6d37c1 efc7921
+Merge: c6d37c1859 efc7921c97
 Nathan Woodrow 	2014-10-28
 
     Merge pull request #1666 from elpaso/bugfix11510
@@ -43778,14 +110127,14 @@ Werner Macho 	2014-10-28
 
     fixing typo in tooltip
 
-Merge: c7c107e 4781f58
+Merge: c7c107eb9d 4781f58064
 Werner Macho 	2014-10-28
 
     Merge pull request #1608 from yjacolin/newTips
 
     new tips in tipfactory
 
-Merge: 8617143 3ff1985
+Merge: 8617143c9e 3ff1985e90
 Werner Macho 	2014-10-28
 
     Merge pull request #1657 from DelazJ/MeasureTools
@@ -43798,14 +110147,14 @@ Nyall Dawson 	2014-10-28
 
     These aren't required and just clutter the interface.
 
-Merge: cad3d2b 4f1e6b9
+Merge: cad3d2b930 4f1e6b9c3b
 Werner Macho 	2014-10-27
 
     Merge pull request #1664 from Cracert/master
 
     [TRANSUP] pl: varia
 
-Merge: c21edd0 eef8032
+Merge: c21edd0665 eef8032122
 Werner Macho 	2014-10-27
 
     Merge pull request #1658 from DelazJ/AttributeTableContextHelp
@@ -43816,14 +110165,14 @@ Robert Szczepanek 	2014-10-27
 
     [TRANSUP] pl: varia
 
-Merge: 83d070e 531474d
+Merge: 83d070e8dd 531474d76d
 Tim Sutton 	2014-10-27
 
     Merge pull request #1663 from timlinux/papercuts
 
     Add missing sip bindings for fill and border colours of rubber band.
 
-Merge: 84c429d 83d070e
+Merge: 84c429dc73 83d070e8dd
 Tim Sutton 	2014-10-27
 
     Merge remote-tracking branch 'origin/master' into papercuts
@@ -43842,14 +110191,14 @@ Martin Dobias 	2014-10-27
 
     Along the way I have added some comments that may help others decode why the code does things it does.
 
-Merge: 362d69c 0fa4ce3
+Merge: 362d69cc12 0fa4ce36b1
 Tim Sutton 	2014-10-27
 
     Merge pull request #1662 from timlinux/papercuts
 
     Mark old rubber band ctor as deprecated in python API
 
-Merge: 1932390 362d69c
+Merge: 1932390417 362d69cc12
 Tim Sutton 	2014-10-27
 
     Merge remote-tracking branch 'origin/master'
@@ -43945,7 +110294,7 @@ Werner Macho 	2014-10-26
 
     Signed-off-by: Werner Macho 
 
-Merge: 6402864 edbf265
+Merge: 6402864537 edbf265e67
 Werner Macho 	2014-10-26
 
     Merge pull request #1659 from Cracert/master
@@ -43986,7 +110335,7 @@ DelazJ 	2014-10-24
 
     Since QGIS 2.0, it is possible to also measure angles but this is not mentioned in the context help.
 
-Merge: 444bea5 d64525c
+Merge: 444bea595f d64525c0b6
 rldhont 	2014-10-24
 
     Merge pull request #1655 from rldhont/server_embedded_layers
@@ -44098,7 +110447,7 @@ Juergen E. Fischer 	2014-10-23
     dxf export: fixes for text support (text width, underline/overline/strikeout
     and line direction symbols)
 
-Merge: 2c19543 5c9fee5
+Merge: 2c19543178 5c9fee512b
 Werner Macho 	2014-10-23
 
     Merge pull request #1654 from Cracert/master
@@ -44109,7 +110458,7 @@ Robert Szczepanek 	2014-10-23
 
     [TRANSUP] pl: processing
 
-Merge: cc30609 a41a9a3
+Merge: cc306099d9 a41a9a38ac
 Martin Dobias 	2014-10-23
 
     Merge pull request #1653 from 3nids/fixidentmenurubber
@@ -44129,7 +110478,7 @@ Martin Dobias 	2014-10-23
     because the drag'n'drop does not work properly anymore. Now registry bridge will emit a signal after
     new layers have been added, so the selection change at that point should be safe.
 
-Merge: aeb9d93 6f30ab9
+Merge: aeb9d934ed 6f30ab9be7
 alexbruy 	2014-10-23
 
     Merge pull request #1652 from gioman/processing_count_points
@@ -44192,14 +110541,14 @@ Nyall Dawson 	2014-10-22
 
     [composer] Avoid hang when adding columns to table on Win (fix ##11462)
 
-Merge: 47f5873 17626b8
+Merge: 47f5873e86 17626b802a
 alexbruy 	2014-10-22
 
     Merge pull request #1646 from gioman/saga_shapesmodules_fixes1
 
     fixes for 2 shapes tools for SAGA 2.1.2
 
-Merge: abf816b 80c1dda
+Merge: abf816bf80 80c1dda94d
 alexbruy 	2014-10-22
 
     Merge pull request #1649 from gioman/ogr_clip
@@ -44221,7 +110570,7 @@ Juergen E. Fischer 	2014-10-22
 
     vector file writer: assume shapefiles contain multitype data (fixes #10584)
 
-Merge: a4f2084 d9b1638
+Merge: a4f20840e5 d9b1638073
 alexbruy 	2014-10-22
 
     Merge pull request #1650 from gioman/gdal_rasterize_writeover
@@ -44254,7 +110603,7 @@ Juergen E. Fischer 	2014-10-22
 
     keep add feature action until non-modal attribute form is closed (fixes #11461)
 
-Merge: 3bdb104 f1ce372
+Merge: 3bdb104a01 f1ce3724e2
 Werner Macho 	2014-10-22
 
     Merge pull request #1651 from Cracert/master
@@ -44287,14 +110636,14 @@ Giovanni Manghi 	2014-10-21
 
     add Processing clip using ogr2ogr to compensate for the bad Clip performances of the native QGIS Clip tool
 
-Merge: b24572a a7b3fcc
+Merge: b24572ad7f a7b3fccc30
 Werner Macho 	2014-10-21
 
     Merge pull request #1647 from Cracert/master
 
     [TRANSUP] pl: GDAL, heatmap
 
-Merge: 338e138 eea6c6b
+Merge: 338e138be6 eea6c6bf54
 alexbruy 	2014-10-21
 
     Merge pull request #1648 from gioman/processing_gdal_output_type
@@ -44378,7 +110727,7 @@ Martin Dobias 	2014-10-21
     Cloning of the existing node will preserve the check state, in addition
     it will keep other custom properties that would be lost prevously.
 
-Merge: 42d915e 20b0d12
+Merge: 42d915ef0f 20b0d121c8
 Jürgen Fischer 	2014-10-21
 
     Merge pull request #1616 from ahuarte47/Issue_11243
@@ -44518,35 +110867,35 @@ Martin Dobias 	2014-10-20
 
     Fix #11331 (hidden group still occupies space in composer legend)
 
-Merge: 7876a78 afc60e1
+Merge: 7876a7819f afc60e1828
 alexbruy 	2014-10-20
 
     Merge pull request #1642 from timlinux/processing
 
     Papercut fix for inconsistent spelling of Raster Layer vs Vector layer
 
-Merge: 9f8beb0 34d0796
+Merge: 9f8beb0254 34d07964ed
 Werner Macho 	2014-10-20
 
     Merge pull request #1638 from Cracert/master
 
     [TRANSUP] pl: first run
 
-Merge: 1eefed2 a0a546f
+Merge: 1eefed257d a0a546f19c
 volaya 	2014-10-20
 
     Merge pull request #1640 from gioman/saga_mosaick_fix
 
     small fix for SAGA module
 
-Merge: f3e7a3e 6a33e27
+Merge: f3e7a3ed17 6a33e279da
 volaya 	2014-10-20
 
     Merge pull request #1639 from gioman/saga_transpose_grids
 
     Add SAGA 2.1.2 Transpose Grids tool
 
-Merge: 9bc7eca 3c24615
+Merge: 9bc7eca7b2 3c246159b7
 volaya 	2014-10-20
 
     Merge pull request #1643 from gioman/gdal_rasterize_type
@@ -44582,7 +110931,7 @@ Juergen E. Fischer 	2014-10-19
 
     indentation update
 
-Merge: a548d1f e1dedee
+Merge: a548d1fe2b e1dedee70c
 volaya 	2014-10-19
 
     Merge pull request #1641 from gioman/gdal_rasterize
@@ -44601,14 +110950,14 @@ Giovanni Manghi 	2014-10-19
 
     Add SAGA 2.1.2 Transpose Grids tool
 
-Merge: f35fb5e 7e40811
+Merge: f35fb5ebf7 7e40811840
 volaya 	2014-10-19
 
     Merge pull request #1637 from gioman/saga_grid_cell_index
 
     fix SAGA 2.1.2 Sort Grid module: name and parameters changed
 
-Merge: db0f423 af1fe9e
+Merge: db0f423e0d af1fe9e231
 volaya 	2014-10-19
 
     Merge pull request #1636 from gioman/saga_mosaick
@@ -44675,7 +111024,7 @@ Nyall Dawson 	2014-10-19
 
     [composer] Fix placement of coordinates in map corners (fix #8827)
 
-Merge: 7798bd8 359a3d8
+Merge: 7798bd8abb 359a3d8084
 Chris Crook 	2014-10-19
 
     Merge pull request #1630 from ccrook/GraduatedRendererUnitTests2
@@ -44774,7 +111123,7 @@ Nyall Dawson 	2014-10-19
 
     Fix some compiler/doxygen warnings
 
-Merge: d77e0f0 28f3f46
+Merge: d77e0f0b1f 28f3f4624c
 Paolo Cavallini 	2014-10-18
 
     Merge pull request #1635 from gioman/saga_slope
@@ -44821,7 +111170,7 @@ Werner Macho 	2014-10-17
 
     Signed-off-by: Werner Macho 
 
-Merge: bb95a0f c575fa5
+Merge: bb95a0f43a c575fa51df
 Paolo Cavallini 	2014-10-17
 
     Merge pull request #1633 from gioman/saga_split_shapes_new_option
@@ -44928,14 +111277,14 @@ Juergen E. Fischer 	2014-10-14
 
     remove get from QgsProviderRegistry::getProviderCapabilities() (followup 2e943c93)
 
-Merge: 89b0d7a 2e943c9
+Merge: 89b0d7ae92 2e943c936c
 Jürgen Fischer 	2014-10-14
 
     Merge pull request #1621 from manisandro/bad_layer_improvements
 
     Bad layer dialog improvements
 
-Merge: 1cb22c0 a47764d
+Merge: 1cb22c084d a47764de1c
 Werner Macho 	2014-10-14
 
     Merge pull request #1484 from serialc/master
@@ -44987,7 +111336,7 @@ Nyall Dawson 	2014-10-13
 
     Fix calculation of random colors following 4d72d72
 
-Merge: 4d72d72 3d2747c
+Merge: 4d72d721e8 3d2747c607
 Nathan Woodrow 	2014-10-13
 
     Merge pull request #1627 from slarosa/categorized_style_crash
@@ -45019,7 +111368,7 @@ Matthias Kuhn 	2014-10-13
 
     Fix #11342
 
-Merge: 62ad5ae 823b57e
+Merge: 62ad5ae12b 823b57e360
 Nathan Woodrow 	2014-10-13
 
     Merge pull request #1618 from ccrook/GraduatedRendererBugFix11366
@@ -45036,14 +111385,14 @@ Werner Macho 	2014-10-12
 
     Signed-off-by: Werner Macho 
 
-Merge: 25333c5 0ed701e
+Merge: 25333c5349 0ed701e9f4
 Nyall Dawson 	2014-10-13
 
     Merge pull request #1623 from manisandro/initially_unsorted_attributes
 
     Show attributes dialog with initially unsorted attributes
 
-Merge: d1f84fd e0e6204
+Merge: d1f84fd11a e0e6204e54
 Nyall Dawson 	2014-10-13
 
     Merge pull request #1622 from manisandro/spatialite_dialog_border
@@ -45080,14 +111429,14 @@ Nathan Woodrow 	2014-10-07
 
     Fix crash with SQL Server driver
 
-Merge: 3d8a034 ac5622a
+Merge: 3d8a0345f9 ac5622ad06
 Jürgen Fischer 	2014-10-11
 
     Merge pull request #1617 from ahuarte47/Issue_9777_missing-labels
 
     Fix #11368: Simplification of a dataset leaves some polygons unlabelled
 
-Merge: 34ccc81 94b2e7c
+Merge: 34ccc8173e 94b2e7cea0
 Jürgen Fischer 	2014-10-11
 
     Merge pull request #1625 from giohappy/master
@@ -45098,7 +111447,7 @@ giohappy 	2014-10-10
 
     Fixes error in Multipoints with Z rendering
 
-Merge: 738e0be f1577f1
+Merge: 738e0bedd5 f1577f1e8b
 Jürgen Fischer 	2014-10-10
 
     Merge pull request #1615 from ccrook/PostgresSaveStyleFix
@@ -45162,7 +111511,7 @@ rldhont 	2014-10-01
     * assignFreeId
     * readXML
 
-Merge: 174c2f3 4a639ad
+Merge: 174c2f3fdf 4a639ad984
 alexbruy 	2014-10-09
 
     Merge pull request #1619 from anitagraser/patch-4
@@ -45379,7 +111728,7 @@ volaya 	2014-09-26
 
     [processing] enabled more gdal output extensions
 
-Merge: b2e7e6e 6c2c6e2
+Merge: b2e7e6ee8a 6c2c6e2b6b
 Nathan Woodrow 	2014-10-06
 
     Merge pull request #1612 from ccrook/GraduatedRendererBugFixes1
@@ -45394,7 +111743,7 @@ Juergen E. Fischer 	2014-10-05
 
     followup 3c95b5b9
 
-Merge: 3c95b5b fa15784
+Merge: 3c95b5b936 fa157843a1
 Jürgen Fischer 	2014-10-05
 
     Merge pull request #1611 from manisandro/readlink
@@ -45445,7 +111794,7 @@ Alexander Bruy 	2014-10-05
     [processing] show layers sorted only for single selection widget and use
     legend order for multiple selection
 
-Merge: 6922e45 ec64e1d
+Merge: 6922e45c2f ec64e1d9c1
 Yves Jacolin 	2014-10-04
 
     Merge remote-tracking branch 'upstream/master' into newTips
@@ -45454,7 +111803,7 @@ Yves Jacolin 	2014-10-04
 
     A lot of missing letter and typo corrected thanks to @ccrook
 
-Merge: b8c558c c17957f
+Merge: b8c558ccd8 c17957fec9
 mhugent 	2014-10-04
 
     Merge pull request #1598 from marcel-dancak/getfeatureinfo-raster
@@ -45487,7 +111836,7 @@ Werner Macho 	2014-10-04
 
     typo fix
 
-Merge: 7fce897 76ff1a6
+Merge: 7fce897bcd 76ff1a6c4f
 alexbruy 	2014-10-04
 
     Merge pull request #1607 from gioman/v_kernel
@@ -45579,7 +111928,7 @@ volaya 	2014-10-03
 
     [processing] fixed minor typos in GeometryConvert algorithm
 
-Merge: 6ec751f 0075bde
+Merge: 6ec751f634 0075bde28d
 Denis Rouzaud 	2014-10-03
 
     Merge pull request #1606 from arnaud-morvan/selectioncolor_alphachannel
@@ -45647,14 +111996,14 @@ Juergen E. Fischer 	2014-10-03
 
     dxf export: (re-)enable linetype generation for pen styles
 
-Merge: f5054a1 c9e0328
+Merge: f5054a1e72 c9e0328339
 Jürgen Fischer 	2014-10-03
 
     Merge pull request #1603 from luipir/master
 
     [GdalTools] fix blocker bug https://hub.qgis.org/issues/11275
 
-Merge: ac54c8e 59ec15b
+Merge: ac54c8e00a 59ec15bb2b
 volaya 	2014-10-03
 
     Merge pull request #1604 from elpaso/processing
@@ -45722,7 +112071,7 @@ elpaso 	2014-10-03
 
     [processing] Avoid python hangs when run in headless mode from FCGI
 
-Merge: 10d75c0 ba0f9d4
+Merge: 10d75c0066 ba0f9d40c9
 Nathan Woodrow 	2014-10-03
 
     Merge pull request #1599 from ccrook/CategorizedRendererFixes
@@ -45890,7 +112239,7 @@ Denis Rouzaud 	2014-09-29
 
     set icon of feature actions in the action menu
 
-Merge: 1c03067 04becdc
+Merge: 1c03067504 04becdc53a
 volaya 	2014-09-29
 
     Merge pull request #1595 from giohappy/master
@@ -46005,7 +112354,7 @@ Juergen E. Fischer 	2014-09-08
     Funded-By: Ville de Morges
     Funded-By: SIGE
 
-Merge: eaacb12 7c1efea
+Merge: eaacb125c4 7c1efea46e
 alexbruy 	2014-09-26
 
     Merge pull request #1596 from anitagraser/patch-3
@@ -46022,21 +112371,21 @@ giohappy 	2014-09-26
 
     [Processing] HTML output for r.sum
 
-Merge: 6fcfb97 b07660a
+Merge: 6fcfb97bf6 b07660a069
 Martin Dobias 	2014-09-26
 
     Merge pull request #1509 from ahuarte47/Issue_10767
 
     Fix bug #10767: Simplified rendering causing boxes to appear instead
 
-Merge: 0c6576c 251a8a4
+Merge: 0c6576c423 251a8a4d3a
 mhugent 	2014-09-26
 
     Merge pull request #1593 from rldhont/qgis-server-print-legend
 
     [FEATURE][QGIS-Server] Legend filtering based on map in GetPrint Request
 
-Merge: b734e87 b558c08
+Merge: b734e87978 b558c08bd4
 Nathan Woodrow 	2014-09-26
 
     Merge pull request #1587 from ccrook/CategorizedRendererUpdate
@@ -46137,7 +112486,7 @@ Denis Rouzaud 	2014-09-25
 
     add support for NULL values in range widget (new Qgs(Double)SpinBox classes to show the clear button)
 
-Merge: e37a5ad a4515f1
+Merge: e37a5ad8df a4515f1385
 Nyall Dawson 	2014-09-25
 
     Merge pull request #1548 from manisandro/typo
@@ -46175,7 +112524,7 @@ Martin Dobias 	2014-09-25
     cofinanziato dalla Commissione Europea e sviluppato nell'ambito del progetto LIFE12 ENV/IT/001054 LIFE + IMAGINE.
     Il software è stato realizzato da Gis3W s.a.s.
 
-Merge: f1de497 da3516c
+Merge: f1de4973bb da3516ca87
 Nyall Dawson 	2014-09-25
 
     Merge pull request #1590 from slarosa/query_builder_enhanchements
@@ -46195,7 +112544,7 @@ Chris Crook 	2014-09-25
 
     Reverting class editor patch
 
-Merge: a5911e7 3f8a860
+Merge: a5911e78b7 3f8a860503
 Chris Crook 	2014-09-25
 
     Merge remote-tracking branch 'upstream/master' into CategorizedRendererUpdate
@@ -46264,7 +112613,7 @@ Chris Crook 	2014-09-24
 
     Refactoring ready for manual update dialog.  Also improves labelling of StdDev classifications and better determination of decimal places to use
 
-Merge: e0b9afb e194423
+Merge: e0b9afbefa e19442310d
 Chris Crook 	2014-09-24
 
     Merge branch 'master' into CategorizedRendererUpdate
@@ -46298,7 +112647,7 @@ Salvatore Larosa 	2014-09-23
 
     [query builder] editor enhancements: QTextEdit => QgsCodeEditorSQL
 
-Merge: 72a33ea bad94e0
+Merge: 72a33ea78f bad94e00c1
 Nathan Woodrow 	2014-09-23
 
     Merge pull request #1589 from slarosa/fix11247
@@ -46397,14 +112746,14 @@ Matthias Kuhn 	2014-09-22
 
     Fix #11236
 
-Merge: 86cbc2e 788575e
+Merge: 86cbc2ef43 788575e5cd
 Nyall Dawson 	2014-09-22
 
     Merge pull request #1540 from manisandro/composer_html_fixes
 
     Recompute webpage viewport dimensions when resizing html frames
 
-Merge: bb3ead3 4e3510e
+Merge: bb3ead3b0f 4e3510edec
 Nyall Dawson 	2014-09-22
 
     Merge pull request #1582 from nyalldawson/db_manager_fixes
@@ -46506,7 +112855,7 @@ Chris Crook 	2014-09-20
 
     Removing compiler warnings
 
-Merge: abd9e3c 808464f
+Merge: abd9e3cd21 808464fed6
 Chris Crook 	2014-09-20
 
     Merge branch 'master' into CategorizedRendererUpdate
@@ -46527,14 +112876,14 @@ Larry Shaffer 	2014-09-19
 
     Fix 'geos_c.h not found' build error on Mac for browser app
 
-Merge: 9ae648b c945eec
+Merge: 9ae648b824 c945eec556
 alexbruy 	2014-09-19
 
     Merge pull request #1531 from ccrook/DistanceMatrixFix
 
     [processing] Distance matrix fixes
 
-Merge: a809dcc 8ec82a3
+Merge: a809dcce14 8ec82a30d0
 alexbruy 	2014-09-19
 
     Merge pull request #1585 from cayetanobv/master
@@ -46557,7 +112906,7 @@ Nathan Woodrow 	2014-09-19
 
     Add asImage method for QgsSymbol
 
-Merge: acae80e 11be64d
+Merge: acae80e5ea 11be64db85
 Chris Crook 	2014-09-19
 
     Merge branch 'master' into CategorizedRendererUpdate
@@ -47002,7 +113351,7 @@ Martin Dobias 	2014-09-14
 
     Fix #11200 (Symbology changes of a layer aren't reflected in overview panel)
 
-Merge: fbea7d4 a53bf7e
+Merge: fbea7d44f4 a53bf7ea2a
 Martin Dobias 	2014-09-14
 
     Merge remote-tracking branch 'origin/master'
@@ -47023,49 +113372,49 @@ Nathan Woodrow 	2014-09-14
 
     Move identify toolbar to top to match other docks with toolbars
 
-Merge: e4f68b1 c5f2f7e
+Merge: e4f68b1ac0 c5f2f7e01a
 Nathan Woodrow 	2014-09-14
 
     Merge pull request #1304 from manisandro/replace_lineedit_with_combobox_snappingdialog
 
     Use a spinbox instead of a lineedit for the snapping tolerance
 
-Merge: e52c123 8b98942
+Merge: e52c1232a8 8b989424e0
 Nathan Woodrow 	2014-09-14
 
     Merge pull request #1571 from slarosa/context-help
 
     [context-help] set heading to 3 for heatmap plugin and python console help file
 
-Merge: f214a01 340d417
+Merge: f214a0181e 340d4178ee
 Nathan Woodrow 	2014-09-14
 
     Merge pull request #1576 from leyan/graduatedRenderer
 
     Automatic update of label and neighboring ranges boundaries in graduated renderer. Fix #9312. Fix #9900, Fix #10203
 
-Merge: e46aa62 7fdaf08
+Merge: e46aa62d07 7fdaf080b2
 Nathan Woodrow 	2014-09-14
 
     Merge pull request #1570 from slarosa/heatmap-plugin
 
     [heatmap-plugin] replace messagebar to messagebox
 
-Merge: e46aa62 6354dd3
+Merge: e46aa62d07 6354dd3a31
 Martin Dobias 	2014-09-13
 
     Merge remote-tracking branch 'rouault/use_geos_reentrant_api'
 
     Conflicts:
-src/core/pal/layer.cpp
-src/core/qgsgeometry.cpp
-src/core/qgspallabeling.cpp
+            src/core/pal/layer.cpp
+            src/core/qgsgeometry.cpp
+            src/core/qgspallabeling.cpp
 
 Martin Dobias 	2014-09-13
 
     Added @leyan to contributors
 
-Merge: 2313be9 ced5ae4
+Merge: 2313be9041 ced5ae4324
 Martin Dobias 	2014-09-13
 
     Merge pull request #1556 from leyan/convertToRuleBasedSymbology
@@ -47179,7 +113528,7 @@ Nathan Woodrow 	2014-09-11
 
     Set auto raise for attribute table buttons to match reset of UI
 
-Merge: 890f921 79b3a8f
+Merge: 890f921e06 79b3a8f889
 Jürgen Fischer 	2014-09-10
 
     Merge pull request #1577 from RossGammon/master
@@ -47267,7 +113616,7 @@ Leyan 	2014-08-30
 
     refactor to a more general convertFromRenderer function
 
-Merge: b9fc2b5 e037697
+Merge: b9fc2b51d9 e0376977f8
 Jürgen Fischer 	2014-09-09
 
     Merge pull request #1578 from alexbruy/layer-submenu
@@ -47386,7 +113735,7 @@ Ross Gammon 	2014-09-05
 
     Author: Peter Michael Green 
 
-Merge: 0a7ddfa 3eb6e7c
+Merge: 0a7ddfa170 3eb6e7ca3f
 Tom Kralidis 	2014-09-05
 
     Merge pull request #1575 from geopython/MetaSearch-0.3.1
@@ -47601,7 +113950,7 @@ Juergen E. Fischer 	2014-09-01
 
     german translation update
 
-Merge: f97d5e3 dab5ff9
+Merge: f97d5e319e dab5ff95ff
 Jürgen Fischer 	2014-09-02
 
     Merge pull request #1574 from mhugent/getFeatureExpression
@@ -47624,7 +113973,7 @@ Nyall Dawson 	2014-09-02
 
     More const correctness, fix crash with atlas
 
-Merge: 368755a 6d4dee9
+Merge: 368755a51a 6d4dee914e
 Nyall Dawson 	2014-09-02
 
     Merge pull request #1572 from jef-n/store-blend-mode
@@ -47688,8 +114037,8 @@ Denis Rouzaud 	2014-08-27
     [map layer actions] action for group of features, rename availability to target (flags), only emit signal for defined target"
 
     Conflicts:
-src/gui/qgsmaplayeractionregistry.cpp
-src/gui/qgsmaplayeractionregistry.h
+            src/gui/qgsmaplayeractionregistry.cpp
+            src/gui/qgsmaplayeractionregistry.h
 
 Nyall Dawson 	2014-09-01
 
@@ -47829,7 +114178,7 @@ Juergen E. Fischer 	2014-08-31
 
     german translation update
 
-Merge: acf1f70 793db5f
+Merge: acf1f70f13 793db5f53f
 Jürgen Fischer 	2014-08-30
 
     Merge pull request #1569 from nyalldawson/measure_undo
@@ -47865,7 +114214,7 @@ Werner Macho 	2014-08-29
 
     Signed-off-by: Werner Macho 
 
-Merge: f92fd58 8c7b394
+Merge: f92fd58163 8c7b394639
 mhugent 	2014-08-29
 
     Merge pull request #1547 from marcel-dancak/bbox-bugfix
@@ -47880,14 +114229,14 @@ Martin Dobias 	2014-08-29
 
     Added Michael Douchin to contributors
 
-Merge: 99ff44c 092b7fc
+Merge: 99ff44cb16 092b7fc673
 Martin Dobias 	2014-08-29
 
     Merge pull request #1566 from mdouchin/debug_project_path_embedded_items
 
     Fix #11109 (Write relative path in project XML for embedded groups and layers)
 
-Merge: 6130505 75b3464
+Merge: 6130505c79 75b3464e1c
 alexbruy 	2014-08-28
 
     Merge pull request #1564 from anitagraser/patch-2
@@ -47970,7 +114319,7 @@ Juergen E. Fischer 	2014-08-25
 
     indentation update
 
-Merge: 7b84ccc 6cd8e4f
+Merge: 7b84ccc9b1 6cd8e4fb00
 Tim Sutton 	2014-08-25
 
     Merge pull request #1561 from DelazJ/ProjSelector
@@ -47993,7 +114342,7 @@ Matthias Kuhn 	2014-08-25
 
     Fix tab order in add relation dialog
 
-Merge: d70235f 0bfd5fb
+Merge: d70235ffbe 0bfd5fbf64
 Tim Sutton 	2014-08-25
 
     Merge pull request #1549 from DelazJ/TableManager_GUI
@@ -48004,21 +114353,21 @@ Nyall Dawson 	2014-08-25
 
     [composer] Show selected items in bold in items tree panel (fix #11057)
 
-Merge: f1aafe0 6cfb6e6
+Merge: f1aafe06c8 6cfb6e61b1
 Tim Sutton 	2014-08-25
 
     Merge pull request #1552 from DelazJ/SaveAsDialog
 
     Put by default to on the "Add layer to map canvas" option when saving new file (issue #6642)
 
-Merge: ae25009 937a97d
+Merge: ae25009c66 937a97db1e
 Tim Sutton 	2014-08-25
 
     Merge pull request #1557 from DelazJ/VectorSymbolselector
 
     fix #10472 : Enlarge btnSaveSymbol so it shows fully its text in all languages
 
-Merge: 4d1595c 23eff1f
+Merge: 4d1595ce79 23eff1f8ca
 Tim Sutton 	2014-08-25
 
     Merge pull request #1551 from DelazJ/FToolsAddNewLayerToMapCanvas
@@ -48274,7 +114623,7 @@ Nyall Dawson 	2014-07-29
 
     Add a simplified class for fetching HTTP network content
 
-Merge: 1b205be 4cfe24a
+Merge: 1b205be604 4cfe24aea9
 Denis Rouzaud 	2014-08-19
 
     Merge pull request #1516 from 3nids/vr_geom_relation
@@ -48317,14 +114666,14 @@ Matthias Kuhn 	2014-08-18
 
     Doxymentation
 
-Merge: 8d822c4 f267791
+Merge: 8d822c42ae f2677918f8
 mhugent 	2014-08-18
 
     Merge pull request #1533 from manisandro/multilabeling_datadefined
 
     Fix multilabeling with datadefined value
 
-Merge: 621edef ff172b2
+Merge: 621edef24e ff172b2cc9
 mhugent 	2014-08-18
 
     Merge pull request #1541 from marcel-dancak/master
@@ -48344,7 +114693,7 @@ Marcel Dancak 	2014-08-18
 
     wmsprovider: store tileWidth and tileHeight values in properties of wms provider
 
-Merge: 8888c5f 8105545
+Merge: 8888c5f0c0 81055452e4
 Marcel Dancak 	2014-08-18
 
     Merge remote-tracking branch 'upstream/master'
@@ -48517,7 +114866,7 @@ Juergen E. Fischer 	2014-08-09
 
     doxygen fixes
 
-Merge: d42c24f 1d736da
+Merge: d42c24f28c 1d736da66c
 Jürgen Fischer 	2014-08-13
 
     Merge pull request #1536 from Ecologeek/bugfix
@@ -48618,7 +114967,7 @@ Chris Crook 	2014-08-11
 
     Fixing field name used for target field in ftools DistanceMatrix algorithm
 
-Merge: fe4e552 26587af
+Merge: fe4e552e96 26587af616
 Nathan Woodrow 	2014-08-11
 
     Merge pull request #1481 from giohappy/alias_remove_when_empty
@@ -48659,14 +115008,14 @@ Matthias Kuhn 	2014-08-07
 
     Let user change form layout in fields properties if .ui is not empty
 
-Merge: 2c12a0d aeed122
+Merge: 2c12a0dfb2 aeed1229e0
 Jürgen Fischer 	2014-08-06
 
     Merge pull request #1458 from rouault/ogr_unknown25d
 
     OGR provider: deal with wkbUnknown25D (wkbUnknown | wkb25DBit)
 
-Merge: 24e89a4 04bb461
+Merge: 24e89a4712 04bb461746
 Jürgen Fischer 	2014-08-06
 
     Merge pull request #1527 from jarl-dk/build_fix
@@ -48714,7 +115063,7 @@ Matthias Kuhn 	2014-08-03
 
     Attribute table cache size 0 is represented as "All" in the options
 
-Merge: 1b94afe ed52cb2
+Merge: 1b94afe8a5 ed52cb25fc
 Matthias Kuhn 	2014-08-03
 
     Merge pull request #1524 from SrNetoChan/master
@@ -48938,7 +115287,7 @@ Larry Shaffer 	2014-07-23
 
     Fix finding QScintilla for non-QT_INCLUDE_DIR install directories
 
-Merge: 3988ad0 6014d45
+Merge: 3988ad0f63 6014d45d96
 Tim Sutton 	2014-07-23
 
     Merge pull request #1514 from manisandro/stretch_last_column
@@ -49011,14 +115360,14 @@ Matthias Kuhn 	2014-07-22
     Only add feature once when python init function is set on attribute form
     Fix #10862
 
-Merge: 080f252 e477633
+Merge: 080f252378 e47763390f
 alexbruy 	2014-07-22
 
     Merge pull request #1510 from gioman/v_points
 
     [processing] fix grass64 v.to.points
 
-Merge: 8f0b898 38390bf
+Merge: 8f0b89870f 38390bf725
 volaya 	2014-07-22
 
     Merge pull request #1512 from radosuav/small_processing_fixes_3
@@ -49089,7 +115438,7 @@ Nathan Woodrow 	2014-07-21
 
     Comment sip files for code editor to fix build error on ubuntu
 
-Merge: 460cee1 6486594
+Merge: 460cee1bde 6486594f57
 alexbruy 	2014-07-21
 
     Merge pull request #1505 from volaya/master
@@ -49130,7 +115479,7 @@ Nathan Woodrow 	2014-07-20
 
     Drop QScintilla2 from window title
 
-Merge: 4e2afeb b2ff718
+Merge: 4e2afeb961 b2ff71868a
 Nathan Woodrow 	2014-07-20
 
     Merge pull request #1507 from NathanW2/code_editor
@@ -49443,14 +115792,14 @@ Marco Hugentobler 	2014-07-10
 
     Fix swapped lat/long
 
-Merge: 6097e58 c33007f
+Merge: 6097e58a7a c33007fe70
 volaya 	2014-07-10
 
     Merge pull request #1503 from alexbruy/processing-ogr
 
     Processing ogr
 
-Merge: 9abeeb6 0525c01
+Merge: 9abeeb64e6 0525c015c8
 Marco Hugentobler 	2014-07-10
 
     Merge branch 'composer_grid_master'
@@ -49533,14 +115882,14 @@ Nyall Dawson 	2014-07-06
 
     [FEATURE] Color picker option in color button context menu, which allows for sampling a color from anywhere on the screen. Supports holding the left mouse button to continuously sample. Pressing space also triggers a sample for Windows, where mouse clicks outside the QGIS window are unavoidably propagated onward.
 
-Merge: 32a3030 d68bc59
+Merge: 32a3030153 d68bc599f4
 alexbruy 	2014-07-07
 
     Merge pull request #1501 from gioman/grass64watershed
 
     [processing] fix GRASS 6.4 r.watershed
 
-Merge: 136cd5c b16172c
+Merge: 136cd5cd37 b16172cc27
 alexbruy 	2014-07-07
 
     Merge pull request #1500 from gioman/grass7watershed
@@ -49638,7 +115987,7 @@ Nyall Dawson 	2014-07-05
 
     [FEATURE][composer] Data defined item rotation. Funded by Canton of Neuchâtel, Switzerland
 
-Merge: 47e8bde 228892c
+Merge: 47e8bde7d4 228892cfa7
 alexbruy 	2014-07-05
 
     Merge pull request #1498 from minorua/joinattrs
@@ -49719,7 +116068,7 @@ Nyall Dawson 	2014-07-04
 
     [composer] Improved method for setting/checking whether items are in a group
 
-Merge: af17b56 0c0e9ec
+Merge: af17b56cb1 0c0e9ec462
 mhugent 	2014-07-04
 
     Merge pull request #1497 from manisandro/multilabeling_fix
@@ -49734,7 +116083,7 @@ borys 	2014-07-03
 
     Typo fixes from Rome airport
 
-Merge: 144f7ec 5476d86
+Merge: 144f7eca8f 5476d86f60
 volaya 	2014-07-03
 
     Merge pull request #1496 from Gustry/dev
@@ -49773,7 +116122,7 @@ Alexander Bruy 	2014-07-01
 
     [processing] fix fusion algs loading
 
-Merge: 978eb2e 6f00101
+Merge: 978eb2e3b8 6f00101bfd
 alexbruy 	2014-07-01
 
     Merge pull request #1495 from giohappy/new_operators_dospatialjoin
@@ -49852,7 +116201,7 @@ Juergen E. Fischer 	2014-06-29
 
     oracle provider: fix closing of iterator in case of error
 
-Merge: a2a26c2 05cfd69
+Merge: a2a26c2829 05cfd69d13
 alexbruy 	2014-06-29
 
     Merge pull request #1446 from volaya/new_modeler
@@ -49885,7 +116234,7 @@ Victor Olaya 	2014-06-08
 
     [processing] overhaul of graphical modeler
 
-Merge: 09645e4 2982b57
+Merge: 09645e4ecc 2982b57dd2
 volaya 	2014-06-28
 
     Merge pull request #1490 from radosuav/small_processing_fixes2
@@ -49938,7 +116287,7 @@ Matthias Kuhn 	2014-06-27
 
     Doxymentation
 
-Merge: ae9b306 00692c7
+Merge: ae9b30632b 00692c7fd8
 mhugent 	2014-06-27
 
     Merge pull request #1395 from manisandro/line_multi_labeling_improved
@@ -49949,7 +116298,7 @@ Martin Dobias 	2014-06-27
 
     Fix #10703 (selection reset after added/removed attribute)
 
-Merge: 71649d4 b42ef8c
+Merge: 71649d423e b42ef8c669
 Werner Macho 	2014-06-27
 
     Merge pull request #1493 from qgis-jp/pullreq_2_4
@@ -49966,7 +116315,7 @@ yoichigmf 	2014-06-27
 
     update translation JA
 
-Merge: fec9e65 599368c
+Merge: fec9e65af5 599368c57e
 Werner Macho 	2014-06-27
 
     Merge pull request #1491 from Cracert/i18n
@@ -49989,7 +116338,7 @@ Juergen E. Fischer 	2014-06-27
 
     indentation update
 
-Merge: 4d6cfd9 0a7e69c
+Merge: 4d6cfd960b 0a7e69c6a0
 Nathan Woodrow 	2014-06-27
 
     Merge pull request #1492 from nyalldawson/fix_10728
@@ -50049,7 +116398,7 @@ Juergen E. Fischer 	2014-06-26
 
     german translation update
 
-Merge: b2ea8f7 8655049
+Merge: b2ea8f70c2 8655049898
 Werner Macho 	2014-06-25
 
     Merge pull request #1489 from Cracert/i18n
@@ -50087,7 +116436,7 @@ Denis Rouzaud 	2014-06-25
 
     followup 7d9b8dda8671820b99cfc0e170aad8e554ebe5d1
 
-Merge: 7d9b8dd be032f7
+Merge: 7d9b8dda86 be032f72a7
 Martin Dobias 	2014-06-25
 
     Merge pull request #1483 from 3nids/pasteshape
@@ -50119,21 +116468,21 @@ Matthias Kuhn 	2014-06-24
 
     Doxymentation for QgsAttributeForm
 
-Merge: 2fc5ce3 61abba8
+Merge: 2fc5ce31eb 61abba8e30
 alexbruy 	2014-06-24
 
     Merge pull request #1487 from gioman/fixgrass7
 
     [processing] Fix GRASS7 Grass7Algorithm.py to avoid error when opening modules
 
-Merge: d56c6c8 30e5747
+Merge: d56c6c81b1 30e5747f92
 alexbruy 	2014-06-24
 
     Merge pull request #1486 from gioman/grass_instructions
 
     [processing] fixed instructions on how build GRASS modules
 
-Merge: acea234 544200e
+Merge: acea234267 544200e82a
 alexbruy 	2014-06-24
 
     Merge pull request #1485 from gioman/wildfire
@@ -50228,7 +116577,7 @@ Nyall Dawson 	2014-06-20
 
     [composer] Refresh attribute table filter when atlas feature changes (fix #10651)
 
-Merge: c601e3b 4eb995c
+Merge: c601e3b851 4eb995c17b
 alexbruy 	2014-06-23
 
     Merge pull request #1479 from gioman/master
@@ -50239,7 +116588,7 @@ Cyrille Medard de Chardon 	2014-06-23
 
     Checkbox for sub index was missing tooltip text
 
-Merge: 151d1f1 8ed8d15
+Merge: 151d1f1434 8ed8d15ef6
 Nyall Dawson 	2014-06-23
 
     Merge pull request #1424 from manisandro/autoupdate_composer_legend_symbols
@@ -50263,7 +116612,7 @@ giohappy 	2014-06-23
 
     Remove alias from vector layer if it's an empty string
 
-Merge: daefe3e 4c199ff
+Merge: daefe3e8ee 4c199ff16c
 Martin Dobias 	2014-06-23
 
     Merge pull request #1480 from 3nids/fixew
@@ -50323,7 +116672,7 @@ volaya 	2014-06-22
 
     fixed #10669
 
-Merge: 7269126 41a2e26
+Merge: 7269126719 41a2e26042
 Werner Macho 	2014-06-22
 
     Merge pull request #1478 from qgis-jp/pullreq_2_4
@@ -50530,7 +116879,7 @@ Matthias Kuhn 	2014-06-20
     Allow negative values for range widget
     Fix #6516
 
-Merge: 909a841 88162d3
+Merge: 909a841e74 88162d3885
 Werner Macho 	2014-06-20
 
     Merge pull request #1476 from cdavila/patch-1
@@ -50606,7 +116955,7 @@ Tim Sutton 	2014-06-20
 
     Fix for Vietnamese UTM 48N projection parameters as reported by Quách Đồng Thắng
 
-Merge: 735028d d99f3a0
+Merge: 735028d5b7 d99f3a0a8c
 Tim Sutton 	2014-06-20
 
     Merge pull request #1474 from timlinux/master
@@ -50665,7 +117014,7 @@ Matthias Kuhn 	2014-06-20
     WidgetWrappers (which are not strictly related to fields being editable)
     don't sync their edit state to the layer edit mode state.
 
-Merge: 7aa93c0 434805b
+Merge: 7aa93c00f7 434805bbd6
 alexbruy 	2014-06-20
 
     Merge pull request #1473 from gioman/master
@@ -50720,7 +117069,7 @@ gioman 	2014-06-19
 
     fix v.surf.bspline modules, input must be a point layer
 
-Merge: a72bfb6 2176e16
+Merge: a72bfb61c9 2176e163b7
 alexbruy 	2014-06-19
 
     Merge pull request #1472 from gioman/r_cost_raster
@@ -50747,7 +117096,7 @@ Werner Macho 	2014-06-19
 
     Signed-off-by: Werner Macho 
 
-Merge: b87093d a7427b2
+Merge: b87093dad4 a7427b266e
 Werner Macho 	2014-06-19
 
     Merge pull request #1470 from qgis-jp/pullreq_2_4
@@ -50758,7 +117107,7 @@ yoichigmf 	2014-06-19
 
     update translation ja
 
-Merge: 63ad0fa 1f6a47b
+Merge: 63ad0fa3d7 1f6a47b92d
 Werner Macho 	2014-06-19
 
     Merge pull request #1469 from Qgis-Tr-kr/master
@@ -50779,7 +117128,7 @@ jangbi882 	2014-06-19
 
     Korean translation updated
 
-Merge: c884e15 0ce4cbf
+Merge: c884e1598b 0ce4cbf4ba
 BJ Jang 	2014-06-19
 
     Merge pull request #3 from qgis/master
@@ -50817,21 +117166,21 @@ Sandro Mani 	2014-06-05
 
     Update composer legend entry when layer symbology changes. Funded by Sourcepole QGIS Enterprise.
 
-Merge: c05e342 0d1d705
+Merge: c05e342ab1 0d1d70551e
 Werner Macho 	2014-06-19
 
     Merge pull request #1464 from Cracert/i18n
 
     [TRANSUP] pl: #18 by Radek
 
-Merge: fcde595 304ced9
+Merge: fcde5955f3 304ced9e44
 mhugent 	2014-06-19
 
     Merge pull request #1462 from giohappy/master
 
     Fix 10625 reverting addDrawingOrder to previous logic
 
-Merge: ee7add4 b998bb2
+Merge: ee7add4f32 b998bb215d
 Nathan Woodrow 	2014-06-19
 
     Merge pull request #1465 from slarosa/str_replace_api
@@ -50846,7 +117195,7 @@ Martin Dobias 	2014-06-19
 
     Added Even Rouault to contributors
 
-Merge: fd46c49 1bfd01b
+Merge: fd46c49811 1bfd01b25a
 Martin Dobias 	2014-06-19
 
     Merge pull request #1460 from rouault/fix_crash_in_QgsVectorFileWriter_addFeature
@@ -50857,7 +117206,7 @@ Robert Szczepanek 	2014-06-18
 
     [TRANSUP] pl: #18 by Radek
 
-Merge: 0dd02ba 0bd6d61
+Merge: 0dd02bad04 0bd6d61b34
 Werner Macho 	2014-06-19
 
     Merge pull request #1463 from Cracert/i18n
@@ -50922,7 +117271,7 @@ Nyall Dawson 	2014-06-18
 
     Fix some failing tests (diagrams control images needed rebuilding following MTR composer changes, added tolerance to renderers test)
 
-Merge: 60d93b3 ec82076
+Merge: 60d93b35cd ec820762d6
 Matthias Kuhn 	2014-06-18
 
     Merge pull request #1457 from rouault/fix_crash_attr_table_no_attr_col
@@ -50992,7 +117341,7 @@ Martin Dobias 	2014-06-18
 
     Use at() instead of operator [] to avoid detach and save time
 
-Merge: c27e731 9019b8e7
+Merge: c27e731ece 9019b8e71a
 Jürgen Fischer 	2014-06-17
 
     Merge pull request #1407 from dbaston/master
@@ -51055,7 +117404,7 @@ Juergen E. Fischer 	2014-06-17
 
     make two editor widget strings translatable (and german translation update)
 
-Merge: ed1d08d a70c865
+Merge: ed1d08d435 a70c865b62
 Martin Dobias 	2014-06-17
 
     Merge pull request #1459 from cdavila/patch-1
@@ -51182,14 +117531,14 @@ Victor Olaya 	2014-06-12
 
     [processing] Prioritze bundled gdal over framework on OS X
 
-Merge: 8005eab 1613d84
+Merge: 8005eab051 1613d840ce
 Martin Dobias 	2014-06-16
 
     Merge pull request #1455 from Oslandia/fix_inverted
 
     Inverted polygons: fix memory leaks
 
-Merge: aa09c8c 00dca40
+Merge: aa09c8cbe6 00dca4031b
 Werner Macho 	2014-06-16
 
     Merge pull request #1454 from Cracert/i18n
@@ -51265,7 +117614,7 @@ Martin Dobias 	2014-06-16
 
     Fix #10271 (crash from race condition in SVG cache when using parallel rendering)
 
-Merge: 9e3f921 ea34bef
+Merge: 9e3f921400 ea34befe7c
 Martin Dobias 	2014-06-15
 
     Merge pull request #1451 from ahuarte47/Issue_OffsetCurve_API
@@ -51276,15 +117625,15 @@ Martin Dobias 	2014-06-15
 
     Map rendering: allow waiting for job while handling events
 
-Merge: 685d3e8 703c3e7
+Merge: 685d3e898b 703c3e7272
 Martin Dobias 	2014-06-15
 
     Merge remote-tracking branch 'edigonzales/master'
 
     Conflicts:
-src/core/symbology-ng/qgslinesymbollayerv2.cpp
+            src/core/symbology-ng/qgslinesymbollayerv2.cpp
 
-Merge: 6c21262 7bec7c2
+Merge: 6c21262935 7bec7c2d49
 Werner Macho 	2014-06-15
 
     Merge pull request #1453 from qgis-jp/pullreq_2_4
@@ -51295,7 +117644,7 @@ yoichigmf 	2014-06-15
 
     update translation JA
 
-Merge: 637dca7 6c21262
+Merge: 637dca76e0 6c21262935
 BJ Jang 	2014-06-15
 
     Merge pull request #2 from qgis/master
@@ -51388,7 +117737,7 @@ Juergen E. Fischer 	2014-06-13
     ogr: don't create spatial index for shapes after deletes. That was supposed to
     also run a repack and doesn't work without (fixes #10483, refs #8317, refs #8822)
 
-Merge: b6d8331 e257227
+Merge: b6d8331429 e257227050
 Martin Dobias 	2014-06-14
 
     Merge pull request #1286 from dakcarto/issue-3975_labeling-svg-as-text
@@ -51493,7 +117842,7 @@ Martin Dobias 	2014-06-13
 
     Fix #10525 (zoom to the first layer not always working)
 
-Merge: 03dfef8 637dca7
+Merge: 03dfef8a29 637dca76e0
 Werner Macho 	2014-06-13
 
     Merge pull request #1450 from Qgis-Tr-kr/master
@@ -51516,7 +117865,7 @@ jangbi882 	2014-06-13
 
     Korean transration completed
 
-Merge: 95687a2 b2782ee
+Merge: 95687a281a b2782ee7a1
 Martin Dobias 	2014-06-13
 
     Merge pull request #1439 from Oslandia/fix_inverted
@@ -51535,21 +117884,21 @@ jangbi882 	2014-06-13
 
     1/5 
 
-Merge: c49e38c 17a8e38
+Merge: c49e38c39c 17a8e38108
 Martin Dobias 	2014-06-13
 
     Merge pull request #1437 from ahuarte47/Issue_10195
 
     Fix bug #10195: Offset line symbology added to polygon layer leads to crash
 
-Merge: ea0e1b1 b3cbefc
+Merge: ea0e1b11ad b3cbefc998
 Martin Dobias 	2014-06-13
 
     Merge pull request #1449 from edigonzales/master
 
     fixes #10520 (scale method for SVG) and #10509 (dash pattern)
 
-Merge: c31b673 ea0e1b1
+Merge: c31b67306e ea0e1b11ad
 Qgis-Tr-kr 	2014-06-13
 
     Merge pull request #1 from qgis/master
@@ -51608,7 +117957,7 @@ Juergen E. Fischer 	2014-06-12
 
     debian packaging update (include pyspatialite also on quantal)
 
-Merge: da99331 b3088e0
+Merge: da99331d85 b3088e0331
 Nathan Woodrow 	2014-06-12
 
     Merge pull request #1315 from manisandro/populate_transparency_table
@@ -51619,14 +117968,14 @@ Nyall Dawson 	2014-05-27
 
     Fix color buttons disappearing in windows when alpha is set (fix #10187)
 
-Merge: ef70000 81593ed
+Merge: ef700000e7 81593edb2c
 Nathan Woodrow 	2014-06-12
 
     Merge pull request #1444 from avlisad/master
 
     Improve mouse logic for measure tool. Fix #4628 Fix #10029
 
-Merge: 28145b4 306b148
+Merge: 28145b4105 306b148bc0
 volaya 	2014-06-12
 
     Merge pull request #1448 from gioman/master
@@ -51637,7 +117986,7 @@ gioman 	2014-06-12
 
     small changes to import into postgis tool
 
-Merge: fc8d07e 51c6c60
+Merge: fc8d07ee24 51c6c60f6e
 Nathan Woodrow 	2014-06-12
 
     Merge pull request #1443 from manisandro/qgsfieldmap
@@ -51648,14 +117997,14 @@ Martin Dobias 	2014-06-12
 
     Fix #10475 (symmetrical difference behaves like difference)
 
-Merge: fa88eb2 2ef7dcf
+Merge: fa88eb2503 2ef7dcf6b9
 volaya 	2014-06-12
 
     Merge pull request #1389 from radosuav/small_processing_fixes
 
     [processing] Small fixes
 
-Merge: d43d306 8e03f7f
+Merge: d43d3065e9 8e03f7f166
 Werner Macho 	2014-06-12
 
     Merge pull request #1447 from Cracert/i18n
@@ -51707,7 +118056,7 @@ Juergen E. Fischer 	2014-06-11
 
     don't reopen feature form when identify maptool is reactivated (fixes #10104)
 
-Merge: dc9148c 32d8c12
+Merge: dc9148c674 32d8c12508
 Werner Macho 	2014-06-11
 
     Merge pull request #1445 from Cracert/i18n
@@ -51722,7 +118071,7 @@ Robert Szczepanek 	2014-06-11
 
     {TRANSUP] pl: context_help
 
-Merge: d20c569 0d7204c
+Merge: d20c5697cc 0d7204cd85
 Jürgen Fischer 	2014-06-11
 
     Merge pull request #1406 from m-kuhn/spatialite-fix
@@ -51812,7 +118161,7 @@ Martin Dobias 	2014-06-11
 
     This removes the debug noise from GEOS when it tries to compute contains() predicate
 
-Merge: 7f434a0 7e0ef8f
+Merge: 7f434a0c7e 7e0ef8f93a
 Martin Dobias 	2014-06-11
 
     Merge remote-tracking branch 'alvaro/Issue_10433'
@@ -51853,7 +118202,7 @@ Martin Dobias 	2014-06-11
     between startRender()/stopRender() calls and was breaking
     also composer legend.
 
-Merge: 3af01b3 b545253
+Merge: 3af01b345c b5452539d0
 Werner Macho 	2014-06-10
 
     Merge pull request #1440 from Cracert/i18n
@@ -51918,17 +118267,17 @@ Martin Dobias 	2014-06-10
     On my machine, there were ~200-800 mismatched pixels in each test image,
     but visually they look the same.
 
-Merge: ae9048a 25346fe
+Merge: ae9048afb1 25346fe98f
 Martin Dobias 	2014-06-10
 
     Fix #10355 (crash) and #10338 (overlapping polygons) in inverted polygon renderer
 
     Conflicts:
-python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
-src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
-src/core/symbology-ng/qgsinvertedpolygonrenderer.h
-src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
-src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h
+            python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
+            src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
+            src/core/symbology-ng/qgsinvertedpolygonrenderer.h
+            src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
+            src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h
 
 Martin Dobias 	2014-06-10
 
@@ -51948,14 +118297,14 @@ Juergen E. Fischer 	2014-06-09
 
     fix zoom to layer extent crash (fixes #10516)
 
-Merge: b5c652b b99a21d
+Merge: b5c652b6da b99a21ddbb
 Werner Macho 	2014-06-09
 
     Merge pull request #1436 from thodorisvakkas/master
 
     [TRANSUP] greek translation 20140609
 
-Merge: dc44747 6a84160
+Merge: dc44747227 6a84160a9e
 Werner Macho 	2014-06-09
 
     Merge pull request #1435 from Cracert/i18n
@@ -51988,7 +118337,7 @@ Juergen E. Fischer 	2014-06-09
     * ask when otf was switched on
     * show more information in selection dialog
 
-Merge: 8d04adb a55303d
+Merge: 8d04adbe8f a55303d2c5
 Werner Macho 	2014-06-09
 
     Merge pull request #1434 from Cracert/i18n
@@ -52019,7 +118368,7 @@ Juergen E. Fischer 	2014-06-09
 
     field model: return alias as display role, but field name as edit role (fixes #10467)
 
-Merge: a59b54e 1357c14
+Merge: a59b54eb08 1357c14f57
 Nathan Woodrow 	2014-06-09
 
     Merge pull request #1432 from gvellut/master
@@ -52057,7 +118406,7 @@ Martin Dobias 	2014-06-09
 
     Fix #10473 (raster preview icons in layer tree view)
 
-Merge: afe6f2b 674cf07
+Merge: afe6f2b94a 674cf07584
 Werner Macho 	2014-06-08
 
     Merge pull request #1433 from Cracert/i18n
@@ -52122,7 +118471,7 @@ Alexander Bruy 	2014-06-08
 
     russian and ukrainian translation update
 
-Merge: db5ae6c add1c92
+Merge: db5ae6cef2 add1c925cc
 Werner Macho 	2014-06-08
 
     Merge pull request #1431 from Cracert/i18n
@@ -52149,7 +118498,7 @@ Sandro Mani 	2014-06-03
 
     Consider also font descent and baseline in QgsComposerLabel::adjustSizeToText. Funded by Sourcepole QGIS Enterprise.
 
-Merge: 4750211 b199dc7
+Merge: 4750211bb0 b199dc7be1
 Nyall Dawson 	2014-06-07
 
     Merge pull request #1423 from manisandro/python_addItemsFromXML
@@ -52172,7 +118521,7 @@ Nyall Dawson 	2014-06-07
 
     [composer] Check if attribute index is valid when reading attribute table fields from pre 2.4 projects (refs #10482)
 
-Merge: b317912 b4a38c2
+Merge: b3179125e7 b4a38c2201
 Werner Macho 	2014-06-06
 
     Merge pull request #1430 from Cracert/i18n
@@ -52197,7 +118546,7 @@ Paolo Cavallini 	2014-06-06
 
     Added a conditional example
 
-Merge: 4850111 bf82848
+Merge: 485011105c bf8284864d
 mhugent 	2014-06-06
 
     Merge pull request #1419 from marcel-dancak/master
@@ -52214,7 +118563,7 @@ Werner Macho 	2014-06-06
 
     Signed-off-by: Werner Macho 
 
-Merge: ced6a30 150ffa3
+Merge: ced6a30968 150ffa3780
 Denis Rouzaud 	2014-06-06
 
     Merge pull request #1428 from 3nids/fix10405
@@ -52251,14 +118600,14 @@ Matthias Kuhn 	2014-06-06
 
     Remove relations when a involved layer gets deleted
 
-Merge: 5e8cda7 7475454
+Merge: 5e8cda7803 7475454edc
 Werner Macho 	2014-06-06
 
     Merge pull request #1420 from Cracert/i18n
 
     VectorLayer, SymbolsList, WidgetShapeburst, XML, parent
 
-Merge: 69f7b65 040cd6b
+Merge: 69f7b65648 040cd6b2ed
 Werner Macho 	2014-06-06
 
     Merge pull request #1425 from qgis-jp/pullreq_2_4
@@ -52277,14 +118626,14 @@ Denis Rouzaud 	2014-06-06
 
     FieldExpressionWidget: add tooltip if expression is larger than widget
 
-Merge: 563f521 319694f
+Merge: 563f5211db 319694fc1b
 Martin Dobias 	2014-06-06
 
     Merge pull request #1429 from christianurich/QgsDatumTransformStore_transformation_0
 
     Fix crash when QgsDatumTransformStore::transformation returns 0
 
-Merge: 8c513f9 e7056f6
+Merge: 8c513f99de e7056f6447
 Martin Dobias 	2014-06-06
 
     Merge pull request #1426 from simonsonc/qgsvaluemapconfigdlg-deprecated-api
@@ -52301,7 +118650,7 @@ Denis Rouzaud 	2014-06-06
 
     fix #10405 and #10303 partially: removes the scroll area for the style page
 
-Merge: ade4c7b 60dfc79
+Merge: ade4c7bd0b 60dfc79623
 Martin Dobias 	2014-06-06
 
     Merge pull request #1427 from simonsonc/qgscolorbutton-deprecated-api
@@ -52326,7 +118675,7 @@ Juergen E. Fischer 	2014-06-06
 
     german translation update
 
-Merge: 2a80881 bcde66f
+Merge: 2a80881e85 bcde66fd6a
 mhugent 	2014-06-05
 
     Merge pull request #1403 from mdouchin/getmap_image_quality
@@ -52491,7 +118840,7 @@ Marcel Dancak 	2014-06-03
 
     mapserver: added 'alias' property into feature attribute properties of GetProjectSettings response
 
-Merge: 9053d46 9e14b32
+Merge: 9053d46c20 9e14b32ad5
 Marcel Dancak 	2014-06-03
 
     Merge remote-tracking branch 'upstream/master'
@@ -52515,7 +118864,7 @@ Paolo 	2014-06-03
 
     Updated IT GUI translation
 
-Merge: 309f5d5 6209b97
+Merge: 309f5d5510 6209b9754a
 Marcel Dancak 	2014-06-03
 
     Merge remote-tracking branch 'upstream/master'
@@ -52555,7 +118904,7 @@ Juergen E. Fischer 	2014-06-02
 
     fix layer tree translation support
 
-Merge: 4d5d26a 510831b
+Merge: 4d5d26a980 510831b587
 Werner Macho 	2014-06-02
 
     Merge pull request #1418 from Cracert/i18n
@@ -52566,14 +118915,14 @@ Robert Szczepanek 	2014-06-02
 
     [TRANSUP] pl: WebView, WMS
 
-Merge: 7f21918 8c67cdf
+Merge: 7f21918e77 8c67cdf083
 Martin Dobias 	2014-06-02
 
     Merge pull request #1399 from giohappy/fix_osm_initspatialmetadata
 
     Fix #9693 (Make OSM DB metadata initialization in transaction)
 
-Merge: 4cf0486 7f21918
+Merge: 4cf0486915 7f21918e77
 Marcel Dancak 	2014-06-02
 
     Merge remote-tracking branch 'upstream/master'
@@ -52607,7 +118956,7 @@ Martin Dobias 	2014-05-30
 
     [layertree] minor consolidation of insert/remove functions
 
-Merge: 108cbc3 c095fe9
+Merge: 108cbc3b0d c095fe925d
 mhugent 	2014-06-02
 
     Merge pull request #1397 from manisandro/minmax_fixes
@@ -52626,14 +118975,14 @@ Nathan Woodrow 	2014-06-02
 
     Fix #10402 - Don't duplicate combo items on selection
 
-Merge: 79edbc2 8438ef4
+Merge: 79edbc29f5 8438ef4c54
 Werner Macho 	2014-06-01
 
     Merge pull request #1416 from Cracert/i18n
 
     [TRANSUP] pl: varia
 
-Merge: 779bf5f 7b192fc
+Merge: 779bf5fb33 7b192fc737
 volaya 	2014-06-01
 
     Merge pull request #1415 from fsdias/fixe_dotlplot2
@@ -52664,7 +119013,7 @@ Juergen E. Fischer 	2014-06-01
 
     set feature form windows title
 
-Merge: a516c36 183bfa5
+Merge: a516c36b91 183bfa5488
 Werner Macho 	2014-06-01
 
     Merge pull request #1413 from qgis-jp/pullreq_2_4
@@ -52712,7 +119061,7 @@ Werner Macho 	2014-06-01
 
     Signed-off-by: Werner Macho 
 
-Merge: 166f8fc bf99a74
+Merge: 166f8fc534 bf99a74600
 Tim Sutton 	2014-06-01
 
     Merge pull request #1412 from timlinux/master
@@ -52767,7 +119116,7 @@ Nathan Woodrow 	2014-05-31
 
     Fix #10405 - Don't resize expression area for label dialog.
 
-Merge: 6dd4346 0b8469a
+Merge: 6dd4346c48 0b8469aeb0
 Werner Macho 	2014-05-31
 
     Merge pull request #1411 from Cracert/i18n
@@ -52782,7 +119131,7 @@ Robert Szczepanek 	2014-05-30
 
     [TRANSUP] pl: varia
 
-Merge: ec79fa9 744a214
+Merge: ec79fa9a08 744a214ac9
 Werner Macho 	2014-05-30
 
     Merge pull request #1410 from Cracert/i18n
@@ -52809,13 +119158,13 @@ Martin Dobias 	2014-05-30
 
     [layertree] Rename childLayerIds() to findLayerIds()
 
-Merge: ecdb6de 83eec4a
+Merge: ecdb6debb3 83eec4ac46
 Martin Dobias 	2014-05-30
 
     Merge remote-tracking branch 'alvaro/Simplification_MTR'
 
     Conflicts:
-python/core/qgsmapsettings.sip
+            python/core/qgsmapsettings.sip
 
 Martin Dobias 	2014-05-30
 
@@ -52833,7 +119182,7 @@ Larry Shaffer 	2014-05-29
 
     #9480: Move checkbox to within centroid frame in labeling gui
 
-Merge: 34f3378 6cb4cbb
+Merge: 34f337816f 6cb4cbb1cc
 Larry Shaffer 	2014-05-29
 
     Merge pull request #1238 from ahuarte47/Issue_9480
@@ -52846,7 +119195,7 @@ Werner Macho 	2014-05-29
 
     Signed-off-by: Werner Macho 
 
-Merge: c661119 6c695cb
+Merge: c661119079 6c695cb3ca
 Werner Macho 	2014-05-29
 
     Merge pull request #1408 from Cracert/i18n
@@ -52869,7 +119218,7 @@ Etienne Tourigny 	2014-05-29
 
     make table view non-editable (#10376)
 
-Merge: e8d1af9 0ae53ae
+Merge: e8d1af955f 0ae53aed65
 Marcel Dancak 	2014-05-29
 
     Merge remote-tracking branch 'upstream/master'
@@ -52902,7 +119251,7 @@ Nyall Dawson 	2014-05-29
 
     Fix capitalisation of strings
 
-Merge: 872ed82 affc9a1
+Merge: 872ed828de affc9a16e8
 alexbruy 	2014-05-29
 
     Merge pull request #1404 from gioman/master
@@ -52913,14 +119262,14 @@ Matthias Kuhn 	2014-05-28
 
     Respect field editable state in attribute form
 
-Merge: 5b61d1f 0046a08
+Merge: 5b61d1febb 0046a08693
 Nathan Woodrow 	2014-05-29
 
     Merge pull request #1401 from slarosa/identify_nogeometry
 
     [identify] skip layer with no geometry
 
-Merge: 850a1ee d9b78bf
+Merge: 850a1eeebd d9b78bfa68
 Nyall Dawson 	2014-05-29
 
     Merge pull request #1394 from Oslandia/fix_atlas_signals
@@ -52935,7 +119284,7 @@ Juergen E. Fischer 	2014-05-29
 
     fix warnings
 
-Merge: c3ee668 21ae813
+Merge: c3ee668343 21ae813b9b
 Nyall Dawson 	2014-05-29
 
     Merge pull request #1402 from manisandro/zoom_icon
@@ -52946,7 +119295,7 @@ giohappy 	2014-05-28
 
     Check Sqlite version to switch metadata initialization parameter
 
-Merge: 18e1bd0 5d465fc
+Merge: 18e1bd05c7 5d465fc15a
 Werner Macho 	2014-05-28
 
     Merge pull request #1405 from Cracert/i18n
@@ -53020,7 +119369,7 @@ Juergen E. Fischer 	2014-05-27
 
     sip sync
 
-Merge: 37c1cad 80282f0
+Merge: 37c1cad11a 80282f01b0
 Werner Macho 	2014-05-27
 
     Merge pull request #1396 from Cracert/i18n
@@ -53150,7 +119499,7 @@ Juergen E. Fischer 	2014-05-26
 
     restore previous Qgs(App)LegendInterface behaviour
 
-Merge: 78525db 8bbb2aa
+Merge: 78525dbb7b 8bbb2aadd8
 Werner Macho 	2014-05-26
 
     Merge pull request #1390 from Cracert/i18n
@@ -53245,7 +119594,7 @@ Radim Blazek 	2014-05-26
 
     svg search path fix, fixes #8664
 
-Merge: 5e240b8 4243b0b
+Merge: 5e240b895b 4243b0bb38
 Denis Rouzaud 	2014-05-26
 
     Merge pull request #1387 from luca76/patch-1
@@ -53320,7 +119669,7 @@ Nathan Woodrow 	2014-05-25
 
     Reduce margins on field calc bar
 
-Merge: fc8f15a 10fd65a
+Merge: fc8f15a4e7 10fd65a010
 volaya 	2014-05-25
 
     Merge pull request #1385 from gioman/getshapeextent
@@ -53402,7 +119751,7 @@ Martin Dobias 	2014-05-24
 
     Fix SIP bindings
 
-Merge: 31bb269 7906154
+Merge: 31bb269059 79061547d4
 Martin Dobias 	2014-05-24
 
     Merge pull request #1380 from Oslandia/mask_renderer
@@ -53425,7 +119774,7 @@ Juergen E. Fischer 	2014-05-24
 
     fix edit widget deprecation warnings and sync sip bindings
 
-Merge: 42e480a df1482f
+Merge: 42e480ac91 df1482f0fe
 Werner Macho 	2014-05-23
 
     Merge pull request #1383 from Cracert/i18n
@@ -53470,7 +119819,7 @@ Larry Shaffer 	2014-05-22
 
     Move label repeat option frame to after main placement options for lines
 
-Merge: 59129c4 4768a8f
+Merge: 59129c4f1e 4768a8fdb6
 Denis Rouzaud 	2014-05-23
 
     Merge pull request #1344 from leyan/splitFeature
@@ -53493,14 +119842,14 @@ Werner Macho 	2014-05-23
 
     Signed-off-by: Werner Macho 
 
-Merge: be706ed a3b9d6c
+Merge: be706ed30c a3b9d6c131
 mhugent 	2014-05-23
 
     Merge pull request #1338 from manisandro/line_multi_labeling
 
     Line multi labeling
 
-Merge: 45d0a9c 82363f4
+Merge: 45d0a9cfca 82363f4fb1
 Nyall Dawson 	2014-05-23
 
     Merge pull request #1382 from Oslandia/atlas_predefined_patch
@@ -53586,7 +119935,7 @@ Daniel Vaz 	2013-07-18
 
     Fix #4417
 
-Merge: fab44c7 40f6d6f
+Merge: fab44c70bd 40f6d6f0a6
 Werner Macho 	2014-05-22
 
     Merge pull request #1381 from Cracert/i18n
@@ -53605,7 +119954,7 @@ Martin Dobias 	2014-05-23
 
     [layertree] Implement more flags for LayerTreeModel (reorder nodes, rename nodes)
 
-Merge: dac4cfc a4e974a
+Merge: dac4cfc2f4 a4e974a338
 Martin Dobias 	2014-05-22
 
     Merge pull request #1215 from etiennesky/mtr_maxcpus
@@ -53696,7 +120045,7 @@ Hugo Mercier 	2014-04-15
 
     Add a new 'mask' feature renderer that can be used to invert polygon fills
 
-Merge: d4b3993 7c0a484
+Merge: d4b3993120 7c0a484719
 Werner Macho 	2014-05-21
 
     Merge pull request #1378 from Cracert/i18n
@@ -53731,7 +120080,7 @@ Martin Dobias 	2014-05-22
 
     Add the missing SIP stub file
 
-Merge: 7f218c7 0b072e6
+Merge: 7f218c7295 0b072e6e83
 Martin Dobias 	2014-05-21
 
     [FEATURE] Merge of legend refactoring work
@@ -53743,7 +120092,7 @@ Martin Dobias 	2014-05-21
     - controlling of map canvas: QgsLayerTreeCanvasBridge
 
     Conflicts:
-src/ui/qgisapp.ui
+            src/ui/qgisapp.ui
 
 Martin Dobias 	2014-05-21
 
@@ -53819,12 +120168,12 @@ Nyall Dawson 	2014-05-22
 
     [FEATURE] Allow dragging and dropping colors from color buttons (also works with some other applications, eg dropping colors from GIMP or Gpick). Tweak color button context menu to remove extra options.
 
-Merge: 3180dee 8485b9c
+Merge: 3180dee4fa 8485b9ce6f
 Martin Dobias 	2014-05-21
 
     Merge remote-tracking branch 'denis/scalevisiblayers_newlegend' into legend-refactoring
 
-Merge: 5417639 5f12661
+Merge: 5417639285 5f12661d34
 Marco Hugentobler 	2014-05-21
 
     Merge branch 'server_value_relation'
@@ -53833,7 +120182,7 @@ Marco Hugentobler 	2014-05-21
 
     WMS server: Use ; as separator in case of multiple selection for value relations
 
-Merge: af7af6c b87049e
+Merge: af7af6c26a b87049e94c
 mhugent 	2014-05-21
 
     Merge pull request #1377 from luca76/master
@@ -54057,7 +120406,7 @@ Martin Dobias 	2014-05-05
 
     Initial import of legend refactoring work
 
-Merge: 6df9d1c ec3da40
+Merge: 6df9d1cb9a ec3da40d26
 Jürgen Fischer 	2014-05-21
 
     Merge pull request #1375 from nyalldawson/processing_postgis2
@@ -54134,7 +120483,7 @@ Matthias Kuhn 	2014-04-30
 
     VLCache takes ownership of index
 
-Merge: b385467 9d838c9
+Merge: b385467679 9d838c93cf
 Nyall Dawson 	2014-05-20
 
     Merge pull request #1362 from manisandro/composer_arrow_fill_bb
@@ -54165,7 +120514,7 @@ Nathan Woodrow 	2014-05-20
 
     Fix copy of extra python files
 
-Merge: 978086b 790b31e
+Merge: 978086badc 790b31ef80
 Jürgen Fischer 	2014-05-20
 
     Merge pull request #1373 from 3nids/package
@@ -54188,7 +120537,7 @@ Etienne Tourigny 	2014-05-19
 
     only handle context menu event if showing tree widget
 
-Merge: 592064b f69ed7d
+Merge: 592064b60a f69ed7d63e
 Nathan Woodrow 	2014-05-20
 
     Merge pull request #1371 from antoniolocandro/SVG-NORTH-ARROWS
@@ -54239,7 +120588,7 @@ Etienne Tourigny 	2014-04-05
 
     implement simple identify results table view
 
-Merge: f470570 23ada03
+Merge: f4705703f6 23ada03249
 Werner Macho 	2014-05-19
 
     Merge pull request #1372 from Cracert/i18n
@@ -54283,7 +120632,7 @@ Juergen E. Fischer 	2014-05-19
 
     fix customwidgets build on windows
 
-Merge: aa70851 0d3e5e4
+Merge: aa7085194d 0d3e5e4b07
 Giuseppe Sucameli 	2014-05-19
 
     Merge pull request #1348 from imincik/db_manager_connection_holding
@@ -54298,7 +120647,7 @@ Juergen E. Fischer 	2014-05-19
 
     debian packaging fix
 
-Merge: 2ff79d3 f9d7aef
+Merge: 2ff79d31c8 f9d7aef6ea
 Denis Rouzaud 	2014-05-19
 
     Merge pull request #1325 from 3nids/qtdesignerplugin
@@ -54319,7 +120668,7 @@ Werner Macho 	2014-05-18
 
     Signed-off-by: Werner Macho 
 
-Merge: 0791930 0f2b92f
+Merge: 07919309c4 0f2b92f941
 volaya 	2014-05-18
 
     Merge pull request #1365 from gioman/ogr2ogr
@@ -54358,7 +120707,7 @@ Nyall Dawson 	2014-05-18
 
     Add expression functions for bounding box (bounds), bounding box width & height (bounds_width/bounds_height), and min/max x/y coordinates (xmin/xmax/ymin/ymax)
 
-Merge: 29de200 e973470
+Merge: 29de20016a e97347051f
 Werner Macho 	2014-05-18
 
     Merge pull request #1364 from Cracert/i18n
@@ -54377,7 +120726,7 @@ Marco Hugentobler 	2014-05-18
 
     Fix getLegendGraphic
 
-Merge: bcfe0a8 90e4a5f
+Merge: bcfe0a8e10 90e4a5fd18
 Jürgen Fischer 	2014-05-17
 
     Merge pull request #1349 from imincik/db_manager_quoteid
@@ -54432,7 +120781,7 @@ Leyan 	2014-05-17
 
     restrict to node
 
-Merge: 16cc66a c2effbf
+Merge: 16cc66a48f c2effbfec5
 Werner Macho 	2014-05-16
 
     Merge pull request #1363 from Cracert/i18n
@@ -54451,7 +120800,7 @@ Etienne Tourigny 	2014-02-25
 
     add option to set max thread count
 
-Merge: 240c128 c7a4002
+Merge: 240c128cb7 c7a4002a92
 Tom Kralidis 	2014-05-16
 
     Merge pull request #1350 from geopython/MetaSearch-0.2.0
@@ -54541,35 +120890,35 @@ Nyall Dawson 	2014-05-16
 
     [composer] Fix crash with expression driven picture items
 
-Merge: 0f0a094 d99dd8e
+Merge: 0f0a0947ca d99dd8e0dd
 Denis Rouzaud 	2014-05-16
 
     Merge pull request #1353 from leyan/snapping_intersection
 
     Check snapping tolerance of both layers before validating intersection snapping
 
-Merge: 89cdfb9 62ed007
+Merge: 89cdfb982d 62ed007fd4
 Jürgen Fischer 	2014-05-16
 
     Merge pull request #1358 from manisandro/memcpy_overlapping
 
     Avoid memcpy on overlapping memory
 
-Merge: 2d749be ea3be5c
+Merge: 2d749be96f ea3be5c583
 Jürgen Fischer 	2014-05-16
 
     Merge pull request #1356 from manisandro/malloc_delete
 
     Fix malloc-ed memory freed by delete[]
 
-Merge: f9e4e78 c0fdfcf
+Merge: f9e4e78d89 c0fdfcf371
 Denis Rouzaud 	2014-05-16
 
     Merge pull request #1332 from leyan/deletePart
 
     Improve delete part feature for polygon
 
-Merge: ccc8192 4214508
+Merge: ccc819265a 42145082d8
 Paolo Cavallini 	2014-05-16
 
     Merge pull request #1361 from lucalanteri/patch-2
@@ -54580,7 +120929,7 @@ lucalanteri 	2014-05-16
 
     Update inversedistanceweighted.rst
 
-Merge: 4ded629 fbc161d
+Merge: 4ded6295f1 fbc161d727
 Werner Macho 	2014-05-16
 
     Merge pull request #1359 from Cracert/i18n
@@ -54603,7 +120952,7 @@ Sandro Mani 	2014-05-15
 
     Avoid memcpy on overlapping memory
 
-Merge: 6a6cc19 5554ab6
+Merge: 6a6cc194d9 5554ab6179
 Werner Macho 	2014-05-15
 
     Merge pull request #1357 from tomass/master
@@ -54699,7 +121048,7 @@ Sandro Mani 	2014-04-07
 
     [composer] Don't consider removed items in z list
 
-Merge: dc905ac f9dcc37
+Merge: dc905accac f9dcc37138
 Denis Rouzaud 	2014-05-15
 
     Merge pull request #1352 from 3nids/datadefined2
@@ -54736,7 +121085,7 @@ Nyall Dawson 	2014-05-15
 
     [composer] Allow for finer control over text rendered with QgsComposerItem::drawText, fixes clipped text when using italic fonts in legend titles
 
-Merge: 9804d17 42203b7
+Merge: 9804d17006 42203b775e
 Radim Blazek 	2014-05-14
 
     Merge pull request #1335 from manisandro/apply_settings_when_saving_style
@@ -54751,12 +121100,12 @@ Tom Kralidis 	2014-05-13
 
     add MetaSearch 0.2.0 (https://github.com/geopython/MetaSearch/issues/53)
 
-Merge: 436973d 8707cf2
+Merge: 436973dc03 8707cf2f37
 Marco Hugentobler 	2014-05-13
 
     [FEATURE]: Server logging also in release mode
 
-Merge: 1ed94d0 06738d4
+Merge: 1ed94d01f7 06738d4971
 mhugent 	2014-05-13
 
     Merge pull request #1337 from Oslandia/test_qgis_mapserver
@@ -54919,7 +121268,7 @@ Juergen E. Fischer 	2014-05-09
 
     allow setting geometry empty in postgres and spatialite provider (applies PR#1343)
 
-Merge: e138c2e e21d151
+Merge: e138c2e94d e21d151b11
 Paolo Cavallini 	2014-05-09
 
     Merge pull request #1341 from lucalanteri/patch-1
@@ -54934,7 +121283,7 @@ lucalanteri 	2014-05-08
 
     Update convergenceindex.rst
 
-Merge: add7040 21249c3
+Merge: add7040a2f 21249c3ce6
 mhugent 	2014-05-08
 
     Merge pull request #1340 from manisandro/fix-10205
@@ -54961,14 +121310,14 @@ Larry Shaffer 	2014-05-07
 
     Move OpenFileGDB to alphabetical placement
 
-Merge: 0c6056b 3f48ec9
+Merge: 0c6056be5b 3f48ec9322
 Jürgen Fischer 	2014-05-07
 
     Merge pull request #1249 from Oslandia/expose_simplifier
 
     Expose QgsMapToPixelSimplifier to Python
 
-Merge: 0a82f37 ddecf7e
+Merge: 0a82f37e92 ddecf7e94e
 Juergen E. Fischer 	2014-05-07
 
     Manually merge PR #1290 (fixes #9861)
@@ -54997,7 +121346,7 @@ Sandro Mani 	2014-04-17
 
     Add line multi-labelling support to pal
 
-Merge: 620220d 53ac675
+Merge: 620220dd16 53ac67517a
 mhugent 	2014-05-07
 
     Merge pull request #1320 from manisandro/minmax
@@ -55020,7 +121369,7 @@ Nyall Dawson 	2014-05-07
 
     [FEATURE][composer] Add button to create new frame when using composer items in Use Existing Frames mode
 
-Merge: 26e98f7 2f2982f
+Merge: 26e98f7f0a 2f2982f6e2
 alexbruy 	2014-05-07
 
     Merge pull request #1328 from m-kuhn/httplib2
@@ -55047,14 +121396,14 @@ Markus Neteler 	2014-04-01
 
     Fixed some parameter names: dot is underscore
 
-Merge: c64c89e bb93600
+Merge: c64c89e7dd bb93600607
 alexbruy 	2014-05-07
 
     Merge pull request #1333 from p0cisk/ConcaveHull
 
     [Processing][Feature] Add Concave Hull algorithm
 
-Merge: 35516fd 7689bf1
+Merge: 35516fd344 7689bf1977
 mhugent 	2014-05-07
 
     Merge pull request #1155 from to-kr/master
@@ -55219,7 +121568,7 @@ borys 	2014-05-03
 
     [Plugin Manager] support multiline breaks in the about tag
 
-Merge: a096cf4 1dc8dd5
+Merge: a096cf45e4 1dc8dd5d58
 Martin Dobias 	2014-05-03
 
     Merge pull request #1334 from simonsonc/qrect-united
@@ -55263,7 +121612,7 @@ Juergen E. Fischer 	2014-05-02
 
     labeling: 'show' empty string instead of configured representation for NULL (party reverts e497a5c; refs #9998; fixes #10151)
 
-Merge: 1f20630 71727ac
+Merge: 1f20630ec5 71727ac381
 Denis Rouzaud 	2014-05-02
 
     Merge pull request #1318 from 3nids/fieldexpressionmodel
@@ -55340,7 +121689,7 @@ Nyall Dawson 	2014-05-01
 
     [composer] Make html items more aggresive in choosing page break locations
 
-Merge: 6f1b875 a66893d
+Merge: 6f1b875aec a66893d5da
 Nyall Dawson 	2014-05-01
 
     Merge pull request #1312 from manisandro/composer_manager_nonmodal
@@ -55405,7 +121754,7 @@ Martin Dobias 	2014-04-28
     the singleton got initialized twice. Now the singleton is handled
     as a static function variable which should be initialized in thread-safe way.
 
-Merge: 7581370 02e46e8
+Merge: 7581370b35 02e46e89a4
 Denis Rouzaud 	2014-04-28
 
     Merge pull request #1317 from 3nids/addtoolbar
@@ -55532,14 +121881,14 @@ Nyall Dawson 	2014-04-28
 
     [composer] Rename getHeaderLabels to headerLabels and make it public for composer text/attribute tables.
 
-Merge: 73b2b86 dfb84e1
+Merge: 73b2b86f6a dfb84e136d
 Jürgen Fischer 	2014-04-28
 
     Merge pull request #1326 from saberraz/master
 
     Changed the link to commercial support page default to EN.
 
-Merge: 4c2819c dfc077b
+Merge: 4c2819c99d dfc077b51f
 Denis Rouzaud 	2014-04-28
 
     Merge pull request #1302 from manisandro/remove_layer_from_LayerSnappingList
@@ -55568,7 +121917,7 @@ Nyall Dawson 	2014-04-27
 
     [composer] Recalculate table size when margin or grid width changes
 
-Merge: 23900ba ca75fed
+Merge: 23900ba55d ca75fedd4b
 Werner Macho 	2014-04-27
 
     Merge pull request #1329 from Cracert/i18n
@@ -55677,7 +122026,7 @@ Nathan Woodrow 	2014-04-23
 
     Remove identify mode and auto open from options from options from dialog
 
-Merge: 5e0b5fe a4133ce
+Merge: 5e0b5fe7d9 a4133cee2e
 Werner Macho 	2014-04-23
 
     Merge pull request #1324 from thodorisvakkas/master
@@ -55726,7 +122075,7 @@ Juergen E. Fischer 	2014-04-22
 
     Add Marco Lechner to CONTRIBUTORS
 
-Merge: 2f47bba d6535a8
+Merge: 2f47bbace8 d6535a82ba
 Marco Hugentobler 	2014-04-22
 
     Merge branch 'server_legend_url'
@@ -55807,7 +122156,7 @@ Marco Hugentobler 	2014-04-20
 
     Fix compile error after merge
 
-Merge: 25676f3 f132b43
+Merge: 25676f3cf5 f132b4307b
 mhugent 	2014-04-20
 
     Merge pull request #1296 from mhugent/server_cleanup
@@ -55989,7 +122338,7 @@ Etienne Tourigny 	2014-04-16
 
     fix raster cumulative cut for byte bands (#9793) and make sure values are rounded down/up for integer bands
 
-Merge: a70a18d 7399789
+Merge: a70a18d39b 7399789f85
 Etienne Tourigny 	2014-04-16
 
     Merge pull request #1213 from etiennesky/histogram_bars
@@ -56002,7 +122351,7 @@ Werner Macho 	2014-04-17
 
     Signed-off-by: Werner Macho 
 
-Merge: 122034a 3461afc
+Merge: 122034a07a 3461afc6b7
 volaya 	2014-04-16
 
     Merge pull request #1284 from gioman/r_cost
@@ -56027,7 +122376,7 @@ Werner Macho 	2014-04-16
 
     Signed-off-by: Werner Macho 
 
-Merge: 10f9f55 a98df93
+Merge: 10f9f55886 a98df93a0d
 mhugent 	2014-04-16
 
     Merge pull request #1266 from rldhont/provider_wfs_authorization
@@ -56123,7 +122472,7 @@ Nathan Woodrow 	2014-04-13
 
     Use message bar for old project message
 
-Merge: e87a7b8 e214741
+Merge: e87a7b84fd e214741c62
 Nyall Dawson 	2014-04-13
 
     Merge pull request #1300 from manisandro/fix_composer_arrow_bbox
@@ -56170,14 +122519,14 @@ Werner Macho 	2014-04-10
 
     Signed-off-by: Werner Macho 
 
-Merge: a1f1b94 d2dce59
+Merge: a1f1b94af4 d2dce59cf0
 Jürgen Fischer 	2014-04-10
 
     Merge pull request #1314 from manisandro/network_timeout
 
     Restart timeout timer when data is received in QgsNetworkAccessManager
 
-Merge: 5f19830 25915d7
+Merge: 5f19830d9e 25915d7891
 mhugent 	2014-04-10
 
     Merge pull request #1305 from manisandro/save_on_new_from_template
@@ -56215,7 +122564,7 @@ Nyall Dawson 	2014-04-09
 
     This reverts commit a901ee119e4b5433765042d3d7b21f12d3ef6bfd.
 
-Merge: bbf68bf a901ee1
+Merge: bbf68bff2b a901ee119e
 Nyall Dawson 	2014-04-09
 
     Merge pull request #1298 from manisandro/composer_window_modal
@@ -56243,7 +122592,7 @@ Sandro Mani 	2014-04-06
      tolerance, make the treeview columns adjust better to the size of the
      contents
 
-Merge: 00b1f2c ff18324
+Merge: 00b1f2c172 ff18324584
 Denis Rouzaud 	2014-04-08
 
     Merge pull request #1260 from leyan/snapping_priority_2
@@ -56280,7 +122629,7 @@ Sandro Mani 	2014-04-06
 
     Make QgsComposer window WindowModal
 
-Merge: d60e7dc c108d02
+Merge: d60e7dc4ff c108d029ac
 Werner Macho 	2014-04-08
 
     Merge pull request #1295 from Cracert/i18n
@@ -56299,15 +122648,15 @@ Marco Hugentobler 	2014-04-07
 
     Cleanup config cache
 
-Merge: d60e7dc 9de505d
+Merge: d60e7dc4ff 9de505d51d
 Marcel Dancak 	2014-04-07
 
     Merge remote-tracking branch 'origin/master'
 
     Conflicts:
-src/mapserver/qgswmsserver.cpp
+            src/mapserver/qgswmsserver.cpp
 
-Merge: 3e4b568 1399c6e
+Merge: 3e4b5684eb 1399c6ed07
 mhugent 	2014-04-07
 
     Merge pull request #1292 from anitagraser/master
@@ -56376,7 +122725,7 @@ Marco Hugentobler 	2014-04-04
 
     Re-enabled WCS server
 
-Merge: a43bd62 a95fedb
+Merge: a43bd626af a95fedbbf0
 Martin Dobias 	2014-04-04
 
     Merge remote-tracking branch 'denis/layerfieldmodel'
@@ -56427,7 +122776,7 @@ Nyall Dawson 	2014-03-17
 
     Expose outline join style as a parameter for simple fill symbol type
 
-Merge: b9a539e 8679c6d
+Merge: b9a539ece4 8679c6dd95
 Martin Dobias 	2014-04-03
 
     Merge pull request #1291 from simonsonc/qtgui-include
@@ -56461,14 +122810,14 @@ Marco Hugentobler 	2014-04-02
 
     Re-enable GetCapabilities in WFS server
 
-Merge: bc40ab6 29c8bc5
+Merge: bc40ab69c9 29c8bc5375
 Martin Dobias 	2014-04-02
 
     Merge pull request #1287 from simonsonc/reset-model
 
     Use begin/endResetModel instead of reset
 
-Merge: 2b3108f 6ebd9a8
+Merge: 2b3108f9ae 6ebd9a8b10
 Etienne Tourigny 	2014-04-01
 
     Merge pull request #1288 from simonsonc/qvariant-qcolor
@@ -56506,7 +122855,7 @@ Marco Hugentobler 	2014-04-01
 
     Delete sld parser for sent sld after request
 
-Merge: 9eb4bb6 3b198d9
+Merge: 9eb4bb6b5b 3b198d9000
 Borys Jurgiel 	2014-04-01
 
     Merge branch 'pluginmanager_votes'
@@ -56533,7 +122882,7 @@ Martin Dobias 	2014-04-01
 
     Otherwise drawing of huge amount of lines/markers can lock GUI
 
-Merge: b60794e d969fb3
+Merge: b60794e0d1 d969fb385c
 Martin Dobias 	2014-04-01
 
     Merge pull request #1283 from simonsonc/rename-accept-hover-events
@@ -56555,7 +122904,7 @@ Martin Dobias 	2014-03-31
 
     Fix #9923 (broken arrow symbol)
 
-Merge: 6852f9e 72457b3
+Merge: 6852f9e3c0 72457b331f
 volaya 	2014-03-31
 
     Merge pull request #1279 from pka/grass7
@@ -56578,21 +122927,21 @@ Alexander Bruy 	2014-03-31
 
     [processing] handle same memory error in another algorithm
 
-Merge: a191d5b 9ef91a2
+Merge: a191d5bcb6 9ef91a222c
 alexbruy 	2014-03-31
 
     Merge pull request #1280 from anitagraser/patch-1
 
     [processing] added error handling for too big rasters
 
-Merge: 3aedeff 45ac9f9
+Merge: 3aedeff087 45ac9f9340
 Werner Macho 	2014-03-31
 
     Merge pull request #1281 from marcelosoaressouza/translation_pt_BR
 
     New Translations to pt_BR
 
-Merge: 04d7169 3e3f30a
+Merge: 04d7169e0e 3e3f30a304
 Martin Dobias 	2014-03-31
 
     Merge pull request #1277 from simonsonc/mime-format
@@ -56615,7 +122964,7 @@ Werner Macho 	2014-03-31
 
     Signed-off-by: Werner Macho 
 
-Merge: 528d70f abc7b9b
+Merge: 528d70fbc6 abc7b9b807
 mhugent 	2014-03-31
 
     Merge pull request #1267 from mwa/fix_8298_crs_select
@@ -56679,14 +123028,14 @@ Radim Blazek 	2014-03-28
 
     missing python plugins menu/actions objectName
 
-Merge: c324895 7b7ffb2
+Merge: c324895cc1 7b7ffb2784
 Martin Dobias 	2014-03-28
 
     Merge pull request #1276 from anitagraser/master
 
     new master splash from #viennacodesprint14
 
-Merge: a82aeb0 3d44c59
+Merge: a82aeb030c 3d44c5934a
 Jürgen Fischer 	2014-03-28
 
     Merge pull request #1275 from sebastic/arm
@@ -56705,7 +123054,7 @@ Alexander Bruy 	2014-03-28
 
     [processing] don't close dialog if execution fails (fix #9893)
 
-Merge: 2b458e8 8dff030
+Merge: 2b458e8895 8dff030787
 Martin Dobias 	2014-03-28
 
     Merge pull request #1274 from simonsonc/explicit-link
@@ -56724,7 +123073,7 @@ Alexander Bruy 	2014-03-28
 
     add option to load result to canvas in Heatmap plugin (fix #6645)
 
-Merge: 9bf96cb 1bcd154
+Merge: 9bf96cbc3e 1bcd154709
 Martin Dobias 	2014-03-28
 
     Merge remote-tracking branch 'simonsonc/rename-subtract'
@@ -56819,7 +123168,7 @@ Alexander Bruy 	2014-03-26
 
     assign CRS to interpolation output (fix #3578)
 
-Merge: 3dfacc7 7710882
+Merge: 3dfacc77bc 77108827e9
 Etienne Tourigny 	2014-03-27
 
     Merge pull request #1269 from etiennesky/rldhont-netcdf_generateBandName
@@ -56877,7 +123226,7 @@ Juergen E. Fischer 	2014-03-26
 
     avoid warning messages on composer arrows without markers
 
-Merge: 48b9ccb 013f9e9
+Merge: 48b9ccbc69 013f9e96a2
 Jürgen Fischer 	2014-03-27
 
     Merge pull request #1265 from nyalldawson/postgis_time
@@ -56888,7 +123237,7 @@ Alexander Bruy 	2014-03-26
 
     [ftools] use int column for point count (fix #9432)
 
-Merge: 3d6f17b 9aab894
+Merge: 3d6f17b067 9aab894f58
 mhugent 	2014-03-26
 
     Merge pull request #1264 from olivierdalang/fix_9334
@@ -56916,7 +123265,7 @@ Martin Dobias 	2014-03-26
 
     Fix symbol's size/width not being updated in GUI on load
 
-Merge: 05ce120 6703126
+Merge: 05ce12062c 6703126af0
 Werner Macho 	2014-03-26
 
     Merge pull request #1268 from milenanv/qgis_trans_pl
@@ -56928,14 +123277,14 @@ Alexander Bruy 	2014-03-26
     [processing] show confirmation when closing modeler with unsaved model
     (fix #9889)
 
-Merge: d0c93b9 690e7b0
+Merge: d0c93b94b2 690e7b096d
 Martin Dobias 	2014-03-26
 
     Merge pull request #1245 from simonsonc/remove-qtgui
 
     Remove include of QtGui in favor of individual includes
 
-Merge: 9445c9a 3e0e0ed
+Merge: 9445c9af53 3e0e0edec7
 Martin Dobias 	2014-03-26
 
     Merge pull request #1244 from simonsonc/qt-no-deprecated
@@ -56974,7 +123323,7 @@ Mathias Walker 	2014-03-26
 
     fix #8298 ignored first selection of recently used CRS in projection selector
 
-Merge: a93bef4 be8ae5f
+Merge: a93bef43d3 be8ae5fbfb
 volaya 	2014-03-26
 
     Merge pull request #1235 from m-kuhn/httplib
@@ -56999,7 +123348,7 @@ Nathan Woodrow 	2014-03-26
 
     [MSSQL] Close database and delete query on close
 
-Merge: 20933de 1911232
+Merge: 20933dedd9 1911232361
 Nathan Woodrow 	2014-03-26
 
     Merge remote-tracking branch 'tamas/master'
@@ -57050,35 +123399,35 @@ Milena Nowotarska 	2014-03-25
 
     translation update pl
 
-Merge: e2d01e2 7abca16
+Merge: e2d01e2e15 7abca16d05
 volaya 	2014-03-25
 
     Merge pull request #1134 from CS-SI/otb_processing_update
 
     OTB processing update
 
-Merge: ec0c820 90fa359
+Merge: ec0c820a81 90fa359fb7
 volaya 	2014-03-25
 
     Merge pull request #970 from snorfalorpagus/spatialjoin
 
     Ported "Join attributes by location" from fTools to Processing
 
-Merge: 44a054d af55e98
+Merge: 44a054dfa5 af55e98a45
 volaya 	2014-03-25
 
     Merge pull request #1052 from Oslandia/processing_gui_set_values
 
     [processing] set droplists if parameter values are already set
 
-Merge: 839c3e7 748d261
+Merge: 839c3e7560 748d261d21
 Jürgen Fischer 	2014-03-25
 
     Merge pull request #1262 from nyalldawson/processing_postgis
 
     Improvements to processing "Import into PostGIS" algorithm
 
-Merge: 3374095 cef3018
+Merge: 33740957d4 cef3018cd6
 Werner Macho 	2014-03-25
 
     Merge pull request #1263 from Qgis-Tr-kr/master
@@ -57102,7 +123451,7 @@ Alexander Bruy 	2014-03-25
 
     [processing] add feature count to Statistics by categories output (fix #9871)
 
-Merge: af9da1d bb9c989
+Merge: af9da1deb4 bb9c9893fd
 alexbruy 	2014-03-25
 
     Merge pull request #1076 from snorfalorpagus/processing_intersection_fix
@@ -57129,14 +123478,14 @@ Marco Hugentobler 	2014-03-25
 
     Clean up code in qgis_map_serv.cpp
 
-Merge: db235c8 02822d4
+Merge: db235c896f 02822d4945
 volaya 	2014-03-25
 
     Merge pull request #1149 from p0cisk/master
 
     [processing]Fix "float division by zero" in polygonize algorithm if no
 
-Merge: f29d44e bd50701
+Merge: f29d44e759 bd50701361
 volaya 	2014-03-25
 
     Merge pull request #1239 from bstroebl/eliminateSmallest
@@ -57259,14 +123608,14 @@ Richard Duivenvoorde 	2014-03-23
 
     Signed-off-by: Juergen E. Fischer 
 
-Merge: e392efa c44b091
+Merge: e392efab15 c44b091bc5
 Jürgen Fischer 	2014-03-22
 
     Merge pull request #1221 from luipir/spatialite-savestyle
 
     added saveStyle capability to Spatialite Provider - Developed for ARPA Piemonte (Dipartimento Tematico Geologia e Dissesto)
 
-Merge: 10ede56 d25f85d
+Merge: 10ede56e64 d25f85d289
 Jürgen Fischer 	2014-03-22
 
     Merge pull request #1138 from slarosa/hold_dialog_db_conn
@@ -57283,7 +123632,7 @@ Werner Macho 	2014-03-22
 
     Signed-off-by: Werner Macho 
 
-Merge: 942d5da fed204b
+Merge: 942d5da59b fed204bd84
 Werner Macho 	2014-03-22
 
     Merge pull request #1259 from thodorisvakkas/master
@@ -57316,7 +123665,7 @@ Denis Rouzaud 	2014-03-21
 
     better naming for messageEmitted/Discarded in maptools, followup 5bc5fdb 59a6663 and 6609ca8
 
-Merge: 375e0d4 7805bc0
+Merge: 375e0d40ed 7805bc0555
 Nyall Dawson 	2014-03-21
 
     Merge pull request #1255 from Oslandia/atlas_signals
@@ -57379,7 +123728,7 @@ Werner Macho 	2014-03-19
 
     Signed-off-by: Werner Macho 
 
-Merge: 6609ca8 f9ee716
+Merge: 6609ca81d2 f9ee716926
 Werner Macho 	2014-03-19
 
     Merge pull request #1256 from thodorisvakkas/master
@@ -57426,21 +123775,21 @@ Denis Rouzaud 	2014-03-18
 
     [joins] display if memory cache is used in layer properties dialog
 
-Merge: ef3189e f61f250
+Merge: ef3189e856 f61f250c5d
 mhugent 	2014-03-18
 
     Merge pull request #1250 from giohappy/master
 
     Add ILIKE filter and % character to safe tokens
 
-Merge: cbf755f 88c8ea2
+Merge: cbf755ff36 88c8ea2603
 Werner Macho 	2014-03-18
 
     Merge pull request #1251 from simogeo/master
 
     translation and typo fixes
 
-Merge: bd9bca9 a606799
+Merge: bd9bca97af a6067993a9
 pcav 	2014-03-18
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -57463,7 +123812,7 @@ giohappy 	2014-03-18
 
     Add ILIKE filter and % character to safe tokens
 
-Merge: f337dd3 8467d9f
+Merge: f337dd35c8 8467d9fba3
 Werner Macho 	2014-03-18
 
     Merge pull request #1247 from Cracert/i18n
@@ -57482,14 +123831,14 @@ thodoris.vakkas 	2014-03-18
 
     el_trans2014031801
 
-Merge: 1a669dc f755781
+Merge: 1a669dc024 f755781cff
 alexbruy 	2014-03-17
 
     Merge pull request #1242 from p0cisk/roadgraph
 
     Fix displaying line layers in Road Graph settings (fix #9780)
 
-Merge: 1c0d5e2 b7b1931
+Merge: 1c0d5e2f21 b7b1931ef6
 Denis Rouzaud 	2014-03-17
 
     Merge pull request #1127 from 3nids/fix8873
@@ -57616,14 +123965,14 @@ Paolo 	2014-03-13
 
     Minor fix to IT translation
 
-Merge: e5597e2 a3dc722
+Merge: e5597e26aa a3dc722e5a
 Werner Macho 	2014-03-13
 
     Merge pull request #1237 from simogeo/master
 
     translation and typo fixes
 
-Merge: 551648f ed5f778
+Merge: 551648f3a6 ed5f7781ba
 alexbruy 	2014-03-13
 
     Merge pull request #1236 from aharfoot/master
@@ -57701,7 +124050,7 @@ Werner Macho 	2014-03-10
 
     Signed-off-by: Werner Macho 
 
-Merge: 60e1a9b 073dbf1
+Merge: 60e1a9b721 073dbf1748
 Larry Shaffer 	2014-03-10
 
     Merge pull request #1230 from dakcarto/issue_9704_gdal-qsettings
@@ -57728,7 +124077,7 @@ Marcel Dancak 	2014-03-06
 
     Mapserver: fixed inconsistencies int WMS GetFeatureInfo response
 
-Merge: 637359a 10ddb02
+Merge: 637359aefc 10ddb027fd
 Werner Macho 	2014-03-09
 
     Merge pull request #1231 from Cracert/i18n
@@ -57747,14 +124096,14 @@ Juergen E. Fischer 	2014-03-08
 
     add menu option to reset to ui defaults (implements #9746)
 
-Merge: a089cff 04f70240
+Merge: a089cff5f7 04f702408e
 Larry Shaffer 	2014-03-07
 
     Merge pull request #1219 from ahuarte47/Issue_9655-1
 
     Fix bug #9655: some polygons not labelled when layer's simplification is on
 
-Merge: 9745dea 0e90729
+Merge: 9745deae94 0e907298de
 alexbruy 	2014-03-07
 
     Merge pull request #1217 from nirvn/ftool_random_points_fix
@@ -57839,7 +124188,7 @@ Werner Macho 	2014-03-05
 
     Signed-off-by: Werner Macho 
 
-Merge: 8a9cc23 d59d191
+Merge: 8a9cc23ead d59d191d39
 Jürgen Fischer 	2014-03-05
 
     Merge pull request #1225 from rduivenvoorde/docurlfix
@@ -57850,7 +124199,7 @@ Richard Duivenvoorde 	2014-03-05
 
     no html in the url anymore
 
-Merge: 08965ed 71c5396
+Merge: 08965ed2f0 71c5396344
 Paolo Cavallini 	2014-03-05
 
     Merge pull request #1224 from ghtmtt/master
@@ -57861,7 +124210,7 @@ ma7730 	2014-03-05
 
     small changes in italian translations
 
-Merge: 837642b 25241b8
+Merge: 837642b782 25241b865f
 Nathan Woodrow 	2014-03-05
 
     Merge pull request #1223 from nirvn/messagebar_auto_crs
@@ -57876,7 +124225,7 @@ Mathieu Pellerin (nirvn) 	2014-03-05
 
     push a message bar informing user of crs applied to newly added layer missing crs
 
-Merge: 2846857 99d030d
+Merge: 284685715b 99d030d675
 Jürgen Fischer 	2014-03-04
 
     Merge pull request #1222 from nyalldawson/wms_layer_speed
@@ -57900,7 +124249,7 @@ Marco Hugentobler 	2014-03-04
 
     WMS Server: show native type in GetProjectSettings
 
-Merge: 86ea4bf a7cb2b2
+Merge: 86ea4bf39a a7cb2b27b5
 Nathan Woodrow 	2014-03-05
 
     Merge pull request #1208 from nirvn/expression_wordwrap3
@@ -57947,14 +124296,14 @@ Juergen E. Fischer 	2014-03-03
 
     wm(t)s json identify: allow geometryless feature info
 
-Merge: 2f2d6ac 02c0d58
+Merge: 2f2d6ac95b 02c0d58243
 Jürgen Fischer 	2014-03-03
 
     Merge pull request #1199 from simonsonc/cmake-cleanup-dups
 
     Remove duplicate entries from CMake build files
 
-Merge: bb7cd40 9c5c065
+Merge: bb7cd4053a 9c5c0650b1
 Jürgen Fischer 	2014-03-03
 
     Merge pull request #1120 from 3nids/pasteconvertgeom
@@ -57969,7 +124318,7 @@ Denis Rouzaud 	2014-03-03
 
     do not convert multiline to multipolygon if one of the part failed, also consider case of 3 vertices line with first and last vertex identical
 
-Merge: 4a3ad4b 540685a
+Merge: 4a3ad4b997 540685a2f5
 Martin Dobias 	2014-03-03
 
     Merge pull request #1205 from ahuarte47/Issue_9485
@@ -58178,7 +124527,7 @@ Martin Dobias 	2014-02-26
 
     Fix #9648 (wrong scale in composer)
 
-Merge: 2d21b67 f66c461
+Merge: 2d21b674fa f66c4614c3
 Denis Rouzaud 	2014-02-26
 
     Merge pull request #1172 from leyan/multiple_snapping
@@ -58235,7 +124584,7 @@ Werner Macho 	2014-02-25
 
     Signed-off-by: Werner Macho 
 
-Merge: 48c1b57 76c3998
+Merge: 48c1b57664 76c39984cd
 Jürgen Fischer 	2014-02-25
 
     Merge pull request #1216 from minorua/georef_bad_alloc
@@ -58262,7 +124611,7 @@ Martin Dobias 	2014-02-25
 
     Fix #9641 (broken contrast enhancement)
 
-Merge: 881b1cc 9021b37
+Merge: 881b1cc0ca 9021b37f84
 Denis Rouzaud 	2014-02-25
 
     Merge pull request #1128 from 3nids/removesnapsegment
@@ -58320,7 +124669,7 @@ Juergen E. Fischer 	2014-02-24
 
     oracle provider: replace rownum=0 with 1=0 to retrieve columns (fixes #9633)
 
-Merge: 91ecc5f f7a47d5
+Merge: 91ecc5f31b f7a47d5274
 Werner Macho 	2014-02-24
 
     Merge pull request #1214 from Cracert/i18n
@@ -58382,19 +124731,19 @@ Martin Dobias 	2014-02-23
 
     Quick fix after MTR merge
 
-Merge: 5a4f8d0 f9e0093
+Merge: 5a4f8d07a0 f9e0093ce7
 Martin Dobias 	2014-02-23
 
     Merge remote-tracking branch 'origin/master' into threading-revival
 
     Conflicts:
-src/core/qgspallabeling.cpp
-src/core/qgsrenderchecker.h
-src/core/qgsvectorlayer.cpp
-src/core/symbology-ng/qgslinesymbollayerv2.cpp
-src/core/symbology-ng/qgssymbollayerv2.cpp
-src/providers/wms/qgswmsdataitems.cpp
-tests/src/core/testqgsblendmodes.cpp
+            src/core/qgspallabeling.cpp
+            src/core/qgsrenderchecker.h
+            src/core/qgsvectorlayer.cpp
+            src/core/symbology-ng/qgslinesymbollayerv2.cpp
+            src/core/symbology-ng/qgssymbollayerv2.cpp
+            src/providers/wms/qgswmsdataitems.cpp
+            tests/src/core/testqgsblendmodes.cpp
 
 Matthias Kuhn 	2014-02-23
 
@@ -58420,14 +124769,14 @@ Etienne Tourigny 	2014-02-22
 
     browser dock search: add normal syntax (with wildcards at begin and end) and case insensitive search, both default (implements #9493)
 
-Merge: 3f20928 a582a4d
+Merge: 3f209281a9 a582a4da23
 Werner Macho 	2014-02-22
 
     Merge pull request #1211 from SrNetoChan/master
 
     pt_PT GUI Translations
 
-Merge: 0dc0483 60bbc08
+Merge: 0dc0483ca2 60bbc082f2
 Werner Macho 	2014-02-22
 
     Merge pull request #1212 from Cracert/master
@@ -58555,14 +124904,14 @@ Werner Macho 	2014-02-21
 
     Signed-off-by: Werner Macho 
 
-Merge: 3f5e883 7d8f151
+Merge: 3f5e8835ec 7d8f151d28
 Werner Macho 	2014-02-21
 
     Merge pull request #1209 from SrNetoChan/master
 
     pt_PT GUI translations by Nelson Silva
 
-Merge: 98401dc ddc0f87
+Merge: 98401dc066 ddc0f87f3e
 mhugent 	2014-02-21
 
     Merge pull request #1210 from marcel-dancak/master
@@ -58623,14 +124972,14 @@ Paolo 	2014-02-21
 
     Minor improvements to IT translation, for consistency
 
-Merge: ba2b61c d6b0095
+Merge: ba2b61cdb0 d6b009562f
 Jürgen Fischer 	2014-02-21
 
     Merge pull request #1203 from ahuarte47/Issue_9610
 
     Displacement point: tolerance not saved in project (fixes #9610)
 
-Merge: da1ebc2 27dccee
+Merge: da1ebc2693 27dccee80b
 Werner Macho 	2014-02-21
 
     Merge pull request #1206 from Cracert/i18n
@@ -58665,7 +125014,7 @@ Werner Macho 	2014-02-21
 
     [TRANSUP] ko by BJ
 
-Merge: a4d2767 7b11b76
+Merge: a4d2767d49 7b11b76dbe
 Werner Macho 	2014-02-21
 
     Merge pull request #1204 from Jean-Roc/traduction_ui
@@ -58731,7 +125080,7 @@ ahuarte47 	2014-01-15
 
     #9060: fix bad ellipsoid selection from srs
 
-Merge: 35791aa 325697d
+Merge: 35791aacd6 325697dd4b
 mhugent 	2014-02-20
 
     Merge pull request #1201 from marcel-dancak/master
@@ -58758,14 +125107,14 @@ Werner Macho 	2014-02-20
 
     Signed-off-by: Werner Macho 
 
-Merge: 4483300 45a95b1
+Merge: 448330021e 45a95b138f
 Werner Macho 	2014-02-20
 
     Merge pull request #1200 from peterisb/master
 
     Latvian translation update
 
-Merge: 469f79b 4483300
+Merge: 469f79b0d0 448330021e
 peterisb 	2014-02-20
 
     Merge remote-tracking branch 'upstream/master'
@@ -58788,7 +125137,7 @@ Werner Macho 	2014-02-20
 
     Signed-off-by: Werner Macho 
 
-Merge: 7d263be 8155e38
+Merge: 7d263be7aa 8155e38152
 Werner Macho 	2014-02-20
 
     Merge pull request #1198 from Cracert/i18n
@@ -58900,7 +125249,7 @@ Werner Macho 	2014-02-19
 
     Signed-off-by: Werner Macho 
 
-Merge: c277f46 63d84ec
+Merge: c277f461f8 63d84ec21b
 Jürgen Fischer 	2014-02-19
 
     Merge pull request #1195 from Oslandia/issue9599
@@ -58919,7 +125268,7 @@ Radim Blazek 	2014-02-19
 
     fixed blendmodes test and added to report
 
-Merge: 2b3e19d b8c6e01
+Merge: 2b3e19d134 b8c6e01a5b
 Werner Macho 	2014-02-19
 
     Merge pull request #1194 from marcelosoaressouza/translation_pt_BR
@@ -58934,7 +125283,7 @@ Radim Blazek 	2014-02-19
 
     updated single symbol rendererstest
 
-Merge: 406ff59 a1e23b1
+Merge: 406ff592d4 a1e23b1132
 Werner Macho 	2014-02-19
 
     Merge pull request #1196 from qgis-jp/for_pull
@@ -58953,7 +125302,7 @@ Marcelo Soares Souza 	2014-02-19
 
     Finalizing translation (pt_BR) of QgsOptionsBase
 
-Merge: 7822abd 4e7fa3a
+Merge: 7822abdc91 4e7fa3adf6
 Werner Macho 	2014-02-19
 
     Merge pull request #1193 from qgis-jp/for_pull
@@ -58972,7 +125321,7 @@ Marco Hugentobler 	2014-02-19
 
     Fix reverse layer order after embedding group
 
-Merge: 58202d0 ab929a8
+Merge: 58202d03d9 ab929a855c
 peterisb 	2014-02-19
 
     lv trans edits
@@ -58988,7 +125337,7 @@ Martin Dobias 	2014-02-19
     Request's extent rectangle was being randomly overwritten as it was
     just reference to a temporary object!
 
-Merge: 10ce9f9 94658bf
+Merge: 10ce9f9c69 94658bf6a8
 pcav 	2014-02-19
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -59007,7 +125356,7 @@ Werner Macho 	2014-02-19
 
     Signed-off-by: Werner Macho 
 
-Merge: d754479 73d9784
+Merge: d754479900 73d9784b3d
 Werner Macho 	2014-02-19
 
     Merge pull request #1190 from Cracert/i18n
@@ -59018,7 +125367,7 @@ Robert Szczepanek 	2014-02-18
 
     [TRANSUP] pl: QObject
 
-Merge: 56ff646 0625dfa
+Merge: 56ff646e8e 0625dfa142
 Werner Macho 	2014-02-19
 
     Merge pull request #1189 from tomass/master
@@ -59079,7 +125428,7 @@ Juergen E. Fischer 	2014-02-18
 
     postgres provider: clear primary key for views (potentially fixes #9590)
 
-Merge: 43af9ea 6364f13
+Merge: 43af9eaf54 6364f1399c
 pcav 	2014-02-18
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -59088,7 +125437,7 @@ pcav 	2014-02-18
 
     Minor improvements to IT translation
 
-Merge: 5e21c55 865ab28
+Merge: 5e21c55d2b 865ab28d0e
 Martin Dobias 	2014-02-18
 
     Merge pull request #1188 from 3nids/addpointleftclick
@@ -59112,7 +125461,7 @@ Nathan Woodrow 	2014-02-18
 
     Faster listing of tables for MS SQL
 
-Merge: d4b1bb4 4e3738a
+Merge: d4b1bb47f4 4e3738a24f
 Martin Dobias 	2014-02-18
 
     Merge branch 'master' into threading-revival
@@ -59120,84 +125469,84 @@ Martin Dobias 	2014-02-18
     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
+            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
 
-Merge: 49fbfba f4f450f
+Merge: 49fbfbadc9 f4f450f379
 Martin Dobias 	2014-02-18
 
     Merge pull request #1186 from ahuarte47/Issue_9360R2
 
     Bug #9360: Whole layer not rendered (when simplify geometry activated)
 
-Merge: fcf1119 0f58a10
+Merge: fcf1119a45 0f58a10757
 Werner Macho 	2014-02-18
 
     Merge pull request #1187 from Cracert/i18n
@@ -59234,7 +125583,7 @@ Juergen E. Fischer 	2014-02-17
 
     osm: transform extents to EPSG:4326 (fixes #8709)
 
-Merge: e6e0614 45dc4a5
+Merge: e6e0614641 45dc4a5cf1
 Werner Macho 	2014-02-17
 
     Merge pull request #1184 from marcelosoaressouza/translation_pt_BR
@@ -59267,7 +125616,7 @@ Werner Macho 	2014-02-17
 
     typo in description
 
-Merge: d31b595 d102a79
+Merge: d31b5950a0 d102a79aa9
 Nathan Woodrow 	2014-02-17
 
     Merge pull request #1180 from nirvn/legend_spacing_fix2
@@ -59278,7 +125627,7 @@ thomas 	2012-06-01
 
     5239_v1
 
-Merge: 24b3ed1 337792b
+Merge: 24b3ed171b 337792bf0c
 Werner Macho 	2014-02-17
 
     Merge pull request #1183 from Cracert/i18n
@@ -59293,7 +125642,7 @@ Juergen E. Fischer 	2014-02-17
 
     postgres provider: fix detection of character fields (related to #8481)
 
-Merge: 26f8be9 e0e5f71
+Merge: 26f8be9286 e0e5f71f77
 Werner Macho 	2014-02-17
 
     Merge pull request #1182 from SrNetoChan/master
@@ -59336,35 +125685,35 @@ Werner Macho 	2014-02-16
 
     Signed-off-by: Werner Macho 
 
-Merge: e91580f 9b651a5
+Merge: e91580fc9f 9b651a5086
 Werner Macho 	2014-02-16
 
     Merge pull request #1179 from asiersarasua/master
 
     Basque translation update
 
-Merge: c809a82 60813ce
+Merge: c809a8221a 60813ce782
 Werner Macho 	2014-02-16
 
     Merge pull request #1178 from Cracert/i18n
 
     [TRANSUP] pl: QObject
 
-Merge: 0d304a2 2168cac
+Merge: 0d304a268d 2168cac11b
 Werner Macho 	2014-02-16
 
     Merge pull request #1177 from marcelosoaressouza/translation_pt_BR
 
     Some translations (pt_BR) for the weekend.
 
-Merge: be67e6a f094cf9
+Merge: be67e6a9ab f094cf9dad
 Werner Macho 	2014-02-16
 
     Merge pull request #1176 from tomass/master
 
     Lithuanian translation update
 
-Merge: 675746c 0ccaafb
+Merge: 675746c2d7 0ccaafbe56
 Gary Sherman 	2014-02-15
 
     Merge pull request #1174 from anitagraser/master
@@ -59415,7 +125764,7 @@ Werner Macho 	2014-02-15
 
     Signed-off-by: Werner Macho 
 
-Merge: 366daa7 cd4c4f9
+Merge: 366daa7e3b cd4c4f9bf7
 Werner Macho 	2014-02-15
 
     Merge pull request #1175 from Cracert/i18n
@@ -59490,7 +125839,7 @@ pcav 	2014-02-14
 
     IT translation almost finished
 
-Merge: a81befc 2bd75b6
+Merge: a81befc596 2bd75b6fed
 pcav 	2014-02-14
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -59501,7 +125850,7 @@ Werner Macho 	2014-02-14
 
     Signed-off-by: Werner Macho 
 
-Merge: a7c33a3 54c88a5
+Merge: a7c33a39d4 54c88a5fe4
 Werner Macho 	2014-02-14
 
     Merge pull request #1170 from Cracert/i18n
@@ -59531,7 +125880,7 @@ Juergen E. Fischer 	2014-02-13
 
     merge attributes: new vector api can skip attributes - use default value for skipped field (fixes #5758)
 
-Merge: 40b4884 8c95eb6
+Merge: 40b48849b5 8c95eb69cf
 Werner Macho 	2014-02-13
 
     Merge pull request #1169 from marcelosoaressouza/translation_pt_BR
@@ -59578,19 +125927,19 @@ Martin Dobias 	2014-02-13
 
     [processing] Fix Qt warnings when opening config dialog
 
-Merge: 59b62e2 c060164
+Merge: 59b62e27b3 c060164bca
 Martin Dobias 	2014-02-13
 
     Merge remote-tracking branch 'slarosa/fix_9328'
 
-Merge: 549f5bc f90b3ed
+Merge: 549f5bc285 f90b3edeb0
 Werner Macho 	2014-02-13
 
     Merge pull request #1166 from marcelosoaressouza/master
 
     Updating the translation to Portuguese-Brazil (pt_BR)
 
-Merge: 57dd877 086f26b
+Merge: 57dd8779ac 086f26befe
 Werner Macho 	2014-02-13
 
     Merge pull request #1168 from Cracert/i18n
@@ -59651,7 +126000,7 @@ Martin Dobias 	2014-02-12
 
     Fix #8758 (graduated classes on expression broken)
 
-Merge: dc08947 33da846
+Merge: dc0894784d 33da84691d
 Werner Macho 	2014-02-12
 
     Merge pull request #1164 from Cracert/i18n
@@ -59697,7 +126046,7 @@ peterisb 	2014-02-11
 
     lv translation
 
-Merge: 7e1c1b9 6b74fee
+Merge: 7e1c1b928c 6b74feed5c
 Martin Dobias 	2014-02-11
 
     Fix #6995 (db manager's SQL window freezes with long query)
@@ -59727,7 +126076,7 @@ Martin Dobias 	2014-02-11
     is correctly parsed. With these changes both options are possible
     and when possible, the unquoted field name is used for compatibility
 
-Merge: 9fd19a6 1a45003
+Merge: 9fd19a696a 1a450038de
 Werner Macho 	2014-02-11
 
     Merge pull request #1161 from Cracert/i18n
@@ -59738,7 +126087,7 @@ Robert Szczepanek 	2014-02-10
 
     [TRANSUP] pl: function_help, DlgNumber, QgisApp
 
-Merge: 85f6fb8 959b05a
+Merge: 85f6fb8b71 959b05a66b
 Werner Macho 	2014-02-11
 
     Merge pull request #1160 from Jean-Roc/traduction_ui
@@ -59771,7 +126120,7 @@ Juergen E. Fischer 	2014-02-10
 
     wfs: catch end of selected features (fixes #8979)
 
-Merge: df0a443 e67eb4a
+Merge: df0a443331 e67eb4a427
 Werner Macho 	2014-02-10
 
     Merge branch 'master' of https://github.com/qgis/QGIS
@@ -59829,21 +126178,21 @@ Martin Dobias 	2014-02-10
 
     Code and warning cleanup
 
-Merge: 928613c 3a075a6
+Merge: 928613c4e0 3a075a6b2e
 Martin Dobias 	2014-02-10
 
     Merge pull request #1157 from kiith-sa/master
 
     Fix #9213 ('bad_alloc' error at QGIS start)
 
-Merge: 8c9d336 7927c7e
+Merge: 8c9d336834 7927c7ef83
 Werner Macho 	2014-02-10
 
     Merge pull request #1158 from Cracert/i18n
 
     [TRANSUP] pl: function_help
 
-Merge: 4aa8607 f70e403
+Merge: 4aa8607edb f70e403b71
 Martin Dobias 	2014-02-10
 
     Merge pull request #1154 from slarosa/bbox_help_1
@@ -59860,7 +126209,7 @@ Werner Macho 	2014-02-10
 
     Signed-off-by: Werner Macho 
 
-Merge: b05c93c 67154d1
+Merge: b05c93c3dd 67154d1b6f
 Werner Macho 	2014-02-10
 
     Merge pull request #1156 from qgis-jp/for_pull
@@ -59899,7 +126248,7 @@ Martin Dobias 	2014-02-09
 
     Fix #8996 (Composer crashes QGIS when setComposition() method called)
 
-Merge: f712a79 ee59033
+Merge: f712a7911a ee590331d9
 Werner Macho 	2014-02-09
 
     Merge pull request #1153 from tomass/master
@@ -59914,7 +126263,7 @@ Juergen E. Fischer 	2014-02-09
 
     german translation update
 
-Merge: 3fdd180 155c769
+Merge: 3fdd180c28 155c769731
 Werner Macho 	2014-02-09
 
     Merge pull request #1152 from qgis-jp/for_pull
@@ -59949,7 +126298,7 @@ Martin Dobias 	2014-02-09
 
     Fix #8852 (crash when removing invalid postgres table from project)
 
-Merge: 8d5862c 41c49bd
+Merge: 8d5862c8fd 41c49bdd0b
 Werner Macho 	2014-02-09
 
     Merge pull request #1151 from Cracert/i18n
@@ -60085,7 +126434,7 @@ Piotr Pociask 	2014-02-08
     For shapely 1.2.16+ and GEOS 3.2+ unary_union will be used for noding
     lines - union method sometimes failed to create properly noded polyline.
 
-Merge: f06e72e 876e985
+Merge: f06e72efcd 876e9853be
 Werner Macho 	2014-02-08
 
     Merge pull request #1147 from Cracert/i18n
@@ -60152,7 +126501,7 @@ Denis Rouzaud 	2014-02-07
 
     remove label from standard option dialog template
 
-Merge: da8ca46 395fb5d
+Merge: da8ca460aa 395fb5dcac
 Werner Macho 	2014-02-07
 
     Merge pull request #1145 from Cracert/i18n
@@ -60204,7 +126553,7 @@ Werner Macho 	2014-02-06
 
     Signed-off-by: Werner Macho 
 
-Merge: ffcbdab 4bff0ed
+Merge: ffcbdabe4e 4bff0edee2
 Werner Macho 	2014-02-06
 
     Merge pull request #1144 from Jean-Roc/traduction_ui
@@ -60219,14 +126568,14 @@ Nyall Dawson 	2014-02-06
 
     [composer] Fix stacking of items breaks after pasting items. Make sure pasted items are always placed in correct order on top of composition.
 
-Merge: ddec663 acf2c3f
+Merge: ddec6639be acf2c3f762
 MORREALE Jean-Roc 	2014-02-06
 
     Merge pull request #11 from olivierdalang/od_french
 
     Corrections de français
 
-Merge: 267b960 84975bf
+Merge: 267b96061c 84975bf05a
 Werner Macho 	2014-02-06
 
     Merge pull request #1143 from Cracert/i18n
@@ -60253,7 +126602,7 @@ Juergen E. Fischer 	2014-02-05
 
     debian packaging update
 
-Merge: 6178860 4b9e181
+Merge: 6178860d76 4b9e181e23
 Giuseppe Sucameli 	2014-02-05
 
     Merge pull request #1129 from etiennesky/gdaltools_fixes2
@@ -60308,7 +126657,7 @@ Nyall Dawson 	2014-02-05
 
     [composer] Follow up 78ecef6, fix setting line width in scalebars
 
-Merge: 03f2ec9 48c91a4
+Merge: 03f2ec93c9 48c91a457a
 Werner Macho 	2014-02-05
 
     Merge pull request #1142 from Cracert/i18n
@@ -60329,7 +126678,7 @@ Werner Macho 	2014-02-04
 
     Signed-off-by: Werner Macho 
 
-Merge: 10947f7 b6f2a92
+Merge: 10947f796c b6f2a92280
 Denis Rouzaud 	2014-02-04
 
     Merge pull request #1125 from ahuarte47/Issue_9454
@@ -60344,7 +126693,7 @@ Nyall Dawson 	2014-02-04
 
     [composer] Draw mouse handles and item bounds outside of item's frames, so that snapping occurs to edge of item frame (fix #8943)
 
-Merge: 9ddfdd8 f7116f6
+Merge: 9ddfdd8f77 f7116f6843
 Werner Macho 	2014-02-03
 
     Merge pull request #1141 from Cracert/i18n
@@ -60355,7 +126704,7 @@ Robert Szczepanek 	2014-02-04
 
     [TRANSUP] pl: QgsOracle
 
-Merge: 97cd120 da4c429
+Merge: 97cd1206bf da4c429237
 Paolo 	2014-02-03
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -60374,7 +126723,7 @@ Marco Hugentobler 	2014-02-03
 
     Fix for dxf label export
 
-Merge: f9861f8 30f7c4f
+Merge: f9861f8455 30f7c4f08a
 Werner Macho 	2014-02-03
 
     Merge pull request #1139 from Cracert/i18n
@@ -60407,7 +126756,7 @@ Alexander Bruy 	2014-02-02
 
     russian translation update
 
-Merge: 9ba28b3 c859938
+Merge: 9ba28b386f c859938b8b
 Werner Macho 	2014-02-02
 
     Merge pull request #1137 from Cracert/i18n
@@ -60426,7 +126775,7 @@ Nyall Dawson 	2014-02-01
 
     [composer] Set initial background colour on map items to canvas background color (fix #3811)
 
-Merge: 041244d b6c1991
+Merge: 041244d74d b6c19916e3
 Werner Macho 	2014-02-01
 
     Merge pull request #1135 from Cracert/i18n
@@ -60491,14 +126840,14 @@ Alexia Mondot 	2014-01-17
 
     add ParameterMultipleExternalInput parameter type
 
-Merge: d050b0a db1192f
+Merge: d050b0a8f4 db1192f151
 Jürgen Fischer 	2014-01-31
 
     Merge pull request #1131 from ahuarte47/Issue_8725R-ST_SnapToGrid
 
     Fix bug #8725R: replace ST_Simplify by ST_SnapToGrid to avoid collapsed geometries by postgis
 
-Merge: e4f410b 414d59c
+Merge: e4f410b589 414d59c597
 Werner Macho 	2014-01-30
 
     Merge pull request #1132 from Cracert/i18n
@@ -60595,7 +126944,7 @@ Denis Rouzaud 	2014-01-30
 
     missing action for add part
 
-Merge: 12256f1 e150ab1
+Merge: 12256f1bc2 e150ab1611
 Werner Macho 	2014-01-29
 
     Merge pull request #1126 from Cracert/i18n
@@ -60636,14 +126985,14 @@ Radim Blazek 	2014-01-29
 
     identify reprojected raster: use 1x1 pixel context in layer crs to get reasonable search tolerance for WMS GetFeatureInfo, fixes #5896
 
-Merge: 0b882d0 8c47c0e
+Merge: 0b882d0190 8c47c0e8dc
 Werner Macho 	2014-01-29
 
     Merge pull request #1122 from Cracert/i18n
 
     [TRANSUP] pl: WidgetGradient, QgsRel
 
-Merge: ec7718b b1aa21d
+Merge: ec7718b55e b1aa21d8b6
 Werner Macho 	2014-01-29
 
     Merge pull request #1123 from Jean-Roc/traduction_ui
@@ -60678,7 +127027,7 @@ Robert Szczepanek 	2014-01-28
 
     [TRANSUP] pl: WidgetGradient, QgsRel
 
-Merge: 2dabba4 6cd0fa1
+Merge: 2dabba4530 6cd0fa165f
 mhugent 	2014-01-28
 
     Merge pull request #1104 from leyan/projectCRS
@@ -60707,7 +127056,7 @@ Denis Rouzaud 	2014-01-28
 
     #9441 add 1 segment line part to multiline layer
 
-Merge: ff9c76a 8500e80
+Merge: ff9c76af9c 8500e80022
 Werner Macho 	2014-01-28
 
     Merge pull request #1121 from zjankovic/master
@@ -60718,7 +127067,7 @@ Zoran 	2014-01-28
 
     Refreshed CRO translation
 
-Merge: 6c3f2ed 7df74ae
+Merge: 6c3f2ed8cc 7df74aeacd
 Werner Macho 	2014-01-28
 
     Merge pull request #1119 from Cracert/i18n
@@ -60749,7 +127098,7 @@ Paolo 	2014-01-27
 
     Update of IT GUI translation - thanks Stefano Campus
 
-Merge: 7b21c72 a8463aa
+Merge: 7b21c727f3 a8463aa041
 Werner Macho 	2014-01-27
 
     Merge pull request #1117 from asiersarasua/master
@@ -60794,7 +127143,7 @@ Juergen E. Fischer 	2014-01-27
 
     update sip bindings II
 
-Merge: af1bdf6 41dd3d6
+Merge: af1bdf6694 41dd3d69c7
 Werner Macho 	2014-01-26
 
     Merge pull request #1115 from Cracert/i18n
@@ -60805,7 +127154,7 @@ Robert Szczepanek 	2014-01-27
 
     [TRANSUP] pl
 
-Merge: d4e3694 624ef2f
+Merge: d4e369414b 624ef2f114
 Nathan Woodrow 	2014-01-26
 
     Merge pull request #1114 from ahuarte47/Issue_9429
@@ -60836,7 +127185,7 @@ Radim Blazek 	2014-01-26
 
     Support SVG relative paths in SVG cache to enable relative data defined paths. Fixes #8883
 
-Merge: 16773ae c27d499
+Merge: 16773ae80a c27d499ff8
 Werner Macho 	2014-01-26
 
     Merge pull request #1111 from Cracert/i18n
@@ -60902,7 +127251,7 @@ Radim Blazek 	2014-01-24
 
     fixed horizontal and vertical marker line fill using maximum markers interval, fixes partially #8975
 
-Merge: 95c3c6f ef001fd
+Merge: 95c3c6ff29 ef001fdc8b
 mhugent 	2014-01-24
 
     Merge pull request #1110 from mwa/dev_labeling_from_sld
@@ -60917,7 +127266,7 @@ Mathias Walker 	2014-01-24
 
     read labeling from SLD
 
-Merge: 6ca57f9 37efe91
+Merge: 6ca57f9d90 37efe9198b
 Jürgen Fischer 	2014-01-24
 
     Merge pull request #1108 from Oslandia/remove_dead_code_in_qgssinglesymbolrendererv2
@@ -60946,7 +127295,7 @@ Juergen E. Fischer 	2014-01-24
 
     fix deleteVertex for POLYGON and MULTILINESTRING
 
-Merge: c3f4bef fb08949
+Merge: c3f4befa3b fb08949319
 volaya 	2014-01-24
 
     Merge pull request #992 from fsdias/master
@@ -60967,14 +127316,14 @@ Werner Macho 	2014-01-24
 
     Signed-off-by: Werner Macho 
 
-Merge: 524788b 393071f
+Merge: 524788b917 393071f2fd
 Werner Macho 	2014-01-23
 
     Merge pull request #1103 from Jean-Roc/traduction_ui
 
     update french translation
 
-Merge: a78a003 d5ef0c5
+Merge: a78a0035ac d5ef0c5d37
 Werner Macho 	2014-01-23
 
     Merge pull request #1107 from Cracert/i18n
@@ -61025,7 +127374,7 @@ Juergen E. Fischer 	2014-01-21
 
     fix QGis::featureType output
 
-Merge: db7cddf f9c5ee0
+Merge: db7cddfc84 f9c5ee0c07
 Larry Shaffer 	2014-01-23
 
     Merge pull request #1091 from 3nids/uioptionbase2
@@ -61048,14 +127397,14 @@ Marco Hugentobler 	2013-07-09
 
     [FEATURE]: class for random transect sampling in analysis lib
 
-Merge: 0536cfa b0474d6
+Merge: 0536cfa3d1 b0474d6f5b
 Tim Sutton 	2014-01-23
 
     Merge pull request #1102 from ahuarte47/Issue_8725R-ST_Simplify2
 
     Fix bug #8725R: no check simplification topology for point geometries in postgis provider
 
-Merge: 810773a 31c9333
+Merge: 810773a608 31c933330b
 mhugent 	2014-01-23
 
     Merge pull request #1105 from mwa/fix_expression_from_ogc_filter
@@ -61088,7 +127437,7 @@ Alvaro Huarte 	2014-01-23
 
     #8725R: no check simplification topology for point geometries
 
-Merge: 5d02020 d5ea0b0
+Merge: 5d0202091b d5ea0b088f
 MORREALE Jean-Roc 	2014-01-23
 
     Merge pull request #10 from mdouchin/traduction_mdouchin
@@ -61099,28 +127448,28 @@ Juergen E. Fischer 	2014-01-23
 
     cleanup 3568fe7
 
-Merge: 3568fe7 80b44a7
+Merge: 3568fe761e 80b44a7685
 Jürgen Fischer 	2014-01-23
 
     Merge pull request #1083 from Oslandia/fix_max_on_joined_fields
 
     fix bug in max value on joined fields
 
-Merge: 467f978 c7ccdc9
+Merge: 467f9783b8 c7ccdc9ed0
 Martin Dobias 	2014-01-23
 
     Merge pull request #1075 from Oslandia/expressions_in_symbol_rotation_and_scale_for_pr
 
     [FEATURE] allow for expressions in symbol rotation and scale
 
-Merge: 8b53001 7fca30b
+Merge: 8b530012d1 7fca30b731
 Werner Macho 	2014-01-22
 
     Merge pull request #1101 from Cracert/i18n
 
     [TRANSUP] pl: Globe, expr.editor
 
-Merge: 49a807a 2baf403
+Merge: 49a807aba2 2baf40307a
 Tim Sutton 	2014-01-22
 
     Merge pull request #1099 from ahuarte47/Issue_8725R-ST_simplify
@@ -61151,7 +127500,7 @@ Michael Douchin 	2014-01-22
 
     French translation update
 
-Merge: 5c1fed5 4077084
+Merge: 5c1fed5b2e 4077084ff0
 Werner Macho 	2014-01-22
 
     Merge pull request #1100 from jonnyforestGIS/master
@@ -61176,14 +127525,14 @@ Alvaro Huarte 	2014-01-22
 
     #87525R: refactoring and minor changes
 
-Merge: f2d0100 f79dfa1
+Merge: f2d0100d5d f79dfa1551
 Jürgen Fischer 	2014-01-22
 
     Merge pull request #1087 from ahuarte47/Issue_9360R
 
     Fix bug #9360-revival: fix whole layer not rendered (when simplify geometry activated; followup 3305a6c; fixes #9360)
 
-Merge: 52d114f 031596c
+Merge: 52d114fba4 031596c4e4
 Tim Sutton 	2014-01-22
 
     Merge pull request #1094 from ahuarte47/Issue_8725R-maxscale
@@ -61194,7 +127543,7 @@ Nyall Dawson 	2014-01-22
 
     [composer] Use better cross hairs cursor
 
-Merge: e2b1e33 d61e6da
+Merge: e2b1e33af1 d61e6da488
 Werner Macho 	2014-01-21
 
     Merge pull request #1097 from Cracert/i18n
@@ -61223,14 +127572,14 @@ Robert Szczepanek 	2014-01-21
 
     [TRANSUP] pl: Composer, DXF, previous mistake (tnx Werner)
 
-Merge: 1cd307c ebae947
+Merge: 1cd307c9e1 ebae947147
 Werner Macho 	2014-01-21
 
     Merge pull request #1095 from Cracert/i18n
 
     [TRANSUP] pl: Atlas, Composer
 
-Merge: 061dcce 03d1e2b
+Merge: 061dcceeeb 03d1e2b529
 Paolo 	2014-01-21
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -61279,7 +127628,7 @@ ahuarte47 	2014-01-21
 
     #8725R: add maximum scale at which the layer should be simplified
 
-Merge: 7cb79c4 b440367
+Merge: 7cb79c497b b440367f65
 Tim Sutton 	2014-01-20
 
     Merge pull request #1093 from ahuarte47/Issue_8725R-UIpoints
@@ -61335,7 +127684,7 @@ Martin Dobias 	2014-01-20
 
     Server adjustments (allow usage from build dir, new API)
 
-Merge: 9209ef6 5162889
+Merge: 9209ef6ed6 5162889c8c
 Werner Macho 	2014-01-19
 
     Merge pull request #1090 from Cracert/i18n
@@ -61366,7 +127715,7 @@ Alexander Bruy 	2014-01-18
 
     add myself to translators, russian translation update
 
-Merge: 06b1fbc 1eaefaa
+Merge: 06b1fbcb26 1eaefaa0cb
 Werner Macho 	2014-01-19
 
     Merge pull request #1088 from Cracert/i18n
@@ -61401,7 +127750,7 @@ Juergen E. Fischer 	2014-01-18
 
     fix typos, indentation and some warnings
 
-Merge: bf814c2 b7612f2
+Merge: bf814c20d1 b7612f27e9
 Larry Shaffer 	2014-01-18
 
     Merge pull request #1082 from 3nids/uioptionbase
@@ -61466,14 +127815,14 @@ Marco Hugentobler 	2014-01-14
 
     Export labels to dxf
 
-Merge: 8c9f41c 47d253e
+Merge: 8c9f41cfa1 47d253e0a8
 mhugent 	2014-01-17
 
     Merge pull request #1056 from ahuarte47/Issue_9060_B
 
     [Feature]: Centralize conversion units in one unique function
 
-Merge: 71360c3 cc13f9d
+Merge: 71360c3cf7 cc13f9d002
 Jürgen Fischer 	2014-01-17
 
     Merge pull request #1086 from ahuarte47/Issue_9360
@@ -61503,7 +127852,7 @@ Martin Dobias 	2014-01-17
     Without this it is necessary to explicitly provide QT_PLUGIN_PATH environment
     variable for Qt plugins we build (e.g. Oracle DB sql driver)
 
-Merge: 2e9d3a8 f4315d7
+Merge: 2e9d3a8c4e f4315d7fbd
 Werner Macho 	2014-01-17
 
     Merge pull request #1085 from tomass/master
@@ -61526,7 +127875,7 @@ Tomas 	2014-01-17
 
     Lithuanian translation update
 
-Merge: 2db44a5 2af29d1
+Merge: 2db44a599e 2af29d18a7
 Jürgen Fischer 	2014-01-16
 
     Merge pull request #1081 from ahuarte47/Issue_9345
@@ -61557,7 +127906,7 @@ Martin Dobias 	2014-01-16
 
     Resolved handling of WMS requests in worker threads
 
-Merge: 5310040 03a7125
+Merge: 5310040add 03a7125bcd
 Denis Rouzaud 	2014-01-15
 
     Merge pull request #1079 from 3nids/uioptionbase
@@ -61742,7 +128091,7 @@ Denis Rouzaud 	2014-01-15
 
     credentials: give focus to password if a user is given
 
-Merge: 4502592 34809e1
+Merge: 4502592bcf 34809e1efa
 Nyall Dawson 	2014-01-15
 
     Merge pull request #1078 from 3nids/uiatlas
@@ -61757,7 +128106,7 @@ Denis Rouzaud 	2014-01-15
 
     remove outline of items in list widget when they have focus
 
-Merge: 89a774a 0f8a99e
+Merge: 89a774a391 0f8a99e550
 Jürgen Fischer 	2014-01-15
 
     Merge pull request #1049 from lynxlynxlynx/master
@@ -61852,7 +128201,7 @@ Tim Sutton 	2014-01-14
 
     Small typo fix in coding doc
 
-Merge: 27f5b8d 8edd6a4
+Merge: 27f5b8d049 8edd6a4936
 Denis Rouzaud 	2014-01-14
 
     Merge pull request #1073 from 3nids/expressiondialogsplitter
@@ -61865,7 +128214,7 @@ Denis Rouzaud 	2014-01-14
 
     respect HIG
 
-Merge: 2cdc896 6bb9dfe
+Merge: 2cdc89654b 6bb9dfec00
 Nyall Dawson 	2014-01-14
 
     Merge pull request #1072 from nyalldawson/atlas_multimap3
@@ -61943,7 +128292,7 @@ Juergen E. Fischer 	2014-01-12
 
     fix warnings
 
-Merge: 8990b66 183dd8e
+Merge: 8990b66eed 183dd8eed6
 Nyall Dawson 	2014-01-12
 
     Merge pull request #1046 from ahuarte47/Issue_9254
@@ -62383,7 +128732,7 @@ Nyall Dawson 	2014-01-12
 
     [composer] Allow data defined symbol expressions using atlas feature properties for page background
 
-Merge: d04239d 4fbf244
+Merge: d04239d70b 4fbf244ce7
 Werner Macho 	2014-01-11
 
     Merge pull request #1065 from tomass/master
@@ -62447,7 +128796,7 @@ Denis Rouzaud 	2014-01-09
 
     indentation
 
-Merge: 129bd98 17e8813
+Merge: 129bd987d5 17e8813aeb
 Etienne Tourigny 	2014-01-09
 
     Merge pull request #1059 from etiennesky/coloramps-inverted
@@ -62458,7 +128807,7 @@ Juergen E. Fischer 	2014-01-09
 
     indentation update
 
-Merge: 9b0652f 1f9c378
+Merge: 9b0652f0fe 1f9c378c77
 mhugent 	2014-01-09
 
     Merge pull request #1058 from elpaso/master
@@ -62489,7 +128838,7 @@ jtornero 	2013-11-15
 
     [composer] Add nautical miles support to scalebar, more rational default scale
 
-Merge: eaf1f38 2155dd8
+Merge: eaf1f38137 2155dd8c3d
 Jürgen Fischer 	2014-01-07
 
     Merge pull request #1060 from ahuarte47/Issue_9308
@@ -62520,12 +128869,12 @@ Etienne Tourigny 	2014-01-07
 
     add checkbox to invert color ramps in graduated and categorized symbology
 
-Merge: 6eb72c7 f8247fa
+Merge: 6eb72c718b f8247fabda
 elpaso 	2014-01-07
 
     GetStyles implementation
 
-Merge: 0b10498 6eb72c7
+Merge: 0b1049880e 6eb72c718b
 Jürgen Fischer 	2014-01-07
 
     Merge pull request #1057 from elpaso/master
@@ -62588,10 +128937,10 @@ Nathan Woodrow 	2014-01-03
 
     Update to new style side bar style for dialogs.
 
-- New blue-grey with white text style dialog
-- Side panel runs top to bottom
-- Icon size is read from settings
-- Option to disable in options dialog
+            - New blue-grey with white text style dialog
+            - Side panel runs top to bottom
+            - Icon size is read from settings
+            - Option to disable in options dialog
 
 elpaso 	2014-01-06
 
@@ -62726,7 +129075,7 @@ Salvatore Larosa 	2014-01-01
 
     [processing] API v2 update fix: returns str obj instead of QVariant one, it occurs when running Processing headless
 
-Merge: 9ef3f86 373adbd
+Merge: 9ef3f86e47 373adbd586
 Nathan Woodrow 	2014-01-02
 
     Merge pull request #1048 from ahuarte47/Issue_9094-revival
@@ -62765,7 +129114,7 @@ Tim Sutton 	2014-01-01
 
     Contributors map update
 
-Merge: 12eb44e 213b982
+Merge: 12eb44e7a0 213b9820a7
 Nyall Dawson 	2014-01-01
 
     Merge pull request #1036 from nyalldawson/composer_render_speed
@@ -62837,7 +129186,7 @@ Juergen E. Fischer 	2013-12-31
 
     fix build error on precise
 
-Merge: f73779a 8a80e0e
+Merge: f73779a49b 8a80e0edbc
 Nathan Woodrow 	2013-12-30
 
     Merge pull request #1047 from ahuarte47/Issue_9273
@@ -62868,7 +129217,7 @@ Tim Sutton 	2013-12-30
 
     Code foramtting cleanups only
 
-Merge: f1aead4 e3e01fc
+Merge: f1aead4ca9 e3e01fc78f
 Tim Sutton 	2013-12-30
 
     Merge branch 'Issue_9094' of https://github.com/ahuarte47/QGIS
@@ -62918,7 +129267,7 @@ Nyall Dawson 	2013-12-30
     [composer] Clean up item rotation api, seperate item rotation (for shapes, labels) from map rotation and picture rotation.
     Maintain compatibility with 2.0 api, deprecate ambiguous rotation/setRotation methods
 
-Merge: 77fb9a5 377c13b
+Merge: 77fb9a5492 377c13b96b
 Tim Sutton 	2013-12-29
 
     Merge pull request #1029 from nyalldawson/composer_dialog_fixes
@@ -63022,7 +129371,7 @@ Juergen E. Fischer 	2013-12-28
 
     Fix typos (fixes #9261)
 
-Merge: 36d9d4b aee4696
+Merge: 36d9d4bfa1 aee4696252
 Werner Macho 	2013-12-28
 
     Merge pull request #1045 from Jean-Roc/traduction_ui
@@ -63034,7 +129383,7 @@ Matthias Kuhn 	2013-12-28
     Add attribute dialog: Hide Length/Precision labels when unavailable
     Fix #9259
 
-Merge: 4b9edc7 720871c
+Merge: 4b9edc77dd 720871c154
 volaya 	2013-12-28
 
     Merge pull request #1043 from anitagraser/master
@@ -63045,7 +129394,7 @@ anitagraser 	2013-12-28
 
     undid changes to densify geometries
 
-Merge: b40e3c0 e0e65ba
+Merge: b40e3c0a34 e0e65ba739
 MORREALE Jean-Roc 	2013-12-28
 
     Merge pull request #9 from Ecologeek/traduction_ui
@@ -63056,7 +129405,7 @@ anitagraser 	2013-12-27
 
     allow float values in densify interval input field
 
-Merge: 8dd31ff 7050265
+Merge: 8dd31ff9e8 7050265f38
 Tim Sutton 	2013-12-27
 
     Merge pull request #1042 from ErunamoJAZZ/master
@@ -63087,7 +129436,7 @@ Victor Olaya 	2013-12-20
 
     [processing] minor cosmetic change
 
-Merge: 0ad5cc9 a09892f
+Merge: 0ad5cc9548 a09892f1bb
 volaya 	2013-12-20
 
     Merge pull request #1031 from rldhont/headless_processing
@@ -63139,7 +129488,7 @@ Marco Hugentobler 	2013-12-18
 
     Better conversion of QPainterPath to dxf
 
-Merge: f7e5588 889f65f
+Merge: f7e55881d0 889f65f765
 Denis Rouzaud 	2013-12-18
 
     Merge pull request #1024 from ahuarte47/Issue_9181
@@ -63253,28 +129602,28 @@ Juergen E. Fischer 	2013-12-17
 
     indentation update
 
-Merge: accd06d 32d4af2
+Merge: accd06dcb9 32d4af2dc5
 Jürgen Fischer 	2013-12-17
 
     Merge pull request #1028 from ahuarte47/Issue_9191
 
     Bug #9191-#9190: fix enable/disable issues of buttons
 
-Merge: 17cd09a 4a75a95
+Merge: 17cd09a8a7 4a75a95a36
 Jürgen Fischer 	2013-12-17
 
     Merge pull request #1032 from etiennesky/vsifile-relative
 
     fix project saving and reading of vsizip paths (fixes #6369)
 
-Merge: 052b2eb 9195356
+Merge: 052b2ebcb9 91953562bb
 mhugent 	2013-12-17
 
     Merge pull request #980 from ahuarte47/Issue_8725-OGR
 
     Feature #8725: Fast rendering of geometries
 
-Merge: ba9936e dbb48f2
+Merge: ba9936e001 dbb48f2d14
 Denis Rouzaud 	2013-12-17
 
     Merge pull request #1030 from alexbruy/fill-ring
@@ -63288,15 +129637,15 @@ Alexander Bruy 	2013-12-10
     features. Attributes taken from parent feature. Feature form opens
     by default. Hold Ctrl key to suppress it.
 
-Merge: bda114b 566e5bd
+Merge: bda114b725 566e5bd184
 Alvaro Huarte 	2013-12-17
 
     Merge branch 'Issue_8725-OGR' of https://github.com/ahuarte47/QGIS into Issue_8725-OGR
 
     Conflicts:
-src/app/qgsoptions.cpp
-src/app/qgsoptions.h
-src/core/symbology-ng/qgssymbollayerv2.cpp
+            src/app/qgsoptions.cpp
+            src/app/qgsoptions.h
+            src/core/symbology-ng/qgssymbollayerv2.cpp
 
 ahuarte47 	2013-12-12
 
@@ -63467,7 +129816,7 @@ Alvaro Huarte 	2013-12-16
 
     #9191: More fixes
 
-Merge: b192f64 2573cc2
+Merge: b192f642d1 2573cc2f3d
 mhugent 	2013-12-16
 
     Merge pull request #1025 from rldhont/wcs
@@ -63495,7 +129844,7 @@ Nyall Dawson 	2013-12-16
 
     [composer] Make map rectangle preview text a bit more subtle
 
-Merge: 27bea19 d132451
+Merge: 27bea19978 d13245190d
 volaya 	2013-12-15
 
     Merge pull request #1026 from anitagraser/working
@@ -63573,7 +129922,7 @@ Juergen E. Fischer 	2013-12-11
 
     a unit to network cache size label (fixes #9189)
 
-Merge: 36c2f7f bce3588
+Merge: 36c2f7f3a8 bce3588d2a
 mhugent 	2013-12-11
 
     Merge pull request #1019 from nyalldawson/random_colors
@@ -63598,21 +129947,21 @@ Marco Hugentobler 	2013-12-10
 
     Add license header for dxfexportdialog
 
-Merge: c21c90a f848396
+Merge: c21c90a076 f848396a58
 mhugent 	2013-12-10
 
     Merge pull request #1023 from 3nids/dxfgeomlayer
 
     [DXF] do not list layer without geometry
 
-Merge: fc24767 3f37d24
+Merge: fc247672b0 3f37d24979
 mhugent 	2013-12-10
 
     Merge pull request #1022 from 3nids/dxfunselectall
 
     [DXF] add (un)select all buttons
 
-Merge: 221263d fdc3ba7
+Merge: 221263db95 fdc3ba79f5
 Giuseppe Sucameli 	2013-12-09
 
     Merge pull request #1021 from etiennesky/gdal_merge
@@ -63701,7 +130050,7 @@ Juergen E. Fischer 	2013-12-06
 
     add script to list github pull request (assignments)
 
-Merge: ba76c99 0239b4d
+Merge: ba76c99037 0239b4d6c7
 Marco Hugentobler 	2013-12-06
 
     [FEATURE]: merge dxf_export branch
@@ -63772,19 +130121,19 @@ Juergen E. Fischer 	2013-12-05
 
     Disable filter if search checkbox is unticked in database selection dialogs (fixes #9168)
 
-Merge: 4df00a8 63c62ad
+Merge: 4df00a8f0f 63c62adf21
 Marco Hugentobler 	2013-12-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: f428c86 57d124b
+Merge: f428c869a9 57d124b9c0
 mhugent 	2013-12-05
 
     Merge pull request #1014 from 3nids/issue9138
 
     fix #9138
 
-Merge: 813459d f428c86
+Merge: 813459da48 f428c869a9
 Marco Hugentobler 	2013-12-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -63794,7 +130143,7 @@ Matthias Kuhn 	2013-12-05
     Safety check when joining before accessing fields
     Fix #9166
 
-Merge: f2fbb2f 4260a23
+Merge: f2fbb2f816 4260a239af
 Marco Hugentobler 	2013-12-05
 
     Merge branch 'symbology_copy_paste'
@@ -63809,14 +130158,14 @@ Alexander Bruy 	2013-12-05
     run InitSpatialMetadata(1) on SpatiaLite >= 4.1 also in Offline Editing
     plugin (addresses #9157)
 
-Merge: 6c0e9af 0f52163
+Merge: 6c0e9af263 0f52163f67
 Tim Sutton 	2013-12-05
 
     Merge pull request #983 from matthias-kuhn/cmake-warning-fix
 
     [cmake] Fix warnings.
 
-Merge: e1186f1 2c4018b
+Merge: e1186f164d 2c4018b66e
 mhugent 	2013-12-05
 
     Merge pull request #1017 from matthias-kuhn/dattrans
@@ -63835,7 +130184,7 @@ Radim Blazek 	2013-12-04
 
     give objectName to plugin menus to allow customization
 
-Merge: f533d53 d39f447
+Merge: f533d53fe0 d39f44782a
 Werner Macho 	2013-12-03
 
     Merge pull request #1016 from thodorisvakkas/el_GR_Translation
@@ -63890,7 +130239,7 @@ Marco Hugentobler 	2013-12-03
 
     Fix printing for curved labels
 
-Merge: f21562c a3f1f7e
+Merge: f21562c86f a3f1f7e9ae
 Richard Duivenvoorde 	2013-12-02
 
     Merge pull request #1012 from ahuarte47/Issue_9085-qbrowser
@@ -63974,7 +130323,7 @@ Marco Hugentobler 	2013-11-28
 
     Fix label size for painting main map with higher dpi
 
-Merge: f624792 688952d
+Merge: f624792255 688952d56a
 Denis Rouzaud 	2013-11-27
 
     Merge pull request #1013 from tomass/master
@@ -63993,7 +130342,7 @@ Juergen E. Fischer 	2013-11-27
 
     don't allow slashes in http connection names (fixes #9131)
 
-Merge: ea47e6f eedab4f
+Merge: ea47e6f8a2 eedab4f4ca
 volaya 	2013-11-27
 
     Merge pull request #1003 from rduivenvoorde/processingtweaks
@@ -64008,7 +130357,7 @@ Alvaro Huarte 	2013-11-27
 
     http://hub.qgis.org/projects/quantum-gis/repository/revisions/32b05836d50b36f443517ef6a76ac26d49b19b89
 
-Merge: 5ac587d f870a38
+Merge: 5ac587d639 f870a38172
 Werner Macho 	2013-11-26
 
     Merge pull request #1011 from tomass/master
@@ -64023,7 +130372,7 @@ Tomas 	2013-11-26
 
     Lithuanian translation update
 
-Merge: 55f8606 c8c2ba2
+Merge: 55f860638d c8c2ba2801
 Jürgen Fischer 	2013-11-26
 
     Merge pull request #1000 from matthias-kuhn/filewriter
@@ -64042,7 +130391,7 @@ Werner Macho 	2013-11-26
 
     updating Layers translation in indonesian language to layer (skip lapisan)
 
-Merge: 32b0583 fdeaee8
+Merge: 32b05836d5 fdeaee83e6
 Werner Macho 	2013-11-25
 
     Merge pull request #1009 from Jean-Roc/traduction_ui
@@ -64053,7 +130402,7 @@ Juergen E. Fischer 	2013-11-25
 
     change default refresh key to F5 (implements #9085)
 
-Merge: 5228e69 f0d25b1
+Merge: 5228e69a16 f0d25b1035
 MORREALE Jean-Roc 	2013-11-25
 
     Merge pull request #7 from Ecologeek/translation_ui
@@ -64124,21 +130473,21 @@ Nathan Woodrow 	2013-11-23
 
     Add $atlasfeatureid and $atlasgeometry
 
-Merge: 94c6657 1a88acb
+Merge: 94c66577d3 1a88acbb30
 Nyall Dawson 	2013-11-23
 
     Merge pull request #999 from nyalldawson/composer_pos
 
     [composer] Change to pos() for item position
 
-Merge: c5cb0ba 836fa73
+Merge: c5cb0bae8d 836fa7388d
 Werner Macho 	2013-11-23
 
     Merge pull request #1004 from tomass/master
 
     Lithuanian translation update
 
-Merge: a9d92cd 34e1bd2
+Merge: a9d92cdcf4 34e1bd2377
 Marco Hugentobler 	2013-11-23
 
     Merge branch 'dxf_export' of github.com:mhugent/Quantum-GIS into dxf_export
@@ -64179,7 +130528,7 @@ Werner Macho 	2013-11-22
 
     translation update: lt, adding new translator
 
-Merge: d863715 abcfe7b
+Merge: d8637156a7 abcfe7b904
 Werner Macho 	2013-11-22
 
     Merge pull request #1002 from Jean-Roc/traduction_ui
@@ -64190,7 +130539,7 @@ Marco Hugentobler 	2013-11-22
 
     Start implementation of QgsDxfPaintDevice / Engine to export svg markers to dxf
 
-Merge: 80e625f f893863
+Merge: 80e625fc90 f893863084
 MORREALE Jean-Roc 	2013-11-22
 
     Merge pull request #6 from Ecologeek/translation_ui
@@ -64300,7 +130649,7 @@ Matthias Kuhn 	2013-11-20
 
     Fix #9099
 
-Merge: 039a4f5 298a052
+Merge: 039a4f5a33 298a0522de
 Paolo Cavallini 	2013-11-20
 
     Merge pull request #998 from ghtmtt/master
@@ -64319,7 +130668,7 @@ ahuarte47 	2013-11-20
 
     #8725: Show warning label for big simplify factor
 
-Merge: 944755a 8f7b4c1
+Merge: 944755af6a 8f7b4c1f0d
 Nyall Dawson 	2013-11-19
 
     Merge pull request #981 from nyalldawson/composer_settings3
@@ -64343,7 +130692,7 @@ nyalldawson 	2013-10-21
 
     [FEATURE] Add composer settings panel, with option to set default font for compositions
 
-Merge: 80e625f ee566a0
+Merge: 80e625fc90 ee566a09db
 Werner Macho 	2013-11-18
 
     Merge pull request #997 from yjacolin/englishTypoInUi
@@ -64402,7 +130751,7 @@ Marco Hugentobler 	2013-11-16
 
     Consider datum transform in raster projector
 
-Merge: dc078b8 836e1a8
+Merge: dc078b8122 836e1a8636
 ahuarte47 	2013-11-15
 
     Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
@@ -64472,7 +130821,7 @@ Matthias Kuhn 	2013-11-14
 
     [spatialite] Don't crash with NULL geometries (Fix #8739)
 
-Merge: d02e473 7c359d2
+Merge: d02e47339b 7c359d2a78
 Werner Macho 	2013-11-14
 
     Merge pull request #993 from Jean-Roc/master
@@ -64483,7 +130832,7 @@ Juergen E. Fischer 	2013-11-14
 
     report found Qt version on build
 
-Merge: c26fecf af73f30
+Merge: c26fecf095 af73f30c27
 ahuarte47 	2013-11-14
 
     Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
@@ -64502,7 +130851,7 @@ Juergen E. Fischer 	2013-11-12
 
     spatialite: update more infinite where clauses (followup 371f9ba17)
 
-Merge: 2f35a7b d3cd331
+Merge: 2f35a7b404 d3cd331c44
 ahuarte47 	2013-11-14
 
     Merge remote-tracking branch 'origin/Issue_9062' into Issue_8725-OGR
@@ -64522,7 +130871,7 @@ Alvaro Huarte 	2013-11-13
 
     #8725: Replace malloc by OGRMalloc
 
-Merge: e890e14 7dfa21c
+Merge: e890e14938 7dfa21c9ef
 MORREALE Jean-Roc 	2013-11-13
 
     Merge pull request #5 from MarieSilvestre/master
@@ -64579,7 +130928,7 @@ Juergen E. Fischer 	2013-11-12
 
     [FEATURE] leave backup when saving projects
 
-Merge: 3d0b286 7613141
+Merge: 3d0b28649e 761314197c
 volaya 	2013-11-12
 
     Merge pull request #986 from p0cisk/processing_crs
@@ -64617,7 +130966,7 @@ Victor Olaya 	2013-11-11
 
     Adds the following R scripts contributed by Yury Ryabov ( riabovvv(at)gmail.com ): Advanced raster histogram, Monte carlo spatial randomness, Relative distribution (distance covariate), Relative distribution (raster covariate),
 
-Merge: f2ca9a1 371f9ba
+Merge: f2ca9a194a 371f9ba17e
 ahuarte47 	2013-11-11
 
     Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
@@ -64658,7 +131007,7 @@ Werner Macho 	2013-11-10
 
     translation update: ht_HR
 
-Merge: b21adc1 6aa4d95
+Merge: b21adc1c9c 6aa4d95302
 Marco Hugentobler 	2013-11-08
 
     [FEATURE] selection of datum transformation for otf-reprojection
@@ -64683,7 +131032,7 @@ Marco Hugentobler 	2013-11-08
 
     Write linetypes for simple line with custom dash pattern
 
-Merge: bff6fe5 e66bd80
+Merge: bff6fe5913 e66bd8039e
 Werner Macho 	2013-11-08
 
     Merge pull request #990 from rduivenvoorde/cppdocfix
@@ -64698,7 +131047,7 @@ Marco Hugentobler 	2013-11-08
 
     Set higher coord_op values for ntv2 to separate them from the entries coming from datum_transform.csv
 
-Merge: 2cfe27b bff6fe5
+Merge: 2cfe27b8f9 bff6fe5913
 ahuarte47 	2013-11-08
 
     Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
@@ -64711,7 +131060,7 @@ Nathan Woodrow 	2013-11-07
 
     Set currentfeature expression variable for Atlas printing. Fix #8766
 
-Merge: e63e92e 866cee4
+Merge: e63e92e7e3 866cee4f22
 Alvaro Huarte 	2013-11-07
 
     Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
@@ -64724,7 +131073,7 @@ Marco Hugentobler 	2013-11-07
 
     Set legend drawing order if creating a new project
 
-Merge: b6f7525 c7a23b4
+Merge: b6f7525467 c7a23b4ce0
 Werner Macho 	2013-11-06
 
     Merge pull request #988 from tomass/master
@@ -64783,7 +131132,7 @@ Juergen E. Fischer 	2013-11-05
 
     oracle provider: optionally use extents from metadata table (implements #8850)
 
-Merge: e18dcbf 872e500
+Merge: e18dcbf751 872e500679
 mhugent 	2013-11-05
 
     Merge pull request #984 from BioEcoForests/master
@@ -64794,7 +131143,7 @@ Marco Hugentobler 	2013-11-05
 
     Add dxf export gui and menu entry in qgisapp
 
-Merge: eb6ca1e 2bf0b2e
+Merge: eb6ca1e098 2bf0b2e901
 mhugent 	2013-11-05
 
     Merge pull request #640 from mhugent/labeling_performance
@@ -64812,7 +131161,7 @@ ahuarte47 	2013-11-05
 
     Feature #8725: fix merge changes
 
-Merge: 5441a1e eb6ca1e
+Merge: 5441a1ebff eb6ca1e098
 ahuarte47 	2013-11-04
 
     Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
@@ -64933,7 +131282,7 @@ nyalldawson 	2013-11-01
 
     Consolidate all composer tools/add item actions to same toolbar, make this toolbar display on left of compositions by default
 
-Merge: ad27dfe 864df0f
+Merge: ad27dfe1c6 864df0fe37
 Nyall Dawson 	2013-10-31
 
     Merge pull request #923 from nyalldawson/gradient_fill2
@@ -65015,14 +131364,14 @@ Alexander Bruy 	2013-10-29
 
     [processing] fix issue wil multiple selection
 
-Merge: 9832ed9 ab1766c
+Merge: 9832ed9927 ab1766c179
 mhugent 	2013-10-29
 
     Merge pull request #976 from nyalldawson/composer_zoom_marquee2
 
     Composer zoom improvements v2
 
-Merge: ac0c5d1 d47e128
+Merge: ac0c5d1bd2 d47e128948
 mhugent 	2013-10-29
 
     Merge pull request #978 from nyalldawson/composer_statusbar
@@ -65070,7 +131419,7 @@ Juergen E. Fischer 	2013-10-29
 
     translation string fix and german translation update
 
-Merge: e6d1093 d90801a
+Merge: e6d1093386 d90801a7d2
 Werner Macho 	2013-10-28
 
     Merge pull request #979 from Jean-Roc/master
@@ -65085,7 +131434,7 @@ Martin Dobias 	2013-10-28
 
     Message bar: do not add menu with "close all" if there is just one message
 
-Merge: 1d87841 e96dee6
+Merge: 1d87841f8a e96dee6027
 MORREALE Jean-Roc 	2013-10-28
 
     Merge pull request #4 from Ecologeek/master
@@ -65120,7 +131469,7 @@ Denis Rouzaud 	2013-10-28
 
     add LayerSelection idetinfy mode in SIP
 
-Merge: 5aac8bb 990a25a
+Merge: 5aac8bbfe0 990a25a3a3
 Denis Rouzaud 	2013-10-28
 
     Merge pull request #974 from leyan/topology_bug
@@ -65131,7 +131480,7 @@ nyalldawson 	2013-10-28
 
     Ensure map is centered when updating map extent (fix #6988)
 
-Merge: 7508fcc 2689f99
+Merge: 7508fcc1ed 2689f99703
 Denis Rouzaud 	2013-10-27
 
     Merge pull request #975 from leyan/topology_bug_2
@@ -65228,7 +131577,7 @@ Juergen E. Fischer 	2013-10-24
 
     indentation update and a few fixed typos
 
-Merge: fc74f66 f6a6a0c
+Merge: fc74f6674c f6a6a0c017
 Jürgen Fischer 	2013-10-24
 
     Merge pull request #966 from luipir/SITA3-WmsGetLegendGraphicManagement
@@ -65323,7 +131672,7 @@ nyalldawson 	2013-10-21
 
     Fix precision problems with composer marquee select by using a QRectF instead of a QRect for marquee bounds
 
-Merge: 0f82df1 91c8a3c
+Merge: 0f82df1ef2 91c8a3cd22
 mhugent 	2013-10-20
 
     Merge pull request #901 from sbrunner/legend-rule
@@ -65348,7 +131697,7 @@ Juergen E. Fischer 	2013-10-20
 
     osgeo4w: fix creatensis.pl
 
-Merge: 2b99414 6aecb09
+Merge: 2b99414c9e 6aecb098a0
 Werner Macho 	2013-10-20
 
     Merge pull request #968 from Jean-Roc/traduction_ui
@@ -65375,98 +131724,98 @@ Victor Olaya 	2013-10-13
 
     [processing] corrected string
 
-Merge: 16ac256 6406835
+Merge: 16ac256311 64068356b6
 volaya 	2013-10-20
 
     Merge pull request #945 from gioman/grassrasterexport
 
     [processing] fixes GRASS raster export in order to cope with r.horizon and r.composite
 
-Merge: f0c9efb 84b682d
+Merge: f0c9efbf01 84b682d46e
 volaya 	2013-10-20
 
     Merge pull request #949 from gioman/sagarasterimportexport
 
     [processing] fixes SAGA import and export rasters
 
-Merge: 26702ab 4c80a07
+Merge: 26702abe0d 4c80a076a5
 volaya 	2013-10-20
 
     Merge pull request #954 from gioman/grassnvizcolor
 
     [processing] add COLOR parameter to nviz to allow draping rasters over the digital elevation model
 
-Merge: 54c576f 0bb3b23
+Merge: 54c576f711 0bb3b2385a
 volaya 	2013-10-20
 
     Merge pull request #953 from gioman/grasssagacomposite
 
     [processing] fixes SAGA RGBComposite and GRASS r.composite
 
-Merge: b7cdf5f c645342
+Merge: b7cdf5fd81 c645342c06
 volaya 	2013-10-20
 
     Merge pull request #950 from gioman/sagaresampling
 
     [processing] suggests to use different parameters with resampling in SAGA and to use the highest resolution when using SAGA raster calculator
 
-Merge: f724efd c5d6f70
+Merge: f724efd76c c5d6f70b1c
 volaya 	2013-10-20
 
     Merge pull request #948 from gioman/r_kappa
 
     [processing] no need to escape parameters in r.kappa as processing does it by default
 
-Merge: a9fea57 1038cd4
+Merge: a9fea57cd9 1038cd42fb
 volaya 	2013-10-20
 
     Merge pull request #947 from gioman/escapegrassparameters
 
     [processing] GRASS parameters values needs always to be escaped
 
-Merge: eb2200e b9f7c74
+Merge: eb2200ec30 b9f7c74a0f
 volaya 	2013-10-20
 
     Merge pull request #946 from gioman/r_horizon
 
     [processing] fixes GRASS r.horizon and adds r.horizon.height
 
-Merge: fbfafb9 4db8bba
+Merge: fbfafb9e2c 4db8bba253
 volaya 	2013-10-20
 
     Merge pull request #952 from gioman/sagaresamplingdescription
 
     [processing] better parameters descriptions for SAGA resampling tool
 
-Merge: 5386b28 fd8cb1f
+Merge: 5386b28aa7 fd8cb1fcba
 volaya 	2013-10-20
 
     Merge pull request #955 from gioman/v_select
 
     [processing] adds v.select
 
-Merge: 99ecb03 78bc437
+Merge: 99ecb03a85 78bc437da4
 volaya 	2013-10-20
 
     Merge pull request #957 from gioman/sagapointstatsforpoly
 
     [processing] Fix SAGA points stats for polygons
 
-Merge: 8a11a82 fecccda
+Merge: 8a11a82c6d fecccda364
 volaya 	2013-10-20
 
     Merge pull request #960 from gioman/sagakriging
 
     [processing] fixes Ordinary Kriging for both SAGA 2.10 and 2.0.8
 
-Merge: ac88d9f 10312cc
+Merge: ac88d9f38b 10312cc5ab
 volaya 	2013-10-20
 
     Merge pull request #961 from gioman/grassvectorexport
 
     [processing] fixes ticket #8814
 
-Merge: a7bf496 d09eb56
+Merge: a7bf496d28 d09eb56b74
 Werner Macho 	2013-10-20
 
     Merge pull request #967 from tomass/master
@@ -65557,7 +131906,7 @@ pcav 	2013-10-18
 
     IT GUI translation
 
-Merge: 7612e12 ba524fc
+Merge: 7612e12702 ba524fc268
 Marco Hugentobler 	2013-10-18
 
     Store relation between layer and coordinate transform in maprenderer class
@@ -65639,7 +131988,7 @@ nyalldawson 	2013-10-13
 
      [FEATURE] Add keyboard shortcuts for composer zoom in/out/full, group… …
 
-Merge: 591d9df 9290d7a
+Merge: 591d9dfb58 9290d7a8b1
 mhugent 	2013-10-17
 
     Merge pull request #930 from nyalldawson/pan_composer3
@@ -65655,14 +132004,14 @@ Matthias Kuhn 	2013-10-17
     use static locals instead of global pointers for some singletons
     (proably more valgrind happyness; followup 572bda85)
 
-Merge: 087b52b d7db4a5
+Merge: 087b52b734 d7db4a53cb
 mhugent 	2013-10-17
 
     Merge pull request #916 from nyalldawson/composer_grid2
 
     Composer grid fixes
 
-Merge: d7c29ae 8eb6c91
+Merge: d7c29ae32b 8eb6c91cc9
 Jürgen Fischer 	2013-10-17
 
     Merge pull request #965 from luipir/SITA2-WmsTileRetry
@@ -65801,7 +132150,7 @@ gioman 	2013-10-15
 
     fixes SAGA RGBComposite and GRASS r.composite
 
-Merge: bad4b77 67ac093
+Merge: bad4b7798f 67ac0939fe
 Werner Macho 	2013-10-15
 
     Merge pull request #951 from tomass/master
@@ -65844,7 +132193,7 @@ Werner Macho 	2013-10-15
 
     adding indian flag for mr
 
-Merge: 125decf 23af7f7
+Merge: 125decfc21 23af7f7e16
 Juergen E. Fischer 	2013-10-15
 
     Merge https://github.com/luipir/Quantum-GIS
@@ -65861,14 +132210,14 @@ Marco Hugentobler 	2013-10-15
 
     Add method to lookup datum transformations in srs.db
 
-Merge: e04b426 4f4ac81
+Merge: e04b426f00 4f4ac8120f
 Werner Macho 	2013-10-14
 
     Merge pull request #934 from Jean-Roc/traduction_ui
 
     update fr ui
 
-Merge: e04b426 fc9c43b
+Merge: e04b426f00 fc9c43bb27
 MORREALE Jean-Roc 	2013-10-14
 
     Merge pull request #3 from Ecologeek/traduction_ui
@@ -65980,7 +132329,7 @@ Victor Olaya 	2013-10-12
 
     [processing] fixed breaklines in script help
 
-Merge: f4e0c83 a15cbeb
+Merge: f4e0c83c6e a15cbebe06
 Werner Macho 	2013-10-12
 
     Merge pull request #931 from tomass/master
@@ -65991,7 +132340,7 @@ Tomas 	2013-10-12
 
     Lithuanian translatio update
 
-Merge: 572bda8 860a238
+Merge: 572bda85ab 860a2382b2
 Werner Macho 	2013-10-11
 
     Merge pull request #926 from ahuarte47/Issue_8769
@@ -66070,7 +132419,7 @@ Matthias Kuhn 	2013-10-10
 
     Add option to insert a NULL value in a value map when loaded from layer
 
-Merge: 6242025 1261d04
+Merge: 6242025318 1261d04484
 Werner Macho 	2013-10-09
 
     Merge pull request #929 from tomass/master
@@ -66199,7 +132548,7 @@ Victor Olaya 	2013-09-27
 
     made algorithms that require open layers (not just file paths) not to appear in modeler ant batch processign interface
 
-Merge: 4072e39 442b236
+Merge: 4072e39227 442b236ac9
 volaya 	2013-10-06
 
     Merge pull request #921 from gioman/master
@@ -66218,7 +132567,7 @@ Giovanni Manghi 	2013-10-05
 
     add the -r parameter to r.external (used now to create grass inputs for processing, replacing r.in.gdal) and so fixes grass modules like r.reclass.area and probably many others
 
-Merge: 6d5cf6f 934e485
+Merge: 6d5cf6fd98 934e4855ec
 Chris Crook 	2013-10-04
 
     Merge pull request #917 from matthias-kuhn/csv_test_fix
@@ -66329,7 +132678,7 @@ Nyall Dawson 	2013-09-17
     [FEATURE] Always draw selection handles on top of composition, add dashed border for selected items (fix #7793)
     Move responsibility for drawing selection mouse handles and mouse interaction with selection to new class
 
-Merge: dd914b8 96bd7e7
+Merge: dd914b81e2 96bd7e7f2e
 pcav 	2013-10-01
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -66350,7 +132699,7 @@ Alexander Bruy 	2013-09-30
 
     [processing] handle non-ASCII characters in layer name when exporting (fix #8673)
 
-Merge: 814ae4c 7004a05
+Merge: 814ae4c781 7004a05934
 volaya 	2013-09-30
 
     Merge pull request #915 from gioman/master
@@ -66377,7 +132726,7 @@ Giovanni Manghi 	2013-09-29
 
     Update supervisedclassification.py
 
-Merge: cfa3464 40d41ca
+Merge: cfa34641b0 40d41cace3
 Werner Macho 	2013-09-29
 
     Merge pull request #914 from tomass/master
@@ -66388,14 +132737,14 @@ Tomas 	2013-09-29
 
     Lithuanian translation update
 
-Merge: a95f07c 3e382da
+Merge: a95f07cb62 3e382dac77
 Larry Shaffer 	2013-09-28
 
     Merge pull request #905 from yellow-sky/show_partial_labels
 
     Show partials labels
 
-Merge: 121d76e 315e7e2
+Merge: 121d76e2a7 315e7e2156
 Werner Macho 	2013-09-28
 
     Merge pull request #913 from tomass/master
@@ -66410,7 +132759,7 @@ root 	2013-09-27
 
     Lithuanian translation update
 
-Merge: 94d7389 9d8d317
+Merge: 94d73893df 9d8d317842
 pcav 	2013-09-27
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -66423,14 +132772,14 @@ Juergen E. Fischer 	2013-09-27
 
     fix instant crash on windows
 
-Merge: b6ca151 a5ee91a
+Merge: b6ca15192e a5ee91a331
 volaya 	2013-09-26
 
     Merge pull request #912 from bstroebl/selectByAttribute
 
     [processing] Make select by attribute work
 
-Merge: 7a720c2 e5a7210
+Merge: 7a720c2166 e5a72107eb
 volaya 	2013-09-26
 
     Merge pull request #911 from bstroebl/testEliminate
@@ -66441,7 +132790,7 @@ Alexander Bruy 	2013-09-26
 
     [processing] sync GDAL algorithm names with Raster menu
 
-Merge: 012e8b1 c222c67
+Merge: 012e8b18b4 c222c67aed
 pcav 	2013-09-26
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -66458,7 +132807,7 @@ yellow-sky 	2013-09-26
 
     Unit tests for ShowingPartialsLabels reorganized
 
-Merge: b9b4119 770e52b
+Merge: b9b4119879 770e52b0e5
 pcav 	2013-09-26
 
     Merge branch 'master' of github.com:qgis/QGIS
@@ -66606,7 +132955,7 @@ Victor Olaya 	2013-09-23
 
     [processing] added -TRANSFORM parameter in SAGA
 
-Merge: 6c2fa21 ae5c68b
+Merge: 6c2fa21992 ae5c68b18d
 Otto Dassau 	2013-09-23
 
     Merge pull request #908 from eykamp/patch-1
@@ -66617,7 +132966,7 @@ eykamp 	2013-09-23
 
     Grammar
 
-Merge: f758597 1bc397d
+Merge: f7585979b0 1bc397d3ac
 Marco Hugentobler 	2013-09-23
 
     Merge branch 'info_layer_selection'
@@ -66628,7 +132977,7 @@ Marco Hugentobler 	2013-09-23
 
     This reverts commit 9bc8c805f115d5f1c9067e61899827961a856e40.
 
-Merge: 9bc8c80 186b6bd
+Merge: 9bc8c805f1 186b6bd51a
 Marco Hugentobler 	2013-09-23
 
     [Feature]: Add anchor point setting for marker symbol layers
@@ -66720,7 +133069,7 @@ Victor Olaya 	2013-09-20
 
     [processing] fixes issue in saga with multiple inputs
 
-Merge: 6f638a5 9dbd8fa
+Merge: 6f638a5ac8 9dbd8fa3b1
 Werner Macho 	2013-09-21
 
     Merge pull request #904 from ndamiens/tradfr
@@ -66832,14 +133181,14 @@ Juergen E. Fischer 	2013-09-18
 
     more URL updates (followup 8c479db7)
 
-Merge: 27ee738 a781e1e
+Merge: 27ee738830 a781e1e2fb
 Nathan Woodrow 	2013-09-18
 
     Merge pull request #786 from minorua/gdaltools_of2
 
     GdalTools: apply selected name filter to -of parameter (fix #8408)
 
-Merge: 718f556 8c479db
+Merge: 718f556199 8c479db7fe
 Nathan Woodrow 	2013-09-17
 
     Merge pull request #900 from simonokeefe/patch-1
@@ -66933,7 +133282,7 @@ Werner Macho 	2013-09-16
 
     translation update: pt_BR by Arthur
 
-Merge: 68d12b4 8fb9816
+Merge: 68d12b45b1 8fb9816c67
 Tim Sutton 	2013-09-15
 
     Merge pull request #898 from dakcarto/test_appstartup_1
@@ -67001,7 +133350,7 @@ Marco Hugentobler 	2013-09-15
 
     More symbology updates for dxf
 
-Merge: 5d60b28 1670a27
+Merge: 5d60b2840c 1670a27423
 Werner Macho 	2013-09-15
 
     Merge pull request #897 from astroidex/master
@@ -67054,7 +133403,7 @@ Alexander Bruy 	2013-09-15
 
     [processing] restore Polygonize algorithm functionality (fix #8252)
 
-Merge: a0ff6d5 6ec9e75
+Merge: a0ff6d5c7c 6ec9e75ca1
 Werner Macho 	2013-09-15
 
     Merge pull request #896 from astroidex/master
@@ -67149,7 +133498,7 @@ Alexander Bruy 	2012-12-08
 
     [FEATURE] new Scintilla-based script editor for Processing
 
-Merge: 64c947b 617fa68
+Merge: 64c947b2f0 617fa68722
 mhugent 	2013-09-15
 
     Merge pull request #893 from sbrunner/scalehint
@@ -67160,21 +133509,21 @@ Marco Hugentobler 	2013-09-15
 
     Dxf: add more header fields, min/max extent and a test linestyle
 
-Merge: 503d32b a8b9d43
+Merge: 503d32b3a3 a8b9d439e4
 Tim Sutton 	2013-09-15
 
     Merge pull request #749 from Oslandia/issue8045b
 
     Unit tests for command line arguments
 
-Merge: 7e171ef 9494365
+Merge: 7e171ef7b0 9494365b32
 mhugent 	2013-09-15
 
     Merge pull request #894 from sbrunner/legend-scale
 
     Use scale parameter to display concerned class
 
-Merge: a1a95c1 6e31245
+Merge: a1a95c179f 6e312456f4
 Tim Sutton 	2013-09-15
 
     Merge pull request #720 from Oslandia/issue6483
@@ -67340,14 +133689,14 @@ Juergen E. Fischer 	2013-09-13
 
     fix retrieval of PYTHON_SITE_PACKAGES_DIR - broke debian builds
 
-Merge: b14e133 2b4e139
+Merge: b14e13388e 2b4e13930d
 mhugent 	2013-09-13
 
     Merge pull request #889 from sbrunner/string
 
     More general string value. …
 
-Merge: e7956a5 ccda1c4
+Merge: e7956a5ca1 ccda1c46f7
 mhugent 	2013-09-13
 
     Merge pull request #887 from sbrunner/environ_mapfile
@@ -67430,7 +133779,7 @@ Alexander Bruy 	2012-12-05
 
     [FEATURE] Model-View based config dialog for Processing (fix #5427)
 
-Merge: 9ce316d 6d5df7c
+Merge: 9ce316dbd3 6d5df7cb25
 Borys Jurgiel 	2013-09-13
 
     Merge pull request #892 from alexbruy/deprecated_plugins
@@ -67491,7 +133840,7 @@ Stéphane Brunner 	2013-09-12
     This option is used for GetFeature and GetfeatureInfo
     And for WKT and GML format
 
-Merge: 885c8b4 8a50ddb
+Merge: 885c8b495a 8a50ddb93f
 alexbruy 	2013-09-12
 
     Merge pull request #731 from ddanielvaz/bugfix-6063
@@ -67506,7 +133855,7 @@ Stéphane Brunner 	2013-09-12
     like:
     SetEnv QGIS_PROJECT_FILE  .qgs
 
-Merge: e72088c 272b6e1
+Merge: e72088cddb 272b6e1858
 alexbruy 	2013-09-12
 
     Merge pull request #799 from slarosa/warning_simplifyTool
@@ -67529,7 +133878,7 @@ Larry Shaffer 	2013-09-11
 
     [globe] Add path to gui images when running from build directory
 
-Merge: 4200046 ba4e438
+Merge: 4200046d8c ba4e438c05
 Luigi Pirelli 	2013-09-11
 
     Merge remote-tracking branch 'upstream/master'
@@ -67578,7 +133927,7 @@ Tim Sutton 	2013-09-10
 
     Updated news
 
-Merge: 641359d f361e11
+Merge: 641359d3cb f361e11c2a
 Denis Rouzaud 	2013-09-10
 
     Merge pull request #741 from 3nids/splitpart
@@ -67606,7 +133955,7 @@ Christian Urich 	2013-09-10
     made bool eventFilter( QObject *obj, QEvent *event ) protected instead of private
     made void showEvent( QShowEvent * ) and void hideEvent( QHideEvent * ) instead of private
 
-Merge: 5f61dd1 b61b5b0
+Merge: 5f61dd12fe b61b5b0f83
 Larry Shaffer 	2013-09-09
 
     Merge pull request #881 from mbernasocchi/android
@@ -67671,13 +134020,13 @@ Marco Bernasocchi 	2013-05-18
 
 Marco Bernasocchi 	2013-05-03
 
-#7752 for android        sip generation issue fix
+    sip generation issue fix        #7752 for android
 
 Larry Shaffer 	2013-09-09
 
     Fix #8587, show/hide labels tool throws Qt warning
 
-Merge: 3216390 c705034
+Merge: 3216390017 c705034977
 Luigi Pirelli 	2013-09-09
 
     Merge remote-tracking branch 'upstream/master'
@@ -67718,7 +134067,7 @@ Juergen E. Fischer 	2013-09-07
 
     fix another bunch of warnings
 
-Merge: feb79a8 5d093f4
+Merge: feb79a81f1 5d093f4e43
 Luigi Pirelli 	2013-09-08
 
     Merge remote-tracking branch 'upstream/master'
@@ -67747,7 +134096,7 @@ Hugo Mercier 	2013-06-12
 
      Add world file generation option. Work funded by Tuscany Region - SITA. Contract Support to the use of GFOSS \(Geographic Free and Open Source Software\) Desktop tools \(CIG Z3B06FA6D7\)
 
-Merge: 6b2fa67 f66f9aa
+Merge: 6b2fa67442 f66f9aaa3e
 Luigi Pirelli 	2013-09-07
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -67772,14 +134121,14 @@ Juergen E. Fischer 	2013-09-06
 
     make qgis_app a shared library and fix some more stl warnings with msvc
 
-Merge: 609bd69 3896c73
+Merge: 609bd69bbc 3896c73884
 Tim Sutton 	2013-09-06
 
     Merge pull request #871 from slarosa/fix_crash_core_plugins
 
     Fix crash in core plugins
 
-Merge: 721fe27 c2d98e7
+Merge: 721fe279ed c2d98e7dc3
 Tim Sutton 	2013-09-06
 
     Merge pull request #870 from etiennesky/browsericons
@@ -67889,7 +134238,7 @@ Juergen E. Fischer 	2013-09-05
 
     fix atlas composition warnings with msvc 64bit
 
-Merge: 1aa5daf 00041e6
+Merge: 1aa5dafdf0 00041e6d1d
 Paolo Cavallini 	2013-09-05
 
     Merge pull request #665 from Oslandia/overview_centering
@@ -67933,14 +134282,14 @@ Juergen E. Fischer 	2013-09-05
 
     osgeo4w: fix shortcut removal
 
-Merge: dcc9b2a cf6ad67
+Merge: dcc9b2a159 cf6ad67743
 Jürgen Fischer 	2013-09-04
 
     Merge pull request #873 from Cracert/i18n
 
     [function help] In strpos() needle is string, not number
 
-Merge: 7030b1a 51f42dd
+Merge: 7030b1ad46 51f42dd36d
 Werner Macho 	2013-09-04
 
     Merge pull request #872 from Cracert/tr
@@ -67979,7 +134328,7 @@ Juergen E. Fischer 	2013-09-04
 
     fix crash in coordinate capture plugin
 
-Merge: 7fc8ad8 f6e0bbc
+Merge: 7fc8ad8e2a f6e0bbc24e
 Jürgen Fischer 	2013-09-04
 
     Merge pull request #852 from borysiasty/installer_v2
@@ -68002,7 +134351,7 @@ Etienne Tourigny 	2013-09-04
 
     use svg icons in browser dock for uI consistency
 
-Merge: e6a4f2f 3d3f81d
+Merge: e6a4f2f808 3d3f81debd
 Borys Jurgiel 	2013-09-04
 
     Merge pull request #869 from Cracert/master
@@ -68035,7 +134384,7 @@ Juergen E. Fischer 	2013-09-04
 
     update TRANSLATORS file
 
-Merge: d4e8e1f 4bd91f2
+Merge: d4e8e1ff16 4bd91f2d97
 Werner Macho 	2013-09-04
 
     Merge pull request #868 from artfwo/master
@@ -68058,7 +134407,7 @@ Werner Macho 	2013-09-04
 
     translation update: nl by diethard
 
-Merge: 14f639d 164d2fe
+Merge: 14f639d568 164d2fe393
 Werner Macho 	2013-09-03
 
     Merge pull request #866 from Cracert/master
@@ -68105,14 +134454,14 @@ Juergen E. Fischer 	2013-09-03
 
     german translation update
 
-Merge: b0664f4 cf0b7b0
+Merge: b0664f473f cf0b7b0dfd
 Werner Macho 	2013-09-03
 
     Merge pull request #864 from Jean-Roc/traduction_ui
 
     update fr translation
 
-Merge: e7a3215 c331f1e
+Merge: e7a321559b c331f1e76f
 Werner Macho 	2013-09-03
 
     Merge pull request #865 from yoichigmf/forpullreq
@@ -68139,7 +134488,7 @@ pcav 	2013-09-03
 
     IT GUI translation almost finished
 
-Merge: 70841a8 eb11479
+Merge: 70841a84f3 eb114799d7
 Nathan Woodrow 	2013-09-03
 
     Merge pull request #804 from nyalldawson/bug_8311
@@ -68170,7 +134519,7 @@ Matthias Kuhn 	2013-09-03
     [diagram] Workaround floating point errors leading to diagram distortion
     Fix #8554
 
-Merge: 9014d5c 5be1807
+Merge: 9014d5cf63 5be180706d
 Werner Macho 	2013-09-02
 
     Merge pull request #862 from Cracert/master
@@ -68185,7 +134534,7 @@ Werner Macho 	2013-09-03
 
     translation update: es by Carlos
 
-Merge: a339702 f5d41d5
+Merge: a3397025ab f5d41d5ddc
 Werner Macho 	2013-09-02
 
     Merge pull request #861 from Jean-Roc/traduction_ui
@@ -68204,7 +134553,7 @@ Matthias Kuhn 	2013-09-02
 
     [dualview] Remove unrequired connect()
 
-Merge: 91b9c11 8ff0f02
+Merge: 91b9c11b09 8ff0f02294
 Werner Macho 	2013-09-02
 
     Merge pull request #860 from Cracert/master
@@ -68267,7 +134616,7 @@ Salvatore Larosa 	2013-09-02
 
     [pyqgis-console] update pyqgis.pap file after 2d63dcf
 
-Merge: a2a2d7a 87e2ad7
+Merge: a2a2d7ac54 87e2ad7315
 Werner Macho 	2013-09-02
 
     Merge pull request #859 from Jean-Roc/traduction_ui
@@ -68290,7 +134639,7 @@ Werner Macho 	2013-09-02
 
     translation update: sv by Victor
 
-Merge: d8b05c2 868974e
+Merge: d8b05c241a 868974e4ea
 Werner Macho 	2013-09-02
 
     Merge pull request #857 from artfwo/master
@@ -68311,7 +134660,7 @@ pcav 	2013-09-02
 
     More IT GUI translation
 
-Merge: f4b2c16 514e899
+Merge: f4b2c16e49 514e899608
 Werner Macho 	2013-09-01
 
     Merge pull request #855 from asiersarasua/master
@@ -68322,7 +134671,7 @@ Werner Macho 	2013-09-02
 
     translation update: id by Trias and ko_KR by BJ
 
-Merge: c48243c 33fe3c8
+Merge: c48243cbe5 33fe3c8193
 Werner Macho 	2013-09-01
 
     Merge pull request #856 from Cracert/master
@@ -68355,7 +134704,7 @@ Werner Macho 	2013-09-01
 
     translation update: gl and zh_CN
 
-Merge: cae08e4 d876560
+Merge: cae08e4215 d87656051a
 Werner Macho 	2013-09-01
 
     Merge pull request #854 from Jean-Roc/traduction_ui
@@ -68393,7 +134742,7 @@ Werner Macho 	2013-09-01
 
     translation update: danish by jacob
 
-Merge: 3ac0759 7c726ee
+Merge: 3ac0759b04 7c726eebd5
 Werner Macho 	2013-09-01
 
     Merge pull request #853 from gioman/master
@@ -68421,7 +134770,7 @@ Werner Macho 	2013-09-01
 
     translation update: es gl and ja
 
-Merge: 74b60c6 f516759
+Merge: 74b60c6c6f f516759bf8
 Werner Macho 	2013-09-01
 
     Merge pull request #850 from yoichigmf/translate_ja
@@ -68470,7 +134819,7 @@ Werner Macho 	2013-08-31
 
     translation update: pl by robert
 
-Merge: 6e19748 735f534
+Merge: 6e197484ed 735f534680
 Werner Macho 	2013-08-31
 
     Merge pull request #849 from gioman/master
@@ -68496,7 +134845,7 @@ Werner Macho 	2013-08-31
 
     last translation update before branching
 
-Merge: 460b007 e56b1bc
+Merge: 460b00786a e56b1bc72b
 Werner Macho 	2013-08-31
 
     Merge pull request #847 from Cracert/tr
@@ -68529,7 +134878,7 @@ Larry Shaffer 	2013-08-30
 
     [labeling] Fix python bindings for access to data defined properties
 
-Merge: f5585d8 94a440f
+Merge: f5585d8be7 94a440f56d
 pcav 	2013-08-31
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -68538,14 +134887,14 @@ pcav 	2013-08-31
 
     List of IT translators updated and sorted
 
-Merge: 9b72523 b14ffb7
+Merge: 9b72523f83 b14ffb7c1e
 Nathan Woodrow 	2013-08-31
 
     Merge pull request #844 from minorua/union_attrs
 
     fTools/union: fix output attribute shift
 
-Merge: 17d5fe9 1380e45
+Merge: 17d5fe980b 1380e45e22
 Werner Macho 	2013-08-30
 
     Merge pull request #843 from Cracert/master
@@ -68560,7 +134909,7 @@ Robert Szczepanek 	2013-08-31
 
     pl translation upadte: raster layers
 
-Merge: dc46285 53d8cf4
+Merge: dc4628599e 53d8cf469e
 Werner Macho 	2013-08-30
 
     Merge pull request #841 from Cracert/master
@@ -68581,7 +134930,7 @@ Robert Szczepanek 	2013-08-30
 
     pl translation update; forms
 
-Merge: b99d51d e162506
+Merge: b99d51d7cd e1625060bb
 Werner Macho 	2013-08-30
 
     Merge pull request #840 from artfwo/master
@@ -68621,7 +134970,7 @@ Hien TRAN-QUANG 	2013-08-28
     Fix Blocker Issue #7871 : SVG Marker fill and outlin colors are restored
     when changing widget or reopening style window
 
-Merge: 8c4c57b 2d163e3
+Merge: 8c4c57b154 2d163e357b
 Werner Macho 	2013-08-29
 
     Merge pull request #839 from Cracert/master
@@ -68660,7 +135009,7 @@ Matthias Kuhn 	2013-08-29
 
     Small UI fix for "New PostGIS connection" dialog
 
-Merge: 84e38ca fe2f18a
+Merge: 84e38ca21c fe2f18ac4b
 Werner Macho 	2013-08-28
 
     Merge pull request #837 from Cracert/master
@@ -68691,7 +135040,7 @@ Werner Macho 	2013-08-28
 
     typo fixes for danish language
 
-Merge: b0ed8ed 2101af5
+Merge: b0ed8ed2bc 2101af517d
 Werner Macho 	2013-08-28
 
     Merge pull request #835 from artfwo/more-strings-fixes-in-vector-layer-properties
@@ -68735,7 +135084,7 @@ Werner Macho 	2013-08-28
 
     translation update: fi by Kari
 
-Merge: 3e27811 4c73b65
+Merge: 3e278110f2 4c73b65260
 Luigi Pirelli 	2013-08-28
 
     Merge remote-tracking branch 'upstream/master'
@@ -68744,7 +135093,7 @@ Salvatore Larosa 	2013-08-28
 
     [processing] sextante => processing renaming: fix example provider plugin
 
-Merge: 6552638 a10c1e3
+Merge: 6552638346 a10c1e3517
 Werner Macho 	2013-08-27
 
     Merge pull request #833 from Cracert/master
@@ -68783,7 +135132,7 @@ Salvatore Larosa 	2013-08-27
 
     [pyqgis-console] small fix for autocompletion bracket, also sets to False the default setting
 
-Merge: 97a3a4f 2398105
+Merge: 97a3a4f0b2 239810581b
 Borys Jurgiel 	2013-08-27
 
     Merge pull request #769 from vinayan/topol
@@ -68794,7 +135143,7 @@ Juergen E. Fischer 	2013-08-27
 
     fix 16f768f9
 
-Merge: e0a1d15 2800191
+Merge: e0a1d153a9 28001918e5
 Werner Macho 	2013-08-27
 
     Merge pull request #832 from asiersarasua/master
@@ -68821,7 +135170,7 @@ Werner Macho 	2013-08-27
 
     translation update for gl, id, nl and pt_PT
 
-Merge: 80c9199 c6e4838
+Merge: 80c9199069 c6e483890b
 Werner Macho 	2013-08-27
 
     Merge pull request #831 from artfwo/raster-minmax-label-fix
@@ -68848,7 +135197,7 @@ Werner Macho 	2013-08-26
 
     translation update: fi by Kari
 
-Merge: b08f47d 071fa92
+Merge: b08f47d28c 071fa924be
 Artem Popov 	2013-08-26
 
     Merge remote-tracking branch 'upstream/master'
@@ -68865,28 +135214,28 @@ Juergen E. Fischer 	2013-08-26
 
     german translation update
 
-Merge: f5ca533 45c5a8c
+Merge: f5ca5336a8 45c5a8c7c4
 Werner Macho 	2013-08-25
 
     Merge pull request #815 from artfwo/raster-minmax-label-fix
 
     Untranslatable strings and formatting of the raster min/max label
 
-Merge: 58a3f01 dffd64c
+Merge: 58a3f01f9e dffd64c349
 Werner Macho 	2013-08-25
 
     Merge pull request #816 from artfwo/properties-untranslatable-tooltip
 
     Fix untranslatable tooltip in project properties.
 
-Merge: 78264a0 3706786
+Merge: 78264a0720 3706786f6c
 Werner Macho 	2013-08-25
 
     Merge pull request #830 from artfwo/master
 
     Russian translation update.
 
-Merge: 3706786 78264a0
+Merge: 3706786f6c 78264a0720
 Artem Popov 	2013-08-26
 
     Merge remote-tracking branch 'upstream/master'
@@ -68909,7 +135258,7 @@ Werner Macho 	2013-08-25
 
     translation update: nl by Richard
 
-Merge: bb798b4 8e43791
+Merge: bb798b4ab3 8e437912b4
 mhugent 	2013-08-25
 
     Merge pull request #829 from mhugent/ogr_odbc_subset
@@ -68956,7 +135305,7 @@ Juergen E. Fischer 	2013-08-25
 
     creatensis.pl: allow installation from other osgeo4w url and collect license texts
 
-Merge: 6937e4f 6899a17
+Merge: 6937e4f913 6899a1756c
 mhugent 	2013-08-24
 
     Merge pull request #800 from minorua/8440
@@ -68979,7 +135328,7 @@ pcav 	2013-08-23
 
     Updated list of translators
 
-Merge: c9cf745 8aa7795
+Merge: c9cf745268 8aa779500b
 pcav 	2013-08-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -69008,14 +135357,14 @@ Marco Hugentobler 	2013-08-23
 
     Fix form annotations not showing in composer
 
-Merge: f8ac3a4 fc2a4a1
+Merge: f8ac3a4ee0 fc2a4a14fa
 Giuseppe Sucameli 	2013-08-23
 
     Merge pull request #827 from slarosa/fix_6892
 
     [dbmanager] skip RuntimeError: fixes #6892
 
-Merge: 418ba87 dd0eda2
+Merge: 418ba870fb dd0eda2762
 Werner Macho 	2013-08-23
 
     Merge pull request #828 from Jean-Roc/traduction_ui
@@ -69042,7 +135391,7 @@ Salvatore Larosa 	2013-08-22
 
     [dbmanager] skip RuntimeError: fixes #6892
 
-Merge: 1bb2725 a765b5a
+Merge: 1bb27253c5 a765b5a644
 mhugent 	2013-08-22
 
     Merge pull request #824 from rldhont/8473
@@ -69102,7 +135451,7 @@ Larry Shaffer 	2013-08-20
     - Load test font from testdata.qrc if app or server built with ENABLE_TESTS
     - Add global loading of test font in utilities.py
 
-Merge: 363b5de 54b45e7
+Merge: 363b5deb85 54b45e7c38
 Werner Macho 	2013-08-21
 
     Merge pull request #825 from yoichigmf/for_pull_req
@@ -69218,7 +135567,7 @@ William Kyngesburye 	2013-08-17
 
     check for bundled GRASS for gisbase on OS X
 
-Merge: 0b5c4eb b1bad51
+Merge: 0b5c4eb4c4 b1bad519dd
 Werner Macho 	2013-08-17
 
     Merge pull request #821 from asiersarasua/master
@@ -69251,7 +135600,7 @@ Borys Jurgiel 	2013-08-16
 
     translation update: pl
 
-Merge: 6366f5b 4957d57
+Merge: 6366f5b272 4957d57cd8
 Werner Macho 	2013-08-16
 
     Merge pull request #820 from Jean-Roc/traduction_ui
@@ -69282,14 +135631,14 @@ Werner Macho 	2013-08-16
 
     translation update: string update for all languages
 
-Merge: 116bbff 2a4f4d6
+Merge: 116bbff23b 2a4f4d6990
 Nathan Woodrow 	2013-08-16
 
     Merge pull request #818 from 3nids/undodigitize
 
     fix crash at undo in digitize
 
-Merge: 4e69997 96834b2
+Merge: 4e699971c3 96834b229b
 Werner Macho 	2013-08-16
 
     Merge pull request #819 from artfwo/master
@@ -69308,7 +135657,7 @@ Marco Hugentobler 	2013-08-16
 
     Fix #8471
 
-Merge: 2046342 d10872a
+Merge: 2046342409 d10872a063
 mhugent 	2013-08-15
 
     Merge pull request #817 from artfwo/save-style-window-title-fix
@@ -69327,7 +135676,7 @@ Artem Popov 	2013-08-16
 
     Untranslatable strings and formatting of the raster min/max label
 
-Merge: 74367c5 9d19752
+Merge: 74367c5b7f 9d1975213a
 Werner Macho 	2013-08-15
 
     Merge pull request #814 from slarosa/fix_8469
@@ -69358,7 +135707,7 @@ Denis Rouzaud 	2013-08-09
 
     more complete QgsMessageBarItem: inherits from QWidget to allow further editing
 
-Merge: 25e79f9 66a7afa
+Merge: 25e79f9f3b 66a7afa8e6
 Tim Sutton 	2013-08-15
 
     Merge pull request #698 from 3nids/svgpan
@@ -69369,7 +135718,7 @@ Denis Rouzaud 	2013-07-04
 
     replace pan icon by a hand, and accord panToSelected to already used colors
 
-Merge: 58b7910 93a5879
+Merge: 58b79108ea 93a5879f86
 Nathan Woodrow 	2013-08-14
 
     Merge pull request #811 from 3nids/fixrubber
@@ -69392,7 +135741,7 @@ Alexander Bruy 	2013-08-14
 
     [sextante] update modeller to changes in parameter vector
 
-Merge: fef6e2b bc07232
+Merge: fef6e2b601 bc0723228e
 Nathan Woodrow 	2013-08-14
 
     Merge pull request #810 from 3nids/fixwarning
@@ -69412,7 +135761,7 @@ Larry Shaffer 	2013-08-13
     - Report all failures to one random temp HTML file
     - Better HTML output for report
 
-Merge: d1768b8 fcb6d64
+Merge: d1768b85fc fcb6d64e02
 Salvatore Larosa 	2013-08-13
 
     Merge pull request #806 from 3nids/fix8399
@@ -69517,7 +135866,7 @@ Larry Shaffer 	2013-08-08
 
     - Note: some tests will fail until differences in platform dpi are worked out
 
-Merge: 58477fe 0d34eb1
+Merge: 58477fea01 0d34eb1c8d
 Werner Macho 	2013-08-11
 
     Merge pull request #801 from yoichigmf/work_translation
@@ -69560,7 +135909,7 @@ pcav 	2013-08-09
 
     Updated list of IT translators
 
-Merge: 2087de1 c1cde94
+Merge: 2087de1060 c1cde94c4c
 Nathan Woodrow 	2013-08-08
 
     Merge pull request #798 from 3nids/maptoolcapturerubber
@@ -69607,14 +135956,14 @@ Alexander Bruy 	2013-08-08
 
     [sextante] fix obtaining vector layers
 
-Merge: b88b76b 0523e89
+Merge: b88b76b510 0523e8984c
 alexbruy 	2013-08-08
 
     Merge pull request #760 from ddanielvaz/partial-fix-7708
 
     Partial fix for #7708
 
-Merge: 6fe077c 25c4337
+Merge: 6fe077ca17 25c4337338
 alexbruy 	2013-08-08
 
     Merge pull request #755 from ddanielvaz/fix-4189
@@ -69625,7 +135974,7 @@ Werner Macho 	2013-08-08
 
     translation updates: fi, kr, and new translator added
 
-Merge: 1a18fba a523fa5
+Merge: 1a18fba2f8 a523fa51dc
 Werner Macho 	2013-08-08
 
     Merge pull request #792 from lynxlynxlynx/master
@@ -69636,14 +135985,14 @@ Salvatore Larosa 	2013-08-08
 
     [dbmanager] set columns tab as default in edit table widget (before was indexes tab)
 
-Merge: 1e28ce5 34344c5
+Merge: 1e28ce5273 34344c508d
 Werner Macho 	2013-08-08
 
     Merge pull request #797 from Jean-Roc/master
 
     update frenchu translation
 
-Merge: 41f8abb 001ad12
+Merge: 41f8abb159 001ad1265f
 alexbruy 	2013-08-08
 
     Merge pull request #791 from alexbruy/annotation-dialog
@@ -69665,7 +136014,7 @@ Nathan Woodrow 	2013-08-08
     Suppress warnings for setNamedColour.
     Warnings reneder composer unusable on windows, even for testing reasons.
 
-Merge: 113e6fb e63aaa0
+Merge: 113e6fbb84 e63aaa098d
 MORREALE Jean-Roc 	2013-08-07
 
     Merge pull request #2 from haubourg/master
@@ -69708,7 +136057,7 @@ Marco Hugentobler 	2013-08-07
 
     Mapserver: fix automatic normalisation of layer bbox (invalid bbox must stay invalid)
 
-Merge: 6149b3a 86a0da0
+Merge: 6149b3a6fa 86a0da07f9
 Werner Macho 	2013-08-06
 
     Merge pull request #793 from 3nids/typo
@@ -69719,7 +136068,7 @@ Denis Rouzaud 	2013-08-07
 
     typo
 
-Merge: 020ed2c 7608faf
+Merge: 020ed2c537 7608faf6cb
 Nyall Dawson 	2013-08-06
 
     Merge pull request #789 from nyalldawson/bug8192
@@ -69798,7 +136147,7 @@ Salvatore Larosa 	2013-08-06
     [ftools] fix polygon from layer extent tool:
     with the "Calculate extent for each feature separately" option ticked, it generates a python error.
 
-Merge: 018e958 73142de
+Merge: 018e95845f 73142defec
 Werner Macho 	2013-08-05
 
     Merge pull request #790 from haubourg/master
@@ -69816,7 +136165,7 @@ Borys Jurgiel 	2013-08-04
 
     [Plugin Installer] fix #8410
 
-Merge: 53e6d8c 9292333
+Merge: 53e6d8c491 9292333acc
 Jürgen Fischer 	2013-08-04
 
     Merge pull request #643 from rduivenvoorde/optionalcleanups
@@ -69831,14 +136180,14 @@ nyalldawson 	2013-08-04
 
     Return minimal QgsRectangle as boundingBox if geometry not available, since QgsRectangle(0,0,0,0) may be a valid bounding box for some geometries
 
-Merge: e76fc95 21fcfd1
+Merge: e76fc956f6 21fcfd1052
 Werner Macho 	2013-08-04
 
     Merge pull request #787 from Jean-Roc/master
 
     update fr ui
 
-Merge: 834c5ab 3720feb
+Merge: 834c5ab172 3720feb587
 MORREALE Jean-Roc 	2013-08-04
 
     Merge pull request #1 from msemchaoui/msemchaoui_branche
@@ -69876,7 +136225,7 @@ Larry Shaffer 	2013-08-03
     - Switch from checkbox delegate to Qt::CheckStateRole for column
     - Enable all triggers for table view
 
-Merge: 0367182 4cb5d04
+Merge: 0367182ce4 4cb5d04848
 volaya 	2013-08-03
 
     Merge pull request #784 from ricardogsilva/sextante_issue_8407
@@ -69964,7 +136313,7 @@ Matthias Kuhn 	2013-08-01
 
     Fix QgsVectorLayer::EditType API doc
 
-Merge: 7c312f8 efd84bd
+Merge: 7c312f8a91 efd84bd022
 Giuseppe Sucameli 	2013-08-01
 
     Merge pull request #780 from slarosa/db_manager_fix
@@ -69979,7 +136328,7 @@ Werner Macho 	2013-07-31
 
     translation update
 
-Merge: 200fae7 d7119f0
+Merge: 200fae7441 d7119f0fc9
 Werner Macho 	2013-07-31
 
     Merge pull request #766 from imincik/slovak
@@ -69998,7 +136347,7 @@ pcav 	2013-07-31
 
     More IT GUI translation
 
-Merge: b9c9ec4 3aad6df
+Merge: b9c9ec440b 3aad6df8cc
 Nathan Woodrow 	2013-07-30
 
     Merge pull request #779 from ajdunlap/patch-1
@@ -70044,7 +136393,7 @@ Matthias Kuhn 	2013-07-30
 
     [symbology] Markerline does not crash on empty lines (Fix #8381)
 
-Merge: 812d1ed 6fce142
+Merge: 812d1ed1d8 6fce142db9
 Nathan Woodrow 	2013-07-29
 
     Merge pull request #765 from 3nids/rightclickdigitize
@@ -70055,7 +136404,7 @@ Denis Rouzaud 	2013-07-25
 
     right click ends digitizing without adding a vertex
 
-Merge: a13cdf8 eeaa867
+Merge: a13cdf8fb9 eeaa867e10
 Nathan Woodrow 	2013-07-29
 
     Merge pull request #776 from Oslandia/issue7926
@@ -70092,7 +136441,7 @@ Matthias Kuhn 	2013-07-28
     Switch from deprecated sip*Instance* calls to sip*Type* calls
     Min SIP version 4.8
 
-Merge: 8b41570 9cabd33
+Merge: 8b415708b1 9cabd33c0c
 Nathan Woodrow 	2013-07-28
 
     Merge pull request #773 from slarosa/fix_8366
@@ -70239,7 +136588,7 @@ Werner Macho 	2013-07-24
 
     translation update: czech by Jan
 
-Merge: 382e300 09b6bf9
+Merge: 382e300c22 09b6bf9520
 Werner Macho 	2013-07-24
 
     Merge pull request #764 from imincik/slovak
@@ -70254,7 +136603,7 @@ Marco Hugentobler 	2013-07-24
 
     Fix double layer space in GetLegendGraphic and remove code redundancy
 
-Merge: 0e55d55 a1632d9
+Merge: 0e55d55e18 a1632d9366
 Werner Macho 	2013-07-23
 
     Merge pull request #763 from SrNetoChan/master
@@ -70291,7 +136640,7 @@ Werner Macho 	2013-07-23
 
     translation update: nb_NO by James
 
-Merge: 5c2e3f3 82deaae
+Merge: 5c2e3f3e92 82deaae73d
 Werner Macho 	2013-07-23
 
     Merge pull request #762 from sbrunner/typo-fr
@@ -70322,7 +136671,7 @@ Werner Macho 	2013-07-23
 
     translation update: es, fi, ko_KR thanks to contributors
 
-Merge: 5ea75bd c7ca40a
+Merge: 5ea75bd5f0 c7ca40a859
 Jürgen Fischer 	2013-07-23
 
     Merge pull request #761 from minorua/label_enc
@@ -70362,7 +136711,7 @@ Juergen E. Fischer 	2013-07-22
 
     sync qgsrasterblock sip (followup eaa27aa4f)
 
-Merge: bfcdc93 335d7f0
+Merge: bfcdc9349e 335d7f02b4
 Jürgen Fischer 	2013-07-22
 
     Merge pull request #758 from 3nids/siprasterblock
@@ -70373,7 +136722,7 @@ Denis Rouzaud 	2013-07-22
 
     raster block: add missing hasNoData method in sip
 
-Merge: d0d2511 d394811
+Merge: d0d2511d13 d394811a08
 Werner Macho 	2013-07-22
 
     Merge pull request #754 from ddanielvaz/ptBR
@@ -70490,7 +136839,7 @@ D'Hont René-Luc 	2013-07-19
 
     Transform layerName for typeName in WFS GetCapabilities
 
-Merge: ddef9a9 1faadbc
+Merge: ddef9a90ca 1faadbcd86
 Werner Macho 	2013-07-19
 
     Merge pull request #750 from artfwo/master
@@ -70546,7 +136895,7 @@ Victor Olaya 	2013-07-15
     This reverts commit 1c2e49ed249a89480c1195f50c96614dc72700d3.
 
     Conflicts:
-python/plugins/sextante/saga/SagaAlgorithm.py
+            python/plugins/sextante/saga/SagaAlgorithm.py
 
 pcav 	2013-07-18
 
@@ -70593,7 +136942,7 @@ Alexander Bruy 	2013-07-18
 
     fix PyQgsSymbolLayerV2 test
 
-Merge: ab4fc78 728ec25
+Merge: ab4fc785e8 728ec25f02
 Werner Macho 	2013-07-18
 
     Merge pull request #748 from Jean-Roc/mywork
@@ -70623,7 +136972,7 @@ Juergen E. Fischer 	2013-07-17
     - read precision in mssql provider (fixes #5966)
     - commit errors are only shown once
 
-Merge: f1e0498 73a9255
+Merge: f1e0498dd0 73a9255417
 Werner Macho 	2013-07-17
 
     Merge pull request #745 from yoichigmf/for_pull_req
@@ -70689,7 +137038,7 @@ nyalldawson 	2013-07-08
 
     Fix calculation of heatmap raster size (fix #8194) - merged for further testing
 
-Merge: f4ac684 cf0676c
+Merge: f4ac684dde cf0676ca86
 Nathan Woodrow 	2013-07-16
 
     Merge pull request #743 from ddanielvaz/fix-7620
@@ -70732,14 +137081,14 @@ Juergen E. Fischer 	2013-07-16
 
     ogr provider: move REPACK into createSpatialIndex.  Don't REPACK in deleteFeatures as there might still be pending changes that depend on the current feature ids (fixes #7472)
 
-Merge: 530610d d476aed
+Merge: 530610d847 d476aed464
 Nathan Woodrow 	2013-07-16
 
     Merge pull request #732 from ddanielvaz/fix-5789
 
     Fix #5789
 
-Merge: bbd257f 00615ae
+Merge: bbd257f0cc 00615ae9c4
 Nathan Woodrow 	2013-07-16
 
     Merge pull request #742 from 3nids/colorconform
@@ -70750,21 +137099,21 @@ Juergen E. Fischer 	2013-07-16
 
     also accept first ellipsoid (followup be7a026190)
 
-Merge: 13c71d4 df627b1
+Merge: 13c71d4507 df627b148d
 volaya 	2013-07-16
 
     Merge pull request #738 from radosuav/sextante_file_extensions
 
     [sextante] Append output file extension if missing
 
-Merge: 29a4bc0 be7a026
+Merge: 29a4bc0aca be7a026190
 Jürgen Fischer 	2013-07-16
 
     Merge pull request #736 from Oslandia/issue7441
 
     fix issue7441
 
-Merge: 2fa7736 45ab8cc
+Merge: 2fa7736272 45ab8ccc85
 Jürgen Fischer 	2013-07-16
 
     Merge pull request #715 from Oslandia/issue7550
@@ -70783,7 +137132,7 @@ Juergen E. Fischer 	2013-07-16
 
     german translation update
 
-Merge: 9093bcd eea246a
+Merge: 9093bcd51d eea246a05c
 Jürgen Fischer 	2013-07-16
 
     Merge pull request #739 from minorua/fixbld
@@ -70798,7 +137147,7 @@ Marco Hugentobler 	2013-07-16
 
     Fix memory leak in multiband color renderer
 
-Merge: dc489df 805be41
+Merge: dc489dfc7a 805be41738
 Nathan Woodrow 	2013-07-15
 
     Merge pull request #740 from 3nids/snapfirstnode
@@ -70842,7 +137191,7 @@ Juergen E. Fischer 	2013-07-15
 
     fix #6978
 
-Merge: 133398b b54c981
+Merge: 133398b390 b54c981341
 Jürgen Fischer 	2013-07-15
 
     Merge pull request #730 from palmerj/wfs_client_fixes
@@ -70858,7 +137207,7 @@ Juergen E. Fischer 	2013-07-15
     - attribute table: sort Date and DateTime as such
     - spatialindex: return false when an exception on insertion occured
 
-Merge: edf32f9 71c9c36
+Merge: edf32f939b 71c9c36a17
 Jürgen Fischer 	2013-07-15
 
     Merge pull request #737 from Oslandia/issue7856
@@ -70898,14 +137247,14 @@ Juergen E. Fischer 	2013-07-15
 
     spatialite: fix handling of empty geometry column (fixes #8299)
 
-Merge: b5f38e3 6fcce28
+Merge: b5f38e3376 6fcce28684
 Nathan Woodrow 	2013-07-15
 
     Merge pull request #697 from 3nids/svgzoomicon
 
     SVG icons for zoom related icons
 
-Merge: 1a77cde 0f638fc
+Merge: 1a77cde169 0f638fc83c
 Nathan Woodrow 	2013-07-15
 
     Merge pull request #735 from 3nids/iconsqloracle
@@ -70941,7 +137290,7 @@ Juergen E. Fischer 	2013-07-15
 
     osgeo4w: update to grass 6.4.3RC4
 
-Merge: 94c5f53 618ffa0
+Merge: 94c5f5386d 618ffa0edf
 Nathan Woodrow 	2013-07-14
 
     Merge pull request #729 from minorua/gdal_filename
@@ -70952,7 +137301,7 @@ Werner Macho 	2013-07-15
 
     translation update: fi by Kari
 
-Merge: 6d48f11 7a288d1
+Merge: 6d48f11e57 7a288d1b9e
 Werner Macho 	2013-07-14
 
     Merge pull request #733 from Cracert/trans3
@@ -71040,14 +137389,14 @@ Minoru Akagi 	2013-07-14
 
     make filename encoding consistent (gdal/ogr)
 
-Merge: 9b4f461 6088fd7
+Merge: 9b4f46193b 6088fd713e
 Nathan Woodrow 	2013-07-13
 
     Merge pull request #713 from minorua/ftools
 
     fTools fixes
 
-Merge: 257b31e c9eb4f2
+Merge: 257b31ea52 c9eb4f2206
 Nathan Woodrow 	2013-07-13
 
     Merge pull request #728 from minorua/osgeo4w_gdalfilename
@@ -71070,7 +137419,7 @@ Nathan Woodrow 	2013-07-14
 
     Use exec file for python console
 
-Merge: 558fe92 7b55e21
+Merge: 558fe92eb1 7b55e21583
 Werner Macho 	2013-07-13
 
     Merge pull request #727 from Cracert/trans3
@@ -71123,7 +137472,7 @@ Larry Shaffer 	2013-07-12
 
     Ensure new GPX Layer action comes before Remove Layer action on Manage Layers toolbar
 
-Merge: 2df4bdc 0017807
+Merge: 2df4bdcc88 0017807939
 Jürgen Fischer 	2013-07-12
 
     Merge pull request #581 from minorua/georef_nonascii
@@ -71138,7 +137487,7 @@ Pirmin Kalberer 	2013-07-12
 
     UI defaults with layer toolbar on the left
 
-Merge: cafc367 5256b80
+Merge: cafc3677fd 5256b80b74
 Jürgen Fischer 	2013-07-12
 
     Merge pull request #717 from Oslandia/issue7244
@@ -71161,7 +137510,7 @@ Juergen E. Fischer 	2013-07-12
 
     fix warning
 
-Merge: 2379129 3328758
+Merge: 237912911b 33287585a5
 Werner Macho 	2013-07-12
 
     Merge pull request #719 from artfwo/master
@@ -71185,7 +137534,7 @@ Juergen E. Fischer 	2013-07-12
     wfs provider: remove old featureById and nextFeature
     gml parsing: don't mistake attributes for features just because the have the same name and some cleanups
 
-Merge: 272400e 58ba7dd
+Merge: 272400e30d 58ba7dd3f8
 Nathan Woodrow 	2013-07-12
 
     Merge pull request #722 from 3nids/iconmouseontop
@@ -71204,7 +137553,7 @@ Nathan Woodrow 	2013-07-12
 
     Use positional for str.format(). Fix #8277
 
-Merge: 9db8970 5de6836
+Merge: 9db8970dae 5de6836e67
 Nathan Woodrow 	2013-07-12
 
     Merge pull request #721 from 3nids/iconmouseontop
@@ -71239,14 +137588,14 @@ Tim Sutton 	2013-07-12
 
     Make composer manager icon more visually consistent with handles of zoom tools and less dominant on toolbar.
 
-Merge: 8c7723f 15101bd
+Merge: 8c7723fa6a 15101bd045
 Jürgen Fischer 	2013-07-11
 
     Merge pull request #718 from ddanielvaz/fix-8275
 
     cleanup temporary database after write check (fixes #8275)
 
-Merge: 0653127 9138ba3
+Merge: 0653127dd6 9138ba3ebd
 Nathan Woodrow 	2013-07-11
 
     Merge pull request #700 from 3nids/svgaddlayers
@@ -71265,7 +137614,7 @@ Daniel Vaz 	2013-07-11
 
     Fix #8275
 
-Merge: b50a893 522aecc
+Merge: b50a893222 522aecc0f9
 Nathan Woodrow 	2013-07-11
 
     Merge pull request #712 from ddanielvaz/fix-8219
@@ -71345,7 +137694,7 @@ Minoru Akagi 	2013-07-10
 
     fTools: fix geoprocessing (fix #7298)
 
-Merge: 9ed1803 62b30fc
+Merge: 9ed180303c 62b30fcaaa
 Nathan Woodrow 	2013-07-10
 
     Merge pull request #711 from ddanielvaz/bugfixes
@@ -71372,7 +137721,7 @@ Nathan Woodrow 	2013-07-11
 
     Add label for composer picture search paths. Fix #7764
 
-Merge: 42d57d6 3d6e468
+Merge: 42d57d6f8f 3d6e46856a
 Jürgen Fischer 	2013-07-10
 
     Merge pull request #710 from pka/uidefaults
@@ -71442,7 +137791,7 @@ Victor Olaya 	2013-07-09
 
     [sextante] removed "lib" prefix in saga calls
 
-Merge: 61062d7 7ccd3d0
+Merge: 61062d719e 7ccd3d0ab9
 vmora 	2013-07-09
 
     Merge remote-tracking branch 'upstream/master'
@@ -71470,7 +137819,7 @@ Werner Macho 	2013-07-09
 
     translation update: ja and KR
 
-Merge: 78b04df f4272e6
+Merge: 78b04df91a f4272e68fe
 Werner Macho 	2013-07-09
 
     Merge pull request #707 from qgis-jp/make_pull_req_from_ja
@@ -71485,7 +137834,7 @@ vmora 	2013-07-09
 
     - added test for issue #7550
 
-Merge: 0bb9543 9179953
+Merge: 0bb9543278 91799532b5
 Nathan Woodrow 	2013-07-09
 
     Merge pull request #546 from PhilippeDorelon/addfeatureJoin
@@ -71572,7 +137921,7 @@ Juergen E. Fischer 	2013-07-07
 
     plugin installer: destroy network replies (fixes #8233)
 
-Merge: f884f09 ddff4cc
+Merge: f884f09a3d ddff4ccfab
 Werner Macho 	2013-07-07
 
     Merge pull request #705 from Cracert/trans3
@@ -71583,7 +137932,7 @@ Robert Szczepanek 	2013-07-07
 
     translation update: pl
 
-Merge: ef07bc3 e35cbcb
+Merge: ef07bc39af e35cbcb0ac
 Werner Macho 	2013-07-06
 
     Merge pull request #701 from qgis-jp/make_pull_req_from_ja
@@ -71689,7 +138038,7 @@ Werner Macho 	2013-07-04
 
     translation update: ja and da_DK thanks to contributors
 
-Merge: e53aa07 286f62c
+Merge: e53aa07698 286f62cfd9
 Werner Macho 	2013-07-04
 
     Merge pull request #699 from qgis-jp/make_pull_req_from_ja
@@ -71706,7 +138055,7 @@ yoichigmf 	2013-07-05
 
     update GUI translation ja
 
-Merge: c3143e6 7221c73
+Merge: c3143e64c3 7221c732fd
 Matthias Kuhn 	2013-07-04
 
     Merge pull request #695 from minorua/defproj
@@ -71721,21 +138070,21 @@ Juergen E. Fischer 	2013-07-04
 
     spit: fix truncation issue
 
-Merge: 5fcd054 5b2e9dc
+Merge: 5fcd054f73 5b2e9dc13c
 Nathan Woodrow 	2013-07-04
 
     Merge pull request #693 from 3nids/selectsvgicon
 
     SVG for select icons
 
-Merge: 1b0dbc8 3331069
+Merge: 1b0dbc8a09 3331069c0a
 Nathan Woodrow 	2013-07-04
 
     Merge pull request #692 from 3nids/moresvgicons
 
     SVG for system and general icons
 
-Merge: eeb2cb4 a7854ff
+Merge: eeb2cb44dd a7854ff7ba
 Werner Macho 	2013-07-04
 
     Merge pull request #696 from asiersarasua/master
@@ -71754,7 +138103,7 @@ Werner Macho 	2013-07-04
 
     Fixing some typos
 
-Merge: 7805af3 ea5d3b3
+Merge: 7805af3cf1 ea5d3b3d04
 Werner Macho 	2013-07-03
 
     Merge pull request #694 from Jean-Roc/mywork
@@ -71813,7 +138162,7 @@ Werner Macho 	2013-07-03
 
     Bugfixing typos, thanx to Carlos Davila for pointing them out
 
-Merge: d2b2bb1 6a2bd62
+Merge: d2b2bb1869 6a2bd62c04
 Etienne Tourigny 	2013-07-03
 
     Merge pull request #429 from tecoholic/ramp_srch
@@ -71845,7 +138194,7 @@ Matthias Kuhn 	2013-07-03
 
     Only cleanup python with newer sip versions (Fix #8102)
 
-Merge: 7d75fcc 3851670
+Merge: 7d75fcc387 3851670300
 Nathan Woodrow 	2013-07-03
 
     Merge pull request #689 from 3nids/svgactionicons
@@ -71863,7 +138212,7 @@ Minoru Akagi 	2013-07-03
     fix #7952
     fix #8206
 
-Merge: ce1a9a8 b0ef70b
+Merge: ce1a9a821d b0ef70b218
 Werner Macho 	2013-07-02
 
     Merge pull request #687 from qgis-jp/make_pull_req_from_ja
@@ -71874,13 +138223,13 @@ yoichigmf 	2013-07-02
 
     update GUI translation JA
 
-Merge: 03c1cec ce1a9a8
+Merge: 03c1cec93e ce1a9a821d
 yoichigmf 	2013-07-02
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into make_pull_req_from_ja
 
     Conflicts:
-i18n/qgis_ja.ts
+            i18n/qgis_ja.ts
 
 Matthias Kuhn 	2013-07-02
 
@@ -71894,7 +138243,7 @@ Werner Macho 	2013-07-02
 
     translation update: es by Carlos
 
-Merge: 3ba1c3c ad01416
+Merge: 3ba1c3c332 ad01416465
 Nathan Woodrow 	2013-07-01
 
     Merge pull request #685 from 3nids/identifyicon
@@ -71935,7 +138284,7 @@ Juergen E. Fischer 	2013-06-30
 
     fix #8165
 
-Merge: 92b930a 7e00e7b
+Merge: 92b930ac47 7e00e7b1ed
 volaya 	2013-06-30
 
     Merge pull request #677 from radosuav/r_report_fix
@@ -71989,7 +138338,7 @@ Juergen E. Fischer 	2013-06-30
 
     don't crash when measuring faulty geometry (fixes partially #7991)
 
-Merge: 5d60f60 7d3461d
+Merge: 5d60f60647 7d3461dbe2
 Werner Macho 	2013-06-29
 
     Merge pull request #683 from rduivenvoorde/nltranslation
@@ -72020,7 +138369,7 @@ Juergen E. Fischer 	2013-06-29
 
     save and restore message viewer geometry
 
-Merge: 376c5f3 5ee134f
+Merge: 376c5f3a47 5ee134f0c9
 Werner Macho 	2013-06-29
 
     Merge pull request #682 from qgis-jp/make_pull_req_from_ja
@@ -72047,7 +138396,7 @@ Juergen E. Fischer 	2013-06-29
 
     enable/disable raster tools (fixes #8179)
 
-Merge: 8dc28f2 f4a4009
+Merge: 8dc28f2be4 f4a4009bca
 Tim Sutton 	2013-06-29
 
     Merge pull request #681 from 3nids/maptoolcursor
@@ -72062,7 +138411,7 @@ Borys Jurgiel 	2013-06-28
 
     Update contributors list
 
-Merge: 93c5599 e00f0c0
+Merge: 93c5599a66 e00f0c006f
 Marco Hugentobler 	2013-06-28
 
     Merge branch 'server_user_db'
@@ -72083,7 +138432,7 @@ Werner Macho 	2013-06-28
 
     translation update: TW by Lin
 
-Merge: c8d3fa7 9a0be04
+Merge: c8d3fa7d0a 9a0be04113
 Nathan Woodrow 	2013-06-27
 
     Merge pull request #680 from ddanielvaz/master
@@ -72142,7 +138491,7 @@ Marco Hugentobler 	2013-06-27
 
     Fix crash if merge geometries fails
 
-Merge: 0cac8b4 6809626
+Merge: 0cac8b49c4 6809626fd3
 Werner Macho 	2013-06-26
 
     Merge pull request #679 from Jean-Roc/mywork
@@ -72178,7 +138527,7 @@ Marco Hugentobler 	2013-06-26
 
     Fix dash pattern for line width < 1 pixels in Qt 4.8
 
-Merge: afbc9b8 a13126c
+Merge: afbc9b8408 a13126cfdf
 Borys Jurgiel 	2013-06-26
 
     Merge pull request #678 from minorua/ogr_init_enc_chk
@@ -72296,7 +138645,7 @@ Werner Macho 	2013-06-24
 
     Fixing some Tooltips regarding to #8147
 
-Merge: f1e2fce dab1e3c
+Merge: f1e2fcebdc dab1e3c759
 Werner Macho 	2013-06-24
 
     Merge pull request #675 from artfwo/master
@@ -72372,7 +138721,7 @@ Borys Jurgiel 	2013-06-22
 
     [Plugin Manager] If no Python support detected, display an explanation why there is nothing to install. Fixes #8063. PL translation included.
 
-Merge: ff27ee8 e21ce1b
+Merge: ff27ee82de e21ce1b42b
 Werner Macho 	2013-06-22
 
     Merge pull request #672 from qgis-jp/make_pull_req_from_ja
@@ -72399,14 +138748,14 @@ Juergen E. Fischer 	2013-06-22
 
     fix #8131
 
-Merge: aa0a17b 8c92ac9
+Merge: aa0a17b253 8c92ac95fb
 Werner Macho 	2013-06-22
 
     Merge pull request #671 from qgis-jp/make_pull_req_from_ja
 
     update GUI translation ja
 
-Merge: f8d6e32 bed65cb
+Merge: f8d6e32efa bed65cb1f4
 mhugent 	2013-06-22
 
     Merge pull request #670 from tqhien/master
@@ -72445,7 +138794,7 @@ Juergen E. Fischer 	2013-06-21
 
     vector providers: allow multiple iterators - testing required
 
-Merge: 9bbc647 6876540
+Merge: 9bbc647c54 6876540302
 Nathan Woodrow 	2013-06-22
 
     Merge branch 'iterator'
@@ -72499,7 +138848,7 @@ Matthias Kuhn 	2013-06-20
     * Fix #8120
     * Fix #8119
 
-Merge: e4b278d f7c556f
+Merge: e4b278d6ed f7c556f9ed
 Werner Macho 	2013-06-19
 
     Merge pull request #669 from qgis-jp/make_pull_req_from_ja
@@ -72526,7 +138875,7 @@ Juergen E. Fischer 	2013-06-19
     - default ui state with two toolbar rows (fixes #8117)
     - update plugin registry state of nsis installer
 
-Merge: 86695a9 8fd200e
+Merge: 86695a9f37 8fd200e272
 Werner Macho 	2013-06-19
 
     Merge pull request #668 from asiersarasua/master
@@ -72557,7 +138906,7 @@ Matthias Kuhn 	2013-06-19
 
     "Merge selected features" leads to data loss (Fix #6902)
 
-Merge: 419d8ee 5bcb0e1
+Merge: 419d8ee593 5bcb0e1ae5
 Werner Macho 	2013-06-19
 
     Merge pull request #667 from yjacolin/gdalToolsdoPolygonBug
@@ -72641,7 +138990,7 @@ Werner Macho 	2013-06-18
 
     translation update sv by Victor
 
-Merge: bdd61d5 5f17250
+Merge: bdd61d592c 5f1725006f
 vinayan 	2013-06-17
 
     Merge pull request #664 from vinayan/topofix
@@ -72717,14 +139066,14 @@ Juergen E. Fischer 	2013-06-16
 
     fix #8083 (MultiSurfaces not supported)
 
-Merge: e8f7c13 9b242c2
+Merge: e8f7c139fe 9b242c28a8
 Werner Macho 	2013-06-16
 
     Merge pull request #663 from Jean-Roc/mywork
 
     update fr ui
 
-Merge: 449c2a2 2c33403
+Merge: 449c2a23dc 2c3340364c
 vinayan 	2013-06-16
 
     Merge pull request #634 from vinayan/offlineFixWin
@@ -72796,7 +139145,7 @@ Juergen E. Fischer 	2013-06-15
 
     fix translation strings (fixes #8057)
 
-Merge: fb15725 3bcf890
+Merge: fb15725190 3bcf890dba
 mhugent 	2013-06-15
 
     Merge pull request #661 from leyan/custom_CRS
@@ -72844,7 +139193,7 @@ Chris Crook 	2013-06-14
 
     Som fTools fixes for SIP API updates
 
-Merge: fec833f 964d7b4
+Merge: fec833f145 964d7b4b8b
 Matthias Kuhn 	2013-06-15
 
     Merge pull request #660 from minorua/grad_it
@@ -72863,7 +139212,7 @@ Nathan Woodrow 	2013-06-15
 
     Fix crash when creating/loading projects. Fixes #7931
 
-Merge: 9f3a879 abcc8b1
+Merge: 9f3a879116 abcc8b16ed
 Nathan Woodrow 	2013-06-14
 
     Merge pull request #659 from slarosa/fix_8065
@@ -72944,7 +139293,7 @@ Larry Shaffer 	2013-06-13
 
     - Also fix long standing unreported bug where scales closer than 1:1, e.g. 5:1, could not be set
 
-Merge: e09683b aeffe2a
+Merge: e09683b1fb aeffe2ae93
 Werner Macho 	2013-06-13
 
     Merge pull request #654 from imincik/slovak
@@ -73033,7 +139382,7 @@ Nathan Woodrow 	2013-06-12
 
     Don't return null on failed metadata load
 
-Merge: a602112 3b4dfd7
+Merge: a602112fcd 3b4dfd724d
 Salvatore Larosa 	2013-06-11
 
     Merge pull request #619 from slarosa/generate_pap
@@ -73088,7 +139437,7 @@ Borys Jurgiel 	2013-06-11
 
     [Plugin Manage] Include tab title pages to i18n. Don't clutter the resources dir.
 
-Merge: 031550a 84eb6f8
+Merge: 031550ac90 84eb6f81f7
 Borys Jurgiel 	2013-06-11
 
     Merge pull request #652 from jetuk/pyplugin_installer-QNAM
@@ -73116,7 +139465,7 @@ Salvatore Larosa 	2013-06-11
 
     [pyqgis-console] another updating to new SIP API
 
-Merge: 6381d62 ba4a3cc
+Merge: 6381d626a1 ba4a3ccc1a
 Nathan Woodrow 	2013-06-11
 
     Merge pull request #625 from vinayan/projcrash
@@ -73127,7 +139476,7 @@ Matthias Kuhn 	2013-06-10
 
     Use python None object for NULL attributes
 
-Merge: 8392c93 8cd8969
+Merge: 8392c93d8e 8cd8969a14
 Giuseppe Sucameli 	2013-06-11
 
     Merge pull request #651 from slarosa/fix_dbmanager
@@ -73184,7 +139533,7 @@ Borys Jurgiel 	2013-06-10
 
     [Plugin Manager] Make appropriate methods const
 
-Merge: 499db4e 6558b53
+Merge: 499db4ecc8 6558b53225
 Werner Macho 	2013-06-10
 
     Merge pull request #650 from imincik/slovak
@@ -73203,7 +139552,7 @@ Borys Jurgiel 	2013-06-10
 
     [Plugin Manager] Maximum major, minor and bugfix version is 99.99.99. Be consistent with this constraint.
 
-Merge: 430f0fc a857434
+Merge: 430f0fcb1b a85743485e
 Werner Macho 	2013-06-09
 
     Merge pull request #645 from qgis-jp/make_pull_req_from_ja
@@ -73267,7 +139616,7 @@ Borys Jurgiel 	2013-06-09
 
     Check qgsMaximumVersion also when loading plugin to QgsPluginRegistry
 
-Merge: dbace48 ce9ed15
+Merge: dbace48427 ce9ed158b5
 Borys Jurgiel 	2013-06-09
 
     Merge pull request #641 from rduivenvoorde/pluginmantxt
@@ -73377,7 +139726,7 @@ Juergen E. Fischer 	2013-06-08
 
     german translation update
 
-Merge: 02c29c0 a939ab1
+Merge: 02c29c0cad a939ab1889
 Nathan Woodrow 	2013-06-08
 
     Merge SIP v2 update
@@ -73394,7 +139743,7 @@ Nathan Woodrow 	2013-06-08
 
     Update plugin installer to new API
 
-Merge: 014d872 02c29c0
+Merge: 014d872f07 02c29c0cad
 Nathan Woodrow 	2013-06-08
 
     Merge master
@@ -73519,7 +139868,7 @@ Victor Olaya 	2013-06-06
 
     [sextante] fixed issue with blank spaces in filenames in OTB
 
-Merge: c8ff386 4d72f82
+Merge: c8ff386695 4d72f82c58
 Matthias Kuhn 	2013-06-06
 
     Merge pull request #638 from 3nids/typo
@@ -73542,7 +139891,7 @@ Werner Macho 	2013-06-06
 
     translation update: farsi
 
-Merge: 9a7776a e49783d
+Merge: 9a7776a239 e49783dd9c
 Werner Macho 	2013-06-05
 
     Merge pull request #637 from qgis-jp/for_pull_from_ja
@@ -73561,7 +139910,7 @@ Nathan Woodrow 	2013-06-06
 
     Only refresh canvas when needed on drop event
 
-Merge: c1fb1bb 74b18e5
+Merge: c1fb1bb4fc 74b18e532a
 Nathan Woodrow 	2013-06-05
 
     Merge pull request #636 from vinayan/zoomlayerextent
@@ -73607,7 +139956,7 @@ vinayan 	2013-06-05
 
     fix zoom issue for new shapefiles
 
-Merge: 0f8de7d 25c76e6
+Merge: 0f8de7d55f 25c76e6965
 Werner Macho 	2013-06-05
 
     Merge pull request #635 from imincik/slovak
@@ -73659,7 +140008,7 @@ Nathan Woodrow 	2013-06-05
 
     Enable touch for the map canvas on windows
 
-Merge: 068da60 c2a458e
+Merge: 068da60570 c2a458e6ad
 Nathan Woodrow 	2013-06-04
 
     Merge pull request #631 from imincik/cmdout
@@ -73713,7 +140062,7 @@ Juergen E. Fischer 	2013-06-04
 
     fix #7828
 
-Merge: f9a0a1d b7c07de
+Merge: f9a0a1d1c8 b7c07deff9
 mhugent 	2013-06-04
 
     Merge pull request #632 from BioEcoForests/master
@@ -73732,7 +140081,7 @@ Radim Blazek 	2013-06-04
 
     OGR layers with unknown geometry type containing single geometry type fix, fixes #7995
 
-Merge: f012065 81a960b
+Merge: f012065658 81a960b3fe
 Werner Macho 	2013-06-03
 
     Merge pull request #630 from SrNetoChan/master
@@ -73782,7 +140131,7 @@ Larry Shaffer 	2013-06-03
 
     Fix #7993, fields are listed twice in labeling data defined menu
 
-Merge: 75cbdf6 e46795a
+Merge: 75cbdf6d2b e46795a4f9
 Nathan Woodrow 	2013-06-03
 
     Merge pull request #629 from volaya/sipapi
@@ -73816,14 +140165,14 @@ Larry Shaffer 	2013-06-03
 
     - Revert part of 6c51965, where setting the line edit field was (accidentally?) removed
 
-Merge: 919aa04 6f2ddbc
+Merge: 919aa04931 6f2ddbc2b1
 Werner Macho 	2013-06-03
 
     Merge pull request #626 from imincik/slovak
 
     First batch of Slovak translation for version 2.0.
 
-Merge: 8201335 aca38a8
+Merge: 8201335835 aca38a8e71
 Werner Macho 	2013-06-03
 
     Merge pull request #628 from qgis-jp/make_pull_req_from_ja
@@ -73850,10 +140199,10 @@ Ivan Mincik 	2013-06-03
 Ivan Mincik 	2013-06-03
 
     First batch of Slovak translation for version 2.0.
-- translation
-- merge with 4b76600 (adding function_help, context_help)
+            - translation
+            - merge with 4b76600 (adding function_help, context_help)
 
-Merge: 21a884b d4945db
+Merge: 21a884b758 d4945db811
 Ivan Mincik 	2013-06-03
 
     Merge branch 'master' into slovak
@@ -74004,7 +140353,7 @@ D'Hont René-Luc 	2013-05-31
     directly used in client supporting OWSContext as config file.
     This function has been funded by Ifremer.
 
-Merge: 32da891 c1797fc
+Merge: 32da891f16 c1797fc737
 mhugent 	2013-05-31
 
     Merge pull request #623 from biolds/master
@@ -74019,7 +140368,7 @@ Nathan Woodrow 	2013-05-31
 
     Fix crash in sip using QString
 
-Merge: a2fc3b4 3acb48d
+Merge: a2fc3b42aa 3acb48d1b0
 Werner Macho 	2013-05-30
 
     Merge pull request #624 from rduivenvoorde/nl
@@ -74113,7 +140462,7 @@ Larry Shaffer 	2013-05-29
     - Ensure labeling gui is restored in correct order
     - Run style script on qgsmaplayer.cpp
 
-Merge: f9ae9d5 085f636
+Merge: f9ae9d5303 085f636962
 Nathan Woodrow 	2013-05-29
 
     Merge pull request #622 from slarosa/one_more_fix_sipapiv2
@@ -74132,7 +140481,7 @@ Juergen E. Fischer 	2013-05-29
 
     german translation update
 
-Merge: 9db7ab9 b1843de
+Merge: 9db7ab96a5 b1843de774
 Nathan Woodrow 	2013-05-29
 
     Merge pull request #621 from slarosa/again_sipapiv2
@@ -74150,7 +140499,7 @@ Juergen E. Fischer 	2013-05-29
     - merge consecutive geometry changes (fixes #7929)
     - avoid validation in nodetool on rollback
 
-Merge: d28d202 bc726dc
+Merge: d28d2023b6 bc726dcbb5
 Matthias Kuhn 	2013-05-29
 
     Merge pull request #620 from slarosa/update_sipapiv2_console
@@ -74257,7 +140606,7 @@ Sandro Santilli 	2013-05-28
 
     Fix leak of geometry in QgsSelectedFeature destructor
 
-Merge: 2fcb8b2 20c729a
+Merge: 2fcb8b26ab 20c729a3e9
 Ivan Mincik 	2013-05-28
 
     Merge branch 'master' into slovak
@@ -74289,7 +140638,7 @@ Werner Macho 	2013-05-27
 
     translation update: sv by Victor
 
-Merge: f4c859a e6e9139
+Merge: f4c859ae0a e6e913971c
 Werner Macho 	2013-05-27
 
     Merge pull request #615 from rduivenvoorde/nltranslation
@@ -74316,14 +140665,14 @@ Werner Macho 	2013-05-27
 
     added more japanese translators
 
-Merge: 7f4a7ac ab3c14c
+Merge: 7f4a7ac6cf ab3c14c008
 Werner Macho 	2013-05-27
 
     Merge pull request #612 from SrNetoChan/master
 
     pt_PT translations
 
-Merge: 5177c7b f2e222b
+Merge: 5177c7b594 f2e222b161
 Werner Macho 	2013-05-27
 
     Merge pull request #613 from qgis-jp/for_pull_from_ja
@@ -74366,7 +140715,7 @@ Giuseppe Sucameli 	2013-05-27
 
     DBManager: better handle for not supported constraint types (fix #7544)
 
-Merge: 0f13260 3c0ac0d
+Merge: 0f132602ed 3c0ac0d43c
 Werner Macho 	2013-05-26
 
     Merge pull request #609 from SrNetoChan/master
@@ -74495,14 +140844,14 @@ pcav 	2013-05-24
 
     Miro edits to IT GUI
 
-Merge: 1902af5 0dcd9eb
+Merge: 1902af567d 0dcd9ebe8e
 mhugent 	2013-05-23
 
     Merge pull request #586 from vinayan/offlineedit
 
     Fix Offline Editing Plugin
 
-Merge: 2c55326 6227475
+Merge: 2c553260e5 6227475e4c
 Chris Crook 	2013-05-24
 
     Merge remote-tracking branch 'upstream/master'
@@ -74515,7 +140864,7 @@ Werner Macho 	2013-05-23
 
     translation update: sv by Victor
 
-Merge: 83445af ebd76d1
+Merge: 83445af23e ebd76d1a64
 Tim Sutton 	2013-05-23
 
     Merge pull request #608 from imincik/menu-cleanup
@@ -74526,7 +140875,7 @@ Ivan Mincik 	2013-05-23
 
     Removing redundant 'New' keyword from 'Layer -> New' menu item.
 
-Merge: f82cc12 bac09e9
+Merge: f82cc12008 bac09e99c0
 Salvatore Larosa 	2013-05-23
 
     Merge pull request #607 from alexbruy/console-ui
@@ -74554,7 +140903,7 @@ Alexander Bruy 	2013-05-23
     use checkable groupbox instead of separate checkboxes in console
     settings
 
-Merge: d50214b ce280f4
+Merge: d50214b144 ce280f49e1
 Chris Crook 	2013-05-23
 
     Merge pull request #606 from ccrook/master
@@ -74565,21 +140914,21 @@ Chris Crook 	2013-05-23
 
     Updating AUTHORS
 
-Merge: ac9736b 700d12f
+Merge: ac9736b998 700d12f7ec
 mhugent 	2013-05-23
 
     Merge pull request #604 from matthias-kuhn/wmsfix
 
     Fix bad WMS server performance
 
-Merge: 64ab894 7ea8610
+Merge: 64ab894630 7ea86101a0
 Werner Macho 	2013-05-22
 
     Merge pull request #605 from SrNetoChan/master
 
     Portuguese translations
 
-Merge: 37a30bb 6bd1b78
+Merge: 37a30bb771 6bd1b78b18
 Giuseppe Sucameli 	2013-05-22
 
     Merge pull request #555 from olivierdalang/SaveSqlQueriesInDbManager
@@ -74590,7 +140939,7 @@ Juergen E. Fischer 	2013-05-22
 
     german translation fix
 
-Merge: 2225108 3da0d7d
+Merge: 22251085ee 3da0d7d56f
 SrNetoChan 	2013-05-22
 
     merge
@@ -74643,7 +140992,7 @@ Juergen E. Fischer 	2013-05-22
 
     reduce debugging noise in pal labeling
 
-Merge: 3306c7c e741ec9
+Merge: 3306c7c31a e741ec947d
 Nathan Woodrow 	2013-05-22
 
     Merge pull request #602 from 3nids/selectall
@@ -74654,7 +141003,7 @@ Denis Rouzaud 	2013-05-22
 
     add select all features methods for vector layers
 
-Merge: b7f1987 6af9261
+Merge: b7f1987b3e 6af9261fa3
 Nathan Woodrow 	2013-05-22
 
     Merge pull request #601 from matthias-kuhn/qgsexpression-unprepared
@@ -74673,7 +141022,7 @@ Juergen E. Fischer 	2013-05-22
 
     yet another german translation update
 
-Merge: 2acea9f 83eff76
+Merge: 2acea9fb22 83eff76c77
 Jürgen Fischer 	2013-05-21
 
     Merge pull request #600 from slarosa/master
@@ -74733,7 +141082,7 @@ Marco Hugentobler 	2013-05-21
 
     Move layer selection menu a few pixel to the right / bottom
 
-Merge: 70b6821 cbc014e
+Merge: 70b6821d53 cbc014edbf
 Jürgen Fischer 	2013-05-21
 
     Merge pull request #598 from ccrook/master
@@ -74826,7 +141175,7 @@ Tim Sutton 	2013-05-19
 
     This reverts commit f7f3e413b726024384235a3654d6b18d9ff073be.
 
-Merge: 6370aa4 f7f3e41
+Merge: 6370aa48ce f7f3e413b7
 Tim Sutton 	2013-05-19
 
     Merge pull request #596 from mbernasocchi/master
@@ -74855,14 +141204,14 @@ Tim Sutton 	2013-05-19
 
     This reverts commit b3c6d38ffefa9db79932be234b010598a9664706.
 
-Merge: 2f9ccb5 b3c6d38
+Merge: 2f9ccb515d b3c6d38ffe
 Tim Sutton 	2013-05-19
 
     Merge pull request #553 from mbernasocchi/myfix
 
     make cmake honor PYTHON_LIBRARY
 
-Merge: acacf84 014729b
+Merge: acacf84845 014729b94d
 Werner Macho 	2013-05-19
 
     Merge pull request #595 from Cracert/trans
@@ -74877,7 +141226,7 @@ Robert Szczepanek 	2013-05-19
 
     translation update: Polish by Milena, Robert, Borys
 
-Merge: 81f677d c95dac5
+Merge: 81f677d501 c95dac558e
 Werner Macho 	2013-05-18
 
     Merge pull request #594 from tomass/master
@@ -74953,14 +141302,14 @@ Matthias Kuhn 	2013-05-17
     Disallow changing of map layer registry directly
     QgsMapLayerRegistry::mapLayers() returned reference is now const
 
-Merge: 957c4f1 198cc39
+Merge: 957c4f1433 198cc39f85
 Tim Sutton 	2013-05-17
 
     Merge pull request #591 from ccrook/delimited_text_to_core
 
     Delimited text to core
 
-Merge: 7962361 cfaa71c
+Merge: 7962361329 cfaa71c536
 vinayan 	2013-05-16
 
     Merge pull request #593 from mach0/topocheck
@@ -74983,7 +141332,7 @@ Chris Crook 	2013-05-17
 
     Fixing line spacing in 
 section of delimited text context help
 
-Merge: 83b571b 2c7eff7
+Merge: 83b571b45e 2c7eff7088
 Chris Crook 	2013-05-17
 
     Fix merge conflict
@@ -74992,7 +141341,7 @@ Werner Macho 	2013-05-14
 
     modified topology checker mostly GUI overhaul
 
-Merge: 36bf93c b7ef48a
+Merge: 36bf93c0d2 b7ef48aee3
 mhugent 	2013-05-16
 
     Merge pull request #592 from matthias-kuhn/fix-7405
@@ -75137,7 +141486,7 @@ nyalldawson 	2013-05-14
 
     Add clamp and scale_exp functions
 
-Merge: 226c524 519fe2f
+Merge: 226c524e35 519fe2f4ac
 Nathan Woodrow 	2013-05-13
 
     Merge pull request #590 from nyalldawson/advanced_composition
@@ -75264,7 +141613,7 @@ Marco Hugentobler 	2013-05-13
 
     sip does not like CORE_EXPORT and Q_OBJECT
 
-Merge: a14adc4 23a7ebf
+Merge: a14adc407c 23a7ebf952
 Nathan Woodrow 	2013-05-12
 
     Merge pull request #587 from nyalldawson/new_functions
@@ -75328,7 +141677,7 @@ Juergen E. Fischer 	2013-05-11
 
     don't reload the whole browser model when the project home changes (fixes #7520)
 
-Merge: 724ed72 2c37896
+Merge: 724ed72324 2c378964c1
 Tim Sutton 	2013-05-12
 
     Merge pull request #582 from ccrook/delimited_text_indexing_implemented
@@ -75343,12 +141692,12 @@ Borys Jurgiel 	2013-05-12
 
     Minor fixes for better compatibility with KDevelop
 
-Merge: 799870d 9dd8b2f
+Merge: 799870d54a 9dd8b2ff6e
 Chris Crook 	2013-05-13
 
     Merge branch 'master' into delimited_text_indexing_implemented
 
-Merge: 8012065 6e3e89b
+Merge: 801206504c 6e3e89b867
 Tim Sutton 	2013-05-12
 
     Merge branch 'customCRS' of https://github.com/leyan/Quantum-GIS
@@ -75366,7 +141715,7 @@ Salvatore Larosa 	2013-05-08
     [pyqgis-console] a simple syntax checker for the editor
     - some fixes and code cleanup
 
-Merge: bbdeceb 2ad5707
+Merge: bbdecebd9a 2ad5707ba2
 vinayan 	2013-05-11
 
     Merge pull request #585 from vinayan/randomsel
@@ -75415,7 +141764,7 @@ Juergen E. Fischer 	2013-05-10
     postgres provider: stop using pg column sizes (fixes #7799)
     oracle provider: skip dropped tables (fixes #7795)
 
-Merge: 0d464b2 4292976
+Merge: 0d464b2e1b 42929762a6
 Chris Crook 	2013-05-10
 
     Merge resolved
@@ -75428,7 +141777,7 @@ Juergen E. Fischer 	2013-05-10
 
     fix doxygen warning
 
-Merge: 2caf0e0 59ffd77
+Merge: 2caf0e0cbc 59ffd77258
 Jürgen Fischer 	2013-05-09
 
     Merge pull request #583 from ccrook/delimited_text_bug_fixes_3
@@ -75525,7 +141874,7 @@ Radim Blazek 	2013-05-08
 
     GRASS Direct disabled for 2.0
 
-Merge: 4c7f51e c054c30
+Merge: 4c7f51e641 c054c30578
 Marco Hugentobler 	2013-05-08
 
     Merge branch 'dd_symbology_help'
@@ -75567,7 +141916,7 @@ Marco Hugentobler 	2013-05-07
 
     Use case insensitive string comparison for wms request names
 
-Merge: 83ffa05 88e18cc
+Merge: 83ffa053f8 88e18cc527
 Werner Macho 	2013-05-07
 
     Merge pull request #580 from rduivenvoorde/nl2.0
@@ -75634,7 +141983,7 @@ Radim Blazek 	2013-05-06
 
     Use OGR VSI cache as buffer on Windows
 
-Merge: a5a7c1c 5c240bc
+Merge: a5a7c1c3ec 5c240bccf7
 Nyall Dawson 	2013-05-05
 
     Merge pull request #579 from nyalldawson/blend_warning
@@ -75645,7 +141994,7 @@ nyalldawson 	2013-05-06
 
     Small fixes to heatmap plugin
 
-Merge: 85a3a67 5e41382
+Merge: 85a3a67288 5e4138261c
 vinayan 	2013-05-05
 
     Merge pull request #577 from vinayan/sliverFix
@@ -75680,7 +142029,7 @@ Salvatore Larosa 	2013-05-05
 
     [pyqgis-console] add a context menu for tabs
 
-Merge: 87f7ea1 fc55655
+Merge: 87f7ea14d9 fc556554cf
 Werner Macho 	2013-05-05
 
     Merge pull request #575 from Jean-Roc/mywork
@@ -75691,7 +142040,7 @@ Victor Olaya 	2013-05-05
 
     [sextante] fixed problem when defining help files for the first time
 
-Merge: 945bc60 788e429
+Merge: 945bc603a2 788e429426
 Borys Jurgiel 	2013-05-05
 
     Merge pull request #578 from minorua/fieldname_encoding
@@ -75820,7 +142169,7 @@ Salvatore Larosa 	2013-05-02
 
     [pyqgis-console] adds a find text widget to editor
 
-Merge: 3e1f3a0 1dfcf53
+Merge: 3e1f3a0a90 1dfcf53b84
 Tim Sutton 	2013-05-02
 
     Merge pull request #545 from el1073/styles_to_db
@@ -75835,7 +142184,7 @@ Radim Blazek 	2013-05-02
 
     raster block setIsNoDataExcept fix, fixes #7608
 
-Merge: 02c9264 ae7115f
+Merge: 02c9264781 ae7115f74f
 Emilio Loi 	2013-05-02
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
@@ -75848,7 +142197,7 @@ Salvatore Larosa 	2013-05-02
 
     [pyqgis-console] re-added shortcut mistakenly removed in 07abb34
 
-Merge: ae48b09 3b28ce3
+Merge: ae48b09f61 3b28ce397e
 Werner Macho 	2013-05-02
 
     Merge pull request #573 from Jean-Roc/master
@@ -75863,7 +142212,7 @@ Radim Blazek 	2013-05-02
 
     mapserver compilation fix
 
-Merge: db3bfa3 c3df3ba
+Merge: db3bfa37a3 c3df3ba7b7
 Emilio Loi 	2013-05-02
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
@@ -75908,21 +142257,21 @@ nyalldawson 	2013-05-02
 
     Add tests for python bindings for layer blend modes
 
-Merge: f62955f cc34d14
+Merge: f62955ff84 cc34d14117
 Tim Sutton 	2013-05-01
 
     Merge pull request #533 from leyan/customCRS_API
 
     Custom crs api
 
-Merge: 5e9e98a 211a090
+Merge: 5e9e98abea 211a090c61
 Tim Sutton 	2013-05-01
 
     Merge pull request #551 from olivierdalang/SvgLibraryCleanup
 
     Svg library cleanup
 
-Merge: 2e446a8 2fb50ab
+Merge: 2e446a87f8 2fb50ab518
 Tim Sutton 	2013-05-01
 
     Merge pull request #569 from ccrook/delimited_text_substring_capability
@@ -75933,12 +142282,12 @@ Radim Blazek 	2013-05-01
 
     limit max number of raster symbol items in legend (may be very slow), resolves slow loading of rasters with large color tables
 
-Merge: 39419e1 78f5110
+Merge: 39419e1a44 78f511078b
 Chris Crook 	2013-05-02
 
     Merge branch 'delimited_text_bug_fixes_2' into delimited_text_substring_capability
 
-Merge: 1fb1c9c 3c68312
+Merge: 1fb1c9c45f 3c68312028
 Chris Crook 	2013-05-02
 
     Merge branch 'master' into delimited_text_bug_fixes_2
@@ -75987,7 +142336,7 @@ Victor Olaya 	2013-04-30
 
     [sextante] Added checking in case model file cannot be save due to permissions
 
-Merge: 5407616 bc57d56
+Merge: 5407616bb7 bc57d56236
 vinayan 	2013-04-30
 
     Merge pull request #570 from vinayan/authorsupdate
@@ -76003,7 +142352,7 @@ Salvatore Larosa 	2013-04-30
     [pyqgis-console] running script without shell window (for Windows OS)
     - changed runscript icon to contextual menu
 
-Merge: 6e6ff40 171973a
+Merge: 6e6ff40f05 171973a54f
 Nyall Dawson 	2013-04-30
 
     Merge pull request #567 from nyalldawson/overview
@@ -76021,39 +142370,39 @@ Emilio Loi 	2013-04-30
 
     QgsVectorDataProvider without diff comments
 
-Merge: f344e51 8a6cba6
+Merge: f344e5129c 8a6cba64ec
 Emilio Loi 	2013-04-30
 
     Merge branch 'styles_to_db' of https://github.com/el1073/Quantum-GIS into styles_to_db
 
     Conflicts:
-src/core/qgsvectordataprovider.h
+            src/core/qgsvectordataprovider.h
 
 Emilio Loi 	2013-04-30
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
 
-Merge: c499df7 009ba1b
+Merge: c499df74a3 009ba1b995
 Emilio Loi 	2013-04-30
 
     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
+            python/console/console_editor.py
+            src/core/qgsvectordataprovider.h
+            src/core/qgsvectorfilewriter.cpp
 
-Merge: c499df7 009ba1b
+Merge: c499df74a3 009ba1b995
 Emilio Loi 	2013-04-30
 
     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
+            python/console/console_editor.py
+            src/core/qgsvectordataprovider.h
+            src/core/qgsvectorfilewriter.cpp
 
-Merge: 7dc0e51 2f9cb93
+Merge: 7dc0e5180c 2f9cb93ad3
 Matthias Kuhn 	2013-04-30
 
     Merge pull request #563 from vinayan/rotateMoveFix
@@ -76117,42 +142466,42 @@ olivierdalang 	2013-04-24
     SVG : clean arrows
 
     Conflicts:
-images/svg/north_arrows/NorthArrow1.svg
-images/svg/north_arrows/NorthArrow10.svg
-images/svg/north_arrows/NorthArrow11.svg
-images/svg/north_arrows/NorthArrow12.svg
-images/svg/north_arrows/NorthArrow13.svg
-images/svg/north_arrows/NorthArrow14.svg
-images/svg/north_arrows/NorthArrow15.svg
-images/svg/north_arrows/NorthArrow16.svg
-images/svg/north_arrows/NorthArrow2.svg
-images/svg/north_arrows/NorthArrow4.svg
-images/svg/north_arrows/NorthArrow5.svg
-images/svg/north_arrows/NorthArrow6.svg
-images/svg/north_arrows/NorthArrow_blackgreenblack.svg
-images/svg/north_arrows/NorthArrow_blackwhiteblack.svg
-images/svg/north_arrows/NorthArrow_blackyellowblack.svg
-images/svg/north_arrows/NorthArrow_bluegreenblue.svg
-images/svg/north_arrows/NorthArrow_source.svg
-images/svg/north_arrows/default.svg
-images/svg/north_arrows/north-arrow_0_qgis_decoration.svg
-images/svg/north_arrows/north-arrow_10_with_map_layers.svg
-images/svg/north_arrows/north-arrow_11_simple_corner.svg
-images/svg/north_arrows/north-arrow_12_triangular_arrows_with_worldmap.svg
-images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg
-images/svg/north_arrows/north-arrow_14_steering_wheel.svg
-images/svg/north_arrows/north-arrow_15_checkerboard_corner_arrows.svg
-images/svg/north_arrows/north-arrow_16_corner_arrows_unfilled_with_circle.svg
-images/svg/north_arrows/north-arrow_17_corner_n_e.svg
-images/svg/north_arrows/north-arrow_1_simple_half_arrow.svg
-images/svg/north_arrows/north-arrow_2_simple_half_arrow.svg
-images/svg/north_arrows/north-arrow_3_simple_symmetric_triangular.svg
-images/svg/north_arrows/north-arrow_4_double_arrow.svg
-images/svg/north_arrows/north-arrow_5_arrow_in_circle_small_n.svg
-images/svg/north_arrows/north-arrow_6_unfilled_big_arrow_symmetric.svg
-images/svg/north_arrows/north-arrow_7_big_circle_with_small_arrow_unfilled_n.svg
-images/svg/north_arrows/north-arrow_8_checkered.svg
-images/svg/north_arrows/north-arrow_9_half_arrow_unfilled.svg
+            images/svg/north_arrows/NorthArrow1.svg
+            images/svg/north_arrows/NorthArrow10.svg
+            images/svg/north_arrows/NorthArrow11.svg
+            images/svg/north_arrows/NorthArrow12.svg
+            images/svg/north_arrows/NorthArrow13.svg
+            images/svg/north_arrows/NorthArrow14.svg
+            images/svg/north_arrows/NorthArrow15.svg
+            images/svg/north_arrows/NorthArrow16.svg
+            images/svg/north_arrows/NorthArrow2.svg
+            images/svg/north_arrows/NorthArrow4.svg
+            images/svg/north_arrows/NorthArrow5.svg
+            images/svg/north_arrows/NorthArrow6.svg
+            images/svg/north_arrows/NorthArrow_blackgreenblack.svg
+            images/svg/north_arrows/NorthArrow_blackwhiteblack.svg
+            images/svg/north_arrows/NorthArrow_blackyellowblack.svg
+            images/svg/north_arrows/NorthArrow_bluegreenblue.svg
+            images/svg/north_arrows/NorthArrow_source.svg
+            images/svg/north_arrows/default.svg
+            images/svg/north_arrows/north-arrow_0_qgis_decoration.svg
+            images/svg/north_arrows/north-arrow_10_with_map_layers.svg
+            images/svg/north_arrows/north-arrow_11_simple_corner.svg
+            images/svg/north_arrows/north-arrow_12_triangular_arrows_with_worldmap.svg
+            images/svg/north_arrows/north-arrow_13_checkerboard_earth.svg
+            images/svg/north_arrows/north-arrow_14_steering_wheel.svg
+            images/svg/north_arrows/north-arrow_15_checkerboard_corner_arrows.svg
+            images/svg/north_arrows/north-arrow_16_corner_arrows_unfilled_with_circle.svg
+            images/svg/north_arrows/north-arrow_17_corner_n_e.svg
+            images/svg/north_arrows/north-arrow_1_simple_half_arrow.svg
+            images/svg/north_arrows/north-arrow_2_simple_half_arrow.svg
+            images/svg/north_arrows/north-arrow_3_simple_symmetric_triangular.svg
+            images/svg/north_arrows/north-arrow_4_double_arrow.svg
+            images/svg/north_arrows/north-arrow_5_arrow_in_circle_small_n.svg
+            images/svg/north_arrows/north-arrow_6_unfilled_big_arrow_symmetric.svg
+            images/svg/north_arrows/north-arrow_7_big_circle_with_small_arrow_unfilled_n.svg
+            images/svg/north_arrows/north-arrow_8_checkered.svg
+            images/svg/north_arrows/north-arrow_9_half_arrow_unfilled.svg
 
 olivierdalang 	2013-04-23
 
@@ -76196,14 +142545,14 @@ Borys Jurgiel 	2013-04-29
 
     More informative text and tooltip for the "ignore shapefile encoding declaration" combobox
 
-Merge: c5177fc 1113c60
+Merge: c5177fc669 1113c6099a
 Borys Jurgiel 	2013-04-29
 
     Merge pull request #566 from minorua/fix_cpg
 
     Encoding: produce more compatible .cpg files.
 
-Merge: 33d13cc 42fc689
+Merge: 33d13ccca7 42fc689e60
 Matthias Kuhn 	2013-04-29
 
     Merge pull request #568 from 3nids/layer2map
@@ -76226,15 +142575,15 @@ Salvatore Larosa 	2013-04-29
 
     [pyqgis-console] allows comments and quotes folding in editor lexer
 
-Merge: 723ad4c 1959182
+Merge: 723ad4c7ec 195918293c
 Emilio Loi 	2013-04-29
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
 
     Conflicts:
-python/console/console_editor.py
+            python/console/console_editor.py
 
-Merge: 2232c3d 1959182
+Merge: 2232c3d9bc 195918293c
 Chris Crook 	2013-04-29
 
     Merge branch 'master' into delimited_text_bug_fixes_2
@@ -76247,7 +142596,7 @@ Salvatore Larosa 	2013-04-29
 
     [pyqgis-console] small fix for show/hide editor action
 
-Merge: 71c9d96 533030f
+Merge: 71c9d96f44 533030f80e
 Nathan Woodrow 	2013-04-28
 
     Merge pull request #565 from nyalldawson/new_functions
@@ -76282,7 +142631,7 @@ Werner Macho 	2013-04-28
 
     translation update: fr by JRM
 
-Merge: 6b9bc64 9d93514
+Merge: 6b9bc64e32 9d935148e5
 Matthias Kuhn 	2013-04-28
 
     Merge pull request #564 from vinayan/fixRubberband
@@ -76338,7 +142687,7 @@ Werner Macho 	2013-04-27
 
     translation update: gl_ES by Xan
 
-Merge: 83f3fc6 a7b52d0
+Merge: 83f3fc6fb5 a7b52d062e
 Werner Macho 	2013-04-27
 
     Merge pull request #472 from jdugge/master
@@ -76367,7 +142716,7 @@ Victor Olaya 	2013-04-26
 
     Removed outdated otb descriptions
 
-Merge: f7dc548 f384277
+Merge: f7dc548ae0 f3842775a5
 Chris Crook 	2013-04-27
 
     Merge branch 'master' into delimited_text_bug_fixes_2
@@ -76378,7 +142727,7 @@ Emilio Loi 	2013-04-26
     Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
     merge with master f3842775a5147b7a8da1639a4bec667a769b7fac
 
-Merge: 7219fb7 f384277
+Merge: 7219fb73ac f3842775a5
 Emilio Loi 	2013-04-26
 
     pre merge with master
@@ -76386,11 +142735,11 @@ Emilio Loi 	2013-04-26
     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
+            python/console/console_editor.py
+            src/core/qgsvectordataprovider.h
+            src/core/qgsvectorfilewriter.cpp
 
-Merge: 02fa729 f7cce9c
+Merge: 02fa7292c6 f7cce9c676
 Borys Jurgiel 	2013-04-26
 
     Merge pull request #561 from minorua/create_shape
@@ -76444,19 +142793,19 @@ Chris Crook 	2013-04-26
 
     Fixing problem with very long data fields corrupting preview table (Qt framework not handling very long strings?)
 
-Merge: 7603f3e b57841f
+Merge: 7603f3e17a b57841fb5c
 Chris Crook 	2013-04-26
 
     Merge branch 'master' into delimited_text_bug_fixes_2
 
-Merge: 21fd0f2 fd57ffa
+Merge: 21fd0f242d fd57ffa571
 Nathan Woodrow 	2013-04-25
 
     Merge pull request #531 from ccrook/colour_functions
 
     Colour functions
 
-Merge: 0372e4b 21fd0f2
+Merge: 0372e4b61b 21fd0f242d
 Chris Crook 	2013-04-26
 
     Merge branch 'master' into colour_functions
@@ -76506,7 +142855,7 @@ Salvatore Larosa 	2013-04-25
     [pyqgis-console] fix object inspector on windows 7
     - minor fixes
 
-Merge: e0838b0 4f54664
+Merge: e0838b0bbf 4f54664900
 vinayan 	2013-04-25
 
     Merge pull request #556 from vinayan/splitVector
@@ -76521,7 +142870,7 @@ Nathan Woodrow 	2013-04-26
 
     Add workaround for loading forms with custom widgets from PyQt4
 
-More information: qt-project.org/forums/viewthread/27098/
+            More information: qt-project.org/forums/viewthread/27098/
 
 Matthias Kuhn 	2013-04-14
 
@@ -76578,7 +142927,7 @@ Radim Blazek 	2013-04-24
 
     vector data provider start/stop editing methods
 
-Merge: 608adb8 ac6a1ee
+Merge: 608adb8e7f ac6a1ee7db
 Alexander Bruy 	2013-04-24
 
     Merge branch 'r-stream'
@@ -76616,7 +142965,7 @@ Victor Olaya 	2013-04-17
 
     [sextante]new modeler interface
 
-Merge: 6d046fc 20d40bf
+Merge: 6d046fcafa 20d40bfd4c
 Tim Sutton 	2013-04-23
 
     Merge pull request #540 from ccrook/delimited_text_bug_fixes
@@ -76627,7 +142976,7 @@ Chris Crook 	2013-04-24
 
     Post merge fixes
 
-Merge: 02388fe 1176bbc
+Merge: 02388feb3e 1176bbccc9
 Chris Crook 	2013-04-24
 
     Merge with master
@@ -76640,7 +142989,7 @@ Emilio Loi 	2013-04-23
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into styles_to_db
 
-Merge: 1176bbc 0b780b0
+Merge: 1176bbccc9 0b780b0a5d
 Jürgen Fischer 	2013-04-23
 
     Merge pull request #539 from matthias-kuhn/fix-7639
@@ -76661,7 +143010,7 @@ Chris Crook 	2013-04-23
 
     Updating QGis to QGIS in vector layer source documentation
 
-Merge: 2073f87 f3ab812
+Merge: 2073f87a22 f3ab81287c
 Nathan Woodrow 	2013-04-22
 
     Merge pull request #548 from minorua/raster_memory_leaks
@@ -76696,20 +143045,20 @@ Salvatore Larosa 	2013-04-22
 
     [pyqgis-console] fix indentation
 
-Merge: 1a91841 0564ab1
+Merge: 1a9184144d 0564ab167d
 Borys Jurgiel 	2013-04-22
 
     Merge pull request #492 from borysiasty/encoding_write_fix
 
     Fix shapefile encoding in QgsVectorFileWriter
 
-Merge: ea382d1 1a91841
+Merge: ea382d1af2 1a9184144d
 Emilio Loi 	2013-04-22
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into styles_to_db
 
     Conflicts:
-src/ui/qgsvectorlayerpropertiesbase.ui
+            src/ui/qgsvectorlayerpropertiesbase.ui
 
 Minoru Akagi 	2013-04-22
 
@@ -76723,7 +143072,7 @@ nyalldawson 	2013-04-22
 
     Add SIP bindings for composer item blend mode and transparency
 
-Merge: 269a419 2298cae
+Merge: 269a419b25 2298cae87a
 Nyall Dawson 	2013-04-21
 
     Merge pull request #547 from nyalldawson/blend_modes_sip
@@ -76899,7 +143248,7 @@ Matthias Kuhn 	2013-04-19
     [attributetable] No autofallback to FilterMode::ShowVisible
     As soon as extents of the map canvas changed, the filter showvisible was reapplied without a reason
 
-Merge: 31cecdb 7fff92a
+Merge: 31cecdbc51 7fff92ac1d
 matthias-kuhn 	2013-04-19
 
     Merge pull request #544 from rduivenvoorde/rubberband#7628
@@ -77072,7 +143421,7 @@ nyalldawson 	2013-04-16
 
     Blend modes apply to whole layer, not individual objects (fix #7603)
 
-Merge: d3f4e34 4e11972
+Merge: d3f4e3484e 4e119720ac
 Martin Dobias 	2013-04-17
 
     Merge pull request #536 from frugardc/master
@@ -77099,7 +143448,7 @@ Juergen E. Fischer 	2013-04-17
 
     fix warnings
 
-Merge: cd24f54 e0732a0
+Merge: cd24f5405c e0732a0628
 Chris Crook 	2013-04-18
 
     Merge branch 'master' into delimited_text_bug_fixes
@@ -77156,7 +143505,7 @@ Juergen E. Fischer 	2013-04-17
 
     fix windows build
 
-Merge: e6f3b2e 58737b6
+Merge: e6f3b2e008 58737b6831
 alexbruy 	2013-04-16
 
     Merge pull request #526 from vinayan/pip7414
@@ -77171,7 +143520,7 @@ Chris Crook 	2013-04-17
 
     Fixed tooltip text throughout.  Renamced combo box named cbxEncoding to cmbEncoding
 
-Merge: 22e54b9 e1421f5
+Merge: 22e54b9210 e1421f5afe
 Tim Sutton 	2013-04-16
 
     Merge pull request #532 from ccrook/delimited_text_bug_fixes
@@ -77182,7 +143531,7 @@ Chris Crook 	2013-04-17
 
     Minor error in tooltip help
 
-Merge: c396128 22e54b9
+Merge: c396128f79 22e54b9210
 Chris Crook 	2013-04-17
 
     Merge branch 'master' into delimited_text_bug_fixes
@@ -77203,7 +143552,7 @@ Chris Crook 	2013-04-17
 
     Delimited text file: tidying up UI layout and labels, updating help file
 
-Merge: 041b9f1 d06ab3c
+Merge: 041b9f1f99 d06ab3c1d9
 Chris Crook 	2013-04-17
 
     Merge branch 'master' into delimited_text_bug_fixes
@@ -77268,7 +143617,7 @@ Alexander Bruy 	2013-04-14
 
     [sextante] add license to script and fix its group
 
-Merge: 5875d5a 07abb34
+Merge: 5875d5a5cf 07abb34ebe
 Salvatore Larosa 	2013-04-15
 
     Merge pull request #399 from slarosa/pyqgis_console_side_editor_2
@@ -77351,7 +143700,7 @@ Chris Crook 	2013-04-16
 
     Colour functions and en-US help files implemented.
 
-Merge: c62c396 268c037
+Merge: c62c396a5f 268c03745f
 Chris Crook 	2013-04-16
 
     Merge branch 'master' into colour_functions
@@ -77433,7 +143782,7 @@ Juergen E. Fischer 	2013-04-15
 
     fix windows build
 
-Merge: 82b41db 632bfbb
+Merge: 82b41db51e 632bfbbaf0
 Tim Sutton 	2013-04-14
 
     Merge pull request #527 from ccrook/master
@@ -77540,12 +143889,12 @@ Chris Crook 	2013-04-14
 
     Tests completed successfully
 
-Merge: d124732 d87eb2a
+Merge: d124732fc4 d87eb2aadc
 Chris Crook 	2013-04-14
 
     Merge branch 'master' into delimiter_text_enhancement
 
-Merge: 27f65c2 8ef9e6d
+Merge: 27f65c2355 8ef9e6d4a4
 Werner Macho 	2013-04-13
 
     Merge pull request #525 from vinayan/fix7474
@@ -77602,21 +143951,21 @@ Radim Blazek 	2013-04-13
 
     raster no data speed up
 
-Merge: f0132dc 7afa4f6
+Merge: f0132dcc6e 7afa4f67ca
 Jürgen Fischer 	2013-04-13
 
     Merge pull request #502 from nyalldawson/wms_dialog
 
     Fix tab order in WMS dialog, change layer control to extended selection mode for usability
 
-Merge: 736f765 f0dd138
+Merge: 736f765c4a f0dd138868
 mhugent 	2013-04-13
 
     Merge pull request #516 from Oslandia/atlas
 
     Fix qgsatlascomposition constructor and related Atlas unit tests
 
-Merge: 99bf5fa e3451bb
+Merge: 99bf5fac75 e3451bb58a
 Jürgen Fischer 	2013-04-13
 
     Merge pull request #514 from mbernasocchi/master
@@ -77709,21 +144058,21 @@ Victor Olaya 	2013-04-13
 
     [sextante] several fixes for supporting optional parameters in modeler
 
-Merge: a6e5569 366e138
+Merge: a6e55696fa 366e13847c
 Werner Macho 	2013-04-13
 
     Merge pull request #517 from L-Infantini/master
 
     Translations and corrections pt_PT
 
-Merge: a05ac22 a5436a8
+Merge: a05ac22564 a5436a8bef
 Werner Macho 	2013-04-13
 
     Merge pull request #524 from tomass/master
 
     Update Lithuanian translations
 
-Merge: 5d99595 fe7f26f
+Merge: 5d99595c23 fe7f26f85c
 mhugent 	2013-04-13
 
     Merge pull request #523 from 3nids/dropinvalidchars
@@ -77788,7 +144137,7 @@ Emilio Loi 	2013-04-12
 
     Added new option for saving styles on db for vector layers with postgres provider
 
-Merge: 61b3e4c41 706ac99
+Merge: 61b3e4c414 706ac99a83
 mhugent 	2013-04-12
 
     Merge pull request #460 from 3nids/readListEntryDefault
@@ -77826,7 +144175,7 @@ Juergen E. Fischer 	2013-04-12
     ogr provider: don't ignore set encoding if SHAPE_ENCODING is set although OGR
     still claims that strings are already UTF-8
 
-Merge: 1a4ce3e bc67bde
+Merge: 1a4ce3ecd5 bc67bde0fc
 mhugent 	2013-04-12
 
     Merge pull request #520 from 3nids/removeaction
@@ -77854,7 +144203,7 @@ Alexander Bruy 	2013-04-12
     [sextante] remove TauDEM help files. Now this files are available from
     SEXTANTE-Help repo
 
-Merge: fa9e0ac ab8b53e
+Merge: fa9e0ac4e9 ab8b53e029
 Tim Sutton 	2013-04-12
 
     Merge pull request #519 from borysiasty/master
@@ -77881,7 +144230,7 @@ Borys Jurgiel 	2013-04-12
 
     Update default symbol set: more symbols from Anita, lock colour in bottom layer of road symbols, include symbology-ng-style.db instead of the depreciated xml in OsGeo4W
 
-Merge: 920253d a290fa2
+Merge: 920253d17d a290fa257f
 Chris Crook 	2013-04-12
 
     Merge branch 'master' into delimiter_text_enhancement
@@ -77890,7 +144239,7 @@ Chris Crook 	2013-04-12
 
     Documentation updates
 
-Merge: a290fa2 5432618
+Merge: a290fa257f 5432618e0c
 Werner Macho 	2013-04-12
 
     Merge pull request #507 from matthias-kuhn/fix-7508
@@ -77930,7 +144279,7 @@ Werner Macho 	2013-04-11
     Manually applied the patch from PhilippeDorelo
     this should fix bug #7068
 
-Merge: 207da36 6d60215
+Merge: 207da3631e 6d6021558b
 Werner Macho 	2013-04-11
 
     Merge pull request #518 from PhilippeDorelon/valuerelation
@@ -78002,7 +144351,7 @@ Victor Olaya 	2013-04-10
 
     [sextante] reorganized sextante tools and how they are exposed and added some tests
 
-Merge: 4b06df0 254fc4d
+Merge: 4b06df0b6c 254fc4db6e
 Werner Macho 	2013-04-11
 
     Merge pull request #515 from 3nids/duplicatecode
@@ -78072,14 +144421,14 @@ Alexander Bruy 	2013-04-10
 
     [sextante] escape filenames, passed to GDAL tools (fix #5923)
 
-Merge: 212aea7 f7732d3
+Merge: 212aea7c44 f7732d3a27
 Nathan Woodrow 	2013-04-10
 
     Merge pull request #511 from nyalldawson/html_labels_fix
 
     Fix html labels rendering before they are fully loaded...
 
-Merge: 76f8d60 212aea7
+Merge: 76f8d60273 212aea7c44
 Marco Bernasocchi 	2013-04-10
 
     Merge remote-tracking branch 'upstream/master'
@@ -78092,7 +144441,7 @@ Marco Hugentobler 	2013-04-10
 
     Change point displacement renderer to work with new vector api
 
-Merge: 8c714a9 d52d4da
+Merge: 8c714a9d41 d52d4dad17
 Nathan Woodrow 	2013-04-09
 
     Merge pull request #513 from olivierdalang/SymbolLayerWidgetsUISmallUpdate
@@ -78111,7 +144460,7 @@ Radim Blazek 	2013-04-09
 
     GML parser boundedBy fix
 
-Merge: 1436056 dbf795e
+Merge: 1436056f77 dbf795ed1f
 mhugent 	2013-04-09
 
     Merge pull request #512 from nyalldawson/blend_mode_fixes
@@ -78162,14 +144511,14 @@ Juergen E. Fischer 	2013-04-08
 
     remove unused layer transparency (and fix some warnings)
 
-Merge: a150865 57c2307
+Merge: a150865e2b 57c23078c7
 Jürgen Fischer 	2013-04-08
 
     Merge pull request #508 from matthias-kuhn/dual-view-fixes
 
     Dual view fixes
 
-Merge: 4306632 a21fc5a
+Merge: 4306632c74 a21fc5a73d
 Jürgen Fischer 	2013-04-08
 
     Merge pull request #510 from matthias-kuhn/field-calculator-perf
@@ -78198,7 +144547,7 @@ Matthias Kuhn 	2013-04-08
 
     [FIX #7543] Dual View Table/Form: Preview column not saved in project
 
-Merge: 34adbe7 52da723
+Merge: 34adbe7f56 52da7237ee
 Werner Macho 	2013-04-08
 
     Merge pull request #505 from vinayan/7477-add-rule-crash
@@ -78306,7 +144655,7 @@ Minoru Akagi 	2013-04-07
 
     fix #4303
 
-Merge: 2bfffaa 73c74ac
+Merge: 2bfffaa516 73c74acf48
 Werner Macho 	2013-04-07
 
     Merge pull request #506 from vinayan/fixdupes
@@ -78357,7 +144706,7 @@ Alexander Bruy 	2013-04-05
 
     remove debug statement
 
-Merge: 217e7c1 9ffc8ee
+Merge: 217e7c1623 9ffc8ee2df
 Larry Shaffer 	2013-04-05
 
     Merge pull request #504 from nyalldawson/blend_modes
@@ -78380,7 +144729,7 @@ Radim Blazek 	2013-04-04
 
     qgis_bench wall clock time
 
-Merge: b809723 5e1dfd9
+Merge: b809723977 5e1dfd9c7d
 Nathan Woodrow 	2013-04-04
 
     Merge pull request #503 from nyalldawson/heatmap_dialog
@@ -78431,19 +144780,19 @@ Alexander Bruy 	2013-04-04
 
     fix typo Python test for QgsVectorLayer
 
-Merge: 1c6ee9f 45cd49d
+Merge: 1c6ee9f650 45cd49d268
 mhugent 	2013-04-04
 
     Merge pull request #500 from matthias-kuhn/rendering-cache-crash
 
     [Bugfix] Make rendering cache more stable
 
-Merge: d7a6bc3 8e7ffd7
+Merge: d7a6bc3d1a 8e7ffd74dd
 Chris Crook 	2013-04-04
 
     Merged with dev master
 
-Merge: cbd257d 3a4aa8f
+Merge: cbd257d11f 3a4aa8f610
 alexbruy 	2013-04-04
 
     Merge pull request #501 from nyalldawson/color_control
@@ -78484,14 +144833,14 @@ Radim Blazek 	2013-04-03
 
     composer legend - default symbol to label space fix
 
-Merge: cf4fd4a 1de8c76
+Merge: cf4fd4a153 1de8c76450
 Jürgen Fischer 	2013-04-03
 
     Merge pull request #498 from matthias-kuhn/feature-request-no-geom
 
     [FIX] Show attribute table for layers without geometry
 
-Merge: 80f7b5a 378a858
+Merge: 80f7b5abb2 378a85894e
 alexbruy 	2013-04-03
 
     Merge pull request #499 from nyalldawson/fix_alpha
@@ -78506,7 +144855,7 @@ Marco Hugentobler 	2013-04-03
 
     Consider alpha component of colors in data defined symbology
 
-Merge: 67a542b 95d7ec3
+Merge: 67a542bfd0 95d7ec359e
 William Kyngesburye 	2013-04-02
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -78515,7 +144864,7 @@ William Kyngesburye 	2013-04-02
 
     add framework path to link test to fix OS X SDK problem
 
-Merge: 87572f7 7a1b12f
+Merge: 87572f72e8 7a1b12f861
 Nathan Woodrow 	2013-04-02
 
     Merge pull request #450 from 3nids/showEditForm
@@ -78534,28 +144883,28 @@ Juergen E. Fischer 	2013-04-02
 
     indentation update
 
-Merge: b48c2dc a3634e2
+Merge: b48c2dc416 a3634e24b2
 Jürgen Fischer 	2013-04-02
 
     Merge pull request #486 from matthias-kuhn/attr-edit-dnd-multi
 
     Attribute editor (drag and drop layouter): Proper handling when multiple...
 
-Merge: 255b467 1b7d94b
+Merge: 255b467b46 1b7d94b96b
 Jürgen Fischer 	2013-04-02
 
     Merge pull request #488 from edigonzales/master
 
     http referer for wm(t)s requests
 
-Merge: c4645ea b035527
+Merge: c4645ea0a8 b0355276d8
 Jürgen Fischer 	2013-04-02
 
     Merge pull request #496 from matthias-kuhn/fix-7483
 
     [FIX  #7483] Attribute table changed selection on layer twice subsequent...
 
-Merge: 00ae45b 002f73e
+Merge: 00ae45befe 002f73ed9c
 Jürgen Fischer 	2013-04-02
 
     Merge pull request #495 from matthias-kuhn/fix-7485
@@ -78608,7 +144957,7 @@ Matthias Kuhn 	2013-04-02
     Don't crash when QgsExpression parser fails to parse a preview column (e.g. column without name)
     Also removed throwing exception as this has been discouraged.
 
-Merge: 4f6c2d2 60c20ab
+Merge: 4f6c2d253c 60c20aba40
 Tim Sutton 	2013-04-02
 
     Merge pull request #494 from palmerj/wfs_ui_improvements
@@ -78631,7 +144980,7 @@ Jeremy Palmer 	2013-04-02
 
     Added Filter search for WFS layers. Also improved the treeView to have better column and row layout
 
-Merge: 3d15e67 af7d6f8
+Merge: 3d15e679b4 af7d6f8c9d
 William Kyngesburye 	2013-04-01
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -78686,7 +145035,7 @@ William Kyngesburye 	2013-04-01
 
     remove very old v1.0 Mac stuff
 
-Merge: e68b322 d971a69
+Merge: e68b32212b d971a69329
 William Kyngesburye 	2013-04-01
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -78711,11 +145060,11 @@ Nathan Woodrow 	2013-04-01
 
     Data defined symbol UI clean up
 
-- Reduce margins
-- Remove cell selection
-- Adjust first column width
+            - Reduce margins
+            - Remove cell selection
+            - Adjust first column width
 
-Merge: 6c3f418 7b6e322
+Merge: 6c3f418988 7b6e322bf9
 Tim Sutton 	2013-04-01
 
     Merge branch 'composer_blend' of https://github.com/nyalldawson/Quantum-GIS
@@ -78748,12 +145097,12 @@ Juergen E. Fischer 	2013-04-01
 
     fix build error and a warning
 
-Merge: 2b34ae5 9b0c455
+Merge: 2b34ae5662 9b0c455c02
 Marco Hugentobler 	2013-04-01
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 5c028f8 8a0b0fe
+Merge: 5c028f8881 8a0b0fef52
 Marco Hugentobler 	2013-04-01
 
     [Feature]: Merge data defined symbology branch
@@ -78766,7 +145115,7 @@ Marco Hugentobler 	2013-04-01
 
     Add export macro
 
-Merge: 9247262 30c343c
+Merge: 92472625f6 30c343cc89
 Nathan Woodrow 	2013-03-31
 
     Merge pull request #452 from minorua/tablejoin
@@ -78827,7 +145176,7 @@ Nathan Woodrow 	2013-03-31
 
     Rename Save as style to Save in symbol library
 
-Merge: 7d9f444 daeafcc
+Merge: 7d9f4446dd daeafccd49
 Nathan Woodrow 	2013-03-30
 
     Merge pull request #491 from borysiasty/master
@@ -78880,7 +145229,7 @@ Tim Sutton 	2013-03-30
 
     Mark srsDimesion unused - see https://github.com/qgis/Quantum-GIS/commit/93e02598438ca9526de5a451b0918e7ae365b7ac#commitcomment-2871379
 
-Merge: 72b476e 86ba94b
+Merge: 72b476e702 86ba94bf90
 Nathan Woodrow 	2013-03-30
 
     Merge pull request #490 from nyalldawson/heatmap_fixes
@@ -78911,7 +145260,7 @@ Nathan Woodrow 	2013-03-30
 
     Add overload for QgsFeature with QgsFields
 
-Merge: 6e75ea4 de7dd71
+Merge: 6e75ea441a de7dd71710
 Werner Macho 	2013-03-29
 
     Merge pull request #489 from tomass/master
@@ -78988,7 +145337,7 @@ Victor Olaya 	2013-03-28
 
     [sextante] added "delete R script" action
 
-Merge: 93ade1f d056d5f
+Merge: 93ade1f2c0 d056d5f59c
 Werner Macho 	2013-03-28
 
     Merge pull request #487 from SrNetoChan/master
@@ -79023,7 +145372,7 @@ Marco Hugentobler 	2013-03-28
 
     Moved code for data defined simple line symbolisation into its own functions
 
-Merge: 1b663bb 0f7e90b
+Merge: 1b663bb7ae 0f7e90b922
 Nathan Woodrow 	2013-03-27
 
     Merge pull request #480 from nyalldawson/hue_saturation
@@ -79048,19 +145397,19 @@ Alexandre Neto 	2013-03-28
 
     Some PT-pt translations and corrections
 
-Merge: d1825ec c9ef27c
+Merge: d1825ece2a c9ef27c39b
 Nathan Woodrow 	2013-03-27
 
     Merge pull request #485 from nyalldawson/blend_modes
 
     Blend modes pt 3 - blend modes for labels
 
-Merge: 8793d38 d1825ec
+Merge: 8793d388b1 d1825ece2a
 Nyall Dawson 	2013-03-28
 
     Merge remote-tracking branch 'origin/master' into blend_modes
 
-Merge: 24fedb2 d1825ec
+Merge: 24fedb255b d1825ece2a
 Alexandre Neto 	2013-03-27
 
     Merge remote-tracking branch 'upstream/master'
@@ -79073,14 +145422,14 @@ Nyall Dawson 	2013-03-28
 
     Move BlendMode enum and functions to QgsMapRenderer
 
-Merge: dd9bf7e 9aea6ad
+Merge: dd9bf7ef70 9aea6adc0e
 Jürgen Fischer 	2013-03-27
 
     Merge pull request #482 from matthias-kuhn/fix-7379
 
     Fix issue #7379: Crash when attribute table is closed after layer has be...
 
-Merge: aa6d22a f28f13c
+Merge: aa6d22afa3 f28f13cd24
 Jürgen Fischer 	2013-03-27
 
     Merge pull request #484 from matthias-kuhn/attribute-table-sort
@@ -79095,7 +145444,7 @@ edigonzales 	2013-03-27
 
     working on referer option for http requests
 
-Merge: 0005467 429be1e
+Merge: 000546740b 429be1e9c5
 mhugent 	2013-03-27
 
     Merge pull request #483 from matthias-kuhn/pie-angle
@@ -79118,7 +145467,7 @@ Matthias Kuhn 	2013-03-27
 
     Fix issue #7379: Crash when attribute table is closed after layer has been deleted
 
-Merge: 24f1519 689c940
+Merge: 24f1519b1b 689c9405a3
 Nathan Woodrow 	2013-03-27
 
     Merge pull request #481 from matthias-kuhn/fix-missing-icons
@@ -79211,7 +145560,7 @@ Werner Macho 	2013-03-27
 
     fixed Version is obsolete
 
-Merge: 86a246a 4435c4f
+Merge: 86a246a0df 4435c4f3d0
 Nyall Dawson 	2013-03-27
 
     Fix branch to apply to current master
@@ -79248,7 +145597,7 @@ Juergen E. Fischer 	2013-03-26
     - translation strings
     - return plugin category (fixes persistent loading)
 
-Merge: 4e29436 8bf6df2
+Merge: 4e29436d20 8bf6df2445
 Nyall Dawson 	2013-03-27
 
     Merge remote-tracking branch 'origin/master' into hue_saturation
@@ -79274,7 +145623,7 @@ vinayan 	2012-12-12
 
     Conflicts:
 
-src/plugins/CMakeLists.txt
+            src/plugins/CMakeLists.txt
 
     fixed issues in duplicate rule where zooming was not possible..renamed 'Test' to 'Rule'
 
@@ -79343,7 +145692,7 @@ Radim Blazek 	2013-03-26
 
     composer legend styles, fixes partialy #6960
 
-Merge: 250cc4e a482c42
+Merge: 250cc4ecb1 a482c42a76
 Jürgen Fischer 	2013-03-26
 
     Merge pull request #473 from Oslandia/atlas
@@ -79442,7 +145791,7 @@ Marco Hugentobler 	2013-03-24
 
     Add export macro
 
-Merge: 920036e 56b55a0
+Merge: 920036e023 56b55a0a25
 Marco Hugentobler 	2013-03-24
 
     Merge composer ruler branch
@@ -79451,7 +145800,7 @@ Marco Hugentobler 	2013-03-24
 
     Fix ruler shift
 
-Merge: dac35e1 adf8c26
+Merge: dac35e1063 adf8c2667d
 Werner Macho 	2013-03-24
 
     Merge pull request #478 from tomass/master
@@ -79462,7 +145811,7 @@ Tomas 	2013-03-24
 
     Remove russian words from lithuanian translation
 
-Merge: 176a08c 08fba25
+Merge: 176a08c7d1 08fba255e5
 Nathan Woodrow 	2013-03-23
 
     Merge pull request #476 from nyalldawson/blend_modes
@@ -79505,7 +145854,7 @@ Marco Hugentobler 	2013-03-23
 
     Load and save custom snap lines in composer
 
-Merge: 2a9d016 d6ad6e5
+Merge: 2a9d016682 d6ad6e5d62
 Werner Macho 	2013-03-23
 
     Merge pull request #477 from matthias-kuhn/pg-msg
@@ -79520,7 +145869,7 @@ Nyall Dawson 	2013-03-23
 
     Add support for copy/pasting blend modes for layers
 
-Merge: a006d99 7423e9a
+Merge: a006d99958 7423e9aad7
 Nathan Woodrow 	2013-03-23
 
     Merge pull request #471 from nyalldawson/heatmap_kernels
@@ -79535,7 +145884,7 @@ Marco Hugentobler 	2013-03-23
 
     Hide custom snap lines before printing composition
 
-Merge: 0594453 70ef5a7
+Merge: 0594453ff5 70ef5a78b0
 Larry Shaffer 	2013-03-22
 
     Merge pull request #474 from dakcarto/color-button_mk_10
@@ -79554,7 +145903,7 @@ Marco Hugentobler 	2013-03-22
 
     Data defined symbology for simple line symbol layer
 
-Merge: 9afe76d 647fbdb
+Merge: 9afe76d4d6 647fbdbec4
 Nathan Woodrow 	2013-03-21
 
     Merge pull request #475 from nyalldawson/blend_modes
@@ -79749,7 +146098,7 @@ Nyall Dawson 	2013-03-19
 
     Move kernelShape enum to heatmap.h
 
-Merge: 5d62af3 d7d1ece
+Merge: 5d62af343a d7d1ecec1a
 Larry Shaffer 	2013-03-18
 
     Merge pull request #464 from dakcarto/nmake-with-jom_1
@@ -79764,7 +146113,7 @@ Tentotwo <1022tentotwo@gmail.com>	2013-03-18
 
     Added UI elements for specifying resolution in Rasterize
 
-Merge: 5743f52 713d3c1
+Merge: 5743f52c8f 713d3c11f0
 Nathan Woodrow 	2013-03-18
 
     Merge pull request #468 from slarosa/master
@@ -79787,12 +146136,12 @@ Nyall Dawson 	2013-03-18
 
     [FEATURE] Add triweight and Epanechnikov kernels. Make decay disabled for all kernels expect Triangular kernel. Fix math for triangular kernels.
 
-Merge: ec01afb 9a81fa7
+Merge: ec01afb544 9a81fa7609
 Nyall Dawson 	2013-03-17
 
     Merge branch 'master' into heatmap_kernels
 
-Merge: 8966e9e 239479a
+Merge: 8966e9ec3f 239479affd
 Nathan Woodrow 	2013-03-17
 
     Merge pull request #461 from nyalldawson/heatmap_fixes
@@ -79807,7 +146156,7 @@ Nathan Woodrow 	2013-03-17
 
     Fix #7030. Enable customization via command line
 
-Merge: 5d42734 cb685e9
+Merge: 5d42734cf2 cb685e9baa
 Nathan Woodrow 	2013-03-16
 
     Merge pull request #466 from nyalldawson/master
@@ -79854,12 +146203,12 @@ Marco Hugentobler 	2013-03-15
 
     Convert composer entry in project file from 1.8 to 1.9 format for QGIS Server
 
-Merge: 6afd9f4 3b9c688
+Merge: 6afd9f43b3 3b9c688b64
 Marco Hugentobler 	2013-03-15
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 1e30eb0 af1bde9
+Merge: 1e30eb0c75 af1bde995a
 Marco Hugentobler 	2013-03-15
 
     Merge branch 'data_defined_symbology'
@@ -79972,7 +146321,7 @@ Nyall Dawson 	2013-03-14
 
     Change float to double for calculations
 
-Merge: 032c5f5 239479a
+Merge: 032c5f5252 239479affd
 Nyall Dawson 	2013-03-14
 
     Merge heatmap_fixes branch
@@ -80046,7 +146395,7 @@ Marco Hugentobler 	2013-03-13
 
     Use OGRSpatialReferenceH instead of void pointer
 
-Merge: bb5c471 96887b8
+Merge: bb5c471e59 96887b8d24
 Nathan Woodrow 	2013-03-12
 
     Merge pull request #467 from 3nids/immutablefields
@@ -80087,7 +146436,7 @@ Juergen E. Fischer 	2013-03-13
 
     german translation update
 
-Merge: a05747c 3b8cbc2
+Merge: a05747c40d 3b8cbc2adb
 Nyall Dawson 	2013-03-13
 
     Merge heatmap_fixes branch
@@ -80096,7 +146445,7 @@ Nyall Dawson 	2013-03-13
 
     Convert radius to a float, not an integer. Fixes heatmaps created with a radius < 1.
 
-Merge: 1164c81 a56c957
+Merge: 1164c81326 a56c9571ea
 Nyall Dawson 	2013-03-13
 
     Merge branch 'master' into heatmap_fixes
@@ -80230,7 +146579,7 @@ Marco Hugentobler 	2013-03-10
 
     Full support for width/offset/dash units in simple line symbollayer
 
-Merge: 0c1faa5 247980b
+Merge: 0c1faa5aaa 247980b353
 Nathan Woodrow 	2013-03-10
 
     Merge pull request #455 from 3nids/immutablefields
@@ -80283,7 +146632,7 @@ Marco Hugentobler 	2013-03-08
 
     Fix check state for legend groups restored from project file
 
-Merge: b9f3da6 290f8fd
+Merge: b9f3da6f8e 290f8fd5b8
 Nyall Dawson 	2013-03-08
 
     Merge branch 'master' into heatmap_fixes
@@ -80314,7 +146663,7 @@ Marco Hugentobler 	2013-03-07
 
     Separate units for line width, line offset, dash pattern
 
-Merge: 90b66dc 0b6fcda
+Merge: 90b66dce0b 0b6fcdafe9
 volaya 	2013-03-07
 
     Merge pull request #462 from MatMatt/master
@@ -80325,7 +146674,7 @@ Matteo Mattiuzzi 	2013-03-07
 
     R-scripts can have up to 10 consecutive empty lines before the parser exits
 
-Merge: 0a25aad 7db1b60
+Merge: 0a25aadcf0 7db1b607ce
 mhugent 	2013-03-06
 
     Merge pull request #454 from Oslandia/atlas
@@ -80388,7 +146737,7 @@ Martin Dobias 	2013-03-05
 
     Define OpenStreetMap actions in .ui file and make Vector menu permanent
 
-Merge: 2f53505 6d1eb26
+Merge: 2f53505692 6d1eb26a19
 Nathan Woodrow 	2013-03-05
 
     Merge pull request #448 from szekerest/master
@@ -80403,7 +146752,7 @@ Werner Macho 	2013-03-05
 
     translation update: romanian language
 
-Merge: a976ecb ba91c8f
+Merge: a976ecb321 ba91c8f8ec
 Nathan Woodrow 	2013-03-04
 
     Merge pull request #458 from 3nids/respectUIimmutableoption
@@ -80418,7 +146767,7 @@ Denis Rouzaud 	2013-03-05
 
     keep coding consistent
 
-Merge: 7c0746b b4aaa19
+Merge: 7c0746b091 b4aaa196d7
 Nathan Woodrow 	2013-03-04
 
     Merge pull request #457 from nyalldawson/gradfixes
@@ -80429,7 +146778,7 @@ Nyall Dawson 	2013-03-05
 
     Allow long/bigint columns to be used for graduated symbology (#4593)
 
-Merge: ea0c87e 58a7edb
+Merge: ea0c87e9ad 58a7edbb76
 Nathan Woodrow 	2013-03-04
 
     Merge pull request #453 from nyalldawson/gradfixes
@@ -80527,14 +146876,14 @@ Marco Hugentobler 	2013-03-01
 
     Fix WMS filter request with new API (ticket 7258)
 
-Merge: 54f3e0a 735577d
+Merge: 54f3e0a445 735577d32f
 volaya 	2013-03-01
 
     Merge pull request #442 from MatMatt/master
 
     [sextante]set package used when writing in case of #passfilenames
 
-Merge: 4baba76 cc239b2
+Merge: 4baba76e1a cc239b2fa7
 Nathan Woodrow 	2013-03-01
 
     Merge pull request #449 from nyalldawson/grad_fixes
@@ -80630,7 +146979,7 @@ olivierdalang 	2013-01-21
     - added offset curve action
     - added add html (composer) icon
 
-Merge: 13b362e 62e6b13
+Merge: 13b362e583 62e6b13d83
 Larry Shaffer 	2013-02-28
 
     Merge pull request #435 from Oslandia/atlas
@@ -80641,7 +146990,7 @@ Juergen E. Fischer 	2013-02-28
 
     avoid gdalconst deprecation warning
 
-Merge: 4f397f2 7316701
+Merge: 4f397f2c12 731670102c
 Martin Dobias 	2013-02-28
 
     Merge pull request #446 from matthias-kuhn/diag-py-bindings
@@ -80664,7 +147013,7 @@ Amit Kulkarni 	2013-02-21
 
     add old/new scale comparison and emit scaleChanged only if new scale is different than old.
 
-Merge: 84db88b f5d81ae
+Merge: 84db88baf0 f5d81aef3a
 Nathan Woodrow 	2013-02-27
 
     Merge pull request #445 from szekerest/master
@@ -80688,7 +147037,7 @@ Larry Shaffer 	2013-02-26
     - Show busy indicator dialog
     - Add busy indicator dialog method to QgsComposer
 
-Merge: 7267c6e af3245b
+Merge: 7267c6e765 af3245bba3
 Werner Macho 	2013-02-27
 
     Merge pull request #444 from SrNetoChan/master
@@ -80759,7 +147108,7 @@ Victor Olaya 	2013-02-25
 
     [sextante]modified problematic headers
 
-Merge: 148e7e1 aa4b291
+Merge: 148e7e1d99 aa4b291dba
 volaya 	2013-02-25
 
     Merge pull request #440 from MatMatt/master
@@ -80779,7 +147128,7 @@ Matteo Mattiuzzi 	2013-02-25
     changed the R command behavior .libPaths() in RAlgorithm.py to add a .lib.loc and not substitute one
     modifies the Advanced_Raster_histogramm.rsx in order to fully benefit from raster package RAM savety
 
-Merge: f85d3ae 79d5fb3
+Merge: f85d3ae71f 79d5fb35b8
 volaya 	2013-02-25
 
     Merge pull request #439 from mach0/master
@@ -80790,7 +147139,7 @@ Werner Macho 	2013-02-25
 
     added help files in doc subdirectory to be installed
 
-Merge: 5ac7d03 cfb56a2
+Merge: 5ac7d036b3 cfb56a21c9
 volaya 	2013-02-25
 
     Merge pull request #438 from MatMatt/master
@@ -80805,7 +147154,7 @@ Hugo Mercier 	2013-02-25
 
     [Atlas] Replace QgsCollapsibleGroupBoxBasic by QgsCollapsibleGroupBox (add auto-save collapsilble states)
 
-Merge: 34e6b9a 9517c0e
+Merge: 34e6b9a2f0 9517c0e373
 Hugo Mercier 	2013-02-25
 
     Merge pull request #1 from dakcarto/atlas-ui
@@ -80895,7 +147244,7 @@ Hugo Mercier 	2013-02-22
 
     [Atlas] Fix UI to be consistent with the use of QgsCollapsibleWidgets
 
-Merge: 857f849 8176da0
+Merge: 857f849355 8176da04f2
 Jürgen Fischer 	2013-02-21
 
     Merge pull request #433 from 3nids/pg_hstore
@@ -80977,7 +147326,7 @@ Marco Hugentobler 	2013-02-20
 
     Fix WFS loading with geoserver layers
 
-Merge: 6355e9b ad7deec
+Merge: 6355e9be0d ad7deec50f
 Jürgen Fischer 	2013-02-20
 
     Merge pull request #432 from matthias-kuhn/fix-vector-layer-signals
@@ -81124,7 +147473,7 @@ Werner Macho 	2013-02-19
 
     added malayalam language on request
 
-Merge: dc074b3 7717aee
+Merge: dc074b393e 7717aeed1c
 Larry Shaffer 	2013-02-18
 
     Merge pull request #418 from dakcarto/cmake_stagedplugins-optmz_2
@@ -81249,7 +147598,7 @@ Juergen E. Fischer 	2013-02-15
 
     quote closing parens within column names (fixes #7159)
 
-Merge: c1527af 2e84efa
+Merge: c1527af3be 2e84efafc5
 mhugent 	2013-02-15
 
     Merge pull request #428 from schmandr/master
@@ -81313,7 +147662,7 @@ Larry Shaffer 	2013-02-12
     - Holding Alt modifier key when toggling collapsed state will synchronize the toggling across other boxes with the same syncGroup QString value
     - Synchronizes boxes of same syncGroup via recursive search in parent or grandparent widget (if grandparent is not QgisApp)
 
-Merge: 8e11e5f 42dad85
+Merge: 8e11e5f9dd 42dad857e8
 mhugent 	2013-02-12
 
     Merge pull request #427 from matthias-kuhn/rubberband-doc
@@ -81324,7 +147673,7 @@ Matthias Kuhn 	2013-02-12
 
     Documentation update for QgsRubberband
 
-Merge: b45d8cb d1a05f7
+Merge: b45d8cb0d7 d1a05f7565
 mhugent 	2013-02-12
 
     Merge pull request #422 from Oslandia/atlas
@@ -81403,7 +147752,7 @@ Juergen E. Fischer 	2013-02-09
 
     ftools api update (fixes #7130)
 
-Merge: 5967db9 8303a47
+Merge: 5967db9bd6 8303a47e6c
 Giuseppe Sucameli 	2013-02-09
 
     Merge pull request #424 from slarosa/fix_rubber_band_python_plugins
@@ -81467,7 +147816,7 @@ Larry Shaffer 	2013-02-06
     - Add QHash containing old-style data provider mapping of index to name for use in properties migration
     - Update QgsLabelingGui, QgsMapToolLabel, QgsLabelPropertyDialog to work with name-based properties
 
-Merge: 863da7d d97f05e
+Merge: 863da7d03c d97f05ebee
 Radim Blazek 	2013-02-07
 
     Merge remote branch '3nids/maptoolidentify_returnresults'
@@ -81536,14 +147885,14 @@ Radim Blazek 	2013-02-06
 
     QgsMapToolIdentifyAction cleanup
 
-Merge: 81d865a ec634a2
+Merge: 81d865aaa7 ec634a2d2f
 Nathan Woodrow 	2013-02-06
 
     Merge pull request #413 from olivierdalang/labelCanDisplayHtml
 
     [Feature] add HTML capabilities to composer labels
 
-Merge: 50d4bb6 b642722
+Merge: 50d4bb6d4d b6427220d4
 Nathan Woodrow 	2013-02-06
 
     Merge pull request #408 from olivierdalang/showBackgroundCheckboxForComposerItem
@@ -81648,7 +147997,7 @@ Marco Hugentobler 	2013-02-04
 
     Show more verbose error message (ticket #7095)
 
-Merge: 93dbfd7 8a880ca
+Merge: 93dbfd7f35 8a880cadc3
 Victor Olaya 	2013-02-04
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -81677,7 +148026,7 @@ Larry Shaffer 	2013-02-03
 
     Update stage-installed plugins CMakeLists.txt
 
-Merge: dc340de 1095f98
+Merge: dc340def18 1095f98173
 Victor Olaya 	2013-02-03
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -81776,7 +148125,7 @@ Juergen E. Fischer 	2013-01-31
 
     debian packaging update
 
-Merge: a396613 3b29fad
+Merge: a3966131f4 3b29fadacc
 Nathan Woodrow 	2013-01-31
 
     Merge pull request #416 from szekerest/master
@@ -81787,7 +148136,7 @@ Alexander Bruy 	2013-01-31
 
     update russian python console help translation
 
-Merge: 859854f c728ea4
+Merge: 859854fcfc c728ea42c2
 Werner Macho 	2013-01-30
 
     Merge pull request #415 from gioman/master
@@ -81888,12 +148237,12 @@ olivierdalang 	2013-01-29
 
     fix for composer map item's background when non-opaque
 
-Merge: a00e413 bb97787
+Merge: a00e413b5d bb97787c65
 Marco Hugentobler 	2013-01-29
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 81dacc7 9f9ce32
+Merge: 81dacc726d 9f9ce3290f
 Marco Hugentobler 	2013-01-29
 
     [FEATURE]: possibility to export vector symbology (using ogr feature style)
@@ -81943,7 +148292,7 @@ Larry Shaffer 	2013-01-26
     - [API] Add setupFont() method to legend group items
     - [API] Add updateLegendItemStyles() and updateLegendItemSymbologies() to QgsLegend to allow style option changes to become active without app restart
 
-Merge: 8c89c2a c279ec2
+Merge: 8c89c2a058 c279ec2202
 Giuseppe Sucameli 	2013-01-28
 
     Merge pull request #394 from etiennesky/gdaltools1
@@ -81966,14 +148315,14 @@ Larry Shaffer 	2013-01-28
 
     Remove invalid relative path to images resource file
 
-Merge: 958cd2a 4cd271b
+Merge: 958cd2a0d7 4cd271bd71
 Nathan Woodrow 	2013-01-28
 
     Merge pull request #403 from matthias-kuhn/expression-build-dialog-save-window-geometry
 
     Save geometry of expression build dialog on close
 
-Merge: 6c931f3 fb63167
+Merge: 6c931f3bbc fb63167a47
 Nathan Woodrow 	2013-01-28
 
     Merge pull request #407 from matthias-kuhn/expression-builder-margin
@@ -82013,7 +148362,7 @@ Tim Sutton 	2013-01-27
 
     Update doc/osx.t2t
 
-Merge: 247c2db 5b9b03f
+Merge: 247c2dbe19 5b9b03f447
 Paolo Cavallini 	2013-01-27
 
     Merge pull request #405 from matthias-kuhn/piediagram-test-fix
@@ -82040,7 +148389,7 @@ Victor Olaya 	2013-01-27
 
     edited GRASS and SAGA algorithm descriptions
 
-Merge: 20e4ec5 a9a289e
+Merge: 20e4ec5596 a9a289e91e
 Victor Olaya 	2013-01-27
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -82089,7 +148438,7 @@ Martin Dobias 	2013-01-26
 
     QgsVectorLayer: deprecate old API: select(), nextFeature(), featureAtId()
 
-Merge: 985468e 994dc1c
+Merge: 985468e461 994dc1cc21
 Martin Dobias 	2013-01-26
 
     Merge remote-tracking branch 'origin/master' into new_vector_api
@@ -82147,7 +148496,7 @@ Radim Blazek 	2013-01-25
 
     more robust raster color map conversion from 1.8 project and style file, fixes #7023
 
-Merge: 4f3e89a 2a54248
+Merge: 4f3e89a8b4 2a542487cf
 Victor Olaya 	2013-01-24
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -82177,37 +148526,37 @@ Juergen E. Fischer 	2013-01-24
 
     log python warnings and enabled deprecation warnings
 
-Merge: 5f304b3 0ccff60
+Merge: 5f304b34a1 0ccff602e2
 Martin Dobias 	2013-01-24
 
     Merge remote-tracking branch 'jef/oraclespatial-nva' into new_vector_api
 
     Conflicts:
-doc/TRANSLATORS
-i18n/qgis_de.ts
-src/app/qgisapp.cpp
-src/core/qgis.cpp
-src/core/qgsvectorlayerimport.cpp
-src/providers/oracle/CMakeLists.txt
-src/providers/oracle/qgsoracleprovider.cpp
-src/providers/oracle/qgsoracleprovider.h
+            doc/TRANSLATORS
+            i18n/qgis_de.ts
+            src/app/qgisapp.cpp
+            src/core/qgis.cpp
+            src/core/qgsvectorlayerimport.cpp
+            src/providers/oracle/CMakeLists.txt
+            src/providers/oracle/qgsoracleprovider.cpp
+            src/providers/oracle/qgsoracleprovider.h
 
-Merge: dda51c6 5f70a68
+Merge: dda51c62b5 5f70a68ff8
 Martin Dobias 	2013-01-23
 
     Merge remote-tracking branch 'origin/master' into new_vector_api
 
     Conflicts:
-python/core/qgsvectordataprovider.sip
-src/app/legend/qgslegendlayer.cpp
-src/app/qgisapp.cpp
-src/app/qgsmergeattributesdialog.cpp
-src/core/qgsvectordataprovider.cpp
-src/core/qgsvectordataprovider.h
-src/core/qgsvectorlayer.cpp
-src/gui/qgssearchquerybuilder.cpp
-src/providers/postgres/qgspostgresprovider.cpp
-src/providers/wfs/CMakeLists.txt
+            python/core/qgsvectordataprovider.sip
+            src/app/legend/qgslegendlayer.cpp
+            src/app/qgisapp.cpp
+            src/app/qgsmergeattributesdialog.cpp
+            src/core/qgsvectordataprovider.cpp
+            src/core/qgsvectordataprovider.h
+            src/core/qgsvectorlayer.cpp
+            src/gui/qgssearchquerybuilder.cpp
+            src/providers/postgres/qgspostgresprovider.cpp
+            src/providers/wfs/CMakeLists.txt
 
 Tim Sutton 	2013-01-24
 
@@ -82219,7 +148568,7 @@ Juergen E. Fischer 	2013-01-23
     + progress dialog in progress dialog
     + fix for feature form from attribute table
 
-Merge: de437ab b1bfb9a
+Merge: de437abdb1 b1bfb9af03
 Tim Sutton 	2013-01-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -82228,7 +148577,7 @@ Tim Sutton 	2013-01-23
 
     Set options list style to to white background
 
-Merge: 53197ad 73b3d9c
+Merge: 53197ad88b 73b3d9cc8c
 Larry Shaffer 	2013-01-22
 
     Merge pull request #389 from slarosa/pyqgis-console
@@ -82265,7 +148614,7 @@ Juergen E. Fischer 	2013-01-09
 
     [FEATURE] add oracle provider
 
-Merge: 4479cd7 b6e6147
+Merge: 4479cd70b2 b6e6147948
 Marco Hugentobler 	2013-01-22
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -82352,15 +148701,15 @@ Larry Shaffer 	2013-01-21
     - Useful for group boxes on Ubuntu (default have no borders/backgrounds) and Mac (default are a bit funky-looking)
     - NOT tested yet on Windows
 
-Merge: 995ede3 0757e42
+Merge: 995ede3526 0757e4208c
 Victor Olaya 	2013-01-21
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
     Conflicts:
-python/plugins/sextante/algs/ftools/Difference.py
-python/plugins/sextante/algs/ftools/Intersection.py
-python/plugins/sextante/outputs/OutputTable.py
+            python/plugins/sextante/algs/ftools/Difference.py
+            python/plugins/sextante/algs/ftools/Intersection.py
+            python/plugins/sextante/outputs/OutputTable.py
 
 Victor Olaya 	2013-01-21
 
@@ -82402,7 +148751,7 @@ Marco Hugentobler 	2013-01-21
 
     Change WFS provider for new vector api
 
-Merge: 2a4d79d bfb2b7a
+Merge: 2a4d79d913 bfb2b7af0d
 Larry Shaffer 	2013-01-20
 
     Merge pull request #393 from dakcarto/options_re-org_5
@@ -82433,7 +148782,7 @@ Juergen E. Fischer 	2013-01-18
 
     fix #7006
 
-Merge: 7809cbd 1910621
+Merge: 7809cbdb29 1910621f63
 Marco Hugentobler 	2013-01-18
 
     Merge branch 'composer_inference_lines'
@@ -82494,7 +148843,7 @@ Larry Shaffer 	2013-01-14
     - Fix excess whitespace issue for list widget pane in QtDesigner and QGIS
     - Switch GDAL drive table load to on current page name
 
-Merge: a6c5fd8 e12d139
+Merge: a6c5fd875b e12d1398d8
 rldhont 	2013-01-17
 
     Merge pull request #392 from rldhont/new_vector_api
@@ -82523,14 +148872,14 @@ Marco Hugentobler 	2013-01-17
 
     Cleanup code for composer item align
 
-Merge: 79d7246 3fe0f99
+Merge: 79d7246eff 3fe0f99f1c
 Werner Macho 	2013-01-17
 
     Merge pull request #390 from gioman/master
 
     More pt_PT translations by Nelson Silva
 
-Merge: a928d51 629fa5a
+Merge: a928d514c7 629fa5ab3a
 Werner Macho 	2013-01-17
 
     Merge pull request #391 from slarosa/gdal_tools_issue
@@ -82585,7 +148934,7 @@ Salvatore Larosa 	2013-01-15
 
     Update translation for Python Console
 
-Merge: ce64ede a1743ab
+Merge: ce64ede9bb a1743ab0e5
 mhugent 	2013-01-15
 
     Merge pull request #388 from mwa/offline_editing_api
@@ -82596,7 +148945,7 @@ Mathias Walker 	2013-01-15
 
     Move QgsOfflineEditing to core and add SIP bindings; refactor Offline Editing Plugin
 
-Merge: 0357f0f 6768327
+Merge: 0357f0fd24 6768327edb
 Tim Sutton 	2013-01-15
 
     Merge pull request #387 from slarosa/pyqgis-console
@@ -82607,7 +148956,7 @@ Salvatore Larosa 	2013-01-15
 
     Add QgsMessageBar for pyqgis console
 
-Merge: bdcb6c1 ca77a98
+Merge: bdcb6c1c33 ca77a9876c
 mhugent 	2013-01-15
 
     Merge pull request #386 from Oslandia/atlas
@@ -82682,7 +149031,7 @@ Larry Shaffer 	2013-01-12
     - Add user-defined option for general message timeouts
     - [API] Add get/set methods for general message timeouts to QgisApp
 
-Merge: ac29c5b 5b06de9
+Merge: ac29c5b11f 5b06de9935
 Jürgen Fischer 	2013-01-12
 
     Merge pull request #378 from slarosa/ftools_split_vector
@@ -82705,7 +149054,7 @@ Juergen E. Fischer 	2013-01-12
 
     fix sip binding of QgsCredentials::get() (always returned true; partly rolls back dcf3ede)
 
-Merge: 13bfb5e 8203eff
+Merge: 13bfb5eb9a 8203effa72
 Larry Shaffer 	2013-01-12
 
     Merge pull request #385 from slarosa/pyqgis-console
@@ -82717,7 +149066,7 @@ Salvatore Larosa 	2013-01-12
     remove item QgsInterface from import class menu in python console
     since a369ed0 it is no longer necessary to import iface object
 
-Merge: 5b431df bc4f8f2
+Merge: 5b431dfaf4 bc4f8f2ba2
 Victor Olaya 	2013-01-12
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -82788,7 +149137,7 @@ vinayan 	2013-01-06
 
     Added Rotate Map Tool
 
-Merge: 971c7b8 8803a00
+Merge: 971c7b8b6a 8803a00aff
 Larry Shaffer 	2013-01-11
 
     Merge pull request #382 from dakcarto/iface_edits-tool-switch-fix_1
@@ -82813,7 +149162,7 @@ Juergen E. Fischer 	2013-01-12
 
     oracle provider: accept number(0) as key
 
-Merge: 078f0d0 eb02e91
+Merge: 078f0d0ad2 eb02e915d9
 Marco Hugentobler 	2013-01-11
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -82826,7 +149175,7 @@ Juergen E. Fischer 	2013-01-11
 
     oracle provider: fix menu entry
 
-Merge: 37f7d57 5003c46
+Merge: 37f7d57897 5003c465d0
 Jürgen Fischer 	2013-01-10
 
     Merge pull request #384 from lynxlynxlynx/master
@@ -82853,14 +149202,14 @@ Marco Hugentobler 	2013-01-10
 
     Fix display of paper size after loading from Template. Fixes #6818
 
-Merge: 834107a f2a0378
+Merge: 834107a68a f2a037881e
 volaya 	2013-01-10
 
     Merge pull request #383 from slarosa/sextante-issue
 
     Fix for destination CRS in SEXTANTE GRASS algs:
 
-Merge: 4ddcb3e 2c1db1c
+Merge: 4ddcb3eaac 2c1db1c665
 mhugent 	2013-01-10
 
     Merge pull request #380 from bischofia/updateFieldName
@@ -82916,7 +149265,7 @@ Victor Olaya 	2013-01-08
 
     improvements for handling tables
 
-Merge: 964e842 45fab4b
+Merge: 964e842435 45fab4ba55
 Victor Olaya 	2013-01-08
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -82925,7 +149274,7 @@ Salvatore Larosa 	2013-01-08
 
     fix #4534
 
-Merge: e59de66 7e29d7c
+Merge: e59de661b7 7e29d7ced1
 Victor Olaya 	2013-01-07
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -82938,12 +149287,12 @@ Martin Dobias 	2013-01-06
 
     Postgres feature iterator fixes (rewind, FID filter, closing)
 
-Merge: a785fd5 522bbcd
+Merge: a785fd5973 522bbcda2b
 Victor Olaya 	2013-01-04
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
-Merge: 5c00014 a572f3c
+Merge: 5c00014397 a572f3c262
 Victor Olaya 	2013-01-04
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -83048,7 +149397,7 @@ Marco Hugentobler 	2012-12-18
 
     Better error handling
 
-Merge: 81b0930 122cff7
+Merge: 81b0930498 122cff7859
 Martin Dobias 	2012-12-18
 
     Merge remote-tracking branch 'origin/master' into new_vector_api
@@ -83057,27 +149406,27 @@ Martin Dobias 	2012-12-18
     Fixed tests.
 
     Conflicts:
-src/app/legend/qgslegendlayer.cpp
-src/app/qgsattributedialog.cpp
-src/app/qgsattributedialog.h
-src/app/qgslabelpropertydialog.cpp
-src/app/qgsmaptoollabel.cpp
-src/app/qgsvectorlayerproperties.cpp
-src/core/CMakeLists.txt
-src/core/composer/qgsatlascomposition.cpp
-src/core/qgsexpression.cpp
-src/core/qgspallabeling.cpp
-src/core/qgsvectorlayer.cpp
-src/core/qgsvectorlayer.h
-src/core/qgsvectorlayerimport.cpp
-src/mapserver/qgsprojectparser.cpp
-src/mapserver/qgswfsserver.cpp
-src/mapserver/qgswfsserver.h
-src/mapserver/qgswmsserver.cpp
-src/providers/postgres/qgspostgresprovider.cpp
-src/providers/spatialite/qgsspatialiteprovider.h
-tests/src/core/testqgsexpression.cpp
-tests/src/python/test_qgsmemoryprovider.py
+            src/app/legend/qgslegendlayer.cpp
+            src/app/qgsattributedialog.cpp
+            src/app/qgsattributedialog.h
+            src/app/qgslabelpropertydialog.cpp
+            src/app/qgsmaptoollabel.cpp
+            src/app/qgsvectorlayerproperties.cpp
+            src/core/CMakeLists.txt
+            src/core/composer/qgsatlascomposition.cpp
+            src/core/qgsexpression.cpp
+            src/core/qgspallabeling.cpp
+            src/core/qgsvectorlayer.cpp
+            src/core/qgsvectorlayer.h
+            src/core/qgsvectorlayerimport.cpp
+            src/mapserver/qgsprojectparser.cpp
+            src/mapserver/qgswfsserver.cpp
+            src/mapserver/qgswfsserver.h
+            src/mapserver/qgswmsserver.cpp
+            src/providers/postgres/qgspostgresprovider.cpp
+            src/providers/spatialite/qgsspatialiteprovider.h
+            tests/src/core/testqgsexpression.cpp
+            tests/src/python/test_qgsmemoryprovider.py
 
 Martin Dobias 	2012-12-17
 
@@ -83114,7 +149463,7 @@ Chris Crook 	2012-11-03
 
     Code for delimited text provider
 
-Merge: e0f9d53 a9ff3cf
+Merge: e0f9d53e63 a9ff3cfccd
 ddehaan 	2012-10-28
 
     Merge remote-tracking branch 'origin/master'
@@ -83145,7 +149494,7 @@ Nathan Woodrow 	2013-01-08
 
     [API] Add method to QgsMapLayerRegistry to get layers using name
 
-Merge: 4ff5b29 c4115cf
+Merge: 4ff5b29b56 c4115cf141
 Nathan Woodrow 	2013-01-07
 
     Merge pull request #377 from matthias-kuhn/attredit-load-idx
@@ -83208,7 +149557,7 @@ Larry Shaffer 	2013-01-06
 
     - Icon-only mode enabled by fully moving splitter to left
 
-Merge: 2a002c5 0595f74
+Merge: 2a002c558e 0595f746a0
 Larry Shaffer 	2013-01-06
 
     Merge pull request #372 from dakcarto/iface_enviro_3
@@ -83225,7 +149574,7 @@ Juergen E. Fischer 	2013-01-06
     - reset primary key attributes to default value when splitting features (better fix for #6060)
     - comment out unused QgsPasteTransformations
 
-Merge: b2932de 3f5f706
+Merge: b2932deca1 3f5f70696f
 Jürgen Fischer 	2013-01-04
 
     Merge pull request #364 from matthias-kuhn/attredit-aliases
@@ -83304,7 +149653,7 @@ Juergen E. Fischer 	2013-01-04
 
     nmea parsing: call strtod with locale "C" (fixes #6687)
 
-Merge: 3359870 fb763a7
+Merge: 335987005b fb763a7e48
 Marco Hugentobler 	2013-01-04
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -83323,7 +149672,7 @@ Larry Shaffer 	2012-12-09
     - Update/add support for non-squared SVG via QImage and QPicture, on screen and in output to print/image
     - Non-squared SVG QImage/QPicture can now be used in pattern fill, without excess space
 
-Merge: 1bda31d fb26989
+Merge: 1bda31d4b3 fb26989a7a
 Nathan Woodrow 	2013-01-03
 
     Merge pull request #374 from bholland/master
@@ -83346,28 +149695,28 @@ Juergen E. Fischer 	2013-01-03
 
     python plugins: replace QgsMapRenderer.destinationSrs() with destinationCrs() (closes #6391)
 
-Merge: d4ef4fd d6a33f5
+Merge: d4ef4fd98e d6a33f5298
 Werner Macho 	2013-01-03
 
     Merge pull request #373 from slarosa/pyqgis_console_1
 
     Reorganize icons theme for pyqgis console
 
-Merge: b48ae8b 77d48a0
+Merge: b48ae8b280 77d48a05b4
 Werner Macho 	2013-01-03
 
     Merge pull request #347 from slarosa/pyqgis-console
 
     fix output directory for pyqgis console on installing
 
-Merge: 71580df 90ef576
+Merge: 71580df366 90ef5767bc
 Werner Macho 	2013-01-03
 
     Merge pull request #370 from slarosa/osm_plugin_issue
 
     fixes issues for OSM plugin generated from api cleanup commit
 
-Merge: 93e0526 aef3f34
+Merge: 93e0526246 aef3f345fb
 Werner Macho 	2013-01-03
 
     Merge pull request #371 from bstroebl/fix#6925
@@ -83479,7 +149828,7 @@ Larry Shaffer 	2012-12-28
     - Remove graphical limitation indicating edit is only vector-based (previously removed themes/gis/mActionSaveEdits.png)
     - Remove themes/default/mActionSaveEdits.png, just duplicate of mActionsFileSave.png
 
-Merge: 837f187 2b2da5d
+Merge: 837f1872fd 2b2da5d7f1
 Martin Dobias 	2012-12-28
 
     Merge pull request #350 from matthias-kuhn/qgsmessagebar
@@ -83494,7 +149843,7 @@ Victor Olaya 	2012-12-28
 
     fixed #6918
 
-Merge: ce4d03b 8b98197
+Merge: ce4d03bca1 8b98197514
 Nathan Woodrow 	2012-12-27
 
     Merge pull request #368 from tecoholic/6897
@@ -83517,14 +149866,14 @@ Nathan Woodrow 	2012-12-27
 
     Remove Symbol: from symbol selector tree view names
 
-Merge: d8b271d 90c571d
+Merge: d8b271dd0d 90c571da90
 mhugent 	2012-12-27
 
     Merge pull request #366 from matthias-kuhn/rubberband-point-symbols
 
     Add different point symbols for QgsRubberband.
 
-Merge: c419888 6a9c994
+Merge: c419888242 6a9c994878
 Nathan Woodrow 	2012-12-27
 
     Merge pull request #367 from tecoholic/imp_style
@@ -83539,7 +149888,7 @@ Arunmozhi 	2012-12-27
 
     auto update the symbol DB with 0s in place of NULLs
 
-Merge: 7344368 0ff4324
+Merge: 7344368abe 0ff4324caa
 Nathan Woodrow 	2012-12-26
 
     Merge pull request #365 from tecoholic/improved_symbols
@@ -83661,7 +150010,7 @@ Radim Blazek 	2012-12-21
 
     GRASS Direct test script initial work
 
-Merge: 79947fe a9de654
+Merge: 79947fe942 a9de654c14
 Marco Hugentobler 	2012-12-21
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -83670,7 +150019,7 @@ Radim Blazek 	2012-12-21
 
     raster sublayer test Windows fix
 
-Merge: ac52671 0d9dcb5
+Merge: ac5267178c 0d9dcb5a81
 Marco Hugentobler 	2012-12-21
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -83736,7 +150085,7 @@ Radim Blazek 	2012-12-19
 
     raster save as VRT fixes and improvements, fixes #6821
 
-Merge: bcca81b e0d9796
+Merge: bcca81bb86 e0d9796fda
 Marco Hugentobler 	2012-12-18
 
     Merge branch 'crs_transform_cache'
@@ -83827,7 +150176,7 @@ Giuseppe Sucameli 	2012-12-17
 
     the returned ptr's pointing to a wrong position whether we break the loop before reading all the points of all the rings.
 
-Merge: cdaebd1 a18cb51
+Merge: cdaebd1399 a18cb51106
 volaya 	2012-12-16
 
     Merge pull request #360 from slarosa/sextante-issue
@@ -83850,7 +150199,7 @@ Alexander Bruy 	2012-12-16
 
     fix help files installation for TauDEM
 
-Merge: 3b3d1a7 948faef
+Merge: 3b3d1a75da 948faefa1e
 mhugent 	2012-12-15
 
     Merge pull request #354 from Oslandia/atlas
@@ -83867,13 +150216,13 @@ Larry Shaffer 	2012-12-14
     - Store generated label text in QgsLabelPosition (sans direction symbols)
     - Update change label properties dialog to show whether label text is expression
 
-Merge: 33e3925 3a59fd4
+Merge: 33e3925eb7 3a59fd4dfd
 Victor Olaya 	2012-12-15
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
     Conflicts:
-python/plugins/sextante/grass/ext/CMakeLists.txt
+            python/plugins/sextante/grass/ext/CMakeLists.txt
 
 Victor Olaya 	2012-12-15
 
@@ -83917,7 +150266,7 @@ Radim Blazek 	2012-12-14
 
     More GRASS direct functions
 
-Merge: d997863 7e34355
+Merge: d99786303a 7e343558ae
 volaya 	2012-12-14
 
     Merge pull request #358 from slarosa/sextante-issue
@@ -83930,7 +150279,7 @@ Salvatore Larosa 	2012-12-14
     the tool does not work if option "Create convex hulls based on field" is used
     to due of missing some methods. This patch fixes the issue.
 
-Merge: 968c6d8 eff5c20
+Merge: 968c6d81f3 eff5c20040
 mhugent 	2012-12-13
 
     Merge pull request #357 from matthias-kuhn/rb
@@ -83955,7 +150304,7 @@ Alexander Bruy 	2012-12-14
 
     move missed CMakeLists.txt to ext directory, fix path
 
-Merge: f2fc33b 2c59866
+Merge: f2fc33bb3a 2c59866c9c
 Victor Olaya 	2012-12-13
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -83976,7 +150325,7 @@ Victor Olaya 	2012-12-12
 
     added fix by Salvatore Larosa that fixes #6862
 
-Merge: d401a6e f218a39
+Merge: d401a6ef6e f218a394f4
 Victor Olaya 	2012-12-12
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -83989,7 +150338,7 @@ Alexander Bruy 	2012-12-12
 
     fix QgsDistanceArea bindings
 
-Merge: 32f0dfd d9a3c99
+Merge: 32f0dfdb51 d9a3c993e4
 Marco Hugentobler 	2012-12-12
 
     Merge branch 'wms_raster_performance'
@@ -84028,7 +150377,7 @@ Hugo Mercier 	2012-12-12
     refs #6741
     Fix resolution issues when printing in raster mode
 
-Merge: e38b222 d584b76
+Merge: e38b2222ab d584b7606b
 mhugent 	2012-12-12
 
     Merge pull request #352 from Oslandia/atlas
@@ -84046,13 +150395,13 @@ Larry Shaffer 	2012-12-07
     - Feature request #6814
     - Converted 'N' text to path and centered
 
-Merge: a4186df c84408e
+Merge: a4186dfee2 c84408edf4
 Victor Olaya 	2012-12-12
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
     Conflicts:
-python/plugins/sextante/grass/GrassAlgorithm.py
+            python/plugins/sextante/grass/GrassAlgorithm.py
 
 Victor Olaya 	2012-12-12
 
@@ -84077,13 +150426,13 @@ Werner Macho 	2012-12-11
     Again some updates to clean the whole QGIS tree of unlicensed files.
     Main purpose is to make the source tree checkable by debian licensechecker to clearly state the license of QGIS and find out if everything is compatible.
 
-Merge: 6e8bf84 dcf3ede
+Merge: 6e8bf845cf dcf3ede3c3
 Hugo Mercier 	2012-12-11
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
 
     Conflicts:
-src/core/composer/qgsatlascomposition.cpp
+            src/core/composer/qgsatlascomposition.cpp
 
 Hugo Mercier 	2012-12-11
 
@@ -84252,7 +150601,7 @@ Radim Blazek 	2012-12-06
 
     More GRASS direct modules
 
-Merge: ef6da72 fc22a6f
+Merge: ef6da72a79 fc22a6f8d6
 mhugent 	2012-12-06
 
     Merge pull request #341 from matthias-kuhn/rubberband-point
@@ -84285,7 +150634,7 @@ Tim Sutton 	2012-12-06
 
     Transfer ownership of transparency to prevent crashing python apps.
 
-Merge: b304df8 8a90e2c
+Merge: b304df8fb4 8a90e2cef6
 mhugent 	2012-12-06
 
     Merge pull request #345 from bischofia/joined_minmax
@@ -84364,7 +150713,7 @@ Alexander Bruy 	2012-12-04
 
     fix typo
 
-Merge: d32a377 47097b7
+Merge: d32a3773c3 47097b72b8
 Giuseppe Sucameli 	2012-12-04
 
     Merge pull request #346 from brushtyler/splite4_provider
@@ -84459,7 +150808,7 @@ Giuseppe Sucameli 	2012-12-02
 
     fix segfaults and memory leaks in sip files (fix #6805)
 
-Merge: 5cf1c77 871d4e8
+Merge: 5cf1c77574 871d4e846b
 Giuseppe Sucameli 	2012-12-02
 
     Merge pull request #348 from slarosa/sextante-issue
@@ -84518,7 +150867,7 @@ Alexander Bruy 	2012-12-01
 
     add tooltips for groups and providers (fix #5951)
 
-Merge: e7995cf 69308d3
+Merge: e7995cf5a5 69308d3767
 Magnus Homann 	2012-12-01
 
     Merge pull request #343 from homann/qgsexpression_DA
@@ -84545,7 +150894,7 @@ pcav 	2012-11-30
 
     Load layer in canvas Checked (fixes #6641)
 
-Merge: 047127b 635e19a
+Merge: 047127bf19 635e19ad32
 volaya 	2012-11-30
 
     Merge pull request #342 from slarosa/master
@@ -84562,7 +150911,7 @@ Werner Macho 	2012-11-30
 
     added Basque language on request .. this is our 50! Language!
 
-Merge: 9342a9c aab08cb
+Merge: 9342a9ca0b aab08cb722
 Marco Hugentobler 	2012-11-30
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -84595,7 +150944,7 @@ Victor Olaya 	2012-11-30
 
     fixed #6759 and #6228
 
-Merge: 6d71876 1a7ccd0
+Merge: 6d71876626 1a7ccd015d
 Victor Olaya 	2012-11-30
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -84651,7 +151000,7 @@ Larry Shaffer 	2012-11-28
 
     - Add option to return selected layers in drawing order
 
-Merge: a448f6a a4484b2
+Merge: a448f6a3dd a4484b217e
 Magnus Homann 	2012-11-28
 
     Merge branch 'master' into qgsexpression_DA
@@ -84672,7 +151021,7 @@ Nathan Woodrow 	2012-11-28
 
     Fix #6764
 
-Merge: c989673 ee12df2
+Merge: c98967360e ee12df2f4e
 Tim Sutton 	2012-11-28
 
     Rebase failed - merging branch 'master' of github.com:qgis/Quantum-GIS
@@ -84717,7 +151066,7 @@ Salvatore Larosa 	2012-11-27
 
     fix for #6749 and #6278
 
-Merge: a757935 4cfdba4
+Merge: a75793563a 4cfdba4c26
 Alexander Bruy 	2012-11-27
 
     Merge branch 'identify_improvements'
@@ -84740,7 +151089,7 @@ Giuseppe Sucameli 	2012-11-27
 
     Work done for Regione Toscana-SITA
 
-Merge: 6e24c16 b54c3bf
+Merge: 6e24c1623f b54c3bf54e
 Giuseppe Sucameli 	2012-11-26
 
     Merge pull request #340 from slarosa/master
@@ -84763,7 +151112,7 @@ Salvatore Larosa 	2012-11-26
 
     changed import sextante class entry according to 6173fa3
 
-Merge: 4dc85e4 6e24c16
+Merge: 4dc85e44ea 6e24c1623f
 Magnus Homann 	2012-11-26
 
     Merge branch 'master' into qgsexpression_DA
@@ -84772,7 +151121,7 @@ Magnus Homann 	2012-11-26
 
     Removed ellipsoid settings from QgsOptions
 
-Merge: afeb497 f1ab2db
+Merge: afeb497679 f1ab2dbe3e
 Werner Macho 	2012-11-26
 
     Merge pull request #339 from kimaidou/myqgis
@@ -84800,14 +151149,14 @@ Alexander Bruy 	2012-11-26
     [FEATURE] Possibility to save error messages as shapefile from check
     geometry validity tool. Contributed by Salvatore Larosa
 
-Merge: 9f71d9f 838864f
+Merge: 9f71d9f298 838864f6ad
 Werner Macho 	2012-11-26
 
     Merge pull request #335 from giohappy/master
 
     projectSaved SIGNAL added to QgsProject
 
-Merge: a0c8b5c 755707d
+Merge: a0c8b5c0d0 755707de89
 Werner Macho 	2012-11-25
 
     Merge pull request #338 from simon04/too_many_classes
@@ -84834,7 +151183,7 @@ Magnus Homann 	2012-11-24
 
     Copied ellipsoidal settings to project properties
 
-Merge: 21370d9 b60a00f
+Merge: 21370d91d5 b60a00f074
 Werner Macho 	2012-11-23
 
     Merge pull request #337 from gioman/master
@@ -84850,7 +151199,7 @@ Larry Shaffer 	2012-11-20
     - Add red notification to project save prompt dialog, and set Cancel to default
     - Fix for #6054 and #6732
 
-Merge: 1f1448d 7f8768a
+Merge: 1f1448d414 7f8768a072
 Magnus Homann 	2012-11-23
 
     Update from master
@@ -84859,7 +151208,7 @@ Vânia Neves 	2012-11-23
 
     PT_PT translations courtesy of Pedro Palheiro
 
-Merge: e5dae02 dd1d4b5
+Merge: e5dae02248 dd1d4b5986
 Marco Hugentobler 	2012-11-23
 
     Merge branch 'wms_layer_opacity'
@@ -84953,7 +151302,7 @@ giohappy 	2012-11-21
 
     emit projectSaved SIGNAL when the project file is saved and closed
 
-Merge: 0893db7 d673606
+Merge: 0893db7c6e d67360621a
 Marco Hugentobler 	2012-11-21
 
     Merge branch 'drawing_order_embedded'
@@ -84982,7 +151331,7 @@ Marco Hugentobler 	2012-11-20
 
     Synchronize check states between legend and layer order widget
 
-Merge: cb07ae4 0533e2d
+Merge: cb07ae436a 0533e2dbc9
 Victor Olaya 	2012-11-20
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -84995,7 +151344,7 @@ Victor Olaya 	2012-11-20
 
     cleaned BatchProcessingDialog code
 
-Merge: bab4395 ddb5117
+Merge: bab43958a6 ddb51175e7
 mhugent 	2012-11-19
 
     Merge pull request #332 from bischofia/shp_enc
@@ -85068,7 +151417,7 @@ Radim Blazek 	2012-11-18
 
     graduated renderer GUI DnD and sort; categorized symbol GUI better drop indicator
 
-Merge: 28531f3 3f40232
+Merge: 28531f3f7e 3f40232e29
 Victor Olaya 	2012-11-18
 
     minor change to last commit fixing #6635
@@ -85105,7 +151454,7 @@ Radim Blazek 	2012-11-17
 
     composer legend single column box width fix
 
-Merge: 845edd9 01775ce
+Merge: 845edd90e8 01775ce11a
 Giuseppe Sucameli 	2012-11-16
 
     Merge pull request #330 from slarosa/master
@@ -85135,14 +151484,14 @@ Larry Shaffer 	2012-11-14
     - Distributes max number across total number of features registered in PAL
     - Caveat: PAL may not show label for every registered feature
 
-Merge: 5bc0a8a 6abedba
+Merge: 5bc0a8af6c 6abedba087
 Jürgen Fischer 	2012-11-15
 
     Merge pull request #320 from matthias-kuhn/fix-attredit
 
     Fix for http://hub.qgis.org/issues/6647
 
-Merge: 5053818 1237546
+Merge: 5053818440 12375462de
 Jürgen Fischer 	2012-11-15
 
     Merge pull request #328 from slarosa/master
@@ -85165,7 +151514,7 @@ Victor Olaya 	2012-11-15
 
     applied fix for #6127 (problems with non-ascii strings
 
-Merge: 10a57ad 7d0d5d3
+Merge: 10a57ad7ff 7d0d5d3267
 Victor Olaya 	2012-11-15
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -85200,7 +151549,7 @@ Victor Olaya 	2012-11-15
     reverted shell=true in R execution
     Removed help files help menu
 
-Merge: 36da82a 3f4f5f0
+Merge: 36da82ab54 3f4f5f0215
 Martin Dobias 	2012-11-14
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -85290,7 +151639,7 @@ Alexander Bruy 	2012-11-13
 
     deactivate TauDEM provider by default
 
-Merge: 3b88637 543ac03
+Merge: 3b886372fe 543ac03ed0
 mhugent 	2012-11-13
 
     Merge pull request #329 from matthias-kuhn/diagram
@@ -85314,7 +151663,7 @@ Sandro Santilli 	2012-11-12
 
     Use ASCII direction arrows
 
-Merge: 4195eaf aaded5a
+Merge: 4195eaf72a aaded5a737
 Werner Macho 	2012-11-12
 
     Merge pull request #327 from slarosa/master
@@ -85334,7 +151683,7 @@ Alexander Bruy 	2012-11-12
 
     Ukrainian translation update
 
-Merge: e11ee59 4496c74
+Merge: e11ee594e2 4496c74e7c
 Alexander Bruy 	2012-11-12
 
     Merge branch 'sextante_user_dir'
@@ -85376,7 +151725,7 @@ Larry Shaffer 	2012-11-10
     - Option to reverse symbol direction
     - Add character selector dialog for single font to src/gui
 
-Merge: c4b74c9 b2eb1c1
+Merge: c4b74c9266 b2eb1c10e9
 Giuseppe Sucameli 	2012-11-11
 
     Merge pull request #325 from slarosa/master
@@ -85427,7 +151776,7 @@ Victor Olaya 	2012-11-10
 
     disabled postgis algs until they are ready
 
-Merge: 27f197c e5f07ed
+Merge: 27f197cf24 e5f07edf55
 Victor Olaya 	2012-11-10
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -85445,7 +151794,7 @@ Larry Shaffer 	2012-11-07
     - Allows user to quickly set visibility thresholds based upon text legibility
     - By default initially on for map unit labels to skip rendering at sizes < 3 px
 
-Merge: a2d4347 17c5e37
+Merge: a2d434700d 17c5e37060
 volaya 	2012-11-09
 
     Merge pull request #324 from giohappy/master
@@ -85462,14 +151811,14 @@ Alexander Bruy 	2012-11-09
 
     [FEATURE] Eliminate tool for fTools, contributed by Bernhard Strobl
 
-Merge: 716e188 05aca2b
+Merge: 716e188eb5 05aca2b695
 alexbruy 	2012-11-09
 
     Merge pull request #323 from sanak/ftools-dissolve-line
 
     Add line layer support for dissolve function (fix #5059)
 
-Merge: 3f72a6a 36452a8
+Merge: 3f72a6a593 36452a8e24
 mhugent 	2012-11-09
 
     Merge pull request #321 from matthias-kuhn/rubberband
@@ -85480,7 +151829,7 @@ Tim Sutton 	2012-11-09
 
     Added from uri test for mem provider. Simplified the vector writer test.
 
-Merge: 3564eae 3250221
+Merge: 3564eaeb57 32502219e8
 Giuseppe Sucameli 	2012-11-09
 
     Merge pull request #322 from matthias-kuhn/ellipsemarker
@@ -85649,7 +151998,7 @@ Juergen E. Fischer 	2012-11-06
 
     add missing GUI_EXPORT to QgsSvgAnnotationItem
 
-Merge: f410e38 550a2c6
+Merge: f410e389d8 550a2c6286
 Marco Hugentobler 	2012-11-06
 
     [FEATURE]: svg- and text items can be used as watermarks in QGIS server. Developed for Faunalia ( http://www.faunalia.it) with funding from Regione Toscana \- Settore SISTEMA INFORMATIVO TERRITORIALE ED AMBIENTALE
@@ -85659,7 +152008,7 @@ Victor Olaya 	2012-11-06
     Added missing cmake files
     fixed bug in execution dialog when running iterative algorithms
 
-Merge: a2e6a48 ff78ef1
+Merge: a2e6a484af ff78ef1802
 Victor Olaya 	2012-11-06
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -85706,7 +152055,7 @@ Larry Shaffer 	2012-11-05
 
     Add Atlas generation dock to Composer's View->Panels menu
 
-Merge: d53f123 5de2fee
+Merge: d53f1238fb 5de2feef7d
 Victor Olaya 	2012-11-05
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -85761,7 +152110,7 @@ Juergen E. Fischer 	2012-11-05
 
     fix warnings
 
-Merge: 08b05f3 38f82d3
+Merge: 08b05f3bdb 38f82d3711
 Giuseppe Sucameli 	2012-11-04
 
     Merge pull request #316 from slarosa/master
@@ -85793,7 +152142,7 @@ Giuseppe Sucameli 	2012-11-04
 
     Thanks Minoru Akagi for patches!
 
-Merge: 6ecfc29 ed4bc25
+Merge: 6ecfc29226 ed4bc25413
 Giuseppe Sucameli 	2012-11-03
 
     Merge pull request #314 from slarosa/master
@@ -85921,7 +152270,7 @@ Larry Shaffer 	2012-11-02
     - Duplicate layer always created below source layer, and at same nested group depth
     - Duplicate layer is always set to not visible (much faster, canvas refresh not needed when duplicating many layers)
 
-Merge: 70fc8ca 2425f92
+Merge: 70fc8ca9b2 2425f92ce0
 Giuseppe Sucameli 	2012-11-02
 
     Merge pull request #313 from slarosa/master
@@ -85973,7 +152322,7 @@ Sandro Santilli 	2012-11-01
 
     TopoViewer: only use queries for layers when really needed
 
-Merge: dbea359 6abe861
+Merge: dbea3596a1 6abe8611f4
 Giuseppe Sucameli 	2012-11-01
 
     Merge pull request #312 from slarosa/master
@@ -85992,7 +152341,7 @@ Marco Hugentobler 	2012-11-01
 
     Fix crash if calling GetProjectSettings the first time
 
-Merge: 98e8ba4 66368f9
+Merge: 98e8ba484b 66368f9bc3
 Giuseppe Sucameli 	2012-10-31
 
     Merge pull request #311 from slarosa/master
@@ -86079,7 +152428,7 @@ Larry Shaffer 	2012-10-30
 
     Revert part of a27aad0, not compatible with generated makefiles for GCC 4.2.1
 
-Merge: f68b688 47da0c0
+Merge: f68b6883f3 47da0c0700
 Giuseppe Sucameli 	2012-10-30
 
     Merge pull request #310 from slarosa/master
@@ -86091,14 +152440,14 @@ Salvatore Larosa 	2012-10-30
     add default font-family and size to output area in console
     fix for help dialog
 
-Merge: 234709d 10178d7
+Merge: 234709da5a 10178d71c8
 Giuseppe Sucameli 	2012-10-30
 
     Merge pull request #308 from slarosa/master
 
     Add UI file for help - PyQGIS Console
 
-Merge: e3cd56f 234709d
+Merge: e3cd56fa8c 234709da5a
 Salvatore Larosa 	2012-10-30
 
     Merge branch master of https://github.com/qgis/Quantum-GIS
@@ -86119,7 +152468,7 @@ Tim Sutton 	2012-10-29
 
     Added python test for QgsFeature from Germán Carrillo
 
-Merge: e5437c4 d6e3188
+Merge: e5437c494b d6e3188653
 Victor Olaya 	2012-10-29
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86173,7 +152522,7 @@ Larry Shaffer 	2012-10-26
     - Build directory app bundle, providers, Python plugins and unit tests functional
     - Adjusted resources corrected on install
 
-Merge: f010205 1bac84c
+Merge: f0102057b4 1bac84ca77
 Giuseppe Sucameli 	2012-10-28
 
     Merge pull request #307 from slarosa/master
@@ -86184,7 +152533,7 @@ Salvatore Larosa 	2012-10-29
 
     Reimplemented copy action for keybindings in console
 
-Merge: 9744b8a 0660dcf
+Merge: 9744b8a292 0660dcf73e
 Tim Sutton 	2012-10-28
 
     Merge pull request #306 from slarosa/master
@@ -86207,7 +152556,7 @@ Tim Sutton 	2012-10-28
 
     Fix transparency issue for splash
 
-Merge: 46655cf 50f3352
+Merge: 46655cf790 50f335269b
 Giuseppe Sucameli 	2012-10-28
 
     Merge pull request #305 from slarosa/master
@@ -86223,7 +152572,7 @@ Salvatore Larosa 	2012-10-28
     Improvement to contextual menu
     - typo in help.htm
 
-Merge: 8f6ae95 fe08fd6
+Merge: 8f6ae95366 fe08fd6d57
 Victor Olaya 	2012-10-28
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86240,7 +152589,7 @@ Tim Sutton 	2012-10-28
 
     Fix for jenkins breakages caused by addition of licens info to xslt
 
-Merge: 9587252 a8934a2
+Merge: 9587252abf a8934a28f7
 Victor Olaya 	2012-10-27
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86254,14 +152603,14 @@ Radim Blazek 	2012-10-27
 
     invert raster colors better
 
-Merge: 34f677a 9fb1c11
+Merge: 34f677a576 9fb1c113d0
 Larry Shaffer 	2012-10-27
 
     Merge pull request #303 from slarosa/master
 
     [FEATURE] - Split-pane entry and output for PyQGIS console
 
-Merge: 5c762ef 779e166
+Merge: 5c762ef741 779e16603e
 Victor Olaya 	2012-10-27
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86280,7 +152629,7 @@ Salvatore Larosa 	2012-10-27
     - cleaning code
     - more info see http://hub.qgis.org/issues/6558
 
-Merge: f15b4e1 6870cff
+Merge: f15b4e12c7 6870cff83f
 Salvatore Larosa 	2012-10-26
 
     Merge pull request #2 from dakcarto/console-nosplitter_1
@@ -86341,7 +152690,7 @@ Larry Shaffer 	2012-10-25
 
     Redo of 3ce27d6, hard-link to Mac embedded app bundle binary
 
-Merge: 558245c f391d99
+Merge: 558245c8ba f391d991dd
 Magnus Homann 	2012-10-25
 
     Merge pull request #301 from homann/trans_sv
@@ -86451,7 +152800,7 @@ Radim Blazek 	2012-10-24
 
     warnings fix
 
-Merge: e210a57 e837a96
+Merge: e210a57101 e837a965a5
 Werner Macho 	2012-10-24
 
     Merge pull request #300 from gioman/master
@@ -86536,7 +152885,7 @@ Larry Shaffer 	2012-10-22
 
     Fix #6505, set typedef for Mac size_t in bindings
 
-Merge: a45b759 a29ccbf5
+Merge: a45b759e1c a29ccbf553
 Giuseppe Sucameli 	2012-10-22
 
     Merge pull request #298 from slarosa/master
@@ -86552,7 +152901,7 @@ Alexander Bruy 	2012-10-20
 
     [FEATURE] TauDEM provider for SEXTANTE
 
-Merge: dbab4a2 feec5f0
+Merge: dbab4a2425 feec5f050c
 Marco Hugentobler 	2012-10-22
 
     Merge branch for sia2045 GetFeatureInfo output
@@ -86587,7 +152936,7 @@ Sandro Santilli 	2012-10-20
 
     See http://hub.qgis.org/issues/5879
 
-Merge: 6546d74 2765220
+Merge: 6546d748c8 27652201d0
 Victor Olaya 	2012-10-20
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86601,14 +152950,14 @@ Giuseppe Sucameli 	2012-10-20
 
     fix build
 
-Merge: 8ca2236 3fecd44
+Merge: 8ca2236134 3fecd44ae5
 Giuseppe Sucameli 	2012-10-19
 
     Merge pull request #297 from slarosa/master
 
     [FEATURE] - Choose Fontfamily and API files for Python Console
 
-Merge: ca20be1 8ca2236
+Merge: ca20be178a 8ca2236134
 Salvatore Larosa 	2012-10-20
 
     Merge branch master of https://github.com/qgis/Quantum-GIS
@@ -86796,7 +153145,7 @@ Juergen E. Fischer 	2012-10-17
 
     fix windows build
 
-Merge: c4c3fec fa84588
+Merge: c4c3fecf17 fa845883f0
 Victor Olaya 	2012-10-17
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86813,7 +153162,7 @@ pcav 	2012-10-17
 
     Microfix for IT GUI
 
-Merge: df85492 bacf0bd
+Merge: df85492c40 bacf0bd898
 Marco Hugentobler 	2012-10-17
 
     Merge branch 'ows_attribute_exclude'
@@ -86834,7 +153183,7 @@ Marco Hugentobler 	2012-10-17
 
     [FEATURE]: possibility to exclude vector attributes from WMS and WFS publication
 
-Merge: 5a6401c 0478d3b
+Merge: 5a6401c983 0478d3b531
 Marco Hugentobler 	2012-10-16
 
     Merge branch 'wms_selective_publish'
@@ -86883,7 +153232,7 @@ Werner Macho 	2012-10-16
 
     translation update: gl_ES by XAN and sr_Latn by Goran, also added sr_Cyrl as requested, renamed sr_CS-* to sr_*
 
-Merge: 4b76e69 4f98420
+Merge: 4b76e69f5b 4f984202bd
 Victor Olaya 	2012-10-16
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86904,7 +153253,7 @@ Marco Hugentobler 	2012-10-15
 
     [FEATURE]: Possibility to restrict layers / groups from WMS publication
 
-Merge: cdb9abd d06203b
+Merge: cdb9abd233 d06203ba6b
 Victor Olaya 	2012-10-14
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86929,7 +153278,7 @@ Juergen E. Fischer 	2012-10-14
 
     fix visibility tracking of tile scale widget
 
-Merge: fbca157 83cb4ef
+Merge: fbca157ff4 83cb4ef4af
 Victor Olaya 	2012-10-14
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -86947,7 +153296,7 @@ Larry Shaffer 	2012-10-12
     - Test if layer can have PAL engine set
     - Test render comparison for output of vector line layer
 
-Merge: e576d93 30c08cb
+Merge: e576d93b5f 30c08cbb8c
 Jürgen Fischer 	2012-10-13
 
     Merge pull request #291 from strk/topogeom_and_geometry
@@ -86980,7 +153329,7 @@ Juergen E. Fischer 	2012-10-12
 
     german translation update
 
-Merge: 0e2f92f 036d844
+Merge: 0e2f92fa76 036d844fc5
 Victor Olaya 	2012-10-12
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -87005,7 +153354,7 @@ Marco Hugentobler 	2012-10-12
 
     [FEATURE] QGIS server: possibility to restrict published composers
 
-Merge: f230f51 12ddac6
+Merge: f230f51a53 12ddac6352
 mhugent 	2012-10-11
 
     Merge pull request #288 from Oslandia/atlas
@@ -87026,12 +153375,12 @@ Alexander Bruy 	2012-10-11
 
     fix warnings and identation update
 
-Merge: 0c4846b def6486
+Merge: 0c4846ba6d def648633c
 Alexander Bruy 	2012-10-11
 
     Merge remote-tracking branch 'upstream/master'
 
-Merge: 9ad9f8c 78a9bd7
+Merge: 9ad9f8c082 78a9bd7546
 Martin Dobias 	2012-10-11
 
     Merge pull request #220 from tecoholic/style-docs
@@ -87070,7 +153419,7 @@ Nathan Woodrow 	2012-10-11
 
     Switch to listbox for edit types. Fix #6495
 
-Merge: a587cb6 936f4aa
+Merge: a587cb67ff 936f4aa5f7
 Nathan Woodrow 	2012-10-11
 
     Merge pull request #287 from tecoholic/3275
@@ -87093,7 +153442,7 @@ Arunmozhi 	2012-10-11
 
     ability to delete multiple categories using Ctrl selection
 
-Merge: 1ff42b2 7140e52
+Merge: 1ff42b2ec1 7140e52cbf
 Magnus Homann 	2012-10-10
 
     Merge branch 'trans_sv'
@@ -87102,7 +153451,7 @@ Magnus Homann 	2012-10-10
 
     4039 översättningar
 
-Merge: 552703a 3c50290
+Merge: 552703a665 3c50290b42
 Giuseppe Sucameli 	2012-10-10
 
     Merge pull request #284 from slarosa/master
@@ -87121,7 +153470,7 @@ Tim Sutton 	2012-10-10
 
     Added test and sample wkt to replicate issue 4189
 
-Merge: 2be41ab b1ac946
+Merge: 2be41abd1b b1ac9469cf
 mhugent 	2012-10-10
 
     Merge pull request #283 from alexbruy/datasourceuri_sip
@@ -87164,14 +153513,14 @@ Giuseppe Sucameli 	2012-10-09
     escape sql ids and strings,
     fix minor errors
 
-Merge: 1796178 cb2230e
+Merge: 1796178e74 cb2230e3d1
 Giuseppe Sucameli 	2012-10-09
 
     Merge pull request #281 from strk/db_manager_addlayer
 
     dbmananger topoviewer: addlayer instead of creating a new project
 
-Merge: aa25448 2581b3f
+Merge: aa25448bc3 2581b3fb8a
 Magnus Homann 	2012-10-09
 
     Merged some swedish translations
@@ -87184,7 +153533,7 @@ Magnus Homann 	2012-10-09
 
     3801 översättningar
 
-Merge: 6d75d20 eee37cb
+Merge: 6d75d20b51 eee37cb974
 Werner Macho 	2012-10-09
 
     Merge pull request #282 from Oslandia/i18n
@@ -87211,7 +153560,7 @@ Werner Macho 	2012-10-09
 
     translation update: sv by Victor
 
-Merge: f4dd8a0 eae008e
+Merge: f4dd8a0762 eae008ebf8
 Marco Hugentobler 	2012-10-09
 
     QGIS server: merge get_project_settings branch
@@ -87220,7 +153569,7 @@ Sandro Santilli 	2012-10-08
 
     Install style templates
 
-Merge: dc522e0 a28157c
+Merge: dc522e0b61 a28157ce15
 Giuseppe Sucameli 	2012-10-08
 
     Merge pull request #277 from slarosa/master
@@ -87241,7 +153590,7 @@ Martin Dobias 	2012-07-21
 
     Providers that currently do not implement the new API were disabled.
 
-Merge: 13a6fd9 c0e779f
+Merge: 13a6fd98ee c0e779f0a7
 mhugent 	2012-10-08
 
     Merge pull request #280 from Oslandia/atlas
@@ -87277,7 +153626,7 @@ Werner Macho 	2012-10-08
 
     translation update: es by Diana
 
-Merge: 3f412e4 6c652a0
+Merge: 3f412e4291 6c652a0acd
 mhugent 	2012-10-08
 
     Merge pull request #278 from Oslandia/atlas
@@ -87312,7 +153661,7 @@ Pirmin Kalberer 	2012-10-07
 
     CMake variable for additional plugins to build (Usage: ccmake .. -DCUSTOM_PLUGINS:STRING=myplugin)
 
-Merge: 53fb95c fccf9ac
+Merge: 53fb95cb79 fccf9ac5d0
 Pirmin Kalberer 	2012-10-07
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -87370,7 +153719,7 @@ Giuseppe Sucameli 	2012-10-06
     display selected feature count in attribute table when docked,
     do not select rows two times when the attribute table view is created
 
-Merge: 52de721 42672c1
+Merge: 52de72152f 42672c18e9
 Giuseppe Sucameli 	2012-10-06
 
     Merge pull request #275 from slarosa/master
@@ -87403,7 +153752,7 @@ Juergen E. Fischer 	2012-10-06
 
     [FEATURE] open layer properties from identify results
 
-Merge: 9f0d858 5d84cd3
+Merge: 9f0d858175 5d84cd3f87
 mhugent 	2012-10-06
 
     Merge pull request #276 from cmoe/bug_snapping_options
@@ -87418,7 +153767,7 @@ Salvatore Larosa 	2012-10-06
 
     fix mouse event in console
 
-Merge: 0d4b6f6 9135226
+Merge: 0d4b6f6d32 9135226514
 mhugent 	2012-10-06
 
     Merge pull request #274 from Oslandia/atlas_integration
@@ -87450,7 +153799,7 @@ Hugo Mercier 	2012-10-06
     Add access to the atlas' layer in the expression builder GUI for labels.
     QgsAtlasComposition is now held by QgsComposition
 
-Merge: f1c9955 e54e917
+Merge: f1c99553e3 e54e917431
 Marco Hugentobler 	2012-10-06
 
     Merge atlas branch
@@ -87483,7 +153832,7 @@ Juergen E. Fischer 	2012-10-05
 
     german translation fix
 
-Merge: 94bc415 c212e91
+Merge: 94bc4157cd c212e91ffc
 Giuseppe Sucameli 	2012-10-05
 
     Merge pull request #272 from slarosa/master
@@ -87498,7 +153847,7 @@ Werner Macho 	2012-10-05
 
     adjust license to be readable by licensechecker
 
-Merge: 7ee4a5c 7218bd3
+Merge: 7ee4a5ce63 7218bd3412
 Hugo Mercier 	2012-10-05
 
     Merge branch 'atlas_integration' of https://github.com/Oslandia/Quantum-GIS into atlas
@@ -87507,7 +153856,7 @@ Hugo Mercier 	2012-10-05
 
     Get rid of the unneeded vector of QgsFeature in atlas generation
 
-Merge: 1905b61 9c104b3
+Merge: 1905b61d79 9c104b3394
 Pirmin Kalberer 	2012-10-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -87535,7 +153884,7 @@ Juergen E. Fischer 	2012-10-05
 
     add more sextante copyright headers
 
-Merge: c5e2257 b3e2eb2
+Merge: c5e225763d b3e2eb2ce3
 Pirmin Kalberer 	2012-10-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -87544,12 +153893,12 @@ Juergen E. Fischer 	2012-10-05
 
     fix language detection in console_help and german translation update
 
-Merge: 88cd943 4a90e73
+Merge: 88cd9439b1 4a90e738cd
 Pirmin Kalberer 	2012-10-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: d9c5a68 680db77
+Merge: d9c5a68d80 680db77e99
 Giuseppe Sucameli 	2012-10-05
 
     Merge pull request #271 from slarosa/master
@@ -87564,7 +153913,7 @@ Salvatore Larosa 	2012-10-05
 
     minor fixes for help (Python Console)
 
-Merge: 1a1370f 4513ada
+Merge: 1a1370f33d 4513ada562
 Giuseppe Sucameli 	2012-10-05
 
     Merge pull request #270 from slarosa/master
@@ -87601,7 +153950,7 @@ Alexander Bruy 	2012-10-05
 
     fix #5269
 
-Merge: 7ed05a2 372e520
+Merge: 7ed05a2545 372e520c84
 Juergen E. Fischer 	2012-10-05
 
     Merge branch 'mapserverexport' of https://github.com/rduivenvoorde/Quantum-GIS
@@ -87610,7 +153959,7 @@ Juergen E. Fischer 	2012-10-05
 
     indentation update
 
-Merge: 189b066 603f35c
+Merge: 189b0669c4 603f35c8ea
 Juergen E. Fischer 	2012-10-05
 
     Merge branch 'master' of https://github.com/rouault/Quantum-GIS
@@ -87623,7 +153972,7 @@ Juergen E. Fischer 	2012-10-05
 
     debian packaging update - also moved python console files and icons
 
-Merge: e3536e4 eae523d
+Merge: e3536e4d83 eae523d33b
 Hugo Mercier 	2012-10-05
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
@@ -87677,7 +154026,7 @@ Richard Duivenvoorde 	2012-10-05
 
     making it work on ms6 work out of the box again
 
-Merge: 064c0c0 acaa969
+Merge: 064c0c054b acaa9692b8
 Tim Sutton 	2012-10-04
 
     Merge pull request #261 from slarosa/master
@@ -87771,7 +154120,7 @@ Juergen E. Fischer 	2012-10-04
 
     setup sip dependencies
 
-Merge: 3e8e697 c9c0209
+Merge: 3e8e6978ee c9c02096bc
 Werner Macho 	2012-10-04
 
     Merge pull request #262 from gioman/master
@@ -87908,14 +154257,14 @@ Alexander Bruy 	2012-09-18
     adjust metadata.txt and __init__.py files
     initial i18n support
 
-Merge: b5f736a 371efa0
+Merge: b5f736ad21 371efa07bb
 Hugo Mercier 	2012-10-04
 
     Merge branch 'atlas' into atlas2
 
     Conflicts:
-python/core/composer/qgscomposition.sip
-tests/src/python/CMakeLists.txt
+            python/core/composer/qgscomposition.sip
+            tests/src/python/CMakeLists.txt
 
 Hugo Mercier 	2012-10-04
 
@@ -88012,7 +154361,7 @@ Alexander Bruy 	2012-10-03
 
     follow up e8061c7fea
 
-Merge: 5a0feb3 35a4f88
+Merge: 5a0feb3f31 35a4f88b33
 Tim Sutton 	2012-10-03
 
     Merge pull request #257 from slarosa/master
@@ -88035,7 +154384,7 @@ Giuseppe Sucameli 	2012-10-02
 
     gdaltools: add cubic interpolation to Build overviews tool (fix #6301)
 
-Merge: 88e3e34 6369196
+Merge: 88e3e348df 6369196210
 Pirmin Kalberer 	2012-10-03
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88044,7 +154393,7 @@ Pirmin Kalberer 	2012-10-03
 
     Backported osgEarth::QtGui::ViewerWidget and osgEarth::Util::Controls for compatibilty with news OSG and QT version
 
-Merge: 6548e2e 8a1ad57
+Merge: 6548e2e1a2 8a1ad57fc2
 Victor Olaya 	2012-10-03
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -88156,7 +154505,7 @@ Giuseppe Sucameli 	2012-08-20
     fix transparency saving on QML file (follow 74ba70aa):
     do not store the same transparency value twice (for both SimpleFill symbol and its layers)
 
-Merge: 86a56b6 74ba70a
+Merge: 86a56b6a24 74ba70aa7b
 Giuseppe Sucameli 	2012-10-01
 
     Merge branch 'master' of git://github.com/rugginoso/Quantum-GIS into rugginoso-master
@@ -88240,14 +154589,14 @@ D'Hont René-Luc 	2012-09-29
 
     Better writing of coordinate (WKT, GeoJSON, GML2) and using of searchRect
 
-Merge: 23352ce 80eb345
+Merge: 23352ce0d6 80eb345820
 Tim Sutton 	2012-09-28
 
     Merge pull request #245 from Oslandia/atlas_integration
 
     [FEATURE] Support for creation of map atlasses in print composer - Atlas integration
 
-Merge: aaa5040 82a22f0
+Merge: aaa504058e 82a22f0886
 Tim Sutton 	2012-09-28
 
     Merge pull request #255 from rouault/master
@@ -88296,7 +154645,7 @@ Marco Hugentobler 	2012-09-28
 
     Remove expectedFailure for composition test
 
-Merge: 500a953 3c1a778
+Merge: 500a953d96 3c1a778662
 Tim Sutton 	2012-09-28
 
     Merge pull request #254 from lynxlynxlynx/master
@@ -88319,19 +154668,19 @@ Jaka Kranjc 	2012-09-28
 
     INSTALL: mention pyqscintilla as required (hard dependency of the console)
 
-Merge: c85ad5a 500a953
+Merge: c85ad5a46a 500a953d96
 Hugo Mercier 	2012-09-28
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
 
     Conflicts:
-src/core/composer/qgscomposition.cpp
+            src/core/composer/qgscomposition.cpp
 
 Hugo Mercier 	2012-09-28
 
     Add a test for Atlas generation when the coverage layer is hidden
 
-Merge: f2f1426 32deee7
+Merge: f2f14264c9 32deee72a5
 Tim Sutton 	2012-09-28
 
     Merge pull request #253 from slarosa/master
@@ -88367,14 +154716,14 @@ Juergen E. Fischer 	2012-09-28
 
     fix ogr provider's createEmptyDataSource()
 
-Merge: 28fc9d0 630a021
+Merge: 28fc9d06fd 630a02153f
 Tim Sutton 	2012-09-27
 
     Merge pull request #248 from slarosa/master
 
     Several fixes and added for python console
 
-Merge: 2dfa77c 885bd2e
+Merge: 2dfa77cbd5 885bd2e8a7
 Jürgen Fischer 	2012-09-27
 
     Merge pull request #251 from sdikiy/work
@@ -88448,7 +154797,7 @@ Radim Blazek 	2012-09-27
 
     compare wcs extent using significant digits
 
-Merge: 504ed49 2d12bb8
+Merge: 504ed49034 2d12bb86cc
 Tim Sutton 	2012-09-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88461,7 +154810,7 @@ Tim Sutton 	2012-09-27
 
     Fixed attribution for composition test
 
-Merge: db7b26f 126b897
+Merge: db7b26fa55 126b897b40
 Tim Sutton 	2012-09-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88470,7 +154819,7 @@ Tim Sutton 	2012-09-27
 
     Removed extraneous newline from test
 
-Merge: 126b897 7ef9dbd
+Merge: 126b897b40 7ef9dbdd3f
 Magnus Homann 	2012-09-27
 
     Merge swedish translations
@@ -88503,17 +154852,17 @@ Juergen E. Fischer 	2012-09-26
 
     sip fixes
 
-Merge: 4657c84 ee593e8
+Merge: 4657c84422 ee593e860d
 Hugo Mercier 	2012-09-26
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
 
     Conflicts:
-python/core/qgsexpression.sip
+            python/core/qgsexpression.sip
 
     Add a missing function to QgsExpression
 
-Merge: b95296a 6a1c280
+Merge: b95296a252 6a1c2808d4
 Hugo Mercier 	2012-09-26
 
     Merge branch 'atlas_integration' of https://github.com/Oslandia/Quantum-GIS into atlas
@@ -88550,7 +154899,7 @@ Tim Sutton 	2012-09-26
 
     Added a test to verify that we can get a map to render in the template (python bindings)
 
-Merge: 671cc98 dad7f98
+Merge: 671cc98895 dad7f98570
 Tim Sutton 	2012-09-26
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88613,7 +154962,7 @@ Radim Blazek 	2012-09-25
 
     wcs test timeout
 
-Merge: ded943d a0566c7
+Merge: ded943d77d a0566c79b7
 Tim Sutton 	2012-09-25
 
     Merge pull request #247 from slarosa/master
@@ -88693,7 +155042,7 @@ Larry Shaffer 	2012-09-22
 
     Labeling centroid calculation update (provided by Serge Dikiy)
 
-Merge: 7824842 74fd0e4
+Merge: 782484206a 74fd0e48ae
 Tim Sutton 	2012-09-24
 
     Fix compilation error caused by numeric_limits::quiet_NaN not being passed a type
@@ -88712,7 +155061,7 @@ Alexander Bruy 	2012-09-24
 
     fix SIP bindings
 
-Merge: 1190eea 75452b8
+Merge: 1190eea55f 75452b8102
 Magnus Homann 	2012-09-24
 
     Merge pull request #246 from homann/CP-legal
@@ -88747,7 +155096,7 @@ Tim Sutton 	2012-09-24
 
     Reinstate symbol layer registry sip stuff
 
-Merge: 1dc9302 34f542e
+Merge: 1dc93021f2 34f542edef
 Tim Sutton 	2012-09-24
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88760,7 +155109,7 @@ Tim Sutton 	2012-09-24
 
     Mark composer html multiframe test as expected to fail for now
 
-Merge: 719db73 04f9348
+Merge: 719db73e38 04f934841d
 Tim Sutton 	2012-09-24
 
     Resolved merge conflicts with origin master
@@ -88790,7 +155139,7 @@ Juergen E. Fischer 	2012-09-24
     - add scripts/sipdiff
     - replace some usages of std::vector and std::set with QVector/QSet
 
-Merge: 58ba3f0 740eaf9
+Merge: 58ba3f0084 740eaf98dc
 Tim Sutton 	2012-09-23
 
     Merge pull request #243 from slarosa/master
@@ -88801,7 +155150,7 @@ Salvatore Larosa 	2012-09-23
 
     adjustment to the translate file to get the Italian translation in python console
 
-Merge: f7af2de 58ba3f0
+Merge: f7af2defa9 58ba3f0084
 Tim Sutton 	2012-09-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88816,7 +155165,7 @@ Larry Shaffer 	2012-09-22
     - Add ability to get/set a QSettings group (instead of window obj name) for saving states.
       Allows for groupboxes to be used in multiple places/dialogs and maintain same states (e.g. adv labeling dialog).
 
-Merge: d80d3cf 1b95cdc
+Merge: d80d3cf985 1b95cdca85
 Victor Olaya 	2012-09-22
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -88826,12 +155175,12 @@ Victor Olaya 	2012-09-22
     fixed #6295
     did some cleaning in GrassAlgorithm.py
 
-Merge: 2b1443f 1b95cdc
+Merge: 2b1443fe26 1b95cdca85
 Tim Sutton 	2012-09-22
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 73fcb66 c5ff5ee
+Merge: 73fcb66257 c5ff5ee5be
 Tim Sutton 	2012-09-22
 
     Merge pull request #242 from slarosa/master
@@ -88862,7 +155211,7 @@ Juergen E. Fischer 	2012-09-21
 
     fix OGRSpatialReferenceH member declaration
 
-Merge: 341935d d1c8884
+Merge: 341935d214 d1c8884ca1
 Magnus Homann 	2012-09-21
 
     Merge pull request #240 from homann/test_scalecombobox
@@ -88901,19 +155250,19 @@ Magnus Homann 	2012-09-18
 
     First simple test
 
-Merge: 003f833 719db73
+Merge: 003f83330d 719db73e38
 Tim Sutton 	2012-09-21
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
 
-Merge: dd36727 8f155b9
+Merge: dd367274a0 8f155b9755
 Tim Sutton 	2012-09-21
 
     Merge pull request #239 from matthias-kuhn/diagram-numberformat
 
     Always show numbers in decimal format ( no e format )
 
-Merge: 6ac8792 dd36727
+Merge: 6ac87920d0 dd367274a0
 Tim Sutton 	2012-09-21
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88930,7 +155279,7 @@ Juergen E. Fischer 	2012-09-21
 
     add links to old api version to doxygen documentation
 
-Merge: a220ef5 0133ed2
+Merge: a220ef5731 0133ed20fc
 Hugo Mercier 	2012-09-21
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into atlas
@@ -88955,22 +155304,22 @@ Radim Blazek 	2012-09-21
 
     wcs test - improved report
 
-Merge: 88ca822 5243423
+Merge: 88ca822c4e 5243423f0b
 Tim Sutton 	2012-09-21
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 05ae00d 88ca822
+Merge: 05ae00de29 88ca822c4e
 Tim Sutton 	2012-09-20
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
 
-Merge: 8fd7805 5243423
+Merge: 8fd78059c9 5243423f0b
 Tim Sutton 	2012-09-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: c5cc634 fed17aa
+Merge: c5cc634520 fed17aa552
 Etienne Tourigny 	2012-09-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -88986,7 +155335,7 @@ Tim Sutton 	2012-09-20
 
     Better test html table
 
-Merge: 8489bd1 fed17aa
+Merge: 8489bd17cd fed17aa552
 Tim Sutton 	2012-09-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89017,7 +155366,7 @@ Alexander Bruy 	2012-09-20
 
     fix typo in OGC filter implementaion
 
-Merge: 8fd7805 b1e00e9
+Merge: 8fd78059c9 b1e00e950c
 Tim Sutton 	2012-09-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89030,7 +155379,7 @@ Radim Blazek 	2012-09-19
 
     wcs test - improved report, servers list in json
 
-Merge: 78cb4e0 11dead9
+Merge: 78cb4e01a6 11dead9a3a
 Tim Sutton 	2012-09-19
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -89043,7 +155392,7 @@ Radim Blazek 	2012-09-19
 
     nodata per band, src nodata optional
 
-Merge: 0618a1f 35d869c
+Merge: 0618a1f163 35d869cfb3
 Magnus Homann 	2012-09-19
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89064,7 +155413,7 @@ Juergen E. Fischer 	2012-09-18
 
     debian packaging update
 
-Merge: 117e6f9 9c6ebdd
+Merge: 117e6f9eae 9c6ebdd4ee
 Tim Sutton 	2012-09-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89089,7 +155438,7 @@ Larry Shaffer 	2012-09-17
 
     Fix for compilers that do not cope with template argument
 
-Merge: ca752ee af63afa
+Merge: ca752eedb0 af63afa05b
 Tim Sutton 	2012-09-17
 
     Merge pull request #236 from matthias-kuhn/diagramtest
@@ -89108,7 +155457,7 @@ Juergen E. Fischer 	2012-09-17
 
     debian packaging update
 
-Merge: e671351 a25b1ec
+Merge: e671351747 a25b1ec509
 Tim Sutton 	2012-09-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89149,7 +155498,7 @@ Etienne Tourigny 	2012-09-16
 
     remove unused constructor (also fix build error in mac osx)
 
-Merge: d00c335 0138c47
+Merge: d00c33529c 0138c47e45
 Etienne Tourigny 	2012-09-16
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89168,7 +155517,7 @@ Juergen E. Fischer 	2012-09-17
     QgsSVGFillSymbolLayer
     QgsSimpleFillSymbolLayerV2
 
-Merge: 44ef220 8898e6b
+Merge: 44ef220477 8898e6b847
 Tim Sutton 	2012-09-16
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89207,7 +155556,7 @@ Larry Shaffer 	2012-09-16
     - Initial show of very long CRS no longer makes combobox too wide
     - Remove min height for nodata groupbox, possible cause for not fully collapsing
 
-Merge: cc63a1e d83b618
+Merge: cc63a1e297 d83b618f1e
 Magnus Homann 	2012-09-16
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89230,7 +155579,7 @@ Larry Shaffer 	2012-09-16
     - Corrected vertical alignment offset for all labels
     - Curved and parallel line labels also now register well for above/on/below
 
-Merge: 3fb8093 802ab85
+Merge: 3fb80939b0 802ab85673
 Magnus Homann 	2012-09-16
 
     Merge pull request #235 from homann/test_qgsclipper
@@ -89241,7 +155590,7 @@ Magnus Homann 	2012-09-16
 
     Fix stupid SIP error
 
-Merge: 8a347eb 9629501
+Merge: 8a347ebaf7 96295010d3
 Magnus Homann 	2012-09-16
 
     Merge pull request #234 from homann/test_qgsclipper
@@ -89291,7 +155640,7 @@ Larry Shaffer 	2012-09-14
     - Signal now passes pointer to custom widget; calling isCollapsed() now works in connected slot
     - Keep expanded group boxes in scroll areas from scrolling on first showing of dialog
 
-Merge: c328539 3130719
+Merge: c328539479 3130719ad3
 Magnus Homann 	2012-09-14
 
     Merge pull request #233 from homann/test_qgsclipper
@@ -89302,7 +155651,7 @@ Magnus Homann 	2012-09-15
 
     Test Friday! QgsClipper test
 
-Merge: 7b80206 2a32eca
+Merge: 7b80206793 2a32eca41f
 Alexander Bruy 	2012-09-14
 
     Merge branch 'master' into sextante-import
@@ -89316,7 +155665,7 @@ Alexander Bruy 	2012-09-14
     fix coordinate transform python test
     fix typo in renderchecker
 
-Merge: db59e1b 3a4d5e0
+Merge: db59e1b1b3 3a4d5e0ca2
 Etienne Tourigny 	2012-09-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89346,12 +155695,12 @@ Etienne Tourigny 	2012-09-14
 
     fix alignment when using oxygen (kde) theme
 
-Merge: 1080d97 799795a
+Merge: 1080d978c4 799795a05a
 Etienne Tourigny 	2012-09-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 8bf5cb2 799795a
+Merge: 8bf5cb264c 799795a05a
 Alexander Bruy 	2012-09-14
 
     Merge branch 'master' into sextante-import
@@ -89377,7 +155726,7 @@ Alexander Bruy 	2012-09-14
 
     fix another signal-slot connection in new console
 
-Merge: 8241030 26a4340
+Merge: 8241030957 26a43408b4
 Tim Sutton 	2012-09-14
 
     Merge pull request #232 from slarosa/master
@@ -89388,7 +155737,7 @@ Salvatore Larosa 	2012-09-14
 
     fix path for icon
 
-Merge: e1a1627 5b91b38
+Merge: e1a1627896 5b91b38d8e
 Magnus Homann 	2012-09-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89397,7 +155746,7 @@ Magnus Homann 	2012-09-14
 
     Reversed erroneous change
 
-Merge: 396f363 89e75cf
+Merge: 396f3633f3 89e75cf64a
 Tim Sutton 	2012-09-13
 
     Merge pull request #230 from slarosa/master
@@ -89416,7 +155765,7 @@ Larry Shaffer 	2012-09-13
 
     Remove hardcoded path for pyuic4 on Mac install
 
-Merge: 24a047d e2e2792
+Merge: 24a047d283 e2e27923a5
 Magnus Homann 	2012-09-13
 
     Merge pull request #231 from homann/memcpy_malloc_fixes
@@ -89459,7 +155808,7 @@ Salvatore Larosa 	2012-09-13
 
     added remember last used dir for open tool in python console
 
-Merge: 6af929a 94c2e1c
+Merge: 6af929a252 94c2e1cbb0
 Hugo Mercier 	2012-09-13
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -89476,7 +155825,7 @@ Tim Sutton 	2012-09-12
 
     Fix compiler warning about use of deprecated crs.epsg() call
 
-Merge: 3cb4669 c1f37e8
+Merge: 3cb46692b5 c1f37e8a03
 Magnus Homann 	2012-09-12
 
     Merge pull request #229 from homann/issue5895
@@ -89523,7 +155872,7 @@ Radim Blazek 	2012-09-12
 
     rasters saveas data type conversion fix
 
-Merge: 7ce99b8 e2fff49
+Merge: 7ce99b8cab e2fff49874
 Tim Sutton 	2012-09-12
 
     Merge pull request #228 from slarosa/master
@@ -89538,7 +155887,7 @@ Tim Sutton 	2012-09-11
 
     [FEATURE] Improved python console in QGIS based on PyScintilla. (This is a nominal commit to record the addition of this new feature)
 
-Merge: 597e770 318dd7c
+Merge: 597e770d37 318dd7c16b
 Tim Sutton 	2012-09-11
 
     Merge pull request #217 from endmax/master
@@ -89616,7 +155965,7 @@ Juergen E. Fischer 	2012-09-11
 
     also copy console_sci to build directory
 
-Merge: 80c03e5 a090559
+Merge: 80c03e5d33 a090559f3d
 Tim Sutton 	2012-09-11
 
     Merge pull request #227 from slarosa/master
@@ -89647,7 +155996,7 @@ Salvatore Larosa 	2012-09-11
 
     check platform for font size
 
-Merge: 02b6873 9db9ef8
+Merge: 02b687321a 9db9ef80c6
 Salvatore Larosa 	2012-09-11
 
     Merge pull request #1 from dakcarto/slarosa_pyqgisconsole
@@ -89688,7 +156037,7 @@ Tim Sutton 	2012-09-10
 
     Added asWktPolygon method to QgsRectangle with a unit test. Discovered QgsRectangle tests were missing their main method causing them to not run. Then discovered that some of these tests fail, one of which remains unresolved.
 
-Merge: 5eba984 83482fe
+Merge: 5eba984842 83482fe9a1
 homann 	2012-09-10
 
     Merge pull request #226 from homann/issue2465_patch
@@ -89752,7 +156101,7 @@ Larry Shaffer 	2012-09-07
 
     Fix for #6315, and keeps centroid calc. for whole feature in adv labeling
 
-Merge: 09c3693 2e8d82f
+Merge: 09c3693409 2e8d82fd3e
 Etienne Tourigny 	2012-09-07
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89769,7 +156118,7 @@ Tim Sutton 	2012-08-27
 
     Added comment about origin of qgis path var
 
-Merge: d686fbe 26dc406
+Merge: d686fbe7cb 26dc40676d
 Etienne Tourigny 	2012-09-07
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89794,7 +156143,7 @@ Marco Hugentobler 	2012-09-07
 
     Show layer visibility in GetProjectSettings
 
-Merge: 6e63f9f 3a4fa2f
+Merge: 6e63f9f083 3a4fa2fdb6
 Tim Sutton 	2012-09-07
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89803,7 +156152,7 @@ Tim Sutton 	2012-09-07
 
     Added Jaka to contributors list - thanks \o/
 
-Merge: c5763f9 89811ae
+Merge: c5763f975e 89811ae0c1
 Tim Sutton 	2012-09-07
 
     Merge pull request #225 from lynxlynxlynx/master
@@ -89850,7 +156199,7 @@ Juergen E. Fischer 	2012-09-07
 
     fix windows build
 
-Merge: 0d189ff ea86b93
+Merge: 0d189ffaea ea86b93e0d
 Etienne Tourigny 	2012-09-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89859,7 +156208,7 @@ Radim Blazek 	2012-09-06
 
     more raster Python bindings, raster write test in Python
 
-Merge: 5b49c9e e690048
+Merge: 5b49c9e6d9 e690048b46
 Etienne Tourigny 	2012-09-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89876,7 +156225,7 @@ Marco Hugentobler 	2012-09-06
 
     Add min/max scale denominator to capabilities output
 
-Merge: d77973d ea2de72
+Merge: d77973d0d3 ea2de726d3
 Tim Sutton 	2012-09-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89907,7 +156256,7 @@ Larry Shaffer 	2012-09-06
 
     Fix for #6309, add case-insensitive sort for vector provider encodings
 
-Merge: 4d90320 6cd3d77
+Merge: 4d90320d9c 6cd3d77762
 mhugent 	2012-09-06
 
     Merge pull request #224 from matthias-kuhn/diagram
@@ -89926,7 +156275,7 @@ Marco Hugentobler 	2012-09-06
 
     Fix item reading for GetPrint (project file format changed between 1.8 and 1.9)
 
-Merge: e109101 0748867
+Merge: e1091013af 07488674b2
 homann 	2012-09-05
 
     Merge pull request #223 from homann/custom_ellipsoid
@@ -89975,7 +156324,7 @@ Radim Blazek 	2012-05-24
 
     calc raster stats in grass module, time reduced to 20%, solves part of #4862
 
-Merge: 9d5b16e 1e1cdb8
+Merge: 9d5b16e842 1e1cdb83b3
 Marco Hugentobler 	2012-09-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -89988,7 +156337,7 @@ Marco Hugentobler 	2012-09-05
 
     Fix printing of pie and text diagrams
 
-Merge: cfa15ff aa31c8c
+Merge: cfa15ff560 aa31c8c6ba
 Marco Hugentobler 	2012-09-05
 
     [Feature]: Merge diagram improvements provided by Matthias Kuhn
@@ -90070,7 +156419,7 @@ Magnus Homann 	2012-08-30
 
     Made qgsexpression be DA-aware
 
-Merge: ad2ff90 0d1b1aa
+Merge: ad2ff907bd 0d1b1aa425
 homann 	2012-09-04
 
     Merge pull request #219 from homann/measure_cleanup
@@ -90154,12 +156503,12 @@ Tim Sutton 	2012-09-03
 
     Added comment about introduction of srid to version 1.9 for data source id
 
-Merge: 7cc62de 56c15dc
+Merge: 7cc62de08e 56c15dc647
 Tim Sutton 	2012-09-03
 
     Resolved merge conflicts
 
-Merge: ff7b21d bb3d86b
+Merge: ff7b21d545 bb3d86bc07
 Tim Sutton 	2012-09-03
 
     Merge pull request #222 from homann/test_DA
@@ -90194,7 +156543,7 @@ Larry Shaffer 	2012-09-03
 
     Fix for double point size in font named-style lookups
 
-Merge: 70fc079 c322cd5
+Merge: 70fc079230 c322cd52cf
 Nathan Woodrow 	2012-09-03
 
     Merge pull request #221 from szekerest/master
@@ -90275,7 +156624,7 @@ Nathan Woodrow 	2012-08-12
 
     Add html annotations
 
-Merge: b43ed34 df04771
+Merge: b43ed34872 df047713b3
 Jürgen Fischer 	2012-09-01
 
     Merge pull request #200 from sdikiy/dirdebug
@@ -90367,7 +156716,7 @@ Etienne Tourigny 	2012-08-31
 
     fix db handling when modifying existing color ramp (#6229)
 
-Merge: ee16369 c928868
+Merge: ee1636900a c928868916
 Marco Hugentobler 	2012-08-31
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -90487,7 +156836,7 @@ Matthias Kuhn 	2012-08-29
 
     Draw histogram diagrams in assigned space (no half-bar-width offset)
 
-Merge: 4e914c6 244e7d1
+Merge: 4e914c6657 244e7d1875
 Matthias Kuhn 	2012-08-29
 
     Merge branch 'print-diagram'
@@ -90496,15 +156845,15 @@ Matthias Kuhn 	2012-08-29
 
     Default width for histogram
 
-Merge: 0eab969 dae596a
+Merge: 0eab9697c0 dae596a251
 Matthias Kuhn 	2012-08-29
 
     Merge branch 'master' of https://github.com/matthias-kuhn/Quantum-GIS
 
     Conflicts:
-src/app/qgsdiagramproperties.cpp
+            src/app/qgsdiagramproperties.cpp
 
-Merge: c8a3321 b97f2fc
+Merge: c8a3321287 b97f2fc060
 Matthias Kuhn 	2012-08-29
 
     Merge branch 'diagram-additional-fix'
@@ -90536,7 +156885,7 @@ Etienne Tourigny 	2012-08-28
 
     add raster stats to python bindings (many more functions missing)
 
-Merge: 2a3d09c d2a18c2
+Merge: 2a3d09c90e d2a18c21b0
 Etienne Tourigny 	2012-08-28
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -90549,7 +156898,7 @@ Marco Hugentobler 	2012-08-28
 
     Fix diagram scaling for print
 
-Merge: 9226e84 2900646
+Merge: 9226e84f0c 29006466ec
 Etienne Tourigny 	2012-08-28
 
     Merge branch 'style-docs' of https://github.com/tecoholic/Quantum-GIS
@@ -90566,7 +156915,7 @@ Alexander Bruy 	2012-08-28
 
     fix #6235
 
-Merge: ec6b5a5 924e7eb
+Merge: ec6b5a5086 924e7eb9f2
 Etienne Tourigny 	2012-08-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -90631,7 +156980,7 @@ Juergen E. Fischer 	2012-08-26
 
     make tests runable without install
 
-Merge: 31743cf 725275c
+Merge: 31743cfca9 725275cf6c
 Tim Sutton 	2012-08-26
 
     Merge pull request #215 from homann/small_fixes_1969_2850
@@ -90678,14 +157027,14 @@ Juergen E. Fischer 	2012-08-25
 
     typo fixes, translation string updates and german translation update
 
-Merge: ae08961 5ba8422
+Merge: ae089619c2 5ba8422893
 Tim Sutton 	2012-08-25
 
     Merge pull request #212 from homann/issue2850
 
     Fix for issue 2850
 
-Merge: ca7fa30 6862a94
+Merge: ca7fa30242 6862a948b1
 Tim Sutton 	2012-08-24
 
     Merge pull request #208 from homann/issue1969
@@ -90720,7 +157069,7 @@ Etienne Tourigny 	2012-08-24
 
     restore qgscolorbrewerpalette.h
 
-Merge: 3f8a467 c836d61
+Merge: 3f8a467982 c836d61e99
 Etienne Tourigny 	2012-08-24
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into coloramp
@@ -90729,7 +157078,7 @@ Etienne Tourigny 	2012-08-24
 
     fix merge mistake
 
-Merge: 9d96e76 f5c7753
+Merge: 9d96e76291 f5c77536d5
 Etienne Tourigny 	2012-08-24
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -90738,7 +157087,7 @@ Etienne Tourigny 	2012-08-24
 
     implement UI for pyramids in raster save dialog, ui tweaks and bugfixes
 
-Merge: d0bf482 11ce55c
+Merge: d0bf482683 11ce55c0ac
 Tim Sutton 	2012-08-24
 
     Merge pull request #214 from slarosa/master
@@ -90749,7 +157098,7 @@ Tim Sutton 	2012-08-24
 
     Merged in upstream svn changes into sextante branch
 
-Merge: 17f91e7 9f47d96
+Merge: 17f91e73af 9f47d96796
 Tim Sutton 	2012-08-24
 
     Merge linfiniti2:/tmp/sextante into sextante-import
@@ -90782,7 +157131,7 @@ Etienne Tourigny 	2012-08-23
 
     bugfixes to archive management
 
-Merge: 69c3774 eaecf0c
+Merge: 69c3774650 eaecf0cd2c
 Etienne Tourigny 	2012-08-23
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into coloramp
@@ -90821,7 +157170,7 @@ Magnus Homann 	2012-08-23
 
     Added a signal from canvas when it has refreshed
 
-Merge: 523b56f 8015c12
+Merge: 523b56f58f 8015c12acd
 Etienne Tourigny 	2012-08-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -90838,7 +157187,7 @@ Radim Blazek 	2012-08-23
 
     nodata rendered transparent
 
-Merge: b145998 a8ca14b
+Merge: b145998078 a8ca14b6ed
 Etienne Tourigny 	2012-08-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -90847,7 +157196,7 @@ Etienne Tourigny 	2012-08-23
 
     fix symbol and color ramp saving - issues #6222 and #6227
 
-Merge: b6760ce 447c0d1
+Merge: b6760ce1d4 447c0d1e54
 Etienne Tourigny 	2012-08-23
 
     Merge branch 'style-docs' of https://github.com/tecoholic/Quantum-GIS
@@ -90972,7 +157321,7 @@ Marco Hugentobler 	2012-08-19
 
     Adapt composerhtml test to new multiframe resize modes
 
-Merge: bcbdd7c cb3a08e
+Merge: bcbdd7cba5 cb3a08e6ef
 Marco Hugentobler 	2012-08-19
 
     Merge branch 'multiframe_options'
@@ -90989,7 +157338,7 @@ Juergen E. Fischer 	2012-08-19
 
     use QEXPECT_FAIL instead of disabling the test
 
-Merge: 45cb47c c690f53
+Merge: 45cb47c78b c690f53374
 Tim Sutton 	2012-08-18
 
     Merge pull request #207 from homann/issue1591
@@ -91045,7 +157394,7 @@ Juergen E. Fischer 	2012-08-18
     - extend support for user defined network timeout to QgsNetworkAccessManager
     - support for user defined tile expiration time for WMTS/WMS-C tiles (fixes #5104)
 
-Merge: 4b40c53 500c64a
+Merge: 4b40c53a45 500c64a001
 Nathan Woodrow 	2012-08-18
 
     Merge pull request #206 from szekerest/master
@@ -91060,14 +157409,14 @@ szekerest 	2012-08-18
 
     MSSQL: Fix for the parser when reading multipoint geometries (fixes #6190)
 
-Merge: b42067e a18e396
+Merge: b42067eed6 a18e3965b0
 Tim Sutton 	2012-08-17
 
     Merge pull request #205 from homann/issue1993
 
     Issue1993
 
-Merge: 24e3559 ceea621
+Merge: 24e3559f94 ceea621242
 Nathan Woodrow 	2012-08-17
 
     Merge pull request #204 from szekerest/master
@@ -91119,7 +157468,7 @@ Juergen E. Fischer 	2012-08-17
     - disable TestStyleV2::testSaveLoad() test while QgsStyleV2::save() is defunct
     - used temporary copy of testzip.zip in TestZipLayer so that original is not modified
 
-Merge: b7e6e64 d05701f
+Merge: b7e6e64f0f d05701fdf4
 Tim Sutton 	2012-08-17
 
     Merge pull request #203 from slarosa/master
@@ -91130,7 +157479,7 @@ Salvatore Larosa 	2012-08-17
 
     Added MultiGeometries tests for test friday
 
-Merge: b37a3b6 b5a59fd
+Merge: b37a3b64f5 b5a59fd251
 Jürgen Fischer 	2012-08-17
 
     Merge pull request #202 from homann/issue6194
@@ -91150,7 +157499,7 @@ Matthias Kuhn 	2012-08-17
     Do not apply diagram transparency to pen
     but instead save custom pen alpha value
 
-Merge: ed98805 4839a2a
+Merge: ed988051e7 4839a2ab01
 Alexander Bruy 	2012-08-17
 
     Merge branch 'test_memory'
@@ -91247,13 +157596,13 @@ Matthias Kuhn 	2012-08-16
 
     Diagram type not properly selected in properties dialog
 
-Merge: 033bd79 d845a0a
+Merge: 033bd79762 d845a0a458
 Matthias Kuhn 	2012-08-16
 
     Merge diagram icons
 
     Conflicts:
-src/app/qgsdiagramproperties.cpp
+            src/app/qgsdiagramproperties.cpp
 
 Matthias Kuhn 	2012-08-16
 
@@ -91355,7 +157704,7 @@ Martin Dobias 	2012-08-14
 
     Fixed compilation
 
-Merge: da5609c d2f08ee
+Merge: da5609c839 d2f08eeb24
 Martin Dobias 	2012-08-14
 
     [FEATURE] Reworked symbol selector/properties dialog, greatly improved style manager
@@ -91365,7 +157714,7 @@ Martin Dobias 	2012-08-14
     Merge remote-tracking branch 'arun/gsoc'
 
     Conflicts:
-src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
+            src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
 
 Radim Blazek 	2012-08-14
 
@@ -91487,7 +157836,7 @@ Werner Macho 	2012-08-13
 
     translation update: gl_ES by Xan
 
-Merge: 129dc0b 9a26650
+Merge: 129dc0b3d1 9a266503aa
 Marco Hugentobler 	2012-08-13
 
     Merge branch 'scalebar_units'
@@ -91602,7 +157951,7 @@ Juergen E. Fischer 	2012-08-10
 
     avoid gettimeofday
 
-Merge: 2983ad7 8f3142e
+Merge: 2983ad732c 8f3142efbc
 Etienne Tourigny 	2012-08-10
 
     Merge branch 'cptcity' of ../qgis-etiennesky
@@ -91709,7 +158058,7 @@ Matthias Kuhn 	2012-08-09
 
     draw smaller diagrams on top
 
-Merge: 8b2b601 cceb1fb
+Merge: 8b2b601713 cceb1fbcb3
 Matthias Kuhn 	2012-08-09
 
     draw smaller diagrams on top
@@ -91878,7 +158227,7 @@ Marco Hugentobler 	2012-08-08
 
     Add export macros to classes and fix warning
 
-Merge: 954bec4 12f521e
+Merge: 954bec45a0 12f521eb55
 Marco Hugentobler 	2012-08-08
 
     Fix merge conflict
@@ -92006,12 +158355,12 @@ Juergen E. Fischer 	2012-08-07
 
     fix windows build
 
-Merge: 829f672 0fc62dd
+Merge: 829f672b48 0fc62dd443
 Radim Blazek 	2012-08-07
 
     WCS native
 
-Merge: e9afc7b 829f672
+Merge: e9afc7bc81 829f672b48
 Radim Blazek 	2012-08-07
 
     Merge remote branch 'origin/master' into wcs2
@@ -92074,7 +158423,7 @@ cpolymeris@gmail.com 
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@336 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 6861078 2752f66
+Merge: 6861078d02 2752f66ec1
 Etienne Tourigny 	2012-08-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92102,7 +158451,7 @@ cpolymeris@gmail.com 
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@335 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 53da893 3b3f674
+Merge: 53da893280 3b3f6748f1
 Radim Blazek 	2012-08-06
 
     master merge
@@ -92155,7 +158504,7 @@ Arunmozhi 	2012-08-04
 
     tweaks for symbolslist widget filtering
 
-Merge: 3305ccd d4a316a
+Merge: 3305ccda50 d4a316a9d9
 Tim Sutton 	2012-08-04
 
     Merge linfiniti2:/tmp/sextante-clone into sextante-import
@@ -92183,7 +158532,7 @@ Juergen E. Fischer 	2012-08-03
 
     add title() expression test row
 
-Merge: 8761bc7 84706ae
+Merge: 8761bc7730 84706aea14
 Tim Sutton 	2012-08-03
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92219,7 +158568,7 @@ cpolymeris@gmail.com 
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@332 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: de5f95b e39c216
+Merge: de5f95b6f4 e39c216a59
 Etienne Tourigny 	2012-08-02
 
     Merge branch 'coloramp' of ../qgis-etiennesky
@@ -92257,7 +158606,7 @@ Marco Hugentobler 	2012-08-02
 
     Improved multiframe command handling
 
-Merge: d8e918d 28b8ab0
+Merge: d8e918d97c 28b8ab09ad
 Tim Sutton 	2012-08-02
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92438,7 +158787,7 @@ Juergen E. Fischer 	2012-07-31
 
     fix warnings
 
-Merge: ec87f7f dbad873
+Merge: ec87f7f8eb dbad873488
 Marco Hugentobler 	2012-07-31
 
     Merge branch 'wms_address'
@@ -92488,7 +158837,7 @@ Radim Blazek 	2012-07-29
 
     fixed gdal stats approx for large rasters
 
-Merge: f457ece 52eed92
+Merge: f457ece3eb 52eed922cb
 Larry Shaffer 	2012-07-29
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92512,7 +158861,7 @@ Radim Blazek 	2012-07-29
 
     wcs - enabled histogram
 
-Merge: 5a5928e 1eeb537
+Merge: 5a5928e37a 1eeb537e76
 Radim Blazek 	2012-07-29
 
     master merge
@@ -92521,7 +158870,7 @@ Larry Shaffer 	2012-07-29
 
     Fix to keep defined custom symbol paths from being added to first of new global scales.
 
-Merge: 5b44fbf 26a4f80
+Merge: 5b44fbfb40 26a4f80260
 Larry Shaffer 	2012-07-29
 
     Merge pull request #192 from dakcarto/update-rulebasestyles-gui-2
@@ -92725,7 +159074,7 @@ Arunmozhi 	2012-07-26
 
     symbol DB updated to support groups,tags for colorramp
 
-Merge: d8fd81b ee4ac59
+Merge: d8fd81ba02 ee4ac59dc5
 Tim Sutton 	2012-07-26
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92756,15 +159105,15 @@ volayaf 	2012-07-25
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@309 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: f2c4f53 d039c3f
+Merge: f2c4f53941 d039c3f649
 Hugo Mercier 	2012-07-25
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
 
     Conflicts:
-src/core/symbology-ng/qgsrulebasedrendererv2.cpp
+            src/core/symbology-ng/qgsrulebasedrendererv2.cpp
 
-Merge: d039c3f 1bcd947
+Merge: d039c3f649 1bcd947247
 Marco Hugentobler 	2012-07-25
 
     Merge branch 'raster-pipes-2'
@@ -92829,7 +159178,7 @@ Etienne Tourigny 	2012-07-24
 
     add qgsrasterformatsaveoptionswidget to sip and cleanup names ; better hack for mOptionsLabel click
 
-Merge: 4018ca6 c9f17ed
+Merge: 4018ca61bd c9f17ed0e4
 Tim Sutton 	2012-07-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92870,7 +159219,7 @@ Etienne Tourigny 	2012-07-22
 
     re-implement QgisApp::removeDockWidget to remove dock widget action from panel menu when plugins are disabled (#4796)
 
-Merge: b702d3c 68bf5ec
+Merge: b702d3ca9f 68bf5ec8c2
 Tim Sutton 	2012-07-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92942,7 +159291,7 @@ Nathan Woodrow 	2012-07-22
 
      - Use readAll() for function help to preserve html
 
-Merge: c517a90 2599bf4
+Merge: c517a90cdd 2599bf4683
 William Kyngesburye 	2012-07-21
 
     Merge pull request #196 from dakcarto/fix_mac-build-libs
@@ -92971,7 +159320,7 @@ Etienne Tourigny 	2012-07-20
 
     add basic driver create options - simple line edit in save dialog and in gdal driver options
 
-Merge: 47b8d60 c517a90
+Merge: 47b8d60332 c517a90cdd
 Radim Blazek 	2012-07-20
 
     master merge
@@ -92988,7 +159337,7 @@ thomas 	2012-06-22
 
     apply #4819: use QPainterPath instead of QPolygonF for highlighting
 
-Merge: d4a26cb 23ba58d
+Merge: d4a26cb62d 23ba58d2fe
 Tim Sutton 	2012-07-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -92997,7 +159346,7 @@ Tim Sutton 	2012-07-20
 
     Added basic notes on Jenkins setup
 
-Merge: ecb7b24 28021ef
+Merge: ecb7b241b2 28021ef0c5
 Nathan Woodrow 	2012-07-20
 
     Merge pull request #195 from dakcarto/feature_freeze-thaw-labels_6
@@ -93020,7 +159369,7 @@ Tim Sutton 	2012-07-20
 
     Added xslt for transforming CTest results to Junit for Jenkins. Source: https://gist.github.com/2358656
 
-Merge: 814ea09 b6380b7
+Merge: 814ea09272 b6380b7f32
 Tim Sutton 	2012-07-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -93035,14 +159384,14 @@ Larry Shaffer 	2012-07-19
 
     Builds were not portable (i.e. Snow Leopard to Lion, dev Mac to client) because libs were still referencing dev Mac's libs and were not being updated on bundle frameworks.
 
-Merge: d6c0c6d 5f9f76e
+Merge: d6c0c6dbbc 5f9f76ea82
 Tim Sutton 	2012-07-19
 
     Merge pull request #190 from dakcarto/fix-comp-label-edit
 
     Additional fix for #5862 fix.
 
-Merge: 62a51e8 7d469db
+Merge: 62a51e8e92 7d469dbf37
 Tim Sutton 	2012-07-19
 
     Merge pull request #186 from lynxlynxlynx/master
@@ -93077,7 +159426,7 @@ Marco Hugentobler 	2012-07-19
 
     Show GeoTiff in format combo box, fix wrong loop index
 
-Merge: 78bbb65 3af7ef3
+Merge: 78bbb659dd 3af7ef3085
 Tim Sutton 	2012-07-19
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -93110,7 +159459,7 @@ Radim Blazek 	2012-07-19
 
     better wcs mapfile mimetypes
 
-Merge: 8e66f2c 0c62390
+Merge: 8e66f2c45c 0c62390027
 Nathan Woodrow 	2012-07-18
 
     Merge pull request #194 from dakcarto/binding_labelsWithinRect
@@ -93127,7 +159476,7 @@ Larry Shaffer 	2012-07-18
 
     qgis.utils.iface.mapCanvas().mapRenderer().labelingEngine().labelsWithinRect(some_extent) can now return all labels shown within the canvas (if that's the extent given).
 
-Merge: cb1e7d3 83764a6
+Merge: cb1e7d3f6b 83764a6f1e
 Tim Sutton 	2012-07-18
 
     Merge pull request #193 from dakcarto/feature_freeze-thaw-labels_4
@@ -93170,7 +159519,7 @@ Marco Hugentobler 	2012-07-18
 
     Move non-gui part of printing functionality to composition
 
-Merge: aea41ee f5dce33
+Merge: aea41eebbc f5dce33431
 Alexander Bruy 	2012-07-18
 
     Merge branch 'project_scale'
@@ -93191,7 +159540,7 @@ Alexander Bruy 	2012-07-05
 
     [FEATURE] editable global scales list
 
-Merge: 0cfe094 74021a4
+Merge: 0cfe094aca 74021a477e
 Juergen E. Fischer 	2012-07-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -93232,7 +159581,7 @@ Etienne Tourigny 	2012-06-12
 
     add project defaults for layer symbology
 
-Merge: 03b0526 19d6499
+Merge: 03b0526e19 19d64998f6
 Marco Hugentobler 	2012-07-17
 
     Merge branch 'composer_multi_pages'
@@ -93281,7 +159630,7 @@ Juergen E. Fischer 	2012-07-17
 
     update grass provider after 008592b0
 
-Merge: b58b827 d1b7e8b
+Merge: b58b827e07 d1b7e8bac3
 Etienne Tourigny 	2012-07-16
 
     Merge branch 'histogramwidget' of ../qgis-etiennesky
@@ -93377,7 +159726,7 @@ Martin Dobias 	2012-07-15
 
     [API] removed QgsSearchString - QgsExpression should be used instead
 
-Merge: 87bdff9 f84d965
+Merge: 87bdff9314 f84d9658e1
 Alexander Bruy 	2012-07-15
 
     Merge branch 'raster_fixes'
@@ -93477,7 +159826,7 @@ Arunmozhi 	2012-07-13
 
     added context menu to the groupTree to +/- groups
 
-Merge: c840ce1 b70a0c6
+Merge: c840ce199c b70a0c6991
 Radim Blazek 	2012-07-12
 
     Merge remote branch 'origin/master' into wcs2
@@ -93536,7 +159885,7 @@ Marco Hugentobler 	2012-07-11
 
     Move descriptive label
 
-Merge: c372772 ea2f74a
+Merge: c3727720a3 ea2f74ab70
 Marco Hugentobler 	2012-07-11
 
     Merge branch 'composer_overview_map'
@@ -93873,7 +160222,7 @@ Marco Hugentobler 	2012-07-06
 
     [FEATURE]: display rectangle of another composer map (overview map)
 
-Merge: aa8cccb bc18adb
+Merge: aa8cccb527 bc18adb02e
 Marco Hugentobler 	2012-07-06
 
     Merge branch 'composer_test'
@@ -93955,7 +160304,7 @@ paolo.cavallini 	2012-07-0
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@284 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: b4d8b9a ba0f5da
+Merge: b4d8b9afdb ba0f5da677
 Marco Hugentobler 	2012-07-05
 
     Merge branch 'raster_transparency'
@@ -93968,7 +160317,7 @@ Werner Macho 	2012-07-05
 
     translation update: de
 
-Merge: ddd8028 72d7a23
+Merge: ddd8028fe9 72d7a238b7
 Werner Macho 	2012-07-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -93983,7 +160332,7 @@ Alexander Bruy 	2012-07-04
 
     use band numbers in transparency tab if color interpretation is undefined
 
-Merge: 3cd360c 9d3b505
+Merge: 3cd360c64e 9d3b505271
 Marco Hugentobler 	2012-07-04
 
     Merge branch 'zebra_style'
@@ -94004,7 +160353,7 @@ Marco Hugentobler 	2012-07-04
 
     Also update enum in python bindings of composer map
 
-Merge: 040b046 5a7cb21
+Merge: 040b046ac3 5a7cb21c93
 Marco Hugentobler 	2012-07-04
 
     Merge branch 'graticule_labels'
@@ -94101,7 +160450,7 @@ Radim Blazek 	2012-07-01
 
     use QgsRasterInterface::DataType enum instead of int; in raster interfaces check in setInput if input is compatible;
 
-Merge: 2fdd82f fab2fe1
+Merge: 2fdd82f4b8 fab2fe16fd
 Radim Blazek 	2012-07-01
 
     Merge remote branch 'origin/master' into raster-pipes-2
@@ -94247,7 +160596,7 @@ Marco Hugentobler 	2012-06-29
 
     Outcomment debug code
 
-Merge: 53dd796 663f5ad
+Merge: 53dd79644c 663f5ad0a1
 Marco Hugentobler 	2012-06-29
 
     Merge branch 'label_rotation'
@@ -94345,14 +160694,14 @@ Marco Hugentobler 	2012-06-26
 
     Bugfix by Radim: prevent extra multiplication if alpha is 1
 
-Merge: 91862c3 94a1210
+Merge: 91862c3432 94a1210d87
 Tim Sutton 	2012-06-26
 
     Merge pull request #181 from etiennesky/decorationgrid
 
     [FEATURE] Added Decoration grid
 
-Merge: 1e7e763 e27ce7c
+Merge: 1e7e763af1 e27ce7c75f
 alexbruy 	2012-06-26
 
     Merge pull request #188 from slarosa/master
@@ -94393,7 +160742,7 @@ Juergen E. Fischer 	2012-06-25
 
     osgeo4w: enable touch support
 
-Merge: a2d857f 6b4a27a
+Merge: a2d857fd93 6b4a27a902
 Nathan Woodrow 	2012-06-25
 
     Merge pull request #187 from mbernasocchi/android
@@ -94412,7 +160761,7 @@ Marco Bernasocchi 	2012-06-25
 
     make QGIS settings go to .qgis
 
-Merge: 48e42c5 6a7ab64
+Merge: 48e42c5417 6a7ab642e9
 Marco Hugentobler 	2012-06-25
 
     Merge branch 'raster_renderer_default'
@@ -94461,7 +160810,7 @@ Etienne Tourigny 	2012-06-21
 
     UI tweaks + selectively enable line/cross width/marker picker
 
-Merge: 52158fb 9a88de8
+Merge: 52158fbd89 9a88de8465
 Werner Macho 	2012-06-23
 
     Merge pull request #185 from lynxlynxlynx/master
@@ -94500,7 +160849,7 @@ Juergen E. Fischer 	2012-06-23
 
     fix #5490 again
 
-Merge: b6ad69d 2238fc1
+Merge: b6ad69d12c 2238fc1d66
 Nathan Woodrow 	2012-06-23
 
     Merge pull request #184 from mbernasocchi/android
@@ -94515,7 +160864,7 @@ Alexander Bruy 	2012-06-23
 
     show 'unkonwn'instead of '-1' in sublayers dialog (addresses #5844)
 
-Merge: 3599700 5445178
+Merge: 3599700d86 5445178151
 Jürgen Fischer 	2012-06-22
 
     Merge pull request #183 from mbernasocchi/android
@@ -94582,7 +160931,7 @@ Werner Macho 	2012-06-21
 
     translation update: adding more danish translations and a new maintainer
 
-Merge: fcb86cf 3df1c4e
+Merge: fcb86cf513 3df1c4e668
 Tim Sutton 	2012-06-21
 
     Merge pull request #182 from dakcarto/fix-unittests-mac
@@ -94620,7 +160969,7 @@ Juergen E. Fischer 	2012-06-21
 
     run TestZipLayer::testTarItemSubfolder() only on GDAL>=1.8
 
-Merge: 02b1324 de6f642
+Merge: 02b1324faa de6f642152
 Tim Sutton 	2012-06-21
 
     Merge branch 'fix-menu-ordering-2' of https://github.com/dakcarto/Quantum-GIS into 5753
@@ -94645,7 +160994,7 @@ Marco Hugentobler 	2012-06-20
 
     Add comments for new functions
 
-Merge: b86498a 6188322
+Merge: b86498a3b5 618832252f
 Marco Hugentobler 	2012-06-20
 
     Merge branch 'snap_interface'
@@ -94825,7 +161174,7 @@ Marco Hugentobler 	2012-06-17
 
     Applied fix for #4453 from Leyan Ouyang
 
-Merge: f55c13f ac45351
+Merge: f55c13fa93 ac453510af
 mhugent 	2012-06-17
 
     Merge pull request #179 from sdikiy/master
@@ -94908,7 +161257,7 @@ Larry Shaffer 	2012-06-15
 
     File, Edit, View, Layer, Settings, Plugins, [Vector], Raster, [Database], [Web], [Plugin-added-menus], Window (on Mac), Help
 
-Merge: a240f44 dceefca
+Merge: a240f44237 dceefca2a8
 alexbruy 	2012-06-15
 
     Merge pull request #175 from coyotte508/master
@@ -94947,7 +161296,7 @@ Marco Hugentobler 	2012-06-15
 
     Use band number as text in raster renderer widgets if color interpretation is undefined. Fix for ticket #5799
 
-Merge: 11b23d5 70b68be
+Merge: 11b23d5c0e 70b68be646
 Radim Blazek 	2012-06-15
 
     WCS
@@ -94996,7 +161345,7 @@ Alexander Bruy 	2012-06-14
 
     fix Python bindings for raster renderer and resampler
 
-Merge: f3f1c43 9a006e4
+Merge: f3f1c4378e 9a006e4dad
 Tim Sutton 	2012-06-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -95025,7 +161374,7 @@ Marco Hugentobler 	2012-06-14
 
     Make project file transform for rasters between 1.8 and 1.9
 
-Merge: dba6ba4 966c5c1
+Merge: dba6ba4fb1 966c5c15c0
 Tim Sutton 	2012-06-14
 
     Resolved merge conflicts
@@ -95038,7 +161387,7 @@ Marco Hugentobler 	2012-06-14
 
     Fix typo
 
-Merge: adca9d3 efb54ea
+Merge: adca9d39dc efb54eaf3b
 Marco Hugentobler 	2012-06-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -95053,12 +161402,12 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@242 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: ff87dee fd0a46a
+Merge: ff87deef07 fd0a46a8d3
 Marco Hugentobler 	2012-06-14
 
     Merge raster resampler branch
 
-Merge: b33ea42 efb54ea
+Merge: b33ea422ce efb54eaf3b
 Tim Sutton 	2012-06-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -95099,12 +161448,12 @@ Radim Blazek 	2012-06-13
 
     missing QHash
 
-Merge: 5ebdbe3 f276fde
+Merge: 5ebdbe34f2 f276fdee6c
 Juergen E. Fischer 	2012-06-13
 
     [FEATURE] Add WMTS support
 
-Merge: 3713511 e85d9b8
+Merge: 371351188f e85d9b8586
 Tim Sutton 	2012-06-12
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -95121,7 +161470,7 @@ Tim Sutton 	2012-06-12
 
     Remove rc from splash
 
-Merge: ef60f81 e85d9b8
+Merge: ef60f812e3 e85d9b8586
 Juergen E. Fischer 	2012-06-12
 
     Merge remote-tracking branch 'origin/master' into wmts
@@ -95169,7 +161518,7 @@ Werner Macho 	2012-06-11
 
     translation update: es by Carlos
 
-Merge: cc9b898 8a9c82c
+Merge: cc9b8983bc 8a9c82cb6a
 Tim Sutton 	2012-06-11
 
     Merge pull request #171 from Cracert/trans
@@ -95180,7 +161529,7 @@ Robert Szczepanek 	2012-06-11
 
     translation update: pl by Robert
 
-Merge: 014b9ac e0b899e
+Merge: 014b9ac563 e0b899e964
 Tim Sutton 	2012-06-11
 
     Merge pull request #170 from dakcarto/fix-about-hijack
@@ -95192,7 +161541,7 @@ Larry Shaffer 	2012-06-11
     Better fix for #5754. More of a hack but works well.
     Keeps all plugins from hijacking About or Preferences application menus on Mac.
 
-Merge: 442adba a5199a8
+Merge: 442adbac3b a5199a8140
 Werner Macho 	2012-06-11
 
     Merge pull request #168 from Jean-Roc/master
@@ -95226,7 +161575,7 @@ Werner Macho 	2012-06-11
 
     translation update: ja by yoichi
 
-Merge: 615089c f47d1ab
+Merge: 615089c9f6 f47d1ab07b
 Werner Macho 	2012-06-11
 
     Merge pull request #167 from artfwo/master
@@ -95237,7 +161586,7 @@ Artem Popov 	2012-06-11
 
     Updated Russian translation.
 
-Merge: 6d9f0dd 24cca20
+Merge: 6d9f0dddb8 24cca20d02
 Werner Macho 	2012-06-11
 
     Merge pull request #166 from rduivenvoorde/master
@@ -95277,7 +161626,7 @@ cpolymeris@gmail.com 
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@235 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 769fd5e 7f1a4e2
+Merge: 769fd5e20a 7f1a4e28d1
 Jürgen Fischer 	2012-06-10
 
     Merge pull request #165 from dakcarto/fix-menus-two
@@ -95301,7 +161650,7 @@ Juergen E. Fischer 	2012-06-10
 
     fix query item removal
 
-Merge: 3c746c7 ed801a4
+Merge: 3c746c7667 ed801a47fa
 Juergen E. Fischer 	2012-06-10
 
     Merge remote-tracking branch 'origin/master' into wmts
@@ -95333,7 +161682,7 @@ Giuseppe Sucameli 	2012-06-09
 
     DBManager: fix spatial index creation importing a vector layer (fix #5625)
 
-Merge: 23c0f25 12ef68e
+Merge: 23c0f252e7 12ef68e834
 Gary Sherman 	2012-06-09
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -95369,7 +161718,7 @@ volayaf 	2012-06-08
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@232 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 7b08cba 4a33d74
+Merge: 7b08cbaa31 4a33d74cc3
 Werner Macho 	2012-06-08
 
     Merge pull request #162 from rduivenvoorde/master
@@ -95433,7 +161782,7 @@ Radim Blazek 	2012-06-07
 
     updated widgets / customization
 
-Merge: 38d15f1 77d3ab9
+Merge: 38d15f1200 77d3ab91e2
 Juergen E. Fischer 	2012-06-07
 
     Merge remote-tracking branch 'origin/master' into wmts
@@ -95442,7 +161791,7 @@ Juergen E. Fischer 	2012-06-07
 
     fix WMS-C
 
-Merge: c695198 ac67309
+Merge: c695198e17 ac6730996e
 Werner Macho 	2012-06-06
 
     Merge pull request #161 from Cracert/trans
@@ -95473,7 +161822,7 @@ Juergen E. Fischer 	2012-06-06
 
     update creatensis section of INSTALL
 
-Merge: 40fbac0 1ca6e7d
+Merge: 40fbac0db7 1ca6e7d193
 Werner Macho 	2012-06-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -95490,7 +161839,7 @@ Werner Macho 	2012-06-06
 
     translation update: ja by yoichi
 
-Merge: d78e605 237f73c
+Merge: d78e605243 237f73cb33
 Werner Macho 	2012-06-05
 
     Merge pull request #160 from Cracert/trans
@@ -95553,7 +161902,7 @@ paolo.cavallini 	2012-06-0
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@223 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 08a712a dab4758
+Merge: 08a712a5f0 dab475868f
 Juergen E. Fischer 	2012-06-04
 
     Merge branch 'master' into wmts
@@ -95613,7 +161962,7 @@ volayaf 	2012-06-04
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@216 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 8ad85ed 2519df8
+Merge: 8ad85ed59e 2519df85ff
 Nathan Woodrow 	2012-06-03
 
     Merge pull request #159 from szekerest/master
@@ -95644,7 +161993,7 @@ Werner Macho 	2012-06-03
 
     translation update: nl by Richard
 
-Merge: cdd683c d6d1e70
+Merge: cdd683c5bc d6d1e70646
 Werner Macho 	2012-06-03
 
     Merge pull request #158 from Jean-Roc/master
@@ -95658,7 +162007,7 @@ paolo.cavallini 	2012-06-0
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@214 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: c3f240b 2ed561b
+Merge: c3f240b81e 2ed561bdd5
 Jean-Roc Morreale 	2012-06-02
 
     update fr strings, patches from Etienne Tourigny and Robin Cura
@@ -95677,7 +162026,7 @@ paolo.cavallini 	2012-06-0
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@212 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: af01338 7db9df5
+Merge: af01338e30 7db9df5d86
 MORREALE Jean-Roc 	2012-06-02
 
     Merge pull request #5 from RCura/master
@@ -95724,7 +162073,7 @@ Juergen E. Fischer 	2012-06-01
 
     cache sublayer feature counts and don't retrieve expensive ones (fixes #5322)
 
-Merge: 2767edf b7382e3
+Merge: 2767edf8c9 b7382e3653
 Werner Macho 	2012-06-01
 
     Merge pull request #157 from artfwo/master
@@ -95833,7 +162182,7 @@ volayaf 	2012-05-31
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@199 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: af01338 5368468
+Merge: af01338e30 53684682f2
 Jean-Roc Morreale 	2012-05-31
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -95905,7 +162254,7 @@ Juergen E. Fischer 	2012-05-29
      * QgsPoint::sqrDistToSegment: allow assing of segment snapping epsilon
      * QgsMapLayer::crs() add "const"
 
-Merge: 23b40de 1341a55
+Merge: 23b40de5a6 1341a5537e
 alexbruy 	2012-05-29
 
     Merge pull request #154 from slarosa/master
@@ -95936,7 +162285,7 @@ Juergen E. Fischer 	2012-05-29
 
     fix #5660
 
-Merge: 9859709 9e45d4c
+Merge: 9859709e92 9e45d4c52b
 Werner Macho 	2012-05-29
 
     Merge pull request #153 from rduivenvoorde/master
@@ -95951,7 +162300,7 @@ Giuseppe Sucameli 	2012-05-28
 
     fix set crs to OGR data items (broken in 04aab2938)
 
-Merge: 5e45e87 04aab29
+Merge: 5e45e876dc 04aab2938c
 Giuseppe Sucameli 	2012-05-29
 
     Merge remote-tracking branch 'etiennesky/browser_fixes'
@@ -95968,7 +162317,7 @@ Juergen E. Fischer 	2012-05-28
 
     fix #5030
 
-Merge: 369b32e 721765e
+Merge: 369b32e5e5 721765e5ee
 Tim Sutton 	2012-05-28
 
     Merge pull request #152 from dakcarto/patch-1
@@ -96049,12 +162398,12 @@ Tim Sutton 	2012-05-27
 
     Remove 'm' tagged QGIS icon in lead up to release of 1.8
 
-Merge: c1df626 4295a68
+Merge: c1df6269a7 4295a687d1
 Tim Sutton 	2012-05-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 9d0745f df79503
+Merge: 9d0745fa68 df79503cae
 alexbruy 	2012-05-27
 
     Merge pull request #150 from slarosa/master
@@ -96069,7 +162418,7 @@ Juergen E. Fischer 	2012-05-27
 
     fix warning
 
-Merge: d281277 812ff51
+Merge: d281277665 812ff51e39
 Werner Macho 	2012-05-26
 
     Merge pull request #149 from Jean-Roc/master
@@ -96115,7 +162464,7 @@ Jean-Roc Morreale 	2012-05-25
 
     update fr strings
 
-Merge: c4db2e0 afcd5b6
+Merge: c4db2e0e33 afcd5b6e3c
 Jean-Roc Morreale 	2012-05-25
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -96134,7 +162483,7 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@191 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 88a319a 40c34d4
+Merge: 88a319a4fc 40c34d4b40
 Tim Sutton 	2012-05-25
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -96182,14 +162531,14 @@ Juergen E. Fischer 	2012-05-25
 
     message log: fix crash on exit
 
-Merge: a442b89 474e04b
+Merge: a442b89c71 474e04b027
 alexbruy 	2012-05-25
 
     Merge pull request #148 from slarosa/master
 
     minor fixes in fTools GUI
 
-Merge: e37a9ae 3dc5d54
+Merge: e37a9aea58 3dc5d54805
 Jean Roc 	2012-05-25
 
     Merge pull request #4 from mathieubossaert/master
@@ -96214,7 +162563,7 @@ Juergen E. Fischer 	2012-05-24
 
     fTools: fix handling of locationless geometry errors (fixes #4396)
 
-Merge: bc367ce 84f7b12
+Merge: bc367ce7dd 84f7b125dc
 Jean Roc 	2012-05-24
 
     Merge pull request #3 from mathieubossaert/master
@@ -96279,7 +162628,7 @@ Alexander Bruy 	2012-05-23
 
     make Dissolve tool work with SpatiaLite (addresses #4571)
 
-Merge: 4d3cf1a c367a35
+Merge: 4d3cf1abca c367a35ce9
 Tim Sutton 	2012-05-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -96327,7 +162676,7 @@ Marco Hugentobler 	2012-05-22
 
     Split tool: prefer default values for new features vs. values copied from original feature. Fixes ticket #5475
 
-Merge: 5a4412a 1780344
+Merge: 5a4412a21d 1780344671
 Radim Blazek 	2012-05-21
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -96458,14 +162807,14 @@ Etienne Tourigny 	2012-05-19
 
     fix zip file reading for gdal<1.9 and add test for folder-in-zip
 
-Merge: 9dcee6b 396aaf1
+Merge: 9dcee6b424 396aaf1c6e
 Tim Sutton 	2012-05-19
 
     Merge pull request #142 from etiennesky/fix_crs
 
     Fix crs issues
 
-Merge: 1e7b9ed b6997a0
+Merge: 1e7b9ed0d4 b6997a0788
 Tim Sutton 	2012-05-19
 
     Merge pull request #141 from etiennesky/zip_fixes2
@@ -96596,7 +162945,7 @@ Jean-Roc Morreale 	2012-05-17
 
     update fr strings
 
-Merge: 07e4fb1 bfd846a
+Merge: 07e4fb1534 bfd846a192
 Jean-Roc Morreale 	2012-05-17
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -96630,7 +162979,7 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@182 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 2caba61 a1255fc
+Merge: 2caba61bba a1255fce34
 Jean-Roc Morreale 	2012-05-15
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -96649,7 +162998,7 @@ Alexander Bruy 	2012-05-13
 
     minor formatting fixes
 
-Merge: edaaddd e9ff072
+Merge: edaadddb2a e9ff072335
 alexbruy 	2012-05-13
 
     Merge pull request #140 from slarosa/master
@@ -96788,7 +163137,7 @@ Jean-Roc Morreale 	2012-05-06
 
     update fr strings
 
-Merge: 0dbf937 f60d40a
+Merge: 0dbf937ff9 f60d40aa10
 Tim Sutton 	2012-05-08
 
     Merge pull request #139 from etiennesky/zip_fixes
@@ -96858,7 +163207,7 @@ volayaf 	2012-05-07
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@170 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: be0e17b 301e320
+Merge: be0e17be31 301e3206f9
 Werner Macho 	2012-05-07
 
     Merge pull request #138 from Cracert/trans
@@ -96883,7 +163232,7 @@ Nathan Woodrow 	2012-05-07
 
     Remove old GCPs in georeferencer; clear image on close.  Fixes #4310
 
-Merge: 54eabf3 acd1643
+Merge: 54eabf300b acd16433e3
 Tim Sutton 	2012-05-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -96904,7 +163253,7 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@167 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: db1c3d9 1ad8700
+Merge: db1c3d9f4e 1ad8700cbd
 Werner Macho 	2012-05-06
 
     Merge pull request #136 from Jean-Roc/master
@@ -96937,7 +163286,7 @@ volayaf 	2012-05-06
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@166 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 0bf56ab 8c236a3
+Merge: 0bf56ab225 8c236a39a8
 Werner Macho 	2012-05-05
 
     Merge pull request #135 from Cracert/trans
@@ -96956,7 +163305,7 @@ Marco Hugentobler 	2012-05-05
 
     Save memory in raster rendering
 
-Merge: 99d41cf 43abddb
+Merge: 99d41cfa9d 43abddb630
 alexbruy 	2012-05-04
 
     Merge pull request #134 from artfwo/master
@@ -97069,14 +163418,14 @@ Nathan Woodrow 	2012-04-30
 
     Add convert to subclass for QgsGpsConnection for python bindings
 
-Merge: adb8390 a859c62
+Merge: adb8390158 a859c62062
 Tim Sutton 	2012-04-30
 
     Merge pull request #131 from etiennesky/zip_qml2
 
     [TEST][API]improved qml support for zip layers and more tests
 
-Merge: 69ef4de bba09a1
+Merge: 69ef4deba1 bba09a19f0
 Tim Sutton 	2012-04-30
 
     Merge pull request #133 from NathanW2/zoombug
@@ -97298,7 +163647,7 @@ Juergen E. Fischer 	2012-04-24
 
     quazip: fix warnings and drop OF macro
 
-Merge: 2978bfa cd408bc
+Merge: 2978bfa4ce cd408bc531
 Tim Sutton 	2012-04-24
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -97410,7 +163759,7 @@ volayaf 	2012-04-23
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@142 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 71d0e4d ed8c3a1
+Merge: 71d0e4dd19 ed8c3a1232
 Nathan Woodrow 	2012-04-22
 
     Merge pull request #129 from szekerest/master
@@ -97662,7 +164011,7 @@ Juergen E. Fischer 	2012-04-18
 
     debian packaging: run tests with xvfb and upload results to dashboard
 
-Merge: 7bd9240 4993675
+Merge: 7bd9240efd 49936755e0
 Tim Sutton 	2012-04-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -97687,7 +164036,7 @@ Tim Sutton 	2012-04-18
 
     Added zipped shp for testing zip driver
 
-Merge: ad39a42 0b082fb
+Merge: ad39a428e6 0b082fb766
 Tim Sutton 	2012-04-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -97748,12 +164097,12 @@ Juergen E. Fischer 	2012-04-18
 
     indentation update
 
-Merge: 70a2a4a 6248295
+Merge: 70a2a4a6fa 62482954f9
 Tim Sutton 	2012-04-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: fc373b3 e1c934a
+Merge: fc373b3bc5 e1c934af13
 Tim Sutton 	2012-04-17
 
     Merge pull request #127 from mhugo/copy_paste_styles
@@ -97768,7 +164117,7 @@ Hugo Mercier 	2012-04-15
 
     Implement basic copy/paste of styles between layers
 
-Merge: 213a1bc e5775e7
+Merge: 213a1bcb12 e5775e71d5
 Tim Sutton 	2012-04-17
 
     Merge pull request #114 from etiennesky/providers_browser2
@@ -97783,7 +164132,7 @@ Tim Sutton 	2012-04-17
 
     Added anomaly checks based on test run http://dash.orfeo-toolbox.org/testDetails.php?test=9375735&build=81442
 
-Merge: 2ad635a 7221eaa
+Merge: 2ad635a554 7221eaa1f3
 Tim Sutton 	2012-04-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -97796,7 +164145,7 @@ Tim Sutton 	2012-04-17
 
     Added anomaly for ubuntu 12.04 buffer render
 
-Merge: 205a4b3 506d829
+Merge: 205a4b3240 506d829ba2
 Tim Sutton 	2012-04-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98020,7 +164369,7 @@ Werner Macho 	2012-04-15
 
     small typo fixes for consistency
 
-Merge: e51dd2c a39d0b7
+Merge: e51dd2cc10 a39d0b7362
 Nathan Woodrow 	2012-04-15
 
     Merge pull request #126 from szekerest/master
@@ -98031,7 +164380,7 @@ szekerest 	2012-04-15
 
     MSSQL: Support non spatial tables in browser dock (fixes #5334)
 
-Merge: 8f6d941 9da981b
+Merge: 8f6d9418b2 9da981bf2a
 pcav 	2012-04-15
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98060,7 +164409,7 @@ Werner Macho 	2012-04-15
 
     translation update: all strings .. prepare 1.8
 
-Merge: c25a186 8332f32
+Merge: c25a18686a 8332f32014
 Tim Sutton 	2012-04-15
 
     Merge pull request #125 from lynxlynxlynx/master
@@ -98137,7 +164486,7 @@ Giuseppe Sucameli 	2012-04-15
 
     in import vector layer fix overwrite option and report provider errors
 
-Merge: dca998f 0dc5080
+Merge: dca998f4b0 0dc5080a99
 Tim Sutton 	2012-04-15
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98170,7 +164519,7 @@ Tim Sutton 	2012-04-14
 
     Don't use ugly old std::out to send info to CDash
 
-Merge: aab9976 847650e
+Merge: aab9976b55 847650e433
 Tim Sutton 	2012-04-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98203,7 +164552,7 @@ Tim Sutton 	2012-04-14
 
     Fixed bug with signal being emitted declaring layers were added but having a zero length layer list
 
-Merge: 4097ed5 5598082
+Merge: 4097ed5cbd 5598082c51
 Tim Sutton 	2012-04-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98230,7 +164579,7 @@ Werner Macho 	2012-04-14
 
     forgot danish language
 
-Merge: b995abf 6718000
+Merge: b995abf71a 6718000bea
 Tim Sutton 	2012-04-14
 
     Merged conflicts
@@ -98275,12 +164624,12 @@ Tim Sutton 	2012-04-14
 
     Fix wanings about duplicated grid layout
 
-Merge: a3fea94 5148d5f
+Merge: a3fea94d3f 5148d5f3f6
 Tim Sutton 	2012-04-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 8c3f2a1 0a2fdb6
+Merge: 8c3f2a1872 0a2fdb6d08
 Werner Macho 	2012-04-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98313,7 +164662,7 @@ Werner Macho 	2012-04-14
 
     inserting flags for language codes
 
-Merge: 4665ac0 fa07903
+Merge: 4665ac01f5 fa07903644
 Tim Sutton 	2012-04-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98364,7 +164713,7 @@ Tim Sutton 	2012-04-14
 
     Moved control images one per directory and updated render checker to generate paths and filenames more cleanly. All tests pass for me.
 
-Merge: cfcf12f 1e193c3
+Merge: cfcf12f121 1e193c32c2
 Tim Sutton 	2012-04-13
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98407,21 +164756,21 @@ julien.malik@gmail.com 	2012-04-13
 
     Merge pull request #121 from lynxlynxlynx/master
 
     fix for one abort and a few SIP compile warnings
 
-Merge: a65ded0 27fe004
+Merge: a65ded011f 27fe00467a
 Tim Sutton 	2012-04-13
 
     Merge pull request #117 from dakcarto/master
 
     Fix for source or build directory paths that contain spaces (on Mac).
 
-Merge: 7f29572 5310b5b
+Merge: 7f295723fd 5310b5bed0
 Tim Sutton 	2012-04-13
 
     Merge pull request #122 from mbernasocchi/android
@@ -98564,7 +164913,7 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@74 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 4da0c03 67c77e5
+Merge: 4da0c038b9 67c77e5532
 Tim Sutton 	2012-04-12
 
     Merged from master into raster resampler branch
@@ -98585,7 +164934,7 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@72 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: 67c77e5 be8f135
+Merge: 67c77e5532 be8f135abb
 Nathan Woodrow 	2012-04-12
 
     Merge pull request #118 from szekerest/master
@@ -98688,7 +165037,7 @@ Tim Sutton 	2012-04-08
 
     Replaced raster test images so all tests pass
 
-Merge: bbf471e 051749a
+Merge: bbf471eee7 051749a495
 Tim Sutton 	2012-04-08
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98725,7 +165074,7 @@ Tim Sutton 	2012-04-07
 
     Use more appropriate global for createFromId CRS test
 
-Merge: 8ae8e15 a82a243
+Merge: 8ae8e1596c a82a2438e1
 Tim Sutton 	2012-04-07
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98800,7 +165149,7 @@ Juergen E. Fischer 	2012-04-05
 
     indentation update
 
-Merge: d830d53 ae20835
+Merge: d830d537a6 ae20835d7b
 Tim Sutton 	2012-04-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -98976,7 +165325,7 @@ Marco Hugentobler 	2012-03-31
 
     Intendention update and remove legacy code
 
-Merge: c4aed92 dd9b98a
+Merge: c4aed92c62 dd9b98a1b3
 Marco Hugentobler 	2012-03-31
 
     Merge branch 'linear_referencing'
@@ -98997,21 +165346,21 @@ Juergen E. Fischer 	2012-03-31
 
     fix gcc 4.7 warnings/errors
 
-Merge: 401aea2 76ba1f6
+Merge: 401aea2a49 76ba1f6924
 Tim Sutton 	2012-03-31
 
     Merge pull request #112 from mbernasocchi/android
 
     Android goodies (touch maptool, with-touch mode, ui edits, ...)
 
-Merge: be4d125 8966899
+Merge: be4d125e3f 8966899d22
 Tim Sutton 	2012-03-31
 
     Merge pull request #111 from etiennesky/ftools1
 
     Ftools vector grid improvements
 
-Merge: 785f9ae 157541e
+Merge: 785f9ae0cc 157541ed2b
 Tim Sutton 	2012-03-31
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99152,7 +165501,7 @@ Tim Sutton 	2012-03-28
 
     [BACKPORT] Enable gdaltools by default on all platforms
 
-Merge: 5333b74 f375e35
+Merge: 5333b7479a f375e351f3
 Tim Sutton 	2012-03-28
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99197,7 +165546,7 @@ Marco Hugentobler 	2012-03-28
 
     Remove old SLD files in QGIS server
 
-Merge: 0ef88a2 145a184
+Merge: 0ef88a247a 145a18477b
 Marco Hugentobler 	2012-03-28
 
     Merge branch 'qgis_server_sld'
@@ -99220,7 +165569,7 @@ Giuseppe Sucameli 	2012-03-28
 
     Signed-off-by: Tim Sutton 
 
-Merge: c8ca7d7 516fc7e
+Merge: c8ca7d7401 516fc7eb2d
 Tim Sutton 	2012-03-28
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99243,7 +165592,7 @@ volayaf 	2012-03-27
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@54 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: eef6f53 04e8268
+Merge: eef6f538c0 04e826881a
 Tim Sutton 	2012-03-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99353,7 +165702,7 @@ Marco Hugentobler 	2012-03-23
 
     Add offset parameters to eventLayer functions
 
-Merge: 51ece3c f2f65d1
+Merge: 51ece3c0c4 f2f65d1d79
 Nathan Woodrow 	2012-03-23
 
     Merge MS SQL provider support.  Funded by Digital Mapping Solutions (Australia) completed by Tamas Szekeres
@@ -99640,7 +165989,7 @@ Juergen E. Fischer 	2012-03-08
 
     debian packageing update: add globe plugin to ubuntu precise
 
-Merge: d3f5eb2 dabd59b
+Merge: d3f5eb2684 dabd59b134
 pcav 	2012-03-08
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99801,7 +166150,7 @@ Tim Sutton 	2012-03-02
 
     [BACKPORT] added more missing python bindings for composer api
 
-Merge: 32be114 ad955e2
+Merge: 32be114f76 ad955e26bf
 Tim Sutton 	2012-03-02
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99822,7 +166171,7 @@ Alexander Bruy 	2012-03-01
 
     fix geometry column export when used calculation on ellipsoid
 
-Merge: 643db0e 8459b58
+Merge: 643db0e328 8459b5834f
 Tim Sutton 	2012-03-01
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99845,7 +166194,7 @@ Marco Hugentobler 	2012-02-29
 
     Remove comment
 
-Merge: 9a9ab73 139821d
+Merge: 9a9ab73b61 139821dc15
 Marco Hugentobler 	2012-02-29
 
     Merge branch 'curve_offset'
@@ -99866,7 +166215,7 @@ Tim Sutton 	2012-02-28
 
     [BACKPORT] Nicer api for composer item frames and carry docs through to sip.
 
-Merge: c1b268c cda3693
+Merge: c1b268c2d5 cda3693d58
 Tim Sutton 	2012-02-28
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -99890,7 +166239,7 @@ volayaf@gmail.com 	2012-
 
     git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@24 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
 
-Merge: c42f094 a90e3e9
+Merge: c42f0945d4 a90e3e9262
 Tim Sutton 	2012-02-24
 
     Merge pull request #96 from mbernasocchi/android
@@ -100037,7 +166386,7 @@ Marco Hugentobler 	2012-02-20
 
     Add type name to renderers. Restore the corresponding renderer widget in raster properties
 
-Merge: b90d550 6fab61a
+Merge: b90d550da3 6fab61a3e4
 Nathan Woodrow 	2012-02-20
 
     Merge pull request #99 from spilth/master
@@ -100104,14 +166453,14 @@ Marco Hugentobler 	2012-02-18
 
     Delete feature if add polygon not successfull
 
-Merge: cd509e6 974fe95
+Merge: cd509e612c 974fe9531b
 mhugent 	2012-02-17
 
     Merge pull request #98 from lynxlynxlynx/master
 
     a crash fix and a tiny cleanup
 
-Merge: 2001249 46ba390
+Merge: 200124916d 46ba39082a
 Marco Hugentobler 	2012-02-17
 
     Merge branch 'raster_resampler' of github.com:mhugent/Quantum-GIS into raster_resampler
@@ -100435,7 +166784,7 @@ Juergen E. Fischer 	2012-02-08
 
     heatmap plugin: fix menu removal
 
-Merge: 36a69af a080538
+Merge: 36a69afc43 a080538aec
 Tim Sutton 	2012-02-08
 
     Merge changes from QGIS upstream
@@ -100448,12 +166797,12 @@ Alexander Bruy 	2012-02-08
 
     enable Toggle editing button depending on layer type (fix #4965)
 
-Merge: 093aae5 2b07e3d
+Merge: 093aae5611 2b07e3dfe8
 Alexander Bruy 	2012-02-08
 
     Merge remote-tracking branch 'upstream/master'
 
-Merge: 2a7ac93 b7994f1
+Merge: 2a7ac93636 b7994f1468
 pcav 	2012-02-08
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -100547,7 +166896,7 @@ Marco Hugentobler 	2012-02-06
 
     Consider svg parameters for svg fill
 
-Merge: ccf3af7 886ed10
+Merge: ccf3af763a 886ed107b4
 Jürgen Fischer 	2012-02-05
 
     Merge pull request #92 from Jean-Roc/master
@@ -100574,14 +166923,14 @@ Juergen E. Fischer 	2012-02-05
 
     indentation update
 
-Merge: c933dce 1be0e87
+Merge: c933dce209 1be0e877a8
 Nathan Woodrow 	2012-02-05
 
     Merge pull request #91 from szekerest/master
 
     Improve the support for OGR/MSSQL driver
 
-Merge: 876b8c7 c933dce
+Merge: 876b8c7e46 c933dce209
 szekerest 	2012-02-05
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -100893,7 +167242,7 @@ pcav 	2012-01-27
 
     Fixed v.in.region GRASS module to accept lines.
 
-Merge: 3c33cf8 41e70d5
+Merge: 3c33cf8f98 41e70d5adc
 pcav 	2012-01-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -101010,13 +167359,13 @@ Martin Dobias 	2012-01-24
 
     Fixed symbol levels dialog
 
-Merge: 0b1fd34 1c3c02f
+Merge: 0b1fd34c3e 1c3c02f832
 Martin Dobias 	2012-01-24
 
     [FEATURE] Merge branch 'rules' - new rule-based rendering
 
     Conflicts:
-src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
+            src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
 
 Martin Dobias 	2012-01-24
 
@@ -101060,7 +167409,7 @@ Martin Dobias 	2012-01-23
 
     Drag'n'drop for rules, rule does not need a symbol
 
-Merge: fbc4308 26ca493
+Merge: fbc43080ac 26ca4932a1
 Werner Macho 	2012-01-23
 
     Merge pull request #87 from Jean-Roc/master
@@ -101257,7 +167606,7 @@ Marco Hugentobler 	2012-01-18
 
     Support replacement of layer names in GetFeatureInfo with the elements WMSFeatureInfoAliasLayers and WMSFeatureInfoLayerAliases
 
-Merge: 5155176 619083a
+Merge: 5155176eac 619083a264
 Nathan Woodrow 	2012-01-19
 
     Merge branch 'field-calc-4814'
@@ -101309,7 +167658,7 @@ Sergey Yakushev 	2012-01-17
 
     RoadGraph: add dijkstra method to Network analysis library, remove unused shortestpath, update python bindings
 
-Merge: c56d02f 3ba2fe9
+Merge: c56d02fb66 3ba2fe9d04
 Sergey Yakushev 	2012-01-17
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -101361,7 +167710,7 @@ Radim Blazek 	2012-01-15
 
     unset QgsMapRenderer mCachedTrForLayer on setDestinationCrs and always check layer->crs against mCachedTr destCRS
 
-Merge: aa323ae a6df30c
+Merge: aa323aea12 a6df30c99f
 Sergey Yakushev 	2012-01-15
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -101379,7 +167728,7 @@ Juergen E. Fischer 	2012-01-14
 
     fix #4812
 
-Merge: 1f0341c 8930633
+Merge: 1f0341cdc1 89306335ae
 Sergey Yakushev 	2012-01-15
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -101500,7 +167849,7 @@ Sergey Yakushev 	2012-01-08
 
     RoadGraph: fix export tool.
 
-Merge: 47ca431 878b048
+Merge: 47ca43136c 878b04843d
 Marco Hugentobler 	2012-01-12
 
     Merge branch 'relief'
@@ -101509,7 +167858,7 @@ Marco Hugentobler 	2012-01-12
 
     Reapply cosmetical changes
 
-Merge: 92de863 35eded8
+Merge: 92de863c77 35eded8fde
 mhugent 	2012-01-12
 
     Merge pull request #85 from mbernasocchi/android
@@ -101611,7 +167960,7 @@ Marco Bernasocchi 	2012-01-11
 
     fixing execinfo.h no such file or directory on android
 
-Merge: 325df26 f7d80e5
+Merge: 325df2697b f7d80e5d6e
 Nathan Woodrow 	2012-01-10
 
     Merge pull request #84 from mbernasocchi/android
@@ -101664,7 +168013,7 @@ Sandro Santilli 	2012-01-09
 
     Use ST_MakeEnvelope with PostGIS 2.0+ to build query rectangle
 
-Merge: 838ac1d efb7fad
+Merge: 838ac1d9ad efb7fade3c
 Tim Sutton 	2012-01-10
 
     Merge pull request #74 from mbernasocchi/android
@@ -101823,13 +168172,13 @@ Marco Hugentobler 	2012-01-06
 
     Single band pseudo color renderer
 
-Merge: abcd193 3f73c85
+Merge: abcd193b0f 3f73c859c3
 Marco Bernasocchi 	2012-01-05
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into android
 
     Conflicts:
-src/ui/qgsnewspatialitelayerdialogbase.ui
+            src/ui/qgsnewspatialitelayerdialogbase.ui
 
 Marco Hugentobler 	2012-01-05
 
@@ -101913,7 +168262,7 @@ Juergen E. Fischer 	2012-01-02
 
     fix #4736
 
-Merge: ffa2cfd 1d6d296
+Merge: ffa2cfdf2b 1d6d2961df
 Werner Macho 	2012-01-02
 
     Merge pull request #80 from Jean-Roc/master
@@ -101956,7 +168305,7 @@ Marco Hugentobler 	2011-12-30
 
     Provide convenience function to draw image parts for raster renderer
 
-Merge: de48504 3c9d1a3
+Merge: de4850457c 3c9d1a3f74
 Nathan Woodrow 	2011-12-30
 
     Merge branch 'master' into expression-builder-highlighter
@@ -102090,7 +168439,7 @@ Marco Hugentobler 	2011-12-27
 
     Improve incremental WFS fetch. Patch from Bill Clay from ticket 4604
 
-Merge: bdd33b3 ba2a205
+Merge: bdd33b3048 ba2a205fac
 William Kyngesburye 	2011-12-26
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102290,7 +168639,7 @@ Radim Blazek 	2011-12-20
 
     reload default color table
 
-Merge: 9f8f86d 8f31f24
+Merge: 9f8f86db5e 8f31f244f1
 Gary Sherman 	2011-12-20
 
     Merge pull request #75 from g-sherman/master
@@ -102432,7 +168781,7 @@ Marco Hugentobler 	2011-12-16
 
     Added title / abstract to python bindings
 
-Merge: c336eca dcae360
+Merge: c336eca8a7 dcae36009e
 Marco Hugentobler 	2011-12-16
 
     Merge branch 'wms_layer_title_abstract'
@@ -102490,7 +168839,7 @@ Alexander Bruy 	2011-12-13
 
     [BACKPORT] use native separators in filename edit widget (fix #2992)
 
-Merge: 8bdf404 3f14ea8
+Merge: 8bdf4041b6 3f14ea8888
 Sergey Yakushev 	2011-12-13
 
     Merge remote branch 'pb/master'
@@ -102499,7 +168848,7 @@ Marco Hugentobler 	2011-12-13
 
     Avoid warnings
 
-Merge: 700e6b4 05fd598
+Merge: 700e6b42e6 05fd5983f0
 Marco Hugentobler 	2011-12-13
 
     Merge branch 'wfs_filter'
@@ -102508,7 +168857,7 @@ Marco Hugentobler 	2011-12-12
 
     Don't forget to send server response if in release mode
 
-Merge: bca3f93 a9616b3
+Merge: bca3f934c0 a9616b3aed
 Werner Macho 	2011-12-11
 
     Merge pull request #72 from Jean-Roc/master
@@ -102543,7 +168892,7 @@ Alexander Bruy 	2011-12-10
 
     [BACKPORT] mark project dirty when added or removed composer (fix #3577)
 
-Merge: e154f69 c7db7da
+Merge: e154f692c4 c7db7dac02
 Radim Blazek 	2011-12-10
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102552,7 +168901,7 @@ Radim Blazek 	2011-12-10
 
     #3576 fix, load default raster style
 
-Merge: 315bd85 13fdca8
+Merge: 315bd8541a 13fdca8f30
 Werner Macho 	2011-12-10
 
     Merge pull request #71 from Cracert/master
@@ -102585,7 +168934,7 @@ Marco Hugentobler 	2011-12-09
 
     Support writing filters by hand, remove namespace from filter element, better comments
 
-Merge: 6fbad32 a6746f1
+Merge: 6fbad32b6b a6746f1401
 Tim Sutton 	2011-12-09
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102629,7 +168978,7 @@ Marco Hugentobler 	2011-12-08
 
     Filter export for operators AND / OR
 
-Merge: a74d82d f1c4d53
+Merge: a74d82d013 f1c4d535f3
 marco 	2011-12-07
 
     Merge branch 'composeritem_xml'
@@ -102698,7 +169047,7 @@ Tim Sutton 	2011-12-06
 
     Added more debugging info to wms server. Also when compiled in debug mode, it will write the last rendered image out to the system temp dir (overwriting it with each render)
 
-Merge: 5b6b293 0c39be6
+Merge: 5b6b29326b 0c39be62fe
 Tim Sutton 	2011-12-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102733,14 +169082,14 @@ Alexander Bruy 	2011-12-05
     [BACKPORT] run Split vector layer tool in separate thread to prevent UI
     blocking
 
-Merge: d38a0bc 5151b2a
+Merge: d38a0bcbbb 5151b2a82a
 Tim Sutton 	2011-12-04
 
     Merge pull request #68 from mbernasocchi/android
 
     [BP18] Android adaptations
 
-Merge: f9f4860 d38a0bc
+Merge: f9f486072f d38a0bcbbb
 Tim Sutton 	2011-12-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102749,7 +169098,7 @@ Werner Macho 	2011-12-04
 
     translation update: mn by Bayarmaa
 
-Merge: e2dac54 f00785f
+Merge: e2dac54ef8 f00785fc85
 Werner Macho 	2011-12-04
 
     Merge pull request #70 from Jean-Roc/master
@@ -102781,12 +169130,12 @@ Alexander Bruy 	2011-12-02
 
     [BACKORT] move Add attribute button in New vector layer dialog (fix #2749) and some other minor UI fixes
 
-Merge: ad8ae1b 335dbf1
+Merge: ad8ae1bda8 335dbf1631
 Tim Sutton 	2011-12-02
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 7c128e1 c63b149
+Merge: 7c128e118b c63b14976a
 Tim Sutton 	2011-12-01
 
     Merge pull request #69 from NathanW2/ui-tweaks
@@ -102821,7 +169170,7 @@ Tim Sutton 	2011-11-30
     This reverts commit 78ce3cdc84b79dbec5d227db9ee14af6edf9af66, reversing
     changes made to 2414a3abbc97483a5355c262a96c4fc353566bcb.
 
-Merge: 2414a3a 763caa7
+Merge: 2414a3abbc 763caa71f6
 Tim Sutton 	2011-11-30
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS into qgis-master
@@ -102834,7 +169183,7 @@ Tim Sutton 	2011-11-30
 
     [UI] put wms options for project properties into a scroll widget so dialog can be resized vertically
 
-Merge: 2bd2d84 8e4e8e1
+Merge: 2bd2d84e08 8e4e8e147c
 Tim Sutton 	2011-11-30
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102862,7 +169211,7 @@ Juergen E. Fischer 	2011-11-30
 
     legend order: add checkboxes to control whether the legend or the layer order controls render order
 
-Merge: ce80710 376d45b
+Merge: ce807107c9 376d45b0dd
 Marco BErnasocchi 	2011-11-29
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android
@@ -102875,7 +169224,7 @@ Juergen E. Fischer 	2011-11-29
 
     remove superfluous closing parenthesis
 
-Merge: 2bd2d84 4b86c71
+Merge: 2bd2d84e08 4b86c710e9
 Tim Sutton 	2011-11-29
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -102888,7 +169237,7 @@ Marco BErnasocchi 	2011-11-29
 
     cleaning up for pull request
 
-Merge: 249d889 4b86c71
+Merge: 249d8892b1 4b86c710e9
 Marco BErnasocchi 	2011-11-29
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android
@@ -102905,12 +169254,12 @@ marco 	2011-11-28
 
     [FEATURE]: alignment (left/middle/right) for composer scale bar to keep bar position when zooming
 
-Merge: 1b6e10d a5b9f92
+Merge: 1b6e10d25c a5b9f92d4e
 Tim Sutton 	2011-11-27
 
     Resolved merge conflicts
 
-Merge: 476df40 32ad063
+Merge: 476df4047d 32ad063de0
 Tim Sutton 	2011-11-27
 
     Merge pull request #67 from NathanW2/projection-ui
@@ -102929,12 +169278,12 @@ Juergen E. Fischer 	2011-11-27
 
     more log messages and auto-resize cells
 
-Merge: 301d207 191fb22
+Merge: 301d20717d 191fb223fb
 Tim Sutton 	2011-11-27
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
 
-Merge: 545e9a4 bae8301
+Merge: 545e9a4b59 bae83014a7
 Tim Sutton 	2011-11-27
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103057,29 +169406,29 @@ Sergey Yakushev 	2011-11-25
 
     fix QgsGraphAnalyzer: a bad result if the source is a symmetric graph
 
-Merge: 39a039d 898604d
+Merge: 39a039d140 898604dbb4
 Tim Sutton 	2011-11-25
 
     Resolved merge conflicts
 
-Merge: 5b9cc5c 898604d
+Merge: 5b9cc5cfaf 898604dbb4
 Marco BErnasocchi 	2011-11-25
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android
 
-Merge: dde7032 898604d
+Merge: dde70324a8 898604dbb4
 Tim Sutton 	2011-11-24
 
     Resolved merge conflicts
 
-Merge: 23ce247 d3e913c
+Merge: 23ce247f1c d3e913ce23
 Martin Dobias 	2011-11-24
 
     Merge pull request #56 from NathanW2/function_help
 
     Handle function help the same way as context help; Allows easier management of function help texts
 
-Merge: c02ccc9 9048107
+Merge: c02ccc9ce3 9048107253
 Tim Sutton 	2011-11-24
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103096,7 +169445,7 @@ Juergen E. Fischer 	2011-11-24
 
     fix crash when project is not yet saved
 
-Merge: 52eb8fd dde7032
+Merge: 52eb8fd7be dde70324a8
 Tim Sutton 	2011-11-24
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -103135,7 +169484,7 @@ Tim Sutton 	2011-11-22
 
     Further updates to flot histogram implementation - added legend and try to map colours more intelligently
 
-Merge: 6191319 376adc4
+Merge: 6191319ac9 376adc4dab
 Tim Sutton 	2011-11-22
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103144,14 +169493,14 @@ Juergen E. Fischer 	2011-11-22
 
     emulate getrusage(2) on windows (borought from PostgreSQL)
 
-Merge: 1b3c383 a0dad9c
+Merge: 1b3c383aba a0dad9c4f6
 Tim Sutton 	2011-11-22
 
     Merge pull request #59 from NathanW2/window_theme
 
     [FEATURE] Allow the user to select the Qt windows style they want
 
-Merge: ec7e159 b6d986c
+Merge: ec7e159b0f b6d986c8e8
 Tim Sutton 	2011-11-22
 
     Merge pull request #66 from rduivenvoorde/projection-ui
@@ -103190,7 +169539,7 @@ Sergey Yakushev 	2011-11-21
 
     fix Road graph plugin: enable geometry type filter
 
-Merge: 555e028 7f1ca27
+Merge: 555e028e73 7f1ca27900
 Tim Sutton 	2011-11-20
 
     Merge pull request #64 from rouault/master
@@ -103237,7 +169586,7 @@ Juergen E. Fischer 	2011-11-18
 
     make relative paths default
 
-Merge: 8f33367 d6ffb81
+Merge: 8f33367ffd d6ffb8106e
 Giuseppe Sucameli 	2011-11-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103266,7 +169615,7 @@ Giuseppe Sucameli 	2011-11-17
 
     fix #4465 to make the GRASS plugin working with GRASS 6.4.2RC2
 
-Merge: aabfdf9 0a17ad5
+Merge: aabfdf9d88 0a17ad5287
 Nathan Woodrow 	2011-11-17
 
     Merge upstream/master; fix conflicts
@@ -103283,7 +169632,7 @@ Juergen E. Fischer 	2011-11-17
 
     fix windows build
 
-Merge: 608e7d0 00e0a61
+Merge: 608e7d05ba 00e0a61c02
 Werner Macho 	2011-11-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103308,7 +169657,7 @@ Tim Sutton 	2011-11-17
 
     Added make check command for Sandro Santilli and other gnu make officianados
 
-Merge: 483a8d8 c585a49
+Merge: 483a8d8154 c585a49feb
 Tim Sutton 	2011-11-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103333,7 +169682,7 @@ Alexander Bruy 	2011-11-16
 
     fix build error introduced in ed13141b67
 
-Merge: f0d6cea 275585c
+Merge: f0d6cea53f 275585cf83
 Werner Macho 	2011-11-16
 
     Merge remote-tracking branch 'upstream/master'
@@ -103398,7 +169747,7 @@ Tim Sutton 	2011-11-14
 
     Further updates to the unit tests - still not all passing yet
 
-Merge: e54680d f0839fb
+Merge: e54680dbdd f0839fb350
 Tim Sutton 	2011-11-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103415,7 +169764,7 @@ Tim Sutton 	2011-11-14
 
     Enable tests by default
 
-Merge: 9adb57e cf84987
+Merge: 9adb57ebae cf849875a2
 Tim Sutton 	2011-11-13
 
     Merge pull request #61 from rduivenvoorde/cf849875
@@ -103448,7 +169797,7 @@ Juergen E. Fischer 	2011-11-13
 
     german translation update
 
-Merge: 27e770a d52c510
+Merge: 27e770a502 d52c510eaa
 pcav 	2011-11-13
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103457,7 +169806,7 @@ marco 	2011-11-13
 
     WMS server: support relative pathes to spatialite dbs
 
-Merge: 76244bc f8bbe8f
+Merge: 76244bc59c f8bbe8fb70
 Marco Bernasocchi 	2011-11-13
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into android
@@ -103487,7 +169836,7 @@ Tim Sutton 	2011-11-13
 
     Updated version number and splash for master branch
 
-Merge: 1148aaf 33b7e31
+Merge: 1148aaf72e 33b7e314bc
 Tim Sutton 	2011-11-13
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103504,7 +169853,7 @@ Alexander Bruy 	2011-11-12
 
     [BACKPORT] fix holes in Union output (fix #3581)
 
-Merge: ce8c75f e115975
+Merge: ce8c75ff6c e115975037
 Werner Macho 	2011-11-12
 
     Merge pull request #58 from Jean-Roc/master
@@ -103523,7 +169872,7 @@ Juergen E. Fischer 	2011-11-12
 
     german translation update
 
-Merge: cf7b989 d3fe194
+Merge: cf7b989a7e d3fe1941fd
 Tim Sutton 	2011-11-12
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103563,7 +169912,7 @@ marco 	2011-11-12
 
     sld parser in qgis server is still on old symbology
 
-Merge: 8422a9d 05edbed
+Merge: 8422a9da4f 05edbedc5e
 Werner Macho 	2011-11-12
 
     Merge pull request #57 from Jean-Roc/master
@@ -103614,12 +169963,12 @@ Juergen E. Fischer 	2011-11-09
 
     put spatialindex header directory in front of GEOS
 
-Merge: 52a3009 eda69e6
+Merge: 52a30097fa eda69e6ffe
 Sergey Yakushev 	2011-11-09
 
     Merge remote branch 'pb/master'
 
-Merge: c37b63a 98d5a76
+Merge: c37b63a83f 98d5a7665c
 Giuseppe Sucameli 	2011-11-09
 
     Merge remote-tracking branch 'brushtyler/master'
@@ -103714,7 +170063,7 @@ Martin Dobias 	2011-11-04
 
     Fix #4495 - patch by Nathan
 
-Merge: 5be1d74 15174da
+Merge: 5be1d744d0 15174da710
 Werner Macho 	2011-11-04
 
     Merge pull request #55 from mach0/master
@@ -103745,7 +170094,7 @@ Martin Dobias 	2011-11-02
 
     Add default gradient ColorBrewer color ramps from Anita
 
-Merge: 650605f 9e809f3
+Merge: 650605f62e 9e809f397a
 Martin Dobias 	2011-11-02
 
     Merge pull request #54 from NathanW2/expression-ui
@@ -103768,7 +170117,7 @@ Nathan Woodrow 	2011-11-01
 
     Added icons for save and load buttons; Open and Save buttons hiden for now
 
-Merge: 7d480b9 68f7d57
+Merge: 7d480b965a 68f7d57d3a
 Marco Hugentobler 	2011-11-02
 
     [FEATURE]: added vector field symbol layer to visualise displacement. Changed ellipse symbol layer to resolve field indices in startRender method
@@ -103805,7 +170154,7 @@ Nathan Woodrow 	2011-10-31
 
     Move help above field values, less movement in Ui for user;add save and open button
 
-Merge: e9ee865 50f20c2
+Merge: e9ee865f78 50f20c2c20
 Tim Sutton 	2011-10-31
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103814,7 +170163,7 @@ Tim Sutton 	2011-10-31
 
     [BACKPORT] apply fix to invalid reference to trac #4440
 
-Merge: 1a1f5eb 8154103
+Merge: 1a1f5ebe30 8154103176
 Tim Sutton 	2011-10-31
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -103827,7 +170176,7 @@ Martin Dobias 	2011-10-31
 
     Fix #4444. Patch by Vaclav Petras
 
-Merge: ed20ff3 a739750
+Merge: ed20ff3687 a739750e45
 Martin Dobias 	2011-10-31
 
     Merge pull request #53 from NathanW2/expression-labels-patch
@@ -103862,7 +170211,7 @@ Nathan Woodrow 	2011-10-29
 
     Remove debug noise for expression labels
 
-Merge: 0d79669 05e3258
+Merge: 0d79669f7d 05e3258ce8
 Tim Sutton 	2011-10-28
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103903,7 +170252,7 @@ Marco Hugentobler 	2011-10-25
 
     Set prompt as default behaviour for unknown CRS
 
-Merge: 513f1c3 1a1f5eb
+Merge: 513f1c3959 1a1f5ebe30
 Tim Sutton 	2011-10-24
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -103962,7 +170311,7 @@ Martin Dobias 	2011-10-21
     The newly created "provider-specific" option group may be used by other providers
     for some custom actions ("create spatial index" should move here, too)
 
-Merge: bd5a31b b0112f1
+Merge: bd5a31b51e b0112f1c42
 Martin Dobias 	2011-10-21
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -103971,12 +170320,12 @@ Martin Dobias 	2011-10-21
 
     Fixed a typo, added GUI_EXPORT
 
-Merge: 2ef1772 b0112f1
+Merge: 2ef1772f08 b0112f1c42
 Tim Sutton 	2011-10-21
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 5e45bda b62daee
+Merge: 5e45bda419 b62daee5cb
 Tim Sutton 	2011-10-20
 
     Merge pull request #52 from brushtyler/raster-transparency
@@ -103987,7 +170336,7 @@ Martin Dobias 	2011-10-20
 
     Fix indentation
 
-Merge: 3a15509 665e92e
+Merge: 3a15509b7c 665e92e4ef
 Martin Dobias 	2011-10-20
 
     Merge branch 'master', remote-tracking branch 'nathan/expression-labels'
@@ -104044,14 +170393,14 @@ Martin Dobias 	2011-10-18
 
     Show full path of gdal/ogr layers as a tooltip (#4399)
 
-Merge: fc80b60 139e297
+Merge: fc80b6023f 139e297374
 Nathan Woodrow 	2011-10-18
 
     Merge remote-tracking branch 'upstream/master' into expression-labels
 
     Conflicts:
-src/core/qgsexpression.cpp
-src/gui/CMakeLists.txt
+            src/core/qgsexpression.cpp
+            src/gui/CMakeLists.txt
 
 Nathan Woodrow 	2011-10-18
 
@@ -104073,7 +170422,7 @@ Nathan Woodrow 	2011-10-17
 
     Revert CMakeList to normal
 
-Merge: 93c2fec 3996d89
+Merge: 93c2fecfdd 3996d89aa1
 pcav 	2011-10-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104118,12 +170467,12 @@ marco 	2011-10-15
 
     WMS server: avoid reading layer symbology if the request does not come from SLD
 
-Merge: 10d81dd fb6d551
+Merge: 10d81dd743 fb6d5512a4
 marco 	2011-10-15
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 4e6f83b 0d187bf
+Merge: 4e6f83b3cd 0d187bf2a4
 Nathan Woodrow 	2011-10-15
 
     Merge branch 'expression-labels' of github.com:NathanW2/Quantum-GIS into expression-labels
@@ -104148,7 +170497,7 @@ Martin Dobias 	2011-10-13
 
     Refresh item also when it had no children (they could be added in meanwhile)
 
-Merge: 8154103 f8ed801
+Merge: 8154103176 f8ed801dae
 Tim Sutton 	2011-10-14
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104276,19 +170625,19 @@ Juergen E. Fischer 	2011-10-07
 
     fix warning
 
-Merge: f09417d dd6a594
+Merge: f09417dbfc dd6a594178
 Giuseppe Sucameli 	2011-10-07
 
     Merge remote-tracking branch 'brushtyler/master'
 
     Conflicts:
-src/providers/postgres/qgspostgresprovider.cpp
+            src/providers/postgres/qgspostgresprovider.cpp
 
 Giuseppe Sucameli 	2011-10-07
 
     [FEATURE] Make the gdaltools command editable to fix #3041
 
-Merge: 7e059af f09417d
+Merge: 7e059aff9e f09417dbfc
 Tim Sutton 	2011-10-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104313,13 +170662,13 @@ Tim Sutton 	2011-10-04
 
     Dont use gdal c++ api. Also gdal drivers now unloaded without restart
 
-Merge: 87c6742 3f70d32
+Merge: 87c6742d77 3f70d32e85
 Sergey Yakushevs 	2011-10-04
 
     Merge remote branch 'pb/master'
 
     Conflicts:
-src/plugins/roadgraph/linevectorlayerdirector.cpp
+            src/plugins/roadgraph/linevectorlayerdirector.cpp
 
 Martin Dobias 	2011-10-03
 
@@ -104393,7 +170742,7 @@ Juergen E. Fischer 	2011-09-30
 
     indentation update - please use prepare-commit.sh
 
-Merge: a2713fd a950830
+Merge: a2713fd0ed a950830dcf
 mhugent 	2011-09-30
 
     Merge pull request #49 from stopa85/network-analysis
@@ -104426,7 +170775,7 @@ Tim Sutton 	2011-09-29
 
     Another valiant attempt at spurious changelog suppression.
 
-Merge: 7f3e956 3cac713
+Merge: 7f3e9560fc 3cac713cc3
 Tim Sutton 	2011-09-29
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104443,7 +170792,7 @@ Marco Hugentobler 	2011-09-28
 
     Add feature bounding box to GetFeatureInfo response if invoked with filter and without x/y coordinates
 
-Merge: 224f0e3 7f57de0
+Merge: 224f0e3779 7f57de020b
 mhugent 	2011-09-27
 
     Merge pull request #48 from linz/wfs_layer_sort
@@ -104454,19 +170803,19 @@ Sergey Yakushevs 	2011-09-27
 
     fix QgsArc.in() python-binding
 
-Merge: af91b48 224f0e3
+Merge: af91b48805 224f0e3779
 Sergey Yakushevs 	2011-09-27
 
     Merge remote branch 'pb/master' into network-analysis
 
     Conflicts:
-python/CMakeLists.txt
-src/analysis/network/qgsgraphbuilder.h
-src/plugins/roadgraph/graphbuilder.h
-src/plugins/roadgraph/linevectorlayerdirector.cpp
-src/plugins/roadgraph/simplegraphbuilder.cpp
-src/plugins/roadgraph/utils.cpp
-src/plugins/roadgraph/utils.h
+            python/CMakeLists.txt
+            src/analysis/network/qgsgraphbuilder.h
+            src/plugins/roadgraph/graphbuilder.h
+            src/plugins/roadgraph/linevectorlayerdirector.cpp
+            src/plugins/roadgraph/simplegraphbuilder.cpp
+            src/plugins/roadgraph/utils.cpp
+            src/plugins/roadgraph/utils.h
 
 Nathan Woodrow 	2011-09-26
 
@@ -104489,7 +170838,7 @@ Tim Sutton 	2011-09-25
 
     Restore override cursor when about box is shown
 
-Merge: 93a190a a0f8294
+Merge: 93a190a382 a0f8294ce6
 Tim Sutton 	2011-09-25
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104498,7 +170847,7 @@ Tim Sutton 	2011-09-25
 
     Fix some more merge confglicts after merging updates from 1.7 brnach
 
-Merge: 2831968 b54f668
+Merge: 28319682f3 b54f668e4b
 Tim Sutton 	2011-09-24
 
     Merge branch 'master' of ../Quantum-GIS
@@ -104549,7 +170898,7 @@ Jeremy Palmer 	2011-09-22
 
     Added sorting to WFS layer tree grid widget
 
-Merge: 8a9da0f 820469f
+Merge: 8a9da0f227 820469f4b1
 marco 	2011-09-20
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104594,13 +170943,13 @@ Giuseppe Sucameli 	2011-09-15
 
     mark some methods as deprecated
 
-Merge: 7093b06 37b2c04
+Merge: 7093b06793 37b2c045c7
 Giuseppe Sucameli 	2011-09-15
 
     [FEATURE] Import a vector layer from a datasource to a different one
     Merge of another part of my Summer of Code work (remote-tracking branch 'brushtyler/import_layer')
 
-Merge: 262ec3f 37b2c04
+Merge: 262ec3f8f5 37b2c045c7
 Giuseppe Sucameli 	2011-09-15
 
     Merge branch 'import_layer'
@@ -104617,7 +170966,7 @@ pcav 	2011-09-14
 
     Minor IT GUI translation improvements
 
-Merge: f2b6876 6eb406b
+Merge: f2b6876085 6eb406b122
 Giuseppe Sucameli 	2011-09-13
 
     merge import_layer branch
@@ -104626,7 +170975,7 @@ Tim Sutton 	2011-09-13
 
     Added unit test for GDAL_SKIP stuff
 
-Merge: 9076461 f2b6876
+Merge: 907646164c f2b6876085
 Tim Sutton 	2011-09-13
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104698,7 +171047,7 @@ Martin Dobias 	2011-09-06
 
     Fix #4266 - georeferencer and spatial query crashing on exit
 
-Merge: cfedf09 f932140
+Merge: cfedf09592 f93214052b
 Martin Dobias 	2011-09-06
 
     [FEATURE] PostGIS connections and layer now available from browser
@@ -104717,7 +171066,7 @@ Marco Hugentobler 	2011-09-06
 
     Add zero pointer checks to avoid segfaults
 
-Merge: cc8deb9 c2cf5cb
+Merge: cc8deb9a42 c2cf5cba11
 pcav 	2011-09-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -104738,7 +171087,7 @@ pcav 	2011-09-05
 
     More consistency in WFS plugin IT translation
 
-Merge: 4312197 68b91fa
+Merge: 431219744a 68b91fa590
 Martin Dobias 	2011-09-05
 
     Merge pull request #42 from rduivenvoorde/master
@@ -104789,7 +171138,7 @@ Marco Hugentobler 	2011-09-01
 
     Small efficiency improvement for rendering
 
-Merge: 706b6f1 7deb0c9
+Merge: 706b6f154f 7deb0c977c
 Nathan 	2011-08-31
 
     Merge remote-tracking branch 'upstream/master' into expression-labels-merge-wonder
@@ -104798,13 +171147,13 @@ marco 	2011-08-30
 
     WMS server: report crs systems in the order given in the project
 
-Merge: 1e7c8a7 bc09ab3
+Merge: 1e7c8a7ec7 bc09ab3539
 Martin Dobias 	2011-08-30
 
     Merge remote-tracking branch 'remotes/giuseppe/dataitems' into dataitems
 
     Conflicts:
-src/app/CMakeLists.txt
+            src/app/CMakeLists.txt
 
 Martin Dobias 	2011-08-30
 
@@ -104814,12 +171163,12 @@ Martin Dobias 	2011-08-30
 
     Raised minimal Bison version to 2.4 (for QgsExpression). Fixed bison version detection.
 
-Merge: 6c0f56c 5e4e4f7
+Merge: 6c0f56cc14 5e4e4f7a6d
 Marco Hugentobler 	2011-08-30
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 26aa007 03c13ad
+Merge: 26aa007f0c 03c13add29
 Marco Hugentobler 	2011-08-30
 
     Merge linepattern offset
@@ -104868,7 +171217,7 @@ Martin Dobias 	2011-08-27
 
     Fixed build error
 
-Merge: a0b8e3c 96f7736
+Merge: a0b8e3c9e9 96f7736021
 Werner Macho 	2011-08-27
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS
@@ -104877,7 +171226,7 @@ Werner Macho 	2011-08-27
 
     translation: fixed some german typos
 
-Merge: 260bf0c 25ff28a
+Merge: 260bf0c139 25ff28a0fa
 Martin Dobias 	2011-08-27
 
     Merge branch 'expr'
@@ -104923,7 +171272,7 @@ Giuseppe Sucameli 	2011-08-23
     fix invalid postgres type when converting field,
     removed some commented and unused code
 
-Merge: 593ea7e f0f1b5e
+Merge: 593ea7e830 f0f1b5e3b2
 Giuseppe Sucameli 	2011-08-23
 
     Merge branch 'import_layer' of github.com:brushtyler/Quantum-GIS into import_layer
@@ -104993,7 +171342,7 @@ Marco Bernasocchi 	2011-08-21
 
     fixing black canvas issue
 
-Merge: 4ffa820 25ff28a
+Merge: 4ffa8208d7 25ff28a0fa
 NathanW 	2011-08-21
 
     Merge remote branch 'wonder/expr' into expression-labels-merge-wonder
@@ -105022,7 +171371,7 @@ Marco Bernasocchi 	2011-08-19
 
     adding support fo share folder
 
-Merge: 0ba0f93 0373a26
+Merge: 0ba0f93465 0373a26231
 Martin Dobias 	2011-08-18
 
     Merge pull request #37 from NathanW2/identify-patch
@@ -105042,7 +171391,7 @@ Giuseppe Sucameli 	2011-08-18
     convert the primary key type name to a PG valid one,
     add a new options param to importVector
 
-Merge: 22f5ba2 0c8695c
+Merge: 22f5ba29e2 0c8695ccc3
 Marco Hugentobler 	2011-08-18
 
     Merge branch 'server_search'
@@ -105147,7 +171496,7 @@ Marco Hugentobler 	2011-08-12
 
     Show only provider fields as join target candidates (ticket #4136)
 
-Merge: e12191b 880540b
+Merge: e12191bd6c 880540baac
 Tim Sutton 	2011-08-11
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -105188,7 +171537,7 @@ NathanW 	2011-08-10
 
     Update comments. Hide field value area
 
-Merge: 89ddd03 7acce88
+Merge: 89ddd03bdc 7acce8801e
 Tim Sutton 	2011-08-10
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -105201,7 +171550,7 @@ Marco Hugentobler 	2011-08-10
 
     Add crs to wms project group also if no crs constraint is there
 
-Merge: 7196dfc e5f9462
+Merge: 7196dfca01 e5f9462a02
 Martin Dobias 	2011-08-09
 
     Merge pull request #36 from spilth/master
@@ -105265,15 +171614,15 @@ NathanW 	2011-08-08
 
     Resolve merge conflict
 
-Merge: 7454584 2034d59
+Merge: 74545848cb 2034d59a2f
 NathanW 	2011-08-08
 
     Merge remote branch 'upstream/master' into expression-labels
 
     Conflicts:
-src/core/qgspallabeling.cpp
-src/gui/CMakeLists.txt
-src/ui/qgslabelingguibase.ui
+            src/core/qgspallabeling.cpp
+            src/gui/CMakeLists.txt
+            src/ui/qgslabelingguibase.ui
 
 marco 	2011-08-08
 
@@ -105300,7 +171649,7 @@ Tim Sutton 	2011-08-07
 
     [BACKPORT] fix error in notes reported to me by Marco Braida
 
-Merge: 2034d59 cbd2756
+Merge: 2034d59a2f cbd275698e
 Tim Sutton 	2011-08-06
 
     Merge pull request #35 from NathanW2/reduce-attribute-dialog-margins
@@ -105378,7 +171727,7 @@ Alexander Bruy 	2011-07-29
     [BACKPORT]fix RandomPoints crash when there are NULL values in
     attributes
 
-Merge: bfb5f2c f3d5387
+Merge: bfb5f2c184 f3d5387edb
 Marco Bernasocchi 	2011-07-29
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS into android
@@ -105403,7 +171752,7 @@ Martin Dobias 	2011-07-28
 
     Bring back locked/unlocked icons
 
-Merge: a1cc666 a5f8a82
+Merge: a1cc666472 a5f8a82515
 marco 	2011-07-28
 
     [FEATURE]: Add point and line pattern symbol layers
@@ -105448,7 +171797,7 @@ Marco Bernasocchi 	2011-07-25
 
     making GSL and thus georeferences really optional but ON by default
 
-Merge: 8c4cf8e 05d2cd9
+Merge: 8c4cf8e063 05d2cd9612
 Marco Bernasocchi 	2011-07-25
 
     Merge branch 'master' of https://github.com/qgis/Quantum-GIS into android
@@ -105550,7 +171899,7 @@ Martin Dobias 	2011-07-20
 
     Fix #4088: better handling of unknown geometry types
 
-Merge: c4cbcf4 042a882
+Merge: c4cbcf4ebf 042a882c16
 Tim Sutton 	2011-07-19
 
     Merge pull request #32 from Jean-Roc/master
@@ -105565,7 +171914,7 @@ Jean-Roc Morreale 	2011-07-19
 
     update french translation
 
-Merge: 4c00456 ce826f6
+Merge: 4c004569f6 ce826f6eb2
 Marco Hugentobler 	2011-07-19
 
     Merge ellipse symbollayer branch
@@ -105631,7 +171980,7 @@ Juergen E. Fischer 	2011-07-17
 
     fix build problem with Qt 4.4
 
-Merge: f49d225 e0e21f1
+Merge: f49d2255ab e0e21f14da
 Tim Sutton 	2011-07-15
 
     Merge pull request #31 from gostrc/master
@@ -105730,7 +172079,7 @@ Marco Hugentobler 	2011-07-13
 
     Fix for considering layer title length in composer legend
 
-Merge: 36fb5a7 e0f4d06
+Merge: 36fb5a7a6b e0f4d06562
 Pirmin Kalberer 	2011-07-13
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -105747,7 +172096,7 @@ Juergen E. Fischer 	2011-07-13
 
     fix vc build
 
-Merge: 540fb7a 9c9259a
+Merge: 540fb7a1b7 9c9259a703
 Pirmin Kalberer 	2011-07-13
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -105792,7 +172141,7 @@ NathanW 	2011-07-12
 
     Fill value list from selected field.
 
-Merge: db469be f57bef4
+Merge: db469bedf9 f57bef47c6
 Marco Hugentobler 	2011-07-12
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -105821,7 +172170,7 @@ NathanW 	2011-07-11
 
     Redesign of expression builder UI
 
-Merge: bff8e54 8e3aca4
+Merge: bff8e54465 8e3aca41ee
 Marco Hugentobler 	2011-07-11
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -105866,7 +172215,7 @@ William Kyngesburye 	2011-07-06
 
     missed these also in 3ccae3f
 
-Merge: d56e4e9 97d477b
+Merge: d56e4e958e 97d477b236
 Tim Sutton 	2011-07-06
 
     Merge branch 'margins'
@@ -105875,12 +172224,12 @@ Marco Hugentobler 	2011-07-06
 
     Added line pattern symbol layer
 
-Merge: dd79841 49e9a62
+Merge: dd79841c61 49e9a621ce
 Tim Sutton 	2011-07-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: bd495c1 49e9a62
+Merge: bd495c1360 49e9a621ce
 Marco Hugentobler 	2011-07-06
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106351,7 +172700,7 @@ Juergen E. Fischer 	2011-07-05
 
     add support for mixed case geometry types of PostGIS 2.0
 
-Merge: a637ebc 93fb601
+Merge: a637ebcac2 93fb601fdb
 Marco Hugentobler 	2011-07-05
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106404,7 +172753,7 @@ William Kyngesburye 	2011-07-04
     dev frameworks install option;
     cmake cleanup
 
-Merge: 3849742 ff83436
+Merge: 3849742b10 ff83436cdc
 Marco Hugentobler 	2011-07-04
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106438,7 +172787,7 @@ Tim Sutton 	2011-07-04
 
     Better ignore options
 
-Merge: 934e56f a946a20
+Merge: 934e56f8c4 a946a20f63
 Tim Sutton 	2011-07-04
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106471,14 +172820,14 @@ Juergen E. Fischer 	2011-07-03
 
     fix windows build
 
-Merge: 8cddfb8 8e5cd40
+Merge: 8cddfb8d5e 8e5cd403bb
 NathanW 	2011-07-03
 
     Merge remote branch 'upstream/master' into expression-labels
     Fixed merge conflict in pallabeling
 
     Conflicts:
-src/core/qgspallabeling.cpp
+            src/core/qgspallabeling.cpp
 
 Marco Hugentobler 	2011-07-02
 
@@ -106488,12 +172837,12 @@ Marco Hugentobler 	2011-07-02
 
     Fix labeling-ng with utf-8 layers (ticket #3854)
 
-Merge: 4d75a7d 701e35d
+Merge: 4d75a7d3e4 701e35dae2
 Marco Hugentobler 	2011-07-01
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
 
-Merge: d954421 4d75a7d
+Merge: d95442138c 4d75a7d3e4
 NathanW 	2011-07-01
 
     Merge remote branch 'upstream/master' into expression-labels
@@ -106518,7 +172867,7 @@ Marco Hugentobler 	2011-06-30
 
     Emit signal when showing / hiding composer
 
-Merge: 4888f51 b6fa94f
+Merge: 4888f51d54 b6fa94fa2f
 Tim Sutton 	2011-06-30
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106535,7 +172884,7 @@ Tim Sutton 	2011-06-30
 
     Fix bugs causing a crash when histogram is gathered due to uninitilised histogram vector
 
-Merge: eb9d610 4546646
+Merge: eb9d6105f4 4546646f1d
 Marco Hugentobler 	2011-06-30
 
     Merge branch 'svg_params'
@@ -106564,7 +172913,7 @@ Marco Hugentobler 	2011-06-29
 
     Fix replacement in style attribute
 
-Merge: 664317f 85ca9bd
+Merge: 664317f8c6 85ca9bd539
 Marco Hugentobler 	2011-06-29
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106577,7 +172926,7 @@ Tim Sutton 	2011-06-28
 
     Added missing QUrl include
 
-Merge: 6509df2 b664ca0
+Merge: 6509df23f4 b664ca0d09
 Marco Hugentobler 	2011-06-28
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106590,7 +172939,7 @@ Marco Hugentobler 	2011-06-28
 
     Remove oldest entries from svg cache if cache size is too large
 
-Merge: e79fe4d 0d91c81
+Merge: e79fe4d46e 0d91c81f3d
 Tim Sutton 	2011-06-28
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106623,7 +172972,7 @@ Marco Hugentobler 	2011-06-27
 
     Tweak for layer cache
 
-Merge: de5ffb5 8910039
+Merge: de5ffb5eae 8910039115
 Marco Hugentobler 	2011-06-27
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106681,7 +173030,7 @@ Marco Hugentobler 	2011-06-23
 
     Composer legend: support point symbol sizes in map units
 
-Merge: 1d65377 3bd37ec
+Merge: 1d65377013 3bd37ecf98
 Marco Hugentobler 	2011-06-23
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106730,7 +173079,7 @@ Marco Hugentobler 	2011-06-18
 
     Add license header to postrequesthandler, clean old code section
 
-Merge: 2a05b54 abe6bb5
+Merge: 2a05b5430f abe6bb5812
 Marco Hugentobler 	2011-06-18
 
     Merge branch 'master' of github.com:mhugent/Quantum-GIS
@@ -106747,7 +173096,7 @@ Sergey Yakushev 	2011-06-06
 
     Fix #3866 for measure angle tool
 
-Merge: 9028bf7 f70aae6
+Merge: 9028bf7d7d f70aae6f21
 Radim Blazek 	2011-06-18
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106800,7 +173149,7 @@ Radim Blazek 	2011-06-16
 
     drag layer fix
 
-Merge: 728de00 608d394
+Merge: 728de0059c 608d3947f2
 Radim Blazek 	2011-06-16
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106817,7 +173166,7 @@ Marco Hugentobler 	2011-06-16
 
     Support for raster legend in composer
 
-Merge: 6ce35e3 cc7e63b
+Merge: 6ce35e37e4 cc7e63b439
 Marco Hugentobler 	2011-06-16
 
     merge conflict
@@ -106878,7 +173227,7 @@ Sergey Yakushevs 	2011-06-14
 
     optimization hit
 
-Merge: 27db9c3 a954488
+Merge: 27db9c3ca2 a954488ba7
 Radim Blazek 	2011-06-14
 
     resolved qgsbrowsermodel merge conflicts
@@ -106919,7 +173268,7 @@ Marco Hugentobler 	2011-06-10
 
     started rotation / data defined rotation
 
-Merge: d967b71 efb462b
+Merge: d967b71c91 efb462b831
 Tim Sutton 	2011-06-10
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -106960,7 +173309,7 @@ Tim Sutton 	2011-06-10
 
     Run astyle to cleanup formatting
 
-Merge: 4bcddc1 be751be
+Merge: 4bcddc1929 be751be6ec
 Tim Sutton 	2011-06-10
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -106977,7 +173326,7 @@ Tim Sutton 	2011-06-10
 
     Added warning that .qgs extension may be missing
 
-Merge: b2fa1b8 fabc66a
+Merge: b2fa1b8952 fabc66aa1d
 Tim Sutton 	2011-06-10
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107022,7 +173371,7 @@ Marco Hugentobler 	2011-06-03
 
     Don't list join fields to facilitate 'save as' function (fixes #3857). Don't display the query builder if a layer has joins (#3858)
 
-Merge: 82e9936 1b15528
+Merge: 82e9936c21 1b1552812d
 Tim Sutton 	2011-06-10
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107115,7 +173464,7 @@ Marco Hugentobler 	2011-06-08
 
     Include QgsFeature pointer to symbol render context. Bindings not adapted yet
 
-Merge: 36854d2 a579685
+Merge: 36854d213d a57968532b
 Tim Sutton 	2011-06-08
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107204,7 +173553,7 @@ Marco Hugentobler 	2011-06-06
 
     Fix order of embedded layers in groups
 
-Merge: 107df1f ba39378
+Merge: 107df1f08c ba39378bcf
 Marco Hugentobler 	2011-06-06
 
     Merge branch 'embed_layers'
@@ -107213,7 +173562,7 @@ Marco Hugentobler 	2011-06-06
 
     More safety checks
 
-Merge: 03525ea 6cb4248
+Merge: 03525ea037 6cb4248130
 Tim Sutton 	2011-06-06
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -107230,7 +173579,7 @@ Tim Sutton 	2011-06-05
 
     Updated references to bug tracker to point to hub website
 
-Merge: 48d82eb 0e318b0
+Merge: 48d82eb5d9 0e318b0c5f
 Tim Sutton 	2011-06-05
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107295,7 +173644,7 @@ Tim Sutton 	2011-06-02
 
     Mark icon with 'm' for master branch to make working with multiple installs easier
 
-Merge: 0e12034 edad445
+Merge: 0e12034224 edad445fbb
 Tim Sutton 	2011-06-02
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107332,27 +173681,27 @@ Marco Hugentobler 	2011-05-31
 
     Add support for embedded legend groups
 
-Merge: 9ab859a c8dd587
+Merge: 9ab859ad19 c8dd58791f
 Sergey Yakushevs 	2011-05-31
 
     Merge remote branch 'pb/master' into network-analysis
 
     Conflicts:
-src/analysis/network/qgsdistanceedgeproperter.cpp
-src/analysis/network/qgsgraphbuilder.h
-src/plugins/roadgraph/graphbuilder.h
-src/plugins/roadgraph/linevectorlayerdirector.cpp
-src/plugins/roadgraph/roadgraphplugin.cpp
-src/plugins/roadgraph/shortestpathwidget.cpp
-src/plugins/roadgraph/simplegraphbuilder.cpp
+            src/analysis/network/qgsdistanceedgeproperter.cpp
+            src/analysis/network/qgsgraphbuilder.h
+            src/plugins/roadgraph/graphbuilder.h
+            src/plugins/roadgraph/linevectorlayerdirector.cpp
+            src/plugins/roadgraph/roadgraphplugin.cpp
+            src/plugins/roadgraph/shortestpathwidget.cpp
+            src/plugins/roadgraph/simplegraphbuilder.cpp
 
-Merge: 8bbdde6 c8dd587
+Merge: 8bbdde6254 c8dd58791f
 Sergey Yakushevs 	2011-05-31
 
     Merge remote branch 'pb/master'
 
     Conflicts:
-src/plugins/roadgraph/linevectorlayerdirector.cpp
+            src/plugins/roadgraph/linevectorlayerdirector.cpp
 
 Marco Hugentobler 	2011-05-31
 
@@ -107419,7 +173768,7 @@ Sergey Yakushevs 	2011-05-27
 
     fix excess graph build if topology tolerance > 0
 
-Merge: f49be68 27c9870
+Merge: f49be68c66 27c9870141
 Tim Sutton 	2011-05-27
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -107444,7 +173793,7 @@ Juergen E. Fischer 	2011-05-26
 
     remove svn Id tags
 
-Merge: ffc267d db4fdee
+Merge: ffc267d937 db4fdee7fe
 Tim Sutton 	2011-05-26
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107453,7 +173802,7 @@ Tim Sutton 	2011-05-26
 
     Coding guideline updates for GIT
 
-Merge: c2757d3 0e5baf4
+Merge: c2757d31bc 0e5baf4c13
 Tim Sutton 	2011-05-26
 
     Merge pull request #25 from brushtyler/master
@@ -107468,7 +173817,7 @@ Sandro Santilli 	2011-05-26
 
     Fix missing space between 'Middle' and 'Right' click instructions, consistently use 'vertex' rather than 'point' while adding lines or boundaries. Fixes bug #3846.
 
-Merge: 4be0d71 2670283
+Merge: 4be0d71810 2670283b06
 Tim Sutton 	2011-05-26
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107489,7 +173838,7 @@ Sergey Yakushevs 	2011-05-26
 
     QgsDistanceArea copy-construct is bad. Fix it.
 
-Merge: 4070354 21fa438
+Merge: 4070354d5f 21fa4385f9
 Radim Blazek 	2011-05-25
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107502,7 +173851,7 @@ Juergen E. Fischer 	2011-05-25
 
     osgeo4w: include browser batch template
 
-Merge: 3f50ee2 c3e161a
+Merge: 3f50ee200b c3e161a506
 Tim Sutton 	2011-05-25
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107535,7 +173884,7 @@ Marco Hugentobler 	2011-05-24
 
     Discard empty http parameters in mapserver
 
-Merge: 4d5455f 0b2317e
+Merge: 4d5455f5b1 0b2317e85a
 Tim Sutton 	2011-05-24
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107552,7 +173901,7 @@ Sergey Yakushevs 	2011-05-24
 
     add properter classes
 
-Merge: 09de6da 77d2651
+Merge: 09de6da686 77d265128e
 Jürgen Fischer 	2011-05-24
 
     Merge pull request #24 from pcav/master
@@ -107563,14 +173912,14 @@ pcav 	2011-05-24
 
     Another minor edit to IT translation - thanks Gabriele Monfardini for noticing
 
-Merge: b610620 a075104
+Merge: b6106203d3 a07510495a
 Jürgen Fischer 	2011-05-24
 
     Merge pull request #23 from pcav/master
 
     Minor change to IT translation
 
-Merge: a075104 b610620
+Merge: a07510495a b6106203d3
 pcav 	2011-05-24
 
     Merge branch 'master' of git://github.com/qgis/Quantum-GIS
@@ -107587,7 +173936,7 @@ Sergey Yakushevs 	2011-05-24
 
     add qgsgraphbuilder interface
 
-Merge: 7c0e900 b610620
+Merge: 7c0e9000ec b6106203d3
 Tim Sutton 	2011-05-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107608,7 +173957,7 @@ Sergey Yakushevs 	2011-05-23
 
     Launch of integration RoadGraph api in the QGIS
 
-Merge: 4549d0e ffed1d7
+Merge: 4549d0e199 ffed1d7702
 Tim Sutton 	2011-05-23
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -107628,7 +173977,7 @@ Juergen E. Fischer 	2011-05-23
     - /* ... */ => #if 0 / #endif
     - reindentation
 
-Merge: 1d3ac80 ee6c516
+Merge: 1d3ac808bb ee6c516111
 Sergey Yakushevs 	2011-05-23
 
     Merge remote branch 'pb/master'
@@ -107645,19 +173994,19 @@ Juergen E. Fischer 	2011-05-21
 
     german translation update
 
-Merge: 5fea5a8 bb1a4e6
+Merge: 5fea5a8c61 bb1a4e6af8
 Tim Sutton 	2011-05-23
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
 
-Merge: 9784cd7 cd8ecd6
+Merge: 9784cd78e5 cd8ecd6a6e
 Tim Sutton 	2011-05-22
 
     Merge pull request #22 from alexbruy/master
 
     Make "-dstalpha" parameter in GDALTools Clipper optional
 
-Merge: ffed1d7 9784cd7
+Merge: ffed1d7702 9784cd78e5
 Tim Sutton 	2011-05-22
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107682,7 +174031,7 @@ Marco Hugentobler 	2011-05-20
 
     Fix rotation of simple marker if cache is not used (ticket #3778)
 
-Merge: 0390131 62db3d7
+Merge: 0390131247 62db3d7dac
 Martin Dobias 	2011-05-20
 
     Merge branch 'browser-and-customization'
@@ -107698,7 +174047,7 @@ Martin Dobias 	2011-05-20
     The rationale is that some data sources (providers) share CRS for a whole
     set of layers (e.g. GRASS)
 
-Merge: 626c8dd 0390131
+Merge: 626c8ddb7c 0390131247
 Sergey Yakushevs 	2011-05-19
 
     Merge remote branch 'pb/master'
@@ -107719,7 +174068,7 @@ Radim Blazek 	2011-05-18
 
     QgsLayerItem::layerInfo replaced by mapLayerType, providerKey and uri methods
 
-Merge: cda5461 c724ce5
+Merge: cda5461099 c724ce5180
 Tim Sutton 	2011-05-17
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107749,7 +174098,7 @@ Martin Dobias 	2011-05-16
     - data item's mType should be used for differentiating classes
     - layer-specific virtual methods moved down to QgsLayerItem
 
-Merge: 6de875a 6062bb5
+Merge: 6de875ab16 6062bb587a
 mhugent 	2011-05-16
 
     Merge pull request #21 from telwertowski/master
@@ -107780,7 +174129,7 @@ Tim Sutton 	2011-05-15
 
     Added fancy pdf generation from t2t docs
 
-Merge: 27e3a8f a942239
+Merge: 27e3a8f621 a9422394f3
 Tim Sutton 	2011-05-14
 
     Merge branch 'master' of github.com:timlinux/Quantum-GIS
@@ -107797,24 +174146,24 @@ Martin Dobias 	2011-05-14
 
     Fixed #3818
 
-Merge: 153ad16 3ec8059
+Merge: 153ad164fe 3ec8059141
 Martin Dobias 	2011-05-13
 
     Merge branch 'master' into dbl
 
     Conflicts:
-images/splash/splash.png
-src/CMakeLists.txt
-src/app/main.cpp
-src/app/qgsvectorlayerproperties.cpp
-src/core/qgsvectorlayer.cpp
-src/providers/wms/qgswmssourceselect.cpp
+            images/splash/splash.png
+            src/CMakeLists.txt
+            src/app/main.cpp
+            src/app/qgsvectorlayerproperties.cpp
+            src/core/qgsvectorlayer.cpp
+            src/providers/wms/qgswmssourceselect.cpp
 
 Martin Dobias 	2011-05-13
 
     All customization and QGIS browser work in one commit.
 
-Merge: 6327b2e 5579560
+Merge: 6327b2e224 55795600db
 Marco Hugentobler 	2011-05-13
 
     Merge branch 'wms_filewatch'
@@ -107831,7 +174180,7 @@ Alexander Bruy 	2011-05-12
 
     allow merging shapefiles with different attribute tables (fix #3010)
 
-Merge: dfeb19b 07da493
+Merge: dfeb19b453 07da493572
 Sergey Yakushevs 	2011-05-12
 
     Merge remote branch 'pb/master'
@@ -107840,7 +174189,7 @@ Marco Hugentobler 	2011-05-12
 
     [FEATURE]: Possibility to set a WFS filter
 
-Merge: 5b1a9f9 76751f6
+Merge: 5b1a9f9807 76751f614d
 Sergey Yakushevs 	2011-05-12
 
     Merge remote branch 'pb/master'
@@ -107886,12 +174235,12 @@ Marco Hugentobler 	2011-05-11
 
     Safety check for wms server filters
 
-Merge: d05b140 a48c4ac
+Merge: d05b140e4f a48c4ac93b
 Marco Hugentobler 	2011-05-11
 
     Merge remote-tracking branch 'upstream/master'
 
-Merge: c914c14 a48c4ac
+Merge: c914c14b43 a48c4ac93b
 Sergey Yakushevs 	2011-05-11
 
     Merge remote branch 'pb/master'
@@ -107908,7 +174257,7 @@ Juergen E. Fischer 	2011-05-08
 
     more svn=>git stuff
 
-Merge: 41bf4c8 45cc8a7
+Merge: 41bf4c83b3 45cc8a7fea
 Tim Sutton 	2011-05-10
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -107921,7 +174270,7 @@ Marco Hugentobler 	2011-05-10
 
     Added wms filter support
 
-Merge: 1455636 9647ac8
+Merge: 14556360b1 9647ac877f
 alexbruy 	2011-05-10
 
     Merge pull request #16 from alexbruy/master
@@ -107936,14 +174285,14 @@ Giuseppe Sucameli 	2011-05-10
 
     save file instead of open it in select output file dialog
 
-Merge: fefae90 9ffedb4
+Merge: fefae903a5 9ffedb482a
 Tim Sutton 	2011-05-10
 
     Merge pull request #14 from pcav/master
 
     IT translation wrong
 
-Merge: 8494cad fb43d16
+Merge: 8494cadde1 fb43d16f16
 Sergey Yakushevs 	2011-05-10
 
     Merge branch 'master' of https://github.com/stopa85/Quantum-GIS
@@ -107972,7 +174321,7 @@ pcav 	2011-05-10
 
     Minor edits to IT translation
 
-Merge: fb56838 ee20b30
+Merge: fb5683820b ee20b30320
 Tim Sutton 	2011-05-10
 
     Merge pull request #13 from stopa85/master
@@ -107987,7 +174336,7 @@ Juergen E. Fischer 	2011-05-09
 
     fix #3671: update view after search in attributetable
 
-Merge: c586afe 7ad75d9
+Merge: c586afe8fb 7ad75d9ffc
 Tim Sutton 	2011-05-08
 
     Merge pull request #9 from kyngchaos/master
@@ -108006,7 +174355,7 @@ J
 
     fix lenny build
 
-Merge: ad494d4 8fb20e0
+Merge: ad494d4dab 8fb20e03af
 Tim Sutton 	2011-05-07
 
     Merge pull request #6 from timlinux/master
@@ -108017,7 +174366,7 @@ Tim Sutton 	2011-05-07
 
     Radim's patch to fix rendering issues with otf wms reprojection
 
-Merge: 1bff56a ce6588c
+Merge: 1bff56ae4c ce6588c572
 Juergen E. Fischer 	2011-05-07
 
     Merge branch 'master' of github.com:qgis/Quantum-GIS
@@ -108070,7 +174419,7 @@ Juergen E. Fischer 	2011-05-04
 
     update version tracking to git
 
-Merge: 0e17f4e 0b7f5fa
+Merge: 0e17f4ed03 0b7f5fa542
 Tim Sutton 	2011-05-04
 
     Merge pull request #2 from timlinux/master.
@@ -108085,7 +174434,7 @@ Tim Sutton 	2011-05-04
 
     Added shortname option to quickpackage script
 
-Merge: fb01318 758fa49
+Merge: fb013183da 758fa49c0f
 Tim Sutton 	2011-05-04
 
     Merge pull request #1 from rudilinfiniti/master.
@@ -108096,7 +174445,7 @@ Rudi Thiede 	2011-05-04
 
     fixed minor errors in install documentation
 
-Merge: 2f86b4f 6455628
+Merge: 2f86b4fe61 6455628219
 Tim Sutton 	2011-05-02
 
     Merge branch 'master' of /home/timlinux/qgis-git-migration/qgis_all
@@ -113589,7 +179938,7 @@ gsherman 	2010-12-11
     Merge branch 'master' of github.com:qgis/qgis
 
     Conflicts:
-README
+            README
 
     git-svn-id: http://svn.osgeo.org/qgis/trunk@14888 c8812cc2-4d05-0410-92ff-de0c093fc19c
 
@@ -182624,7 +248973,7 @@ gsherman 	2004-03-01
 
     1. Added bounds checking for selecting features.
     2. Created wkbPoint structure for building WKB (well known binary) representation
- of the point.
+             of the point.
     3. Implementation is not complete.
 
 
diff --git a/INSTALL b/INSTALL
index 51d04ecbe5b..1bbb4de89ec 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,9 @@
 QGIS
 Building QGIS from source - step by step
-Sunday February 18, 2018
+Friday February 23, 2018
 
 
-Last Updated: Sunday February 18, 2018
+Last Updated: Friday February 23, 2018
 Last Change : Sunday February 18, 2018
 
 
@@ -457,7 +457,7 @@ For the QGIS build you need to install following packages from cygwin:
 
 and from OSGeo4W (select Advanced Installation):
 
-- qgis-dev-deps
+- qgis-rel-deps
 
 This will also select packages the above packages depend on.
 
diff --git a/NEWS b/NEWS
index 9d32762c9bf..d73c123b286 100644
--- a/NEWS
+++ b/NEWS
@@ -1,50 +1,205 @@
 QGIS News
 Change history for the QGIS Project
-Sunday August 13, 2017
+Friday February 23, 2018
 
 
 ------------------------------------------------------------------------
 
 
-  1. What's new in Version 2.18 'Las Palmas'?
-  2. What's new in Version 2.16 'Nødebo'?
-  3. What's new in Version 2.14 'Essen'?
-  4. What's new in Version 2.12 'Lyon'?
-  5. What's new in Version 2.10 'Pisa'?
-  6. What's new in Version 2.8 'Wien'?
-  7. What's new in Version 2.6.0 'Brighton'?
-  8. What's new in Version 2.4.0 'Chugiak'?
-  9. Whats new in Version 2.2.0 'Valmiera'?
-  10. Whats new in Version 2.0.1 'Dufour'?
-  11. Whats new in Version 2.0.0 'Dufour'?
-  12. Whats new in Version 1.8.0 'Lisboa'?
-  13. Whats new in Version 1.7.2 'Wroclaw'?
-  14. Whats new in Version 1.7.1 'Wroclaw'?
-  15. Whats new in Version 1.7.0 'Wroclaw'?
-  16. Whats new in Version 1.6.0 'Capiapo'?
-  17. Whats new in Version 1.5.0?
-  18. Whats new in Version 1.4.0 'Enceladus'?
-  19. Whats new in Version 1.3.0 'Mimas'?
-  20. Version 1.2.0 'Daphnis'
-  21. Version 1.0.0 'Kore'
-  22. Version 0.11.0 'Metis'
-  23. Version 0.10.0 'Io'
-  24. Version 0.9.2rc1 'Ganymede'
-  25. Version 0.9.1 'Ganymede'
-  26. Version 0.9 'Ganymede'
-  27. Version 0.8 'Joesephine' .... development version
-  28. Version 0.6 'Simon'
-  29. 0.5
+  1. What's new in Version 3.0 'Girona'?
+  2. What's new in Version 2.18 'Las Palmas'?
+  3. What's new in Version 2.16 'Nødebo'?
+  4. What's new in Version 2.14 'Essen'?
+  5. What's new in Version 2.12 'Lyon'?
+  6. What's new in Version 2.10 'Pisa'?
+  7. What's new in Version 2.8 'Wien'?
+  8. What's new in Version 2.6.0 'Brighton'?
+  9. What's new in Version 2.4.0 'Chugiak'?
+  10. Whats new in Version 2.2.0 'Valmiera'?
+  11. Whats new in Version 2.0.1 'Dufour'?
+  12. Whats new in Version 2.0.0 'Dufour'?
+  13. Whats new in Version 1.8.0 'Lisboa'?
+  14. Whats new in Version 1.7.2 'Wroclaw'?
+  15. Whats new in Version 1.7.1 'Wroclaw'?
+  16. Whats new in Version 1.7.0 'Wroclaw'?
+  17. Whats new in Version 1.6.0 'Capiapo'?
+  18. Whats new in Version 1.5.0?
+  19. Whats new in Version 1.4.0 'Enceladus'?
+  20. Whats new in Version 1.3.0 'Mimas'?
+  21. Version 1.2.0 'Daphnis'
+  22. Version 1.0.0 'Kore'
+  23. Version 0.11.0 'Metis'
+  24. Version 0.10.0 'Io'
+  25. Version 0.9.2rc1 'Ganymede'
+  26. Version 0.9.1 'Ganymede'
+  27. Version 0.9 'Ganymede'
+  28. Version 0.8 'Joesephine' .... development version
+  29. Version 0.6 'Simon'
+  30. 0.5
 
 
 ------------------------------------------------------------------------
 
 
-Last Updated: Sunday August 13, 2017
-Last Change : Sunday August 13, 2017
+Last Updated: Friday February 23, 2018
+Last Change : Friday February 23, 2018
 
 
-  1. What's new in Version 2.18 'Las Palmas'?
+  1. What's new in Version 3.0 'Girona'?
+  ======================================
+
+This release has following new features:
+
+- Expressions: Support aggregation of geometry in expressions
+- Expressions: New expression variables
+- Expressions: new global expression variable @qgis_locale
+- Expressions: item_variables expression function inside compositions
+- Expressions: New expression variables for map settings
+- Expressions: New expression functions
+- Expressions: Expose @parent variable in aggregate functions
+- User Interface: Improved consistency to the user interface
+- User Interface: Enable tabbed floating docks
+- User Interface: Add support for fine-resolution mouse wheel zooming
+- User Interface: add search bar to the Configure Shortcuts dialog
+- User Interface: Toggle visibility of opened panels in main window
+- User Interface: Locator bar
+- User Interface: More non-blocking, inline editing
+- User Interface: Add an option to show user color schemes menus
+- User Interface: Color setting for map canvas north arrow decoration
+- User Interface: Improved map canvas' save as image
+- Symbology: NEW MAP COLORING ALGORITHMS IN QGIS 3.0
+- Symbology:  New "preset" colors color ramp option
+- Symbology: Allow symbol layers to be temporarily disabled
+- Symbology: Data defined symbol layer visibility
+- Symbology: save and restore color ramp used for singleband pseudocolor rendering
+- Symbology: save and restore color ramp used for singleband pseudocolor rendering
+- Symbology: Add Points  and Inches to available symbol units
+- Symbology: New color ramp button widget
+- Symbology: Style management re-work and upgrade
+- Symbology: Show an alpha slider in color button drop down menu
+- Symbology: Support setting of color and transparency on multiple items for raster renderers
+- Symbology: raster auto-stretching when updating canvas
+- Symbology: Raster stretch toolbar actions support for pseudocolor renderer
+- Symbology: Transparency support for paletted renderer
+- Symbology: Control over annotation contents margins
+- Symbology: Annotations can be styled using fill symbol styles
+- Symbology: Point cluster renderer
+- Labelling: Allow label font size in mm/pixels
+- Labelling: Custom labelling toolbar is now always enabled
+- Diagrams: Data definable properties
+- Rendering: Grid renderer for points displacement
+- Rendering: Live layer support
+- Rendering: Cache labeling result to avoid unnecessary redraws     when refreshing canvas
+- Digitising: add functionnality to copy/move feature to move feature map tool
+- Digitising: Range vertex selection in node tool
+- Digitising: Add default Z value option
+- Digitising: Move feature now benefits from Advanced Digitizing
+- Digitising: Tracing with offset
+- Data Management: Metadata overhaul
+- Data Management: Auxilliary Storage Support
+- Data Management: Pan to current feature in attribute table
+- Data Management: Map of CRS-extent in Project properties
+- Data Management: Unified data source manager dialog
+- Data Management: Unified data source manager dialog
+- Data Management: Unified data source manager dialog
+- Forms and Widgets: Allow controlling labels for individual edit widgets
+- Forms and Widgets: Smarter default edit widgets with plugins to pick them
+- Forms and Widgets: Allow configuring link/unlink feature buttons on relation editor widget
+- Forms and Widgets: conditional visibility for tabs and groupboxes
+- Forms and Widgets: Field constraints can be enforced or not
+- Forms and Widgets: Add layer scoped actions
+- Forms and Widgets: Add between/not between to numerical fields in select by form
+- Forms and Widgets: Show field values in autocompleter in form filter mode
+- Forms and Widgets: Add zoom to features and flash features shortcuts in select by form dialog
+- Forms and Widgets: Add between/not between to numerical fields in select by form
+- Layer Legend: Hide Deselected Layers action
+- Layer Legend: Change of ergonomy of the visibility of layers inside groups
+- Map Composer: Control over drawing of composer table grid horizontal & vertical lines
+- Map Composer: Map Composer Overhaul
+- Map Composer: Drag qpt to QGIS to create new composer from template
+- Map Composer: Allow customization of line spacing for composer legend item labels
+- Map Composer: Allow choice of CRS for map items
+- Map Composer: Data definable controls
+- Map Composer: Holding shift while drawing polyline/polygon constrains     line angles
+- Analysis Tools: Raster unique values count for processing
+- Processing:  New algorithm for offsetting lines
+- Processing: New algorithm for single sided buffers
+- Processing: Optimised points along geometry algorithm
+- Processing: Add choice of simplification method to simplify
+- Processing: support for output geometry types in models
+- Processing: Angle threshold for smooth algorithm
+- Processing: Better support for Z/M dimensions and curved geometries
+- Processing: Raster analysis algorithms added to Processing
+- Processing: New algorithm to extract specific nodes
+- Processing: expose zonal statistics from Zonal statistics plugin in toolbox
+- Processing: add a spatialite execute SQL algorithm
+- Processing: New algorithm to extend lines
+- Processing: New extract by expression algorithm
+- Processing: add import into spatialite algorithm
+- Processing: Interpolation algorithms
+- Processing: New algorithm to compute geometry by expression
+- Processing: Snap geometries to layer algorithm
+- Processing: New input type for expressions
+- Processing: SplitWithLines
+- Processing: pole of inaccessibility algorithm
+- Processing: Extract by attribute can extract for null/notnull values
+- Processing: Create attribute index algorithm
+- Processing: New 'drop geometries' algorithm
+- Processing: New universal 'basic stats for field' algorithm
+- Processing: Port heatmap plugin to processing algorithm
+- Processing: New algorithm to orthagonalize geometries
+- Processing: Network analysis algorithms
+- Processing: Export processing models as PDF/SVG
+- Processing: New algorithm to truncate tables
+- Processing: added ‘invalid feature handling’ option
+- Processing: algorithm to fix invalid geometries using native makeValid() implementation
+- Processing: add search to Get Scripts and Models dialog
+- Processing: Generic centroid algorithm
+- Processing: improved Extract nodes algorithm
+- Processing: New algorithm for translating (moving) points
+- Processing: Improved processing modeler window
+- Processing: New raster unique values report algorithm
+- Processing: remove TauDEM provider from core Processing
+- Processing: Download a file from Processing
+- Application and Project Options: New zipped project file format .qgz
+- Application and Project Options: Add support for user profiles
+- Browser: Drag'n'drop layers from layer tree view to browser dock
+- General: Remove dxf2shp converter plugin
+- General: Remove zonal stats plugin
+- General: Remove orphaned oracle raster plugin
+- General: Possibility to configure location of the QGIS help files
+- General: remove TauDEM provider from core Processing
+- General: removed otb and lidartools providers from processing
+- General: Migrate Photo, WebView and FileName widgets to Attachment
+- Data Providers: GeoPackage
+- Data Providers: Support all GDAL writable raster formats for 'Save as' dialog on raster layers
+- Data Providers: Add auto-discovery of relations for PostgresQL
+- Data Providers: Detect literal default values for spatialite provider
+- Data Providers: New unified 'add layer' dialog
+- Data Providers: Create attribute index support for spatialite provider
+- Data Providers: Add support for arrays
+- Data Providers: Support for HStore in PostGIS data provider
+- Data Providers: Data dependencies between layers
+- Data Providers: hstore support to the postgres provider
+- Data Providers: dxf export: support reprojection
+- Data Providers: Load/save style in database for GPKG and Spatialite
+- Data Providers: Unique and not-null constraint handling
+- Data Providers: support for Z/M geometries in memory provider
+- Data Providers: Support for Z/M geometries in spatialite provider
+- Data Providers: GeoNode integration
+- Data Providers: Improved handling of defaults
+- QGIS Server: QGIS Server overhaul
+- QGIS Server: Possibility to segmentize feature info geometry in server
+- Plugins: Remove trusted status from Plugin Manager
+- Plugins: Offline editing: Add flag to only copy selected features
+- Plugins: GDALTools moved to Processing
+- Plugins: allow installing plugins from local ZIP packages
+- Programmability: Geometry class updates
+- Programmability: Task manager
+- Programmability: API to allow drag'n'drop of custom browser items
+
+
+  2. What's new in Version 2.18 'Las Palmas'?
   ===========================================
 
 This release has following new features:
@@ -74,7 +229,7 @@ This release has following new features:
 - Programmability: Expose GEOS linear referencing function to QgsGeometry
 
 
-  2. What's new in Version 2.16 'Nødebo'?
+  3. What's new in Version 2.16 'Nødebo'?
   =======================================
 
 This release has following new features:
@@ -171,7 +326,7 @@ This release has following new features:
 - Programmability: Plugins can add pages to vector layer properties
 
 
-  3. What's new in Version 2.14 'Essen'?
+  4. What's new in Version 2.14 'Essen'?
   ======================================
 
 This release has following new features:
@@ -247,7 +402,7 @@ This release has following new features:
 - User Interface : Show/hide all legend items via the the context menu
 
 
-  4. What's new in Version 2.12 'Lyon'?
+  5. What's new in Version 2.12 'Lyon'?
   =====================================
 
 This release has following new features:
@@ -301,7 +456,7 @@ This release has following new features:
 - Symbology : Add pixels as option for all symbology size unit choices
 
 
-  5. What's new in Version 2.10 'Pisa'?
+  6. What's new in Version 2.10 'Pisa'?
   =====================================
 
 This is a minor release increment with the following new features:
@@ -349,7 +504,7 @@ This is a minor release increment with the following new features:
 - User interface improvements.
 
 
-  6. What's new in Version 2.8 'Wien'?
+  7. What's new in Version 2.8 'Wien'?
   ====================================
 
 This is a minor release increment with the following feature:
@@ -382,7 +537,7 @@ This is a minor release increment with the following feature:
   DescribeLayer, python plugins.
 
 
-  7. What's new in Version 2.6.0 'Brighton'?
+  8. What's new in Version 2.6.0 'Brighton'?
   ==========================================
 
 This is a minor release increment with the following new features:
@@ -428,7 +583,7 @@ This is a minor release increment with the following new features:
 - Context menu for identify tool
 
 
-  8. What's new in Version 2.4.0 'Chugiak'?
+  9. What's new in Version 2.4.0 'Chugiak'?
   =========================================
 
 This is the minor release sports a number of great new features:
@@ -448,8 +603,8 @@ This is the minor release sports a number of great new features:
 - New Inverted Polygon renderer
 
 
-  9. Whats new in Version 2.2.0 'Valmiera'?
-  =========================================
+  10. Whats new in Version 2.2.0 'Valmiera'?
+  ==========================================
 
 This is the minor release sports a number of great new features:
 
@@ -489,7 +644,7 @@ This is the minor release sports a number of great new features:
 - 'Processing' can be used headless in scripts.
 
 
-  10. Whats new in Version 2.0.1 'Dufour'?
+  11. Whats new in Version 2.0.1 'Dufour'?
   ========================================
 
 This is a small bugfix release to address the missing copyright / credits for
@@ -497,7 +652,7 @@ our new splash screen and to update supporting documentation. The spanish
 translation was also updated.
 
 
-  11. Whats new in Version 2.0.0 'Dufour'?
+  12. Whats new in Version 2.0.0 'Dufour'?
   ========================================
 
 This is a new major release. Building on the foundation of
@@ -583,7 +738,7 @@ key new features.
       you to explore the software and discover them all!
 
 
-  12. Whats new in Version 1.8.0 'Lisboa'?
+  13. Whats new in Version 1.8.0 'Lisboa'?
   ========================================
 
 This is a new feature release. Building on the foundation of
@@ -638,7 +793,7 @@ added gdal_fillnodata to GDALTools plugin
 - Support for nesting projects within other projects
 
 
-  13. Whats new in Version 1.7.2 'Wroclaw'?
+  14. Whats new in Version 1.7.2 'Wroclaw'?
   =========================================
 
 This is a bugfix release over version 1.7.1. The following changes
@@ -685,7 +840,7 @@ were made.
 - Fix broken Assign projection functionality in GDALTools and improve handling output file extension
 
 
-  14. Whats new in Version 1.7.1 'Wroclaw'?
+  15. Whats new in Version 1.7.1 'Wroclaw'?
   =========================================
 
 This is a bugfix release over version 1.7.0. The following changes 
@@ -748,7 +903,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]
 - Fixed a bug where map= was not being published in onlineresource url when project files are not in the same dir as cgi
 
 
-  15. Whats new in Version 1.7.0 'Wroclaw'?
+  16. Whats new in Version 1.7.0 'Wroclaw'?
   =========================================
 
 This release is named after the town of Wroclaw in Poland. The Department of
@@ -765,7 +920,7 @@ enhancements. Once again it is impossible to document everything here that has
 changed so we will just provide a bullet list of key new features here.
 
 
-  15.1. Symbology labels and diagrams
+  16.1. Symbology labels and diagrams
   ===================================
 
 - New symbology now used by default!
@@ -783,7 +938,7 @@ changed so we will just provide a bullet list of key new features here.
 - Move/rotate/change label edit tools to interactively change data defined label properties.
 
 
-  15.2. New Tools
+  16.2. New Tools
   ===============
 
 - Added GUI for gdaldem.
@@ -792,7 +947,7 @@ changed so we will just provide a bullet list of key new features here.
 - Added voronoi polygon tool to Vector menu.
 
 
-  15.3. User interface updates
+  16.3. User interface updates
   ============================
 
 - Allow managing missing layers in a list.
@@ -803,7 +958,7 @@ changed so we will just provide a bullet list of key new features here.
 - General clean-ups and usability improvements.
 
 
-  15.4. CRS Handling
+  16.4. CRS Handling
   ==================
 
 - Show active crs in status bar.
@@ -813,7 +968,7 @@ changed so we will just provide a bullet list of key new features here.
 - Default to last selection when prompting for CRS.
 
 
-  15.5. Rasters
+  16.5. Rasters
   =============
 
 - Added AND and OR operator for raster calculator
@@ -822,7 +977,7 @@ changed so we will just provide a bullet list of key new features here.
 - Added raster toolbar with histogram stretch functions.
 
 
-  15.6. Providers and Data Handling
+  16.6. Providers and Data Handling
   =================================
 
 - New SQLAnywhere vector provider.
@@ -848,7 +1003,7 @@ changed so we will just provide a bullet list of key new features here.
  - Allow OGR 'save as' without attributes (e.g., DGN/DXF).
 
 
-  15.7. Api and Developer Centric
+  16.7. Api and Developer Centric
   ===============================
 
 - Refactored attribute dialog calls to QgsFeatureAttribute.
@@ -860,7 +1015,7 @@ changed so we will just provide a bullet list of key new features here.
   new QgsGeometry.validateGeometry function
 
 
-  15.8. QGIS Mapserver
+  16.8. QGIS Mapserver
   ====================
 
 - Ability to specify wms service capabilities in the properties 
@@ -868,7 +1023,7 @@ changed so we will just provide a bullet list of key new features here.
 - Support for wms printing with GetPrint-Request.
 
 
-  15.9. Plugins
+  16.9. Plugins
   =============
 
 - Support for icons of plugins in the plugin manager dialog.
@@ -876,13 +1031,13 @@ changed so we will just provide a bullet list of key new features here.
 - Removed ogr converter plugin - use 'save as' context menu rather.
 
 
-  15.10. Printing
+  16.10. Printing
   ===============
 
 - Undo/Redo support for the print composer
 
 
-  16. Whats new in Version 1.6.0 'Capiapo'?
+  17. Whats new in Version 1.6.0 'Capiapo'?
   =========================================
 
 Please note that this is a release in our 'cutting edge' release series. As
@@ -894,7 +1049,7 @@ Once again it is impossible to document everything here that has changed so we w
 just provide a bullet list of key new features here.
 
 
-  16.1. General Improvements
+  17.1. General Improvements
   ==========================
 
 - Added gpsd support to live gps tracking.
@@ -928,7 +1083,7 @@ caching providers (currently WMS and WFS) can synchronize with changes in
 the datasource.
 
 
-  16.2. Table of contents (TOC) improvements
+  17.2. Table of contents (TOC) improvements
   ==========================================
 
 - Added a new option to the raster legend menu that will stretch the current
@@ -938,14 +1093,14 @@ as' option, you can now specify OGR creation options.
 - In the table of contents, it is now possible to select and remove several layers at once.
 
 
-  16.3. Labeling (New generation only)
+  17.3. Labeling (New generation only)
   ====================================
 
 - Data defined label position in labeling-ng.
 - Line wrapping, data defined font and buffer settings for labeling-ng.
 
 
-  16.4. Layer properties and symbology
+  17.4. Layer properties and symbology
   ====================================
 
 - Three new classification modes added to graduated symbol renderer (version
@@ -966,7 +1121,7 @@ the transparency table in the raster layer properties dialog.
 the style manager more easily.
 
 
-  16.5. Map Composer
+  17.5. Map Composer
   ==================
 
 - add capability to show and manipulate composer item width/ height in item
@@ -975,7 +1130,7 @@ position dialog.
 - Sorting for composer attribute table (several columns and ascending / descending).
 
 
-  17. Whats new in Version 1.5.0?
+  18. Whats new in Version 1.5.0?
   ===============================
 
 Please note that this is a release in our 'cutting edge' release series. As
@@ -990,7 +1145,7 @@ Once again it is impossible to document everything here that has changed so we w
 just provide a bullet list of key new features here.
 
 
-  17.1. Main GUI
+  18.1. Main GUI
   ==============
 
 - There is a new angle measuring tool that allows you to interactively
@@ -1045,7 +1200,7 @@ only visible features in composer table or all features
 closed and reappears when reactivated.
 
 
-  17.2. WMS and WMS-C Support
+  18.2. WMS and WMS-C Support
   ===========================
 
 - WMS-C support, new spatial authorities, wms selection improvements
@@ -1058,7 +1213,7 @@ IGNF definitions in srs.db
 - WMS-C scale slider gui added and more selection improvements
 
 
-  17.3. API Updates
+  18.3. API Updates
   =================
 
 - QgsDataProvider & QgsMapLayer: add dataChanged() signal, so that a
@@ -1075,7 +1230,7 @@ variables. More paths can be passed, separated by semicolon.
 - Support more GEOS operators
 
 
-  18. Whats new in Version 1.4.0 'Enceladus'?
+  19. Whats new in Version 1.4.0 'Enceladus'?
   ===========================================
 
 Please note that this is a release in our 'cutting edge' release series. As
@@ -1133,13 +1288,13 @@ For power users, you can now create customizable attribute forms using Qt
 Designer dialog UIs.
 
 
-  19. Whats new in Version 1.3.0 'Mimas'?
+  20. Whats new in Version 1.3.0 'Mimas'?
   =======================================
 
 This release includes over 30 bug fixes and several useful new features:
 
 
-  19.1. OSM plugin & provider updates
+  20.1. OSM plugin & provider updates
   =======================================
 
 - new OSM style files.
@@ -1151,7 +1306,7 @@ This release includes over 30 bug fixes and several useful new features:
 - other OSM related bugfixes.
 
 
-  19.2. Other notable features and improvements in this release
+  20.2. Other notable features and improvements in this release
   =============================================================
 
 - Marker size is now configurable when editing a layer.
@@ -1166,7 +1321,7 @@ This release includes over 30 bug fixes and several useful new features:
 - Zoom to a coordinate by entering it in the status bar coordinate display.
 
 
-  20. Version 1.2.0 'Daphnis'
+  21. Version 1.2.0 'Daphnis'
   ===========================
 
 Please note that this is a release in our 'cutting edge' release series. As 
@@ -1179,7 +1334,7 @@ over the QGIS 1.1.0 release. In addition we have added
 the following new features:
 
 
-  20.1. Editing
+  21.1. Editing
   =============
 
 Editing functionality in QGIS has had a major update in this release. This
@@ -1211,14 +1366,14 @@ this tool: the redraws are much faster and the map is not cluttered with
 markers. 
 
 
-  20.2. Keyboard shortcuts
+  21.2. Keyboard shortcuts
   ========================
 
 New feature: configure shortcuts for actions within main window of qgis!
 See menu Setting->Configure shortcuts
 
 
-  20.3. Map Composer
+  21.3. Map Composer
   ==================
 
 It is now possible to lock/unlock composer item positions by right mouse click.
@@ -1229,7 +1384,7 @@ It is now possible to keep the current layers in a composer map even if further
 layers are added to the main map. Export to PDF in composer is now possible.
 
 
-  20.4. Attribute tables
+  21.4. Attribute tables
   ======================
 
 It is now possible to search the attribute table within selected records only.
@@ -1245,7 +1400,7 @@ for layer attributes.  A new dialog allows loading a value map from a layer
 be respected in the attribute table.
 
 
-  20.5. Plugins
+  21.5. Plugins
   =============
 
 - The order of layers in the WMS dialog can now be changed.
@@ -1258,14 +1413,14 @@ be respected in the attribute table.
 - An new OpenStreetMap provider and plugin have been added to QGIS.
 
 
-  20.6. Projects Management
+  21.6. Projects Management
   =========================
 
 QGIS now includes support for  project relative position of file data sources
 and svgs. The saving of relative paths of file data sources is optional.
 
 
-  20.7. PostGIS & the PostgreSQL Provider
+  21.7. PostGIS & the PostgreSQL Provider
   =======================================
 
 You can now select the SSL mode when adding a new DB connection. Turning off
@@ -1274,7 +1429,7 @@ connection security is not required. Support has been added for more native
 types and for setting of column comments.
 
 
-  20.8. Symbology enhancements
+  21.8. Symbology enhancements
   ============================
 
 - allow refresh of symbols via popup menu on the renderer's symbol selection
@@ -1284,7 +1439,7 @@ types and for setting of column comments.
   independent of the mapscale)
 
 
-  20.9. Command line arguments
+  21.9. Command line arguments
   ============================
 
 Added command line argument support on windows.
@@ -1355,7 +1510,7 @@ implementation based on the SQLITE database.
 layers based on attribute data.
 
 
-  21. Version 1.0.0 'Kore'
+  22. Version 1.0.0 'Kore'
   ========================
 
 This release includes over 265 bug fixes and enhancements over the 
@@ -1384,7 +1539,7 @@ running will support a plugin that is being installed.
 - Ported all GDAL/OGR and GEOS usage to use C APIs only.
 
 
-  22. Version 0.11.0 'Metis'
+  23. Version 0.11.0 'Metis'
   ==========================
 
 This release includes over 60 bug fixes and enhancements over the 
@@ -1400,7 +1555,7 @@ QGIS 0.10.0 release. In addition we have made the following changes:
 - QML Style support for rasters and database layers
 
 
-  23. Version 0.10.0 'Io'
+  24. Version 0.10.0 'Io'
   =======================
 
 This release includes over 120 bug fixes and enhancements 
@@ -1421,7 +1576,7 @@ improvements 'under the hood'.
 - Support for migration of old projects to work in newer QGIS versions.
 
 
-  24. Version 0.9.2rc1 'Ganymede'
+  25. Version 0.9.2rc1 'Ganymede'
   ===============================
 
 - This release candidate includes over 40 bug fixes and enhancements 
@@ -1438,7 +1593,7 @@ in raster layers. Support for color ramps in raster layers.
 improvements 'under the hood'.
 
 
-  25. Version 0.9.1 'Ganymede'
+  26. Version 0.9.1 'Ganymede'
   ============================
 
 This is a bug fix release
@@ -1451,7 +1606,7 @@ This is a bug fix release
 - Python Plugin installer to install PyQGIS plugins from the repository
 
 
-  26. Version 0.9 'Ganymede'
+  27. Version 0.9 'Ganymede'
   ==========================
 
 - Python bindings - This is the major focus of this release
@@ -1466,7 +1621,7 @@ This is a bug fix release
 - Improvements to the GeoReferencer
 
 
-  27. Version 0.8 'Joesephine' .... development version
+  28. Version 0.8 'Joesephine' .... development version
   =====================================================
 
 - 2006-01-23 [timlinux] 0.7.9.10 Dropped use of qpicture and resampling for point markers in favour of
@@ -1490,7 +1645,7 @@ over time,
 grid_maker plugin
 
 
-  28. Version 0.6 'Simon'
+  29. Version 0.6 'Simon'
   =======================
 
 QGIS Change Log
@@ -1578,7 +1733,7 @@ under construction.
  save or save as (if not specified by the user). 
 
 
-  29. 0.5
+  30. 0.5
   =======
 
 - 2004-12-01 [gsherman] 0.5.0devel30 Added functions to qgsdataprovider.h to support updating the feature count
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
index 3459dc7d291..a9e3e4a5b9a 100644
--- a/doc/INSTALL.html
+++ b/doc/INSTALL.html
@@ -5,7 +5,7 @@
 
 QGIS
 
-
+