Merge pull request #113 from labhackercd/develop

v2.1.0
labhackercd · Jul 9, 2018 · c5453a5 · c5453a5
2 parents 79118ce + 6bebe09
commit c5453a5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/wikilegis/api/resources.py b/wikilegis/api/resources.py
@@ -138,11 +138,12 @@ class Meta:
             reference__bill__status='draft'
         ).exclude(reference__bill__is_visible=False)
         allowed_methods = ['get']
-        excludes = ['modified']
         filtering = {
             'author': ALL_WITH_RELATIONS,
             'reference': ALL_WITH_RELATIONS,
             'id': ALL,
+            'created': ['exact', 'lt', 'lte', 'gte', 'gt'],
+            'modified': ['exact', 'lt', 'lte', 'gte', 'gt'],
         }
 
 
@@ -159,11 +160,12 @@ class Meta:
             replaced__bill__status='draft'
         ).exclude(replaced__bill__is_visible=False)
         allowed_methods = ['get']
-        excludes = ['modified']
         filtering = {
             'author': ALL_WITH_RELATIONS,
             'replaced': ALL_WITH_RELATIONS,
             'id': ALL,
+            'created': ['exact', 'lt', 'lte', 'gte', 'gt'],
+            'modified': ['exact', 'lt', 'lte', 'gte', 'gt'],
         }
 
 
@@ -180,11 +182,12 @@ class Meta:
             supressed__bill__status='draft'
         ).exclude(supressed__bill__is_visible=False)
         allowed_methods = ['get']
-        excludes = ['modified']
         filtering = {
             'author': ALL_WITH_RELATIONS,
             'supressed': ALL_WITH_RELATIONS,
             'id': ALL,
+            'created': ['exact', 'lt', 'lte', 'gte', 'gt'],
+            'modified': ['exact', 'lt', 'lte', 'gte', 'gt'],
         }
 
 
@@ -209,6 +212,8 @@ class Meta:
             'author': ALL_WITH_RELATIONS,
             'vote': ALL,
             'id': ALL,
+            'created': ['exact', 'lt', 'lte', 'gte', 'gt'],
+            'modified': ['exact', 'lt', 'lte', 'gte', 'gt'],
         }
 
 
@@ -225,4 +230,6 @@ class Meta:
         filtering = {
             'author': ALL_WITH_RELATIONS,
             'id': ALL,
+            'created': ['exact', 'lt', 'lte', 'gte', 'gt'],
+            'modified': ['exact', 'lt', 'lte', 'gte', 'gt'],
         }
diff --git a/wikilegis/core/plugins.py b/wikilegis/core/plugins.py
@@ -4,7 +4,7 @@
 
 from django.conf import settings
 import importlib
-import pip
+from pip import _internal as pip
 
 
 PLUGINS_CONFIG_FILE = settings.BASE_DIR + '/.plugins'

diff --git a/wikilegis/public/media/brasao.png b/wikilegis/public/media/brasao.png