diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-05 17:35:43 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-05 17:35:43 +0400 |
| commit | 3d7e3710a299efb4555c811908292b32cab556b4 (patch) | |
| tree | 60a049ee8495fc5e8997ce8fba0998e12cfd04d1 /js | |
| parent | c4d8fe1c05d33589f831c8f8f36b986819bb2d9c (diff) | |
| parent | 3a1ed51ae871699aca5034c9ef9fcaeafa70bab4 (diff) | |
Merge branch 'master' into uiunittests
Conflicts:
piwik.js
plugins/SegmentEditor/javascripts/Segmentation.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/piwik.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/piwik.js b/js/piwik.js index 5fbee7b4ff..1cbcef4da9 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -1094,7 +1094,7 @@ if (typeof Piwik !== 'object') { configTitle = documentAlias.title, // Extensions to be treated as download links - configDownloadExtensions = '7z|aac|apk|ar[cj]|as[fx]|avi|bin|csv|deb|dmg|docx?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip', + configDownloadExtensions = '7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip', // Hosts or alias(es) to not treat as outlinks configHostsAlias = [domainAlias], |