diff options
88 files changed, 7 insertions, 17 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index b57af2a59e..501a0d2bc1 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -635,8 +635,6 @@ Plugins[] = MobileMessaging Plugins[] = Overlay Plugins[] = SegmentEditor Plugins[] = Insights - -Plugins[] = Morpheus Plugins[] = ZenMode [PluginsInstalled] diff --git a/core/Twig.php b/core/Twig.php index 8c5ce8a2ef..8dd259fc2d 100755 --- a/core/Twig.php +++ b/core/Twig.php @@ -42,18 +42,19 @@ class Twig //get current theme $manager = Plugin\Manager::getInstance(); - $theme = $manager->getThemeEnabled(); + $theme = $manager->getThemeEnabled(); $loaders = array(); //create loader for custom theme to overwrite twig templates - if($theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME){ + if($theme->getPluginName() != \Piwik\Plugin\Manager::DEFAULT_THEME) { $customLoader = $this->getCustomThemeLoader($theme); - if($customLoader){ + if ($customLoader) { //make it possible to overwrite plugin templates - $this->addCustomPluginNamespaces($customLoader,$theme->getPluginName()); + $this->addCustomPluginNamespaces($customLoader, $theme->getPluginName()); $loaders[] = $customLoader; } } + $loaders[] = $loader; $chainLoader = new Twig_Loader_Chain($loaders); diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index 5376559f13..27fc06939a 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -151,7 +151,7 @@ </thead> <tbody id="plugins"> {% for name,plugin in pluginsInfo %} - {% set isZeitgeist = isTheme and name == 'Zeitgeist' %} + {% set isZeitgeist = isTheme and (name == 'Morpheus' or name == 'Zeitgeist') %} {% if (plugin.alwaysActivated is defined and not plugin.alwaysActivated) or isTheme %} <tr {% if plugin.activated %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %} data-filter-status="{% if plugin.activated %}active{% else %}inactive{% endif %}" data-filter-origin="{% if plugin.isCorePlugin %}core{% else %}noncore{% endif %}"> <td class="name" style="white-space:nowrap;"> diff --git a/plugins/Zeitgeist/images/background-submit.png b/plugins/Morpheus/images/background-submit.png Binary files differindex 033a47ad9a..033a47ad9a 100644 --- a/plugins/Zeitgeist/images/background-submit.png +++ b/plugins/Morpheus/images/background-submit.png diff --git a/plugins/Zeitgeist/images/collapsed_arrows.gif b/plugins/Morpheus/images/collapsed_arrows.gif Binary files differindex 458728fdec..458728fdec 100644 --- a/plugins/Zeitgeist/images/collapsed_arrows.gif +++ b/plugins/Morpheus/images/collapsed_arrows.gif diff --git a/plugins/Zeitgeist/images/affix-arrow.png b/plugins/Zeitgeist/images/affix-arrow.png Binary files differdeleted file mode 100644 index bc45f553a4..0000000000 --- a/plugins/Zeitgeist/images/affix-arrow.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/annotations.png b/plugins/Zeitgeist/images/annotations.png Binary files differdeleted file mode 100644 index b0e3e3e6ae..0000000000 --- a/plugins/Zeitgeist/images/annotations.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/annotations_starred.png b/plugins/Zeitgeist/images/annotations_starred.png Binary files differdeleted file mode 100644 index a2506a2a7d..0000000000 --- a/plugins/Zeitgeist/images/annotations_starred.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/arr_r.png b/plugins/Zeitgeist/images/arr_r.png Binary files differdeleted file mode 100644 index 4a244a89e9..0000000000 --- a/plugins/Zeitgeist/images/arr_r.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/chart_bar.png b/plugins/Zeitgeist/images/chart_bar.png Binary files differdeleted file mode 100644 index 6c96e7bd57..0000000000 --- a/plugins/Zeitgeist/images/chart_bar.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/chart_line_edit.png b/plugins/Zeitgeist/images/chart_line_edit.png Binary files differdeleted file mode 100755 index e437801b3d..0000000000 --- a/plugins/Zeitgeist/images/chart_line_edit.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/chart_pie.png b/plugins/Zeitgeist/images/chart_pie.png Binary files differdeleted file mode 100644 index 610f857890..0000000000 --- a/plugins/Zeitgeist/images/chart_pie.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/close.png b/plugins/Zeitgeist/images/close.png Binary files differdeleted file mode 100644 index 44b591bd03..0000000000 --- a/plugins/Zeitgeist/images/close.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/configure-highlight.png b/plugins/Zeitgeist/images/configure-highlight.png Binary files differdeleted file mode 100755 index dd37fc14de..0000000000 --- a/plugins/Zeitgeist/images/configure-highlight.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/configure.png b/plugins/Zeitgeist/images/configure.png Binary files differdeleted file mode 100755 index 5a0ec4a785..0000000000 --- a/plugins/Zeitgeist/images/configure.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/dashboard_h_bg.png b/plugins/Zeitgeist/images/dashboard_h_bg.png Binary files differdeleted file mode 100644 index 279a94949d..0000000000 --- a/plugins/Zeitgeist/images/dashboard_h_bg.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/dashboard_h_bg_hover.png b/plugins/Zeitgeist/images/dashboard_h_bg_hover.png Binary files differdeleted file mode 100644 index 37e4bd54e8..0000000000 --- a/plugins/Zeitgeist/images/dashboard_h_bg_hover.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/data_table_footer_active_item.png b/plugins/Zeitgeist/images/data_table_footer_active_item.png Binary files differdeleted file mode 100644 index 343591f6bf..0000000000 --- a/plugins/Zeitgeist/images/data_table_footer_active_item.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/datepicker_arr_l.png b/plugins/Zeitgeist/images/datepicker_arr_l.png Binary files differdeleted file mode 100644 index aa73d36239..0000000000 --- a/plugins/Zeitgeist/images/datepicker_arr_l.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/datepicker_arr_r.png b/plugins/Zeitgeist/images/datepicker_arr_r.png Binary files differdeleted file mode 100644 index 7bd04bc236..0000000000 --- a/plugins/Zeitgeist/images/datepicker_arr_r.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/delete.png b/plugins/Zeitgeist/images/delete.png Binary files differdeleted file mode 100644 index f2a3c2a20d..0000000000 --- a/plugins/Zeitgeist/images/delete.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/download.png b/plugins/Zeitgeist/images/download.png Binary files differdeleted file mode 100644 index 1920b1bb22..0000000000 --- a/plugins/Zeitgeist/images/download.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif b/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif Binary files differdeleted file mode 100644 index b4ec1d75f7..0000000000 --- a/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/ecommerceOrder.gif b/plugins/Zeitgeist/images/ecommerceOrder.gif Binary files differdeleted file mode 100644 index 664e035509..0000000000 --- a/plugins/Zeitgeist/images/ecommerceOrder.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/email.png b/plugins/Zeitgeist/images/email.png Binary files differdeleted file mode 100644 index 4a6c5d396a..0000000000 --- a/plugins/Zeitgeist/images/email.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/error.png b/plugins/Zeitgeist/images/error.png Binary files differdeleted file mode 100644 index 2997461b21..0000000000 --- a/plugins/Zeitgeist/images/error.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/error_medium.png b/plugins/Zeitgeist/images/error_medium.png Binary files differdeleted file mode 100644 index 538cb9039f..0000000000 --- a/plugins/Zeitgeist/images/error_medium.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/event.png b/plugins/Zeitgeist/images/event.png Binary files differdeleted file mode 100644 index ad4b38a01b..0000000000 --- a/plugins/Zeitgeist/images/event.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/expanded_arrows.gif b/plugins/Zeitgeist/images/expanded_arrows.gif Binary files differdeleted file mode 100644 index ed33959206..0000000000 --- a/plugins/Zeitgeist/images/expanded_arrows.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/export.png b/plugins/Zeitgeist/images/export.png Binary files differdeleted file mode 100644 index 110af8c431..0000000000 --- a/plugins/Zeitgeist/images/export.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/feed.png b/plugins/Zeitgeist/images/feed.png Binary files differdeleted file mode 100644 index 315c4f4fa6..0000000000 --- a/plugins/Zeitgeist/images/feed.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/fullscreen.png b/plugins/Zeitgeist/images/fullscreen.png Binary files differdeleted file mode 100755 index 3c3273ba9d..0000000000 --- a/plugins/Zeitgeist/images/fullscreen.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/goal.png b/plugins/Zeitgeist/images/goal.png Binary files differdeleted file mode 100644 index 69db019e5e..0000000000 --- a/plugins/Zeitgeist/images/goal.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/help.png b/plugins/Zeitgeist/images/help.png Binary files differdeleted file mode 100644 index 8f3df97e9c..0000000000 --- a/plugins/Zeitgeist/images/help.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/html_icon.png b/plugins/Zeitgeist/images/html_icon.png Binary files differdeleted file mode 100644 index 7b4308d885..0000000000 --- a/plugins/Zeitgeist/images/html_icon.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/ico_alert.png b/plugins/Zeitgeist/images/ico_alert.png Binary files differdeleted file mode 100644 index b8087eba9c..0000000000 --- a/plugins/Zeitgeist/images/ico_alert.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/ico_delete.png b/plugins/Zeitgeist/images/ico_delete.png Binary files differdeleted file mode 100644 index eb6cbc030b..0000000000 --- a/plugins/Zeitgeist/images/ico_delete.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/ico_edit.png b/plugins/Zeitgeist/images/ico_edit.png Binary files differdeleted file mode 100644 index 0d1a0fa16f..0000000000 --- a/plugins/Zeitgeist/images/ico_edit.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/ico_info.png b/plugins/Zeitgeist/images/ico_info.png Binary files differdeleted file mode 100644 index 1278cef852..0000000000 --- a/plugins/Zeitgeist/images/ico_info.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/icon-calendar.gif b/plugins/Zeitgeist/images/icon-calendar.gif Binary files differdeleted file mode 100644 index 132350e783..0000000000 --- a/plugins/Zeitgeist/images/icon-calendar.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/image.png b/plugins/Zeitgeist/images/image.png Binary files differdeleted file mode 100644 index 546ebcdec7..0000000000 --- a/plugins/Zeitgeist/images/image.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/inp_bg.png b/plugins/Zeitgeist/images/inp_bg.png Binary files differdeleted file mode 100644 index 6bd9674743..0000000000 --- a/plugins/Zeitgeist/images/inp_bg.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/li_dbl_gray.gif b/plugins/Zeitgeist/images/li_dbl_gray.gif Binary files differdeleted file mode 100644 index 42fe8b3b89..0000000000 --- a/plugins/Zeitgeist/images/li_dbl_gray.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/link.gif b/plugins/Zeitgeist/images/link.gif Binary files differdeleted file mode 100644 index e160f23b63..0000000000 --- a/plugins/Zeitgeist/images/link.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/loading-blue.gif b/plugins/Zeitgeist/images/loading-blue.gif Binary files differdeleted file mode 100644 index 4df2f1fde6..0000000000 --- a/plugins/Zeitgeist/images/loading-blue.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/login-sprite.png b/plugins/Zeitgeist/images/login-sprite.png Binary files differdeleted file mode 100644 index 1692e4b09b..0000000000 --- a/plugins/Zeitgeist/images/login-sprite.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/logo-header.png b/plugins/Zeitgeist/images/logo-header.png Binary files differdeleted file mode 100644 index d10293eaef..0000000000 --- a/plugins/Zeitgeist/images/logo-header.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/logo-marketplace.png b/plugins/Zeitgeist/images/logo-marketplace.png Binary files differdeleted file mode 100644 index d28491d73f..0000000000 --- a/plugins/Zeitgeist/images/logo-marketplace.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/logo.png b/plugins/Zeitgeist/images/logo.png Binary files differdeleted file mode 100644 index 00421e4497..0000000000 --- a/plugins/Zeitgeist/images/logo.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/logo.svg b/plugins/Zeitgeist/images/logo.svg deleted file mode 100644 index d83f657687..0000000000 --- a/plugins/Zeitgeist/images/logo.svg +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 220 76" width="220" height="76" style="stroke:none;fill-rule:nonzero"> - <path d="m 44.71,23.34 c 0.00,3.06 -0.71,5.82 -2.33,8.02 -1.57,2.13 -3.88,3.64 -6.62,4.48 -2.67,0.83 -5.84,1.21 -9.52,1.21 l -12.46,0 0,-27.33 12.46,0 c 6.87,0.04 11.82,0.96 14.97,4.02 2.35,2.50 3.51,5.84 3.51,9.53 l -0.37,0 0.37,0.05 z m 10.20,-0.29 c 0,-3.25 -0.52,-6.09 -1.52,-8.55 C 52.38,11.99 50.95,9.96 49.04,8.27 47.14,6.58 44.90,5.39 42.19,4.63 39.55,3.86 35.39,3.41 29.92,3.41 l 0,-0.10 -0.08,0.11 -19.13,-0.01 0,0.00 c -0.00,0 -0.01,0 -0.03,0 -2.91,0 -4.64,0.67 -5.43,1.46 -0.77,0.69 -1.48,2.29 -1.47,5.23 l 0,56.65 c 0.00,2.59 0.60,4.15 1.42,5.05 0.96,1.01 1.88,1.44 3.60,1.48 1.57,-0.03 2.48,-0.44 3.51,-1.51 0.85,-0.92 1.46,-2.49 1.46,-5.11 l 0,-23.24 16.07,0 c 8.80,0.00 15.07,-1.88 19.03,-5.22 3.97,-3.36 6.01,-8.13 6.04,-15.15" style="fill:#fbc907" /> - <path d="m 67.14,28.19 c -1.64,0.03 -2.54,0.44 -3.51,1.45 -0.80,0.87 -1.42,2.45 -1.42,5.12 l 0,31.88 -0.00,0 c 0.00,2.66 0.62,4.24 1.44,5.14 1.00,1.05 1.90,1.45 3.47,1.48 1.73,-0.03 2.67,-0.45 3.65,-1.47 0.80,-0.86 1.43,-2.46 1.43,-5.15 l 0,-31.88 c 0,-2.70 -0.62,-4.29 -1.42,-5.12 -0.96,-1.00 -1.93,-1.42 -3.64,-1.45" style="fill:#f68c11" /> - <path d="m 73.22,15.83 c 0,3.31 -2.69,6.00 -6.01,6.00 -3.31,0 -6.00,-2.69 -6.00,-6.00 0,-3.31 2.69,-6.00 6.00,-6.00 3.31,0 6.01,2.69 6.01,6.00" style="fill:#f68c11" /> - <path d="m 155.84,28.19 c -1.64,0.03 -2.53,0.44 -3.51,1.45 -0.80,0.86 -1.42,2.45 -1.42,5.12 l 0,31.88 c 0,2.66 0.61,4.26 1.43,5.14 1.01,1.05 1.90,1.45 3.48,1.48 1.72,-0.03 2.67,-0.45 3.65,-1.47 0.80,-0.86 1.42,-2.46 1.42,-5.15 l 0.00,-31.88 c 0,-2.70 -0.62,-4.29 -1.41,-5.12 -0.97,-0.99 -1.93,-1.42 -3.65,-1.45" style="fill:#cd1e25" /> - <path d="m 161.92,15.83 c 0,3.31 -2.69,6.00 -6.00,6.00 -3.31,0 -6.00,-2.69 -6.00,-6.00 0,-3.31 2.68,-6.00 6.00,-6.00 3.31,0 6.00,2.69 6.00,6.00" style="fill:#cd1e25" /> - <path d="m 215.55,66.59 c -0.41,-0.78 -1.15,-2.02 -2.19,-3.67 l -15.21,-23.91 8.66,-7.94 c 3.69,-3.23 5.14,-5.89 5.01,-6.69 -0.02,-1.21 -0.35,-1.95 -1.12,-2.72 -0.79,-0.74 -1.64,-1.09 -2.96,-1.11 -1.13,0.00 -1.90,0.27 -2.55,0.74 -0.82,0.59 -2.28,1.95 -4.18,3.95 l -19.15,20.09 0.00,-35.92 c 0,-2.59 -0.58,-4.23 -1.40,-5.19 -0.90,-1.01 -1.89,-1.47 -3.60,-1.50 -1.73,0.04 -2.64,0.51 -3.50,1.61 -0.82,1.11 -1.40,3.03 -1.39,5.89 l 0,56.59 c -0.00,2.51 0.55,4.11 1.34,5.03 0.86,0.96 1.83,1.41 3.54,1.44 1.30,-0.01 2.31,-0.44 3.45,-1.57 0.95,-0.98 1.54,-2.44 1.55,-4.81 l 0,-11.95 9.99,-9.45 13.60,22.35 c 1.51,2.34 2.73,3.94 3.45,4.64 0.46,0.45 1.15,0.78 2.52,0.79 1.55,-0.02 2.48,-0.43 3.32,-1.29 0.79,-0.84 1.25,-1.99 1.26,-3.86 0,-0.38 -0.10,-0.88 -0.45,-1.54" style="fill:#5f1316" /> - <path d="m 143.02,29.00 c -0.88,-0.83 -1.88,-1.23 -3.06,-1.23 -1.28,0.00 -2.12,0.29 -2.67,0.76 -0.64,0.55 -1.08,1.17 -1.33,1.87 -0.29,0.79 -0.70,2.13 -1.21,4.01 l -8.41,28.51 -7.62,-26.69 c -0.70,-2.39 -1.25,-4.08 -1.62,-5.00 -0.34,-0.83 -0.94,-1.64 -1.84,-2.41 -0.78,-0.67 -1.93,-1.05 -3.53,-1.05 -1.56,0 -2.70,0.37 -3.49,1.05 -0.90,0.77 -1.48,1.55 -1.77,2.31 -0.33,0.87 -0.87,2.58 -1.61,5.08 L 97.16,62.95 88.84,34.41 c -0.76,-2.59 -1.46,-4.41 -2.08,-5.38 -0.46,-0.75 -1.44,-1.25 -3.22,-1.25 -1.24,0 -2.25,0.41 -3.08,1.24 -0.86,0.87 -1.25,1.79 -1.25,2.78 0,0.00 0,0.03 0,0.05 0.00,0.83 0.44,2.56 1.36,5.11 l 9.37,27.73 c 0.25,0.74 0.61,1.73 1.06,2.99 0.43,1.21 0.93,2.24 1.49,3.10 0.52,0.81 1.17,1.42 1.94,1.85 0.73,0.41 1.66,0.64 2.81,0.64 0.01,0 0.02,0 0.03,0 2.31,-0.00 3.74,-0.72 4.53,-2.01 0.93,-1.49 1.83,-3.80 2.67,-6.92 l 7.15,-25.23 7.41,25.25 c 0.55,2.01 1.07,3.64 1.54,4.88 0.44,1.15 1.10,2.11 2.00,2.90 0.82,0.71 2.00,1.12 3.61,1.11 1.57,0.00 2.71,-0.37 3.50,-1.03 0.89,-0.76 1.52,-1.59 1.92,-2.51 0.43,-1.00 1.07,-2.70 1.88,-5.02 l -0.59,-0.20 0,0 0.59,0.19 9.47,-27.78 c 0.78,-2.15 1.19,-3.79 1.24,-4.83 l 0.01,-0.01 0,-0.26 c 0,-1.04 -0.40,-1.97 -1.26,-2.79" style="fill:#f2541b" /> -</svg> diff --git a/plugins/Zeitgeist/images/maximise.png b/plugins/Zeitgeist/images/maximise.png Binary files differdeleted file mode 100644 index 143dfa5c89..0000000000 --- a/plugins/Zeitgeist/images/maximise.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/minimise.png b/plugins/Zeitgeist/images/minimise.png Binary files differdeleted file mode 100644 index 73c82a3cee..0000000000 --- a/plugins/Zeitgeist/images/minimise.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/minus.png b/plugins/Zeitgeist/images/minus.png Binary files differdeleted file mode 100644 index 48a507df9b..0000000000 --- a/plugins/Zeitgeist/images/minus.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/newtab.png b/plugins/Zeitgeist/images/newtab.png Binary files differdeleted file mode 100755 index 1e50c59200..0000000000 --- a/plugins/Zeitgeist/images/newtab.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/ok.png b/plugins/Zeitgeist/images/ok.png Binary files differdeleted file mode 100644 index 148319419d..0000000000 --- a/plugins/Zeitgeist/images/ok.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/paypal_subscribe.gif b/plugins/Zeitgeist/images/paypal_subscribe.gif Binary files differdeleted file mode 100755 index 50d8ee52e9..0000000000 --- a/plugins/Zeitgeist/images/paypal_subscribe.gif +++ /dev/null diff --git a/plugins/Zeitgeist/images/plus.png b/plugins/Zeitgeist/images/plus.png Binary files differdeleted file mode 100644 index 7216c7d7a9..0000000000 --- a/plugins/Zeitgeist/images/plus.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/plus_blue.png b/plugins/Zeitgeist/images/plus_blue.png Binary files differdeleted file mode 100755 index bf16b7512a..0000000000 --- a/plugins/Zeitgeist/images/plus_blue.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/refresh.png b/plugins/Zeitgeist/images/refresh.png Binary files differdeleted file mode 100644 index 8e99a5f0ab..0000000000 --- a/plugins/Zeitgeist/images/refresh.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/reload.png b/plugins/Zeitgeist/images/reload.png Binary files differdeleted file mode 100755 index a77ffe7c64..0000000000 --- a/plugins/Zeitgeist/images/reload.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/row_evolution.png b/plugins/Zeitgeist/images/row_evolution.png Binary files differdeleted file mode 100644 index 7423c473cc..0000000000 --- a/plugins/Zeitgeist/images/row_evolution.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/row_evolution_hover.png b/plugins/Zeitgeist/images/row_evolution_hover.png Binary files differdeleted file mode 100755 index 53827ae4df..0000000000 --- a/plugins/Zeitgeist/images/row_evolution_hover.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/search_bg.png b/plugins/Zeitgeist/images/search_bg.png Binary files differdeleted file mode 100644 index 7688b8080b..0000000000 --- a/plugins/Zeitgeist/images/search_bg.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/search_ico.png b/plugins/Zeitgeist/images/search_ico.png Binary files differdeleted file mode 100644 index dba240f91f..0000000000 --- a/plugins/Zeitgeist/images/search_ico.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sites_selection.png b/plugins/Zeitgeist/images/sites_selection.png Binary files differdeleted file mode 100644 index 15750a63d8..0000000000 --- a/plugins/Zeitgeist/images/sites_selection.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/smileyprog_0.png b/plugins/Zeitgeist/images/smileyprog_0.png Binary files differdeleted file mode 100755 index 8a4627eea3..0000000000 --- a/plugins/Zeitgeist/images/smileyprog_0.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/smileyprog_1.png b/plugins/Zeitgeist/images/smileyprog_1.png Binary files differdeleted file mode 100755 index 5b16b257ae..0000000000 --- a/plugins/Zeitgeist/images/smileyprog_1.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/smileyprog_2.png b/plugins/Zeitgeist/images/smileyprog_2.png Binary files differdeleted file mode 100755 index 55537fb732..0000000000 --- a/plugins/Zeitgeist/images/smileyprog_2.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/smileyprog_3.png b/plugins/Zeitgeist/images/smileyprog_3.png Binary files differdeleted file mode 100755 index 3410a344be..0000000000 --- a/plugins/Zeitgeist/images/smileyprog_3.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/smileyprog_4.png b/plugins/Zeitgeist/images/smileyprog_4.png Binary files differdeleted file mode 100755 index 0facd94f85..0000000000 --- a/plugins/Zeitgeist/images/smileyprog_4.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sort_subtable_asc.png b/plugins/Zeitgeist/images/sort_subtable_asc.png Binary files differdeleted file mode 100644 index e402026efe..0000000000 --- a/plugins/Zeitgeist/images/sort_subtable_asc.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sort_subtable_asc_light.png b/plugins/Zeitgeist/images/sort_subtable_asc_light.png Binary files differdeleted file mode 100755 index cad89bd570..0000000000 --- a/plugins/Zeitgeist/images/sort_subtable_asc_light.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sort_subtable_desc.png b/plugins/Zeitgeist/images/sort_subtable_desc.png Binary files differdeleted file mode 100644 index a3d7a5dfd4..0000000000 --- a/plugins/Zeitgeist/images/sort_subtable_desc.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sort_subtable_desc_light.png b/plugins/Zeitgeist/images/sort_subtable_desc_light.png Binary files differdeleted file mode 100644 index 5091fe6841..0000000000 --- a/plugins/Zeitgeist/images/sort_subtable_desc_light.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sortasc.png b/plugins/Zeitgeist/images/sortasc.png Binary files differdeleted file mode 100644 index 29a06dad88..0000000000 --- a/plugins/Zeitgeist/images/sortasc.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/sortdesc.png b/plugins/Zeitgeist/images/sortdesc.png Binary files differdeleted file mode 100644 index 91d2618d26..0000000000 --- a/plugins/Zeitgeist/images/sortdesc.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/star.png b/plugins/Zeitgeist/images/star.png Binary files differdeleted file mode 100755 index 52d161eab4..0000000000 --- a/plugins/Zeitgeist/images/star.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/star_empty.png b/plugins/Zeitgeist/images/star_empty.png Binary files differdeleted file mode 100755 index 965f4bacb8..0000000000 --- a/plugins/Zeitgeist/images/star_empty.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/success_medium.png b/plugins/Zeitgeist/images/success_medium.png Binary files differdeleted file mode 100644 index 05a3a06be4..0000000000 --- a/plugins/Zeitgeist/images/success_medium.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/table.png b/plugins/Zeitgeist/images/table.png Binary files differdeleted file mode 100644 index ab0814775d..0000000000 --- a/plugins/Zeitgeist/images/table.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/table_more.png b/plugins/Zeitgeist/images/table_more.png Binary files differdeleted file mode 100644 index d438326d83..0000000000 --- a/plugins/Zeitgeist/images/table_more.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/tagcloud.png b/plugins/Zeitgeist/images/tagcloud.png Binary files differdeleted file mode 100644 index 47e9d166fc..0000000000 --- a/plugins/Zeitgeist/images/tagcloud.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/video_play.png b/plugins/Zeitgeist/images/video_play.png Binary files differdeleted file mode 100755 index 7ca28d991f..0000000000 --- a/plugins/Zeitgeist/images/video_play.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/warning.png b/plugins/Zeitgeist/images/warning.png Binary files differdeleted file mode 100644 index fd49f31f29..0000000000 --- a/plugins/Zeitgeist/images/warning.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/warning_medium.png b/plugins/Zeitgeist/images/warning_medium.png Binary files differdeleted file mode 100644 index 62bd22dc5c..0000000000 --- a/plugins/Zeitgeist/images/warning_medium.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/warning_small.png b/plugins/Zeitgeist/images/warning_small.png Binary files differdeleted file mode 100644 index 1242b4f180..0000000000 --- a/plugins/Zeitgeist/images/warning_small.png +++ /dev/null diff --git a/plugins/Zeitgeist/images/zoom-out.png b/plugins/Zeitgeist/images/zoom-out.png Binary files differdeleted file mode 100644 index ec195a571d..0000000000 --- a/plugins/Zeitgeist/images/zoom-out.png +++ /dev/null diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php index a7211dc96d..4508690bea 100644 --- a/tests/PHPUnit/Core/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php @@ -212,7 +212,7 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase continue; } $manager = \Piwik\Plugin\Manager::getInstance(); - $isGitSubmodule = Manager::getInstance()->isPluginOfficialAndNotBundledWithCore($pluginName); + $isGitSubmodule = $manager->isPluginOfficialAndNotBundledWithCore($pluginName); $disabled = in_array($pluginName, $manager->getCorePluginsDisabledByDefault()) || $isGitSubmodule; $enabled = in_array($pluginName, $pluginsBundledWithPiwik); |
