image

83c6b678 Merge commit 'a93f105b'
1a0869b7 Merge commit '28ac2839'
409c6467 Merge commit 'a77c66ec'
749ee869 Merge commit '9ec6a912'
a93f105b Merge branch 'next_version'
28ac2839 Merge branch 'next_version'
a77c66ec Merge branch 'next_version'
95760f8e Merge branch 'next_version'
9ec6a912 Merge branch 'next_version'
2f9770d9 Merge branch 'master'
38a75ca2 Merge branch 'master'
92813729 Merge branch 'master'
0d5dda26 Merge branch 'master'
78a6c625 Merge branch 'master'
bf880279 Merge branch 'master' into 'app_vmap'
4188d1e6 Merge module_cadastreV2
17aa49c3 Merge module_cadastreV2
3112a2e8 Merge module_cadastreV2
4dabc71a Merge module_cadastreV2
f6ff85d0 Merge module_cadastreV2
778f28d7 Merge module_cadastreV2
050f8233 Merge commit '1c340f7e'
f7b63812 Merge commit '1c340f7e'
755fd34b Merge commit '1c340f7e'
64e09162 Merge commit '1c340f7e'
a2957b7c Merge commit '1c340f7e'
1044e682 Merge commit '68cd7130'
7100bf0b Merge commit '68cd7130'
19df2325 Merge commit '68cd7130'
a1d73582 Merge commit '68cd7130'
26e216cd Merge commit 'af1a2e36'
a86b0f35 Merge commit 'af1a2e36'
041b403e Merge commit 'af1a2e36'
749f5d19 Merge commit '348d59b7'
fb5f0210 Merge commit '348d59b7'
52b157e1 Merge commit '4398b26d'
101fad20 Merge branch 'master' into app_vmap
04012fb5 Remove gitignore
1c5454e1 Merge branch 'master' into app_vmap
80c027e2 Merge branch 'app_vmap'
9862a97c Remove gitignore
1e0dea62 Merge branch 'next_version' into 'master'
40e7d46e pull subtree
7e14e88c Ajout propertie intersect_id_com pour utiliser un filtre id_com en plus de l'intersection
68214db2 Update crontab.txt - Changement nom balise
771a5655 Merge branch 'Sebastien-master-patch-58096' into '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
68cd7130 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
af1a2e36 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
258a4172 Modify symlinks strategy
6acd8ede Modify symlinks strategy
8bb35778 add subtree
4d95a3da add subtree
cbd47c25 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa
a77b5d16 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa
32487f97 add subtree
cc0df5ed add subtree
16f9769a Merge branch 'master' into next_version
24e0fb69 Merge branch 'master' into next_version
ad32c46a Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/sources/module_anc
8158b9a2 Resolve require problems
373ef426 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
e132804b Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
4321adc4 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
7a1818a4 add subtree
6c1b3e3c Reset sources
a195a4d9 Init from SVN
4ad29c4b add subtree
1ac46cd9 Squashed 'src/closure/' content from commit 622066db
635a2f96 add subtree
7593c383 Squashed 'src/vitis/' content from commit 01d199ce
b487cd6f Update from SVN
266e19a6 Initial commit
3adab3af gitignore
4f506db7 add gitignore
e678ee10 add gitignore
b55c5e85 add gitignore
01d199ce Update from SVN
7780fca4 Update from SVN
8ac7a8be Update from SVN
df3f8eb9 Update from SVN
21f8928e gitignore
1d1dcfc0 gitignore
caaa1684 gitignore
5674ba26 fixed untracked files
bc1486d6 fixed untracked files
80e8527e fixed untracked files
be582445 fixed untracked files
68af99b0 add subtree
28140b96 add subtree
0b81257e add subtree
ce1c22a0 add subtree
355b5f8b Update from SVN
ddd89b96 Update from SVN
4e055857 Update from SVN
1a7d90a0 Update from SVN
1f0d4038 Update from SVN
519580a2 Update from SVN
7347d062 Update from SVN
015a4e77 Update from SVN
2feba722 Update from SVN
00cb90db Update from SVN
ab8db901 Update dependency.xml
3c167ff4 Ajout de la dépendance au schema cadastre
9b7aed87 Update dependency.xml
d374201c Update dependency.xml
80ef8488 Update dependency.xml
8c498237 Divise les dependances client et vas pour apache
a7b754eb Update _install/dependency.xml
00339553 Update dependency.xml
b03d7e50 Update dependency.xml
189e0e6d Update dependency.xml
3bf002c4 Update dependency.xml
2c489f99 Update dependency.xml
b05764f4 Update dependency.xml
54d83afe Update dependency.xml
7743bd81 Update dependency.xml
ecf80b3c Update dependency.xml
700adff2 Change dependencies model
598189b5 Change dependencies model
87b86b4f Change dependencies model
ce4f3cc5 Change dependencies model
832eb3b8 Change dependencies model
12a17e13 Change dependencies model
a18be2fb Chamge dependencies model
449fe8f3 Modification du titre
e3b4bf85 Update README.md
REVERT: 467dfde8 Merge branch 'next_version' into next_app_vmap
REVERT: dfc1306b Merge remote-tracking branch 'origin/next_version' into next_version
REVERT: 407a18be Merge branch 'master' into next_version
REVERT: 4be06293 Merge branch 'master' into 'next_version'
REVERT: 00ecdc5e Merge branch 'app_vmap' into 'master'
REVERT: 49b02a0a pull subtree
REVERT: 7755613b Squashed 'src/module_cadastre/' changes from 66dbfede..5883a499
REVERT: e2547f63 pull subtree
REVERT: ec89ac3d Squashed 'src/module_cadastreV2/' changes from 66dbfede..bc664f7f
REVERT: 2b3986a6 pull subtree
REVERT: 92412612 Squashed 'src/module_anc/' changes from 66dbfede..24e0fb69
REVERT: af78a82b pull subtree
REVERT: 90da1776 Squashed 'src/module_vm4ms/' changes from 66dbfede..16f9769a
REVERT: 13364170 pull subtree
REVERT: fcaa4375 update colonne version pour accepter les version de plus de 10 caractères
REVERT: 8aa63301 Merge branch 'master' into 'next_version'
REVERT: 0a99f83a Merge remote-tracking branch 'origin/next_version' into next_version
REVERT: 9b18e653 Interface générateur d'URL
REVERT: be845c0e Review Checkbox CSS
REVERT: 67e90d76 Review Checkbox CSS
REVERT: 313b106c Resolve "mode comparaison"
REVERT: c6698d67 Ajout de listes déroulantes au formulaire objet métier
REVERT: e996ab25 Resolve "[Studio] suppressions des différents formulaires"
REVERT: 710bebc1 Synchronisation
REVERT: bffda111 Prettify code
REVERT: 95289acb Nommage & affichage
REVERT: f0c4c8a6 Ajout calcul de polygones jointifs en mode update
REVERT: cbd57671 correction syntaxe
REVERT: c3aac3e5 Limite le calcul des polygones jointifs aux types polygon, multipolygon, geometry, geometrycollection
REVERT: c815ad8e Ajout des fonctions de calcul de polygones jointifs
REVERT: 4063537f Add diff_geometry request
REVERT: c3fbd520 Avoid intersections interface
REVERT: 1a519367 Edit snapping modal title
REVERT: 5762b29a Add right-click to termine drawing
REVERT: b2615442 pull subtree
REVERT: 7facefc7 Merge branch 'master' into next_version
REVERT: 7fbff5c8 Merge remote-tracking branch 'origin/master'
REVERT: 65d69a47 Remove auto pull/push subtrees
REVERT: 02633d0c Remove auto pull/push subtrees
REVERT: 5a8cfb32 Pull/push_subtrees.sh
REVERT: 2fb6e11b use next_app_vmap branches
REVERT: c64422b2 Merge branch 'master'
REVERT: 3097ea44 Merge branch 'cherry-pick-08ef8c91' into 'next_version'
REVERT: 1a3e2509 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'
REVERT: 08ef8c91 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'
REVERT: 731fb56e Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'
REVERT: ef0c46d2 Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles
REVERT: 7fd95b0d Replace bootstrapTable getAllSelections by getSelections
REVERT: 173760d7 Merge branch 'master' into bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles
REVERT: 4613f700 link subtrees on branch app_vmap
REVERT: 6a47c43a Rename pull.sh into pull_subtrees.sh
REVERT: 591f4ecd pull subtree
REVERT: 77845c68 Squashed 'src/module_vmap/' changes from 3e46450b..fb263937
REVERT: 475f6218 pull subtree
REVERT: 4b44e6b9 Squashed 'src/vitis/' changes from 12a22d70..4398b26d
REVERT: 2b3157a0 Merge branch 'cherry-pick-fb263937' into 'next_version'
REVERT: 3c58909c Merge branch 'bug/1-probleme-d-affichage-getfeatureinfo-sur-mobile' into 'master'
REVERT: 97cbc155 Merge branch 'master' into 'next_version'
REVERT: 37643273 Merge remote-tracking branch 'origin/master'
REVERT: e058ef8f Resolve grunt links
REVERT: 4f4bf75c Correct grunt problems
REVERT: dca067bb Merge branch 'dev_master' into 'master'
REVERT: 837046c7 Dev master
REVERT: 82a645db Update properties.json
REVERT: 5d57e51c Update conf/properties.json
REVERT: ee905c13 Resolve web services update problem
REVERT: 54bd1775 Minify JS after updating files
REVERT: c35cc38d Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
REVERT: 6a7cf62c Minify JS after updating files
REVERT: 7b0e04e0 Minify JS after updating files
REVERT: 479d7853 Add install/update files for windows
REVERT: 78a320a0 pull subtree
REVERT: e2a617e7 Squashed 'src/module_cadastreV2/' changes from 8158b9a2..895d7e3b
REVERT: 926bff66 Utilisation des utils sans avoir besoin de linxml2
REVERT: 3df5e36a Squashed 'src/module_vmap/' changes from 98047575..3e46450b
REVERT: 0852ad92 pull subtree
REVERT: 9f131870 Utilisation des utils sans avoir besoin de libxml2
REVERT: 1a61e637 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
REVERT: 03a5dfe3 Update pull/push_subtrees.sh to use the current version of subtrees
REVERT: 51f83a0b Add windows install files
REVERT: 457792c6 pull subtree
REVERT: 0bf9c2cc Squashed 'src/module_cadastre/' changes from a36394b9..1c340f7e
REVERT: b5c65a64 pull subtree
REVERT: 5e944c4a Squashed 'src/vitis/' changes from 7b55e678..12a22d70
REVERT: 85f07d4a Update init_symlinks
REVERT: 896a06b7 pull subtree
REVERT: e9dfdcbc Squashed 'src/module_anc/' changes from 8bb35778..68cd7130
REVERT: 393551e3 pull subtree
REVERT: 5cd5ab05 Squashed 'src/module_vmap/' changes from e7dabee0..98047575
REVERT: 19925d4f pull subtree
REVERT: df416439 Squashed 'src/vitis/' changes from 7a1818a4..7b55e678
REVERT: 59e770c1 pull subtree
REVERT: 77582f18 Update gitignore
REVERT: aa4b71d8 Remvove web_service from parent
REVERT: 99dab641 Update gitignore
REVERT: 7e0d02d6 Update Readme
REVERT: 74b02e3f Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
REVERT: 05269f92 Modify symlinks strategy
REVERT: 577d7654 Modify symlinks strategy
REVERT: 3c521a9e Modify symlinks strategy
REVERT: cf8ebcdc Update symlinks strategy
REVERT: b93b890c Modify symlinks strategy
REVERT: 139ee7e4 Modify symlinks strategy
REVERT: 3427147f Squashed 'src/module_cadastre/' changes from ee26cf16..a36394b9
REVERT: 54df607d pull subtree
REVERT: 3ce44dcc Squashed 'src/module_anc/' changes from 4321adc4..8bb35778
REVERT: 1056cb48 pull subtree
REVERT: 278331d3 pull subtree
REVERT: a0cda927 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da
REVERT: 9d999ac0 add subtree
REVERT: 2b0c911e Squashed 'src/module_cadastre/' content from commit 0bb9b2fa
REVERT: e2a23caf add subtree
REVERT: e0e437ec Squashed 'src/module_cadastreV2/' content from commit b442386a
REVERT: 4fa86e72 add subtree
REVERT: 6b7d2e6a Squashed 'src/module_anc/' content from commit 24e0fb69
REVERT: 66dbfede Merge branch 'master' into next_version

git-subtree-dir: src/module_vmap
git-subtree-split: 83c6b678