commit 24658ca9bcb5de8d58336837059245c12ca4d742
parent 65c9341c6d2a5ac1990c71a644a5c01758ca6c26
Author: Felicitus <felicitus@felicitus.org>
Date: Wed, 1 Jul 2015 22:52:46 +0200
Removed LiipImagineBundle, upgrade to ExtJS6
Diffstat:
5 files changed, 49 insertions(+), 127 deletions(-)
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -61,7 +61,6 @@ class AppKernel extends Kernel
new PartKeepr\ApiDocBundle\PartKeeprApiDocBundle(),
new Dunglas\ApiBundle\DunglasApiBundle(),
new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(),
- new Liip\ImagineBundle\LiipImagineBundle(),
);
// Developer bundles
diff --git a/composer.json b/composer.json
@@ -36,11 +36,10 @@
"sensio/distribution-bundle": "~2.3",
"sensio/framework-extra-bundle": "~2.3",
"sensio/generator-bundle": "~2.3",
- "incenteev/composer-parameter-handler": "~2.0",
"nelmio/api-doc-bundle": "2.9.0",
"friendsofsymfony/rest-bundle": "1.5.0",
"cbsi/doctrine2-nestedset": "dev-master",
- "zendmaniacs/extjs5": "dev-master",
+ "partkeepr/extjs6": "dev-master",
"fortawesome/font-awesome": "4.1.0",
"doctrine/doctrine-fixtures-bundle": "2.2.*",
"symfony/doctrine-bridge": "2.7.x-dev",
@@ -48,7 +47,7 @@
"dunglas/api-bundle": "1.0.*@dev",
"symfony/serializer": "2.7.1",
"brainbits/fugue-icons-bundle": "^3.5",
- "liip/imagine-bundle": "^1.3"
+ "imagine/imagine": "^0.6.2"
},
"autoload": {
"psr-0": { "": "src/",
@@ -77,7 +76,7 @@
"file": "app/config/parameters.yml"
},
"installer-paths": {
- "web/js/packages/{$name}": ["zendmaniacs/extjs5"]
+ "web/js/packages/{$name}": ["partkeepr/extjs6"]
}
},
"require-dev": {
diff --git 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"
],
- "hash": "8136ef51db822c160f3d5a93b057ccab",
+ "hash": "901fa87432596dc49f7c9f3b41657a9b",
"packages": [
{
"name": "brainbits/fugue-icons-bundle",
@@ -1079,12 +1079,12 @@
"source": {
"type": "git",
"url": "https://github.com/dunglas/DunglasApiBundle.git",
- "reference": "2e8bed5b85931cfedd57d6887d4267ad3da6d36c"
+ "reference": "e5d4db276c15da522e0e4f71a472af282936509d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/2e8bed5b85931cfedd57d6887d4267ad3da6d36c",
- "reference": "2e8bed5b85931cfedd57d6887d4267ad3da6d36c",
+ "url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/e5d4db276c15da522e0e4f71a472af282936509d",
+ "reference": "e5d4db276c15da522e0e4f71a472af282936509d",
"shasum": ""
},
"require": {
@@ -1145,7 +1145,7 @@
"json",
"rest"
],
- "time": "2015-06-23 09:28:39"
+ "time": "2015-07-01 08:16:18"
},
{
"name": "dunglas/php-property-info",
@@ -1688,81 +1688,6 @@
"time": "2014-12-12 05:04:05"
},
{
- "name": "liip/imagine-bundle",
- "version": "1.3.0",
- "target-dir": "Liip/ImagineBundle",
- "source": {
- "type": "git",
- "url": "https://github.com/liip/LiipImagineBundle.git",
- "reference": "24c977ccf1a15854dc5fb3efc5de86011f8f0ef3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/liip/LiipImagineBundle/zipball/24c977ccf1a15854dc5fb3efc5de86011f8f0ef3",
- "reference": "24c977ccf1a15854dc5fb3efc5de86011f8f0ef3",
- "shasum": ""
- },
- "require": {
- "imagine/imagine": "~0.5,<0.7",
- "php": ">=5.3.2",
- "symfony/filesystem": "~2.3 || ~3.0",
- "symfony/finder": "~2.3 || ~3.0",
- "symfony/framework-bundle": "~2.3 || ~3.0",
- "symfony/options-resolver": "~2.3 || ~3.0"
- },
- "require-dev": {
- "amazonwebservices/aws-sdk-for-php": "~1.0",
- "aws/aws-sdk-php": "~2.4",
- "doctrine/cache": "~1.1",
- "doctrine/mongodb-odm": "1.0.*",
- "doctrine/orm": "~2.3",
- "ext-gd": "*",
- "phpunit/phpunit": "~4.3",
- "psr/log": "~1.0",
- "symfony/browser-kit": "~2.3 || ~3.0",
- "symfony/console": "~2.3 || ~3.0",
- "symfony/form": "~2.3 || ~3.0",
- "symfony/phpunit-bridge": "~2.3 || ~3.0",
- "symfony/yaml": "~2.3 || ~3.0",
- "twig/twig": "~1.0"
- },
- "suggest": {
- "amazonwebservices/aws-sdk-for-php": "Add it if you'd like to use aws v1 resolver",
- "aws/aws-sdk-php": "Add it if you'd like to use aws v2 or v3 resolver",
- "monolog/monolog": "If you'd want to write logs",
- "twig/twig": "If you'd want to use some handy twig filters"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev",
- "dev-0.x": "0.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Liip\\ImagineBundle": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Liip and other contributors",
- "homepage": "https://github.com/liip/LiipImagineBundle/contributors"
- }
- ],
- "description": "This Bundle assists in imagine manipulation using the imagine library",
- "homepage": "http://liip.ch",
- "keywords": [
- "image",
- "imagine"
- ],
- "time": "2015-06-04 11:44:07"
- },
- {
"name": "michelf/php-markdown",
"version": "1.5.0",
"source": {
@@ -2076,6 +2001,35 @@
"time": "2014-12-12 10:59:05"
},
{
+ "name": "partkeepr/extjs6",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/partkeepr/extjs6.git",
+ "reference": "6e6492ba3a0ba40753805cff4c2aeac069b15426"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/partkeepr/extjs6/zipball/6e6492ba3a0ba40753805cff4c2aeac069b15426",
+ "reference": "6e6492ba3a0ba40753805cff4c2aeac069b15426",
+ "shasum": ""
+ },
+ "require": {
+ "composer/installers": "~1.0"
+ },
+ "type": "zend-extra",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPLv3"
+ ],
+ "description": "ExtJS 6.0.0.640 distro",
+ "keywords": [
+ "PartKeepr",
+ "extjs6"
+ ],
+ "time": "2015-07-01 20:21:32"
+ },
+ {
"name": "phpdocumentor/reflection",
"version": "1.0.7",
"source": {
@@ -2483,12 +2437,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/DoctrineBridge.git",
- "reference": "67454aa55d8351c5b53cb7cfa442cb342197cc64"
+ "reference": "aa7eb6751902df204c281186c2db414d154e088e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/67454aa55d8351c5b53cb7cfa442cb342197cc64",
- "reference": "67454aa55d8351c5b53cb7cfa442cb342197cc64",
+ "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/aa7eb6751902df204c281186c2db414d154e088e",
+ "reference": "aa7eb6751902df204c281186c2db414d154e088e",
"shasum": ""
},
"require": {
@@ -2544,7 +2498,7 @@
],
"description": "Symfony Doctrine Bridge",
"homepage": "https://symfony.com",
- "time": "2015-06-18 16:13:27"
+ "time": "2015-06-28 17:13:14"
},
{
"name": "symfony/monolog-bundle",
@@ -3135,35 +3089,6 @@
"zf2"
],
"time": "2015-06-03 15:32:03"
- },
- {
- "name": "zendmaniacs/extjs5",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/zendmaniacs/extjs5.git",
- "reference": "fb0969d7ec628fdc13fe05bbba2a463ad2f21d1a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendmaniacs/extjs5/zipball/fb0969d7ec628fdc13fe05bbba2a463ad2f21d1a",
- "reference": "fb0969d7ec628fdc13fe05bbba2a463ad2f21d1a",
- "shasum": ""
- },
- "require": {
- "composer/installers": "~1.0"
- },
- "type": "zend-extra",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPLv2"
- ],
- "description": "ExtJS 5.1.0.107 distro",
- "keywords": [
- "extjs5",
- "zendmaniacs"
- ],
- "time": "2015-05-28 11:00:53"
}
],
"packages-dev": [
@@ -3229,7 +3154,7 @@
"minimum-stability": "stable",
"stability-flags": {
"cbsi/doctrine2-nestedset": 20,
- "zendmaniacs/extjs5": 20,
+ "partkeepr/extjs6": 20,
"symfony/doctrine-bridge": 20,
"dunglas/api-bundle": 20
},
diff --git a/extras/library/extjs5 b/extras/library/extjs5
@@ -1 +0,0 @@
-Subproject commit 6adaee3015360d0bdb9bf8dfcb685905651da576
diff --git a/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig b/src/PartKeepr/FrontendBundle/Resources/views/index.html.twig
@@ -13,8 +13,10 @@
<!-- Include the ExtJS CSS Theme -->
{% stylesheets
filter='cssrewrite'
- 'js/packages/extjs5/packages/ext-theme-neptune-touch/build/resources/ext-theme-neptune-touch-all-debug.css'
- 'js/packages/extjs5/packages/extux/statusbar/css/statusbar.css'
+ 'js/packages/extjs6/build/classic/theme-neptune-touch/resources/theme-neptune-touch-all.css'
+ 'js/packages/extjs6/build/packages/ux/classic/neptune/resources/ux-all.css'
+ 'js/packages/extjs6/build/packages/charts/classic/neptune/resources/charts-all.css'
+ '@PartKeeprFrontendBundle/Resources/public/css/PartKeepr.css'
%}
<link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %}
@@ -33,14 +35,12 @@
</script>
{% javascripts
output='js/compiled/main.js'
- 'js/packages/extjs5/build/ext-all-debug.js'
- 'js/packages/extjs5/packages/ext-charts/build/ext-charts.js'
- 'js/packages/extjs5/packages/extux/statusbar/StatusBar.js'
- 'js/packages/extjs5/packages/extux/statusbar/ValidationStatus.js'
+ 'js/packages/extjs6/build/ext-all-debug.js'
+ 'js/packages/extjs6/build/packages/charts/classic/charts.js'
+ 'js/packages/extjs6/build/packages/ux/classic/ux.js'
'@PartKeeprFrontendBundle/Resources/public/js/Util/i18n.js'
'@PartKeeprFrontendBundle/Resources/public/js/Util/JsonWithAssociationsWriter.js'
'@PartKeeprFrontendBundle/Resources/public/js/PartKeepr.js'
- 'js/packages/extjs5/packages/extux/TabCloseMenu.js'
'@PartKeeprFrontendBundle/Resources/public/js/compat.js'
'@PartKeeprFrontendBundle/Resources/public/js/Ext.ux/NumericField.js'
'@PartKeeprFrontendBundle/Resources/public/js/Components/Widgets/CurrencyNumberField.js'
