Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vMap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marty Fabien
vMap
Commits
7625c3ee
Commit
7625c3ee
authored
5 years ago
by
ludivine premont
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into laurent-change.log
parents
e07adc9a
f2159818
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
conf/requires/config.js
+2
-1
2 additions, 1 deletion
conf/requires/config.js
src/module_cadastreV2
+1
-1
1 addition, 1 deletion
src/module_cadastreV2
src/module_vm4ms
+1
-1
1 addition, 1 deletion
src/module_vm4ms
src/module_vmap
+1
-1
1 addition, 1 deletion
src/module_vmap
src/vitis
+1
-1
1 addition, 1 deletion
src/vitis
with
6 additions
and
5 deletions
conf/requires/config.js
+
2
−
1
View file @
7625c3ee
...
@@ -88,7 +88,8 @@ var oApplicationFiles = {
...
@@ -88,7 +88,8 @@ var oApplicationFiles = {
'
javascript/externs/jquery/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
'
,
'
javascript/externs/jquery/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js
'
,
'
javascript/externs/viewer/viewer.min.js
'
,
'
javascript/externs/viewer/viewer.min.js
'
,
'
javascript/externs/alasql/alasql.min.js
'
,
'
javascript/externs/alasql/alasql.min.js
'
,
'
javascript/externs/alasql/xlsx.core.min.js
'
'
javascript/externs/alasql/xlsx.core.min.js
'
,
'
javascript/externs/signature_pad/signature_pad.min.js
'
]
]
},
},
...
...
This diff is collapsed.
Click to expand it.
module_cadastreV2
@
118744ca
Compare
2d51a3f4
...
118744ca
Subproject commit
2d51a3f41fa801d5e302d70c0274142a6aeed119
Subproject commit
118744cac43030ae83dd6623fe5d7c29ca2fb9e4
This diff is collapsed.
Click to expand it.
module_vm4ms
@
2787f8e3
Compare
00bf79b1
...
2787f8e3
Subproject commit
00bf79b1cb2c5921cd68c6e61ca2c1f77676330
5
Subproject commit
2787f8e37dd6166ea999178e3647a20d0857fc5
5
This diff is collapsed.
Click to expand it.
module_vmap
@
5ab246b1
Compare
789c7696
...
5ab246b1
Subproject commit
789c7696b5fc47111b10278df61097676a2209d2
Subproject commit
5ab246b13dd1f9b75eeed34cb0eb4c4599b4907c
This diff is collapsed.
Click to expand it.
vitis
@
d3bed009
Compare
c8b6b25f
...
d3bed009
Subproject commit
c8b6b25fae97dff94b7c7f85350aa6bf7690810
e
Subproject commit
d3bed0093fb3127ac29d5f193e0844f629d8d6c
e
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment