Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge From QGIS #2

Merged
merged 23 commits into from
Dec 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5bf8d2c
Pass project when creating relation from Xml
dmarteau Dec 19, 2019
5eaaf73
Ignore test file in spell check
m-kuhn Dec 21, 2019
907b273
Add missing parameter documentation
dmarteau Dec 21, 2019
4f625ce
Merge pull request #33476 from dmarteau/fix-project-relation-manager
m-kuhn Dec 23, 2019
cd8b6be
Fix stored expression remove
elpaso Dec 25, 2019
df102a9
[needs-docs] Drop setting for maximum number of point label candidates
nyalldawson Dec 18, 2019
1899f90
[needs-docs] Rework label engine "maximum line candidates" and "maxim…
nyalldawson Dec 20, 2019
ad825c9
Test updates
nyalldawson Dec 21, 2019
f44c229
Fix dox test
nyalldawson Dec 21, 2019
322eb31
More test updates
nyalldawson Dec 21, 2019
664517a
Rework layout
nyalldawson Dec 22, 2019
7e3de3a
Build fixes
nyalldawson Dec 22, 2019
c5e0ada
[needs-docs] Add optional global settings allowing for hard limits
nyalldawson Dec 22, 2019
da2419c
Fix variable name
nyalldawson Dec 23, 2019
032e8fd
Add some explanatory comments on the logic happening while ranking
nyalldawson Dec 24, 2019
bb42c43
Fix bug in polygon label candidate ranking
nyalldawson Dec 24, 2019
5f848be
Add another TODO bug note
nyalldawson Dec 24, 2019
13d4096
[pal] Scale coordinates stored in pal rtrees to full float ranges
nyalldawson Dec 24, 2019
157a670
txt2tags 3.3: drop --css-sugar --css-inside (closes #33516)
jef-n Dec 26, 2019
e2488ea
Merge pull request #33521 from elpaso/stored-expressions-fix-rm
elpaso Dec 26, 2019
4557a31
[HIG] Remove colon from widget label in status bar
DelazJ Dec 26, 2019
c004f40
Fix build
nyalldawson Dec 26, 2019
ddd2c6e
Expose QgsBearingUtils to QML
nirvn Dec 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Tuesday October 08, 2019
Wednesday December 25, 2019


Last Updated: Tuesday October 08, 2019
Last Change : Tuesday October 08, 2019
Last Updated: Wednesday December 25, 2019
Last Change : Wednesday December 25, 2019


1. Introduction
Expand Down
28 changes: 14 additions & 14 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Friday October 25, 2019
Wednesday December 25, 2019


------------------------------------------------------------------------
Expand Down Expand Up @@ -46,8 +46,8 @@ Friday October 25, 2019
------------------------------------------------------------------------


Last Updated: Friday October 25, 2019
Last Change : Friday October 25, 2019
Last Updated: Wednesday December 25, 2019
Last Change : Wednesday December 25, 2019


1. What's new in Version 3.10 'A Coruña'?
Expand Down Expand Up @@ -957,7 +957,7 @@ This is the minor release sports a number of great new features:


15. What's new in Version 2.2.0 'Valmiera'?
==========================================
===========================================

This is the minor release sports a number of great new features:

Expand Down Expand Up @@ -998,15 +998,15 @@ This is the minor release sports a number of great new features:


16. What's new in Version 2.0.1 'Dufour'?
========================================
=========================================

This is a small bugfix release to address the missing copyright / credits for
our new splash screen and to update supporting documentation. The spanish
translation was also updated.


17. What's new in Version 2.0.0 'Dufour'?
========================================
=========================================

This is a new major release. Building on the foundation of
QGIS 1.x.x releases, QGIS Dufour introduces many new features,
Expand Down Expand Up @@ -1092,7 +1092,7 @@ key new features.


18. What's new in Version 1.8.0 'Lisboa'?
========================================
=========================================

This is a new feature release. Building on the foundation of
QGIS 1.7.x releases, Lisboa introduces many new features,
Expand Down Expand Up @@ -1147,7 +1147,7 @@ added gdal_fillnodata to GDALTools plugin


19. What's new in Version 1.7.2 'Wroclaw'?
=========================================
==========================================

This is a bugfix release over version 1.7.1. The following changes
were made.
Expand Down Expand Up @@ -1194,7 +1194,7 @@ were made.


20. What's new in Version 1.7.1 'Wroclaw'?
=========================================
==========================================

This is a bugfix release over version 1.7.0. The following changes
were made.
Expand Down Expand Up @@ -1257,7 +1257,7 @@ http://linfiniti.com/2011/08/improvements-to-raster-performance-in-qgis-master/]


21. What's new in Version 1.7.0 'Wroclaw'?
=========================================
==========================================

This release is named after the town of Wroclaw in Poland. The Department of
Climatology and Atmosphere Protection, University of Wroclaw kindly hosted our
Expand Down Expand Up @@ -1391,7 +1391,7 @@ changed so we will just provide a bullet list of key new features here.


22. What's new in Version 1.6.0 'Capiapo'?
=========================================
==========================================

Please note that this is a release in our 'cutting edge' release series. As
such it contains new features and extends the programmatic interface over QGIS
Expand Down Expand Up @@ -1484,7 +1484,7 @@ position dialog.


23. What's new in Version 1.5.0?
===============================
================================

Please note that this is a release in our 'cutting edge' release series. As
such it contains new features and extends the programmatic interface over QGIS
Expand Down Expand Up @@ -1584,7 +1584,7 @@ variables. More paths can be passed, separated by semicolon.


24. What's new in Version 1.4.0 'Enceladus'?
===========================================
============================================

Please note that this is a release in our 'cutting edge' release series. As
such it contains new features and extends the programmatic interface over QGIS
Expand Down Expand Up @@ -1642,7 +1642,7 @@ Designer dialog UIs.


25. What's new in Version 1.3.0 'Mimas'?
=======================================
========================================

This release includes over 30 bug fixes and several useful new features:

Expand Down
Loading