Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
d21ec45
add a couple of new platform features especially around validating se…
tsteur Feb 13, 2018
c6709b1
more validators and other tweaks
tsteur Feb 25, 2018
cef7669
few tweaks
tsteur Feb 26, 2018
bd338a5
allow plugins to add header script in JS tests
tsteur Mar 7, 2018
278c182
some work on gdpr
tsteur Mar 11, 2018
945532a
remove email feature
tsteur Mar 11, 2018
75c5825
menu update
tsteur Mar 11, 2018
9ca87e8
add date tooltip
tsteur Mar 11, 2018
88e0f43
make sure privacy has its own icon
tsteur Mar 11, 2018
fb70be2
added some text
tsteur Mar 12, 2018
da3286c
add opt out info
tsteur Mar 12, 2018
4703f82
better titles
tsteur Mar 12, 2018
0b4e4e1
add some information about webserver logs
tsteur Mar 12, 2018
653c0eb
add log import notice
tsteur Mar 12, 2018
b801546
give angular some time to render
tsteur Mar 17, 2018
77a38f9
show border around iframe
tsteur Mar 19, 2018
bd9099c
make sure to place a notification in modal dialog if needed
tsteur Mar 22, 2018
2ba7f9b
when opening a modal, make sure the top part is visible
tsteur Mar 22, 2018
02fbde0
disable newsletter sign up by default
tsteur Mar 23, 2018
185ff9f
command line tool to anonymize and remove previously tracked raw data
tsteur Mar 25, 2018
33f1b2d
implement some basic consent features into piwik.js
tsteur Mar 25, 2018
5269ce2
minor tweak
tsteur Mar 25, 2018
98cc0fb
schedule entries to anonymize data in past
tsteur Mar 26, 2018
a00916e
let users anonymize historical data
tsteur Mar 26, 2018
db7f968
better overview
tsteur Mar 26, 2018
b573ed3
better naming
tsteur Mar 26, 2018
6bcfa51
explain consent tracking
tsteur Mar 26, 2018
9afeeb3
add legitimate interest
tsteur Mar 26, 2018
3acaf86
new menu structure for privacy
tsteur Mar 27, 2018
3d66b70
use a proper db table for scheduled anonymizations
tsteur Mar 27, 2018
d093263
add some tracker tests
tsteur Mar 28, 2018
3fd7a32
some tests and fixes
tsteur Mar 29, 2018
78d1d72
couple of fixes and tests
tsteur Mar 29, 2018
6045cdc
starting to add some UI tests
tsteur Apr 3, 2018
1515e1f
more tweaks
tsteur Apr 3, 2018
e6ded4a
add missing file
tsteur Apr 3, 2018
cbff67c
fix jslint
tsteur Apr 3, 2018
15b3b6a
have the field full width
tsteur Apr 3, 2018
f93f012
more tweaks
tsteur Apr 3, 2018
9dfac13
create directory if needed
tsteur Apr 3, 2018
cc07097
Merge branch '3.x-dev' into platformfeatures
tsteur Apr 3, 2018
9f9cc35
various fixes
tsteur Apr 3, 2018
afbb2e2
fix some tests
tsteur Apr 3, 2018
394034c
make sure keys will be always returned in same order
tsteur Apr 3, 2018
c6ed7f7
more fixes
tsteur Apr 4, 2018
6454cfc
fix some tests
tsteur Apr 4, 2018
6465879
apply feedback from review
tsteur Apr 6, 2018
e1a08d5
fix some tests
tsteur Apr 6, 2018
f52c121
this might fix mysqli tests
tsteur Apr 6, 2018
5f8d9bd
fix some tests
tsteur Apr 6, 2018
5fe5c8f
trying to fix mysqli tests
tsteur Apr 6, 2018
403c7ac
fix system test
tsteur Apr 6, 2018
f2c00d6
fix comment
tsteur Apr 9, 2018
43111a0
remove some duplicated code
tsteur Apr 9, 2018
500ccd4
update method name
tsteur Apr 9, 2018
0af4847
trigger event when logs need to be deleted
tsteur Apr 15, 2018
609aa47
add possibility to anonymize userId and orderId
tsteur Apr 16, 2018
629d51f
trigger event in tracking code page
tsteur Apr 17, 2018
9562dc4
expire consent in hours
tsteur Apr 17, 2018
df1413e
post another event
tsteur Apr 17, 2018
e971e2c
update wording for privacy GDPR
tsteur Apr 17, 2018
14cb220
fix various ui tests
tsteur Apr 19, 2018
9347677
Merge branch '3.x-dev' into platformfeatures
tsteur Apr 19, 2018
ad9a948
fix some tests
tsteur Apr 19, 2018
0a28b93
trying to fix ui tests
tsteur Apr 19, 2018
c5750e3
trigger another test run
tsteur Apr 19, 2018
64f9620
fix system test
tsteur Apr 19, 2018
a08778a
fix some ui tests
tsteur Apr 19, 2018
e50d2bf
show a table of contents on tracking code page, fix title, add mobile…
tsteur Apr 19, 2018
b290b3b
fix ui test
tsteur Apr 19, 2018
6079b50
Merge branch '3.x-dev' into platformfeatures
mattab Apr 23, 2018
0917898
3.5.0-b2 update
mattab Apr 23, 2018
477cb47
Re-generate piwik.js
mattab Apr 23, 2018
a07fc68
fix job status and selector style
tsteur Apr 23, 2018
c4b3a6b
Merge branch 'platformfeatures' of github.com:matomo-org/piwik into p…
tsteur Apr 23, 2018
d88bfab
make sure to include only sites with admin access
tsteur Apr 23, 2018
228c254
some tweaks
tsteur Apr 23, 2018
68b9732
fix some ui tests
tsteur Apr 23, 2018
f2b3ef6
fix some ui tests
tsteur Apr 23, 2018
2bc0735
fix test
tsteur Apr 24, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
better overview
  • Loading branch information
