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

Squashed 'src/module_vm4ms/' changes from c34ae8c2..369e8d0d

369e8d0da Merge branch 'next_version' into pre-2018.04.00
eb23863f6 Merge branch 'next_app_vmap' into next_version
6a0b53eff pull subtree
b93971d52 pull subtree
f42f31011 Merge branch 'pre_prod' into evolution/2-mode-comparaison-2
dfd4bcbc5 pull subtree
181cdbaee pull subtree
4d555e374 pull subtree
401609c1a pull subtree
e999a1814 update colonne version pour accepter les version de plus de 10 caractères
115665fa7 Remove parasit files
f2ffb070b Add right-click to termine drawing
af1a2e367 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
6acd8ede2 Modify symlinks strategy
4d95a3dac add subtree
a77b5d165 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa9
cc0df5ede add subtree
16f9769a7 Merge branch 'master' into next_version
66dbfede1 Merge branch 'master' into next_version
a36394b91 Resolve require problems
373ef4267 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
0b1d66c61 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
4f506db7d add gitignore
ee26cf162 add gitignore
7780fca42 Update from SVN
0d3132438 Update from SVN
21f8928e2 gitignore
acda8124e fixed untracked files
bc1486d6b fixed untracked files
21a2e37fc add subtree
a40989590 add subtree
16d095e85 Squashed 'src/module_cadastreV2/' content from commit 1f0d403
7821e7eb4 add subtree
902ae99f5 Squashed 'src/module_anc/' content from commit 7347d06
0b81257e6 add subtree
f20833ba7 add subtree
5d3011c2d Squashed 'src/module_vm4ms/' content from commit 1a7d90a
1023eed8d add subtree
0212e87a1 Squashed 'src/module_vmap/' content from commit 5cb51b4
0b7f92e1f add subtree
6ba792b7b Squashed 'src/closure/' content from commit 622066d
8918ebf80 add subtree
88554edc7 Squashed 'src/vitis/' content from commit ddd89b9
d9a06a324 reset
4e0558576 Update from SVN
1a7d90a05 Update from SVN
d1d8c8eb7 Update from SVN
59214f977 Update .gitignore
53a26943c Update utils/init_symlinks.sh
cdd6388c6 Utilisation d'une install existante
5c00d023e Permettre de relancer le script sans symlinks dupliqués
a7a046977 Permettre de relancer le script sans problèmes de duplication des symlinks
767c55e8f Update utils/init_symlinks.sh
122955dfc Lancer init_symlinks avant de pull les subtrees
92f4957e8 Update utils/init_symlinks.sh
6c3d32ea5 Integrate message
df3fda74e Automatically pull the subtrees
32c06af73 pull from module
d25cf488c Squashed 'src/module_cadastre/' changes from a7611084..da0e1887
f15eca237 pull from module
8b47e8e69 Squashed 'src/module_cadastreV2/' changes from 812b365a..3bf002c4
db8f5acf4 pull from module
93888f306 Squashed 'src/module_anc/' changes from 8f732f9f..ab8db901
7607f7894 pull from module
5fec7981e Squashed 'src/module_vm4ms/' changes from 1964e93a..9b7aed87
80672c1ca pull from module
79710cea0 Squashed 'src/module_vmap/' changes from 81346f03..4b3d61a4
404c71d80 pull from module
e0812b1ee Squashed 'src/vitis/' changes from fec164ba..8c498237
72ec9143f Update utils/pull_subtrees.sh
35a719c17 Update utils/pull_subtrees.sh
7fe1bd223 Update utils/pull_subtrees.sh
82e31e547 Update utils/pull_subtrees.sh
b398658c1 Update utils/pull_subtrees.sh
5f906507d Update utils/pull_subtrees.sh
d0adeedbf Vérification sudo
9897f9dae Utilisation de dependency.xml pour les dépendances
9b7aed870 Update dependency.xml
003395538 Update dependency.xml
b03d7e506 Update dependency.xml
189e0e6d3 Update dependency.xml
6151e6bfc Update dependency.xml
da0e18874 Update dependency.xml
2c489f996 Update dependency.xml
7743bd819 Update dependency.xml
598189b5b Change dependencies model
87b86b4f9 Change dependencies model
e64ea4211 Change dependencies model
76ae45474 Change dependencies model
d72234217 Modification titre
9ce399c2d Modification du titre
4c4eb4899 Add 'src/module_cadastre/' from commit 'a7611084f351207cc02d36ddd089dd74e64059e8'
7589aa712 Add 'src/module_cadastreV2/' from commit '812b365ac7f5854814f9b7abe089e96d522b1a37'
052186c30 Add 'src/module_anc/' from commit '8f732f9f4f9ba00a01faa6c38e465a49187e173f'
691caa917 Add 'src/module_vm4ms/' from commit '1964e93a80658175d7219d374f415915d437ebca'
7d07b86d6 Add 'src/module_vmap/' from commit '81346f032a6b96cecc25a44744ce0bf95d144230'
c66793436 Add 'src/closure/' from commit '622066dbf7c0adf29022d25dade0d2c6c872c5c9'
ce0a64c54 Add 'src/vitis/' from commit 'fec164babe252325a825dbc530ca1e6556f2f8c7'
672dc991c Reset sources
73ff28a79 Utilisation de dependency.xml pour le versionnement des dependances
9b030f28e Utilisation de dependency.xml pour la version des deps
71fe1986b Add 'src/module_cadastre/' from commit 'a7611084f351207cc02d36ddd089dd74e64059e8'
77cff122f Add 'src/module_cadastreV2/' from commit '812b365ac7f5854814f9b7abe089e96d522b1a37'
59eca12df Add 'src/module_anc/' from commit '8f732f9f4f9ba00a01faa6c38e465a49187e173f'
00c149c7b Add 'src/module_vm4ms/' from commit '1964e93a80658175d7219d374f415915d437ebca'
0fca2368b Add 'src/module_vmap/' from commit '81346f032a6b96cecc25a44744ce0bf95d144230'
59a21e52e Add 'src/closure/' from commit '622066dbf7c0adf29022d25dade0d2c6c872c5c9'
0513a6065 Add 'src/vitis/' from commit 'fec164babe252325a825dbc530ca1e6556f2f8c7'
440395b0d Reset sources
60dda2e5e Utilisation de dependency.xml pour la gestion des dependances
de649f183 Add 'src/closure/' from commit '622066dbf7c0adf29022d25dade0d2c6c872c5c9'
5222a00a2 Add 'src/vitis/' from commit 'fec164babe252325a825dbc530ca1e6556f2f8c7'
5db1f50eb Reset sources
e212d87d8 Utilisation de dependency.xml pour la gestion des dépendances
77799b0a6 Add 'src/closure/' from commit '622066dbf7c0adf29022d25dade0d2c6c872c5c9'
c79261bc6 Add 'src/vitis/' from commit 'fec164babe252325a825dbc530ca1e6556f2f8c7'
1cc750a8f Reset sources
d0276a43e Utilisation de dependency.xml pour la gestion des dependances
7d623d033 Add 'src/closure/' from commit '622066dbf7c0adf29022d25dade0d2c6c872c5c9'
2d74de73b Add 'src/vitis/' from commit 'fec164babe252325a825dbc530ca1e6556f2f8c7'
5449da825 Utilisation de dependency.xml pour la gestion des dependances
fb928b784 Reset sources
4bdd0b7d6 Utilisation de dependency.xml pour la gestion des subtrees
f7f3dadf3 Add closure conf
3bd7dc98b Add closure conf
7366a26b7 Add closure conf
93a0649f4 Add 'src/closure/' from commit '622066dbf7c0adf29022d25dade0d2c6c872c5c9'
c531c58c7 Add closure conf
622066dbf add files from SVN
c2a8d7d30 Ajout de README.md
81346f032 Update vMap title
93afdd18c Update vMap title
fec164bab Update Vitis title
dd365f5bc Update Vitis title
b4e746f6d Update readme.md
fd1a9a8f2 Automaticaly copy git hooks
15a03d30e Updat Readme.md
48744f3a8 Update Readme.md
9622b230d Update README.md
871ab4f71 Update Readme
a9c26d6a5 Update README.md
64fde26d4 Update readme.md
95e4dfeef Update README.md
be34a510b Update Readme.md
73aec2ac8 Update README.md
6e2a768a3 update Readme
533177d51 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
5343b6947 Update README.md
55144f68b Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
9a2ce1fc3 Update README.md
09375e73a Update README.md
020ce1d17 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
148bbb797 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
5624d8b86 Pull and push hooks
52bad93ee Update README.md
dbffe34cc Copy custop hooks on installing
5f740160f Update README.md
d55a48720 Pull and push hooks
c7d34b24f Update README.md
24e41af8d test update
0b32a44f7 Update README.md
6e72ab3b8 Update README.md
1469c6901 Update README.md
7ff8c64b0 Add install.sh
6d6bb7c43 Add install.sh
7738cbffa Add 'src/module_cadastreV2/' from commit '812b365ac7f5854814f9b7abe089e96d522b1a37'
39962b3f4 Add 'src/module_cadastre/' from commit 'a7611084f351207cc02d36ddd089dd74e64059e8'
9e079d31b Add 'src/module_anc/' from commit '8f732f9f4f9ba00a01faa6c38e465a49187e173f'
098b185c7 Add 'src/module_vm4ms/' from commit '1964e93a80658175d7219d374f415915d437ebca'
70e897581 Add 'src/module_vmap/' from commit '9808f2796734a0839254f2d78dd820e216dfa31c'
8ca582450 Add 'src/vitis/' from commit '2c2bec2bc91cd9cdbab40c5c7e068f9868a53f93'
a1d2171b7 remove dependencies
2ffe7163e Merge branch 'version_1' into 'master'
9808f2796 Edit titles
2c2bec2bc Edit titles
cbb00e544 Edit titles
ef1fa8e5c Remove creation on .gitignore from init_symlinks
38ba68096 Amélioration messages shell
3838b4c46 Suppression de la dep app_vmap
ff811df3f Edit Readme.md
41552069b Merge commit '9fd449ca9fe825a7819ae0137da7c155881283a9' into version_1
73ee04162 Merge commit 'e7013570c198c83b7a52a7c1f59c8aacf43bf041' into version_1
2fa7b3653 make pull_subtrees executable
dcdf54270 rename utils scripts
fc4b53bd1 Add script to pull and push subtrees
9fd449ca9 Rename vMap title
8ba521790 Rename vMap title
e7013570c Rename vitis title
df7de9ab9 Rename vitis title
41cbe0f4f reset gitignore
2239253db reset gitignore
18e7c8394 Add 'src/module_cadastreV2/' from commit '812b365ac7f5854814f9b7abe089e96d522b1a37'
98e78c0c7 Add 'src/module_cadastre/' from commit 'a7611084f351207cc02d36ddd089dd74e64059e8'
2d1e279b4 Add 'src/module_anc/' from commit '8f732f9f4f9ba00a01faa6c38e465a49187e173f'
c2bf54033 Add 'src/module_vm4ms/' from commit '1964e93a80658175d7219d374f415915d437ebca'
1baf900a8 Add 'src/module_vmap/' from commit 'b7d5d7bc0bec652799caeff229148b054efe23ab'
758621462 Add 'src/app_vmap/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
a68b68c9b Add 'src/vitis/' from commit 'bcaa41e5e4eb2a40c59aa0f99f10add1ff2f1d11'
5af452f8d Move shell scripts
13b9cebd3 Move shell scripts
0b4326c63 Reset deps
a062f9f0d Reset deps
1dab44ca2 Add symlinks to gitignore
07c6c2e4e gitignore
3fb87b3a3 add dependencies
3e811f916 add symlinks to gitignore
e848ea8c7 add symlinks to gitignore
bbd5526bf Creating init_vmap_symlinks.sh
817df15f6 Add 'deps/module_cadastreV2/' from commit '812b365ac7f5854814f9b7abe089e96d522b1a37'
34bcdf162 Add 'deps/module_cadastre/' from commit 'a7611084f351207cc02d36ddd089dd74e64059e8'
99b617d20 Add 'deps/module_anc/' from commit '8f732f9f4f9ba00a01faa6c38e465a49187e173f'
213455637 Add 'deps/module_vm4ms/' from commit '1964e93a80658175d7219d374f415915d437ebca'
a847d3275 Add 'deps/module_vmap/' from commit 'b7d5d7bc0bec652799caeff229148b054efe23ab'
c3ee4af8a Add 'deps/app_vmap/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
a90c77c1d Add 'deps/vitis/' from commit 'bcaa41e5e4eb2a40c59aa0f99f10add1ff2f1d11'
572ad9d01 tests
46710ed0e Creating init_vmap_subtrees.sh
aa840d197 Add 'repos/module_cadastreV2/' from commit '812b365ac7f5854814f9b7abe089e96d522b1a37'
c11c8793d Add 'repos/module_cadastre/' from commit 'a7611084f351207cc02d36ddd089dd74e64059e8'
1ac8b86e9 Add 'repos/module_anc/' from commit '8f732f9f4f9ba00a01faa6c38e465a49187e173f'
ae675e023 Add 'repos/module_vm4ms/' from commit '1964e93a80658175d7219d374f415915d437ebca'
b5ef4148b Add 'repos/module_vmap/' from commit 'b7d5d7bc0bec652799caeff229148b054efe23ab'
b333c144c Add 'repos/app_vmap/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
2363b164d Add 'repos/vitis/' from commit 'bcaa41e5e4eb2a40c59aa0f99f10add1ff2f1d11'
042aa0c10 Creating init_vitis
af6cee515 revert
bcaa41e5e reset from svn
9ad23084b reset from svn
f2b1d4d52 reset from svn
eff674c11 reset from svn
e14a7a334 Change index title
9501d84bd Change index title
e26aafea5 Merge commit 'fb2e2c6d0289369bec53b1b48d503b5e7bcbdc93'
1748b2a10 Merge commit 'fb2e2c6d0289369bec53b1b48d503b5e7bcbdc93'
874e6ef15 Add update script
78768a919 Add update script
b7d5d7bc0 Mise à jour titre
fb2e2c6d0 Mise à jour titre
cfd4fb05c Add init_vmap.sh
31631d746 Add 'vmap/vas/sql/cadastreV2/' from commit '33e450da5b4f99e3e5bfbc7f2e8ecb43232770a7'
7917c7657 Add 'vmap/vas/sql/cadastreV2/' from commit '33e450da5b4f99e3e5bfbc7f2e8ecb43232770a7'
04b8dd11f Add 'vmap/vas/rest/ws/cadastreV2/' from commit '4f833ebc047fe8c9fdb22170dc60192fe8150eb0'
fdd9b3a04 Add 'vmap/vas/rest/ws/cadastreV2/' from commit '4f833ebc047fe8c9fdb22170dc60192fe8150eb0'
13959dcde Add 'vmap/vas/rest/conf/cadastreV2/' from commit '5f14ce4c85b7a0d8a986d895abd2c28003cd7043'
4f3407c08 Add 'vmap/vas/rest/conf/cadastreV2/' from commit '5f14ce4c85b7a0d8a986d895abd2c28003cd7043'
38151d110 Add 'vmap/vas/rest/ws/cadastre/' from commit '40766c0744b334aa5e042a032f9d80bbe46c9678'
a371f3f44 Add 'vmap/vas/rest/ws/cadastre/' from commit '40766c0744b334aa5e042a032f9d80bbe46c9678'
dd2115356 Add 'vmap/vas/rest/conf/cadastre/' from commit '2a0bf9870bd886014cd5d3af61b57234c0b109f5'
29fba9ee2 Add 'vmap/vas/rest/conf/cadastre/' from commit '2a0bf9870bd886014cd5d3af61b57234c0b109f5'
a01b30f62 Add 'vmap/vas/sql/anc/' from commit '627a911579c951b47e95d6cd77fa81513b25517b'
92400fa34 Add 'vmap/vas/sql/anc/' from commit '627a911579c951b47e95d6cd77fa81513b25517b'
a8b94f195 Add 'vmap/vas/rest/ws/anc/' from commit 'd2fdf3ca2bf16131fe3d659780e97f2cc3a25fef'
a04bf01d2 Add 'vmap/vas/rest/ws/anc/' from commit 'd2fdf3ca2bf16131fe3d659780e97f2cc3a25fef'
cc3b97196 Add 'vmap/vas/rest/conf/anc/' from commit 'aae628ed0a5d6a0449153edc287a6d392bb18d0c'
ea7a3cecf Add 'vmap/vas/rest/conf/anc/' from commit 'aae628ed0a5d6a0449153edc287a6d392bb18d0c'
d2b63df68 Add 'vmap/client/modules/anc/' from commit '3a4bd963c057f42ccfbf98c94c8239ad4aaed327'
64a2cac7b Add 'vmap/client/modules/anc/' from commit '3a4bd963c057f42ccfbf98c94c8239ad4aaed327'
6332b020d Add 'vmap/vas/sql/vm4ms/' from commit '36eaf20a3d9e8be46130be3a3f88c469d2f6c1e1'
9807de576 Add 'vmap/vas/sql/vm4ms/' from commit '36eaf20a3d9e8be46130be3a3f88c469d2f6c1e1'
db92d37d2 Add 'vmap/vas/rest/ws/vm4ms/' from commit '3062a55117c3d6dc99b81137eb496363d0a72bbc'
7e510b3ba Add 'vmap/vas/rest/ws/vm4ms/' from commit '3062a55117c3d6dc99b81137eb496363d0a72bbc'
4571e5b45 Add 'vmap/vas/rest/conf/vm4ms/' from commit '888c2e558c7f460cc88c86b044a616cfd1812734'
0e1e3e3d9 Add 'vmap/vas/rest/conf/vm4ms/' from commit '888c2e558c7f460cc88c86b044a616cfd1812734'
221dc654b Add 'vmap/client/modules/vm4ms/' from commit '19e9a5a224016b8daf84ab7ec9945d9f59fa4af5'
6a47c5ac7 Add 'vmap/client/modules/vm4ms/' from commit '19e9a5a224016b8daf84ab7ec9945d9f59fa4af5'
c7287da38 Add 'vmap/vas/sql/vmap/' from commit '34d982caa3c2feb96dfb0535025dbceabcc303f2'
d7433f0ba Add 'vmap/vas/sql/vmap/' from commit '34d982caa3c2feb96dfb0535025dbceabcc303f2'
94bb30d97 Add 'vmap/vas/rest/ws/vmap/' from commit 'ed196105ef260cdb7df82bfa280d91e7c82deacc'
98532183a Add 'vmap/vas/rest/ws/vmap/' from commit 'ed196105ef260cdb7df82bfa280d91e7c82deacc'
408633d0e Add 'vmap/vas/rest/conf/vmap/' from commit '4045e8b4562965dcb2adbe13ce068942a808c699'
8deebc143 Add 'vmap/vas/rest/conf/vmap/' from commit '4045e8b4562965dcb2adbe13ce068942a808c699'
7ac7bba7d Add init_vmap.sh
fa7787d52 Add init_vmap.sh
f7e19860e Add init_vmap.sh
66353d812 Add init_vmap.sh
4a42a3c78 Add 'vmap/client/modules/vmap/' from commit 'adad985e12db139f57bd5971993b3ec7cf40b179'
3e103de30 Add 'vmap/client/modules/vmap/' from commit 'adad985e12db139f57bd5971993b3ec7cf40b179'
4b0067748 Add init_vmap.sh
cbff45a89 Add 'vmap/client/conf/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
49a551888 Add 'vmap/client/conf/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
2b35d0bf9 working dependencies
081519210 working dependencies
b288f847e Add 'vmap/conf/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
3448d57f6 Add 'vmap/conf/' from commit '130d2a058c69dd9a6aebb14ebe52ccc7e2cad5ef'
efac89889 Add 'vmap/' from commit '8cd2ae16781332203514d230e251fc1f60a7cd8f'
3f7a98977 rm subtree
80f4cada7 Add '.vim/bundle/tpope-vim-surround/' from commit '8cd2ae16781332203514d230e251fc1f60a7cd8f'
a7611084f add files from SVN
40766c074 add files from SVN
2a0bf9870 add files from SVN
b765e1677 Ajout de README.md
812b365ac add files from SVN
33e450da5 add files from SVN
4f833ebc0 add files from SVN
5f14ce4c8 add files from SVN
58e7f3bc3 Ajout de README.md
8cd2ae167 Update .gitignore
130d2a058 add conf files
47892bd38 Ajout de README.md
4cceb35fc Update README.md
56af1e173 Complete .gitignore
1964e93a8 add files from SVN
36eaf20a3 add files from SVN
3062a5511 add files from SVN
888c2e558 add files from SVN
19e9a5a22 add files from SVN
b5d0f5aac Ajout de README.md
748324d28 Add .gitignore
9426236c1 Changement date
adad985e1 Changement date
7c9b5db36 changement date
28bc62495 changement date
34d982caa Migrating files from SVN
ed196105e Migrating files from SVN
4045e8b45 Migrating files from SVN
2fed36ff6 Migrating files from SVN
4bfbbc52c Migrating files from SVN
8f732f9f4 Migrating files from SVN
627a91157 Migrating files from SVN
d2fdf3ca2 Migrating files from SVN
aae628ed0 Migrating files from SVN
3a4bd963c Migrating files from SVN
3f149b96e Migrating files from SVN
8479039c0 Ajout de README.md
89c79951f Ajout de README.md
387343e6e Ajout de README.md
2b3f8b191 Ajout de README.md
REVERT: c34ae8c2e Revert "pull subtree"
REVERT: ab49657b0 pull subtree
REVERT: 1a650d5b4 pull subtree
REVERT: ee4f9a230 pull subtree
REVERT: 2f788ee26 Squashed 'src/module_vm4ms/' changes from 0c12f3e1..f42f3101
REVERT: d640dd3b1 pull subtree
REVERT: 06b33c885 Squashed 'src/module_vmap/' changes from 0c12f3e1..467dfde8
REVERT: 93d178f7c pull subtree
REVERT: 4e0e577cd Squashed 'src/vitis/' changes from 940a5919..ad685c89

git-subtree-dir: src/module_vm4ms
git-subtree-split: 369e8d0dab9d7b5d837a2060e323fc925019b6dd
parent 933d587c
No related branches found
No related tags found
Loading
Showing
with 3 additions and 2993 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment