Commit Graph
54 Commits
Author SHA1 Message Date
Dan Wallis 151078121f Fix static test failures 2023-03-07 00:02:31 +00:00
Dan Wallis 0ad651b688 Remove forbidden @author tag 2023-03-06 22:38:50 +00:00
Eugene Shakhsuvarov 3a26af4de5 Merge branch 'patch-3' of github.com:tkotosz/magento2 into 2.4-develop-prs 2022-09-16 07:21:46 -05:00
andrii.zinkevych 8b02c435fe AC-3579: Replaced Zend_Validate with laminas/laminas-validator 2022-08-24 23:18:36 +02:00
Tibor Kotosz bae09cd98b Fix issue when login is not recorded for updated admin user 2022-08-12 14:40:27 +02:00
Sachin Admane 25a31a8010 AC-1323: Rest Token Improvement. 2021-12-01 14:00:54 -06:00
Doru Petruc 9cb53cdcd3 fix for ambigous column user_id in where clause ( Model\ResourceModel\User\Collection addFilterToMap for user_id ) 2020-12-08 14:09:49 +02:00
Dmytro Voskoboinikov 2d574be31f Merge branch '2.4-develop' into 2.4.1-develop
# Conflicts:
#	app/code/Magento/Store/etc/config.xml
2020-07-28 21:20:27 -05:00
magento-team 6729b6e013 Updated deprecation doc annotations 2020-07-20 10:37:42 -07:00
OlgaVasyltsun 67fae82c62 MC-34197: Admin user improvement 2020-06-09 13:19:12 +03:00
Myroslav Dobra 592cb1e90e MC-30224: [2.4] Deleting an empty user model caused deleting admin role 2020-01-09 14:54:50 +02:00
Myroslav Dobra d05e25bdd4 MC-30224: [2.4] Deleting an empty user model caused deleting admin role 2020-01-06 12:22:43 +02:00
Eden d1f7f0d2cc Fix static test 2019-08-19 17:41:29 +07:00
Eden 7a8026d466 remove useless logic 2019-08-19 16:17:54 +07:00
Eden 91df9ce068 Resolve undefine variable in _createUserRole function 2019-08-19 16:08:40 +07:00
Magento EngCom Team 64f63b3cf5 ⏫ Forwardport of magento/magento2#12516 to 2.3-develop branch
Applied pull request patch https://github.com/magento/magento2/pull/12516.patch (created by @lfluvisotto) based on commit(s):
  1. 702d7fe27916ed66dbb72af5bd59d07c58d546bf
  2. 66556661476c7727af7e7a2b75c2e37519aafc49
2018-01-24 12:11:30 -06:00
Daniel Renaud d0b38c5f8b MAGETWO-80353: PHP 7.1 compatibility: Jenkins Failures related to PHP 7.1 upgrade 2017-11-07 14:58:46 -06:00
Eugene Tulika 9f5de14c20 MAGETWO-75524: Add Role column to admin user grid #10891
- fix method visibility
2017-09-25 17:01:05 -05:00
Max Chadwick 3445928a1e Add Role column to admin user grid 2017-09-14 17:06:21 -05: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
Oleksii Korshenko 4b5626478a MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags
- replaced release version with package version in @since and @depreacated tags
 - removed @since tag from private properties/methods  and non @api classes
2017-08-04 19:15:55 -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
Viktor Tymchynskyi d4bc679569 MAGETWO-68794: Password policy does not work correctly 2017-06-30 13:32:22 +03:00
Alex Paliarush b9986a1877 MAGETWO-65444: Add @api annotation to modules owned by Okapis 2017-04-11 09:20:21 -05:00
Alex Paliarush ae4de44006 MAGETWO-65444: Add @api annotation to User module 2017-04-07 13:45:19 -05:00
Oleksii Korshenko 1b5dc60a26 MAGETWO-66875: Remove the copyright year from file headers #8648 2017-03-29 04:48:40 +03:00
Alex Paliarush feb8024244 MAGETWO-65444: Add @api annotation to User module 2017-03-17 13:54:27 -05:00
Stanislav Lopukhov 150c31ca40 MAGETWO-65287: Remove class, related unit tests, add to obsolete classes 2017-03-09 09:48:41 +02:00
James Halsall a31f4a35c0 Remove the copyright year from file headers 2017-02-22 09:09:36 +00:00
Roman Ganin 7fcb25954a Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-62356 2017-02-06 15:08:14 +02:00
Roman Ganin b20a49d6c3 MAGETWO-60424: Remove Acl cache usage in Acl Builder
- CR notices
2017-01-17 15:52:25 +02:00
Roman Ganin 3e13c1f78e MAGETWO-60424: Remove Acl cache usage in Acl Builder
- codestyle, naming and other related fixes.
2017-01-17 11:21:33 +02:00
Roman Ganin 95a76fdc11 MAGETWO-60424: Remove Acl cache usage in Acl Builder
- fix integration of ACL builder and cache
2017-01-16 20:32:16 +02:00
Roman Ganin 0d8eea9c59 MAGETWO-60424: Remove Acl cache usage in Acl Builder
- codestyle fixes, moved cache to builder to match coupling rule
2017-01-16 16:35:02 +02:00
Roman Ganin 7aa91152c6 MAGETWO-60424: Remove Acl cache usage in Acl Builder 2017-01-12 17:46:11 +02:00
Sergii Kovalenko eb30343a09 MAGETWO-62855: Copyright Year Update 2017 2017-01-05 13:01:45 +02:00
Roman Ganin 220ebebd81 MAGETWO-62356: Remove all uses of php-serialize function in module Magento_User 2016-12-19 12:03:07 +02:00
Sergii Kovalenko 2263d5c9de MAGETWO-56989: Deployment process can't be executed on separate machine
-move deploy static command
2016-11-11 13:39:05 +02:00
Sergii Kovalenko 5c2bc87099 MAGETWO-56989: Deployment process can't be executed on separate machine
-move deploy static command
2016-11-11 12:54:18 +02:00
Sergii Kovalenko a978a4cb72 MAGETWO-56989: Deployment process can't be executed on separate machine 2016-10-21 10:44:16 +03:00
Stanislav Idolov e4cfb20a4d Merge remote-tracking branch 'mainline/develop' into literal_classname_to_namespace 2016-07-18 13:15:28 +03:00
Alexander Paliarush bc86310ae9 MAGETWO-54231: Integration broken after deleting admin with same ID 2016-06-10 12:27:29 -05:00
Stanislav Idolov e282fb4fc2 MAGETWO-51858: Convert literal class names to \Namespace\Classname::class 2016-04-29 12:24:47 +03:00
Joan He 2d368d0134 MAGETWO-48081: Copyright Year Update 2016-03-17 15:49:11 -05:00
Oleksii Korshenko f68d6111b2 Merge remote-tracking branch 'mainline/develop' into bug-fixes 2016-01-28 14:43:39 -06:00
Hayder Sharhan 97825ae007 MAGETWO-46020: [Integration] 2 config files needed to create single integartion
- Updated Tests.
2016-01-25 21:52:48 -06:00
Hayder Sharhan fb0c78a360 MAGETWO-46020: [Integration] 2 config files needed to create single integartion
- Added backwards compatibility.
- Updated filter for role getter to only provide admin users not integrations.
- Updated Tests.
2016-01-25 17:29:48 -06:00
Cari Spruiell 1381824285 MAGETWO-47583: checkAdminPasswordChange is NOT throwing exception when previous password is used
- copy 2.0.1 patch changes for mainline
2016-01-20 13:47:14 -06:00
Joan He 5d44bbbbf5 MAGETWO-43960: Custom Timezone does not work properly 2015-10-30 01:41:48 -05:00