From 5e717030db6b2143c86f647a574df03cbe3464a3 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Thu, 21 Nov 2013 11:34:23 +0000 Subject: [PATCH 01/61] Reference Update --- src/OroCRM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OroCRM b/src/OroCRM index 7dea175124..e41b3790e1 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit 7dea175124ddf6e1e572b4623686c3eb89654958 +Subproject commit e41b3790e134bf5a398704d92a8cf934d5a60007 From 88cb5c2bfa05e8874eb9171b1732a916c074a784 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Thu, 21 Nov 2013 18:02:17 +0000 Subject: [PATCH 02/61] Reference Update --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index 1a3b85eb3e..f0eb522e71 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 1a3b85eb3ed81b1e69cc67081ab88af1553749fc +Subproject commit f0eb522e719a20ce7c7a9c9b020feb55f0f283b9 From c2c4fe3bb416d87a33faee9e011fbc4d8150aa5b Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Thu, 21 Nov 2013 18:19:01 +0000 Subject: [PATCH 03/61] Reference Update --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index f0eb522e71..37155436b3 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit f0eb522e719a20ce7c7a9c9b020feb55f0f283b9 +Subproject commit 37155436b3b029463d57ca3eb615118cc2a885a0 From 1aaf33d1f6b7158fcc13131763d28a7a0430bab0 Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Fri, 22 Nov 2013 14:53:56 +0200 Subject: [PATCH 04/61] BAP-2337: Add form extension to provide value of data-validation attribute - removed use of JSFV --- app/config/config.yml | 3 --- app/config/routing.yml | 5 +---- src/Oro | 2 +- src/OroCRM | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 0b3058d01a..63ddde1684 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -205,9 +205,6 @@ a2lix_translation_form: locales: [en, fr] templating: "OroUIBundle:Form:translateable.html.twig" -apy_js_form_validation: - check_modes: [submit] - lexik_maintenance: authorized: path: "maintenance|.*\.js" # "maintenance" is only for demo purposes, remove in production! diff --git a/app/config/routing.yml b/app/config/routing.yml index 5e74cd8df9..25b3384b80 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -12,9 +12,6 @@ _imagine: resource: . type: imagine -_apy_jsformvalidation: - resource: "@APYJsFormValidationBundle/Resources/config/routing/routing.yml" - # # ORO routes # @@ -26,4 +23,4 @@ oro_default: oro_auto_routing: resource: . - type: oro_auto \ No newline at end of file + type: oro_auto diff --git a/src/Oro b/src/Oro index 1a3b85eb3e..3679495504 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 1a3b85eb3ed81b1e69cc67081ab88af1553749fc +Subproject commit 367949550470cb66d1e3343c10e92be7d66b2131 diff --git a/src/OroCRM b/src/OroCRM index e41b3790e1..f3e5166bf1 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit e41b3790e134bf5a398704d92a8cf934d5a60007 +Subproject commit f3e5166bf1d52bb0cc890bd6d45e5e02ce349a48 From 2bcf305d54cbd13f76c667227d52e1e306fae8b2 Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Fri, 22 Nov 2013 15:09:24 +0200 Subject: [PATCH 05/61] BAP-2337: Add form extension to provide value of data-validation attribute - updated reference --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index deacacd1cd..2a61fb49c9 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit deacacd1cd6b0fecb0daed70e571da6ced7b6db3 +Subproject commit 2a61fb49c9e64dd8c0177ef9ecfd2eba25e010a9 From 1e3424dfb9ad29e9c57a874a0b4dfc4a069efae1 Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Fri, 22 Nov 2013 15:28:58 +0200 Subject: [PATCH 06/61] BAP-2390: Return back use of "oro_assetic" router - added router to config --- app/config/routing_dev.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 172205b9ea..00cb9c7381 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -8,3 +8,7 @@ _profiler: _main: resource: routing.yml + +oro_assets: + resource: . + type: oro_assetic From a652222bca2bd175fe6c2d18390fbe39dfc1b90b Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Mon, 25 Nov 2013 17:28:22 +0200 Subject: [PATCH 07/61] BAP-2337: Add form extension to provide value of data-validation attribute - update submodule reference --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index 2a61fb49c9..dcc040c7a9 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 2a61fb49c9e64dd8c0177ef9ecfd2eba25e010a9 +Subproject commit dcc040c7a9e60f30095b7fee8fcd02fd7f31ad54 From b78fdae3fb994b3d677414a9074aa8598581fd3b Mon Sep 17 00:00:00 2001 From: Dmitry Khrysev Date: Tue, 26 Nov 2013 16:04:15 +0200 Subject: [PATCH 08/61] BAP-2337: Add form extension to provide value of data-validation attribute - removed dependency from composer,json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index f22db0659a..55bcc720e7 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,6 @@ "liip/imagine-bundle": "dev-master", "leafo/lessphp": "dev-master", "willdurand/expose-translation-bundle": "0.2.*@dev", - "apy/jsfv-bundle": "dev-master", "genemu/form-bundle": "2.2.*", "zendframework/zend-mail": "2.1.*", "a2lix/translation-form-bundle" : "1.*@dev", From 9bef06822da1000013328a67e3e8d21402eac6f9 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Tue, 26 Nov 2013 17:02:32 +0000 Subject: [PATCH 09/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index dcc040c7a9..223990be8e 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit dcc040c7a9e60f30095b7fee8fcd02fd7f31ad54 +Subproject commit 223990be8e91ebcee12d5535ea0cb3a5be7071a0 diff --git a/src/OroCRM b/src/OroCRM index f3e5166bf1..7dad9b7132 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit f3e5166bf1d52bb0cc890bd6d45e5e02ce349a48 +Subproject commit 7dad9b7132a9cccdb588bbb8e3e8a3173b9b288e From 456a68bb5214e707bd5ae9bb2b46eebe2413fedf Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Wed, 27 Nov 2013 10:30:02 +0000 Subject: [PATCH 10/61] Reference Update --- src/OroCRM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OroCRM b/src/OroCRM index 7dad9b7132..7c18532bf5 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit 7dad9b7132a9cccdb588bbb8e3e8a3173b9b288e +Subproject commit 7c18532bf5c287d8d3ab712890f4bfcc87a57249 From ed4f1742b68acfda67a5369af520e9411a8ed22b Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Wed, 27 Nov 2013 11:12:39 +0000 Subject: [PATCH 11/61] Reference Update --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index 223990be8e..ba8d2b7672 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 223990be8e91ebcee12d5535ea0cb3a5be7071a0 +Subproject commit ba8d2b76722dd509894c86c77b5bef85fcb62555 From 36902083acca9c774d5eca5a095bbee67a326580 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Wed, 27 Nov 2013 11:38:24 +0000 Subject: [PATCH 12/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index ba8d2b7672..c7948ffe70 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit ba8d2b76722dd509894c86c77b5bef85fcb62555 +Subproject commit c7948ffe7097549e36be62927dbfdb8192d2f64d diff --git a/src/OroCRM b/src/OroCRM index 7c18532bf5..cb7c77dfbb 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit 7c18532bf5c287d8d3ab712890f4bfcc87a57249 +Subproject commit cb7c77dfbb684a7a4dd198dabeba8a5ed54c8980 From 6207de73c367fd1762b20789d070747f9c4569ca Mon Sep 17 00:00:00 2001 From: Roman Grebenchuk Date: Wed, 27 Nov 2013 17:29:37 +0200 Subject: [PATCH 13/61] BAP-2399: Impossible to reinstall application - removed fos-routing command from composer.json --- composer.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 55bcc720e7..511998094c 100644 --- a/composer.json +++ b/composer.json @@ -60,18 +60,14 @@ "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "php app/console fos:js-routing:dump --target=web/js/routes.js" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ], "post-update-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "php app/console fos:js-routing:dump --target=web/js/routes.js" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ] }, "minimum-stability": "dev", From 0a479e7cbde08dfaf92f1e95d138ec36547d0c7f Mon Sep 17 00:00:00 2001 From: Ivan Klymenko Date: Thu, 28 Nov 2013 16:02:18 +0200 Subject: [PATCH 14/61] BAP-2405: Segmentation Fault in develompment mode - removed unnecessary js_debug init for oro_assetic --- app/config/config_dev.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index b96b98a7fa..f67d9a34f8 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -22,8 +22,6 @@ twig: base_template_class: Oro\Bundle\UIBundle\Twig\Template oro_assetic: - js_debug: ~ - js_debug_all: false css_debug: ~ css_debug_all: false From f01c84a32319b56b6ccebd6466c4e43bcc836640 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Thu, 28 Nov 2013 19:22:49 +0000 Subject: [PATCH 15/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index c7948ffe70..cfa39e8c58 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit c7948ffe7097549e36be62927dbfdb8192d2f64d +Subproject commit cfa39e8c58b916bbd806ae4a2c83f7c34216b845 diff --git a/src/OroCRM b/src/OroCRM index cb7c77dfbb..3c51abc0d3 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit cb7c77dfbb684a7a4dd198dabeba8a5ed54c8980 +Subproject commit 3c51abc0d314cb75af52badb0bdbabd0cca73119 From 0ba75ac8f5aae53cbb80d02036bdb10d514fd256 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Fri, 29 Nov 2013 09:19:33 +0000 Subject: [PATCH 16/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index cfa39e8c58..49e8c69164 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit cfa39e8c58b916bbd806ae4a2c83f7c34216b845 +Subproject commit 49e8c691642214eae4ce8e4733b999f90c4ee622 diff --git a/src/OroCRM b/src/OroCRM index 3c51abc0d3..f7273e2808 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit 3c51abc0d314cb75af52badb0bdbabd0cca73119 +Subproject commit f7273e2808b0fd20265926de952e2361efbccbfc From 7a70feb03bc95b6b3ee1d8419c6268e3c81b398c Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Fri, 29 Nov 2013 09:52:42 +0000 Subject: [PATCH 17/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index 49e8c69164..389576a6c2 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 49e8c691642214eae4ce8e4733b999f90c4ee622 +Subproject commit 389576a6c2009f9cddee623d0a3701654761bfee diff --git a/src/OroCRM b/src/OroCRM index f7273e2808..9c31e99b6e 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit f7273e2808b0fd20265926de952e2361efbccbfc +Subproject commit 9c31e99b6ea19fb47c59fbc9475fcf487312bba4 From 1469b4d0ab34c6ebfaea15c4339e0d85dd59ec48 Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Fri, 29 Nov 2013 15:25:40 +0200 Subject: [PATCH 18/61] BAP-2405: Segmentation Fault in develompment mode - removed use of oro_assetic router in dev mode --- app/config/routing_dev.yml | 4 ---- src/Oro | 2 +- src/OroCRM | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml index 00cb9c7381..172205b9ea 100644 --- a/app/config/routing_dev.yml +++ b/app/config/routing_dev.yml @@ -8,7 +8,3 @@ _profiler: _main: resource: routing.yml - -oro_assets: - resource: . - type: oro_assetic diff --git a/src/Oro b/src/Oro index c7948ffe70..387a371067 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit c7948ffe7097549e36be62927dbfdb8192d2f64d +Subproject commit 387a371067a391d59ae4b822f22059d287c0418f diff --git a/src/OroCRM b/src/OroCRM index cb7c77dfbb..9c31e99b6e 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit cb7c77dfbb684a7a4dd198dabeba8a5ed54c8980 +Subproject commit 9c31e99b6ea19fb47c59fbc9475fcf487312bba4 From bf5a922e8c393606e7daf1ce8b2bae128afac301 Mon Sep 17 00:00:00 2001 From: Dmitry Khrysev Date: Fri, 29 Nov 2013 16:08:15 +0200 Subject: [PATCH 19/61] BAP-1953: B2B Sales Flow adjustments - ref update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index 389576a6c2..f4fd87fa6f 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 389576a6c2009f9cddee623d0a3701654761bfee +Subproject commit f4fd87fa6fc910cbb66d725e1bbb955673130d02 diff --git a/src/OroCRM b/src/OroCRM index 9c31e99b6e..bcc97da908 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit 9c31e99b6ea19fb47c59fbc9475fcf487312bba4 +Subproject commit bcc97da908e2cb675b67601ab5d372cdcf87b96d From de8cbc510bcec587bf4c634755173e754f445a11 Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Fri, 29 Nov 2013 14:46:42 +0000 Subject: [PATCH 20/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index f4fd87fa6f..812473ed25 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit f4fd87fa6fc910cbb66d725e1bbb955673130d02 +Subproject commit 812473ed25020c7b11c88cd45e72f1b9c74048d3 diff --git a/src/OroCRM b/src/OroCRM index bcc97da908..19eb02ad44 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit bcc97da908e2cb675b67601ab5d372cdcf87b96d +Subproject commit 19eb02ad4497d65989e4060604343414be1f4efd From 3a341a7d3df3acb0ec6dd6b70e008f3e3183d9bc Mon Sep 17 00:00:00 2001 From: Dmitry Khrysev Date: Fri, 29 Nov 2013 17:01:00 +0200 Subject: [PATCH 21/61] BAP-1953: B2B Sales Flow adjustments - tests fix --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index f4fd87fa6f..cbe6d673f7 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit f4fd87fa6fc910cbb66d725e1bbb955673130d02 +Subproject commit cbe6d673f714fce6a0dfccb1741a92d7a73ae273 From 82f9ed1c062c0c8d9092ee209578e2c7ab60e3d7 Mon Sep 17 00:00:00 2001 From: Roman Grebenchuk Date: Fri, 29 Nov 2013 17:04:06 +0200 Subject: [PATCH 22/61] BAP-2373: Refactor ACME bundles to use distribution - refactor Oropro to use distribution --- app/AppKernel.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 89d910d588..93b6d04f53 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -9,8 +9,7 @@ class AppKernel extends OroKernel public function registerBundles() { $bundles = array( - // BAPP bundles - new OroPro\Bundle\EwsBundle\OroProfessionalEwsBundle(), + //bundles ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { From c45a0c2e6f1d348ac669e108f4957368fab8015e Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Fri, 29 Nov 2013 17:56:38 +0200 Subject: [PATCH 23/61] BAP-2405: Segmentation Fault in develompment mode - update ref --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index 8d1c17c361..c49d3532cb 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit 8d1c17c3613d8181c41263343b677b08e399bc45 +Subproject commit c49d3532cbd606ceeb89a8785f5f591b3ea96117 From 50070501d4f6dadd94bcf154e78d0eb77655ed6b Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Fri, 29 Nov 2013 16:14:00 +0000 Subject: [PATCH 24/61] Reference Update --- src/OroPro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OroPro b/src/OroPro index a2a761c14d..f190f064f9 160000 --- a/src/OroPro +++ b/src/OroPro @@ -1 +1 @@ -Subproject commit a2a761c14d8845c374b14f13f8e03b457b377762 +Subproject commit f190f064f9ece521e666e016de27657df1912885 From bbae56fbe62ac7ddc9459c200e50ca0a41bdc7be Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Fri, 29 Nov 2013 16:52:37 +0000 Subject: [PATCH 25/61] Reference Update --- src/Oro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro b/src/Oro index c49d3532cb..f42175ba13 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit c49d3532cbd606ceeb89a8785f5f591b3ea96117 +Subproject commit f42175ba13f4121821ba0c4426d1c5ea48a20f68 From 900e35fe74c1132d93bc7f09c4d6fc043e838c9c Mon Sep 17 00:00:00 2001 From: OroCRM Deployer Date: Fri, 29 Nov 2013 17:29:33 +0000 Subject: [PATCH 26/61] Reference Update --- src/Oro | 2 +- src/OroCRM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro b/src/Oro index f42175ba13..fa0247cffa 160000 --- a/src/Oro +++ b/src/Oro @@ -1 +1 @@ -Subproject commit f42175ba13f4121821ba0c4426d1c5ea48a20f68 +Subproject commit fa0247cffa968f5a56816e56998c2c8a143c4e12 diff --git a/src/OroCRM b/src/OroCRM index 19eb02ad44..1111f0fb76 160000 --- a/src/OroCRM +++ b/src/OroCRM @@ -1 +1 @@ -Subproject commit 19eb02ad4497d65989e4060604343414be1f4efd +Subproject commit 1111f0fb76aebba472d6c4af79b0f3218f6d7a27 From ed8fab65d74e23afe2799c9d507d321687f6759f Mon Sep 17 00:00:00 2001 From: Hryhorii Hrebiniuk Date: Fri, 29 Nov 2013 19:57:02 +0200 Subject: [PATCH 27/61] Fixed BAP-2399: Impossible to reinstall application --- composer.json | 8 ++------ web/install.php | 13 ++++--------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 55bcc720e7..dff20da4bd 100644 --- a/composer.json +++ b/composer.json @@ -60,18 +60,14 @@ "post-install-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "php app/console fos:js-routing:dump --target=web/js/routes.js" + "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets" ], "post-update-cmd": [ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "php app/console fos:js-routing:dump --target=web/js/routes.js" + "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets" ] }, "minimum-stability": "dev", diff --git a/web/install.php b/web/install.php index 8c9c7cab32..d50b36994c 100644 --- a/web/install.php +++ b/web/install.php @@ -72,11 +72,8 @@ function iterateRequirements(array $collection) <?php echo $translator->trans('title'); ?> - - + +