Merge branch 'develop' into trunk
This commit is contained in:
commit
f3826a78ad
4 changed files with 469 additions and 369 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -5,6 +5,7 @@
|
|||
/vendor
|
||||
.env
|
||||
.env.backup
|
||||
.env.dev
|
||||
.phpunit.result.cache
|
||||
docker-compose.override.yml
|
||||
Homestead.json
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@ class AppServiceProvider extends ServiceProvider
|
|||
*/
|
||||
public function boot()
|
||||
{
|
||||
//
|
||||
if (config('app.env') !== 'local') {
|
||||
\URL::forceScheme('https');
|
||||
setlocale(LC_TIME, config('app.locale') . "_" . strtoupper(config('app.locale')) . '.utf8');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
820
package-lock.json
generated
820
package-lock.json
generated
File diff suppressed because it is too large
Load diff
12
resources/js/cookies-ldc.js
vendored
12
resources/js/cookies-ldc.js
vendored
|
|
@ -7,26 +7,26 @@ window.LDCWebCN = new LdcwebCn({
|
|||
'script': function () {
|
||||
(function (d, t) {
|
||||
let g = d.createElement(t), s = d.getElementsByTagName(t)[0];
|
||||
g.src = 'https://www.google.com/recaptcha/api.js?render=6LePZvAUAAAAABs8uGHxhSkJVPVs4yCJ3amJ1HpX';
|
||||
g.src = 'https://www.google.com/recaptcha/api.js?render=6LfN9O0dAAAAAH98Ojk-xmaTj0mXRuWZTPzQmDVq';
|
||||
s.parentNode.insertBefore(g, s)
|
||||
}(document, 'script'));
|
||||
}
|
||||
},
|
||||
},
|
||||
'analytics': {
|
||||
'name': "MESURES D'AUDIENCE - Google Analytics",
|
||||
'description': 'Les services de mesure d\'audience permettent de générer des statistiques de fréquentation utiles à l\'amélioration du site.',
|
||||
'link': 'https://support.google.com/analytics/answer/6004245',
|
||||
'cookies': ['NID', '_ga', '_gat_gtag_UA_35342869_1', '_gid'],
|
||||
'cookies': ['NID', '_ga', '_gat_gtag_G_5K094FDBBP', '_gid'],
|
||||
'script': function () {
|
||||
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
|
||||
g.src='https://www.googletagmanager.com/gtag/js?id=UA-35342869-1';g.id='analytics';
|
||||
g.src='https://www.googletagmanager.com/gtag/js?id=G-5K094FDBBP';g.id='analytics';
|
||||
s.parentNode.insertBefore(g,s)}(document,'script'));
|
||||
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
function gtag(){dataLayer.push(arguments);}
|
||||
gtag('js', new Date());
|
||||
|
||||
gtag('config', 'UA-35342869-1');
|
||||
gtag('config', 'G-5K094FDBBP');
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue