From e70d578548bb086722ee6b82b51db4eb62f26506 Mon Sep 17 00:00:00 2001 From: Thomas Dalichow Date: Mon, 13 Jul 2015 23:47:59 +0200 Subject: [PATCH 1/3] fix typo for Private Cloud_s --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a1a66b8..d50e1fe7 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [Kyélà](http://kyela.net/) - Participation polls for group events - ([Source code](https://github.com/abienvenu/Kyela), [Demo](http://kyela.net/55232734237c8/)) * [MaterialPoll](https://github.com/nearbycoder/materialpoll) - an opensource strawpoll.me clone for creating random polls. - ([Source code](https://github.com/nearbycoder/materialpoll), [Demo](http://materialpoll.tk)) -## Private Cloud +## Private Clouds * [Tine 2.0org](https://www.tine20.org) - Contacts, Calendar, Tasks, WebDAV, ActiveSync, VOIP, Mail-Client, CRM, Sales, Projects, Timetracker - ([Demo](https://demo.tine20.net)) - `GNU-AGPL v3` - other licences involved, see LICENSE-file * [ownCloud](https://owncloud.org/) - All-in-one solution for saving and sharing files, photos, music,... - `GNU-AGPL-3.0` From 3e3af8b42f63d9f16b63a87c520a41dbff1f0753 Mon Sep 17 00:00:00 2001 From: Thomas Dalichow Date: Mon, 13 Jul 2015 23:53:44 +0200 Subject: [PATCH 2/3] add new category 'GPS tracking' and added Traccar to it --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index d50e1fe7..e92d467e 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Table of Contents * [File Synchronization Tools](#file-synchronization-tools) * [Games](#games) * [Gateways](#gateways) + * [GPS tracking](#gps-tracking) * [Groupware](#groupware) * [Link Sharing](#link-sharing) * [Maps](#maps) @@ -166,6 +167,10 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [GateOne](https://github.com/liftoff/GateOne/) - Gate One is an HTML5 web-based terminal emulator and SSH client. - `AGPL 3.0` * [Guacamole](http://guac-dev.org/) - Guacamole is a clientless remote desktop gateway. It supports standard protocols like VNC and RDP. - `Proprietary` +## GPS tracking + + * [Traccar](https://www.traccar.org/) - Java application to track GPS positions. Supports loads of tracking devices and protocols, has an Android and iOS App. Has a web interface to view your trips - ([Demo](http://demo.traccar.org/)) - ([Source](https://github.com/tananaev?tab=repositories)) - Tracking server license: `Apache License 2.0` + ## Groupware * [Kolab](https://kolab.org/) - Kolab community is a unified communication and collaboration system - `Various FLOSS Licenses` ([Source](http://git.kolab.org/)) * [Horde](http://www.horde.org/) - The Horde Project is about creating high quality Open Source applications and libraries, based on PHP and the Horde Framework. - `GPL` + Various Free Software / Open Source Software Licenses From b061b016bf8ff4042fea7356e2a38d3d59abd7c7 Mon Sep 17 00:00:00 2001 From: Thomas Dalichow <2012-02-05.github.com@thomasdalichow.de> Date: Tue, 14 Jul 2015 00:57:52 +0200 Subject: [PATCH 3/3] Adhere to standard format --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e92d467e..67c8ace6 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi ## GPS tracking - * [Traccar](https://www.traccar.org/) - Java application to track GPS positions. Supports loads of tracking devices and protocols, has an Android and iOS App. Has a web interface to view your trips - ([Demo](http://demo.traccar.org/)) - ([Source](https://github.com/tananaev?tab=repositories)) - Tracking server license: `Apache License 2.0` + * [Traccar](https://www.traccar.org/) - Java application to track GPS positions. Supports loads of tracking devices and protocols, has an Android and iOS App. Has a web interface to view your trips - ([Demo](http://demo.traccar.org/)) - ([Source](https://github.com/tananaev?tab=repositories)) - `Apache License 2.0` ## Groupware * [Kolab](https://kolab.org/) - Kolab community is a unified communication and collaboration system - `Various FLOSS Licenses` ([Source](http://git.kolab.org/))