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

Squashed 'src/vitis/' changes from 25238a11..40e7d46e

40e7d46e pull subtree
68214db2 Update crontab.txt - Changement nom balise
771a5655 Merge branch 'Sebastien-master-patch-58096' 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
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
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
12a22d70 pull subtree
47cd4913 Squashed 'src/module_vm4ms/' changes from 4d95a3da..af1a2e36
7b55e678 Utilisation de dirname($_SERVER['SCRIPT_FILENAME']) au dlieu de __DIR__
24ea0f3d pull subtree
f4326e8a 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
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
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
01d199ce Update from SVN
5674ba26 fixed untracked files
ce1c22a0 add subtree
d9a06a32 reset
ddd89b96 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
8c498237 Divise les dependances client et vas pour apache
a7b754eb Update _install/dependency.xml
6151e6bf Update dependency.xml
700adff2 Change dependencies model
d7223421 Modification titre
449fe8f3 Modification du 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: 25238a11 Update conf/_install/dependency.xml
REVERT: a45308c9 update utils
REVERT: a172ed7f update utils
REVERT: 94bfb8c4 Resolve git ignore on properties.json
REVERT: 2203c387 Update properties.json
REVERT: f4cf0d23 Update conf/properties.json
REVERT: bcd0a441 Add windows install doc on README.md
REVERT: d85eb2a8 add install/update.bat
REVERT: 257deb71 Add utils for windows install
REVERT: 09369e7a Modify symlinks strategy
REVERT: b8263ffb Update Readme
REVERT: 0c03b20a Grunt with symlinks
REVERT: bc1e046a add subtree
REVERT: 42fed54d Squashed 'src/module_extraction/' content from commit c3060a5
REVERT: 4045a0f5 add subtree
REVERT: 38b4f6f5 Squashed 'src/closure/' content from commit 622066db
REVERT: cf3f0aa2 add subtree
REVERT: f15e264f Squashed 'src/vitis/' content from commit 7a1818a4
REVERT: 66ae7aee Add files from template
REVERT: f772eff2 Initial commit

git-subtree-dir: src/vitis
git-subtree-split: 40e7d46e
parent 1d4a46b7
No related branches found
No related tags found
Loading
Showing
with 119 additions and 21 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