bc664f7f Revert "pull subtree"
b442386a Merge branch 'master' into next_version
8158b9a2 Resolve require problems
e132804b Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
e678ee10 add gitignore
8ac7a8be Update from SVN
1d1dcfc0 gitignore
80e8527e fixed untracked files
68af99b0 add subtree
862099bb Update from SVN
1f0d4038 Update from SVN
3bf002c4 Update dependency.xml
ecf80b3c Update dependency.xml
ce4f3cc5 Change dependencies model
832eb3b8 Change dependencies model
REVERT: 66dbfede Merge branch 'master' into next_version
REVERT: a36394b9 Resolve require problems
REVERT: 0b1d66c6 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: ee26cf16 add gitignore
REVERT: 0d313243 Update from SVN
REVERT: acda8124 fixed untracked files
REVERT: 21a2e37f add subtree
REVERT: a4098959 add subtree
REVERT: 16d095e8 Squashed 'src/module_cadastreV2/' content from commit 1f0d4038
REVERT: d1d8c8eb Update from SVN
REVERT: da0e1887 Update dependency.xml
REVERT: e64ea421 Change dependencies model
REVERT: 76ae4547 Change dependencies model

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

Squashed 'src/module_vmap/' changes from fb263937..2b3157a0

2b3157a0 Merge branch 'cherry-pick-fb263937' into 'next_version'
3c58909c Merge branch 'bug/1-probleme-d-affichage-getfeatureinfo-sur-mobile' into 'master'
97cbc155 Merge branch 'master' into 'next_version'
REVERT: fb263937 Merge branch 'bug/1-probleme-d-affichage-getfeatureinfo-sur-mobile' into 'master'
REVERT: fa4aeff7 Redefine css for mobile usage
REVERT: 151aa0d1 Merge branch 'hotfix/cache_liste_sous_objet_metier'
REVERT: 9e8f5beb Merge branch 'hotfix/wms_avec_mp'

git-subtree-dir: src/module_vmap
git-subtree-split: 2b3157a0

pull subtree

pull subtree

Squashed 'src/module_vm4ms/' changes from af1a2e36..16f9769a

REVERT: af1a2e36 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
REVERT: 6acd8ede Modify symlinks strategy
REVERT: 4d95a3da add subtree
REVERT: a77b5d16 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa
REVERT: cc0df5ed add subtree
REVERT: 5f3241ae add subtree
REVERT: a0825d63 Squashed 'src/module_vmap/' content from commit ce9e639a
REVERT: 3f3d51c3 add subtree
REVERT: 41d5aec2 Squashed 'src/closure/' content from commit 622066db
REVERT: 91cd365c add subtree
REVERT: 7c3aef17 Squashed 'src/vitis/' content from commit 355b5f8b
REVERT: e8597475 Reset sources
REVERT: 8fe041e4 Merge branch 'master' into next_version
REVERT: 0bb9b2fa pull subtree
REVERT: 14758714 Squashed 'src/module_cadastreV2/' changes from e678ee10..8158b9a2
REVERT: a9b2699c pull subtree
REVERT: c499cef3 Squashed 'src/module_anc/' changes from b55c5e85..4321adc4
REVERT: d82d485e pull subtree
REVERT: 1ad8c842 Squashed 'src/module_vm4ms/' changes from 4f506db7..373ef426
REVERT: 6702c1fb pull subtree
REVERT: 94998ed6 Squashed 'src/module_vmap/' changes from cf75b106..e7dabee0
REVERT: 3a2b6fe9 pull subtree
REVERT: 97c993d5 Squashed 'src/vitis/' changes from 01d199ce..7a1818a4
REVERT: 213795da Resolve require problems
REVERT: 0c3ac326 Change dependency.xml
REVERT: c23b6587 Rights on write folders
REVERT: 4ac589ad Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: bc0e0830 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: b51e622f Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 3bd1ab17 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 53d54531 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 2d9fd6a5 Get rights to vas/server
REVERT: 0602efdb Compilation grunt
REVERT: 75c89c8b Try on push subtrees
REVERT: 246ebd0f Add pull.sh
REVERT: 2e026c10 Add pull.sh
REVERT: 37d37d03 Add grunt to the install
REVERT: 5b9cffc3 Update readme
REVERT: 3f86c344 Ignore properties files
REVERT: 02a3be3e gitignore
REVERT: 578f9827 Ingore properties files
REVERT: d1327b32 add subtree
REVERT: 59431f9c Squashed 'src/module_cadastre/' content from commit ee26cf16
REVERT: 950e5a10 Squashed 'src/module_cadastreV2/' content from commit e678ee10
REVERT: c2e686cb add subtree
REVERT: 92d769cc Squashed 'src/module_anc/' content from commit b55c5e85
REVERT: 63a0562b add subtree
REVERT: 829e4cf3 Squashed 'src/module_vm4ms/' content from commit 4f506db7
REVERT: 3630a462 add subtree
REVERT: 8792eb7c Squashed 'src/module_vmap/' content from commit cf75b106
REVERT: 4fe41d6b add subtree
REVERT: 974b9dd8 add subtree
REVERT: 92032b6a Squashed 'src/closure/' content from commit 622066db
REVERT: 646709a4 Squashed 'src/vitis/' content from commit 01d199ce
REVERT: 416c2c24 add subtree
REVERT: 06cc1a2d ignore properties files
REVERT: 192389a6 Get files from SVN
REVERT: 86c2affb Initial commit

