Permalink
Browse files

Added a changelog.

Dropped redundant INSTALL.rst.
  • Loading branch information...
1 parent 67bd86a commit f028db8d0229772aa60151cda83636ccb0ca6ee3 @markotibold markotibold committed Dec 21, 2012
Showing with 42 additions and 115 deletions.
  1. +25 −0 CHANGELOG.md
  2. +0 −104 INSTALL.rst
  3. +1 −1 MANIFEST.in
  4. +15 −9 README.md
  5. +1 −1 setup.py
View
@@ -0,0 +1,25 @@
+# Changelog
+
+## dev
+
+* Enhancement: Ported to REST Framework. **Note:** projects with local REST Framework 0.3.X or 0.3.4
+dependencies will break.
+* Enhancements: Updated README file and added this changelog.
+
+
+## 0.9.9.1
+
+**Date**: 6th Dec 2012
+
+* Security-Bugfix: Changed permission check in API from IsAuthenticated to IsAdminUser
+
+
+## 0.9.9
+
+**Date**: 27th Nov 2012
+
+* Enhancement: Title fields of pages are now required. Solves inconsistent behaviour in the UI.
+
+---
+
+Older changes not documented. Revert to the git log for details.
View
@@ -1,104 +0,0 @@
-===============================================
-Installation instructions for Django 1.3 or 1.4
-===============================================
-
-
-Installation:
-=============
-
-We're assuming you are using Django 1.3 or 1.4. If you need to install Django Fiber with an older Django version, you can find instructions in the docs folder.
-
-::
-
- $ pip install django-fiber
-
-
-Requirements:
-=============
-
-These dependencies are automatically installed:
-
-::
-
- Pillow==1.7.7
- djangorestframework==0.3.3
- django-mptt>=0.4.2
- django-compressor>=0.7.1
-
-
-Settings:
-=========
-
-settings.py
------------
-
-::
-
- import django.conf.global_settings as DEFAULT_SETTINGS
-
- MIDDLEWARE_CLASSES = DEFAULT_SETTINGS.MIDDLEWARE_CLASSES + (
- 'fiber.middleware.ObfuscateEmailAddressMiddleware',
- 'fiber.middleware.AdminPageMiddleware',
- )
-
- TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
- 'django.core.context_processors.request',
- 'fiber.context_processors.page_info',
- )
-
- INSTALLED_APPS = (
- ...
- 'django.contrib.staticfiles',
- 'djangorestframework',
- 'mptt',
- 'compressor',
- 'fiber',
- ...
- )
-
- import os
- BASE_DIR = os.path.abspath(os.path.dirname(__file__))
-
- STATIC_ROOT = os.path.join(BASE_DIR, 'static')
- STATIC_URL = '/static/'
- STATICFILES_FINDERS = DEFAULT_SETTINGS.STATICFILES_FINDERS + (
- 'compressor.finders.CompressorFinder',
- )
-
-urls.py
--------
-
-::
-
- from django.conf import settings
-
- urlpatterns = patterns('',
- ...
- (r'^api/v2/', include('fiber.rest_api.urls')),
- (r'^admin/fiber/', include('fiber.admin_urls')),
- (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('fiber',),}),
- ...
- )
-
- if settings.DEBUG:
- urlpatterns += patterns('django.contrib.staticfiles.views',
- url(r'^static/(?P<path>.*)$', 'serve'),
- )
-
-
-Post-installation:
-==================
-
-Create database tables::
-
- $ python manage.py syncdb
-
-All static Fiber files need to be symlinked in (or copied to) your media folder::
-
- $ python manage.py collectstatic --link
-
-
-Documentation:
-==============
-
-You can find usage instructions, and other documentation, in the docs folder.
View
@@ -1,4 +1,4 @@
include LICENSE.rst
-include README.rst
+include README.md
recursive-include fiber/templates *
recursive-include fiber/static *
View
@@ -3,7 +3,7 @@
[travis]: http://travis-ci.org/#!/ridethepony/django-fiber
[travis-build-image]: https://secure.travis-ci.org/ridethepony/django-fiber.png
-#Django Fiber
+# Django Fiber
---
@@ -21,14 +21,14 @@ https://github.com/ridethepony/django-fiber-example
Convinced? Want to use Django Fiber in your own Django project? Then follow the instructions below:
-##Installation
+## Installation
We're assuming you are using Django 1.3.x or 1.4.
$ pip install django-fiber
-##Requirements
+## Requirements
These dependencies are automatically installed:
@@ -38,9 +38,9 @@ These dependencies are automatically installed:
django-compressor>=0.7.1
-##Settings
+## Settings
-###settings.py
+### settings.py
import django.conf.global_settings as DEFAULT_SETTINGS
@@ -59,6 +59,7 @@ These dependencies are automatically installed:
'mptt',
'compressor',
'fiber',
+ ...
)
import os
@@ -70,7 +71,7 @@ These dependencies are automatically installed:
'compressor.finders.CompressorFinder',
)
-###urls.py
+### urls.py
from django.conf import settings
@@ -84,7 +85,7 @@ These dependencies are automatically installed:
)
-##Post-installation
+## Post-installation
Create database tables:
@@ -95,5 +96,10 @@ All static Fiber files need to be symlinked in (or copied to) your media folder:
$ python manage.py collectstatic --link
-##Further documentation
-For further usage and configuration details take a look at our documentation project at [readthedocs](https://django-fiber.readthedocs.org/en/latest/index.html).
+## Further documentation
+For further usage and configuration details take a look at our documentation project at [readthedocs](https://django-fiber.readthedocs.org/).
+
+## Changelog
+See CHANGELOG.md for the latest changes.
+
+[changelog]: CHANGELOG.md
View
@@ -24,7 +24,7 @@
],
description='Django Fiber - a simple, user-friendly CMS for all your Django projects',
- long_description=open('README.rst').read(),
+ long_description=open('README.md').read(),
author='Dennis Bunskoek',
author_email='dbunskoek@leukeleu.nl',

0 comments on commit f028db8

Please sign in to comment.