Merge master to devel

lib/redmine_dmsf/hooks/views/issue_view_hooks.rb

@@ -73,7 +73,9 @@ module RedmineDmsf
       end
 
       def view_issues_show_thumbnails(context={})
-        show_thumbnails(context[:container], context[:controller])
+        unless context[:options][:only_mails].present?
+          show_thumbnails(context[:container], context[:controller])
+        end
       end
 
       def view_issues_dms_thumbnails(context={})

lib/redmine_dmsf/patches/easy_crm_case_patch.rb

@@ -177,9 +177,10 @@ module RedmineDmsf
   end
 end
 
-# Apply patch
-Rails.configuration.to_prepare do
-  unless EasyCrmCase.included_modules.include?(RedmineDmsf::Patches::EasyCrmCasePatch)
-    EasyCrmCase.send(:include, RedmineDmsf::Patches::EasyCrmCasePatch)
+if Redmine::Plugin.installed?(:easy_crm)
+  Rails.configuration.to_prepare do
+    unless EasyCrmCase.included_modules.include?(RedmineDmsf::Patches::EasyCrmCasePatch)
+      EasyCrmCase.send(:include, RedmineDmsf::Patches::EasyCrmCasePatch)
+    end
   end
-end
+end

lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb

@@ -112,4 +112,6 @@ module RedmineDmsf
   end
 end
 
-EasyCrmCasesController.send(:prepend, RedmineDmsf::Patches::EasyCrmCasesControllerPatch)
+if Redmine::Plugin.installed?(:easy_crm)
+  EasyCrmCasesController.send(:prepend, RedmineDmsf::Patches::EasyCrmCasesControllerPatch)
+end