git-subtree-dir: src/module_vm4ms
git-subtree-split: 16f9769a

Squashed 'src/module_anc/' changes from 68cd7130..24e0fb69

REVERT: 68cd7130 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
REVERT: 258a4172 Modify symlinks strategy
REVERT: 8bb35778 add subtree
REVERT: cbd47c25 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa
REVERT: 32487f97 add subtree
REVERT: 1af7f5c4 add subtree
REVERT: 2e8e909b Squashed 'src/module_vm4ms/' content from commit 16f9769a
REVERT: 5f3241ae add subtree
REVERT: a0825d63 Squashed 'src/module_vmap/' content from commit ce9e639a
REVERT: 3f3d51c3 add subtree
REVERT: 41d5aec2 Squashed 'src/closure/' content from commit 622066db
REVERT: 91cd365c add subtree
REVERT: 7c3aef17 Squashed 'src/vitis/' content from commit 355b5f8b
REVERT: e8597475 Reset sources
REVERT: 8fe041e4 Merge branch 'master' into next_version
REVERT: 0bb9b2fa pull subtree
REVERT: 14758714 Squashed 'src/module_cadastreV2/' changes from e678ee10..8158b9a2
REVERT: a9b2699c pull subtree
REVERT: c499cef3 Squashed 'src/module_anc/' changes from b55c5e85..4321adc4
REVERT: d82d485e pull subtree
REVERT: 1ad8c842 Squashed 'src/module_vm4ms/' changes from 4f506db7..373ef426
REVERT: 6702c1fb pull subtree
REVERT: 94998ed6 Squashed 'src/module_vmap/' changes from cf75b106..e7dabee0
REVERT: 3a2b6fe9 pull subtree
REVERT: 97c993d5 Squashed 'src/vitis/' changes from 01d199ce..7a1818a4
REVERT: 213795da Resolve require problems
REVERT: 0c3ac326 Change dependency.xml
REVERT: c23b6587 Rights on write folders
REVERT: 4ac589ad Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: bc0e0830 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: b51e622f Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 3bd1ab17 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 53d54531 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 2d9fd6a5 Get rights to vas/server
REVERT: 0602efdb Compilation grunt
REVERT: 75c89c8b Try on push subtrees
REVERT: 246ebd0f Add pull.sh
REVERT: 2e026c10 Add pull.sh
REVERT: 37d37d03 Add grunt to the install
REVERT: 5b9cffc3 Update readme
REVERT: 3f86c344 Ignore properties files
REVERT: 02a3be3e gitignore
REVERT: 578f9827 Ingore properties files
REVERT: d1327b32 add subtree
REVERT: 59431f9c Squashed 'src/module_cadastre/' content from commit ee26cf16
REVERT: 950e5a10 Squashed 'src/module_cadastreV2/' content from commit e678ee10
REVERT: c2e686cb add subtree
REVERT: 92d769cc Squashed 'src/module_anc/' content from commit b55c5e85
REVERT: 63a0562b add subtree
REVERT: 829e4cf3 Squashed 'src/module_vm4ms/' content from commit 4f506db7
REVERT: 3630a462 add subtree
REVERT: 8792eb7c Squashed 'src/module_vmap/' content from commit cf75b106
REVERT: 4fe41d6b add subtree
REVERT: 974b9dd8 add subtree
REVERT: 92032b6a Squashed 'src/closure/' content from commit 622066db
REVERT: 646709a4 Squashed 'src/vitis/' content from commit 01d199ce
REVERT: 416c2c24 add subtree
REVERT: 06cc1a2d ignore properties files
REVERT: 192389a6 Get files from SVN
REVERT: 86c2affb Initial commit

