bdnugget/magento2
1
0 Fork 0
mirror of https://github.com/bdnugget/magento2.git synced 2026-11-07 09:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
143,425 Commits 1 Branch 0 Tags
2.4-develop
Commit Graph
70 Commits
Author SHA1 Message Date
engcom-Charlie e068a31ea1 Fixed static test failur 2022-08-09 17:49:09 +05:30
engcom-Charlie c98e958046 Merge remote-tracking branch 'magento/2.4-develop' into newsletter-queue 2022-08-04 16:12:13 +05:30
engcom-Bravo 17ab362b0c ISSUE-33310 Fix static tests failed 2021-12-30 23:05:16 +05:30
engcom-Bravo 990641bd2a ISSUE-33310 updated commented code 2021-12-30 21:43:18 +05:30
engcom-Bravo 4b42e83d47 ISSUE-33310 Fixed unit and static test fail 2021-12-30 21:40:23 +05:30
engcom-Bravo b7139ed9ff ISSUE-33310 Fix the code to appear unsubscribe link in newsletter template 2021-12-30 19:29:15 +05:30
Oleh Usik 03fb76a36a Merge branch '2.4-develop' into newsletter-queue 2021-12-14 10:27:58 +02:00
Karyna 57db88b94e fix Newsletter Queue method for a case with invalid start_at param 2021-10-04 10:55:18 +03:00
Oleh Usik d812f42d55 Added Newsletter queue improvements 2021-08-18 15:39:08 +03:00
Sviatoslav Mankivskyi 127b1b8029 Fix docblock 2018-10-23 15:28:11 -05:00
Bunyamin 51e8fe7118 Convert local timestamp into GMT timestamp 2018-10-08 10:07:17 -03:00
Bunyamin 1b03c19021 Revert back change 2018-10-08 09:16:07 -03:00
Bunyamin 6bda779e40 Convert internationalized date into DateTime object 2018-09-16 15:21:20 -03:00
Bunyamin c4fa85bb59 Move formatter into string conversion block 2018-09-16 14:49:06 -03:00
serhii balko 29eb4762ff MAGETWO-56349: [GITHUB] Newsletter Queue doesn't set to local time #5943 #2937 #7560 2017-08-22 11:32:25 +03:00
serhii balko f6ca40109b MAGETWO-56349: [GITHUB] Newsletter Queue doesn't set to local time #5943 #2937 #7560 2017-08-21 12:50:25 +03:00
serhii balko f746b834d4 MAGETWO-56349: [GITHUB] Newsletter Queue doesn't set to local time #5943 #2937 #7560 2017-08-21 11:30:18 +03:00
Oleksii Korshenko b2ce2a37d9 MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags 
- added @since tag to all @api classes
 2017-08-11 15:26:37 -05:00
Cristian Partica 96d9d1cf50 MAGETWO-71223: Deprecate getResource and getCollection 
- deprecate from AbstractModel and children
 2017-08-09 11:27:56 -05:00
Oleksii Korshenko 56af1e73ce MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags 
- removed @since 2.0.0 as it is a base release
 - updated version in @since and @deprecated tag taking into account all patch releases
 2017-08-02 14:14:33 -05:00
Oleksii Korshenko bd74370771 MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags 
- added release number to all existing @deprecated tag in php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup)
 - added tag @since to all existing php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup)
 2017-07-28 15:43:18 -05:00
Sviatoslav Mankivskyi dece1a06b8 MAGETWO-66839: API annotation coverage (Magento/Newsletter) 2017-04-10 17:46:00 +03:00
Oleksii Korshenko 1b5dc60a26 MAGETWO-66875: Remove the copyright year from file headers #8648 2017-03-29 04:48:40 +03:00
Eugene Tulika 3cc57173b7 MAGETWO-66552: Newsletter Email fix #6354 
- Merge Pull Request magento/magento2#6354 from inettman/magento2:patch-1
 2017-03-22 10:46:41 -07:00
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
inettman 9b7dd77e2b Newsletter Email fix 
Fix #5898
 2016-08-26 14:54:24 +03:00
Stanislav Idolov e99627038f MAGETWO-51858: Convert literal class names to \Namespace\Classname::class 2016-04-29 12:29:32 +03:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Serhiy Shkolyarenko 087c8d0174 MAGETWO-43923: [GitHub]ModelResource namespace inconsistency 
renamed  namespace
 2015-10-12 11:59:28 +03:00
Serhiy Shkolyarenko 4e204b1a88 MAGETWO-41527: PHP 7 namespace strict compatibility 
renamed ModelResource
 2015-10-07 20:23:13 +03:00
Iryna Lagno 0457cf36cd MAGETWO-41527: PHP 7 namespace strict compatibility 2015-10-07 17:13:45 +03:00
Serhiy Shkolyarenko e1d6488306 MAGETWO-41527: PHP 7 namespace strict compatibility 
- Updated Magento_Newsletter module for PHP 7 compatibility
 2015-10-06 17:40:48 +03:00
Erik Hansen 2631119b50 Merge remote-tracking branch 'upstream/develop' into feature/responsive-email-structure 
Conflicts:
	app/code/Magento/Email/Model/AbstractTemplate.php
	app/code/Magento/Email/Model/Template.php
	app/code/Magento/Email/Model/Template/Filter.php
	app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
	app/code/Magento/Newsletter/Model/Queue.php
	app/code/Magento/Newsletter/Model/Template.php
	app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php
	app/code/Magento/Sales/Test/Unit/Model/Email/TemplateTest.php
	app/code/Magento/Sales/composer.json
	dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
	dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/Magento/default/Magento_Email/templates/sample_email_content.phtml
	dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content.phtml
	dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/Magento/default/Magento_Email/templates/sample_email_content_custom.phtml
	lib/internal/Magento/Framework/Filter/Template.php
 2015-06-29 18:39:24 -05:00
