Merge with master.
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Wed, 26 Mar 2014 15:32:58 +0000 (16:32 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Wed, 26 Mar 2014 15:32:58 +0000 (16:32 +0100)
commitec5b493bff5efa683aadf5f78aa891eff3550156
tree26b30df7844c2806d4c537e650e89b649846c374
parente7927df2744d46e176c7114bf63f1bd8f5746168
parent0f84fb864cfe3f6c642706f40933ede6a74fe0c4
Merge with master.
39 files changed:
apps/catalogue/admin.py
apps/catalogue/forms.py
apps/catalogue/locale/pl/LC_MESSAGES/django.mo
apps/catalogue/locale/pl/LC_MESSAGES/django.po
apps/catalogue/migrations/0012_auto__add_imagepublishrecord__add_imagechange__add_unique_imagechange_.py
apps/catalogue/models/__init__.py
apps/catalogue/models/image.py
apps/catalogue/templates/catalogue/activity.html
apps/catalogue/templates/catalogue/base.html
apps/catalogue/templates/catalogue/book_detail.html
apps/catalogue/templates/catalogue/book_list/book_list.html
apps/catalogue/templates/catalogue/chunk_edit.html
apps/catalogue/templates/catalogue/document_list.html
apps/catalogue/templates/catalogue/document_upload.html
apps/catalogue/templates/catalogue/image_detail.html
apps/catalogue/templates/catalogue/image_short.html
apps/catalogue/templates/catalogue/my_page.html
apps/catalogue/templates/catalogue/user_list.html
apps/catalogue/templates/catalogue/wall.html
apps/catalogue/templatetags/book_list.py
apps/catalogue/templatetags/catalogue.py
apps/catalogue/urls.py
apps/catalogue/views.py
apps/dvcs/models.py
apps/wiki/templates/wiki/document_details_base.html
apps/wiki/templates/wiki/tabs/gallery_view.html
apps/wiki/templates/wiki/tabs/summary_view.html
apps/wiki_img/templates/wiki_img/document_details_base.html
apps/wiki_img/templates/wiki_img/tabs/history_view.html
apps/wiki_img/urls.py
apps/wiki_img/views.py
lib/librarian
redakcja/settings/common.py
redakcja/settings/compress.py
redakcja/static/css/filelist.css
redakcja/static/css/master.css
redakcja/static/js/lib/jquery/jquery.imgareaselect.js
redakcja/static/js/wiki/loader.js
redakcja/urls.py