From d706c080e7f11d86804a4f54b61e6864f22e760d Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Sat, 19 Sep 2020 11:27:25 +0300 Subject: [PATCH 1/3] #2486: Change Gitter to Matrix Fixes #2486. --- README.md | 3 +-- app/views/integrations/help.html.erb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c4cb75e71..753197c77 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,7 @@ * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues * Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki * Mailing list: http://groups.google.com/group/TracksApp -* IRC channel: #tracks on Freenode -* Gitter: https://gitter.im/TracksApp/tracks +* IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org) * Original developer: bsag (http://www.rousette.org.uk/) * Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/) * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors diff --git a/app/views/integrations/help.html.erb b/app/views/integrations/help.html.erb index 5cd0fca6f..3ae78ec79 100644 --- a/app/views/integrations/help.html.erb +++ b/app/views/integrations/help.html.erb @@ -8,6 +8,6 @@ From e474ee564ae3648cfb5ea2c536c6f60856f96718 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Sep 2020 13:10:38 +0300 Subject: [PATCH 2/3] More fixes to README --- README.md | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 753197c77..7209fb525 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,34 @@ -# Tracks: a GTD(TM) web application, built with Ruby on Rails +# Tracks: a GTD™ compatible web application built with Ruby on Rails [![Build Status](https://github.com/TracksApp/tracks/workflows/Continuous%20Integration/badge.svg)](https://github.com/TracksApp/tracks/actions) [![Code Climate](https://codeclimate.com/github/TracksApp/tracks/badges/gpa.svg)](https://codeclimate.com/github/TracksApp/tracks) +## About + * Project homepage: http://www.getontracks.org/ * Manual: http://www.getontracks.org/manual/ * Source at GitHub: https://github.com/TracksApp/tracks +* Hosted services: https://github.com/TracksApp/tracks/wiki/Hosted-Tracks * Bug reports and feature requests: https://github.com/TracksApp/tracks/issues -* Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki * Mailing list: http://groups.google.com/group/TracksApp * IRC channel: #tracks on Freenode, available also on [Matrix](https://matrix.to/#/#tracks:matrix.org) -* Original developer: bsag (http://www.rousette.org.uk/) -* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) (sponsored by Ardcoras oy, https://www.ardcoras.fi/) -* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors * License: See COPYING Full instructions for both new installations and upgrades from older installations of Tracks can be found in the [wiki](https://github.com/TracksApp/tracks/wiki/Installation). -If you are thinking about contributing towards the development of Tracks, -please read /CONTRIBUTING.md for general information. Also you can find -some information on development, testing and contributing on the wiki. - As always, make sure that you take sensible precautions and back up all your data frequently, taking particular care when you are upgrading. Enjoy being productive! + +## Contributors and consulting + +* Original developer: bsag (http://www.rousette.org.uk/) +* Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) + (sponsored by Ardcoras oy, https://www.ardcoras.fi/). +* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors + +If you are thinking about contributing towards the development of Tracks, +please read /CONTRIBUTING.md for general information. Also you can find +some information on development, testing and contributing on the wiki. From 9b27b08856edb1b59751996f350c2d62b3371d71 Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 23 Sep 2020 13:12:18 +0300 Subject: [PATCH 3/3] #2486: Fix the syntax and move Matrix together with IRC --- README.md | 2 +- app/views/integrations/help.html.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7209fb525..11d9dbc21 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Enjoy being productive! * Original developer: bsag (http://www.rousette.org.uk/) * Principal maintainer: [Jyri-Petteri ”ZeiP” Paloposki](https://github.com/ZeiP) - (sponsored by Ardcoras oy, https://www.ardcoras.fi/). + (sponsored by [Ardcoras oy](https://www.ardcoras.fi/), also available for paid consulting) * Contributors: https://github.com/TracksApp/tracks/wiki/Contributors If you are thinking about contributing towards the development of Tracks, diff --git a/app/views/integrations/help.html.erb b/app/views/integrations/help.html.erb index 3ae78ec79..7402f8544 100644 --- a/app/views/integrations/help.html.erb +++ b/app/views/integrations/help.html.erb @@ -8,6 +8,5 @@