d0784a1c Merge branch 'bug/28-comparaison-non-synchronisation-si-on-ne-passe-pas-la-souris-par-la-carte-de-droite' into 'master'
4690bfd5 Fix synchronisation si on ne passe pas la souris par la carte comparée
4fe8ddf9 pull module_cadastre app_vmap
f13aa86b Squashed 'src/module_cadastre/' changes from 0c12f3e1..6f475695
b3fc7073 pull module_cadastreV2 app_vmap
77e2b19f Squashed 'src/module_cadastreV2/' changes from 5719ef49..fd56b08b
94d5e4e5 pull module_anc app_vmap
e27ad4cd Squashed 'src/module_anc/' changes from 5ef8a762..0d85aba1
124de276 pull module_vm4ms app_vmap
9a160c0b Squashed 'src/module_vm4ms/' changes from f42f3101..4dc05bee
3d6317c1 pull module_vmap app_vmap
b241e8f2 Squashed 'src/module_vmap/' changes from 467dfde8..80ac33f9
163aca13 pull vitis app_vmap
65c0e7ab Squashed 'src/vitis/' changes from ad685c89..943bb3de
4fbe6e5a Update utils
c0d258cf Update utils
8a1fdfaf Update README
f14cfe3b Merge branch 'next_version' Conflicts: 	src/module_vmap/module/css/vmap.less 	src/module_vmap/module/template/layers/mapmodal/maplistlitle.html
579f292a Fenêtres comparaison et choix de la carte en cours de même largeur
c9af259a Merge commit 'a93f105b'
5f38bc75 Merge commit '28ac2839'
1e6f02d6 Merge commit 'a77c66ec'
88027f67 Merge commit '9ec6a912'
1b5b20cb Merge commit '95760f8e'
cff3af6f Merge commit 'da1ad0ef'
a77c66ec Merge branch 'next_version'
9ec6a912 Merge branch 'next_version'
95760f8e Merge branch 'next_version'
1d299552 Merge branch 'next_version'
da1ad0ef Merge branch 'next_version'
55872db4 Merge branch 'master' into next_version
de931bcf Merge branch 'next_version'
92813729 Merge branch 'master'
78a6c625 Merge branch 'master'
0d5dda26 Merge branch 'master'
642ae493 Merge branch 'master'
3112a2e8 Merge module_cadastreV2
f6ff85d0 Merge module_cadastreV2
4dabc71a Merge module_cadastreV2
58a1439f Merge module_cadastreV2
f7b63812 Merge commit '1c340f7e'
64e09162 Merge commit '1c340f7e'
755fd34b Merge commit '1c340f7e'
6db663e2 Merge commit '1c340f7e'
19df2325 Merge commit '68cd7130'
7100bf0b Merge commit '68cd7130'
86cfabbb Merge commit '68cd7130'
a86b0f35 Merge commit 'af1a2e36'
fccff4be Merge commit 'af1a2e36'
a17c1f47 Merge commit '348d59b7'
0f812bbe Merge commit '4398b26d'
a207eb35 Merge branch 'master' into next_version
34a7be79 Rename changelog files
4495e50b Add changelogs from 2017.03.00
7305e1ca Merge branch 'ArmandBahi-master-patch-41794' into 'master'
c23b994b Update README.md
12d49b76 Merge branch 'patch-1' into 'master'
7841a8fa Add license
f1cb96cd Merge branch 'evolution/27-affiner-l-interface-quand-on-utilise-le-mode-public' into 'next_version'
389330a4 Ne pas afficher la barre de gauche si le seul outil est vMap
63c138da Affichage des outils en fonction des properties
eead76d9 Merge commit 'a029100a' into next_version
598c1c31 Merge commit 'c16511be' into next_version
95e46994 Merge commit 'f80d1266' into next_version
9043c293 Merge commit '6ecf0ac4' into next_version
3de06ddb Merge commit '0d2fdec8' into next_version
1694077b Bug déformation carte imprimée
772b3e0a Bug impressions comparaison : scope.compare_mode not interpreted
a029100a Merge commit 'ec64b461' into next_version
c16511be Merge commit 'ec64b461' into next_version
f80d1266 Merge commit 'ec64b461' into next_version
6ecf0ac4 Merge commit 'ec64b461' into next_version
0d2fdec8 Merge commit 'ec64b461' into next_version
acd3d63b Merge commit '5719ef49' into next_version
9795f569 Merge commit '5719ef49' into next_version
63499f55 Merge commit '5719ef49' into next_version
c465203a Merge commit '5719ef49' into next_version
6d5b5843 Merge commit 'a3e5d1d3' into next_version
a7af2328 Merge commit 'a3e5d1d3' into next_version
57788622 Merge commit 'a3e5d1d3' into next_version
5171052c Merge commit '6a0b53ef' into next_version
85c53a92 Merge commit '6a0b53ef' into next_version
f179ee2e Resolve confilct
305e5c4f Resolve icons conflict
da914e96 Icone lien pour generateur url
c8a85130 Icone lien pour generateur url
aea547e5 Icone lien pour generateur url
6ec51b8c Merge branch 'evolution/26-generateur-d-url-pour-bo' into 'next_version'
b0861e7a Merge branch 'master' into next_version
29315536 Update gitignore
00e70593 Générateur d'url pour BO
ca250084 Générateur d'url pour BO
f50859ea Merge branch 'master' into next_version
e89feaca Remove squash from subtrees utils
b443f83d Merge branch 'master' into next_version
01783af0 Remove closure from gitignore
16b1d8d2 Revert "pull subtree"
c34ae8c2 Revert "pull subtree"
8a1d5450 Squashed 'src/module_cadastreV2/' changes from 0c12f3e1..5719ef49
ec64b461 pull subtree
a3e5d1d3 pull subtree
6a0b53ef pull subtree
9c324c8d pull subtree
3ce4602e pull subtree
ab49657b pull subtree
b58c3992 Squashed 'src/module_anc/' changes from 0c12f3e1..5ef8a762
2234695e pull subtree
b93971d5 pull subtree
28fc8051 pull subtree
209350d0 pull subtree
1a650d5b pull subtree
2f788ee2 Squashed 'src/module_vm4ms/' changes from 0c12f3e1..f42f3101
b5bafcbe pull subtree
6a13d9ee pull subtree
4bb796bb pull subtree
ee4f9a23 pull subtree
06b33c88 Squashed 'src/module_vmap/' changes from 0c12f3e1..467dfde8
d140371f pull subtree
5a4861ea pull subtree
504d372f pull subtree
d640dd3b pull subtree
4e0e577c Squashed 'src/vitis/' changes from 940a5919..ad685c89
94d96d82 pull subtree
2e133294 pull subtree
93d178f7 pull subtree
81d25f33 pull subtree
5719ef49 Merge branch 'master' into next_app_vmap
d06ee42b Merge branch 'next_version' into next_app_vmap
beccf8fd Merge branch 'master' into next_version
cef5535a Merge branch 'next_app_vmap' into next_version
0c12f3e1 Merge branch 'next_version' into next_app_vmap
db17bf52 Remove gitignore
c6890c62 Merge branch 'next_app_vmap' into next_version
1f972d00 Merge branch 'bug/24-url-exporter-ne-fonctionne-pas-si-le-mode-carto-n-est-pas-le-premier-de-l-application' into 'next_version'
2761aec4 Merge branch 'pre_prod' into next_version
c7dc5dc9 Merge branch 'evolution/2-mode-comparaison-2' into 'pre_prod'
2940c73f Alignement de la projecction de la carte comparée
04a28c55 JS doc
94331793 Ajout de la proj de la carte en comparaison
d625dde1 Syntaxe
42ca573b Ajout du nom de la carte en comparaison
50654dc8 Correction Recharge légende quand on affiche/cache un service de la carte compare
50b5ed2d Ajout de compare_mode dans le scope
e79d29d1 Comparaison impressions légende
7b740274 Mise au propre
a46fa1f0 Correction problème redimentionnement
ba1c14d9 Comparaison sur la fenêtre légende
051f1865 Comparaison sur la fenêtre Jeux de données
2a7c2ee1 Ajout onglets (visu uniquement)
c662099a L'url ouvre l'application sur le mode Carto
5ef8a762 Merge branch 'pre_prod' into evolution/2-mode-comparaison-2
f42f3101 Merge branch 'pre_prod' into evolution/2-mode-comparaison-2
d48cfcb5 Merge branch 'pre_prod' into evolution/2-mode-comparaison-2
467dfde8 Merge branch 'next_version' into next_app_vmap
dfc1306b Merge remote-tracking branch 'origin/next_version' into next_version
407a18be Merge branch 'master' into next_version
4be06293 Merge branch 'master' into 'next_version'
00ecdc5e Merge branch 'app_vmap' into 'master'
e76c4453 make push_subtrees.sh executable
9752b768 pull subtree
ec4141b9 Squashed 'src/module_vmap/' changes from fb263937..f081e696
ad685c89 Merge branch 'next_version' into 'next_app_vmap'
4a400f14 Merge branch 'next_app_dtnet' into 'next_version'
dc9e09bb Merge branch 'next_app_vmap' into 'next_version'
ed3718ef Next app vmap
6909aeec Correctif sur la concaténation de filtres
68d6ee11 Retouche attribut comparator sur les formulaires de filtres
ede9aab9 Add changelog
bda76d6e Amélioration forlulaire objet métier fix #9
ffc2d351 Agrandissement du bouton comparaison
a9e1f332 [zoom suivant precedent] Dysfonctionnement quand on ouvre les volets latéraux fix #23
2999a932 Supprression des contrôles de la carte de droite fix 22
bc4640e7 Utilisation de deux champs au lieu d'une checkbox pour la génération des liens dans le mode vMap. fix #21
3493d34c Amélioration de la synchronisation des cartes de comparaison Fix #20
1eeee253 fix #17 image objet metier affiche bouton upload
6ef5abbd fix #17 image objet metier affiche bouton upload
77cbfb3c Calcul des superpositions en update Fix #18
ee85f804 fix url uthentification problems Closes #19
5e1ed3cc fix url uthentification problems Closes #19
85bb73a6 Correction problèmes de chargement JS des sous formulaires
1aa1cae2 Correction problèmes de chargement JS des sous formulaires
a74a2a99 pull subtree
cb63318a pull subtree
dfd4bcbc pull subtree
49b02a0a pull subtree
613ccca5 pull subtree
dbebb835 pull subtree
7755613b Squashed 'src/module_cadastre/' changes from 66dbfede..5883a499
71144e83 pull subtree
181cdbae pull subtree
e2547f63 pull subtree
51b130ea pull subtree
3868e82d pull subtree
ec89ac3d Squashed 'src/module_cadastreV2/' changes from 66dbfede..bc664f7f
4d555e37 pull subtree
2b3986a6 pull subtree
5b7a1076 pull subtree
a937f6d2 pull subtree
92412612 Squashed 'src/module_anc/' changes from 66dbfede..24e0fb69
112cdb5b pull subtree
af78a82b pull subtree
b9ae9807 pull subtree
1ad73285 pull subtree
90da1776 Squashed 'src/module_vm4ms/' changes from 66dbfede..16f9769a
401609c1 pull subtree
108289ca pull subtree
13364170 pull subtree
4f5cf220 pull subtree
56346bce pull subtree
116e0210 Squashed 'src/module_vmap/' changes from 66dbfede..2b3157a0
30d983f1 Squashed 'src/vitis/' changes from 4398b26d..940a5919
bf01f32 pull subtree
5e6139f pull subtree
93f3d98 Make push_subtrees runnable
bc664f7 Revert "pull subtree"
f002069 Correction problèmes chargement JS sous formulaires
9e8f5c6 Correction problèmes chargement JS sous formulaires
e999a18 update colonne version pour accepter les version de plus de 10 caractères
4402a3b update colonne version pour accepter les version de plus de 10 caractères
fcaa437 update colonne version pour accepter les version de plus de 10 caractères
ca49780 update colonne version pour accepter les version de plus de 10 caractères
115665f Remove parasit files
3a3fe5d Remove parasit files
07f786f update colonne version pour accepter les version de plus de 10 caractères
1c87936 update colonne version pour accepter les version de plus de 10 caractères
1dd6eeb Merge branch 'next_version' into 'pre_prod'
5883a49 Merge branch 'master' into 'next_version'
7f7f902 Merge branch 'master' into 'next_version'
8aa6330 Merge branch 'master' into 'next_version'
c2776a8 Merge remote-tracking branch 'origin/next_version' into next_version
0b735ab Merge remote-tracking branch 'origin/next_version' into next_version
0a99f83 Merge remote-tracking branch 'origin/next_version' into next_version
65aa29c Interface générateur d'URL
9b18e65 Interface générateur d'URL
f29a96e Review Checkbox CSS
e85ab01 Review Checkbox CSS
be845c0 Review Checkbox CSS
f4a1833 Review Checkbox CSS
01d51fa Review Checkbox CSS
67e90d7 Review Checkbox CSS
bdae653 Merge branch 'evolution/2-mode-comparaison-2' into 'next_version'
313b106 Resolve "mode comparaison"
d65f119 Resolve "mode comparaison"
d45e75d Interface checkbox
1d9f88d interface liste cartes comparaison
847e66e Amélioration performances
f9f4d2c fix problemes coef resolution
233ea36 fix problèmes boutons blockage zone impression
68392db css curseur comparaison
ae74ba2 Bouton de comparaison blanc quand la fonctionnalité est activée
1ccb1a8 Mise à l'échelle lors du chargement de la carte
f940d51 Correction erreur de compilation sur impression et erreur si élément non présent dans l'impression
b3684eb Merge branch 'evolution/9-ajouter-les-listes-deroulantes-au-formulaire-objet-metier' into 'next_version'
c6698d6 Ajout de listes déroulantes au formulaire objet métier
fb8adf6 Ajout de listes déroulantes au formulaire objet métier
7382c53 Correction Zoom et déformation d'étendue
ce3bb9c Resolve "[Studio] suppressions des différents formulaires"
3154da3 Merge branch 'evolution/studio-suppression-des-formulaires' into 'next_version'
e996ab2 Resolve "[Studio] suppressions des différents formulaires"
4b3c71d Resolve "[Studio] suppressions des différents formulaires"
eb48d02 Reset src/module_cadastre
93a4ba8 Reset src/module_cadastre
69a7f28 Utilisation de l'étendue pour la synchronisation
dce9cac Merge branch 'bug/5-contraintes-d-urbanisme-remontees-pour-une-parcelle-limitrophe-entre-deux-communes-mauvaise-numerisation' into 'master'
8a44aec Ajout propertie intersect_id_com pour utiliser un filtre id_com en plus de l'intersection
a8607fc Merge branch 'bug/4-problemes-lors-qu-un-utilisateur-vmap_admin-et-non-vitis_admin-va-dans-le-mode-configuration' into 'master'
a366275 Non affichage du mode configuration pour les utilisateurs vmap_admin
6bdd6f9 retrait console.log et code commenté
ed20c32 Merge remote-tracking branch 'origin/next_version' into evolution/2-mode-comparaison-2
10e6f9c Ajout de la fonctionnalitée d'impression sur la carte de comparaison
32fd687 Généralisation de la classe Printbox
ceac048 Merge branch 'evolution/7-calculs-de-polygones-jointifs' into 'next_version'
710bebc Synchronisation
eb1594e Synchronisation
bffda11 Prettify code
7d3a986 Prettify code
95289ac Nommage & affichage
0e53ade Nommage & affichage
500f524 Instanciation du composant Map pour la comparaison et synchro avec le composant classique
f0c4c8a Ajout calcul de polygones jointifs en mode update
aee4451 Ajout calcul de polygones jointifs en mode update
cbd5767 correction syntaxe
3a3c236 correction syntaxe
c3aac3e Limite le calcul des polygones jointifs aux types polygon, multipolygon, geometry, geometrycollection
8fcd4c0 Limite le calcul des polygones jointifs aux types polygon, multipolygon, geometry, geometrycollection
c815ad8 Ajout des fonctions de calcul de polygones jointifs
7f4401b Ajout des fonctions de calcul de polygones jointifs
4063537 Add diff_geometry request
815cedc Add diff_geometry request
40fce0a Retouche pour séparer la vue principale en deux
0974ddb Retouche du sélécteur de carte pour la carte de comparaison
af13d1c Ajout de l'outils dans Basictools
c3fbd52 Avoid intersections interface
0eb3260 Avoid intersections interface
1a51936 Edit snapping modal title
14af3a5 Edit snapping modal title
594f0c3 Add right-click to termine drawing
f2ffb07 Add right-click to termine drawing
05c763b Add right-click to termine drawing
5762b29 Add right-click to termine drawing
a05e0fd Add right-click to termine drawing
b261544 pull subtree
914a1b6 pull subtree
c88aa58 Merge remote-tracking branch 'origin/next_version' into evolution/2-mode-comparaison-2
7facefc Merge branch 'master' into next_version
7fbff5c Merge remote-tracking branch 'origin/master'
65d69a4 Remove auto pull/push subtrees
02633d0 Remove auto pull/push subtrees
5a8cfb3 Pull/push_subtrees.sh
2fb6e11 use next_app_vmap branches
4cbf5a6 Merge branch 'master'
c64422b Merge branch 'master'
3097ea4 Merge branch 'cherry-pick-08ef8c91' into 'next_version'
1a3e250 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'
08ef8c9 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'
731fb56 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'
ef0c46d Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles
7fd95b0 Replace bootstrapTable getAllSelections by getSelections
173760d Merge branch 'master' into bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles
4613f70 link subtrees on branch app_vmap
6a47c43 Rename pull.sh into pull_subtrees.sh
77845c6 Squashed 'src/module_vmap/' changes from 3e46450b..fb263937
591f4ec pull subtree
4b44e6b Squashed 'src/vitis/' changes from 12a22d70..4398b26d
475f621 pull subtree
2b3157a Merge branch 'cherry-pick-fb263937' into 'next_version'
3c58909 Merge branch 'bug/1-probleme-d-affichage-getfeatureinfo-sur-mobile' into 'master'
97cbc15 Merge branch 'master' into 'next_version'
3764327 Merge remote-tracking branch 'origin/master'
e058ef8 Resolve grunt links
4f4bf75 Correct grunt problems
dca067b Merge branch 'dev_master' into 'master'
837046c Dev master
82a645d Update properties.json
5d57e51 Update conf/properties.json
ee905c1 Resolve web services update problem
54bd177 Minify JS after updating files
c35cc38 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
6a7cf62 Minify JS after updating files
7b0e04e Minify JS after updating files
479d785 Add install/update files for windows
78a320a pull subtree
e2a617e Squashed 'src/module_cadastreV2/' changes from 8158b9a2..895d7e3b
926bff6 Utilisation des utils sans avoir besoin de linxml2
3df5e36 Squashed 'src/module_vmap/' changes from 98047575..3e46450b
0852ad9 pull subtree
9f13187 Utilisation des utils sans avoir besoin de libxml2
1a61e63 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
03a5dfe Update pull/push_subtrees.sh to use the current version of subtrees
51f83a0 Add windows install files
457792c pull subtree
0bf9c2c Squashed 'src/module_cadastre/' changes from a36394b9..1c340f7e
b5c65a6 pull subtree
5e944c4 Squashed 'src/vitis/' changes from 7b55e678..12a22d70
85f07d4 Update init_symlinks
896a06b pull subtree
e9dfdcb Squashed 'src/module_anc/' changes from 8bb35778..68cd7130
393551e pull subtree
5cd5ab0 Squashed 'src/module_vmap/' changes from e7dabee0..98047575
19925d4 pull subtree
df41643 Squashed 'src/vitis/' changes from 7a1818a4..7b55e678
59e770c pull subtree
77582f1 Update gitignore
aa4b71d Remvove web_service from parent
99dab64 Update gitignore
7e0d02d Update Readme
74b02e3 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
05269f9 Modify symlinks strategy
577d765 Modify symlinks strategy
3c521a9 Modify symlinks strategy
cf8ebcd Update symlinks strategy
b93b890 Modify symlinks strategy
139ee7e Modify symlinks strategy
3427147 Squashed 'src/module_cadastre/' changes from ee26cf16..a36394b9
54df607 pull subtree
3ce44dc Squashed 'src/module_anc/' changes from 4321adc4..8bb35778
1056cb4 pull subtree
278331d pull subtree
a0cda92 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da
1b6864e add subtree
9d999ac add subtree
df88c95 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa9
2b0c911 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa9
e2a23ca add subtree
e0e437e Squashed 'src/module_cadastreV2/' content from commit b442386a7
4fa86e7 add subtree
6b7d2e6 Squashed 'src/module_anc/' content from commit 24e0fb694
d661316 add subtree
b442386 Merge branch 'master' into next_version
66dbfed Merge branch 'master' into next_version
862099b Update from SVN
REVERT: fd56b08 Merge commit 'a93f105b814cad44ec1deb72ffc1d192bd2d3720'

git-subtree-dir: src/module_cadastreV2
git-subtree-split: d0784a1c8b491182f654a34279a7b936d7504191