Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2017-03-28 20:38:53 +0300
committerGitHub <noreply@github.com>2017-03-28 20:38:53 +0300
commita0f0eb8fa0cc86e14afeabde80d2a21a7e0122d9 (patch)
treec43d4e5cada42fd9275ada7dc85e1c31320b6e05 /plugins/DevicePlugins
parent8179b7897d6ba0538b7b24274e451d3613bbebc9 (diff)
All icons in own repo and included as a submodule (#11548)
* add icons submodule * replace path * change submodule url * fix JSONTest * fix integration tests * update icon submodules * fix preg_match * fix remaining system tests * better match for non dist icon files * fix .gitmodules * update icon submodule * Fixed custom dimension test * Do not completely fail when GD not enabled * Fix http test + refactor checklist * Refactored the code into a method * Changed icon path refs https://github.com/piwik/piwik/pull/11383 * System tests * Update valid UI tests * Fix integration test
Diffstat (limited to 'plugins/DevicePlugins')
-rw-r--r--plugins/DevicePlugins/functions.php2
-rw-r--r--plugins/DevicePlugins/images/plugins/cookie.pngbin2350 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/director.pngbin1795 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/flash.pngbin942 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/gears.pngbin1260 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/java.pngbin1452 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/pdf.pngbin2004 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/quicktime.pngbin2720 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/realplayer.pngbin2295 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/silverlight.pngbin2849 -> 0 bytes
-rw-r--r--plugins/DevicePlugins/images/plugins/windowsmedia.pngbin3963 -> 0 bytes
11 files changed, 1 insertions, 1 deletions
diff --git a/plugins/DevicePlugins/functions.php b/plugins/DevicePlugins/functions.php
index ad27e67b72..30a6cf504b 100644
--- a/plugins/DevicePlugins/functions.php
+++ b/plugins/DevicePlugins/functions.php
@@ -16,5 +16,5 @@ function getPluginsLogo($label)
if ($label == Piwik::translate('General_Others')) {
return false;
}
- return 'plugins/DevicePlugins/images/plugins/' . $label . '.png';
+ return 'plugins/Morpheus/icons/dist/plugins/' . $label . '.png';
}
diff --git a/plugins/DevicePlugins/images/plugins/cookie.png b/plugins/DevicePlugins/images/plugins/cookie.png
deleted file mode 100644
index 6a2c66726b..0000000000
--- a/plugins/DevicePlugins/images/plugins/cookie.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/director.png b/plugins/DevicePlugins/images/plugins/director.png
deleted file mode 100644
index 529b54402c..0000000000
--- a/plugins/DevicePlugins/images/plugins/director.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/flash.png b/plugins/DevicePlugins/images/plugins/flash.png
deleted file mode 100644
index 3c10ce920c..0000000000
--- a/plugins/DevicePlugins/images/plugins/flash.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/gears.png b/plugins/DevicePlugins/images/plugins/gears.png
deleted file mode 100644
index bcd3a408c0..0000000000
--- a/plugins/DevicePlugins/images/plugins/gears.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/java.png b/plugins/DevicePlugins/images/plugins/java.png
deleted file mode 100644
index ab07c395ed..0000000000
--- a/plugins/DevicePlugins/images/plugins/java.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/pdf.png b/plugins/DevicePlugins/images/plugins/pdf.png
deleted file mode 100644
index b3e5f6a5b0..0000000000
--- a/plugins/DevicePlugins/images/plugins/pdf.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/quicktime.png b/plugins/DevicePlugins/images/plugins/quicktime.png
deleted file mode 100644
index 2b2b1f5a2b..0000000000
--- a/plugins/DevicePlugins/images/plugins/quicktime.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/realplayer.png b/plugins/DevicePlugins/images/plugins/realplayer.png
deleted file mode 100644
index 26b2695e35..0000000000
--- a/plugins/DevicePlugins/images/plugins/realplayer.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/silverlight.png b/plugins/DevicePlugins/images/plugins/silverlight.png
deleted file mode 100644
index 148279faf4..0000000000
--- a/plugins/DevicePlugins/images/plugins/silverlight.png
+++ /dev/null
Binary files differ
diff --git a/plugins/DevicePlugins/images/plugins/windowsmedia.png b/plugins/DevicePlugins/images/plugins/windowsmedia.png
deleted file mode 100644
index b066b614a2..0000000000
--- a/plugins/DevicePlugins/images/plugins/windowsmedia.png
+++ /dev/null
Binary files differ