From 48a2facef4dfd39c058ba0d7c65766ef3f7be7c1 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 20 Mar 2016 20:38:28 +0100 Subject: [PATCH 1/5] Fix typo (found by codespell) Signed-off-by: Stefan Weil --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c468e1d..60a92af9 100644 --- a/README.md +++ b/README.md @@ -325,7 +325,7 @@ _[Extensible Messaging and Presence Protocol](https://en.wikipedia.org/wiki/XMPP * [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript. ([Source Code](https://github.com/candy-chat/candy)) `MIT` `JavaScript` * [Converse.js](https://conversejs.org/) - A free and open-source XMPP chat client in your browser. ([Source Code](https://github.com/jcbrand/converse.js)) `MPLv2` `Javascript` * [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives. ([Source Code](https://github.com/digicoop/kaiwa)) `MIT` `Javascript, NodeJS` - * [Kontalk](http://kontalk.org/) – Kontalk is an Open Source Messenger, similiar to WhatsApp (app for android only currently), including end-to-end encryption, server is based on Tigase XMPP Server. ([Source Code](https://github.com/kontalk)) `GPLv3` + * [Kontalk](http://kontalk.org/) – Kontalk is an Open Source Messenger, similar to WhatsApp (app for android only currently), including end-to-end encryption, server is based on Tigase XMPP Server. ([Source Code](https://github.com/kontalk)) `GPLv3` * [Salut à Toi](http://www.salut-a-toi.org/) - Multipurpose, multi frontend, libre and decentralised communication tool. ([Source Code](http://repos.goffi.org/sat)) `AGPLv3` `Python` * [Libervia](http://wiki.goffi.org/wiki/Libervia/en) - Web frontend from Salut à Toi. ([Source Code](http://repos.goffi.org/libervia)) `AGPLv3` `Python` From 608dc53cd9433496a1d282f82e7eea6a3ed04e57 Mon Sep 17 00:00:00 2001 From: paddo Date: Sun, 20 Mar 2016 22:52:25 +0100 Subject: [PATCH 2/5] added php password manager --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c468e1d..baa87390 100644 --- a/README.md +++ b/README.md @@ -639,7 +639,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com * [RatticDB](http://rattic.org/) - Password Management for Humans. ([Source Code](https://github.com/tildaslash/RatticWeb), [Demo](https://demo.rattic.org/cred/list/)) * [Teampass](http://teampass.net/) - Password manager dedicated for managing passwords in a collaborative way on any server Apache, MySQL and PHP. ([Source Code](https://github.com/nilsteampassnet/TeamPass/)) `GPLv3` `PHP` * [keeweb](https://antelle.github.io/keeweb/) - This webapp is a browser and desktop password manager compatible with KeePass databases. ([Source Code](https://github.com/antelle/keeweb)) `MIT` `JavaScript` - +* [PHP Password Manager](https://github.com/pklink/ppma) - A web based, encrypting password manager, based on the Yii framework. ([Source Code](https://github.com/pklink/ppma)) `BSD` `PHP` ## Pastebins From 8e59a0eb2a355c94dc54e6f2f7254a6ecba1ec92 Mon Sep 17 00:00:00 2001 From: paddo Date: Wed, 23 Mar 2016 18:14:53 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index baa87390..c48005c2 100644 --- a/README.md +++ b/README.md @@ -636,11 +636,10 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com ## Password Managers + * [keeweb](https://antelle.github.io/keeweb/) - This webapp is a browser and desktop password manager compatible with KeePass databases. ([Source Code](https://github.com/antelle/keeweb)) `MIT` `JavaScript` + * [PHP Password Manager](https://github.com/pklink/ppma) - A web based, encrypting password manager, based on the Yii framework. ([Source Code](https://github.com/pklink/ppma)) `BSD` `PHP` * [RatticDB](http://rattic.org/) - Password Management for Humans. ([Source Code](https://github.com/tildaslash/RatticWeb), [Demo](https://demo.rattic.org/cred/list/)) * [Teampass](http://teampass.net/) - Password manager dedicated for managing passwords in a collaborative way on any server Apache, MySQL and PHP. ([Source Code](https://github.com/nilsteampassnet/TeamPass/)) `GPLv3` `PHP` - * [keeweb](https://antelle.github.io/keeweb/) - This webapp is a browser and desktop password manager compatible with KeePass databases. ([Source Code](https://github.com/antelle/keeweb)) `MIT` `JavaScript` -* [PHP Password Manager](https://github.com/pklink/ppma) - A web based, encrypting password manager, based on the Yii framework. ([Source Code](https://github.com/pklink/ppma)) `BSD` `PHP` - ## Pastebins * [0bin](https://github.com/sametmax/0bin) - Client side encrypted pastebin. `WTFPL` `Python` From 4962d8641238117cb30a36dfc14766c8335d73d8 Mon Sep 17 00:00:00 2001 From: paddo Date: Wed, 23 Mar 2016 18:16:13 +0100 Subject: [PATCH 4/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c48005c2..2af849fc 100644 --- a/README.md +++ b/README.md @@ -640,6 +640,8 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com * [PHP Password Manager](https://github.com/pklink/ppma) - A web based, encrypting password manager, based on the Yii framework. ([Source Code](https://github.com/pklink/ppma)) `BSD` `PHP` * [RatticDB](http://rattic.org/) - Password Management for Humans. ([Source Code](https://github.com/tildaslash/RatticWeb), [Demo](https://demo.rattic.org/cred/list/)) * [Teampass](http://teampass.net/) - Password manager dedicated for managing passwords in a collaborative way on any server Apache, MySQL and PHP. ([Source Code](https://github.com/nilsteampassnet/TeamPass/)) `GPLv3` `PHP` + + ## Pastebins * [0bin](https://github.com/sametmax/0bin) - Client side encrypted pastebin. `WTFPL` `Python` From e205a777285cc85a1ebe046eeea96686c6fd589d Mon Sep 17 00:00:00 2001 From: paddo Date: Wed, 30 Mar 2016 10:19:46 +0200 Subject: [PATCH 5/5] Update README.md updated link to project site --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2af849fc..eb775413 100644 --- a/README.md +++ b/README.md @@ -637,7 +637,7 @@ See https://github.com/n1trux/awesome-sysadmin#monitoring and https://github.com ## Password Managers * [keeweb](https://antelle.github.io/keeweb/) - This webapp is a browser and desktop password manager compatible with KeePass databases. ([Source Code](https://github.com/antelle/keeweb)) `MIT` `JavaScript` - * [PHP Password Manager](https://github.com/pklink/ppma) - A web based, encrypting password manager, based on the Yii framework. ([Source Code](https://github.com/pklink/ppma)) `BSD` `PHP` + * [PHP Password Manager](http://www.ppma.pw) - A web based, encrypting password manager, based on the Yii framework. ([Source Code](https://github.com/pklink/ppma)) `BSD` `PHP` * [RatticDB](http://rattic.org/) - Password Management for Humans. ([Source Code](https://github.com/tildaslash/RatticWeb), [Demo](https://demo.rattic.org/cred/list/)) * [Teampass](http://teampass.net/) - Password manager dedicated for managing passwords in a collaborative way on any server Apache, MySQL and PHP. ([Source Code](https://github.com/nilsteampassnet/TeamPass/)) `GPLv3` `PHP`