Commit Graph

646 Commits

Author SHA1 Message Date
Amauri CHAMPEAUX e88aa28701 Add an option to show a message about mandatory cookies 2020-05-21 15:37:31 +02:00
Amauri CHAMPEAUX 605dd68565 Update .gitignore 2020-05-21 14:33:54 +02:00
Amauri CHAMPEAUX dcbc7399d5 enable sweden locale 2020-05-21 14:29:11 +02:00
Amauri CHAMPEAUX 1c538f21c5
Merge pull request #449 from BuyukCem/seLanguage
Add Sweden language
2020-05-07 15:43:51 +02:00
BuyukCem 05ad48bf45
Add Sweden language 2020-05-07 15:13:10 +02:00
Amauri CHAMPEAUX 2db53e215e Add Adobe Analytics 2020-05-06 10:45:42 +02:00
Amauri CHAMPEAUX 4832682dde Fix auto load of services when needconsent is true
+ add an alternative to not autoload matomo and at internet
2020-05-05 15:59:35 +02:00
Amauri CHAMPEAUX b77b74c2db
Merge pull request #447 from sluaire/master
Add Vietnamese translation
2020-05-05 09:24:29 +02:00
Amauri CHAMPEAUX f96be0440e Prepare for the new Vietnamese translation 2020-05-05 09:24:15 +02:00
Simon Luaire 35f7225a04 Add Vietnamese translation 2020-05-05 11:39:49 +07:00
Amauri CHAMPEAUX f1a748aff3
Merge pull request #446 from Webmecanik/200504_fix_tracking_webmecanik_service
[Fix] fix tracking for Webmecanik service
2020-05-04 16:45:19 +02:00
Noa83 ddf93bf274 fix tracking for webmecanik service 2020-05-04 11:52:33 +02:00
Amauri CHAMPEAUX ce66e8d0b9
Merge pull request #445 from Mejans/master
[i18n] Adds the Occitan language
2020-05-01 16:07:38 +02:00
Mejans b19062a632
Update tarteaucitron.oc.js 2020-05-01 15:27:07 +02:00
Mejans 8ebdbcf1dc
Update tarteaucitron.js 2020-05-01 15:19:19 +02:00
Mejans 9600425472
Create tarteaucitron.oc.js 2020-05-01 15:15:38 +02:00
Amauri CHAMPEAUX da33f6e2fe Always allow service that doesnt need consent FIX #290 #437 2020-05-01 09:36:29 +02:00
Amauri CHAMPEAUX a1cea94425
Merge pull request #444 from Zen4All/patch-1
Add missing double quote
2020-04-29 11:42:23 +02:00
Erik Kerkhoven 18d9594bf9
Add missing double quote 2020-04-29 11:09:40 +02:00
Amauri CHAMPEAUX ca76bca789 Merge branch 'master' of https://github.com/AmauriC/tarteaucitron.js 2020-04-26 20:59:27 +02:00
Amauri CHAMPEAUX a975be9e5f enable all locales 2020-04-26 20:59:21 +02:00
Amauri CHAMPEAUX 6cca3a0836
Fix #442 2020-04-24 10:12:08 +02:00
Amauri CHAMPEAUX abf235b37f
Merge pull request #440 from prudloff-insite/internal-scripts
useExternalJs should only apply to internal scripts
2020-04-22 17:19:31 +02:00
Pierre Rudloff e555e47ecd Default value for internal parameter 2020-04-22 11:08:39 +02:00
Pierre Rudloff 4eb716c351 Refactor to make addScript() calls easier to read 2020-04-21 18:30:32 +02:00
Amauri CHAMPEAUX de701ba421
Merge pull request #436 from Manoz/fix/duplicate-code
[Enhancement] Duplicate code
2020-04-18 15:34:26 +02:00
Amauri CHAMPEAUX 2026742cf7
Merge pull request #435 from geraldolsribeiro/master
Translation
2020-04-18 15:28:11 +02:00
Amauri CHAMPEAUX 7d79afa879
Merge pull request #433 from BuyukCem/master
Add Finland Language
2020-04-18 15:27:47 +02:00
Amauri CHAMPEAUX 2aad968a17
Merge pull request #431 from nstCactus/doc/custom-service-types
📝 Document additional allowed types for custom services
2020-04-18 15:27:12 +02:00
Amauri CHAMPEAUX 761112c1c9
Merge branch 'master' into doc/custom-service-types 2020-04-18 15:26:51 +02:00
Amauri CHAMPEAUX 43d3e3099b
Merge pull request #430 from nstCactus/feature/service-faciliti
 Add Facil'ITI service
2020-04-18 15:26:01 +02:00
Amauri CHAMPEAUX 3ffca69d83
Merge branch 'master' into feature/service-faciliti 2020-04-18 15:25:30 +02:00
Amauri CHAMPEAUX 0f3827df13
Merge pull request #429 from boulaffasae/master
Add Userlike service
2020-04-18 15:23:00 +02:00
Amauri CHAMPEAUX ec91bcdbaa New domain name: tarteaucitron.io 2020-04-18 15:20:20 +02:00
Kévin Legrand ae187c73ad [Enhancement] Duplicate code 2020-04-15 20:30:37 +02:00
Geraldo Ribeiro 6e5c76bd5e Translation 2020-04-12 14:33:15 -03:00
BUYUK Cem 0cfaa08c99
Merge pull request #3 from BuyukCem/add-Finland-language
add Finland language
2020-04-09 10:55:16 +02:00
BuyukCem 85b3a1af8e add Finland language
Signed-off-by: BuyukCem <cembuyuk7@gmail.com>
2020-04-09 10:53:59 +02:00
nstCactus 9aa2531700 Add Facil'ITI service 2020-04-02 12:02:22 +02:00
nstCactus 7c7b6e8ceb 📝 Document additional allowed types for custom services 2020-04-02 11:58:48 +02:00
Boulaffas Ae 179256f73f Make sur Userclick service work in http too 2020-04-01 21:09:28 +01:00
Boulaffas Ae 46488ad616 camelCase user key in Userlike service 2020-04-01 21:07:45 +01:00
Boulaffas Ae ada9d8db96 Add Userlike service 2020-04-01 20:59:12 +01:00
Amauri CHAMPEAUX 88af745341 Revert #412 Fix #421 2020-03-28 06:29:27 +01:00
Amauri CHAMPEAUX 67d426f966
Merge pull request #422 from nstCactus/fixes/invisible-deny-all-button
🐛 Fix invisible "Deny all" button in the modal window
2020-03-27 20:06:49 +01:00
Amauri CHAMPEAUX 3db6f40ed4
Merge pull request #423 from nstCactus/fixes/buttons-height
🐛 Fix inconsistent buttons height
2020-03-27 20:06:00 +01:00
Amauri CHAMPEAUX d664f4fadb
Merge pull request #426 from prudloff-insite/gtm-https
Load GTM with HTTPS
2020-03-27 20:05:05 +01:00
Amauri CHAMPEAUX dad64861c6 check outside the loop if thisScript is still null 2020-03-27 20:03:42 +01:00
Pierre Rudloff 14af0a48a6 Load GTM with HTTPS 2020-03-23 18:18:03 +01:00
Pierre Rudloff ab8bb3de65 useExternalJs should only apply to internal scripts 2020-03-23 17:25:35 +01:00