Alex Bomko 1154f035e8 MAGETWO-38946: Create pull request for a sprint 22 results 
- fix tests
 2015-06-19 16:16:14 +03:00
Maksym Iakusha 3b45713527 MAGETWO-38011: [Nord] Unit test Coverage - Sprint 22 2015-06-15 16:19:07 +03:00
Maksym Iakusha 75a1a76ce3 MAGETWO-38011: [Nord] Unit test Coverage - Sprint 22 2015-06-05 11:49:29 +03:00
Erik Hansen 1774f6fd99 MAGETWO-37672: Responsive Email Foundation 
- Refactored getProcessedTemplate method from Newsletter and Email classes into abstract class
- Removed getPreparedTemplateText method as it wasn't needed
- Changed \Magento\Newsletter\Model\Queue to extend from \Magento\Framework\Model\AbstractModel as it was not
  using the previous parent class methods and prevented getProcessedTemplate from being moved to abstract
- Method/property name cleanup to confirm with PSR-2
 2015-05-29 19:32:00 -05:00
Erik Hansen 42af021fc5 MAGETWO-37672: Responsive Email Foundation 
- Fixed some newsletter and email unit tests
- Code refactoring
 2015-05-22 00:37:30 -05:00
Erik Hansen 1f3ce5ea4b MAGETWO-37672: Responsive Email Foundation 
- Added {{css file="email.css"}} directive
- Added support for the css/template directives to the Newsletter and Newsletter Queue template models
- Refactored how inline css files are added. Now adding to the template model, not the filter model.
- Template styles now load via {{var template_styles}} variable
 2015-05-21 09:33:31 -05:00
Erik Hansen 505fd7b185 Implement {{template config_path=""}} directive 
* Added {{template}} directive to both transactional and newsletter templates
* Removed unused {{include template=""}} directive
* Removed loadByCode methods from email/newsletter models as they're no longer used
* Began updating tests
 2015-05-14 00:02:35 -05:00
Maxim Shikula 88dad17496 MAGETWO-34991: Eliminate exceptions from the list Part2 2015-03-25 16:03:19 +02:00
Ievgen Shakhsuvarov 1289e4e08f MAGETWO-32710: Code micro-optimizations 2015-03-18 12:20:00 +02:00
Sviatoslav Mankivskyi 4193025280 Merge remote-tracking branch 'origin/MAGETWO-32616' into MAGETWO-32432-32616 
Conflicts:
	app/code/Magento/Backend/Block/Dashboard/Graph.php
	app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
	app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
	app/code/Magento/Backup/Model/Backup.php
	app/code/Magento/Catalog/Block/Rss/Product/Special.php
	app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
	app/code/Magento/Core/Helper/Data.php
	app/code/Magento/Core/etc/di.xml
	app/code/Magento/Reports/Model/DateFactory.php
	app/code/Magento/Ui/Component/Filter/Type/Date.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/unit/testsuite/Magento/Framework/Stdlib/DateTime/TimezoneTest.php
	dev/tools/Magento/Tools/View/Deployer.php
	lib/internal/Magento/Framework/Data/Form/Filter/Date.php
	lib/internal/Magento/Framework/Stdlib/DateTime/DateInterface.php
	lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
 2015-02-27 01:24:05 +02:00
Sviatoslav Mankivskyi 5a23defe3c MAGETWO-33900: [Dev] Replace Zend_Date with native PHP DateTime object/functions 2015-02-13 16:06:15 +02:00
Alexander Paliarush 722851c54f MAGETWO-33562: Move StoreManagerInterface back from Framework to App 2015-02-03 15:24:33 +02:00
Yuxing Zheng cb59ad4167 Merge remote-tracking branch 'origin/MAGETWO-31506-Move-URL-Components-From-The-Magento-Core-Module' into develop 
Conflicts:
	app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
	app/code/Magento/Email/Model/AbstractTemplate.php
	app/code/Magento/Email/Model/BackendTemplate.php
	app/code/Magento/Email/Model/Template.php
	app/code/Magento/Newsletter/Model/Queue.php
	app/code/Magento/Newsletter/Model/Template.php
	app/code/Magento/Store/Model/Storage/Db.php
	app/etc/di.xml
	dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
	lib/internal/Magento/Framework/Url/RouteParamsResolver.php
 2015-01-23 15:45:13 -06:00
Dmytro Kvashnin 783d70628b Merge remote-tracking branch 'main_ce/develop' into static_tests 
Conflicts:
	dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
	lib/internal/Magento/Framework/Validator/Factory.php
 2015-01-23 10:35:12 +02:00
Alexander Paliarush 5f9cf53767 MAGETWO-32354: Move Magento\Core\Model\Url\RouteParamsResolver.php to Framework 
- Moved Magento\Store\Model\StoreManagerInterface to Magento\Framework\Store\StoreManagerInterface to avoid dependencies on application from the lib
 2015-01-21 16:38:26 +02:00
Dmytro Kvashnin de2d869676 Merge remote-tracking branch 'main_ce/develop' into static_tests 
Conflicts:
	app/code/Magento/Checkout/Block/Total/Nominal.php
	app/code/Magento/Checkout/view/frontend/templates/total/nominal.phtml
	dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
 2015-01-15 12:10:02 +02:00