Commit graph

901 commits

Author SHA1 Message Date
Iacopo Spalletti
1cfacc6557 Merge pull request #327 from nephila/merge/322
Merge #322
2016-09-13 07:57:53 +02:00
Iacopo Spalletti
d757e1e997 Merge pull request #326 from nephila/feature/optimizations_develop
Optimize querysets
2016-09-13 07:21:23 +02:00
Iacopo Spalletti
30eca46587
Add test for #322 2016-09-13 06:59:46 +02:00
Mark
40171e46a6
on site in manager 2016-09-13 06:59:00 +02:00
Iacopo Spalletti
53f98afd6c
Changes for develop 2016-09-12 23:27:59 +02:00
Iacopo Spalletti
52cd80b129
Merge branch 'release/0.8.x' into develop 2016-09-12 23:10:22 +02:00
Iacopo Spalletti
78001259a1 Merge pull request #325 from nephila/feature/optimizations
Optimize querysets
2016-09-12 08:17:03 +02:00
Iacopo Spalletti
065329f471
Optimize querysets 2016-09-11 22:38:16 +02:00
Iacopo Spalletti
c013661a53
Merge branch 'release/0.8.x' into develop 2016-09-10 21:50:21 +02:00
Iacopo Spalletti
a932552950
Fix readme formatting 2016-09-10 21:46:43 +02:00
Iacopo Spalletti
8d98df349c Merge pull request #324 from nephila/feature/optional_search
Remove strict dependency on aldryn-search for leaner installs
2016-09-06 08:14:14 +02:00
Iacopo Spalletti
3883d2a5ba
Remove strict dependency on aldryn-search for leaner installs 2016-09-06 07:20:31 +02:00
Iacopo Spalletti
5ede0f01a4
Merge branch 'release/0.8.x' into develop 2016-09-04 09:47:05 +02:00
Iacopo Spalletti
f9262e3327
Release 0.8.8 2016-09-04 06:51:47 +02:00
Iacopo Spalletti
97971b511e Merge pull request #321 from nephila/hotfix/thumbnail_model
Use correct ThumbnailOption model in migrations
2016-09-04 06:39:53 +02:00
Iacopo Spalletti
a74348df2b
Do not enable auto setup during tests 2016-09-04 00:07:56 +02:00
Iacopo Spalletti
f6ffd0a63b
Use 0.9 branch of djangocms-helper 2016-09-02 07:52:08 +02:00
Iacopo Spalletti
ab7929648e
Use correct model in migrations 2016-08-31 22:19:30 +02:00
Iacopo Spalletti
2b40378729 Merge pull request #319 from nephila/feature/cms_342
More django CMS 3.4 compatiblity
2016-08-26 17:54:38 +02:00
Iacopo Spalletti
549cd9e1d7
More django CMS 3.4 compatiblity 2016-08-26 08:56:27 +02:00
Iacopo Spalletti
0ada77d2e7
Merge branch 'release/0.8.x' into develop 2016-08-25 22:34:47 +02:00
Iacopo Spalletti
479cd067c7
Release 0.8.7 2016-08-25 22:34:08 +02:00
Iacopo Spalletti
4389b2408e
Release 0.8.7 2016-08-25 22:07:12 +02:00
Iacopo Spalletti
db60fa2f4d Merge pull request #318 from nephila/hotfix/sites
Do not cache sites in the admin
2016-08-25 18:21:43 +02:00
Iacopo Spalletti
3b1e2de016
Update PO 2016-08-25 15:40:19 +02:00
Iacopo Spalletti
4529f9b8dd
Do not cache sites in the admin 2016-08-25 15:32:19 +02:00
Iacopo Spalletti
d584009912 Merge pull request #317 from nephila/feature/cms-3.4
Add support for django CMS 3.4
2016-08-25 08:29:53 +02:00
Iacopo Spalletti
6dd9176617
xAdd support for django CMS 3.4 2016-08-23 20:08:48 +02:00
Iacopo Spalletti
8f58eaeec1
Release 0.8.6 2016-08-03 14:59:12 +02:00
Iacopo Spalletti
2290e84ef9
Pin html5lib 2016-08-03 14:59:09 +02:00
Iacopo Spalletti
bcc89c303d
Bump development version 2016-08-03 12:21:07 +02:00
Iacopo Spalletti
f0c589babf Merge pull request #312 from nephila/feature/improve_category_admin
Improve category admin
2016-08-03 12:20:28 +02:00
Iacopo Spalletti
56b472eefc
Fix tests 2016-08-03 10:58:47 +02:00
Iacopo Spalletti
258680221d Merge pull request #313 from nephila/feature/docs_parler_version
Document PARLER_LANGUAGES for parler 1.6
2016-08-03 10:51:06 +02:00
Iacopo Spalletti
0410ac1f8c
Add changelog entry 2016-08-03 10:05:10 +02:00
Iacopo Spalletti
b2b962610a
Add tests for category parent filtering 2016-08-03 10:05:10 +02:00
Iacopo Spalletti
c14afead36
Filter parent categories on apphook 2016-08-03 10:05:10 +02:00
Iacopo Spalletti
abb92c01ed
Document PARLER_LANGUAGES for parler 1.6 2016-08-03 09:29:23 +02:00
Iacopo Spalletti
e56d5aa137
Add very stupid check to avoid circular relationships for BlogCategory 2016-08-03 09:21:54 +02:00
Iacopo Spalletti
ece8ee663f Merge pull request #311 from nephila/feature/channels_docs
Improve channels features configuration docs
2016-08-03 09:20:39 +02:00
Iacopo Spalletti
3a9feceb8a
Improve channels features configuration docs 2016-08-03 08:13:37 +02:00
Iacopo Spalletti
5cc81adb98
Pin html5lib 2016-07-15 23:27:01 +02:00
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