git-subtree-dir: src/module_anc
git-subtree-split: 24e0fb69

pull subtree

pull subtree

Squashed 'src/module_cadastreV2/' changes from 895d7e3b..b442386a

b442386a Merge branch 'master' into next_version
862099bb Update from SVN
REVERT: 895d7e3b pull subtree
REVERT: 47cd4913 Squashed 'src/module_vm4ms/' changes from 4d95a3da..af1a2e36
REVERT: c0b73f09 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da
REVERT: 906a7169 Modify client symlinks
REVERT: 1dccb17e Modify vas symlinks
REVERT: 07db5ec5 Update Readme
REVERT: 0bb9b2fa pull subtree
REVERT: 14758714 Squashed 'src/module_cadastreV2/' changes from e678ee10..8158b9a2
REVERT: a9b2699c pull subtree
REVERT: c499cef3 Squashed 'src/module_anc/' changes from b55c5e85..4321adc4
REVERT: d82d485e pull subtree
REVERT: 1ad8c842 Squashed 'src/module_vm4ms/' changes from 4f506db7..373ef426
REVERT: 6702c1fb pull subtree
REVERT: 94998ed6 Squashed 'src/module_vmap/' changes from cf75b106..e7dabee0
REVERT: 3a2b6fe9 pull subtree
REVERT: 97c993d5 Squashed 'src/vitis/' changes from 01d199ce..7a1818a4
REVERT: 213795da Resolve require problems
REVERT: c23b6587 Rights on write folders
REVERT: 4ac589ad Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: bc0e0830 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: b51e622f Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 3bd1ab17 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 53d54531 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 2d9fd6a5 Get rights to vas/server
REVERT: 0602efdb Compilation grunt
REVERT: 75c89c8b Try on push subtrees
REVERT: 246ebd0f Add pull.sh
REVERT: 2e026c10 Add pull.sh
REVERT: 37d37d03 Add grunt to the install
REVERT: 5b9cffc3 Update readme
REVERT: 3f86c344 Ignore properties files
REVERT: 02a3be3e gitignore
REVERT: 578f9827 Ingore properties files
REVERT: d1327b32 add subtree
REVERT: 59431f9c Squashed 'src/module_cadastre/' content from commit ee26cf16
REVERT: 950e5a10 Squashed 'src/module_cadastreV2/' content from commit e678ee10
REVERT: c2e686cb add subtree
REVERT: 92d769cc Squashed 'src/module_anc/' content from commit b55c5e85
REVERT: 63a0562b add subtree
REVERT: 829e4cf3 Squashed 'src/module_vm4ms/' content from commit 4f506db7
REVERT: 3630a462 add subtree
REVERT: 8792eb7c Squashed 'src/module_vmap/' content from commit cf75b106
REVERT: 4fe41d6b add subtree
REVERT: 974b9dd8 add subtree
REVERT: 92032b6a Squashed 'src/closure/' content from commit 622066db
REVERT: 646709a4 Squashed 'src/vitis/' content from commit 01d199ce
REVERT: 416c2c24 add subtree
REVERT: 06cc1a2d ignore properties files
REVERT: 192389a6 Get files from SVN
REVERT: 86c2affb Initial commit

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

