Squashed 'src/module_vmap/' changes from 467dfde8..80ac33f9

80ac33f9 Merge commit 'fd56b08b'
b22d59bb Merge commit 'ec0e1587'
ccc6badc Merge commit '1ec09986'
43370846 pull module_cadastre app_vmap
81d09906 Squashed 'src/module_cadastre/' changes from 0c12f3e1..a93f105b
1906a37e pull module_cadastreV2 app_vmap
3885f268 Squashed 'src/module_cadastreV2/' changes from 5719ef49..fd56b08b
9321087a pull module_anc app_vmap
7ed582e8 Squashed 'src/module_anc/' changes from 5ef8a762..ec0e1587
b10f89fa pull module_vm4ms app_vmap
9f5589a7 Squashed 'src/module_vm4ms/' changes from f42f3101..2584beda
c051af2a pull module_vmap app_vmap
1ec09986 pull module_cadastre app_vmap
da832bf3 pull module_cadastre app_vmap
354c2543 Squashed 'src/module_cadastre/' changes from 0c12f3e1..a93f105b
3b55bb75 pull module_cadastreV2 app_vmap
9859fc5a pull module_cadastreV2 app_vmap
9980c4bf Squashed 'src/module_cadastreV2/' changes from 5719ef49..fd56b08b
d0709eee pull module_anc app_vmap
b60f114e pull module_anc app_vmap
7ea9ae58 Squashed 'src/module_anc/' changes from 5ef8a762..ec0e1587
4572afdc pull module_vm4ms app_vmap
8919d3ab pull module_vm4ms app_vmap
c73d204a Squashed 'src/module_vm4ms/' changes from f42f3101..2584beda
bb37cbdd pull module_vmap app_vmap
6de6c804 pull module_vmap app_vmap
1629e86c Squashed 'src/module_vmap/' changes from 467dfde8..83c6b678
f14cfe3b Merge branch 'next_version' Conflicts: 	src/module_vmap/module/css/vmap.less 	src/module_vmap/module/template/layers/mapmodal/maplistlitle.html
d8339ea5 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
a1a294cb Fenêtres comparaison et choix de la carte en cours de même largeur
fd56b08b Merge commit 'a93f105b'
ec0e1587 Merge commit 'a93f105b'
bc6b5346 Merge commit 'a93f105b'
83c6b678 Merge commit 'a93f105b'
c9af259a Merge commit 'a93f105b'
aed57e2d Merge commit '28ac2839'
7ef2ebb5 Merge commit '28ac2839'
1a0869b7 Merge commit '28ac2839'
5f38bc75 Merge commit '28ac2839'
13db2f09 Merge commit 'a77c66ec'
409c6467 Merge commit 'a77c66ec'
1e6f02d6 Merge commit 'a77c66ec'
2285d70f Merge commit '9ec6a912'
749ee869 Merge commit '9ec6a912'
88027f67 Merge commit '9ec6a912'
bd5282c0 Merge commit '95760f8e'
1b5b20cb Merge commit '95760f8e'
cff3af6f Merge commit 'da1ad0ef'
28ac2839 Merge branch 'next_version'
a93f105b Merge branch 'next_version'
a77c66ec Merge branch 'next_version'
9ec6a912 Merge branch 'next_version'
95760f8e Merge branch 'next_version'
da1ad0ef Merge branch 'next_version'
1d299552 Merge branch 'next_version'
55872db4 Merge branch 'master' into next_version
66eb03a5 Merge branch 'next_version'
de931bcf Merge branch 'next_version'
38a75ca2 Merge branch 'master'
2f9770d9 Merge branch 'master'
92813729 Merge branch 'master'
78a6c625 Merge branch 'master'
0d5dda26 Merge branch 'master'
642ae493 Merge branch 'master'
bf880279 Merge branch 'master' into 'app_vmap'
17aa49c3 Merge module_cadastreV2
4188d1e6 Merge module_cadastreV2
3112a2e8 Merge module_cadastreV2
f6ff85d0 Merge module_cadastreV2
4dabc71a Merge module_cadastreV2
58a1439f Merge module_cadastreV2
778f28d7 Merge module_cadastreV2
050f8233 Merge commit '1c340f7e'
f7b63812 Merge commit '1c340f7e'
64e09162 Merge commit '1c340f7e'
755fd34b Merge commit '1c340f7e'
6db663e2 Merge commit '1c340f7e'
a2957b7c Merge commit '1c340f7e'
1044e682 Merge commit '68cd7130'
19df2325 Merge commit '68cd7130'
7100bf0b Merge commit '68cd7130'
86cfabbb Merge commit '68cd7130'
a1d73582 Merge commit '68cd7130'
26e216cd Merge commit 'af1a2e36'
a86b0f35 Merge commit 'af1a2e36'
fccff4be Merge commit 'af1a2e36'
041b403e Merge commit 'af1a2e36'
749f5d19 Merge commit '348d59b7'
a17c1f47 Merge commit '348d59b7'
fb5f0210 Merge commit '348d59b7'
52b157e1 Merge commit '4398b26d'
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
2e6f335a Affichage des outils en fonction des properties
63c138da Affichage des outils en fonction des properties
eead76d9 Merge commit 'a029100a' into next_version
a1c50ecd Merge commit 'a029100a' into next_version
598c1c31 Merge commit 'c16511be' into next_version
9fb7d98c Merge commit 'c16511be' into next_version
95e46994 Merge commit 'f80d1266' into next_version
270b8fe3 Merge commit 'f80d1266' into next_version
9043c293 Merge commit '6ecf0ac4' into next_version
d5b74467 Merge commit '6ecf0ac4' into next_version
3de06ddb Merge commit '0d2fdec8' into next_version
99a21380 Merge commit '0d2fdec8' into next_version
1694077b Bug déformation carte imprimée
2f744082 Bug déformation carte imprimée
772b3e0a Bug impressions comparaison : scope.compare_mode not interpreted
d2547fbd 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
aea547e5 Icone lien pour generateur url
c8a85130 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
94d96d82 pull subtree
2e133294 pull subtree
93d178f7 pull subtree
4e0e577c Squashed 'src/vitis/' changes from 940a5919..ad685c89
81d25f33 pull subtree
5719ef49 Merge branch 'master' into next_app_vmap
101fad20 Merge branch 'master' into app_vmap
04012fb5 Remove gitignore
d06ee42b Merge branch 'next_version' into next_app_vmap
beccf8fd Merge branch 'master' into next_version
1c5454e1 Merge branch 'master' into app_vmap
80c027e2 Merge branch 'app_vmap'
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
9862a97c Remove gitignore
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
1e0dea62 Merge branch 'next_version' into 'master'
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
613ccca5 pull subtree
dbebb835 pull subtree
71144e83 pull subtree
181cdbae pull subtree
51b130ea pull subtree
3868e82d pull subtree
4d555e37 pull subtree
5b7a1076 pull subtree
a937f6d2 pull subtree
112cdb5b pull subtree
b9ae9807 pull subtree
1ad73285 pull subtree
401609c1 pull subtree
108289ca 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
bf01f328 pull subtree
5e6139f5 pull subtree
93f3d98c Make push_subtrees runnable
bc664f7f Revert "pull subtree"
f0020699 Correction problèmes chargement JS sous formulaires
9e8f5c6a Correction problèmes chargement JS sous formulaires
e999a181 update colonne version pour accepter les version de plus de 10 caractères
4402a3bf update colonne version pour accepter les version de plus de 10 caractères
ca49780d update colonne version pour accepter les version de plus de 10 caractères
115665fa Remove parasit files
3a3fe5d9 Remove parasit files
07f786fb update colonne version pour accepter les version de plus de 10 caractères
1c879364 update colonne version pour accepter les version de plus de 10 caractères
1dd6eeb0 Merge branch 'next_version' into 'pre_prod'
5883a499 Merge branch 'master' into 'next_version'
7f7f9021 Merge branch 'master' into 'next_version'
c2776a81 Merge remote-tracking branch 'origin/next_version' into next_version
0b735ab9 Merge remote-tracking branch 'origin/next_version' into next_version
65aa29c3 Interface générateur d'URL
f29a96e0 Review Checkbox CSS
e85ab019 Review Checkbox CSS
f4a1833b Review Checkbox CSS
01d51fa0 Review Checkbox CSS
bdae6533 Merge branch 'evolution/2-mode-comparaison-2' into 'next_version'
d65f1198 Resolve "mode comparaison"
d45e75d3 Interface checkbox
1d9f88d8 interface liste cartes comparaison
847e66e4 Amélioration performances
f9f4d2c0 fix problemes coef resolution
233ea36e fix problèmes boutons blockage zone impression
68392db5 css curseur comparaison
ae74ba26 Bouton de comparaison blanc quand la fonctionnalité est activée
1ccb1a8b Mise à l'échelle lors du chargement de la carte
f940d512 Correction erreur de compilation sur impression et erreur si élément non présent dans l'impression
b3684eb7 Merge branch 'evolution/9-ajouter-les-listes-deroulantes-au-formulaire-objet-metier' into 'next_version'
fb8adf69 Ajout de listes déroulantes au formulaire objet métier
7382c534 Correction Zoom et déformation d'étendue
ce3bb9c9 Resolve "[Studio] suppressions des différents formulaires"
3154da34 Merge branch 'evolution/studio-suppression-des-formulaires' into 'next_version'
4b3c71dc Resolve "[Studio] suppressions des différents formulaires"
eb48d024 Reset src/module_cadastre
93a4ba83 Reset src/module_cadastre
69a7f286 Utilisation de l'étendue pour la synchronisation
40e7d46e pull subtree
dce9cacd Merge branch 'bug/5-contraintes-d-urbanisme-remontees-pour-une-parcelle-limitrophe-entre-deux-communes-mauvaise-numerisation' into 'master'
7e14e88c Ajout propertie intersect_id_com pour utiliser un filtre id_com en plus de l'intersection
8a44aecb Ajout propertie intersect_id_com pour utiliser un filtre id_com en plus de l'intersection
68214db2 Update crontab.txt - Changement nom balise
a8607fc5 Merge branch 'bug/4-problemes-lors-qu-un-utilisateur-vmap_admin-et-non-vitis_admin-va-dans-le-mode-configuration' into 'master'
a3662752 Non affichage du mode configuration pour les utilisateurs vmap_admin
6bdd6f9d retrait console.log et code commenté
ed20c329 Merge remote-tracking branch 'origin/next_version' into evolution/2-mode-comparaison-2
10e6f9c3 Ajout de la fonctionnalitée d'impression sur la carte de comparaison
32fd687b Généralisation de la classe Printbox
ceac048d Merge branch 'evolution/7-calculs-de-polygones-jointifs' into 'next_version'
771a5655 Merge branch 'Sebastien-master-patch-58096' into 'master'
eb1594e9 Synchronisation
7d3a9869 Prettify code
0e53ade0 Nommage & affichage
500f524a Instanciation du composant Map pour la comparaison et synchro avec le composant classique
aee44514 Ajout calcul de polygones jointifs en mode update
3a3c2362 correction syntaxe
8fcd4c0b Limite le calcul des polygones jointifs aux types polygon, multipolygon, geometry, geometrycollection
7f4401b5 Ajout des fonctions de calcul de polygones jointifs
815cedc1 Add diff_geometry request
40fce0aa Retouche pour séparer la vue principale en deux
0974ddb2 Retouche du sélécteur de carte pour la carte de comparaison
af13d1c1 Ajout de l'outils dans Basictools
0eb3260c Avoid intersections interface
14af3a5c Edit snapping modal title
594f0c34 Add right-click to termine drawing
f2ffb070 Add right-click to termine drawing
05c763bf Add right-click to termine drawing
a05e0fd3 Add right-click to termine drawing
914a1b6a pull subtree
c88aa58d Merge remote-tracking branch 'origin/next_version' into evolution/2-mode-comparaison-2
4cbf5a6f Merge branch 'master'
940a5919 Merge branch 'cherry-pick-4398b26d' into 'next_version'
622dea61 Merge branch 'bug/4-formreader-champs-date-non-pris-en-compte-si-on-met-la-date-du-jour-en-insertion' into 'master'
4398b26d Merge branch 'bug/4-formreader-champs-date-non-pris-en-compte-si-on-met-la-date-du-jour-en-insertion' into 'master'
d17933b9 Edit datetime picker event
b3b6ec06 Merge branch '1-js-sous-formulaire' into 'master'
41a15530 Load BO Javascript on subforms
4f3da349 Merge branch 'master' into 'next_version'
e3923b17 Merge branch 'feature/impressions_144dpi' into 'master'
38bafafa Increase the WMS symbols size to match resolution
431529f6 Merge branch 'master' into 'next_version'
35163699 Merge branch 'hotfix/swagger_doc' into 'master'
275422b6 Make swagger work for dev installs
064924ec Mise à jour du fichier de version pour fonctionnait avec la version 11.0 de PostgreSQL
ee4da38b Add gitignore
f53e707d Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/sources/vitis
6c984bed Add client/vas dependencies
1c340f7e pull subtree
895d7e3b pull subtree
12a22d70 pull subtree
7b55e678 Utilisation de dirname($_SERVER['SCRIPT_FILENAME']) au dlieu de __DIR__
24ea0f3d pull subtree
f4326e8a Squashed 'src/module_vm4ms/' changes from 4d95a3da..af1a2e36
68cd713 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
af1a2e3 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
258a417 Modify symlinks strategy
6acd8ed Modify symlinks strategy
1b6864e add subtree
8bb3577 add subtree
4d95a3d add subtree
df88c95 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa9
cbd47c2 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa9
a77b5d1 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa9
32487f9 add subtree
cc0df5e add subtree
d661316 add subtree
16f9769 Merge branch 'master' into next_version
b442386 Merge branch 'master' into next_version
24e0fb6 Merge branch 'master' into next_version
ad32c46 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/sources/module_anc
8158b9a Resolve require problems
373ef42 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
e132804 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
4321adc Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
7a1818a add subtree
6c1b3e3 Reset sources
a195a4d Init from SVN
4ad29c4 add subtree
1ac46cd Squashed 'src/closure/' content from commit 622066d
635a2f9 add subtree
7593c38 Squashed 'src/vitis/' content from commit 01d199c
b487cd6 Update from SVN
266e19a Initial commit
3adab3a gitignore
4f506db add gitignore
e678ee1 add gitignore
b55c5e8 add gitignore
01d199c Update from SVN
7780fca Update from SVN
8ac7a8b Update from SVN
df3f8eb Update from SVN
21f8928 gitignore
1d1dcfc gitignore
caaa168 gitignore
5674ba2 fixed untracked files
bc1486d fixed untracked files
80e8527 fixed untracked files
be58244 fixed untracked files
68af99b add subtree
28140b9 add subtree
0b81257 add subtree
ce1c22a add subtree
355b5f8 Update from SVN
ddd89b9 Update from SVN
4e05585 Update from SVN
1a7d90a Update from SVN
862099b Update from SVN
1f0d403 Update from SVN
519580a Update from SVN
7347d06 Update from SVN
015a4e7 Update from SVN
2feba72 Update from SVN
00cb90d Update from SVN
ab8db90 Update dependency.xml
3c167ff Ajout de la dépendance au schema cadastre
9b7aed8 Update dependency.xml
d374201 Update dependency.xml
80ef848 Update dependency.xml
8c49823 Divise les dependances client et vas pour apache
a7b754e Update _install/dependency.xml
0033955 Update dependency.xml
b03d7e5 Update dependency.xml
189e0e6 Update dependency.xml
3bf002c Update dependency.xml
2c489f9 Update dependency.xml
b05764f Update dependency.xml
54d83af Update dependency.xml
7743bd8 Update dependency.xml
ecf80b3 Update dependency.xml
700adff Change dependencies model
598189b Change dependencies model
87b86b4 Change dependencies model
ce4f3cc Change dependencies model
832eb3b Change dependencies model
12a17e1 Change dependencies model
a18be2f Chamge dependencies model
449fe8f Modification du titre
e3b4bf8 Update README.md

git-subtree-dir: src/module_vmap
git-subtree-split: 80ac33f902ac5bc6b9254f1411d4265969ac3c52