Merge pull request #415 from aldryn/bugfix/aldryn-translation-tools

Fixed aldryn_translation_tools not being added to INSTALLED_APPS on Aldryn
divio · Jul 13, 2016 · 0b92a06 · 0b92a06
2 parents 02ac33b + 45ac57d
commit 0b92a06
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.2.4 (unreleased)
+------------------
+
+* Fixed aldryn_translation_tools not being added to INSTALLED_APPS on Aldryn
+
+
 1.2.3 (2016-06-28)
 ------------------
 

diff --git a/addon.json b/addon.json
@@ -8,6 +8,7 @@
         "aldryn_newsblog",
         "aldryn_people",
         "aldryn_reversion",
+        "aldryn_translation_tools",
         "easy_thumbnails",
         "filer",
         "sortedm2m",

diff --git a/test_requirements/base.txt b/test_requirements/base.txt
@@ -2,7 +2,6 @@ aldryn-search>=0.2.12
 coverage>=3.7.1
 dj-database-url
 django-classy-tags
-django-haystack
 django-sekizai
 django-treebeard>=2.0
 djangocms-admin-style

diff --git a/test_requirements/django-1.6.txt b/test_requirements/django-1.6.txt
@@ -1,6 +1,7 @@
 django>=1.6,<1.7
 South
 django-reversion<1.8.3
+django-haystack<2.5
 
 
 

diff --git a/test_requirements/django-1.7.txt b/test_requirements/django-1.7.txt
@@ -1,6 +1,7 @@
 django>=1.7.4,<1.8
 
 django-reversion>=1.8.2,<1.9
+django-haystack
 
 
 

diff --git a/test_requirements/django-1.8.txt b/test_requirements/django-1.8.txt
@@ -1,6 +1,7 @@
 django>=1.8,<1.9
 
 django-reversion>=1.9.3,<1.10
+django-haystack
 
 
 

diff --git a/test_requirements/django-1.9.txt b/test_requirements/django-1.9.txt
@@ -1,6 +1,7 @@
 django>=1.9,<1.10
 
 django-reversion>=1.9.4,<1.11
+django-haystack
 
 # Django 1.9 compatible packages
 aldryn-boilerplates>=0.7.4