Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
842772c Merge commit '0e72f4b21db21ffe42c5836761452d18cf0d6d12' into maintenance/3.0 ca52781 Merge commit '04ca95074be3a990fed20bc103c82c73a59c7ef7' into maintenance/3.0 04ca950 Squashed 'package/marello/' changes from 1999cc1..b7ac5c4 31bdc5e - Updated validation on WarehouseGroup, remove required asterisk on description c739b3f Merge commit 'fea3dea76b8b638d7f79d8b3708f785be7354814' into maintenance/3.0 fea3dea Squashed 'applications/marello-application-ee/' changes from a55ceb2..0ec7b82 0398dad Merge commit 'bde1161731d733d62102ae203244ae6f28810003' into maintenance/3.0 bde1161 Squashed 'applications/marello-application-ee/' changes from 1994f4f..a55ceb2 423efea - remove internal versions f599228 - added entity_grid_all_view_label to all relevant entities on EE aacf6ac Merge branch 'maintenance/3.0' into feature/MAR10001-870 7708615 - made the status handler services for enabling/disabling datagrid row actions public for enabling/disabling rules on row action de62692 - updated services to be public in order to use the mass action handler and enable/disable wfa rules f63db91 - removed `selectAll` from datagrids that were having issues with selecting rows only when having pgsql as db driver 12038db - reverted ReplenishmentOrderRepository as service to fix the issue with alllocated cron command c302bb9 Merge branch 'maintenance/3.0' into feature/MAR10001-870 b58e3a7 MAR10001-870: Creating the OroCommerce integration in Marello 3.0 is having issues with fetching the Attribute Family from OroCommerce 6e8e344 Merge branch 'release/3.0.1' into maintenance/3.0 fbdd64c Merge commit '9f8826c1ed6098ac7a470b99f48436dc693e4026' into release/3.0.1 9a9f5aa Merge commit 'c8ab65a29b0a1894abb5d30a21f0d712a5db94ae' into release/3.0.1 ab570a0 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 227ee97 Merge commit '0cebbb868afa87ce24298ed4c9ddd449f456838b' into release/3.0.1 7fd041c - updated composer.json to internal versions 6dde980 Merge commit '1994f4f34847af1a1fd1d9a973fed6d23564aeb8' into release/3.0.1 0e1efed Merge commit '051c13f9a7cb31707f92cfcd8832c1bc83c6270c' into release/3.0.1 051c13f Squashed 'applications/marello-application-ee/' changes from a69ba4a..1994f4f db16b5f Merge commit '9c356b21a489b094195eda075a1b298a95a07813' into release/3.0.1 9c356b2 Squashed 'applications/marello-application/' changes from 3a5a0ae..95a24c2 580cf0b -Merge commit '9c0afd120e710e8bdfcf50358fb22f5babcbd317' into release/3.0.1 2b5ca1c Merge commit '9586a6de30de76d1dacf6808b7c6e547aabb705a' into release/3.0.1 9586a6d Squashed 'package/marello/' changes from 9051b1f..1999cc1 c0f2d07 - removed internal versions a5dbcde - Added save and new buttons to warehouse, warehouse group and warehouse channel group linking on the create and update views - changed selectAll to false in 'not-linked-saleschannelgroups-grid', SalesChannelGroup datagrid, as it was not possible to add a SCG to a WHG with postgres installed 5b22a67 Merge branch '3.0-test' into maintenance/3.0 f9f41a2 merged maintenance/3.0 branch into 3.0-test 84ae871 - updated orocommerce application using 4.1.0 version - updated dev.json and dev.lock to create the updated environment 56fa9c9 fixed problem with schema update 307ca25 Merge branch 'feature/MAR10001-766' into feature/MAR10001-759 fef7637 Merge branch 'feature/MAR10001-759' 18b0ae4 made productName not audittable field 1994f4f - Added composer.lock files for 3.0 applications 1b6d842 - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json 99411a9 - removed internal version in Marello EE - updated not merged translations - updated version number in EE Readme - updated dev dependencies in EE / CE applications - updated author name in packages's composer.json 42de4d0 Merge branch 'develop' into test 6f261c0 Merge branch 'develop' into test de970ea Merge branch '3.0' into test 4f26502 Merge commit '4531bc1f6d96c73cf6bd961956a99e01a0f6ce64' into test 6e99112 Merge commit '2819c3c3081048e75dd1f381ed7719f52f1a4d62' into test b16fb8c Merge commit '4487e16f32edab5591a323617e90704af2e73109' into test 7824d81 Merge branch '3.0' into develop 1de9afb Merge branch '3.0' into develop edd0d7d - updated environments with :delegated parameter on docker env - added 'final' steps on workflows - removed deletion of old customer data in order to preserve possible extended fields and keep issues with old foreign keys at bay - updated UPGRADE file in order to specify additional step for Marello upgrade to 3.0 for smooth transition - updated README of EE in order to update the current requirements for Marello 3.0 applications 3736a98 - removed .class parameters from service container and replaced it with the FQCNs 0f069d4 - fixing config for test environment on marello application ee fad81db - Added missing translation labels 5d74c3d - updated unit test with the removal of the warehouse constructor argument for the InventoryItem as this has been removed as it was deprecated 67cfafd - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys 1e30065 - Updated InventoryLevelLogGridListenerTest with the removal of the previous join, it will not check if it's being called - Updated phpunit.xml.dist of servicepoints application to remove deprecated attributes - Updated phpunit.xml.dist of marello-ee application with uncommenting the Oro TestFramework in order to check on DB and translation keys 8e3244f - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints 72d63c0 - updated test-psr command line arguments in all applications - updated some trivial data in the dev/composer.json files like author name, descriptions and required symfony version - updated composer.json files with the version number to be installed for the applications in preparation for the release - fixed CS PSR2 in other marello packages, such as subscriptions, enterprise and servicepoints bb9731f - updated dev.lock files for Marello CE, Marello EE and Marello Subscription applications dbb18f8 Merge branch 'feature/MAR10001-845' into 3.0 a2b8a3d MAR10001-845: Update WHG and SCG datagrids with the joins in a datagrid listener d0d471a Merge branch '3.0' of https://github.com/marellocommerce/development-mono-repository into 3.0 6c803bd Merge branch 'feature/MAR10001-842' into 3.0 77056b1 Merge branch 'feature/MAR10001-776' into 3.0 dd9645c Merge branch 'feature/MAR10001-776' into 3.0 f580c05 MAR10001-776: Inventory Batches - fixed bug in replenishment 993d22a Merge branch 'feature/MAR10001-776' into 3.0 5ece85e MAR10001-842: Issue when creating Order when Google Address Geocoding is enabled 913156d MAR10001-776: Inventory Batches - InventoryBatches combined in replenishment orders be05560 [WIP] - working on the migration from existing inventory level logs to the new data structure for it - fixing issue where the inventory level log is being removed as soon as an inventory level is deleted - added additional columns to the inventorylevellog in order to be able to have a history of movements for the whole inventory item - updated data grid in order to display the log based on different columns and identifiers - updated enterprise grid listener for displaying different column as warehouse label - added warehouseName as human readable reference of which inventory level it was a movement of - removed FK on inventory level in order to keep the inventorylevel log 7def929 - Merge branch 'feature/MAR10001-776' into feature/update-to-rc3 - Removed deprecated property 'warehouse' from InventoryItem, constructor of InventoryItem and getters and setters for the property 0a67101 - updated applications (most used application variations) with new OroRequirements which require at least PHP 7.1.13 - updated dev.lock files with OroPlatform 4.1.0-rc4 and related packages (calendar, platform-enterprise etc.) - updated docker-compose files to include php 7.3.13 as version to build - updated .gitignore files to include the package.json - add package-lock.json files as this will be the locked npm package versions file - updated activity_list.provider tag to include FQCN for the activity 3b6dc91 MAR10001-776: Inventory Batches - updated Inventory Level import/export - added column 'enabled batch inventory' to inventory items grid 4ae7c41 - updated dev lock files to include mtdowling/cron-expression version v1.2.3 to cover for the incorrect cron expression of the oro:cron:calendar:date in the OroReportBundle 1fc0f6e - fixed js component for purchase orders - fixed issue with showing currency symbol and prices b24be47 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 bfbbca7 Merge branch 'feature/MAR10001-742_Send-invoice-in-workflow' into feature/update-subscriptions-rc3 31fa770 merged branch 3.0 into feature/MAR10001-776 6810fd7 Merge branch 'feature/MAR10001-776' into feature/update-subscriptions-rc3 d02330f - Fixed install issue of Subscription with attribute set not having an organization property anymore - Updated dev.lock files of all applications to RC3 9c4e096 - updated address js component to use the widgetmanager with the updated structure - updated address related views for Order, Supplier and Subscription 51ff680 - fix first part of the OrderReplenishment JS module - [WIP]: bug when deleting a single row and adding it back again, in which it is rendered but not in the collection of added products 03e4a0e - updated dev.lock of ce to use 4.1-rc2 - updated enterprise application to include new requirements and updated config by removing require_js config settings 159c929 - updated marello EE dev.lock 4c199af - Updated js resources for orocommerce bridge, enterprise and subscription to comply with new webpack implementation 5b525d7 - Updated application to Oro Platform 4.1-RC - Updated some components to comply with new webpack implementation of Oro Platform 4.1-rc c67dace MAR10001-776: Inventory Batches - new comments fixed f3d5531 - reverted to old sticky note icon d445499 - changed the sticky note text - reverted commmented line in phpunit.xml 3612645 - fixed the sticky note description and logo - updated help link on the question icon on the top b049b77 - remove instore assistant bundle as we are going to move the code to a separate repo and introduce it as an extension b1b92a9 MAR10001-774: Remove increase / decrease external warehouses option d2ea56e Merge branch 'feature/MAR10001-765' into 3.0 336d292 Merge branch '3.0' into feature/MAR10001-776 6294462 MAR10001-802: WFA rule index is not rendering d4660b3 MAR10001-765: Update InventoryRebalance Command f334d74 - updated symfony/contracts to 1.1.0 instead of 1.0.2 to be more up to date with dependency version and not have it break the installation with the dev.json 6586846 - updated dev.lock files to include symfony/contracts v1.0.2 since it fails to install on some servers with v1.1.8 :/ ffa5dde MAR10001-776: Inventory Batches - bug fixed 7286929 MAR10001-776: Inventory Batches - added inventoryBatch creation on PurchaseOrder complete - updated inventoryBatches allocation by q-ty for order dab3244 Merge branch 'feature/MAR10001-769' into 3.0 0c34245 - updated dev.lock with Oro Platform beta 4.1 d94991b - updated dev.lock with Oro Platform beta 4.1 863b7c8 MAR10001-776: Inventory Batches 4624439 - added SymfonyRequirements to ee environment - [WIP]: updated assignSalesChannels.twig, still not able to mass assign saleschannels to products - updated order view to switch invoices and packingslip grids as it seems a more logical order for displaying the data - removed unnecessary divs which where messing up the css on some datagrids c9336b9 - Fixed issue with deprecated dependency of OrderWarehousesProvider where the service definition was updated but not the class itself - Updated dev.lock file for Marello CE to include Oro 4.x - Added SymfonyRequirements to git as this is not being installed via composer anymore - Updated phpunit.xml.dist by removing incompatible notation of logging incomplete tests - Updated composer.json and dev.json files to include symfony require as extra to use symfony flex globally 752cd2c - updated dev.lock - updated environment to look for version 4 instead of 3 when starting the consumer af00c6d Merge commit '6598534c16cde2c3e1c4989cbf79c56f99b9d43f' into maintenance/2.2 2968f00 - updated dev.lock 77c5004 MAR10001-759: Update OroCommerce bridge for Marello 2.2 - fixed functional tests 2e22d47 MAR10001-766: OroCommerce Bridge f0664be Merge commit 'e0648503de63b2c85be84b8221c1b6275f0abca1' into maintenance/2.2 24ffc8f Merge commit 'bfa4e9daabbc421ed429f987a971b58d80aad9a7' into maintenance/2.2 5a91317 - updated composer locks dc06cc7 - updated branch aliases 4ead445 Merge commit '01a0d5ae6603999e572ad65466187b50d8cba388' into maintenance/2.2 4c0dfd6 Merge commit '651d560e9524a8eb66e396696a20d8414c349ced' into bugfix/PR-GH59-fix-closing-bracket 651d560 Squashed 'package/marello/' changes from 14c2ac8..9051b1f 1c3874b Merge commit 'f4ccf6e09bf029797d5590a52f1a26db5f9d4721' into maintenance/2.2 f4ccf6e Squashed 'package/marello/' changes from dafe2dd..14c2ac8 8e6e356 MAR10001-759: Update OroCommerce bridge for Marello 2.2 bfa4e9d - added composer locks for release - updated composer json to correct version of marello 3f5e14c merged branch develop into 3.0 407b49f Merge branch 'task/MAR10001-add-orocommerce' into develop 4d68c18 merge branch 3.0 into feature/MAR10001-730 3d541ef merge branch 3.0 into feature/MAR10001-730 53687df merge branch 3.0 into feature/MAR10001-714 3cb787a merge branch 3.0 into feature/MAR10001-714 164b57c Merge branch '3.0' into feature/MAR10001-725 2ead95a Merge branch '3.0' into feature/MAR10001-725 321a8be Merge branch '3.0' into feature/MAR10001-718 67d151d - finetuned composer json files for oro commerce b07887c Merge branch 'task/MAR10001-745-add-organization-ownership-to-child-entities' into develop c86dada - Added Organization ownership to ReplenishmentOrderItem - Added migration to update current ReplenishmentOrderItems - Added translation for Organization label - Updated installer migration to include Organization column 174f294 merge develop branch into feature/MAR10001-717 ' c7cbf16 merge develop branch into feature/MAR10001-717 ' c27c3b4 MAR10001-714: Payment methods ca1d577 merge develop branch into feature/MAR10001-714 63ac41b Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 196ce99 Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 38381a0 - updated lock files for php 7.1.x since this is the minimum installation req for php - added some args to build context of the web container for changing php versions 'easier' 06f7cea merged develop branch into feature/MAR10001-714 branch 4cd24f0 merged develop branch into feature/MAR10001-714 branch f9f9fc7 - Reverted changes that break BC, added comments where BC would break if we would keep the changes in the Interface - Added alternatives to provide same functionality but without BC breaks b6a6295 Merge branch 'develop' into feature/MAR10001-674 2d6e6c2 Merge branch 'develop' into feature/MAR10001-674 8798a6b Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop 41eb181 Merge branch 'task/MAR10001-0-remove-unessary-rebalance-job-from-migration' into develop d9c0a5a Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow b152eff Merge branch 'develop' into feature/MAR10001-742_Send-invoice-in-workflow 8624481 - CS Fixes 3157f99 MAR10001-674: Order on Demand - fixed warehouses calculations for order 4f1b64a - remove unused code from validator 38dba3c MAR10001-674: Order on Demand 354eb2a MAR10001-674: Order on Demand 47dcc22 - Updated dev.lock files - Updated oro platform to version 3.1.13 fd770c7 MAR10001-730: Update CustomerBundle with Customer - rollback in OroRequirements.php 94156b1 backmerged develop branch into feature/MAR10001-730 branch 8114ffe backmerged develop branch into feature/MAR10001-730 branch fb45782 MAR10001-730: Update CustomerBundle with Customer 095c15e - platform update ce3e763 - platform update 4850109 - remove composer.lock file from marello application ee for branch 5e4e098 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 06c9a93 Merge commit '1fcaceed572eb29296aba81d50c4746ea44a9d0b' into maintenance/2.1 87da1df Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1 2e19a3b Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 1f1d98d Merge branch 'bugfix/GH-PR9-update-ororequirements' into develop 3a3691b Update OroRequirements check to be compatible with Oro Platform 3.1.x 3a1cbf1 Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements 16fb64d - Updated demo data for PO in order to make sure there are actually POitem candiates for creating a PO da77ef4 Merge branch 'feature/MAR10001-676-purchase-order-notification' of https://github.com/marellocommerce/development-mono-repository into feature/MAR10001-676-purchase-order-notification 8149da2 Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 87c1355 Merge branch 'develop' into feature/MAR10001-725 133dcb6 Merge branch 'develop' into feature/MAR10001-725 620576b Merge branch 'develop' into feature/MAR10001-676-purchase-order-notification 9447e30 - changed Warehouse Location to Pick location - Updated migrations, tests and translations 0084c62 MAR10001-725: Update ProductBundle b933a9d - Added warehouseLocation to InventoryLevel form fields 7d95723 Merge branch 'feature/MAR10001-701_Payment-term' into develop f0847bf - removed unsued and duplicate class 5ac9cca Merge commit '88a66e97085d3973c1f3ab5688d657f589675912' into feature/MAR10001-674 8ab5e23 Merge commit 'c5439ea9dcce676be7d610bd46086d4843c58fad' into feature/MAR10001-674 561fb31 Merge commit '22b754da8f9fb0b396a651fd3f9a1a84ad4a6e61' into feature/MAR10001-13_Create-pdfs 067aaf1 - updated lock files to have mpdf as dependency in lock files 5a2955d - updated lock files to have mpdf as dependency in lock files 9fa4992 Squashed 'package/marello/' changes from aff5639..dafe2dd 9b319a2 Merge commit '9fa49926a0e01508f988164f88559744622be764' into feature/MAR10001-701_Payment-term 7f55039 MAR10001-718: Refactor LocaleBundle - backmerged develop branch 4ad1a19 - updated workflow #2 for switching shipping and invoicing steps in order workflow - updated translation for workflow #2 - updated configuration for workflow #1 to be able to handle more than 1 workflow on a single entity - disabled workflow #2 by default ef1c3c8 MAR10001-717: Update applications with Oro platform 4.0.0 7c18f4b MAR10001-717: Update applications with Oro platform 4.0.0 9ed64dc Merge commit '11f7d8417a07b4a65cd787387c0e10cc56870352' into feature/MAR10001-692 f7cd807 - remove lock files 48e23b4 - remove lock files from master a69ba4a - Release preparation 2.1 f57e272 Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1 950ed59 - updated branch aliases 5e32a3c Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1 94c2ac7 - updated version number in upgrade notes 460559b - prepared composer.json files for release 10b7811 - prepared composer.json files for release 6922523 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions 430259e - updated translations - updated updated orderitem status Dropshipped to Dropshipping - updated datagrids with removal of exports and some sorters 31cfe5b - removed check from WH listener in order to see the newly created external warehouses 738ac7d Merge commit '5bb4981c46c7990c597fb4344a600bcb969981c5' into feature/MAR10001-676 f62c634 - update translation on confirmation message when trying to delete an inventory level which still has inventory e13834e - merged bugfixes form MAR10001-680 with current code bf0bdd2 Merge commit 'fc161bcddd183c818ccdd11fc5e6934a84d6c566' into bugfix/MAR10001-680 ec68b5f - Added check for Back/Pre-order quantities where the MaxInventoryQty is null - Updated test to check the new order count in DB after if the maxQty is set for back/pre-order 7308500 Merge branch 'develop' into feature/MAR10001-485-subscriptions 18b7a05 - CS fixes - Updated dev.lock 7146d1e Merge branch 'develop' into feature/MAR10001-485-subscriptions ed64df0 Merge commit '5f12bd20893426c155ce26461eb08b0dc2da5297' into feature/MAR10001-670 5f12bd2 Squashed 'package/marello/' changes from bc19533..aff5639 08961a3 - removed unnecessary removal of modal during the disposal since it will be disposed by the parent view call cf1c765 - Changed name of the placeholder data twig function for clarification - Added additional tests for checking the functions of the Additional data Placeholder Provider feature f4715d0 - removed references of subscription bundle in Marello CE core - added the ability add additional placeholder data to render blocks - added additional placeholder data to orders, purcahse orders, suppliers, products and salesChannels 04cd981 - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products 5c414a2 Merge commit 'b4d614d5d259ac0085a2f1583612c1d4ad37139a' into feature/MAR10001-485-subscriptions 6b33c2f Merge commit 'b1ef79ca49e261313c5007056254a522cc673dee' into feature/MAR10001-485-subscriptions b1ef79c Squashed 'package/marello/' changes from c8c0bdc..591b9c9 9efc39b Merge commit 'f5d918d8bfff382f5e781e8224b6116c9c38a277' into feature/MAR10001-485-subscriptions a27d7c2 Merge commit 'e5280b59fd2f4e57a38bc08bb62f43344bae4ef0' into feature/MAR10001-485-subscriptions e5280b5 Squashed 'package/marello/' changes from 7660d1a..c8c0bdc 9f7032e Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions 9994dac Merge branch 'bugfix/MAR10001-0-fix-email-template-tags' into feature/MAR10001-485-subscriptions cedbb82 - added fixes for non escaped twig tags in replenishment and return emails d8de161 Merge branch 'develop' into feature/MAR10001-485-subscriptions 81c0538 Merge branch 'develop' into feature/MAR10001-485-subscriptions 8ae6374 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499 77897ec Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into develop 5b45aff Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions 0b6057f Merge branch 'feature/MAR10001-0-fix-is-managed-inventory-level' into feature/MAR10001-485-subscriptions c793617 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged aab29a8 - fixed issue with managedInventory interfering with updating inventoryLevels and or going from managed to unmanaged 3bf91e8 Merge commit '097d4235d69c0c86a7df735078efbdfa75437cbd' into feature/MAR10001-485-subscriptions d616475 Squashed 'package/marello/' changes from bc19533..7660d1a 31a26c3 Merge commit 'd616475ea6c833b33481537e80d73a114b76df94' into feature/MAR10001-485-subscriptions 1156ddb - updated PSR-4 autoloading for marello, marello-enterprise and subscriptions - updated dev lock for enterprise application with subscriptions extension enabled dada220 - change dev.lock 232372c - update dev.lock 4754df2 - updated paths for checking psr code style - added phpunit config to application root 09dcc3e Merge commit 'b845ca9ad29f3b591839c9943f6f2e288d12868b' into feature/MAR10001-377 b55e936 Squashed 'package/marello/' changes from ea5a25e..bc19533 b988d6a Merge commit 'b55e936f3c6428ae97c2f440cd8df8e00e3a9127' into feature/MAR10001-377 2dfee55 Merge branch 'feature/MAR10001-604' into develop 0fe5fab - update environment files for easier setup with docker - added phpunit.xml.dist to root dir on marello-ee application - updated psr testing test script in dev.json to look at the vendor directory instead of the src/ dir 4b5ec7e Squashed 'package/marello/' changes from 836c77f..ea5a25e 915513e Merge commit '4b5ec7e8d02e9b7e079e43d024f18dc3a92a9c7d' into development 84e15a9 Merge commit '524a373109305ee69c29ade6f7eaa7bf0f34f6ac' into development 5d5fbe4 Merge commit '40a4d43559a871bd237a9a91e61f6bb33f6db69e' into feature/MAR10001-604 40a4d43 Squashed 'package/marello/' changes from 836c77f..22cfacd b9f30f5 - added composer.lock to .gitignore - remove composer.lock files 2effb1f - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions 558523e - Added generated lock files - Updated composer.json & dev.json files with correct branch alias versions 231ef5f Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff' git-subtree-dir: package/marello-enterprise git-subtree-split: 842772c
- Loading branch information
