diff --git a/Home.md b/Home.md index 5a32555..817258c 100644 --- a/Home.md +++ b/Home.md @@ -1,7 +1,18 @@ -Welcome to the QGIS wiki! +## Welcome to the QGIS wiki! -Please **do not** use this wiki for documentation. The primary intent of this wiki is to organise our regular hackfests. If in doubt as to whether something is appropriate for the wiki, please contact someone from the QGIS Community group. Archive can be found there: http://hub.qgis.org/wiki/quantum-gis/Users_Corner#QGIS-User-Meetings +Please **do not** use this wiki for documentation. The primary intent of this wiki is to organise our regular hackfests and other regular community events. If in doubt as to whether something is appropriate for the wiki, please contact someone from the QGIS Community group. + + +### QGIS Grant Programme Calls + +Call # | Value | Date | Application Form | Call for proposals | Grant Announcement +------- | ----- | ---- | --------------- | ------------------ | ------------------ +1 | 20,000 EUR | Aug 2016 | [Form closed](https://goo.gl/forms/ADDuYhlgWS9UlKe82) | [Blog Post](http://blog.qgis.org/2016/08/04/qgis-grants-call-for-applications/) | [Blog Post](http://blog.qgis.org/2016/10/04/winning-qgis-grant-proposals-for-2016/) + +### QGIS Hackfests + +An archive of older event pages can be found [here](http://hub.qgis.org/wiki/quantum-gis/Users_Corner#QGIS-User-Meetings). Hackfest # | Venue | Date | Page ---------- | ----- | ---- | ----- @@ -9,9 +20,10 @@ Hackfest # | Venue | Date | Page 17 | Lyon | 12-13 December 2016 | [Lyon 2016](Code-Sprint-QGIS-3-Lyon,-end-2016) 16 | Bonn | 21-23 August 2016 | [Bonn 2016](QGIS-Hackfest---Bonn---August-2016) -### PSC Minutes -This is also the location for the PSC meeting minutes: +### PSC Meeting Minutes + +This is a list of QGIS PSC meeting minutes, available for public reference: **2017** @@ -30,4 +42,4 @@ This is also the location for the PSC meeting minutes: * [April 2016](https://docs.google.com/document/d/1JEGGXsvj72gZ72PiM6E0KhpUwWbLMCzdUJ4cHFZywjk/edit?usp=sharing) * [March 2016](https://docs.google.com/document/d/1arzcgoU0NErm8yiqDvCeasFUdr9zt-8JUx15f3ivTdw/edit?usp=sharing) * [February 2016](https://docs.google.com/document/d/15Wulk-d2gOhQixqFZxyfopTuwGXn9EOtG2-gLigV-4c/edit?usp=sharing) -* [January 2016](https://docs.google.com/document/d/1MZQ7CXOBMOuuQVi46TPzueL0LuYTTi4cLFcwN5FA2EE/edit?usp=sharing) +* [January 2016](https://docs.google.com/document/d/1MZQ7CXOBMOuuQVi46TPzueL0LuYTTi4cLFcwN5FA2EE/edit?usp=sharing) \ No newline at end of file