Commit graph

777 commits

Author SHA1 Message Date
Iacopo Spalletti
35f2b47905 Merge branch 'develop' of github.com:nephila/djangocms-blog into develop 2016-02-16 08:01:09 +01:00
Iacopo Spalletti
8c35763150 Merge pull request #206 from nephila/feature/menu_modifier
Fix selecting current menu item according to menu layout
2016-02-16 07:52:21 +01:00
Iacopo Spalletti
f79b6471c4 Fix test 2016-02-15 23:16:34 +01:00
Iacopo Spalletti
e5a070bc94 Fix string formatting 2016-02-15 20:37:07 +01:00
Iacopo Spalletti
2588f6c020 Fix selecting current menu item according to menu layout 2016-02-15 20:33:17 +01:00
Iacopo Spalletti
c71fb4e534 Update history 2016-02-15 19:44:32 +01:00
Iacopo Spalletti
fd08994810 Merge pull request #203 from skirsdeda/fix202
Fix #202
2016-02-15 19:43:25 +01:00
Iacopo Spalletti
62e8d4429b Merge pull request #201 from skirsdeda/filer_migration_fix
fix migration 0007 to use swappable dependency
2016-02-15 19:39:11 +01:00
Iacopo Spalletti
dc24c12dee Add migrations to .checkignore 2016-02-15 19:37:57 +01:00
Tadas Dailyda
453adeb5bd also fix migration 0001 and 0004, be aware that FILER_IMAGE_MODEL is False by default 2016-02-15 14:55:12 +02:00
Tadas Dailyda
678bd1ab9b remove data migration from 0010, create 0014 with optional data migration (does nothing if already migrated) 2016-02-15 13:53:06 +02:00
Tadas Dailyda
701454bdd2 fix migration 0007 to use swappable dependency 2016-02-15 12:13:36 +02:00
Iacopo Spalletti
18ea7bbd88 Merge pull request #200 from nephila/feature/publish_button
Add publish button to the toolbar
2016-02-12 09:05:30 +01:00
Iacopo Spalletti
34039bea6f Add docstrings 2016-02-12 08:02:23 +01:00
Iacopo Spalletti
094525326f Add admin test for publish view 2016-02-12 07:55:10 +01:00
Iacopo Spalletti
1b42655d97 Add toolbar test for publish button 2016-02-12 07:42:58 +01:00
Iacopo Spalletti
33d2371647 Cleanup code 2016-02-11 23:02:20 +01:00
Iacopo Spalletti
fcc9d3ace1 add publish button to the toolbar 2016-02-11 19:25:05 +01:00
Iacopo Spalletti
9bc5e5c4e6 Update README 2016-02-10 21:56:28 +01:00
Iacopo Spalletti
b7b7cf20cf Merge pull request #198 from nephila/feature/admin_improvements
Admin  improvements
2016-02-10 16:30:54 +01:00
Iacopo Spalletti
9e315d4721 Edit history 2016-02-10 10:10:09 +01:00
Iacopo Spalletti
cac615af85 Use all_languages_column from parler 1.5, bump deps accordingly 2016-02-10 10:06:40 +01:00
Iacopo Spalletti
a4c4f3116e Use the right mptt version 2016-02-07 21:42:08 +01:00
Iacopo Spalletti
85495ee1c3 Add gitlab-ci configuration 2016-02-07 19:41:04 +01:00
Iacopo Spalletti
d5449382c1 Merge pull request #196 from nephila/feature/fix_parler
Feature/fix parler
2016-02-07 18:11:22 +01:00
Iacopo Spalletti
80778b9c04 Fix mptt development fix 2016-02-07 17:01:36 +01:00
Iacopo Spalletti
5313642aad Update changelog 2016-02-07 16:38:11 +01:00
Iacopo Spalletti
2cb43d6497 Merge remote-tracking branch 'upstream/develop' into feature/fix_parler 2016-02-07 16:38:03 +01:00
Iacopo Spalletti
ae2b4a1f6f Merge pull request #195 from nephila/feature/non_required_categories
Fix menu behavior
2016-02-07 15:51:14 +01:00
Iacopo Spalletti
0e8d7f2430 Add checkignore 2016-02-07 13:57:35 +01:00
Iacopo Spalletti
890c8b7883 Merge branch 'feature/non_required_categories' into feature/fix_parler 2016-02-07 13:07:43 +01:00
Iacopo Spalletti
99ebd92e38 Fix issue with django CMS 3 2016-02-07 13:07:32 +01:00
Iacopo Spalletti
fe34a6ae01 Use modern parler in tests 2016-02-07 13:02:32 +01:00
Iacopo Spalletti
38fbe7cf85 Fix tests with parler>=1.6 2016-02-07 13:01:40 +01:00
Iacopo Spalletti
105171d2ad Fix cache leaks 2016-02-07 12:16:24 +01:00
Iacopo Spalletti
178b9bdcc7 Testing post in menu depending if category is present 2016-02-04 06:14:05 +01:00
Iacopo Spalletti
1939ec7919 Fix menu behavior 2016-02-04 04:53:40 +01:00
Iacopo Spalletti
e5e7415d06 Update README 2016-02-02 11:36:08 +01:00
Iacopo Spalletti
660fe15291 Merge pull request #194 from nephila/feature/non_required_categories
Make category not required again
2016-02-02 09:44:08 +01:00
Iacopo Spalletti
486fd4c66d Merge pull request #193 from nephila/feature/fix_author
Fix setting author
2016-02-01 23:41:46 +01:00
Iacopo Spalletti
0f2abd8627 Make category not required again 2016-02-01 22:58:57 +01:00
Iacopo Spalletti
4db9bef8c6 Fix import 2016-02-01 22:04:55 +01:00
Iacopo Spalletti
395185f5fe Code refactoring 2016-02-01 21:22:52 +01:00
Iacopo Spalletti
70e6b6e523 Fix setting author 2016-02-01 21:13:33 +01:00
Iacopo Spalletti
129a8337bb Merge pull request #192 from olibook/develop
Provide french translation
2016-02-01 00:01:57 +01:00
Iacopo Spalletti
0047f0d505 Pin django-taggit 2016-01-26 07:41:50 +01:00
Iacopo Spalletti
e1c63e42b7 Update README 2016-01-25 22:55:12 +01:00
Olivier Tabone
1afb15f308 update fr translation 2016-01-20 19:13:09 +01:00
Olivier Tabone
909b60813d translate app in french 2016-01-20 19:08:32 +01:00
Iacopo Spalletti
cc943450e2 fix code style 2016-01-18 23:48:43 +01:00