From 76ae45474c2ad5b3c1777f7bb2aa322dfc51e5bb Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:43:13 +0200
Subject: [PATCH 1/4] Change dependencies model
---
{web_service/_install => _install}/apache.conf | 0
{web_service/_install => _install}/dependency.xml | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {web_service/_install => _install}/apache.conf (100%)
rename {web_service/_install => _install}/dependency.xml (100%)
diff --git a/web_service/_install/apache.conf b/_install/apache.conf
similarity index 100%
rename from web_service/_install/apache.conf
rename to _install/apache.conf
diff --git a/web_service/_install/dependency.xml b/_install/dependency.xml
similarity index 100%
rename from web_service/_install/dependency.xml
rename to _install/dependency.xml
--
GitLab
From e64ea4211e691ec09d18b4b33b8c0eb37d83c4df Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 12:43:28 +0200
Subject: [PATCH 2/4] Change dependencies model
---
_install/dependency.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index 5ae3784e..e3d6f4d2 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -3,8 +3,7 @@
<installer>
<dependenciesCollection>
<dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
+ <nature>framework</nature>
</dependency>
</dependenciesCollection>
</installer>
--
GitLab
From da0e188745bfb68a97d9e67b42db0dcd17ed574b Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 15:14:03 +0000
Subject: [PATCH 3/4] Update dependency.xml
---
_install/dependency.xml | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index e3d6f4d2..441f5546 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- WS GTF -->
-<installer>
- <dependenciesCollection>
- <dependency>
- <nature>framework</nature>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- WS GTF -->
+<installer>
+ <dependenciesCollection>
+ <dependency>
+ <nature>framework</nature>
+ <name>vitis</name>
+ </dependency>
+ </dependenciesCollection>
+</installer>
--
GitLab
From d1d8c8eb743cdf258144a607c6a31b7d4d4bf9ed Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 14:40:29 +0200
Subject: [PATCH 4/4] Update from SVN
---
web_service/CHANGE_LOG.txt | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100755 web_service/CHANGE_LOG.txt
diff --git a/web_service/CHANGE_LOG.txt b/web_service/CHANGE_LOG.txt
deleted file mode 100755
index 7210b50e..00000000
--- a/web_service/CHANGE_LOG.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-b22731|RELEASE |cadastre| Version 2017.01.01
-b22727|BUG |cadastre| Privilèges
-b22647|EVOLUTION |cadastre| Tous les constructeurs des classes PHP ont été renommé en __construct
-b22139|RELEASE |cadastre| Version 2017.01.00
-b21184|BUG |cadastre| projections cadastre
-b20785|BUG |cadastre| Rajout du champs , 'l_dsgrpf as "DSGRPF"'
-b20499|BUG |cadastre| Ajout Adresse de la parcelle fiche urbanisme
-b20114|BUG |cadastre| Modification des versions.inc pour ajouter la status à UNSTABLE
-b20112|BUG |cadastre| Erreur dans le require_once
-b19998|BUG |cadastre| Web service cadastre --> Suppression de la dépendance au schéma cadastre
-b19822|BUG |cadastre| v_lieu_dit
-b19730|BUG |cadastre| Utilisation d'un seul fichier de properties pour les modules cadastre v1 et v2
-
--
GitLab