-
- Downloads
Squashed 'src/vitis/' changes from 940a5919..ad685c89
ad685c89 Merge branch 'next_version' into 'next_app_vmap' 4a400f14 Merge branch 'next_app_dtnet' into 'next_version' dc9e09bb Merge branch 'next_app_vmap' into 'next_version' ed3718ef Next app vmap 6909aeec Correctif sur la concaténation de filtres 68d6ee11 Retouche attribut comparator sur les formulaires de filtres 85bb73a6 Correction problèmes de chargement JS des sous formulaires 613ccca5 pull subtree 7755613b Squashed 'src/module_cadastre/' changes from 66dbfede..5883a499 51b130ea pull subtree ec89ac3d Squashed 'src/module_cadastreV2/' changes from 66dbfede..bc664f7f 5b7a1076 pull subtree 92412612 Squashed 'src/module_anc/' changes from 66dbfede..24e0fb69 b9ae9807 pull subtree 90da1776 Squashed 'src/module_vm4ms/' changes from 66dbfede..16f9769a 4f5cf220 pull subtree 116e0210 Squashed 'src/module_vmap/' changes from 66dbfede..2b3157a0 bf01f328 pull subtree f0020699 Correction problèmes chargement JS sous formulaires 07f786fb update colonne version pour accepter les version de plus de 10 caractères c2776a81 Merge remote-tracking branch 'origin/next_version' into next_version f29a96e0 Review Checkbox CSS f4a1833b Review Checkbox CSS ce3bb9c9 Resolve "[Studio] suppressions des différents formulaires" b2615442 pull subtree 914a1b6a pull subtree 7facefc7 Merge branch 'master' into next_version 7fbff5c8 Merge remote-tracking branch 'origin/master' 65d69a47 Remove auto pull/push subtrees 02633d0c Remove auto pull/push subtrees 5a8cfb32 Pull/push_subtrees.sh 2fb6e11b use next_app_vmap branches 4cbf5a6f Merge branch 'master' c64422b2 Merge branch 'master' 3097ea44 Merge branch 'cherry-pick-08ef8c91' into 'next_version' 1a3e2509 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master' 08ef8c91 Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master' 731fb56e Merge branch 'bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles' into 'master' ef0c46d2 Bug/1 cadastre recherche attributaire la selection reste en memoire quand on filtre la liste des parcelles 7fd95b0d Replace bootstrapTable getAllSelections by getSelections 173760d7 Merge branch 'master' into bug/1-cadastre-recherche-attributaire-la-selection-reste-en-memoire-quand-on-filtre-la-liste-des-parcelles 4613f700 link subtrees on branch app_vmap 6a47c43a Rename pull.sh into pull_subtrees.sh 591f4ecd pull subtree 77845c68 Squashed 'src/module_vmap/' changes from 3e46450b..fb263937 475f6218 pull subtree 4b44e6b9 Squashed 'src/vitis/' changes from 12a22d70..4398b26d 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 37643273 Merge remote-tracking branch 'origin/master' e058ef8f Resolve grunt links 4f4bf75c Correct grunt problems dca067bb Merge branch 'dev_master' into 'master' 837046c7 Dev master 82a645db Update properties.json 5d57e51c Update conf/properties.json ee905c13 Resolve web services update problem 54bd1775 Minify JS after updating files c35cc38d Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap 6a7cf62c Minify JS after updating files 7b0e04e0 Minify JS after updating files 479d7853 Add install/update files for windows 78a320a0 pull subtree e2a617e7 Squashed 'src/module_cadastreV2/' changes from 8158b9a2..895d7e3b 926bff66 Utilisation des utils sans avoir besoin de linxml2 3df5e36a Squashed 'src/module_vmap/' changes from 98047575..3e46450b 0852ad92 pull subtree 9f131870 Utilisation des utils sans avoir besoin de libxml2 1a61e637 Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap 03a5dfe3 Update pull/push_subtrees.sh to use the current version of subtrees 51f83a0b Add windows install files 457792c6 pull subtree 0bf9c2cc Squashed 'src/module_cadastre/' changes from a36394b9..1c340f7e b5c65a64 pull subtree 5e944c4a Squashed 'src/vitis/' changes from 7b55e678..12a22d70 85f07d4a Update init_symlinks 896a06b7 pull subtree e9dfdcbc Squashed 'src/module_anc/' changes from 8bb35778..68cd7130 393551e3 pull subtree 5cd5ab05 Squashed 'src/module_vmap/' changes from e7dabee0..98047575 19925d4f pull subtree df416439 Squashed 'src/vitis/' changes from 7a1818a4..7b55e678 59e770c1 pull subtree 77582f18 Update gitignore aa4b71d8 Remvove web_service from parent 99dab641 Update gitignore 7e0d02d6 Update Readme 74b02e3f Merge branch 'master' of gitlab.veremes.net:Development/vitis_apps/application/vmap 05269f92 Modify symlinks strategy 577d7654 Modify symlinks strategy 3c521a9e Modify symlinks strategy cf8ebcdc Update symlinks strategy b93b890c Modify symlinks strategy 139ee7e4 Modify symlinks strategy 3427147f Squashed 'src/module_cadastre/' changes from ee26cf16..a36394b9 54df607d pull subtree 3ce44dcc Squashed 'src/module_anc/' changes from 4321adc4..8bb35778 1056cb48 pull subtree 278331d3 pull subtree a0cda927 Squashed 'src/module_vm4ms/' changes from 373ef426..4d95a3da 1b6864ef add subtree 9d999ac0 add subtree df88c955 Squashed 'src/module_cadastre/' content from commit 0bb9b2fa 2b0c911e Squashed 'src/module_cadastre/' content from commit 0bb9b2fa e2a23caf add subtree e0e437ec Squashed 'src/module_cadastreV2/' content from commit b442386a 4fa86e72 add subtree 6b7d2e6a Squashed 'src/module_anc/' content from commit 24e0fb69 1af7f5c4 add subtree 2e8e909b Squashed 'src/module_vm4ms/' content from commit 16f9769a 5f3241ae add subtree a0825d63 Squashed 'src/module_vmap/' content from commit ce9e639a 3f3d51c3 add subtree 41d5aec2 Squashed 'src/closure/' content from commit 622066db d661316e add subtree 91cd365c add subtree 7c3aef17 Squashed 'src/vitis/' content from commit 355b5f8b e8597475 Reset sources 8fe041e4 Merge branch 'master' into next_version 0c3ac326 Change dependency.xml git-subtree-dir: src/vitis git-subtree-split: ad685c89
Showing
- client/javascript/app/script_client.js 43 additions, 42 deletionsclient/javascript/app/script_client.js
- client/javascript/externs/formReader/formReaderDrtv.js 4 additions, 3 deletionsclient/javascript/externs/formReader/formReaderDrtv.js
- client/javascript/externs/formReader/formReaderSrvc.js 27 additions, 3 deletionsclient/javascript/externs/formReader/formReaderSrvc.js
- client/javascript/externs/studio/javascript/app/JsonLoader.js 90 additions, 63 deletions...nt/javascript/externs/studio/javascript/app/JsonLoader.js
- client/javascript/externs/studio/lang/lang-en.json 9 additions, 1 deletionclient/javascript/externs/studio/lang/lang-en.json
- client/javascript/externs/studio/lang/lang-fr.json 9 additions, 1 deletionclient/javascript/externs/studio/lang/lang-fr.json
- client/javascript/externs/studio/less/studio.less 16 additions, 30 deletionsclient/javascript/externs/studio/less/studio.less
- client/javascript/externs/studio/templates/JsonLoader.html 18 additions, 4 deletionsclient/javascript/externs/studio/templates/JsonLoader.html
- client/less/main.less 21 additions, 0 deletionsclient/less/main.less
- vas/sql/sqlQueries.xml 1 addition, 1 deletionvas/sql/sqlQueries.xml
Loading