Skip to content
Snippets Groups Projects
Commit 914a1b6a authored by Armand Bahi's avatar Armand Bahi
Browse files

pull subtree

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
parent 4cbf5a6f
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment