diff --git a/composer.json b/composer.json index 19fa2b1c38..194261d07c 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ "bower-asset/base64": "^1.0", "npm-asset/jquery": "^1.11.2", "npm-asset/jquery-colorbox": "^1.6", - "bower-asset/Chart-js": "^2.7" + "bower-asset/Chart-js": "^2.7", + "npm-asset/jquery-datetimepicker": "^2.4.0" }, "repositories": [ { diff --git a/composer.lock b/composer.lock index a67eb0e1c7..b227342a4f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "7fcbb730be98076fe8318b03c858f41c", + "content-hash": "0c4bc39a37462cde6783b1fb90f0e530", "packages": [ { "name": "bower-asset/Chart-js", @@ -453,6 +453,162 @@ ], "time": "2016-05-10T22:22:39+00:00" }, + { + "name": "npm-asset/jquery-datetimepicker", + "version": "2.5.17", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/jquery-datetimepicker/-/jquery-datetimepicker-2.5.17.tgz", + "reference": null, + "shasum": "8857a631f248081d4072563bde40fa8c17e407b1" + }, + "require": { + "npm-asset/jquery": ">=1.7.2", + "npm-asset/jquery-mousewheel": ">=3.1.13", + "npm-asset/php-date-formatter": ">=1.3.4,<2.0.0" + }, + "require-dev": { + "npm-asset/concat": "dev-github:azer/concat", + "npm-asset/concat-cli": ">=4.0.0,<5.0.0", + "npm-asset/uglifycss": ">=0.0.27,<0.0.28", + "npm-asset/uglifyjs": ">=2.4.10,<3.0.0" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/xdan/datetimepicker/issues" + }, + "npm-asset-main": "build/jquery.datetimepicker.full.min.js", + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git+https://github.com/xdan/datetimepicker.git" + }, + "npm-asset-scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "concat": "concat-cli -f node_modules/php-date-formatter/js/php-date-formatter.min.js jquery.datetimepicker.js node_modules/jquery-mousewheel/jquery.mousewheel.js -o build/jquery.datetimepicker.full.js", + "minify": "uglifyjs jquery.datetimepicker.js -c -m -o build/jquery.datetimepicker.min.js && uglifycss jquery.datetimepicker.css > build/jquery.datetimepicker.min.css", + "minifyconcat": "uglifyjs build/jquery.datetimepicker.full.js -c -m -o build/jquery.datetimepicker.full.min.js", + "github": "git add --all && git commit -m \"New version %npm_package_version% \" && git tag %npm_package_version% && git push --tags origin HEAD:master && npm publish", + "build": "npm run minify && npm run concat && npm run minifyconcat", + "public": "npm version patch --no-git-tag-version && npm run build && npm run github" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chupurnov", + "email": "chupurnov@gmail.com", + "url": "http://xdsoft.net/" + } + ], + "description": "jQuery Plugin DateTimePicker it is DatePicker and TimePicker in one", + "homepage": "https://github.com/xdan/datetimepicker", + "keywords": [ + "calendar", + "date", + "datepicker", + "datetime", + "jquery-plugin", + "time", + "timepicker" + ], + "time": "2018-01-23T05:56:50+00:00" + }, + { + "name": "npm-asset/jquery-mousewheel", + "version": "3.1.13", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz", + "reference": null, + "shasum": "06f0335f16e353a695e7206bf50503cb523a6ee5" + }, + "require-dev": { + "npm-asset/grunt": "~0.4.1", + "npm-asset/grunt-contrib-connect": "~0.5.0", + "npm-asset/grunt-contrib-jshint": "~0.7.1", + "npm-asset/grunt-contrib-uglify": "~0.2.7" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/jquery/jquery-mousewheel/issues" + }, + "npm-asset-files": [ + "ChangeLog.md", + "jquery.mousewheel.js", + "README.md", + "LICENSE.txt" + ], + "npm-asset-main": "./jquery.mousewheel.js", + "npm-asset-directories": { + "test": "test" + }, + "npm-asset-repository": { + "type": "git", + "url": "https://github.com/jquery/jquery-mousewheel.git" + }, + "npm-asset-scripts": [] + }, + "authors": [ + { + "name": "jQuery Foundation and other contributors", + "url": "https://github.com/jquery/jquery-mousewheel/blob/master/AUTHORS.txt" + } + ], + "description": "A jQuery plugin that adds cross-browser mouse wheel support.", + "homepage": "https://github.com/jquery/jquery-mousewheel", + "keywords": [ + "browser", + "event", + "jquery", + "jquery-plugin", + "mouse", + "mousewheel", + "wheel" + ], + "time": "2015-07-15T18:05:23+00:00" + }, + { + "name": "npm-asset/php-date-formatter", + "version": "1.3.4", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/php-date-formatter/-/php-date-formatter-1.3.4.tgz", + "reference": null, + "shasum": "09a15ae0766ba0beb1900c27c1ec319ef2e4563e" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/kartik-v/php-date-formatter/issues" + }, + "npm-asset-main": "js/php-date-formatter.js", + "npm-asset-directories": { + "example": "examples" + }, + "npm-asset-repository": { + "type": "git", + "url": "git+https://github.com/kartik-v/php-date-formatter.git" + }, + "npm-asset-scripts": [] + }, + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kartik Visweswaran", + "email": "kartikv2@gmail.com" + } + ], + "description": "A Javascript datetime formatting and manipulation library using PHP date-time formats.", + "homepage": "https://github.com/kartik-v/php-date-formatter", + "time": "2016-02-18T15:15:55+00:00" + }, { "name": "paragonie/random_compat", "version": "v2.0.11", @@ -653,16 +809,16 @@ "source": { "type": "git", "url": "https://github.com/pear/Text_Highlighter.git", - "reference": "4178158d6fef4729bb08654fce8796a123ad0abd" + "reference": "2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Text_Highlighter/zipball/4178158d6fef4729bb08654fce8796a123ad0abd", - "reference": "4178158d6fef4729bb08654fce8796a123ad0abd", + "url": "https://api.github.com/repos/pear/Text_Highlighter/zipball/2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855", + "reference": "2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855", "shasum": "" }, "require": { - "pear/pear-core-minimal": "@stable", + "pear/pear-core-minimal": "~1.10.0", "php": ">=5.4.0" }, "require-dev": { @@ -678,7 +834,7 @@ "./" ], "license": [ - "PHP License" + "PHP-3.01" ], "authors": [ { @@ -697,7 +853,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Text_Highlighter", "source": "https://github.com/pear/Text_Highlighter" }, - "time": "2017-03-07T21:20:30+00:00" + "time": "2018-01-27T08:24:15+00:00" }, { "name": "pear/text_languagedetect",