From 7804e7e2e4e6aeb9f3780ce6fd4f1fec80aba999 Mon Sep 17 00:00:00 2001 From: Kovah Date: Tue, 6 Dec 2016 10:38:18 +0100 Subject: [PATCH 1/2] Adds cartulary and the CDDL license (#299) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 455ee35c..2c1cc02e 100644 --- a/README.md +++ b/README.md @@ -339,6 +339,7 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_ * [Bootcamp](http://trybootcamp.vitorfs.com) - An enterprise social network. ([Source Code](https://github.com/vitorfs/bootcamp)) `MIT` `Python` * [Buddycloud](http://buddycloud.com/) - Tools, libraries, services and a community to build user-to-user, group and social messaging into your app. Saves time. Scales up. Supports you. ([Source Code](https://github.com/buddycloud)) `Apache` `Java` * [BuddyPress](https://buddypress.org/about/) - A powerful plugin that takes your WordPress.org powered site beyond the blog with social-network features like user profiles, activity streams, user groups, and more. ([Source Code](https://buddypress.svn.wordpress.org/trunk/)) `GPLv2` `PHP` + * [cartulary](https://github.com/daveajones/cartulary) - A web-based digital archiver. ([Source Code](https://github.com/daveajones/cartulary)) `CDDL` `PHP` * [diaspora*](https://diasporafoundation.org/) - Distributed social networking server. ([Demo](http://podupti.me/random.php), [Source Code](https://github.com/diaspora/diaspora)) `AGPLv3` `Ruby` * [Discourse](http://www.discourse.org/) - Advanced forum / community solution based on Ruby and JS. ([Source Code](https://github.com/discourse/discourse)) `GPLv2` `Ruby` * [Elgg](https://elgg.org/) - A powerful open source social networking engine. ([Source Code](https://github.com/Elgg/Elgg)) `GPLv2` `PHP` @@ -1158,6 +1159,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt * `CCBYNCv4` - [Creative Commons Attribution-NonCommercial 4.0 International](https://creativecommons.org/licenses/by-nc/4.0/) * `CCBYSAv4 - [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) * `CC0` - [Public Domain](https://creativecommons.org/about/cc0/) + * `CDDL` - [Common Development and Distribution License](https://opensource.org/licenses/CDDL-1.0) * `CeCILL-B` - [CEA CNRS INRIA Logiciel Libre](http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt) * `CPALv1` - [Common Public Attribution License Version 1.0](http://opensource.org/licenses/CPAL-1.0) * `DPL` - [Devblocks Public License 1.0](http://www.cerberusweb.com/license) From 376d7faed15304ce4f1c7725320785a3d5097e6c Mon Sep 17 00:00:00 2001 From: Kovah Date: Tue, 6 Dec 2016 14:27:21 +0100 Subject: [PATCH 2/2] Updates description for cartulary and removes duplicate link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c1cc02e..ffc408d5 100644 --- a/README.md +++ b/README.md @@ -339,7 +339,7 @@ _[IPBX](https://en.wikipedia.org/wiki/IP_PBX) telephony software_ * [Bootcamp](http://trybootcamp.vitorfs.com) - An enterprise social network. ([Source Code](https://github.com/vitorfs/bootcamp)) `MIT` `Python` * [Buddycloud](http://buddycloud.com/) - Tools, libraries, services and a community to build user-to-user, group and social messaging into your app. Saves time. Scales up. Supports you. ([Source Code](https://github.com/buddycloud)) `Apache` `Java` * [BuddyPress](https://buddypress.org/about/) - A powerful plugin that takes your WordPress.org powered site beyond the blog with social-network features like user profiles, activity streams, user groups, and more. ([Source Code](https://buddypress.svn.wordpress.org/trunk/)) `GPLv2` `PHP` - * [cartulary](https://github.com/daveajones/cartulary) - A web-based digital archiver. ([Source Code](https://github.com/daveajones/cartulary)) `CDDL` `PHP` + * [cartulary](https://github.com/daveajones/cartulary) - RSS reader, readability tool, article archiver, microblogger, social graph manager and reading list manager. `CDDL` `PHP` * [diaspora*](https://diasporafoundation.org/) - Distributed social networking server. ([Demo](http://podupti.me/random.php), [Source Code](https://github.com/diaspora/diaspora)) `AGPLv3` `Ruby` * [Discourse](http://www.discourse.org/) - Advanced forum / community solution based on Ruby and JS. ([Source Code](https://github.com/discourse/discourse)) `GPLv2` `Ruby` * [Elgg](https://elgg.org/) - A powerful open source social networking engine. ([Source Code](https://github.com/Elgg/Elgg)) `GPLv2` `PHP`