resolve merge conflict

DH-IT-Portal-Development · Nov 28, 2023 · c885f2d · c885f2d
2 parents 95f4f7e + 198d1f4
commit c885f2d
Show file tree

Hide file tree

Showing 38 changed files with 436 additions and 867 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 *.pyc
 __pycache__/
 .env*
-
+*.mo
 
 ### Project-specific ###
 media/

diff --git a/docs/developing/install/steps.rst b/docs/developing/install/steps.rst
@@ -21,6 +21,8 @@ Your host OS needs some packages, below is a list of debian packages:
 + libsasl2-dev
 + libssl-dev
 + gettext
++ libcairo2-dev
++ libpoppler-cpp-dev
 
 Pip might throw errors while installing `mysqlclient` if you do not have a mysql-dev package. That package is not needed
 for development, so you can (temporarily) comment out that dependency if you run into problems. (Or just install the

diff --git a/faqs/menus.py b/faqs/menus.py
@@ -21,10 +21,6 @@
     MenuItem(
         _("FAQs"),
         reverse("faqs:list"),
-    ),
-    MenuItem(
-        _("Feedback"),
-        reverse("feedback:create"),
     )
 )
 

diff --git a/feedback/__init__.py b/feedback/__init__.py
diff --git a/feedback/admin.py b/feedback/admin.py
diff --git a/feedback/forms.py b/feedback/forms.py
diff --git a/feedback/migrations/0001_initial.py b/feedback/migrations/0001_initial.py
diff --git a/feedback/migrations/__init__.py b/feedback/migrations/__init__.py
diff --git a/feedback/models.py b/feedback/models.py
diff --git a/feedback/templates/feedback/feedback_form.html b/feedback/templates/feedback/feedback_form.html
diff --git a/feedback/templates/feedback/feedback_list.html b/feedback/templates/feedback/feedback_list.html
diff --git a/feedback/templates/feedback/feedback_thanks.html b/feedback/templates/feedback/feedback_thanks.html
diff --git a/feedback/tests.py b/feedback/tests.py
diff --git a/feedback/urls.py b/feedback/urls.py
diff --git a/feedback/views.py b/feedback/views.py
diff --git a/fetc/settings.py b/fetc/settings.py
@@ -50,7 +50,6 @@
     'interventions',
     'observations',
     'reviews',
-    'feedback',
     'faqs',
 
     'modeltranslation',

diff --git a/fetc/urls.py b/fetc/urls.py
@@ -35,7 +35,6 @@
     path('observations/', include('observations.urls')),
     path('interventions/', include('interventions.urls')),
     path('reviews/', include('reviews.urls')),
-    path('feedback/', include('feedback.urls')),
     path('faqs/', include('faqs.urls')),
 
     path('admin/', admin.site.urls),

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     *.pyc
     __pycache__/
     .env*
+    *.mo
     ### Project-specific ###
     media/
@@ Expand Down @@