Squashed 'src/module_cadastre/' changes from 1c340f7e..66dbfede

66dbfede Merge branch 'master' into next_version
REVERT: 1c340f7e pull subtree
REVERT: 47cd4913 Squashed 'src/module_vm4ms/' changes from 4d95a3da..af1a2e36
REVERT: c0b73f09 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da
REVERT: 906a7169 Modify client symlinks
REVERT: 1dccb17e Modify vas symlinks
REVERT: 07db5ec5 Update Readme
REVERT: 0bb9b2fa pull subtree
REVERT: 14758714 Squashed 'src/module_cadastreV2/' changes from e678ee10..8158b9a2
REVERT: a9b2699c pull subtree
REVERT: c499cef3 Squashed 'src/module_anc/' changes from b55c5e85..4321adc4
REVERT: d82d485e pull subtree
REVERT: 1ad8c842 Squashed 'src/module_vm4ms/' changes from 4f506db7..373ef426
REVERT: 6702c1fb pull subtree
REVERT: 94998ed6 Squashed 'src/module_vmap/' changes from cf75b106..e7dabee0
REVERT: 3a2b6fe9 pull subtree
REVERT: 97c993d5 Squashed 'src/vitis/' changes from 01d199ce..7a1818a4
REVERT: 213795da Resolve require problems
REVERT: c23b6587 Rights on write folders
REVERT: 4ac589ad Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: bc0e0830 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: b51e622f Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 3bd1ab17 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 53d54531 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
REVERT: 2d9fd6a5 Get rights to vas/server
REVERT: 0602efdb Compilation grunt
REVERT: 75c89c8b Try on push subtrees
REVERT: 246ebd0f Add pull.sh
REVERT: 2e026c10 Add pull.sh
REVERT: 37d37d03 Add grunt to the install
REVERT: 5b9cffc3 Update readme
REVERT: 3f86c344 Ignore properties files
REVERT: 02a3be3e gitignore
REVERT: 578f9827 Ingore properties files
REVERT: d1327b32 add subtree
REVERT: 59431f9c Squashed 'src/module_cadastre/' content from commit ee26cf16
REVERT: 950e5a10 Squashed 'src/module_cadastreV2/' content from commit e678ee10
REVERT: c2e686cb add subtree
REVERT: 92d769cc Squashed 'src/module_anc/' content from commit b55c5e85
REVERT: 63a0562b add subtree
REVERT: 829e4cf3 Squashed 'src/module_vm4ms/' content from commit 4f506db7
REVERT: 3630a462 add subtree
REVERT: 8792eb7c Squashed 'src/module_vmap/' content from commit cf75b106
REVERT: 4fe41d6b add subtree
REVERT: 974b9dd8 add subtree
REVERT: 92032b6a Squashed 'src/closure/' content from commit 622066db
REVERT: 646709a4 Squashed 'src/vitis/' content from commit 01d199ce
REVERT: 416c2c24 add subtree
REVERT: 06cc1a2d ignore properties files
REVERT: 192389a6 Get files from SVN
REVERT: 86c2affb Initial commit

git-subtree-dir: src/module_cadastre
git-subtree-split: 66dbfede

pull subtree

Merge branch…

See merge request Development/vitis_apps/application/vmap!5

Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'

Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles

See merge request Development/vitis_apps/application/vmap!4

(cherry picked from commit 08ef8c91)

173760d7 Merge branch 'master' into…
7fd95b0d Replace bootstrapTable getAllSelections by getSelections

Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'

Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles

See merge request Development/vitis_apps/application/vmap!4

Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master'

Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles

See merge request Development/vitis_apps/application/vmap!3

Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles

Merge branch 'master' into bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles

fb263937 Merge branch 'bug/1-probleme-d-affichage-getfeatureinfo-sur-mobile' into 'master'
fa4aeff7 Redefine css for mobile usage
151aa0d1 Merge branch 'hotfix/cache_liste_sous_objet_metier'
9e8f5beb Merge branch 'hotfix/wms_avec_mp'
a81125aa Merge branch 'feature/impressions_144dpi' into 'master'
a8af3474 Active the resolution parameter
6f2cd262 Merge branch 'next_version' into feature/impressions_144dpi
bec87f0c Merge branch 'master' into 'next_version'
c1211553 Merge branch 'cherry-pick-d395d1d4' into 'next_version'
f11099e6 Problème lors de l'enregistrement de services avec mots de passe
d395d1d4 Problème lors de l'enregistrement de services avec mots de passe
885c6310 Merge branch 'master' into next_version

git-subtree-dir: src/module_vmap
git-subtree-split: fb263937

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
e3923b17 Merge branch 'feature/impressions_144dpi' into 'master'
38bafafa Increase the WMS symbols size to match resolution
35163699 Merge branch 'hotfix/swagger_doc' into 'master'
275422b6 Make swagger work for dev installs
ee4da38b Add gitignore
f53e707d Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/sources/vitis
6c984bed Add client/vas dependencies

git-subtree-dir: src/vitis
git-subtree-split: 4398b26d

Dev master

See merge request Development/vitis_apps/application/vmap!1

895d7e3b pull subtree
47cd4913 Squashed 'src/module_vm4ms/' changes from 4d95a3da..af1a2e36
c0b73f09 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da
906a7169 Modify client symlinks
1dccb17e Modify vas symlinks
07db5ec5 Update Readme
0bb9b2fa pull subtree
14758714 Squashed 'src/module_cadastreV2/' changes from e678ee10..8158b9a2
a9b2699c pull subtree
c499cef3 Squashed 'src/module_anc/' changes from b55c5e85..4321adc4
d82d485e pull subtree
1ad8c842 Squashed 'src/module_vm4ms/' changes from 4f506db7..373ef426
6702c1fb pull subtree
94998ed6 Squashed 'src/module_vmap/' changes from cf75b106..e7dabee0
3a2b6fe9 pull subtree
97c993d5 Squashed 'src/vitis/' changes from 01d199ce..7a1818a4
213795da Resolve require problems
c23b6587 Rights on write folders
4ac589ad Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
bc0e0830 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
b51e622f Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
3bd1ab17 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
53d54531 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
2d9fd6a5 Get rights to vas/server
0602efdb Compilation grunt
75c89c8b Try on push subtrees
246ebd0f Add pull.sh
2e026c10 Add pull.sh
37d37d03 Add grunt to the install
5b9cffc3 Update readme
3f86c344 Ignore properties files
02a3be3e gitignore
578f9827 Ingore properties files
d1327b32 add subtree
59431f9c Squashed 'src/module_cadastre/' content from commit ee26cf16
950e5a10 Squashed 'src/module_cadastreV2/' content from commit e678ee10
c2e686cb add subtree
92d769cc Squashed 'src/module_anc/' content from commit b55c5e85
63a0562b add subtree
829e4cf3 Squashed 'src/module_vm4ms/' content from commit 4f506db7
3630a462 add subtree
8792eb7c Squashed 'src/module_vmap/' content from commit cf75b106
4fe41d6b add subtree
974b9dd8 add subtree
92032b6a Squashed 'src/closure/' content from commit 622066db
646709a4 Squashed 'src/vitis/' content from commit 01d199ce
416c2c24 add subtree
06cc1a2d ignore properties files
192389a6 Get files from SVN
86c2affb Initial commit

git-subtree-dir: src/module_cadastreV2
git-subtree-split: 895d7e3b

3e46450b pull subtree
47cd4913 Squashed 'src/module_vm4ms/' changes from 4d95a3da..af1a2e36
c0b73f09 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da
906a7169 Modify client symlinks
1dccb17e Modify vas symlinks
07db5ec5 Update Readme

git-subtree-dir: src/module_vmap
git-subtree-split: 3e46450b