diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-19 05:22:53 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-19 05:22:53 +0300 |
commit | 8f4bc9695380d465e7dfe365e66a0153f76040ff (patch) | |
tree | 3d6bbfa74611f54feb70c3fc5c1df81e8ca6bf94 /plugins | |
parent | af368cfc02bae5026429b0418d83de2b0890ef44 (diff) | |
parent | 8dbc563e99432f38de107be3dfb0f0a17b9e8f87 (diff) |
Merge pull request #11038 from piwik/3.x-dev3.0.0
Piwik 3.0.0 release
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/API/Controller.php | 5 | ||||
-rw-r--r-- | plugins/CoreHome/javascripts/dataTable.js | 5 | ||||
-rw-r--r-- | plugins/CoreUpdater/lang/en.json | 2 | ||||
-rw-r--r-- | plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php index e7ef5efd36..2d107182cb 100644 --- a/plugins/API/Controller.php +++ b/plugins/API/Controller.php @@ -49,7 +49,8 @@ class Controller extends \Piwik\Plugin\Controller public function listAllMethods() { $ApiDocumentation = new DocumentationGenerator(); - return $ApiDocumentation->getAllInterfaceString($outputExampleUrls = true, $prefixUrls = Common::getRequestVar('prefixUrl', '')); + $prefixUrls = Common::getRequestVar('prefixUrl', 'http://demo.piwik.org/', 'string'); + return $ApiDocumentation->getApiDocumentationAsStringForDeveloperReference($outputExampleUrls = true, $prefixUrls); } public function listAllAPI() @@ -59,7 +60,7 @@ class Controller extends \Piwik\Plugin\Controller $ApiDocumentation = new DocumentationGenerator(); $view->countLoadedAPI = Proxy::getInstance()->getCountRegisteredClasses(); - $view->list_api_methods_with_links = $ApiDocumentation->getAllInterfaceString(); + $view->list_api_methods_with_links = $ApiDocumentation->getApiDocumentationAsString(); return $view->render(); } diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index e364251f9b..763674585d 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -509,7 +509,10 @@ $.extend(DataTable.prototype, UIControl.prototype, { setMaxTableWidthIfNeeded(domElem, 1200); - var isTableVisualization = this.jsViewDataTable && this.jsViewDataTable.indexOf('table') !== -1; + var isTableVisualization = this.jsViewDataTable + && typeof this.jsViewDataTable === 'string' + && typeof this.jsViewDataTable.indexOf === 'function' + && this.jsViewDataTable.indexOf('table') !== -1; if (isTableVisualization) { // we do this only for html tables diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index c75736c204..cd517e0d31 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -34,6 +34,8 @@ "ListOfSqlQueriesFYI": "FYI: these are the SQL queries that will be executed to upgrade your database to Piwik %s", "MajorUpdateWarning1": "This is a major update! It will take longer than usual.", "MajorUpdateWarning2": "The following advice is especially important for large installations.", + "NeedHelpUpgrading": "Need help upgrading Piwik?", + "NeedHelpUpgradingText": "If you need support to upgrade your Piwik, the creators of Piwik are here to help you make the Piwik upgrade a success and provide all instructions, best practises and ongoing support. %1$sContact the Piwik experts to get started upgrading your Piwik safely.%2$s", "NoteForLargePiwikInstances": "Important notes for large Piwik installations", "NotificationClickToUpdatePlugins": "Click here to update your plugins now:", "NotificationClickToUpdateThemes": "Click here to update your themes now:", diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index e5899117ce..3d1a8a5357 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -60,6 +60,9 @@ </div> {% endif %} + <h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2> + <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://piwik.org/support/upgrading-piwik/'>", "</a>")|raw }}</p> + <h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2> <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p> {% endif %} |