Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Jan 18, 2014
@Fantomas42 Merge branch 'release/v0.14' into develop feffb9e
@Fantomas42 Wheel support d969c11
@Fantomas42 Bumping to version 0.15.dev 22b40d0
Commits on Jan 19, 2014
@Fantomas42 Add a Paypal button 9f9ab6e
@Fantomas42 Alternate order of badges 9f40670
@Fantomas42 Use a smaller image for Paypal c1a1075
Commits on Jan 27, 2014
@Fantomas42 Better syntax for render_option ce2c0a8
@Fantomas42 Reproduce issue #317 3b5679f
Commits on Jan 28, 2014
@Fantomas42 Fix unicode error, close #317 c5e8e49
@Fantomas42 Merge branch 'feature/fix-MPTTFilteredSelectMultiple-issue-317' into …
…develop
bf58083
Commits on Jan 29, 2014
@Fantomas42 Reproduce the issue #317 like in the front 726ee89
@Fantomas42 Use encode and decode to return Unicode datas in the template, close #… d6ac21d
@Fantomas42 Python 3 fix 30e7774
Commits on Jan 30, 2014
@Fantomas42 Updating the host in the transifex configuration 1ac4276
@Fantomas42 Handle Bulgarian language 4ba1f6a
@Fantomas42 Updating the translations, close #318 f623564
@Fantomas42 Ignore .tox directory a353d9b
@Fantomas42 Add push and pull rules for managing the translation files 31aa921
@Fantomas42 Merge branch 'feature/update-translations-318' into develop d0fcdbd
Commits on Jan 31, 2014
@Fantomas42 Update the link to the demo 4f80d57
Commits on Feb 02, 2014
@Fantomas42 Add breakpoint mixin acbb65c
@Fantomas42 Import the breakpoint mixin 78d9cb5
@Fantomas42 Correct the breakpoint mixin aa575dd
@Fantomas42 Use the breakpoint mixin in the breadcrumb 62c8ab9
@Fantomas42 Use the breakpoint mixin in the header dfe4a1b
@Fantomas42 Merge branch 'feature/breakpoint-mixin' into develop 75fb612
Commits on Feb 03, 2014
@Fantomas42 Fix for Python 2 and 3, close #317 3b31a53
@Fantomas42 Merge branch 'feature/refix-MPTTFilteredSelectMultiple-issue-317' int…
…o develop
a565e8d
Commits on Feb 04, 2014
@bittner bittner Added example website, fixed French formatting 9ac7590
@Fantomas42 Merge pull request #319 from bittner/develop
Added example website, fixed French formatting
4f45024
@sandino sandino Translate breacrumbs root_name. 519aae2
Commits on Feb 05, 2014
@Fantomas42 Merge pull request #322 from sandino/develop
Translate breacrumbs root_name.
9fe9ffb
Commits on Feb 07, 2014
@Fantomas42 Add note about Python 3 compatibility of django-tagging, close #320 c22758c
Commits on Feb 08, 2014
@Fantomas42 Implement a tag for resolving the admin URLs of the comments, whateve…
…r the app used
1eebbab
@Fantomas42 Testing the comment_admin_urlname template filter d32b892
Commits on Feb 09, 2014
@Fantomas42 Subsituting the admin:comments_comment_xxx urls by the comment_admin_…
…urlname filter
0120a1d
@Fantomas42 Implement a tag for resolving the admin URLs of the users, whatever t…
…he app used
ce4f647
@Fantomas42 Testing the user_admin_urlname template filter 4db1ef1
@Fantomas42 Subsituting the admin:auth_user_xxx urls by the user_admin_urlname fi…
…lter
198435b
@Fantomas42 Add documentation for user_admin_urlname and comment_admin_urlname te…
…mplate filters, close #289
47469fd
@Fantomas42 Merge branch 'feature/fix-issue-289' into develop 4c9809f
Commits on Feb 12, 2014
@Fantomas42 Remove declaration of the handlers cee6212
@Fantomas42 Handle error 400 in debug 8816a7a
@Fantomas42 Add a 400 template for this kind of error 9d9f9d4
@Fantomas42 Fix the translation for consistency 455a964
@Fantomas42 Merge branch 'feature/update-error-views' into develop 2cada71
@Fantomas42 Merge branch 'develop' of github.com:Fantomas42/django-blog-zinnia in…
…to develop
d285e22
Commits on Feb 16, 2014
@Fantomas42 Do not force the evolve script anymore ece2414
@Fantomas42 Use the latest versions of the eggs 22deffa
@Fantomas42 Order the eggs alphabeticaly ac1e3e2
@Fantomas42 Merge branch 'feature/update-evolve' into develop 294ba95
@Fantomas42 Merge branch 'develop' of github.com:Fantomas42/django-blog-zinnia in…
…to develop
7c5aae0
Commits on Feb 18, 2014
@Fantomas42 Use the latest stable version of tagging 6dd76c6
@Fantomas42 Force usage of django-tagging v0.3.2 06d973f
@Fantomas42 Update the requirements to build the documentation 517693b
@Fantomas42 Updating depenndancy for django-tagging ed60c69
@Fantomas42 Updating minimal and maximal versions of pyparsing and django-mptt b784c7a
@Fantomas42 Merge branch 'feature/use-stable-tagging-version' into develop edda3c8
Commits on Feb 24, 2014
@JHei JHei Update wxr.xml
set post_date_gmt to entry's creation_date due to import-errors if re-importing data with wp2zinnia
bf390ae
@Fantomas42 Passing to versions 1.5.1 for buildout-versions-checker c8b7f5c
@Fantomas42 Passing to versions 2.4 for Markdown 3e75cc2
@Fantomas42 Remove unused eggs 2cd5558
@Fantomas42 Merge branch 'feature/clean-versions' into develop 4c7fd9a
Commits on Feb 25, 2014
@Fantomas42 Merge branch 'master' of https://github.com/JHei/django-blog-zinnia i…
…nto feature/update-wxr
c981a93
@Fantomas42 Fix exported dates bf4b056
@Fantomas42 Merge branch 'feature/update-wxr' into develop 5a4cd0f
Commits on Feb 26, 2014
@Fantomas42 Handle unicode content, close #316 81cf729
Commits on Feb 27, 2014
@Fantomas42 Adding a new computed index for list views 24d964c
@Fantomas42 Add db_indexed on useful fields fcc4a10
@Fantomas42 Fix Meta on Entry on migration 000=17 a7a1e2f
@Fantomas42 Index creation_date with the other dates 1f2c34f
@Fantomas42 Add migration for the new indexes 0b280c6
@Fantomas42 Merge branch 'feature/index-optimization' into develop b00d118
@Fantomas42 Merge branch 'develop' of github.com:Fantomas42/django-blog-zinnia in…
…to develop
7d32633
Commits on Feb 28, 2014
@Fantomas42 Remove strong markup f5a8316
@Fantomas42 More clickable pagination links a27ec6d
@Fantomas42 No more useless spaces in items f1d0c31
@Fantomas42 Configure begin_pages and end_pages to 1 by default for pagination 31a14a5
@Fantomas42 Responsive pagination fa73898
@Fantomas42 Add border around paginator a5d8b16
@Fantomas42 Merge branch 'feature/better-pagination' into develop 187ff03
@Fantomas42 More flexible style for pagination e7ab0f6
@Fantomas42 Better colors for the header ff11fed
@Fantomas42 Fix typo 6b2c955
@Fantomas42 Merge branch 'feature/css-improvements' into develop 17f573d
@Fantomas42 Stylize input for URL 5aa8d1f
Commits on Mar 01, 2014
@Fantomas42 Add a block around the comment text c45e853
Commits on Mar 02, 2014
@Fantomas42 More block for comment rendering 752b882
@Fantomas42 Add pingback-info, pingback-content, trackback-info, trackback-conten…
…t blocks
4d9e852
@Fantomas42 Add pingbacks-status, trackbacks-status blocks 7f15c1e
@Fantomas42 Add comments-loop, pingbacks-loop, trackbacks-loop blocks f912c2e
@Fantomas42 Merge branch 'feature/discussions-blocks' into develop 5b2b8d7
Commits on Mar 03, 2014
@Fantomas42 Fix the pagination tests, by specifying explicitly all the parameters cf32409
@Fantomas42 Move trackbacks and pingbacks blocks before the comments 66643b7
@Fantomas42 Fix the feed URL of an author if he only has an email, close #323 f688e24
@Fantomas42 Fix generation of the "current" class on the author list, #323 d1857cb
@Fantomas42 Fix the comment form username call, #323 bc03ffc
@Fantomas42 Merge branch 'feature/fix-custom-user-username-as-email-in-templates'…
… into develop
1cbaac7
Commits on Mar 04, 2014
@Fantomas42 Make blogger2zinnia full compatible with custom User model 57f936c
@Fantomas42 Make feed2zinnia full compatible with custom User model 72246f2
@Fantomas42 Make wp2zinnia full compatible with custom User model d0f3aae
@Fantomas42 Make xmlrpc.MetaWeblog full compatible with custom User model 6f0eb92
@Fantomas42 Make search full compatible with custom User model 3165f85
@Fantomas42 Merge branch 'feature/full-compatibility-with-custom-user' into develop fe8d972
Commits on Mar 05, 2014
@Fantomas42 Substitute JS on search field by a placeholder 904fcae
@Fantomas42 Use a placeholder on the search form of the skin e4380de
@Fantomas42 Merge branch 'feature/search-form-placeholder' into develop 35d715c
@Fantomas42 Reorder the fields in the admin interface, for more efficacity c1b7a6a
@Fantomas42 More explicit help_text for the excerpt field 98895a7
@Fantomas42 Merge branch 'feature/review-admin-fields' into develop c4cc76b
Commits on Mar 06, 2014
@Fantomas42 Restaure coverage on MetaWeblog API 7639329
@Fantomas42 Add tests for the metrics of the preview 6f994a4
@Fantomas42 Implement the metrics on HTMLPreview d4041b2
@Fantomas42 split() is better than split(' ') ec2b265
Commits on Mar 07, 2014
@Fantomas42 Fix documentation errors on templates, close #331 3c1c1b5
@Fantomas42 Display remaining percent of the content to show in the "Continue rea…
…ding" link
94c261f
@Fantomas42 Merge branch 'feature/preview-metrics' into develop 2f96435
Commits on Mar 08, 2014
@Fantomas42 Split into submixin the EntryProtectionMixin 41355be
Commits on Mar 09, 2014
@Fantomas42 Implement preview of entries for restricted users in EntryPreviewMixin ccd1822
@Fantomas42 Document the zinnia.views.mixins.entry_preview module a0752a5
@Fantomas42 Implement the EntryPreviewMixin in the EntryDetail view de324cc
@Fantomas42 Compare Authors by Users by the pk to avoid casting error 5bb7f3a
Commits on Mar 10, 2014
@nagyv nagyv How to send you a new Example site?
I thought the best might be with a pull request! :)

