Commit graph

859 commits

Author SHA1 Message Date
Iacopo Spalletti
1d3e9972c5
Merge branch 'release/0.8.x' into develop 2016-07-13 07:23:38 +02:00
Iacopo Spalletti
80c557ed0f Merge pull request #303 from nephila/hotfix/haystack
Set the correct language during indexing
2016-07-13 07:19:47 +02:00
Iacopo Spalletti
2ca14f4454
Pin haystack version for tests 2016-07-13 01:42:34 +02:00
Iacopo Spalletti
9b446a34a0 Merge pull request #302 from nephila/hotfix/3.3
Fixed compatibility error for 3.3
2016-07-13 01:36:39 +02:00
Iacopo Spalletti
f178015876
Updated changelog [ci skip] 2016-07-13 01:13:50 +02:00
Iacopo Spalletti
beb058f27e
Set the correct language during indexing 2016-07-13 01:12:25 +02:00
Iacopo Spalletti
8daa8dd5f6
Fixed compatibility error for 3.3 2016-07-12 22:11:50 +02:00
Iacopo Spalletti
ef017c9479
Update changelog 2016-07-08 08:01:37 +02:00
Iacopo Spalletti
d72270d87d Merge pull request #300 from fsbraun/feature/by-plugin-template
Feature-add: allow by-plugin definition of template folder (Issue #295)
2016-07-08 07:56:26 +02:00
Fabian Braun
61b2304164 Fix: Added missing ":" in documentation 2016-07-07 17:59:32 +02:00
Fabian Braun
18959d35df Fix: Added and adjusted test_template 2016-07-07 15:23:22 +02:00
Fabian Braun
a224fcca2e pep8 corrections 2016-07-07 14:20:40 +02:00
Fabian Braun
2fa7ebb3b1 Bugfix: Defaut values for template_folder from settings
Bugfix:		Extend template_folder length to 200 (including update of migrations)
2016-07-07 00:01:51 +02:00
Fabian Braun
56cdd5e158 Fix: pep8 improvements 2016-07-06 16:24:26 +02:00
Fabian Braun
af2defc46a Brief documentation 2016-07-06 16:14:22 +02:00
Fabian Braun
dad1569aea Added: Hide admin interface if only one template is available
Added:	Migrations
2016-07-06 15:40:45 +02:00
Fabian Braun
014b94449b Feature-add:
Plugins have a field that allows to specify a (sub-)folder from which the plugin templates are loaded. Default folder is "plugins". It goes into the "djangocms_blog" template folder (or, if set, the folder named in the app hook).

This allows, e.g., different templates for showing a post list as tables, columns, or you name it.

New templates have the same names as the standard templates in the "plugins" folder ("latest_entries.html", "authors.html", "tags.html", "categories.html", "archive.html"). The folder options can be defined in a new setting called BLOG_PLUGIN_TEMPLATE_FOLDERS. It's default is "( ("plugins", _("Default template") )" to be compatible with hitherto configurations.

To add new templates write in settings.py, e.g.,

BLOG_PLUGIN_TEMPLATE_FOLDERS = (
('plugins', _('Default template') ), 	# reads from "templates/djangocms_blog/plugins/
('timeline', _('Vertical timeline') ),	# reads from "templates/djangocms_blog/vertical/
('masonry', _('Masonry style') ),  	# reads from "templates/djangocms_blog/masonry/
)
2016-07-06 13:31:58 +02:00
Iacopo Spalletti
8a479a557a
Fix BLOG_PERMALINK_URLS name in doc 2016-06-29 16:25:13 +02:00
Iacopo Spalletti
7c4b3a7c76
Fix BLOG_PERMALINK_URLS name in doc 2016-06-29 16:24:57 +02:00
Iacopo Spalletti
ecfe85fb1f Merge pull request #287 from nephila/feature/multisite-filters
WiP: Multisite filters
2016-06-28 22:53:39 +02:00
Iacopo Spalletti
7d28e08f58
Enabled cached plugin 2016-06-28 08:58:08 +02:00
Iacopo Spalletti
096e1d48f7
More manager tests 2016-06-28 08:14:07 +02:00
Iacopo Spalletti
7cdfc0e7c7
Add docs 2016-06-28 00:34:57 +02:00
Iacopo Spalletti
c1edba9772
Add option to exclude empty categories from menu 2016-06-28 00:26:38 +02:00
Iacopo Spalletti
8b248e7b0f
More multisites tweaks 2016-06-26 18:11:37 +02:00
Iacopo Spalletti
67e3fa0128
Multisite filters 2016-06-26 17:09:01 +02:00
Iacopo Spalletti
ade8b189a4
Initial 0.9 changelog 2016-06-26 17:08:41 +02:00
Iacopo Spalletti
2296b7c1d1 Merge pull request #286 from nephila/feature/improve_docs
Improve documentation
2016-06-26 15:08:31 +02:00
Iacopo Spalletti
4bd6e4fb3a Merge pull request #232 from nephila/liveblog
Liveblog using channels
2016-06-26 13:58:24 +02:00
Iacopo Spalletti
bd0080fb24
Reformat HISTORY file 2016-06-26 13:50:24 +02:00
Iacopo Spalletti
874fde78be
Fix docs styling 2016-06-26 13:45:58 +02:00
Iacopo Spalletti
7bd2655036
Add channels features documentation 2016-06-26 13:45:58 +02:00
Iacopo Spalletti
92b4284eb0
Add tests for liveblog 2016-06-26 13:45:58 +02:00
Iacopo Spalletti
41834f6bf9
Better plugin templates 2016-06-26 13:32:32 +02:00
Iacopo Spalletti
abf2c1bb61
Add tests for liveblog 2016-06-26 12:30:01 +02:00
Iacopo Spalletti
52146269f6
Fix admin 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
413c9bb3aa
Fix code style 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
9bf5fa8895
Fix plugins order 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
a6feb4629d
Fix lieblog channels group 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
0f4056f678
Fix migrations 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
13a26650ad
Add flag to enable liveblog 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
eab9083d90
Update code 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
3c4eebdd02
Remove jQuery dependency 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
d9dd192ca8
Update channels configuration 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
eb5d98c9e3
Fix migrations 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
c0002ddd5f
cleanup PoC 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
a6f296226a
Add experimental liveblogging support 2016-06-26 10:33:07 +02:00
Iacopo Spalletti
f2beec480b
Merge branch 'release/0.8.x' into develop 2016-06-26 10:32:44 +02:00
Iacopo Spalletti
cff940a832
Bump version 2016-06-26 10:24:49 +02:00
Iacopo Spalletti
0c12e450d4 Merge pull request #284 from nephila/feature/thumbnailoption_migrations
Fix Thumbnailoption migrations
2016-06-26 00:49:16 +02:00