Never return a proxy object from __unicode__ ! (#73)
Merge branch 'master' of github.com:benjaoming/django-wiki
Never return a proxy object from __unicode__ ! (#73)
Update wiki/plugins/notifications/forms.py

After the commit to truncate long notifications, the key for the 
article notification was moved to a settings file.

No error or exception is being generated when forms.py
fails to import ARTICLE_EDIT (?). 
This causes that the plugin is not shown on the configuration for 
articles.
Merge pull request #75 from jdcaballero/master

Notifications Plugin form fails to import ARTICLE_EDIT
Increase django-mptt dependency version
Correct django dependency invariant
Merge pull request #79 from avtobiff/update-readme-dependencies

Update readme dependencies (Closes: #77)
Adding Bootstrap 2.2.0
Adding check on article locked for attachments. (#74) - Also cleaning up attachment list and removing forms when article is locked. Adding template filter is_locked
Ensure that CreateForm fails when slug field is longer than the maximum allowed slug length (#54).
Ensure that CreateForm fails when slug field is longer than the maximum allowed slug length (#57)
Merge branch 'master' of github.com:benjaoming/django-wiki
Setting Colorbox.js width and height (#69) and adding captions.
eh..remove alert()
Add warning on Edit page if user is not logged in w/ link to login page and redirect back to edit page (#55)
Count number of occurences of the same message and display "x times" in the notification list instead of duplicate messages.
Add spam/bot protection by verifying user session and ip_address and check the number of recent revisions (#72)
Add global setting to disable anonymous article creation (#72)
Fix markdown extension for images to allow no align:xx specified and use bootstrap pull-left and pull-right. Don't allow center alignment. (#65)
Move all javascript to load at the bottom of the page and ensure only to add javascript inside Sekizai addtoblock tag. (#54)