Thanks for developing zinnia! (Unfortunately, because of django-cms compatibility we had to stick with 0.13, but it works as we wanted.)
88cc282
@Fantomas42 Move vidzor link to a better place 3ac1add
@Fantomas42 Merge branch 'feature/update-example-site' into develop 38536af
@qinjiannet qinjiannet update-example-site
Insert bookshadow.com into example-site list.
592b85a
@qinjiannet qinjiannet Add bookshadow to Examples List
Insert into bookshadow into Examples List
3e06f2b
@Fantomas42 Merge pull request #336 from qinjiannet/patch-1
update-example-site(bookshadow.com)
4a2d94e
@Fantomas42 Tests the preview for entry_detail 0a75e02
@Fantomas42 Merge branch 'feature/entry-preview' into develop, close #327 ed083a9
@Fantomas42 Increase the number of tests done 9801ff0
Commits on Mar 11, 2014
@Fantomas42 Update the documentation accordingly to the recent changes on the vie…
…ws, admin and Python support
02c0fc2
Commits on Mar 12, 2014
@Fantomas42 Updates the translations 771872e
@Fantomas42 Register the Slovenian and Hebrew translations in the demo project b34160f
@Fantomas42 Updating the changelog b86d108
@Fantomas42 Bumping to version 0.14.1 5856063