James Halsall
a31f4a35c0
Remove the copyright year from file headers
2017-02-22 09:09:36 +00:00
Sergii Kovalenko
eb30343a09
MAGETWO-62855: Copyright Year Update 2017
2017-01-05 13:01:45 +02:00
Joan He
2d368d0134
MAGETWO-48081: Copyright Year Update
2016-03-17 15:49:11 -05:00
Oleksii Korshenko
e27bbb30de
MAGETWO-47439: [Github] i18n:collect-phrases -m can't find many important magento phrases #2630
...
- added translate attributes to menu and ACL configurations
2016-01-25 17:52:21 -06:00
Maksym Savich
a36e2b0dd8
MAGETWO-42855: XSD URN format
2015-09-17 18:31:03 -05:00
Joan He
86d7a50519
Merge remote-tracking branch 'ogres/MAGETWO-40848-components-from-vendor' into MAGETWO-42196-xsd
...
Resolved merge conflicts
2015-09-16 14:15:08 -05:00
Joan He
7247f831c8
Merge remote-tracking branch 'ogres/MAGETWO-40848-components-from-vendor' into MAGETWO-42196-xsd
...
Conflicts:
app/code/Magento/Braintree/view/frontend/layout/braintree_paypal_review.xml
app/code/Magento/BundleImportExport/etc/di.xml
app/code/Magento/Customer/etc/module.xml
app/code/Magento/DesignEditor/etc/adminhtml/di.xml
app/code/Magento/DesignEditor/etc/di.xml
app/code/Magento/DesignEditor/etc/events.xml
app/code/Magento/DesignEditor/etc/frontend/di.xml
app/code/Magento/DesignEditor/etc/frontend/routes.xml
app/code/Magento/DesignEditor/etc/vde/events.xml
app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_files_index.xml
app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_firstentrance.xml
app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_index.xml
app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_launch.xml
app/code/Magento/DesignEditor/view/adminhtml/layout/adminhtml_system_design_editor_loadthemelist.xml
app/code/Magento/EncryptionKey/etc/module.xml
app/code/Magento/ImportExport/etc/module.xml
app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml
app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
app/code/Magento/Sales/etc/resources.xml
app/code/Magento/Search/etc/module.xml
app/code/Magento/User/view/adminhtml/layout/adminhtml_locks_grid.xml
app/code/Magento/Wishlist/view/frontend/layout/wishlist_shared_index.xml
dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml
dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml
dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
2015-09-16 10:07:50 -05:00
Cari Spruiell
2072220101
MAGETWO-38570: Refactor as much functionality from PCI module to rest of core/library modules
...
- moved admin user password and locking functionality from PasswordManagement to User module
- moved customer password upgrade from PasswordManagement to Customer module
- renamed PasswordManagement module to EncryptionKey to contain the encryption key management code
2015-08-27 15:34:05 -05:00
James Halsall