tsteur committed Mar 26, 2018
commit db7f9689ee8c0964639be9aa7ae659e0215cebc7
19 changes: 14 additions & 5 deletions plugins/PrivacyManager/templates/gdprOverview.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,30 @@
{% set title %}{{ 'PrivacyManager_GDPR'|translate }}{% endset %}

{% block content %}
<div piwik-content-block content-title="GDPR Overview" class="gdprOverview">
<div class="gdprOverview">
<div piwik-content-intro>
<h2>GDPR Overview</h2>
<p>
The General Data Protection Regulation (GDPR) is a regulation which strengthen and unify data protection for all individuals
within the European Union (EU). It allows EU citizens to better control their personal data. GDPR modernises and unifies rules allowing businesses to reduce red tape and to benefit from greater consumer trust.
</p>
<h3>Who is concerned by GDPR?</h3>
</div>

<div piwik-content-block content-title="Who is concerned by GDPR?">
<h3></h3>
<p>Almost all structures dealing with EU citizens data wherever they are located are concerned by GDPR.
The few exemptions are listed under <a href="https://eur-lex.europa.eu/eli/reg/2016/679/oj" target="_blank" rel="noreferrer noopener">article 2 of the GDPR</a>.</p>
<h3>What is a personal data under GDPR?</h3>
</div>
<div piwik-content-block content-title="What is a personal data under GDPR?">
<p>Any information relating to an identified or identifiable natural person. An identifiable natural person
is one who can be identified, directly or indirectly, in particular by reference to an identifier such as a name,
an identification number, location data, an online identifier...</p>
<h3>Where can I get more information about GDPR?</h3>
</div>
<div piwik-content-block content-title="Where can I get more information about GDPR?">
<p>The official GDPR text is available at <a href="https://eur-lex.europa.eu/eli/reg/2016/679/oj" target="_blank" rel="noreferrer noopener">https://eur-lex.europa.eu/eli/reg/2016/679/oj</a>. As it is interpretation may be difficult,
we strongly advise you to refer to your local privacy commissioner.</p>
<h3>How can I be GDPR compliant with Matomo Analytics?</h3>
</div>
<div piwik-content-block content-title="How can I be GDPR compliant with Matomo Analytics?">
<p>By default, Matomo is GDPR compliant as it is not collecting any personal data.
<br /><br />
However, by changing the default settings and/or adding specific tracking code, you may collect personal data, for example:
Expand All @@ -43,4 +51,5 @@
<li>Is Matomo part of your data breach notification process?</li>
</ul>
</div>
</div>
{% endblock %}