Merge branch 'unstable' of blezz-tech/sharix-open-webapp-base into unstable

bin/install.cfg.example

@@ -23,7 +23,7 @@ CONFIG_BRANCH="master"
 
 USER_MODEL_BRANCH="master"
 
-WEBSERVICE_RUNNING_BRANCH="unstable"
+WEBSERVICE_RUNNING_BRANCH="master"
 
 DESIGN_TEMPLATE_BRANCH="unstable"
 

core/settings.py

@@ -53,6 +53,7 @@ INSTALLED_APPS = [
     'fontawesomefree',
     'landing',
     'captcha',
+    'django_filters',
 ]
 
 MIDDLEWARE = [
@@ -386,6 +387,9 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.BasicAuthentication',
         'rest_framework.authentication.SessionAuthentication',
     ),
+    'DEFAULT_FILTER_BACKENDS': (
+        'django_filters.rest_framework.DjangoFilterBackend',
+    ),
 }
 
 SPAGHETTI_SAUCE = {

requirements.txt

@@ -13,6 +13,7 @@ Django==4.1.3
 django-ckeditor==6.7.2
 django-debug-toolbar==4.1.0
 django-extensions==3.2.1
+django-filter==25.1
 django-jazzmin==2.6.0
 django-js-asset==2.2.0
 django-ranged-response==0.2.0
@@ -22,7 +23,7 @@ django-spaghetti-and-meatballs==0.4.2
 django-tables2==2.4.1
 django-templated-mail==1.1.1
 djangorestframework==3.14.0
-djangorestframework-api-key==2.*
+djangorestframework-api-key==3.*
 djangorestframework-simplejwt==4.8.0
 djoser==2.1.0
 docutils==0.19