From 895de80d3fa0aa6b0c3b9c7c8ecfc724dd558932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Kranzlm=C3=BCller?= Date: Thu, 16 Dec 2010 10:10:48 +0100 Subject: [PATCH 1/3] first commit --- README | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 000000000..e69de29bb From 4d6277db315df3104016e612c3544fd0cfd034b6 Mon Sep 17 00:00:00 2001 From: sehmaschine Date: Thu, 16 Dec 2010 10:56:59 +0100 Subject: [PATCH 2/3] first update, some initial files --- .gitignore | 1 + AUTHORS | 2 ++ LICENSE | 9 +++++++++ MANIFEST.in | 5 +++++ README | 0 README.rst | 4 ++++ setup.py | 23 +++++++++++++++++++++++ 7 files changed, 44 insertions(+) create mode 100644 .gitignore create mode 100644 AUTHORS create mode 100644 LICENSE create mode 100644 MANIFEST.in delete mode 100644 README create mode 100644 README.rst create mode 100644 setup.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..7e99e367f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc \ No newline at end of file diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..2cdc57a87 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,2 @@ +Patrick Kranzlmueller +Axel Swoboda \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..f43ba5410 --- /dev/null +++ b/LICENSE @@ -0,0 +1,9 @@ +Copyright (c) 2010, Patrick Kranzlmueller, Axel Swoboda (vonautomatisch werkstaetten), All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +3. Neither the name of Django-Grappelli nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..b62f01cf8 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,5 @@ +include grappelli/LICENSE +recursive-include grappelli/media * +recursive-include grappelli/templates *.html +recursive-include grappelli/locale *.mo *.po +recursive-include grappelli/models/fixtures *.json \ No newline at end of file diff --git a/README b/README deleted file mode 100644 index e69de29bb..000000000 diff --git a/README.rst b/README.rst new file mode 100644 index 000000000..dccb4a568 --- /dev/null +++ b/README.rst @@ -0,0 +1,4 @@ +django-grappelli +================ + +readme \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 000000000..abbe0cc02 --- /dev/null +++ b/setup.py @@ -0,0 +1,23 @@ +from setuptools import setup, find_packages + +setup( + name='django-grappelli', + version='1.3', + description='A jazzy skin for the Django Admin-Interface.', + author='Patrick Kranzlmueller, Axel Swoboda (vonautomatisch)', + author_email='patrick@vonautomatisch.at', + url = "https://github.com/sehmaschine/django-grappelli" + packages=find_packages(), + include_package_data=True, + zip_safe=False, + classifiers=[ + 'Development Status :: 4 - Beta', + 'Environment :: Web Environment', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Framework :: Django', + ] +) + From 2bfc576d58a71dc4c8c3aa446f6e29f20c0bfa06 Mon Sep 17 00:00:00 2001 From: sehmaschine Date: Sun, 10 Jul 2011 13:37:00 +0200 Subject: [PATCH 3/3] Small updates to initial files --- LICENSE | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ MANIFEST.in | 10 +++++----- README.rst | 21 +++++++++++++++++++-- setup.py | 10 ++++++---- 4 files changed, 77 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index f43ba5410..1bf097438 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,50 @@ -Copyright (c) 2010, Patrick Kranzlmueller, Axel Swoboda (vonautomatisch werkstaetten), All rights reserved. +django-grappelli +---------------- -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Copyright (c) Patrick Kranzlmueller, Axel Swoboda (vonautomatisch werkstaetten), +All rights reserved. -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of Django-Grappelli nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. +3. Neither the name of FileBrowser nor the names of its contributors may be used +to endorse or promote products derived from this software without specific prior +written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +django-grappelli contains code from django-admin-tools +------------------------------------------------------ + +copyright (c) 2010 David JEAN LOUIS + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in index b62f01cf8..ad0272a6f 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -include grappelli/LICENSE -recursive-include grappelli/media * -recursive-include grappelli/templates *.html -recursive-include grappelli/locale *.mo *.po -recursive-include grappelli/models/fixtures *.json \ No newline at end of file +include LICENSE +recursive-include docs * +recursive-include grappelli/static * +recursive-include grappelli/templates * +recursive-include grappelli/dashboard/templates * \ No newline at end of file diff --git a/README.rst b/README.rst index dccb4a568..df75877d4 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,21 @@ -django-grappelli +Django Grappelli ================ -readme \ No newline at end of file +**A jazzy skin for the Django admin interface**. + +Grappelli is a grid-based alternative/extension to the `Django `_ administration interface. + +Code +---- + +https://github.com/sehmaschine/django-grappelli + +Documentation +------------- + +http://readthedocs.org/docs/django-grappelli/ + +Releases +-------- + +The latest release is Grappelli 2.3.3, which requires Django 1.3 \ No newline at end of file diff --git a/setup.py b/setup.py index abbe0cc02..7a68f8324 100644 --- a/setup.py +++ b/setup.py @@ -2,17 +2,19 @@ setup( name='django-grappelli', - version='1.3', + version='2.3.3', description='A jazzy skin for the Django Admin-Interface.', author='Patrick Kranzlmueller, Axel Swoboda (vonautomatisch)', - author_email='patrick@vonautomatisch.at', - url = "https://github.com/sehmaschine/django-grappelli" + author_email='werkstaetten@vonautomatisch.at', + url='http://code.google.com/p/django-grappelli/', + download_url='', packages=find_packages(), include_package_data=True, zip_safe=False, classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 3 - Alpha', 'Environment :: Web Environment', + 'Framework :: Django', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent',