From dfc11867a6777710b262f1adf867460023bb0154 Mon Sep 17 00:00:00 2001 From: Falk Rismansanj Date: Fri, 8 May 2020 05:40:54 +0200 Subject: [PATCH] html-fix --- Podfile.lock | 104 ++++++++++++++++--------------- blista.xcodeproj/project.pbxproj | 4 +- faq.html | 1 + imprint.html | 1 + links.html | 1 + opening.html | 14 ++--- privacy.html | 13 ++-- 7 files changed, 72 insertions(+), 66 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index e876d68..53f89f8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,44 +1,45 @@ PODS: - - Firebase/Core (6.22.0): + - Firebase/Core (6.24.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.4.1) - - Firebase/CoreOnly (6.22.0): - - FirebaseCore (= 6.6.6) - - Firebase/Messaging (6.22.0): + - FirebaseAnalytics (= 6.5.0) + - Firebase/CoreOnly (6.24.0): + - FirebaseCore (= 6.7.0) + - Firebase/Messaging (6.24.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 4.3.0) - - FirebaseAnalytics (6.4.1): - - FirebaseCore (~> 6.6) - - FirebaseInstallations (~> 1.1) - - GoogleAppMeasurement (= 6.4.1) + - FirebaseMessaging (~> 4.4.0) + - FirebaseAnalytics (6.5.0): + - FirebaseCore (~> 6.7) + - FirebaseInstallations (~> 1.2) + - GoogleAppMeasurement (= 6.5.0) - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (= 0.3.9011) + - nanopb (~> 1.30905.0) - FirebaseAnalyticsInterop (1.5.0) - - FirebaseCore (6.6.6): - - FirebaseCoreDiagnostics (~> 1.2) + - FirebaseCore (6.7.0): + - FirebaseCoreDiagnostics (~> 1.3) - FirebaseCoreDiagnosticsInterop (~> 1.2) - GoogleUtilities/Environment (~> 6.5) - GoogleUtilities/Logger (~> 6.5) - - FirebaseCoreDiagnostics (1.2.3): + - FirebaseCoreDiagnostics (1.3.0): - FirebaseCoreDiagnosticsInterop (~> 1.2) - - GoogleDataTransportCCTSupport (~> 2.0) + - GoogleDataTransportCCTSupport (~> 3.1) - GoogleUtilities/Environment (~> 6.5) - GoogleUtilities/Logger (~> 6.5) - - nanopb (~> 0.3.901) + - nanopb (~> 1.30905.0) - FirebaseCoreDiagnosticsInterop (1.2.0) - - FirebaseInstallations (1.1.1): + - FirebaseInstallations (1.2.0): - FirebaseCore (~> 6.6) - - GoogleUtilities/UserDefaults (~> 6.5) + - GoogleUtilities/Environment (~> 6.6) + - GoogleUtilities/UserDefaults (~> 6.6) - PromisesObjC (~> 1.2) - - FirebaseInstanceID (4.3.3): + - FirebaseInstanceID (4.3.4): - FirebaseCore (~> 6.6) - FirebaseInstallations (~> 1.0) - GoogleUtilities/Environment (~> 6.5) - GoogleUtilities/UserDefaults (~> 6.5) - - FirebaseMessaging (4.3.0): + - FirebaseMessaging (4.4.0): - FirebaseAnalyticsInterop (~> 1.5) - FirebaseCore (~> 6.6) - FirebaseInstanceID (~> 4.3) @@ -47,39 +48,40 @@ PODS: - GoogleUtilities/Reachability (~> 6.5) - GoogleUtilities/UserDefaults (~> 6.5) - Protobuf (>= 3.9.2, ~> 3.9) - - GoogleAppMeasurement (6.4.1): + - GoogleAppMeasurement (6.5.0): - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (= 0.3.9011) - - GoogleDataTransport (5.1.1) - - GoogleDataTransportCCTSupport (2.0.2): - - GoogleDataTransport (~> 5.1) - - nanopb (~> 0.3.901) - - GoogleUtilities/AppDelegateSwizzler (6.5.2): + - nanopb (~> 1.30905.0) + - GoogleDataTransport (6.1.0) + - GoogleDataTransportCCTSupport (3.1.0): + - GoogleDataTransport (~> 6.1) + - nanopb (~> 1.30905.0) + - GoogleUtilities/AppDelegateSwizzler (6.6.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.5.2) - - GoogleUtilities/Logger (6.5.2): + - GoogleUtilities/Environment (6.6.0): + - PromisesObjC (~> 1.2) + - GoogleUtilities/Logger (6.6.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.5.2): + - GoogleUtilities/MethodSwizzler (6.6.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.5.2): + - GoogleUtilities/Network (6.6.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.5.2)" - - GoogleUtilities/Reachability (6.5.2): + - "GoogleUtilities/NSData+zlib (6.6.0)" + - GoogleUtilities/Reachability (6.6.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.5.2): + - GoogleUtilities/UserDefaults (6.6.0): - GoogleUtilities/Logger - - nanopb (0.3.9011): - - nanopb/decode (= 0.3.9011) - - nanopb/encode (= 0.3.9011) - - nanopb/decode (0.3.9011) - - nanopb/encode (0.3.9011) + - nanopb (1.30905.0): + - nanopb/decode (= 1.30905.0) + - nanopb/encode (= 1.30905.0) + - nanopb/decode (1.30905.0) + - nanopb/encode (1.30905.0) - PromisesObjC (1.2.8) - Protobuf (3.11.4) - QRCodeReader.swift (10.1.0) @@ -110,20 +112,20 @@ SPEC REPOS: - QRCodeReader.swift SPEC CHECKSUMS: - Firebase: 32f9520684e87c7af3f0704f7f88042626d6b536 - FirebaseAnalytics: 83f822fd0d33a46f49f89b8c3ab16ab4d89df08a + Firebase: b28e55c60efd98963cd9011fe2fac5a10c2ba124 + FirebaseAnalytics: 7386fc2176e3f93ad8ef34b5b1f2b33a891e4962 FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae - FirebaseCore: 9aca0f1fffb405176ba15311a5621fcde4106fcf - FirebaseCoreDiagnostics: 13a6564cd6d5375066bbc8940cc1753af24497f3 + FirebaseCore: e610482f64097b0e9f056cd97bc6b33dfabcbb6a + FirebaseCoreDiagnostics: 4a773a47bd83bbd5a9b1ccf1ce7caa8b2d535e67 FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850 - FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44 - FirebaseInstanceID: 4b87a9a75ef628a53bb5de46e4d4cecfcce88c02 - FirebaseMessaging: 4ec33842d36b3319e062e51fb8b35a74f726950d - GoogleAppMeasurement: e49be3954045b17d046f271b9cc1ec052bad9702 - GoogleDataTransport: 6ffa4dd0b6d547f8d27b91bd92fa9e197a3f5f1f - GoogleDataTransportCCTSupport: 12f02e5c8f09c055615de90bcd5ba2c375546051 - GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e - nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd + FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa + FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b + FirebaseMessaging: 58cb17277641a0084d98d4951ba1f1fb0588c8c6 + GoogleAppMeasurement: 4c644d86835d827bab30ab6aabb9ecaf1f500735 + GoogleDataTransport: f6f8eba931df03ebd2232ff4645aa85f8f47b5ab + GoogleDataTransportCCTSupport: d70a561f7d236af529fee598835caad5e25f6d3d + GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1 + nanopb: c43f40fadfe79e8b8db116583945847910cbabc9 PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6 Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572 diff --git a/blista.xcodeproj/project.pbxproj b/blista.xcodeproj/project.pbxproj index 710808f..bb27b62 100644 --- a/blista.xcodeproj/project.pbxproj +++ b/blista.xcodeproj/project.pbxproj @@ -590,7 +590,7 @@ INFOPLIST_FILE = blista/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.14.0; + MARKETING_VERSION = 1.14.1; PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -619,7 +619,7 @@ INFOPLIST_FILE = blista/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.14.0; + MARKETING_VERSION = 1.14.1; PRODUCT_BUNDLE_IDENTIFIER = de.zitrotec.blista; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/faq.html b/faq.html index 201d806..5792708 100644 --- a/faq.html +++ b/faq.html @@ -1,5 +1,6 @@ + FAQ diff --git a/imprint.html b/imprint.html index de06a43..004781c 100644 --- a/imprint.html +++ b/imprint.html @@ -1,5 +1,6 @@ + Impressum diff --git a/links.html b/links.html index 32938a0..6aa6522 100644 --- a/links.html +++ b/links.html @@ -1,5 +1,6 @@ + Weiterführende Links diff --git a/opening.html b/opening.html index 3ab2724..6e01af2 100644 --- a/opening.html +++ b/opening.html @@ -1,10 +1,11 @@ - - - Öffnungszeiten - - + + + +Öffnungszeiten + +

