# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1595246912 -7200
# Node ID c5d0919c9159ad3c71eaa224c3321504abc06618
# Parent  916c81459d6beb28dfb786bceb30b0a11f6544e4
Version 0.1.61

diff -r 916c81459d6b -r c5d0919c9159 buildout.cfg
--- a/buildout.cfg	Mon Jul 20 12:30:49 2020 +0200
+++ b/buildout.cfg	Mon Jul 20 14:08:32 2020 +0200
@@ -14,26 +14,27 @@
 src = src
 develop =
     .
-    /var/local/src/pyams/pyams_catalog
-    /var/local/src/pyams/pyams_default_theme
-    /var/local/src/pyams/pyams_file
-    /var/local/src/pyams/pyams_form
-    /var/local/src/pyams/pyams_i18n
-    /var/local/src/pyams/pyams_mail
-    /var/local/src/pyams/pyams_media
-    /var/local/src/pyams/pyams_pagelet
-    /var/local/src/pyams/pyams_portal
-    /var/local/src/pyams/pyams_security
-    /var/local/src/pyams/pyams_sequence
-    /var/local/src/pyams/pyams_skin
-    /var/local/src/pyams/pyams_template
-    /var/local/src/pyams/pyams_thesaurus
-    /var/local/src/pyams/pyams_utils
-    /var/local/src/pyams/pyams_viewlet
-    /var/local/src/pyams/pyams_workflow
-    /var/local/src/pyams/pyams_zmi
-    /var/local/src/pyams/pyams_zmq
-    /var/local/src/pyams/ext/lingua
+    ../ext/lingua
+    ../myams
+    ../pyams_catalog
+    ../pyams_default_theme
+    ../pyams_file
+    ../pyams_form
+    ../pyams_i18n
+    ../pyams_mail
+    ../pyams_media
+    ../pyams_pagelet
+    ../pyams_portal
+    ../pyams_security
+    ../pyams_sequence
+    ../pyams_skin
+    ../pyams_template
+    ../pyams_thesaurus
+    ../pyams_utils
+    ../pyams_viewlet
+    ../pyams_workflow
+    ../pyams_zmi
+    ../pyams_zmq
 
 parts =
     package
@@ -86,4 +87,4 @@
 eggs = pyams_content [test]
 
 [versions]
-pyams_content = 0.1.60
+pyams_content = 0.1.61
diff -r 916c81459d6b -r c5d0919c9159 docs/HISTORY.txt
--- a/docs/HISTORY.txt	Mon Jul 20 12:30:49 2020 +0200
+++ b/docs/HISTORY.txt	Mon Jul 20 14:08:32 2020 +0200
@@ -1,6 +1,14 @@
 History
 =======
 
+0.1.61
+------
+ - moved MyAMS resources to dedicated package
+ - apply relevance sorting in views and search folders only when a search query was entered
+ - updated back-office advanced search to be able to use adapters (for example, to be able to
+   use Elasticsearch); disable sorting in advanced search if search adapter is using it's own
+   sort algorithm
+
 0.1.60
 ------
  - alerts management interface: clicking on the link to hide or show an alert didn't
diff -r 916c81459d6b -r c5d0919c9159 setup.py
--- a/setup.py	Mon Jul 20 12:30:49 2020 +0200
+++ b/setup.py	Mon Jul 20 14:08:32 2020 +0200
@@ -24,7 +24,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.1.60'
+version = '0.1.61'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = []
@@ -61,6 +61,7 @@
           # -*- Extra requirements: -*-
           'fanstatic',
           'hypatia',
+          'myams',
           'persistent',
           'pyams_catalog',
           'pyams_file',
diff -r 916c81459d6b -r c5d0919c9159 src/pyams_content.egg-info/PKG-INFO
--- a/src/pyams_content.egg-info/PKG-INFO	Mon Jul 20 12:30:49 2020 +0200
+++ b/src/pyams_content.egg-info/PKG-INFO	Mon Jul 20 14:08:32 2020 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyams-content
-Version: 0.1.60
+Version: 0.1.61
 Summary: PyAMS base content interfaces and classes
 Home-page: http://hg.ztfy.org/pyams/pyams_content
 Author: Thierry Florac
@@ -72,6 +72,14 @@
         History
         =======
         
+        0.1.61
+        ------
+         - moved MyAMS resources to dedicated package
+         - apply relevance sorting in views and search folders only when a search query was entered
+         - updated back-office advanced search to be able to use adapters (for example, to be able to
+           use Elasticsearch); disable sorting in advanced search if search adapter is using it's own
+           sort algorithm
+        
         0.1.60
         ------
          - alerts management interface: clicking on the link to hide or show an alert didn't
diff -r 916c81459d6b -r c5d0919c9159 src/pyams_content.egg-info/requires.txt
--- a/src/pyams_content.egg-info/requires.txt	Mon Jul 20 12:30:49 2020 +0200
+++ b/src/pyams_content.egg-info/requires.txt	Mon Jul 20 14:08:32 2020 +0200
@@ -1,6 +1,7 @@
 setuptools
 fanstatic
 hypatia
+myams
 persistent
 pyams_catalog
 pyams_file