Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2011-01-03 08:49:45 +0300
committermattpiwik <matthieu.aubry@gmail.com>2011-01-03 08:49:45 +0300
commit956c25213d771f37f7ed51bd56b0788be05e6603 (patch)
tree83533901bd264f738f77350755112e9b304efe6e /plugins/ExampleAPI
parent97d410fd5c78155ea744a1b0fe6aae074e5f72bb (diff)
Various code cleanups and small improvements:
* Live! widget shows IP for all users except anonymous * Widgetize displays full URL to the widget + preview link below widget * Live! visitors text change from "Today" to "Last 24 hours" in preview * remove data_push feature introduced in r1330 + removing campaign redirect feature since they are not used * all errors should now display the Piwik header when applicable (or if a php error, prefixed with a sentence suggesting to submit error in piwik forums) * fixing bug with cookie update when a visitor manually converts the same goal in the same second * fixing XML output not valid in Chrome (HTML entities not valid, must use XML entities) * simplifying + refactoring the truncation code in datatables.js (move from JS to small smarty template - hopefully we can fix this truncation and make it nice soon) * removing unnecessary line breaks from translations * refactoring duplicate code in renderers git-svn-id: http://dev.piwik.org/svn/trunk@3565 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/ExampleAPI')
-rw-r--r--plugins/ExampleAPI/tests/compareExpectedAndProcessedFiles.WinMerge12
-rw-r--r--plugins/ExampleAPI/tests/expected/test_allGetMethods__ExampleAPI.getMultiArray.xml2
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/ExampleAPI/tests/compareExpectedAndProcessedFiles.WinMerge b/plugins/ExampleAPI/tests/compareExpectedAndProcessedFiles.WinMerge
new file mode 100644
index 0000000000..e45988ed3c
--- /dev/null
+++ b/plugins/ExampleAPI/tests/compareExpectedAndProcessedFiles.WinMerge
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<project>
+ <paths>
+ <left>expected\</left>
+ <right>processed\</right>
+ <filter>*</filter>
+ <subfolders>0</subfolders>
+ <left-readonly>0</left-readonly>
+ <right-readonly>0</right-readonly>
+ </paths>
+</project>
diff --git a/plugins/ExampleAPI/tests/expected/test_allGetMethods__ExampleAPI.getMultiArray.xml b/plugins/ExampleAPI/tests/expected/test_allGetMethods__ExampleAPI.getMultiArray.xml
index 963d90548f..c279e76ac2 100644
--- a/plugins/ExampleAPI/tests/expected/test_allGetMethods__ExampleAPI.getMultiArray.xml
+++ b/plugins/ExampleAPI/tests/expected/test_allGetMethods__ExampleAPI.getMultiArray.xml
@@ -7,7 +7,7 @@
</Limitation>
<Second_Dimension>
<row>1</row>
- <row></row>
+ <row>0</row>
<row>1</row>
<row>0</row>
<row>152</row>