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

369e8d0d Merge branch 'next_version' into pre-2018.04.00
eb23863f Merge branch 'next_app_vmap' into next_version
6a0b53ef pull subtree
b93971d5 pull subtree
f42f3101 Merge branch 'pre_prod' into evolution/2-mode-comparaison-2
dfd4bcbc pull subtree
181cdbae pull subtree
4d555e37 pull subtree
401609c1 pull subtree
e999a181 update colonne version pour accepter les version de plus de 10 caractères
115665fa Remove parasit files
f2ffb070 Add right-click to termine drawing
af1a2e36 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap
6acd8ede Modify symlinks strategy
4d95a3da add subtree
a77b5d16 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa
cc0df5ed add subtree
16f9769a Merge branch 'master' into next_version
66dbfede Merge branch 'master' into next_version
a36394b9 Resolve require problems
373ef426 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
0b1d66c6 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
4f506db7 add gitignore
ee26cf16 add gitignore
7780fca4 Update from SVN
0d313243 Update from SVN
21f8928e gitignore
acda8124 fixed untracked files
bc1486d6 fixed untracked files
21a2e37f add subtree
a4098959 add subtree
16d095e8 Squashed 'src/module_cadastreV2/' content from commit 1f0d4038
7821e7eb add subtree
902ae99f Squashed 'src/module_anc/' content from commit 7347d062
0b81257e add subtree
f20833ba add subtree
5d3011c2 Squashed 'src/module_vm4ms/' content from commit 1a7d90a0
1023eed8 add subtree
0212e87a Squashed 'src/module_vmap/' content from commit 5cb51b4f
0b7f92e1 add subtree
6ba792b7 Squashed 'src/closure/' content from commit 622066db
8918ebf8 add subtree
88554edc Squashed 'src/vitis/' content from commit ddd89b96
d9a06a32 reset
4e055857 Update from SVN
1a7d90a0 Update from SVN
d1d8c8eb Update from SVN
59214f97 Update .gitignore
53a26943 Update utils/init_symlinks.sh
cdd6388c Utilisation d'une install existante
5c00d023 Permettre de relancer le script sans symlinks dupliqués
a7a04697 Permettre de relancer le script sans problèmes de duplication des symlinks
767c55e8 Update utils/init_symlinks.sh
122955df Lancer init_symlinks avant de pull les subtrees
92f4957e Update utils/init_symlinks.sh
6c3d32ea Integrate message
df3fda74 Automatically pull the subtrees
32c06af7 pull from module
d25cf488 Squashed 'src/module_cadastre/' changes from a7611084..da0e1887
f15eca23 pull from module
8b47e8e6 Squashed 'src/module_cadastreV2/' changes from 812b365a..3bf002c4
db8f5acf pull from module
93888f30 Squashed 'src/module_anc/' changes from 8f732f9f..ab8db901
7607f789 pull from module
5fec7981 Squashed 'src/module_vm4ms/' changes from 1964e93a..9b7aed87
80672c1c pull from module
79710cea Squashed 'src/module_vmap/' changes from 81346f03..4b3d61a4
404c71d8 pull from module
e0812b1e Squashed 'src/vitis/' changes from fec164ba..8c498237
72ec9143 Update utils/pull_subtrees.sh
35a719c1 Update utils/pull_subtrees.sh
7fe1bd22 Update utils/pull_subtrees.sh
82e31e54 Update utils/pull_subtrees.sh
b398658c Update utils/pull_subtrees.sh
5f906507 Update utils/pull_subtrees.sh
d0adeedb Vérification sudo
9897f9da Utilisation de dependency.xml pour les dépendances
9b7aed87 Update dependency.xml
00339553 Update dependency.xml
b03d7e50 Update dependency.xml
189e0e6d Update dependency.xml
6151e6bf Update dependency.xml
da0e1887 Update dependency.xml
2c489f99 Update dependency.xml
7743bd81 Update dependency.xml
598189b5 Change dependencies model
87b86b4f Change dependencies model
e64ea421 Change dependencies model
76ae4547 Change dependencies model
d7223421 Modification titre
9ce399c2 Modification du titre
4c4eb489 Add 'src/module_cadastre/' from commit 'a7611084'
7589aa71 Add 'src/module_cadastreV2/' from commit '812b365a'
052186c3 Add 'src/module_anc/' from commit '8f732f9f'
691caa91 Add 'src/module_vm4ms/' from commit '1964e93a'
7d07b86d Add 'src/module_vmap/' from commit '81346f03'
c6679343 Add 'src/closure/' from commit '622066db'
ce0a64c5 Add 'src/vitis/' from commit 'fec164ba'
672dc991 Reset sources
73ff28a7 Utilisation de dependency.xml pour le versionnement des dependances
9b030f28 Utilisation de dependency.xml pour la version des deps
71fe1986 Add 'src/module_cadastre/' from commit 'a7611084'
77cff122 Add 'src/module_cadastreV2/' from commit '812b365a'
59eca12d Add 'src/module_anc/' from commit '8f732f9f'
00c149c7 Add 'src/module_vm4ms/' from commit '1964e93a'
0fca2368 Add 'src/module_vmap/' from commit '81346f03'
59a21e52 Add 'src/closure/' from commit '622066db'
0513a606 Add 'src/vitis/' from commit 'fec164ba'
440395b0 Reset sources
60dda2e5 Utilisation de dependency.xml pour la gestion des dependances
de649f18 Add 'src/closure/' from commit '622066db'
5222a00a Add 'src/vitis/' from commit 'fec164ba'
5db1f50e Reset sources
e212d87d Utilisation de dependency.xml pour la gestion des dépendances
77799b0a Add 'src/closure/' from commit '622066db'
c79261bc Add 'src/vitis/' from commit 'fec164ba'
1cc750a8 Reset sources
d0276a43 Utilisation de dependency.xml pour la gestion des dependances
7d623d03 Add 'src/closure/' from commit '622066db'
2d74de73 Add 'src/vitis/' from commit 'fec164ba'
5449da82 Utilisation de dependency.xml pour la gestion des dependances
fb928b78 Reset sources
4bdd0b7d Utilisation de dependency.xml pour la gestion des subtrees
f7f3dadf Add closure conf
3bd7dc98 Add closure conf
7366a26b Add closure conf
93a0649f Add 'src/closure/' from commit '622066db'
c531c58c Add closure conf
622066db add files from SVN
c2a8d7d3 Ajout de README.md
81346f03 Update vMap title
93afdd18 Update vMap title
fec164ba Update Vitis title
dd365f5b Update Vitis title
b4e746f6 Update readme.md
fd1a9a8f Automaticaly copy git hooks
15a03d30 Updat Readme.md
48744f3a Update Readme.md
9622b230 Update README.md
871ab4f7 Update Readme
a9c26d6a Update README.md
64fde26d Update readme.md
95e4dfee Update README.md
be34a510 Update Readme.md
73aec2ac Update README.md
6e2a768a update Readme
533177d5 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
5343b694 Update README.md
55144f68 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
9a2ce1fc Update README.md
09375e73 Update README.md
020ce1d1 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
148bbb79 Merge branch 'master' of vm09.veremes.net:Development/vitis_apps/applications/vMap
5624d8b8 Pull and push hooks
52bad93e Update README.md
dbffe34c Copy custop hooks on installing
5f740160 Update README.md
d55a4872 Pull and push hooks
c7d34b24 Update README.md
24e41af8 test update
0b32a44f Update README.md
6e72ab3b Update README.md
1469c690 Update README.md
7ff8c64b Add install.sh
6d6bb7c4 Add install.sh
7738cbff Add 'src/module_cadastreV2/' from commit '812b365a'
39962b3f Add 'src/module_cadastre/' from commit 'a7611084'
9e079d31 Add 'src/module_anc/' from commit '8f732f9f'
098b185c Add 'src/module_vm4ms/' from commit '1964e93a'
70e89758 Add 'src/module_vmap/' from commit '9808f279'
8ca58245 Add 'src/vitis/' from commit '2c2bec2b'
a1d2171b remove dependencies
2ffe7163 Merge branch 'version_1' into 'master'
9808f279 Edit titles
2c2bec2b Edit titles
cbb00e54 Edit titles
ef1fa8e5 Remove creation on .gitignore from init_symlinks
38ba6809 Amélioration messages shell
3838b4c4 Suppression de la dep app_vmap
ff811df3 Edit Readme.md
41552069 Merge commit '9fd449ca' into version_1
73ee0416 Merge commit 'e7013570' into version_1
2fa7b365 make pull_subtrees executable
dcdf5427 rename utils scripts
fc4b53bd Add script to pull and push subtrees
9fd449ca Rename vMap title
8ba52179 Rename vMap title
e7013570 Rename vitis title
df7de9ab Rename vitis title
41cbe0f4 reset gitignore
2239253d reset gitignore
18e7c839 Add 'src/module_cadastreV2/' from commit '812b365a'
98e78c0c Add 'src/module_cadastre/' from commit 'a7611084'
2d1e279b Add 'src/module_anc/' from commit '8f732f9f'
c2bf5403 Add 'src/module_vm4ms/' from commit '1964e93a'
1baf900a Add 'src/module_vmap/' from commit 'b7d5d7bc'
75862146 Add 'src/app_vmap/' from commit '130d2a05'
a68b68c9 Add 'src/vitis/' from commit 'bcaa41e5'
5af452f8 Move shell scripts
13b9cebd Move shell scripts
0b4326c6 Reset deps
a062f9f0 Reset deps
1dab44ca Add symlinks to gitignore
07c6c2e4 gitignore
3fb87b3a add dependencies
3e811f91 add symlinks to gitignore
e848ea8c add symlinks to gitignore
bbd5526b Creating init_vmap_symlinks.sh
817df15f Add 'deps/module_cadastreV2/' from commit '812b365a'
34bcdf16 Add 'deps/module_cadastre/' from commit 'a7611084'
99b617d2 Add 'deps/module_anc/' from commit '8f732f9f'
21345563 Add 'deps/module_vm4ms/' from commit '1964e93a'
a847d327 Add 'deps/module_vmap/' from commit 'b7d5d7bc'
c3ee4af8 Add 'deps/app_vmap/' from commit '130d2a05'
a90c77c1 Add 'deps/vitis/' from commit 'bcaa41e5'
572ad9d0 tests
46710ed0 Creating init_vmap_subtrees.sh
aa840d19 Add 'repos/module_cadastreV2/' from commit '812b365a'
c11c8793 Add 'repos/module_cadastre/' from commit 'a7611084'
1ac8b86e Add 'repos/module_anc/' from commit '8f732f9f'
ae675e02 Add 'repos/module_vm4ms/' from commit '1964e93a'
b5ef4148 Add 'repos/module_vmap/' from commit 'b7d5d7bc'
b333c144 Add 'repos/app_vmap/' from commit '130d2a05'
2363b164 Add 'repos/vitis/' from commit 'bcaa41e5'
042aa0c1 Creating init_vitis
af6cee51 revert
bcaa41e5 reset from svn
9ad23084 reset from svn
f2b1d4d5 reset from svn
eff674c1 reset from svn
e14a7a33 Change index title
9501d84b Change index title
e26aafea Merge commit 'fb2e2c6d'
1748b2a1 Merge commit 'fb2e2c6d'
874e6ef1 Add update script
78768a91 Add update script
b7d5d7bc Mise à jour titre
fb2e2c6d Mise à jour titre
cfd4fb05 Add init_vmap.sh
31631d74 Add 'vmap/vas/sql/cadastreV2/' from commit '33e450da'
7917c765 Add 'vmap/vas/sql/cadastreV2/' from commit '33e450da'
04b8dd11 Add 'vmap/vas/rest/ws/cadastreV2/' from commit '4f833ebc'
fdd9b3a0 Add 'vmap/vas/rest/ws/cadastreV2/' from commit '4f833ebc'
13959dcd Add 'vmap/vas/rest/conf/cadastreV2/' from commit '5f14ce4c'
4f3407c0 Add 'vmap/vas/rest/conf/cadastreV2/' from commit '5f14ce4c'
38151d11 Add 'vmap/vas/rest/ws/cadastre/' from commit '40766c07'
a371f3f4 Add 'vmap/vas/rest/ws/cadastre/' from commit '40766c07'
dd211535 Add 'vmap/vas/rest/conf/cadastre/' from commit '2a0bf987'
29fba9ee Add 'vmap/vas/rest/conf/cadastre/' from commit '2a0bf987'
a01b30f6 Add 'vmap/vas/sql/anc/' from commit '627a9115'
92400fa3 Add 'vmap/vas/sql/anc/' from commit '627a9115'
a8b94f19 Add 'vmap/vas/rest/ws/anc/' from commit 'd2fdf3ca'
a04bf01d Add 'vmap/vas/rest/ws/anc/' from commit 'd2fdf3ca'
cc3b9719 Add 'vmap/vas/rest/conf/anc/' from commit 'aae628ed'
ea7a3cec Add 'vmap/vas/rest/conf/anc/' from commit 'aae628ed'
d2b63df6 Add 'vmap/client/modules/anc/' from commit '3a4bd963'
64a2cac7 Add 'vmap/client/modules/anc/' from commit '3a4bd963'
6332b020 Add 'vmap/vas/sql/vm4ms/' from commit '36eaf20a'
9807de57 Add 'vmap/vas/sql/vm4ms/' from commit '36eaf20a'
db92d37d Add 'vmap/vas/rest/ws/vm4ms/' from commit '3062a551'
7e510b3b Add 'vmap/vas/rest/ws/vm4ms/' from commit '3062a551'
4571e5b4 Add 'vmap/vas/rest/conf/vm4ms/' from commit '888c2e55'
0e1e3e3d Add 'vmap/vas/rest/conf/vm4ms/' from commit '888c2e55'
221dc654 Add 'vmap/client/modules/vm4ms/' from commit '19e9a5a2'
6a47c5ac Add 'vmap/client/modules/vm4ms/' from commit '19e9a5a2'
c7287da3 Add 'vmap/vas/sql/vmap/' from commit '34d982ca'
d7433f0b Add 'vmap/vas/sql/vmap/' from commit '34d982ca'
94bb30d9 Add 'vmap/vas/rest/ws/vmap/' from commit 'ed196105'
98532183 Add 'vmap/vas/rest/ws/vmap/' from commit 'ed196105'
408633d0 Add 'vmap/vas/rest/conf/vmap/' from commit '4045e8b4'
8deebc14 Add 'vmap/vas/rest/conf/vmap/' from commit '4045e8b4'
7ac7bba7 Add init_vmap.sh
fa7787d5 Add init_vmap.sh
f7e19860 Add init_vmap.sh
66353d81 Add init_vmap.sh
4a42a3c7 Add 'vmap/client/modules/vmap/' from commit 'adad985e'
3e103de3 Add 'vmap/client/modules/vmap/' from commit 'adad985e'
4b006774 Add init_vmap.sh
cbff45a8 Add 'vmap/client/conf/' from commit '130d2a05'
49a55188 Add 'vmap/client/conf/' from commit '130d2a05'
2b35d0bf working dependencies
08151921 working dependencies
b288f847 Add 'vmap/conf/' from commit '130d2a05'
3448d57f Add 'vmap/conf/' from commit '130d2a05'
efac8988 Add 'vmap/' from commit '8cd2ae16'
3f7a9897 rm subtree
80f4cada Add '.vim/bundle/tpope-vim-surround/' from commit '8cd2ae16'
a7611084 add files from SVN
40766c07 add files from SVN
2a0bf987 add files from SVN
b765e167 Ajout de README.md
812b365a add files from SVN
33e450da add files from SVN
4f833ebc add files from SVN
5f14ce4c add files from SVN
58e7f3bc Ajout de README.md
8cd2ae16 Update .gitignore
130d2a05 add conf files
47892bd3 Ajout de README.md
4cceb35f Update README.md
56af1e17 Complete .gitignore
1964e93a add files from SVN
36eaf20a add files from SVN
3062a551 add files from SVN
888c2e55 add files from SVN
19e9a5a2 add files from SVN
b5d0f5aa Ajout de README.md
748324d2 Add .gitignore
9426236c Changement date
adad985e Changement date
7c9b5db3 changement date
28bc6249 changement date
34d982ca Migrating files from SVN
ed196105 Migrating files from SVN
4045e8b4 Migrating files from SVN
2fed36ff Migrating files from SVN
4bfbbc52 Migrating files from SVN
8f732f9f Migrating files from SVN
627a9115 Migrating files from SVN
d2fdf3ca Migrating files from SVN
aae628ed Migrating files from SVN
3a4bd963 Migrating files from SVN
3f149b96 Migrating files from SVN
8479039c Ajout de README.md
89c79951 Ajout de README.md
387343e6 Ajout de README.md
2b3f8b19 Ajout de README.md
REVERT: c34ae8c2 Revert "pull subtree"
REVERT: ab49657b pull subtree
REVERT: 1a650d5b pull subtree
REVERT: ee4f9a23 pull subtree
REVERT: 2f788ee2 Squashed 'src/module_vm4ms/' changes from 0c12f3e1..f42f3101
REVERT: d640dd3b pull subtree
REVERT: 06b33c88 Squashed 'src/module_vmap/' changes from 0c12f3e1..467dfde8
REVERT: 93d178f7 pull subtree
REVERT: 4e0e577c Squashed 'src/vitis/' changes from 940a5919..ad685c89

git-subtree-dir: src/module_vm4ms
git-subtree-split: 369e8d0d
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.
Finish editing this message first!
Please register or to comment