diff options
| -rw-r--r-- | LEGALNOTICE | 2 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | lang/en.json | 2 | ||||
| -rwxr-xr-x | misc/log-analytics/import_logs.py | 2 | ||||
| -rw-r--r-- | plugins/ExampleAPI/API.php | 2 | ||||
| -rw-r--r-- | plugins/Feedback/templates/index.twig | 8 | ||||
| -rw-r--r-- | tests/javascript/SQLite.php | 1 | ||||
| -rw-r--r-- | tests/resources/extractSearchEngineInformationFromUrlTests.yml | 2 |
8 files changed, 9 insertions, 12 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE index f6ad6267c9..93c2f03493 100644 --- a/LEGALNOTICE +++ b/LEGALNOTICE @@ -40,7 +40,7 @@ CREDITS For detailed contribution history, refer to the source, tickets, patches, and Git revision history, available at - http://dev.piwik.org/trac/ + https://github.com/piwik/piwik/issues https://github.com/piwik/piwik diff --git a/composer.json b/composer.json index 61397de411..ada8661192 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "support": { "forum": "http://forum.piwik.org/", - "issues": "http://dev.piwik.org/trac/roadmap", + "issues": "https://github.com/piwik/piwik/issues", "wiki": "http://dev.piwik.org/", "source": "https://github.com/piwik/piwik" }, diff --git a/lang/en.json b/lang/en.json index 2705060bb7..276fa52c60 100644 --- a/lang/en.json +++ b/lang/en.json @@ -450,7 +450,7 @@ "ContactThePiwikTeam": "Contact the Piwik team!", "DoYouHaveBugReportOrFeatureRequest": "Do you have a bug to report or a feature request?", "GetInTouch": "We appreciate your feedback and always read all messages. Maybe you would like to share a business opportunity, hire a Piwik consultant, tell us a success story or simply say Hello!", - "HowToCreateIssue": "Please read the recommendations on writing a good %1$sbug report%2$s or %3$sfeature request%4$s. Then %5$sregister%6$s or %7$slogin%8$s on our issue tracker and create a %9$snew issue%10$s.", + "HowToCreateTicket": "Please read the recommendations on writing a good %1$sbug report%2$s or %3$sfeature request%4$s. Then register or login on %5$sour issue tracker%6$s and create a %7$snew issue%8$s.", "IWantTo": "I want to:", "LearnWaysToParticipate": "Learn about all the ways you can %s participate%s", "ManuallySendEmailTo": "Please manually send your message to", diff --git a/misc/log-analytics/import_logs.py b/misc/log-analytics/import_logs.py index a007ab1d85..f986e580b4 100755 --- a/misc/log-analytics/import_logs.py +++ b/misc/log-analytics/import_logs.py @@ -933,7 +933,7 @@ class Piwik(object): args.update(kwargs) # Convert lists into appropriate format. - # See: http://dev.piwik.org/trac/wiki/API/Reference#PassinganArrayParameter + # See: http://developer.piwik.org/api-reference/reporting-api#passing-an-array-of-data-as-a-parameter # Warning: we have to pass the parameters in order: foo[0], foo[1], foo[2] # and not foo[1], foo[0], foo[2] (it will break Piwik otherwise.) final_args = [] diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index f7cb0424ce..2adf4b2ae9 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -16,7 +16,7 @@ use Piwik\Version; /** * The ExampleAPI is useful to developers building a custom Piwik plugin. * - * Please see the <a href='http://dev.piwik.org/trac/browser/trunk/plugins/ExampleAPI/API.php#L1' target='_blank'>source code in in the file plugins/ExampleAPI/API.php</a> for more documentation. + * Please see the <a href='https://github.com/piwik/piwik/blob/master/plugins/ExampleAPI/API.php' target='_blank'>source code in in the file plugins/ExampleAPI/API.php</a> for more documentation. * @method static \Piwik\Plugins\ExampleAPI\API getInstance() */ class API extends \Piwik\Plugin\API diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig index dba9db49d4..e72ad2a5da 100644 --- a/plugins/Feedback/templates/index.twig +++ b/plugins/Feedback/templates/index.twig @@ -37,16 +37,14 @@ <h2>{{ 'Feedback_DoYouHaveBugReportOrFeatureRequest'|translate }}</h2> <div class="header_full"> - <p>{{ 'Feedback_HowToCreateIssue'|translate( + <p>{{ 'Feedback_HowToCreateTicket'|translate( "<a target='_blank' href='?module=Proxy&action=redirect&url=http://developer.piwik.org/guides/core-team-workflow%23submitting-a-bug-report'>", "</a>", "<a target='_blank' href='?module=Proxy&action=redirect&url=http://developer.piwik.org/guides/core-team-workflow%23submitting-a-feature-request'>", "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=http://dev.piwik.org/trac/register'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues'>", "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=http://dev.piwik.org/trac/login'>", - "</a>", - "<a target='_blank' href='?module=Proxy&action=redirect&url=http://dev.piwik.org/trac/newticket'>", + "<a target='_blank' href='?module=Proxy&action=redirect&url=https://github.com/piwik/piwik/issues/new'>", "</a>" )|raw }}</p> <br/> diff --git a/tests/javascript/SQLite.php b/tests/javascript/SQLite.php index c357c7febf..5b4a3b3343 100644 --- a/tests/javascript/SQLite.php +++ b/tests/javascript/SQLite.php @@ -5,7 +5,6 @@ * SQLite shim * * @link http://piwik.org - * @source http://dev.piwik.org/trac/browser/trunk/tests/javascript/SQLite.php * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD */ if (class_exists('SQLite3')) diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml index 5be88676d4..345bf04a43 100644 --- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml +++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml @@ -328,7 +328,7 @@ keywords: false # Google images no keyword -- url: 'http://www.google.com/imgres?hl=en&client=ubuntu&hs=xDb&sa=X&channel=fs&biw=1920&bih=1084&tbm=isch&prmd=imvns&tbnid=5i7iz7u4LPSSrM:&imgrefurl=http://dev.piwik.org/trac/wiki/HowToSetupDevelopmentEnvironmentWindows&docid=tWN9OesMyOTqsM&imgurl=http://dev.piwik.org/trac/raw-attachment/wiki/HowToSetupDevelopmentEnvironmentWindows/eclipse-preview.jpg&w=1000&h=627&ei=pURoT67BEdT74QTUzYiSCQ&zoom=1&iact=hc&vpx=1379&vpy=548&dur=513&hovh=178&hovw=284&tx=134&ty=105&sig=108396332168858896950&page=1&tbnh=142&tbnw=227&start=0&ndsp=37&ved=1t:429,r:5,s:0' +- url: 'http://www.google.com/imgres?hl=en&client=ubuntu&hs=xDb&sa=X&channel=fs&biw=1920&bih=1084&tbm=isch&prmd=imvns&tbnid=5i7iz7u4LPSSrM:&imgrefurl=http://helloworld/trac/wiki/HowToSetupDevelopmentEnvironmentWindows&docid=tWN9OesMyOTqsM&imgurl=http://helloworld.org/trac/raw-attachment/wiki/HowToSetupDevelopmentEnvironmentWindows/eclipse-preview.jpg&w=1000&h=627&ei=pURoT67BEdT74QTUzYiSCQ&zoom=1&iact=hc&vpx=1379&vpy=548&dur=513&hovh=178&hovw=284&tx=134&ty=105&sig=108396332168858896950&page=1&tbnh=142&tbnw=227&start=0&ndsp=37&ved=1t:429,r:5,s:0' engine: 'Google Images' keywords: false |