fnp / redakcja.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ef8e30 c89776c)
Merge master into img-playground. Image support with new management features. Missing...
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 14 Dec 2011 13:44:29 +0000 (14:44 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 14 Dec 2011 13:44:29 +0000 (14:44 +0100)
commit73ef2b8442dc95f8b7279de812c30ac8626d5f39
treecffcaba65de5d2e84e10537fc701f70b93b05395tree | snapshot
parent5ef8e304790026b27417d8ff3c76c18858ba708fcommit | diff
parentc89776c783212b4e1ed572854bcf4308462d8b82commit | diff
Merge master into img-playground. Image support with new management features. Missing history-related stuff, needs refactoring (doubled code).
32 files changed:
apps/catalogue/admin.py | diff2 | blob | history
apps/catalogue/migrations/0009_auto__add_imagechange__add_unique_imagechange_tree_revision__add_image.py | | blob
apps/catalogue/models/__init__.py | diff2 | blob | history
apps/catalogue/models/image.py | | blob
apps/catalogue/models/listeners.py | diff2 | blob | history
apps/catalogue/models/publish_log.py | diff2 | blob | history
apps/catalogue/templates/catalogue/book_html.html | | blob
apps/catalogue/templates/catalogue/image_list.html | | blob
apps/catalogue/templates/catalogue/image_short.html | | blob
apps/catalogue/templates/catalogue/image_table.html | | blob
apps/catalogue/templates/catalogue/upload_pdf.html | | blob
apps/catalogue/templatetags/book_list.py | diff2 | blob | history
apps/catalogue/templatetags/catalogue.py | diff2 | blob | history
apps/catalogue/urls.py | diff2 | blob | history
apps/catalogue/views.py | diff2 | blob | history
apps/wiki/admin.py diff1 | diff2 | blob | history
apps/wiki_img/forms.py diff1 | | blob | history
apps/wiki_img/models.py diff1 | | blob | history
apps/wiki_img/templates/wiki_img/document_details.html diff1 | | blob | history
apps/wiki_img/templates/wiki_img/document_details_base.html diff1 | | blob | history
apps/wiki_img/templates/wiki_img/document_details_readonly.html diff1 | | blob | history
apps/wiki_img/templates/wiki_img/save_dialog.html diff1 | | blob | history
apps/wiki_img/templates/wiki_img/tabs/history_view.html | | blob
apps/wiki_img/urls.py diff1 | | blob | history
apps/wiki_img/views.py diff1 | | blob | history
redakcja/settings/common.py diff1 | diff2 | blob | history
redakcja/settings/compress.py diff1 | diff2 | blob | history
redakcja/static/css/master.css diff1 | diff2 | blob | history
redakcja/static/js/wiki_img/loader.js diff1 | | blob | history
redakcja/static/js/wiki_img/loader_readonly.js | | blob
redakcja/static/js/wiki_img/wikiapi.js diff1 | | blob | history
redakcja/urls.py diff1 | diff2 | blob | history