From fb19e8f981c97b7c353cc16b61c4770581b1fc73 Mon Sep 17 00:00:00 2001 From: Marc Picaud <picaud.marc@gmail.com> Date: Mon, 3 Aug 2015 13:55:02 +0200 Subject: [PATCH 1/3] add PrestaShop (self hosted e-commerce solution) into CMS section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d2212e39..cf381fb2 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [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` + * [PrestaShop](https://www.prestashop.com/) - PrestaShop offers a free, open-source and fully scalable e-commerce solution. ([Demo](http://demo.prestashop.com/), [Source Code](https://github.com/PrestaShop/PrestaShop)) `OSL 3.0` `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` From 202679d015995e91bd906db137725b3bc12a3611 Mon Sep 17 00:00:00 2001 From: Marc Picaud <picaud.marc@gmail.com> Date: Mon, 3 Aug 2015 17:57:55 +0200 Subject: [PATCH 2/3] add e-shop as CMS subsection --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf381fb2..f781b964 100644 --- a/README.md +++ b/README.md @@ -196,12 +196,14 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [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` - * [PrestaShop](https://www.prestashop.com/) - PrestaShop offers a free, open-source and fully scalable e-commerce solution. ([Demo](http://demo.prestashop.com/), [Source Code](https://github.com/PrestaShop/PrestaShop)) `OSL 3.0` `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` + +### E-Shops - +* [PrestaShop](https://www.prestashop.com/) - PrestaShop offers a free, open-source and fully scalable e-commerce solution. ([Demo](http://demo.prestashop.com/), [Source Code](https://github.com/PrestaShop/PrestaShop)) `OSL 3.0` `PHP` + ## Download Tools * [Alltube](https://github.com/Rudloff/alltube) - A web interface for [youtube-dl](https://github.com/rg3/youtube-dl), a program to download videos and audio from [more than 100 websites](https://rg3.github.io/youtube-dl/supportedsites.html) ([Demo](http://alltubedownload.net/)) `GPL` From 84665bd3e49060ae6c6d08df781bbf7018f63ccb Mon Sep 17 00:00:00 2001 From: Marc Picaud <picaud.marc@gmail.com> Date: Mon, 3 Aug 2015 18:08:47 +0200 Subject: [PATCH 3/3] rename e-shop to e-commerce --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f781b964..b6ec4895 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,7 @@ CMS are a practical way to setup a website with many features. CMS often come wi * [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` -### E-Shops +### E-commerce * [PrestaShop](https://www.prestashop.com/) - PrestaShop offers a free, open-source and fully scalable e-commerce solution. ([Demo](http://demo.prestashop.com/), [Source Code](https://github.com/PrestaShop/PrestaShop)) `OSL 3.0` `PHP`