Merge branch 'master' into DeviceDetector2

Conflicts: plugins/DevicesDetection/DevicesDetection.php
d19dotca · Jun 10, 2014 · 70ad607 · 70ad607
2 parents e579da2 + 3c4eaf1
commit 70ad607
Show file tree

Hide file tree

Showing 937 changed files with 1,776 additions and 2,106 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -115,7 +115,10 @@ after_script:
   - ./tests/travis/upload_artifacts.sh
 
 notifications:
-  slack: piwik:3HWhNh21qPfDACQXTrJOb0mW
+  slack:
+    rooms:
+      - piwik:3HWhNh21qPfDACQXTrJOb0mW
+      - piwikpro:7OABSbDrywSTo2nv9lD2svXG
 
   irc:
     skip_join: true

diff --git a/LEGALNOTICE b/LEGALNOTICE
@@ -1,6 +1,6 @@
 COPYRIGHT
 
-	Piwik - Open Source Web Analytics
+	Piwik - free/libre analytics platform
 
 	The software package is:
 
@@ -77,40 +77,40 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 
 	Name:  jqPlot
 	Link:  http://www.jqplot.com/
-	License:  Dual-licensed: MIT or GPL v2
+	License:  Dual-licensed: MIT (Expat) or GPL v2
 
 	Name:  jQuery
 	Link:  http://jquery.com/
-	License:  Dual-licensed: MIT or GPL
+	License:  Dual-licensed: MIT (Expat) or GPL
 	Notes:
 	- GPL version not explicitly stated in source but GPL v2 is in git
-	- includes Sizzle.js - multi-licensed: MIT, New BSD, or GPL [v2]
+	- includes Sizzle.js - multi-licensed: MIT (Expat), New BSD, or GPL [v2]
 
 	Name:  jQuery UI
 	Link:  http://jqueryui.com/
-	License:  Dual-licensed: MIT or GPL
+	License:  Dual-licensed: MIT (Expat) or GPL
 	Notes:
 	- GPL version not explicitly stated in source but GPL v2 is in git
 
 	Name:  jquery.history
 	Link:  http://tkyk.github.com/jquery-history-plugin/
-	License:  MIT
+	License:  MIT (Expat)
 
 	Name:  jquery.scrollTo
 	Link:  http://plugins.jquery.com/project/ScrollTo
-	License:  Dual licensed: MIT or GPL
+	License:  Dual licensed: MIT (Expat) or GPL
 
 	Name:  jquery Tooltip
 	Link:  http://bassistance.de/jquery-plugins/jquery-plugin-tooltip/
-	License:  Dual licensed: MIT or GPL
+	License:  Dual licensed: MIT (Expat) or GPL
 
 	Name:  jquery placeholder
 	Link:  http://mths.be/placeholder
-	License:  Dual licensed: MIT or GPL
+	License:  Dual licensed: MIT (Expat) or GPL
 
 	Name:  jquery smartbanner
 	Link:  https://github.com/jasny/jquery.smartbanner
-	License:  Dual licensed: MIT
+	License:  Dual licensed: MIT (Expat)
 
 	Name:  json2.js
 	Link:  http://json.org/
@@ -206,19 +206,19 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 
 	Name: Raphaël - JavaScript Vector Library
 	Link: http://raphaeljs.com/
-	License: MIT
+	License: MIT (Expat)
 
 	Name: lessphp
 	Link: http://leafo.net/lessphp
-	License: GPL3/MIT
+	License: GPL3, MIT (Expat)
 
 	Name: Symfony Console Component
 	Link: https://github.com/symfony/Console
-	License: MIT
+	License: MIT (Expat)
 
 	Name: AngularJS
 	Link: https://github.com/angular/angular.js
-	License: MIT
+	License: MIT (Expat)
 
 	Name: Mousetrap
 	Link: https://github.com/ccampbell/mousetrap
@@ -267,7 +267,6 @@ THIRD-PARTY CONTENT
 Notes:
 - the "New BSD" license refers to either the "Modified BSD" and "Simplified BSD"
   licenses (2- or 3-clause), which are GPL compatible.
-- the "MIT" license is also referred to as the "X11" license
 - icons for browsers, operating systems, browser plugins, search engines, and
   and flags of countries are nominative use of third-party trademarks when
   referring to the corresponding product or entity
diff --git a/README.md b/README.md
@@ -1,22 +1,22 @@
 # Piwik - piwik.org   
 
-## We’re seeking a talented open source Software Engineer!
+## We’re seeking a talented Software Engineer
 
-Are you looking for a new challenge? We are currently seeking a software engineer or software developer who is passionate about data processing, security, privacy, the open source philosophy and usable interface design.
+Are you looking for a new challenge? We are currently seeking a software engineer or software developer who is passionate about data processing, security, privacy, the open source and free/libre philosophy and usable interface design.
 
 [View Job Description](http://piwik.org/blog/2014/05/piwik-expanding-seeking-talented-software-engineer-new-zealand-poland/) - [Apply online](http://piwik.org/jobs/)
 
 We are grateful if you can share the Job Description with your friends and colleagues. We can help the right candidate relocate to beautiful New Zealand.
 
 ## Description
 
-Piwik is the leading Free/Libre open source Web Analytics platform.
+Piwik is the leading Free/Libre open analytics platform.
 
 Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
 At the end of the five minute installation process you will be given a JavaScript code.
 Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.
 
-Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites.
+Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 1,000,000 websites. Privacy is built-in!
 
 ## Mission Statement
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "piwik/piwik",
     "type": "application",
-    "description": "Open Source Real Time Web Analytics Platform",
+    "description": "the leading free/libre analytics platform",
     "keywords": ["piwik","web","analytics"],
     "homepage": "http://piwik.org",
     "license": "GPL-3.0+",

diff --git a/config/global.ini.php b/config/global.ini.php
@@ -375,7 +375,7 @@
 
 ; The release server is an essential part of the Piwik infrastructure/ecosystem
 ; to provide the latest software version.
-latest_version_url = http://builds.piwik.org/latest.zip
+latest_version_url = http://builds.piwik.org/piwik-latest.zip
 
 ; The API server is an essential part of the Piwik infrastructure/ecosystem to
 ; provide services to Piwik installations, e.g., getLatestVersion and
@@ -609,6 +609,7 @@
 Plugins[] = MultiSites
 Plugins[] = Referrers
 Plugins[] = UserSettings
+Plugins[] = DevicesDetection
 Plugins[] = Goals
 Plugins[] = SEO
 Plugins[] = Events

diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/Proxy.php b/core/API/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/Request.php b/core/API/Request.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/Access.php b/core/Access.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/Archive.php b/core/Archive.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/Archive/DataCollection.php b/core/Archive/DataCollection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/Archive/Parameters.php b/core/Archive/Parameters.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/ArchiveProcessor/Loader.php b/core/ArchiveProcessor/Loader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/ArchiveProcessor/Parameters.php b/core/ArchiveProcessor/Parameters.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager.php b/core/AssetManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAsset.php b/core/AssetManager/UIAsset.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAsset/InMemoryUIAsset.php b/core/AssetManager/UIAsset/InMemoryUIAsset.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAsset/OnDiskUIAsset.php b/core/AssetManager/UIAsset/OnDiskUIAsset.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetCatalog.php b/core/AssetManager/UIAssetCatalog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetCatalogSorter.php b/core/AssetManager/UIAssetCatalogSorter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetFetcher.php b/core/AssetManager/UIAssetFetcher.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetFetcher/StaticUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/StaticUIAssetFetcher.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later

diff --git a/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later