From 007ef3fb2e63f16030f9bffc5f34982949bd9bdb Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 5 Aug 2015 13:11:44 +0200 Subject: [PATCH 1/4] Add Pimcore and MacPass --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f29dd1ee..8b07c91b 100644 --- a/README.md +++ b/README.md @@ -210,6 +210,8 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [SilverStripe](https://www.silverstripe.org) - easy to use CMS with powerful MVC framework underlying. ([Demo](http://demo.silverstripe.org/), [Source code](https://github.com/silverstripe)) `BSD` `PHP` * [SPIP](http://www.spip.net/fr) - Publication system for the Internet. * [Wordpress](https://wordpress.org/) - The worlds most-used blogging and CMS engine. ([Source code mirror](https://github.com/WordPress/WordPress)) `GPLv2` + * [Pimcore](http://www.pimcore.org) Multi-Channel Experience and Engagement Management Platform ([Source code](https://github.com/pimcore/pimcore))) `BSD` `PHP` + ### E-commerce @@ -397,6 +399,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [Keepass](http://keepass.info) - Free, open source, light-weight and easy-to-use password manager. `GPLv2` `C#` * [Rattic](http://rattic.org/) - Password Management for Humans ([Source code](https://github.com/tildaslash/RatticWeb)) * [Teampass](http://www.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` + * [MacPass](https://github.com/mstarke/MacPass) - OSX Port of KeePass ([Source code](https://github.com/mstarke/MacPass)) `GPLv3` `ObjectiveC` ## Pastebins From 769bd2002de022660ff9a9e6abf3ff877ffa7d6d Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 5 Aug 2015 14:16:50 +0200 Subject: [PATCH 2/4] alphabetical order pimcore --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8b07c91b..789f1c0c 100644 --- a/README.md +++ b/README.md @@ -205,12 +205,13 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [Movable Type](https://movabletype.org/) - a powerful solution for the creation and management of web content. * [october](http://octobercms.com/) - Free, open-source, self-hosted CMS platform based on the Laravel PHP Framework. ([Source code](https://github.com/octobercms/october)) `MIT` * [Pagekit](http://pagekit.com/) - A new modern CMS to create and share ([Source code](https://github.com/pagekit/pagekit)) - `MIT` - * [Pico](http://picocms.org/) - A stupidly simple, blazing fast, flat file CMS. ([Source code](https://github.com/gilbitron/Pico)) `MIT` + * [Pico](http://picocms.org/) - A stupidly simple, blazing fast, flat file CMS. ([Source code](https://github.com/gilbitron/Pico)) + * [Pimcore](http://www.pimcore.org) Multi-Channel Experience and Engagement Management Platform ([Source code](https://github.com/pimcore/pimcore))) `BSD` `PHP` +`MIT` * [Redaxscript](https://github.com/redaxmedia/redaxscript) - Ultra lightweight CMS for MySQL, SQLite and PostgreSQL `GPLv3` `PHP` * [SilverStripe](https://www.silverstripe.org) - easy to use CMS with powerful MVC framework underlying. ([Demo](http://demo.silverstripe.org/), [Source code](https://github.com/silverstripe)) `BSD` `PHP` * [SPIP](http://www.spip.net/fr) - Publication system for the Internet. * [Wordpress](https://wordpress.org/) - The worlds most-used blogging and CMS engine. ([Source code mirror](https://github.com/WordPress/WordPress)) `GPLv2` - * [Pimcore](http://www.pimcore.org) Multi-Channel Experience and Engagement Management Platform ([Source code](https://github.com/pimcore/pimcore))) `BSD` `PHP` ### E-commerce From 6cd3bf2541b3bf4ec5c198399b72ee8abb0b504b Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 5 Aug 2015 14:38:00 +0200 Subject: [PATCH 3/4] Remove MacPass and Keepass --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 789f1c0c..932ccb35 100644 --- a/README.md +++ b/README.md @@ -397,10 +397,8 @@ CMS are a practical way to setup a website with many features. CMS often come wi ## Password Managers - * [Keepass](http://keepass.info) - Free, open source, light-weight and easy-to-use password manager. `GPLv2` `C#` * [Rattic](http://rattic.org/) - Password Management for Humans ([Source code](https://github.com/tildaslash/RatticWeb)) * [Teampass](http://www.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` - * [MacPass](https://github.com/mstarke/MacPass) - OSX Port of KeePass ([Source code](https://github.com/mstarke/MacPass)) `GPLv3` `ObjectiveC` ## Pastebins From ac1ad59081cfc3b977e2762ef7602d8a9200c22e Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 5 Aug 2015 15:20:54 +0200 Subject: [PATCH 4/4] move Pico's licence into its line --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 932ccb35..0fd50b06 100644 --- a/README.md +++ b/README.md @@ -205,9 +205,8 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [Movable Type](https://movabletype.org/) - a powerful solution for the creation and management of web content. * [october](http://octobercms.com/) - Free, open-source, self-hosted CMS platform based on the Laravel PHP Framework. ([Source code](https://github.com/octobercms/october)) `MIT` * [Pagekit](http://pagekit.com/) - A new modern CMS to create and share ([Source code](https://github.com/pagekit/pagekit)) - `MIT` - * [Pico](http://picocms.org/) - A stupidly simple, blazing fast, flat file CMS. ([Source code](https://github.com/gilbitron/Pico)) + * [Pico](http://picocms.org/) - A stupidly simple, blazing fast, flat file CMS. ([Source code](https://github.com/gilbitron/Pico)) `MIT` * [Pimcore](http://www.pimcore.org) Multi-Channel Experience and Engagement Management Platform ([Source code](https://github.com/pimcore/pimcore))) `BSD` `PHP` -`MIT` * [Redaxscript](https://github.com/redaxmedia/redaxscript) - Ultra lightweight CMS for MySQL, SQLite and PostgreSQL `GPLv3` `PHP` * [SilverStripe](https://www.silverstripe.org) - easy to use CMS with powerful MVC framework underlying. ([Demo](http://demo.silverstripe.org/), [Source code](https://github.com/silverstripe)) `BSD` `PHP` * [SPIP](http://www.spip.net/fr) - Publication system for the Internet.