Merge pull request #618 from solstag/master

new version of moment.js to match datetimepicker
This commit is contained in:
RedMatrix 2014-10-07 09:01:54 +11:00
commit 7577227a6d
4 changed files with 7 additions and 7064 deletions

0
library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js vendored Executable file → Normal file
View file

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -11,7 +11,7 @@ require_once('view/php/theme_init.php');
head_add_js('library/bootstrap/js/bootstrap.min.js');
head_add_js('library/bootstrap/js/bootbox.min.js');
head_add_js('library/bootstrap-datetimepicker/js/moment.js');
head_add_js('library/bootstrap-datetimepicker/js/moment.min.js');
head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
//head_add_js('library/colorpicker/js/colorpicker.js');
head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');