diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| m--------- | plugins/CustomAlerts | 0 | ||||
| -rw-r--r-- | plugins/ExampleAPI/API.php | 2 | ||||
| m--------- | plugins/SecurityInfo | 0 | ||||
| m--------- | plugins/TasksTimetable | 0 | ||||
| m--------- | plugins/TreemapVisualization | 0 | ||||
| m--------- | plugins/VisitorGenerator | 0 | ||||
| -rw-r--r-- | tests/PHPUnit/Fixtures/InvalidVisits.php | 2 |
9 files changed, 5 insertions, 5 deletions
@@ -1,8 +1,8 @@ # 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/) diff --git a/composer.json b/composer.json index 0cfa4c9f06..de87087718 100644 --- 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/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 495cf80c13b16ef80f9871d31d859abd955540b +Subproject defaa73836af7da37bff85c74de336ff6b1edcd diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index 19a446d17a..27dc2f59aa 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -87,7 +87,7 @@ class API extends \Piwik\Plugin\API */ public function getDescriptionArray() { - return array('piwik', 'open source', 'web analytics', 'free', 'Strong message: Свободный Тибет'); + return array('piwik', 'free/libre', 'web analytics', 'free', 'Strong message: Свободный Тибет'); } /** diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject e3db81b6e557f9ca6b9ace64be505f9dd1a9a7c +Subproject bc73711df837a1cda2de8d8634b9c4e13997b1e diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject a98ff9e692c3bda601cb269673897decce39a4f +Subproject 8abb4ee4c2dd3ccd6e16667a51e0d2ac26af66a diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject b54a6601a52071198b8560335869b57d9145243 +Subproject 2a064c773c8eef17655f5d2ddb626294c1ee029 diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 240f1deff367ef1c19d065f259311865db7e161 +Subproject 17e3ebd3efab0bb489b0621cb45b88f693a71f6 diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php index 8d849b31b1..75015a0766 100644 --- a/tests/PHPUnit/Fixtures/InvalidVisits.php +++ b/tests/PHPUnit/Fixtures/InvalidVisits.php @@ -52,7 +52,7 @@ class Test_Piwik_Fixture_InvalidVisits extends Fixture // Trigger empty request $trackerUrl = self::getTrackerUrl(); $response = Http::fetchRemoteFile($trackerUrl); - self::assertTrue(strpos($response, 'is a free open source web') !== false, 'Piwik empty request response not correct: ' . $response); + self::assertTrue(strpos($response, 'is a free/libre web') !== false, 'Piwik empty request response not correct: ' . $response); $t = self::getTracker($idSite, $dateTime, $defaultInit = true); |