Öffnungszeiten

blista-Shop

@@ -38,6 +39,5 @@

Reha-Beratungszentrum

Rehabilitationseinrichtung

montags bis freitags von 8:00 bis 16:00 Uhr.

- - + diff --git a/privacy.html b/privacy.html index 76da1dc..0ae573a 100644 --- a/privacy.html +++ b/privacy.html @@ -1,10 +1,11 @@ - - - Datenschutzerklärung - - + + + +Datenschutzerklärung + +

Datenschutzerklärung

Wir freuen uns sehr über Ihr Interesse an unserer blistar-App. Datenschutz hat einen besonders hohen Stellenwert für die Geschäftsleitung der zitrotec. Eine Nutzung der blistar-App ist grundsätzlich ohne jede Angabe personenbezogener Daten möglich. Sofern eine betroffene Person besondere Services unserer App in Anspruch nehmen möchte, könnte jedoch eine Verarbeitung personenbezogener Daten erforderlich werden. Ist die Verarbeitung personenbezogener Daten erforderlich und besteht für eine solche Verarbeitung keine gesetzliche Grundlage, holen wir generell eine Einwilligung der betroffenen Person ein.

@@ -253,5 +254,5 @@

19. Widerspruch Werbe-Mails

Zur Datenschutzerklärung der blista - +