From 27d1fc8c90de7def07f90df4427dad5b5cf1e0f1 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 2 Apr 2024 14:14:56 +0200
Subject: [PATCH] publish: Merge remote-tracking branch 'origin/dev' into
feat/grdf-error-messages
generated from commit 9113ac2aaa165a7a2a129364d90503494032f2d6
---
...efd109143371257c4728.js => ecolyo.f40bfcd5212128236bed.js} | 4 ++--
index.html | 2 +-
...3b7dde3fc24563ac1c36.js => ecolyo.941703d5cf81bf8db4c9.js} | 4 ++--
public/index.html | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
rename app/{ecolyo.efd109143371257c4728.js => ecolyo.f40bfcd5212128236bed.js} (99%)
rename public/{ecolyo.3b7dde3fc24563ac1c36.js => ecolyo.941703d5cf81bf8db4c9.js} (99%)
diff --git a/app/ecolyo.efd109143371257c4728.js b/app/ecolyo.f40bfcd5212128236bed.js
similarity index 99%
rename from app/ecolyo.efd109143371257c4728.js
rename to app/ecolyo.f40bfcd5212128236bed.js
index 1e3b95dd9..336c00e46 100644
--- a/app/ecolyo.efd109143371257c4728.js
+++ b/app/ecolyo.f40bfcd5212128236bed.js
@@ -444,7 +444,7 @@ var EnvironmentService = /*#__PURE__*/function () {
(0, _createClass2.default)(EnvironmentService, [{
key: "isAlpha",
value: function isAlpha() {
- return false;
+ return true;
}
}, {
key: "isLocal",
@@ -458,7 +458,7 @@ var EnvironmentService = /*#__PURE__*/function () {
}, {
key: "isDev",
value: function isDev() {
- return false || false;
+ return true || false;
}
}, {
key: "isProduction",
diff --git a/index.html b/index.html
index d03b5df95..abaacdb72 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.efd109143371257c4728.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.f40bfcd5212128236bed.js"></script></div></body></html>
\ No newline at end of file
diff --git a/public/ecolyo.3b7dde3fc24563ac1c36.js b/public/ecolyo.941703d5cf81bf8db4c9.js
similarity index 99%
rename from public/ecolyo.3b7dde3fc24563ac1c36.js
rename to public/ecolyo.941703d5cf81bf8db4c9.js
index 819b67788..af5c11f93 100644
--- a/public/ecolyo.3b7dde3fc24563ac1c36.js
+++ b/public/ecolyo.941703d5cf81bf8db4c9.js
@@ -2626,7 +2626,7 @@ var EnvironmentService = /*#__PURE__*/function () {
(0, _createClass2.default)(EnvironmentService, [{
key: "isAlpha",
value: function isAlpha() {
- return false;
+ return true;
}
}, {
key: "isLocal",
@@ -2640,7 +2640,7 @@ var EnvironmentService = /*#__PURE__*/function () {
}, {
key: "isDev",
value: function isDev() {
- return false || false;
+ return true || false;
}
}, {
key: "isProduction",
diff --git a/public/index.html b/public/index.html
index 81012455a..9225d3f44 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo | Désabonnement</title><link rel="icon" type="image/png" href="public/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="public/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="mask-icon" href="public/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="public/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="public/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="../public/ecolyo.3b7dde3fc24563ac1c36.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo | Désabonnement</title><link rel="icon" type="image/png" href="public/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="public/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="mask-icon" href="public/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="public/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="public/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="../public/ecolyo.941703d5cf81bf8db4c9.js"></script></div></body></html>
\ No newline at end of file
--
GitLab