Skip to content

Commit

Permalink
GPLv3 - initial
Browse files Browse the repository at this point in the history
  • Loading branch information
brusch committed Sep 22, 2015
1 parent 0202a51 commit 7eafdb2
Show file tree
Hide file tree
Showing 1,305 changed files with 9,156 additions and 12,178 deletions.
15 changes: 6 additions & 9 deletions 3rd-party-licenses.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,8 @@ The overal pimcore project is licensed under the terms of a modified BSD Licence


## ExtJS by Sencha Inc.
pimcore includes the GPLv3 version of the ExtJS JavaScript framework (version 3) under the Open Source License Exception for Applications (FLOSS).

There are two FLOSS exceptions available for use with this release for
open source applications that are distributed under a license other than GPL.

* Open Source License Exception for Applications ( [view archived copy](https://www.pimcore.org/download/license/extjs-floss-exception-applications.png) )
* Open Source License Exception for Development ( [view archived copy](https://www.pimcore.org/download/license/extjs-floss-exception-development.png) )

Further information:
License: GPLv3
pimcore includes the GPLv3 version of the ExtJS JavaScript framework.
http://www.sencha.com/license/

## Zend Framework by Zend Technologies Ltd.
Expand All @@ -23,6 +16,10 @@ http://framework.zend.com/license
License: MIT or GPLv2
http://jquery.org/license

## Symfony
License: MIT License
http://symfony.com/license

## CKEditor by Frederico Knabben
License: LGPL / GPLv2 / MPL
http://ckeditor.com/license
Expand Down
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
pimcore
Copyright (C) 2015 pimcore GmbH

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.


Please see also (in this directory):
[Licensing FAQ - license-faq.md](license-faq.md)
[GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](gpl-3.0.txt)
[Libraries used by pimcore incl. their licenses - 3rd-party-licenses.md](3rd-party-licenses.md)
29 changes: 0 additions & 29 deletions LICENSE.txt

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pimcore

THE PREMIER OPEN-SOURCE CMS/CMF, PIM, ECOMMERCE-SUITE
THE PREMIER OPEN-SOURCE CMS/CMF, PIM, DAM, ECOMMERCE-SUITE

[![Software License](https://img.shields.io/badge/license-BSD-brightgreen.svg?style=flat)](LICENSE.txt)
[![Current Release](https://img.shields.io/packagist/v/pimcore/pimcore.svg?style=flat)](https://packagist.org/packages/pimcore/pimcore)
Expand Down Expand Up @@ -38,6 +38,6 @@ mysql -u root -p -e "CREATE DATABASE pimcore charset=utf8;"

## Copyright and license

Copyright [pimcore](http://www.pimcore.org) GmbH under a modified [BSD license](LICENSE.txt).
For licensing details please visit http://www.pimcore.org/license
Copyright [pimcore](http://www.pimcore.org) GmbH
For licensing details please visit [LICENSE.md](LICENSE.md)

Loading

0 comments on commit 7eafdb2

Please sign in to comment.