aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts/application.js
diff options
context:
space:
mode:
authorLuc Donnet2014-10-29 12:36:13 +0100
committerLuc Donnet2014-10-29 12:36:13 +0100
commitdd9a409b3a80cbe56daabfc79d36e23afe0eff1b (patch)
treead3503a57d59b9ee2e77938cc1973a30d2041742 /app/assets/javascripts/application.js
parent98445231394822dc0576b9b10a6d39c00bae71fb (diff)
downloadchouette-core-dd9a409b3a80cbe56daabfc79d36e23afe0eff1b.tar.bz2
Fix timepicker use when no HTML5 possible Refs #0029395
Diffstat (limited to 'app/assets/javascripts/application.js')
-rw-r--r--app/assets/javascripts/application.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ed6e05c4c..01142c849 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,7 +13,9 @@
//= require morris
//= require bootstrap-sass-official
//= require typeahead.js
-//= require bootstrap-timepicker
+//= require moment
+//= require moment/locale/fr
+//= require eonasdan-bootstrap-datetimepicker
//= require tagmanager
//= require_directory ./plugins
//= require_directory .