Commit d84421c0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'js_css_en_local'

parents 5766270c 30c91b3a
Pipeline #6257 failed with stage
in 9 seconds
.idea
vendor/
\ No newline at end of file
./vendor/
\ No newline at end of file
......@@ -581,24 +581,25 @@ return [
],
],
],
'public_files' => [
'head_scripts' => [
'010_jquery' => 'https://gest.unicaen.fr/public/jquery-1.11.3.min.js',
'020_jqueryui' => 'https://gest.unicaen.fr/public/jquery-ui-1.11.4/jquery-ui.min.js',
'010_jquery' => '/unicaen/app/vendor/jquery-1.11.3.min.js',
'020_jqueryui' => '/unicaen/app/vendor/jquery-ui-1.11.4/jquery-ui.min.js',
],
'inline_scripts' => [
'010_bootstrap' => 'https://gest.unicaen.fr/public/bootstrap-3.3.5/js/bootstrap.min.js',
'010_bootstrap' => '/unicaen/app/vendor/bootstrap-3.3.5/js/bootstrap.min.js',
'020_app' => '/js/app.js',
'030_util' => '/unicaen/app/js/util.js',
'040_unicaen' => '/unicaen/app/js/unicaen.js',
'050_jquery_form' => 'https://gest.unicaen.fr/public/jquery.form-3.51.js' // pour l'uploader Unicaen uniquement!!,
'050_jquery_form' => '/unicaen/app/vendor/jquery.form-3.51.js' // pour l'uploader Unicaen uniquement!!,
],
'stylesheets' => [
'010_jquery-ui' => 'https://gest.unicaen.fr/public/jquery-ui-1.11.4/jquery-ui.min.css',
'020_jquery-ui-structure' => 'https://gest.unicaen.fr/public/jquery-ui-1.11.4/jquery-ui.structure.min.css',
'030_jquery-ui-theme' => 'https://gest.unicaen.fr/public/jquery-ui-1.11.4/jquery-ui.theme.min.css',
'040_bootstrap' => 'https://gest.unicaen.fr/public/bootstrap-3.3.5/css/bootstrap.min.css',
'050_bootstrap-theme' => 'https://gest.unicaen.fr/public/bootstrap-3.3.5/css/bootstrap-theme.min.css',
'010_jquery-ui' => '/unicaen/app/vendor/jquery-ui-1.11.4/jquery-ui.min.css',
'020_jquery-ui-structure' => '/unicaen/app/vendor/jquery-ui-1.11.4/jquery-ui.structure.min.css',
'030_jquery-ui-theme' => '/unicaen/app/vendor/jquery-ui-1.11.4/jquery-ui.theme.min.css',
'040_bootstrap' => '/unicaen/app/vendor/bootstrap-3.3.5/css/bootstrap.min.css',
'050_bootstrap-theme' => '/unicaen/app/vendor/bootstrap-3.3.5/css/bootstrap-theme.min.css',
'060_unicaen' => '/unicaen/app/css/unicaen.css',
'070_app' => '/css/app.css',
],
......@@ -606,6 +607,7 @@ return [
],
'cache_enabled' => false,
],
'bjyauthorize' => [
'guards' => [
'BjyAuthorize\Guard\Controller' => [
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
require('../../js/transition.js')
require('../../js/alert.js')
require('../../js/button.js')
require('../../js/carousel.js')
require('../../js/collapse.js')
require('../../js/dropdown.js')
require('../../js/modal.js')
require('../../js/tooltip.js')
require('../../js/popover.js')
require('../../js/scrollspy.js')
require('../../js/tab.js')
require('../../js/affix.js')
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment