Skip to content

Commit

Permalink
followup #a86f5ea52d75862c190105d1ceb23c47a61bba4e fix issues links
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Apr 30, 2017
2 parents 70da6b6 + a86f5ea commit bbdc77d
Show file tree
Hide file tree
Showing 148 changed files with 16,423 additions and 4,160 deletions.
3 changes: 0 additions & 3 deletions .ci/travis/macos/blacklist.txt
Expand Up @@ -15,9 +15,7 @@ qgis_composerrotationtest
qgis_composerscalebartest
qgis_composerutilstest
qgis_composertablev2test
qgis_distanceareatest
qgis_diagramtest
qgis_expressiontest
qgis_fontmarkertest
qgis_labelingenginetest
qgis_legendrenderertest
Expand All @@ -30,7 +28,6 @@ PyQgsAtlasComposition
PyQgsComposerLegend
PyQgsComposerMapGrid
PyQgsDistanceArea
PyQgsJSONUtils
PyQgsPalLabelingBase
PyQgsPalLabelingPlacement
PyQgsPalLabelingComposer
Expand Down
6 changes: 3 additions & 3 deletions BUGS
Expand Up @@ -3,11 +3,11 @@

If you find a bug in QGIS, you can search for it

http://hub.qgis.org/search/index/quantum-gis/issues
https://issues.qgis.org/projects/qgis/search?issues=1

If you can't find an exisitng ticket, report it using the QGIS ticket/bug database at:
If you can't find an existing ticket, report it using the QGIS ticket/bug database at:

http://hub.qgis.org/projects/quantum-gis/issues/new
https://issues.qgis.org/projects/qgis/issues/new


Some hints about when you should file a bug:
Expand Down
14 changes: 7 additions & 7 deletions INSTALL
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Thursday April 20, 2017
Saturday April 29, 2017


Last Updated: Thursday April 20, 2017
Last Change : Thursday April 20, 2017
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017


1. Introduction
Expand Down Expand Up @@ -1897,13 +1897,13 @@ to the QGIS application. Assuming you installed QGIS in your home folder:
If you installed in /Applications, adjust the path accordingly and prefix the
whole command with 'sudo '.

QGIS Mapserver
QGIS Server

See the QGIS Mapserver wiki page at:
See the QGIS Server documentation page at:

http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial
http://docs.qgis.org/2.18/en/docs/user_manual/working_with_ogc/ogc_server_support.html

for instructions on setting up Apache fastcgi and testing Mapserver, including
for instructions on setting up Apache fastcgi and testing qgis server, including
installing the mod-fastcgi that is missing on Lion.


Expand Down
8 changes: 4 additions & 4 deletions NEWS
@@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Tuesday March 14, 2017
Saturday April 29, 2017


------------------------------------------------------------------------
Expand Down Expand Up @@ -39,8 +39,8 @@ Tuesday March 14, 2017
------------------------------------------------------------------------


Last Updated: Tuesday March 14, 2017
Last Change : Sunday March 12, 2017
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017


1. What's new in Version 2.16 'Nødebo'?
Expand Down Expand Up @@ -539,7 +539,7 @@ key new features.
a simple key lookup, no more index lookup and attribute maps.
Note: Most plugins written for QGIS < 1.x will need to be
ported to work correctly in QGIS 2.x. Please consult
http://hub.qgis.org/wiki/quantum-gis/Python_plugin_API_changes_from_18_to_20
https://github.com/qgis/QGIS/wiki/Python_plugin_API_changes_from_18_to_20
for more details.
- The raster data provider system has been completely overhauled. One of
the best new features stemming from this work is the ability to 'Layer ->
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -56,7 +56,7 @@ installation document in qgis/doc/index.html. The installation document is
also available as PDF in the same directory.

## Help us
Please submit bug reports using the [QGIS bug tracker](https://hub.qgis.org/).
Please submit bug reports using the [QGIS bug tracker](https://issues.qgis.org/).
When reporting a bug, either login or, if you don't have a qgis trac, provide
an email address where we can request additional information.

Expand All @@ -74,6 +74,6 @@ QGIS is on GitHub at https://github.com/qgis/QGIS. If you wish to contribute
patches you can [fork the project](https://help.github.com/forking/), make your changes, commit to your
repository, and then [issue a pull request](http://help.github.com/pull-requests/). The development team can then
review your contribution and commit it upstream as appropriate.
If you commit a new feature, add [FEATURE] to your commit message AND give a clear description of the new feature. A webhook will automatically create an issue on the QGIS-Documentation repo to tell people to write about it.
If you commit a new feature, add [FEATURE] to your commit message AND give a clear description of the new feature. A webhook will automatically create an issue on the QGIS-Documentation repo to tell people to write documentation about it.

If you are not a developer, there are many other possibilities which do not require programming skills to help QGIS to evolve. Check our [project homepage for more information](http://qgis.org/en/site/getinvolved/index.html).
4 changes: 2 additions & 2 deletions debian/upstream/metadata
@@ -1,6 +1,6 @@
---
Bug-Database: https://hub.qgis.org/projects/quantum-gis/issues
Bug-Submit: https://hub.qgis.org/projects/quantum-gis/issues/new
Bug-Database: https://issues.qgis.org/projects/qgis/issues
Bug-Submit: https://issues.qgis.org/projects/qgis/issues/new
Contact: qgis-developer@lists.osgeo.org
Donation: https://qgis.org/en/site/getinvolved/donations.html
Name: QGIS
Expand Down
14 changes: 7 additions & 7 deletions doc/INSTALL.html
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Thursday April 20, 2017</H3>
<H3>Saturday April 29, 2017</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Thursday April 20, 2017
Last Change : Thursday April 20, 2017
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -2647,16 +2647,16 @@ <H2>5.9. Post-Install</H2>
whole command with 'sudo '.
</P>
<P>
<B>QGIS Mapserver</B>
<B>QGIS Server</B>
</P>
<P>
See the QGIS Mapserver wiki page at:
See the QGIS Server documentation page at:
</P>
<P>
<A HREF="http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial">http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial</A>
<A HREF="http://docs.qgis.org/2.18/en/docs/user_manual/working_with_ogc/ogc_server_support.html">http://docs.qgis.org/2.18/en/docs/user_manual/working_with_ogc/ogc_server_support.html</A>
</P>
<P>
for instructions on setting up Apache fastcgi and testing Mapserver, including
for instructions on setting up Apache fastcgi and testing qgis server, including
installing the mod-fastcgi that is missing on Lion.
</P>

Expand Down
2 changes: 1 addition & 1 deletion doc/index.dox
Expand Up @@ -50,7 +50,7 @@ users and developers.

\section index_bugs Bug Reporting
If you think you have found a bug, please report it using our <a
href="http://hub.qgis.org/projects/quantum-gis">bug tracker</a>. When reporting bugs,
href="https://issues.qgis.org/projects/qgis">bug tracker</a>. When reporting bugs,
please include some contact information in case we need help with replicating
your issue.

Expand Down
12 changes: 6 additions & 6 deletions doc/news.html
Expand Up @@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS News</TITLE>

<!-- Included doc/style.css -->
<!-- Included /home/fischer/src/qgis/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
Expand Down Expand Up @@ -77,7 +77,7 @@
<DIV CLASS="header" ID="header">
<H1>QGIS News</H1>
<H2>Change history for the QGIS Project</H2>
<H3>Tuesday March 14, 2017</H3>
<H3>Saturday April 29, 2017</H3>
</DIV>

<DIV CLASS="toc">
Expand Down Expand Up @@ -116,8 +116,8 @@ <H3>Tuesday March 14, 2017</H3>
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday March 14, 2017
Last Change : Sunday March 12, 2017
Last Updated: Saturday April 29, 2017
Last Change : Saturday April 29, 2017
</P>

<A NAME="toc1"></A>
Expand Down Expand Up @@ -644,7 +644,7 @@ <H1>10. Whats new in Version 2.0.0 'Dufour'?</H1>
a simple key lookup, no more index lookup and attribute maps.
<B>Note:</B> Most plugins written for QGIS &lt; 1.x will need to be
ported to work correctly in QGIS 2.x. Please consult
<A HREF="http://hub.qgis.org/wiki/quantum-gis/Python_plugin_API_changes_from_18_to_20">http://hub.qgis.org/wiki/quantum-gis/Python_plugin_API_changes_from_18_to_20</A>
<A HREF="https://github.com/qgis/QGIS/wiki/Python_plugin_API_changes_from_18_to_20">https://github.com/qgis/QGIS/wiki/Python_plugin_API_changes_from_18_to_20</A>
for more details.
<LI>The raster data provider system has been completely overhauled. One of
the best new features stemming from this work is the ability to 'Layer -&gt;
Expand Down Expand Up @@ -3091,5 +3091,5 @@ <H1>28. 0.5</H1>
</DIV>

<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/news.html -t html doc/news.t2t -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-qt5/doc/news.html -t html /home/fischer/src/qgis/doc/news.t2t -->
</BODY></HTML>
2 changes: 1 addition & 1 deletion doc/news.t2t
Expand Up @@ -526,7 +526,7 @@ key new features.
a simple key lookup, no more index lookup and attribute maps.
**Note:** Most plugins written for QGIS < 1.x will need to be
ported to work correctly in QGIS 2.x. Please consult
http://hub.qgis.org/wiki/quantum-gis/Python_plugin_API_changes_from_18_to_20
https://github.com/qgis/QGIS/wiki/Python_plugin_API_changes_from_18_to_20
for more details.
- The raster data provider system has been completely overhauled. One of
the best new features stemming from this work is the ability to 'Layer ->
Expand Down
9 changes: 4 additions & 5 deletions doc/osx.t2t
Expand Up @@ -946,12 +946,11 @@ cp -fp /Applications/GPSBabelFE.app/Contents/MacOS/gpsbabel ~/QGIS.app/Contents/
If you installed in /Applications, adjust the path accordingly and prefix the
whole command with 'sudo '.

**QGIS Mapserver**
**QGIS Server**

See the QGIS Mapserver wiki page at:
See the QGIS Server documentation page at:

http://hub.qgis.org/projects/quantum-gis/wiki/QGIS_Server_Tutorial
http://docs.qgis.org/2.18/en/docs/user_manual/working_with_ogc/ogc_server_support.html

for instructions on setting up Apache fastcgi and testing Mapserver, including
for instructions on setting up Apache fastcgi and testing qgis server, including
installing the mod-fastcgi that is missing on Lion.

13 changes: 11 additions & 2 deletions mac/app.info.plist.in
Expand Up @@ -15,7 +15,7 @@
<key>CFBundleSignature</key>
<string>QGIS</string>
<key>CFBundleGetInfoString</key>
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2016 QGIS Development Team</string>
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA}), © 2002-2017 QGIS Development Team</string>
<key>CFBundleShortVersionString</key>
<string>${COMPLETE_VERSION}</string>
<key>CFBundleVersion</key>
Expand Down Expand Up @@ -252,7 +252,7 @@
<array>
<string>sqlite</string>
</array>
</dict>
</dict>
</array>
<key>CFBundleLocalizations</key>
<array>
Expand Down Expand Up @@ -304,5 +304,14 @@
<string>zh_CN</string>
<string>zh_TW</string>
</array>
<key>LSEnvironment</key>
<dict>
<key>QT_AUTO_SCREEN_SCALE_FACTOR</key>
<string>1</string>
</dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict>
</plist>
22 changes: 0 additions & 22 deletions python/auto_sip.blacklist
Expand Up @@ -94,7 +94,6 @@ core/qgsstatisticalsummary.sip
core/qgsstringstatisticalsummary.sip
core/qgsstringutils.sip
core/qgstaskmanager.sip
core/qgstextrenderer.sip
core/qgstolerance.sip
core/qgstracer.sip
core/qgstrackedvectorlayertools.sip
Expand Down Expand Up @@ -268,27 +267,6 @@ core/symbology-ng/qgssymbollayerutils.sip
core/symbology-ng/qgsvectorfieldsymbollayer.sip
core/symbology-ng/qgsarrowsymbollayer.sip
core/dxf/qgsdxfexport.sip
core/geometry/qgsabstractgeometry.sip
core/geometry/qgscircularstring.sip
core/geometry/qgscompoundcurve.sip
core/geometry/qgscurvepolygon.sip
core/geometry/qgscurve.sip
core/geometry/qgsgeometry.sip
core/geometry/qgsgeometrycollection.sip
core/geometry/qgsgeometryengine.sip
core/geometry/qgsgeometryutils.sip
core/geometry/qgslinestring.sip
core/geometry/qgsmulticurve.sip
core/geometry/qgsmultilinestring.sip
core/geometry/qgsmultipoint.sip
core/geometry/qgsmultipolygon.sip
core/geometry/qgsmultisurface.sip
core/geometry/qgspointv2.sip
core/geometry/qgspolygon.sip
core/geometry/qgssurface.sip
core/geometry/qgstriangle.sip
core/geometry/qgswkbtypes.sip
core/geometry/qgswkbptr.sip
gui/qgsblendmodecombobox.sip
gui/qgisinterface.sip
gui/qgsactionmenu.sip
Expand Down

0 comments on commit bbdc77d

Please sign in to comment.