diff --git a/composer.json b/composer.json index a8a87efe98..f53c22a4e9 100755 --- a/composer.json +++ b/composer.json @@ -41,7 +41,6 @@ "zendframework/zend-config": "2.3.3", "ezyang/htmlpurifier": "4.6.0", "aferrandini/phpqrcode": "1.0.1", - "ckeditor/ckeditor": "4.4.7", "szymach/c-pchart": "1.*", "aferrandini/phpqrcode": "1.0.1", "mpdf/mpdf": "5.7.4", @@ -52,11 +51,27 @@ "symfony/doctrine-bridge": "2.6.4", "symfony/validator": "2.6.4", "gedmo/doctrine-extensions": "~2.3", - "sonata-project/user-bundle": "~2.2" + "sonata-project/user-bundle": "~2.2", + "fxp/composer-asset-plugin": "~1.0", + + "bower-asset/bootstrap": "3.3.*", + "bower-asset/fontawesome": "4.3.*", + "bower-asset/moment": "2.9", + "bower-asset/jquery-ui": "1.11.*", + "bower-asset/bootstrap-daterangepicker": "1.3.*", + "bower-asset/ckeditor": "4.4.*", + "bower-asset/jquery-timeago": "1.4.*", + "bower-asset/fullcalendar": "2.3.*", + "bower-asset/mediaelement": "2.16.*", + "bower-asset/modernizr": "2.8.*" + }, "extra": { "branch-alias": { "dev-master": "1.10.x-dev" + }, + "asset-installer-paths": { + "bower-asset-library": "web/assets/" } } } diff --git a/composer.lock b/composer.lock index fb74738504..c26ebcba35 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6064d0ef72af3ef8b2f98db70069486e", + "hash": "7b340a907a3c5eda7380f31f022d7f8f", "packages": [ { "name": "aferrandini/phpqrcode", @@ -205,7 +205,93 @@ "time": "2014-05-15 22:08:22" }, { - "name": "ckeditor/ckeditor", + "name": "bower-asset/bootstrap", + "version": "v3.3.2", + "source": { + "type": "git", + "url": "https://github.com/twbs/bootstrap.git", + "reference": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/bcf7dd38b5ab180256e2e4fb5da0369551b3f082", + "reference": "bcf7dd38b5ab180256e2e4fb5da0369551b3f082", + "shasum": "" + }, + "require": { + "bower-asset/jquery": ">=1.9.1" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "less/bootstrap.less", + "dist/css/bootstrap.css", + "dist/js/bootstrap.js", + "dist/fonts/glyphicons-halflings-regular.eot", + "dist/fonts/glyphicons-halflings-regular.svg", + "dist/fonts/glyphicons-halflings-regular.ttf", + "dist/fonts/glyphicons-halflings-regular.woff" + ], + "bower-asset-ignore": [ + "/.*", + "_config.yml", + "CNAME", + "composer.json", + "CONTRIBUTING.md", + "docs", + "js/tests", + "test-infra" + ] + }, + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", + "keywords": [ + "css", + "framework", + "front-end", + "js", + "less", + "mobile-first", + "responsive", + "web" + ] + }, + { + "name": "bower-asset/bootstrap-daterangepicker", + "version": "v1.3.19", + "source": { + "type": "git", + "url": "https://github.com/dangrossman/bootstrap-daterangepicker.git", + "reference": "32c012f3882af2eb48f12127958be7e0fe112af0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dangrossman/bootstrap-daterangepicker/zipball/32c012f3882af2eb48f12127958be7e0fe112af0", + "reference": "32c012f3882af2eb48f12127958be7e0fe112af0", + "shasum": "" + }, + "require": { + "bower-asset/jquery": ">=1.10", + "bower-asset/moment": "~2.9.0" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "daterangepicker.js", + "daterangepicker-bs3.css" + ], + "bower-asset-ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests", + "moment.js", + "moment.min.js" + ] + } + }, + { + "name": "bower-asset/ckeditor", "version": "4.4.7", "source": { "type": "git", @@ -218,23 +304,13 @@ "reference": "cc324415302784eb1abe33a3762fbdd3b48c558b", "shasum": "" }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", + "type": "bower-asset-library", "license": [ - "GPL-2.0+", - "LGPL-2.1+", - "MPL-1.1+" - ], - "authors": [ - { - "name": "CKSource", - "homepage": "http://cksource.com" - } + "For licensing, see LICENSE.md or http://ckeditor.com/license." ], "description": "JavaScript WYSIWYG web text editor.", - "homepage": "http://ckeditor.com", "keywords": [ - "CKEditor", + "ckeditor", "editor", "fckeditor", "html", @@ -242,8 +318,283 @@ "richtext", "text", "wysiwyg" + ] + }, + { + "name": "bower-asset/fontawesome", + "version": "v4.3.0", + "source": { + "type": "git", + "url": "https://github.com/FortAwesome/Font-Awesome.git", + "reference": "41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0", + "reference": "41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0", + "shasum": "" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "./css/font-awesome.css", + "./fonts/*" + ], + "bower-asset-ignore": [ + "*/.*", + "*.json", + "src", + "*.yml", + "Gemfile", + "Gemfile.lock", + "*.md" + ] + }, + "license": [ + "OFL-1.1", + "MIT", + "CC-BY-3.0" + ], + "description": "Font Awesome" + }, + { + "name": "bower-asset/fullcalendar", + "version": "v2.3.1", + "source": { + "type": "git", + "url": "https://github.com/arshaw/fullcalendar.git", + "reference": "c1a35746058e48d8076fb282a0c324b56de47649" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/arshaw/fullcalendar/zipball/c1a35746058e48d8076fb282a0c324b56de47649", + "reference": "c1a35746058e48d8076fb282a0c324b56de47649", + "shasum": "" + }, + "require": { + "bower-asset/jquery": ">=1.7.1", + "bower-asset/moment": ">=2.5.0" + }, + "require-dev": { + "bower-asset/bootstrap": "~3.2.0", + "bower-asset/jasmine-fixture": "~1.2.0", + "bower-asset/jasmine-jquery": "~2.0.3", + "bower-asset/jquery-mockjax": "~1.5.4", + "bower-asset/jquery-simulate-ext": "~1.3.0", + "bower-asset/jquery-ui": ">=1.11.1", + "bower-asset/moment-timezone": "~0.2.1" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "dist/fullcalendar.js", + "dist/fullcalendar.css" + ], + "bower-asset-ignore": [ + "*", + "**/.*", + "!/dist/**", + "!/changelog.*", + "!/license.*", + "!/readme.*" + ] + }, + "license": { + "type": "MIT", + "url": "https://github.com/arshaw/fullcalendar/blob/master/license.txt" + }, + "description": "Full-sized drag & drop event calendar", + "keywords": [ + "calendar", + "event", + "full-sized", + "jquery-plugin" + ] + }, + { + "name": "bower-asset/jquery", + "version": "2.1.3", + "source": { + "type": "git", + "url": "https://github.com/jquery/jquery.git", + "reference": "8f2a9d9272d6ed7f32d3a484740ab342c02541e0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jquery/jquery/zipball/8f2a9d9272d6ed7f32d3a484740ab342c02541e0", + "reference": "8f2a9d9272d6ed7f32d3a484740ab342c02541e0", + "shasum": "" + }, + "require-dev": { + "bower-asset/qunit": "1.14.0", + "bower-asset/requirejs": "2.1.10", + "bower-asset/sinon": "1.8.1", + "bower-asset/sizzle": "2.1.1-patch2" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": "dist/jquery.js", + "bower-asset-ignore": [ + "**/.*", + "build", + "speed", + "test", + "*.md", + "AUTHORS.txt", + "Gruntfile.js", + "package.json" + ] + }, + "license": [ + "MIT" + ], + "keywords": [ + "javascript", + "jquery", + "library" + ] + }, + { + "name": "bower-asset/jquery-timeago", + "version": "v1.4.1", + "source": { + "type": "git", + "url": "https://github.com/rmm5t/jquery-timeago.git", + "reference": "bf9d361e4e939286777751f4457af54b2e000c7c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rmm5t/jquery-timeago/zipball/bf9d361e4e939286777751f4457af54b2e000c7c", + "reference": "bf9d361e4e939286777751f4457af54b2e000c7c", + "shasum": "" + }, + "require": { + "bower-asset/jquery": ">=1.4" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": "jquery.timeago.js", + "bower-asset-ignore": [ + "test", + "vendor" + ] + }, + "license": [ + "MIT" + ] + }, + { + "name": "bower-asset/jquery-ui", + "version": "1.11.3", + "source": { + "type": "git", + "url": "https://github.com/components/jqueryui.git", + "reference": "7e2d6bec1c729925d9ad7c0c9ab4b561174efa99" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/components/jqueryui/zipball/7e2d6bec1c729925d9ad7c0c9ab4b561174efa99", + "reference": "7e2d6bec1c729925d9ad7c0c9ab4b561174efa99", + "shasum": "" + }, + "require": { + "bower-asset/jquery": ">=1.6" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "jquery-ui.js" + ], + "bower-asset-ignore": [] + } + }, + { + "name": "bower-asset/mediaelement", + "version": "2.16.4", + "source": { + "type": "git", + "url": "https://github.com/johndyer/mediaelement.git", + "reference": "ceeb1a7f41b2557c4f6a865cee5564c82039201d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/johndyer/mediaelement/zipball/ceeb1a7f41b2557c4f6a865cee5564c82039201d", + "reference": "ceeb1a7f41b2557c4f6a865cee5564c82039201d", + "shasum": "" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "./build/mediaelement-and-player.js", + "./build/mediaelementplayer.css" + ], + "bower-asset-ignore": [ + "**", + "!/build/**", + "!/bower.json", + "!/README*" + ] + }, + "license": [ + "MIT" ], - "time": "2015-01-27 15:13:53" + "description": "HTML5