Commit graph

302 commits

Author SHA1 Message Date
Iacopo Spalletti
0d483b7ccb Bump development version 2015-03-01 22:36:13 +01:00
Iacopo Spalletti
d756edb1bf Merge pull request #76 from skirsdeda/develop
Some more fixes to 1.7 migrations
2015-02-26 23:28:11 +01:00
Tadas Dailyda
7687d293e2 django migration 0005 2015-02-26 21:55:47 +00:00
Tadas Dailyda
69aab6cecf fix initial migration once again (no binary strings) 2015-02-26 21:55:47 +00:00
Tadas Dailyda
f956dd106d add a missing django migration 2015-02-26 21:55:47 +00:00
Iacopo Spalletti
03073e45e4 Merge pull request #106 from nephila/feature/minor_fixes
Minor fixes
2015-02-26 22:27:45 +01:00
Iacopo Spalletti
d20a40c52d Use temporary django CMS branch for tests 2015-02-26 21:47:41 +01:00
Iacopo Spalletti
4052fb3e8d Removed Django 1.5 from supported version 2015-02-26 21:37:43 +01:00
Iacopo Spalletti
210c707775 Add versioned dependency on taggit to avoid issues in django 1.7 2015-02-26 21:36:22 +01:00
Iacopo Spalletti
a6247e85c5 Merge pull request #102 from galuszkak/patch-1
Update links
2015-02-24 18:52:43 +01:00
Kamil Gałuszka
b5381c8456 Update links
links are to wrong repository and travis-ci
2015-02-24 16:16:07 +01:00
Iacopo Spalletti
ec6f798b34 Merge pull request #100 from jedie/authors
add me to Contributors
2015-02-23 09:46:03 +01:00
JensDiemer
8cb2e2b990 add me to Contributors 2015-02-23 08:59:55 +01:00
Iacopo Spalletti
04d3d361c2 Merge pull request #99 from jedie/local_datetime_format
use locale datetime format
2015-02-22 23:17:57 +01:00
Iacopo Spalletti
4e606335c4 Merge pull request #95 from jedie/bugfix_images
Bugfix: Images should be visible on "latest entries"...
2015-02-22 23:16:13 +01:00
JensDiemer
b3614a5da8 use locale datetime format 2015-02-22 23:01:36 +01:00
JensDiemer
d5a00a844f Bugfix: Images should be visible on "latest entries"...
...in the same way as on "post list" :)
2015-02-22 22:57:47 +01:00
Iacopo Spalletti
b362c6ddf8 Merge pull request #97 from nephila/feature/cms_template
Use CMS_TEMPLATE as base template
2015-02-22 22:31:47 +01:00
Iacopo Spalletti
dcd72cb2ac Merge pull request #94 from jedie/tab2spaces
convert tab to spaces
2015-02-22 19:56:21 +01:00
Iacopo Spalletti
58373c1586 Use CMS_TEMPLATE as base template 2015-02-22 19:51:00 +01:00
JensDiemer
d00c7c5536 convert tab to spaces 2015-02-21 19:32:22 +01:00
Iacopo Spalletti
94c5dab4e0 Merge pull request #93 from jedie/move_category
workflow enhance
2015-02-21 17:58:51 +01:00
JensDiemer
70b227ab6c workflow enhance:
* move needed category to the top
* move auto slug field into collapsed info tab

see: https://github.com/nephila/djangocms-blog/issues/85#issuecomment-75377841
2015-02-21 17:05:02 +01:00
Iacopo Spalletti
f351fc3707 Merge pull request #92 from jedie/fix_meta
Display username if full name not set also in blog_detail
2015-02-21 14:59:03 +01:00
JensDiemer
20fab2b084 spaces -> tabs 2015-02-21 13:16:18 +01:00
JensDiemer
8582e8483d Display username if full name not set also in blog_detail
Update for https://github.com/nephila/djangocms-blog/pull/83
2015-02-21 13:13:52 +01:00
Iacopo Spalletti
d95ebfb300 Merge pull request #90 from nephila/readme_updates
Update README.rst
2015-02-20 22:10:58 +01:00
Iacopo Spalletti
e6a89abd28 Update README.rst
Fix #85
2015-02-20 21:51:00 +01:00
Iacopo Spalletti
10d0abc244 Merge pull request #89 from jedie/typo
typo in categories list
2015-02-20 21:41:32 +01:00
Iacopo Spalletti
e4c066da88 Merge pull request #86 from jedie/fix_not_translated_category
bugfix NoReverseMatch if category is not translated
2015-02-20 21:41:13 +01:00
Iacopo Spalletti
f7e5f7673f Merge pull request #88 from jedie/spaceless
Fix #87 
exclude content from {% spaceless %}
2015-02-20 21:36:15 +01:00
JensDiemer
7ab20f0ef7 typo in categories list 2015-02-20 21:24:21 +01:00
JensDiemer
c2b98d87e5 exclude content from {% spaceless %}
see: https://github.com/nephila/djangocms-blog/issues/87
2015-02-20 18:11:14 +01:00
JensDiemer
5a4b311e76 bugfix NoReverseMatch if category is not translated 2015-02-20 17:07:21 +01:00
Iacopo Spalletti
9f7584c161 Merge pull request #83 from jedie/author_name
Display username if full name not set
2015-02-19 17:50:23 +01:00
JensDiemer
85bb1eeb7b Display username if full name not set 2015-02-19 14:03:08 +01:00
Iacopo Spalletti
c0d27d08ea Merge pull request #80 from nephila/feature/fix_wheel
Fix conditional dependencies when using wheels
2015-02-19 11:18:36 +01:00
Iacopo Spalletti
3b21c84141 Fix tox.ini 2015-02-19 10:46:17 +01:00
Iacopo Spalletti
c106b101b1 Use stable version of djangocms-helper 2015-02-19 10:46:11 +01:00
Iacopo Spalletti
8dfdcfa0f1 Use environment metadata for conditional dependencies 2015-02-19 10:30:12 +01:00
Iacopo Spalletti
7900d2102e Add information regarding django CMS / filer MIGRATIONS_MODULES 2015-02-10 06:58:40 +01:00
Iacopo Spalletti
4e26bcc2d1 Merge branch 'develop' of github.com:nephila/djangocms-blog into develop 2015-02-08 22:46:57 +01:00
Iacopo Spalletti
bfaa012627 Update badges 2015-02-08 22:46:28 +01:00
Iacopo Spalletti
d95f78facb Merge pull request #74 from motleytech/patch-1
Update README.rst
2015-02-08 09:38:39 +01:00
MotleyTech
1c012e7e2d Update README.rst
Removed a typo.

"sele select" -> "select"
2015-02-07 21:21:03 -08:00
Iacopo Spalletti
0503706bf1 Fix test matrix 2015-02-01 14:43:42 +01:00
Iacopo Spalletti
acefa5fbb9 Merge pull request #72 from creimers/develop
use full_image_options in post_detail.html template
2015-01-26 10:04:28 +01:00
Christoph Reimers
a061c14b6a use full_image_options in post_detail.html template 2015-01-12 23:31:26 +01:00
Iacopo Spalletti
ac237c8813 Bump development version 2015-01-08 15:32:16 +01:00
Iacopo Spalletti
31faae2f20 Bump version 2015-01-08 15:31:00 +01:00