Commits · 240e2576681cd34ac67fe4a51d2c2e5638acff56 · KIII-12 / Magento · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Oct 21, 2015
- Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42984-3 · 240e2576
  Oleh Posyniak authored 9 years ago
  
  240e2576
- Merge pull request #20 from magento-qmt/develop · 098d3ff5
  Kvashnin, Dmytro(dkvashnin) authored 9 years ago
```
[Mavericks] Test maintenance and extend
```
  098d3ff5
- Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop · cc2c0c70
  Dmytro Aponasenko authored 9 years ago
  
  cc2c0c70
- MTA-2712: Functional test maintenance. Part 1 · 85b61972
  Dmytro Aponasenko authored 9 years ago
  
  85b61972
Oct 20, 2015
- Merge pull request #11 from magento-ogre/PR_Branch · 222b77c8
  Kopylova,Olga(okopylova) authored 9 years ago
```
[Ogres] Bug Fixes
```
  222b77c8
- Merge remote-tracking branch 'mainlineCE/develop' into PR_Branch · 6ef7b9e8
  Maddy Chellathurai authored 9 years ago
  
  6ef7b9e8
- Merge pull request #16 from magento-webdev/PR-2 · e3dfd6a9
  Kopylova,Olga(okopylova) authored 9 years ago
```
[WebDev] Bugfixes
```
  e3dfd6a9
- Merge remote-tracking branch 'mainline/develop' into PR_Branch · 960dee5a
  Olga Kopylova authored 9 years ago
  
  960dee5a
- Merge remote-tracking branch 'origin/MAGETWO-44282' into PR-2 · 37221e98
  Natalia Momotenko authored 9 years ago
  
  37221e98
- Merge remote-tracking branch 'origin/develop' into PR-2 · a626f84c
  Natalia Momotenko authored 9 years ago
  
  a626f84c
- Merge pull request #13 from magento-mpi/MPI-BUGFIXES · 0efa2bc8
  Tymchynskyi, Viktor(vtymchynskyi) authored 9 years ago
```
[MPI] Bugfixes
```
  0efa2bc8
- MTA-2712: Functional test maintenance. Part 1 · cb4396c3
  Dmytro Aponasenko authored 9 years ago
  
  cb4396c3
- Merge branch 'MTA-2478' of https://github.corp.magento.com/magento-qmt/magento2ce into develop · 0a63aa89
  Dmytro Aponasenko authored 9 years ago
  
  0a63aa89
Oct 19, 2015
- Merge branch 'MAGETWO-35679-cannot-access-admin-store-code' into PR_Branch · 9e2ad673
  Eddie Lau authored 9 years ago
  
  9e2ad673
- MAGETWO-44072: Contribute Bugfixes by Ogres · a5ee548e
  Eddie Lau authored 9 years ago
```
- fixing unit test
```
  a5ee548e
- MAGETWO-44072: Contribute Bugfixes by Ogres · 749c20fa
  Eddie Lau authored 9 years ago
```
- changed AdminConfig class to use UrlFactory
```
  749c20fa
- Merge branch 'develop_mainline' into MAGETWO-35679-cannot-access-admin-store-code · cce987c7
  Eddie Lau authored 9 years ago
  
  cce987c7
- Merge remote-tracking branch 'origin/MAGETWO-42360' into PR-2 · 914ef79b
  Natalia Momotenko authored 9 years ago
  
  914ef79b
- Merge remote-tracking branch 'origin/MAGETWO-43646' into MPI-BUGFIXES · 9bca98c4
  Viktor Tymchynskyi authored 9 years ago
  
  9bca98c4
- Merge remote-tracking branch 'origin/MAGETWO-43948' into MPI-BUGFIXES · d37da657
  Viktor Tymchynskyi authored 9 years ago
  
  d37da657
- Merge remote-tracking branch 'origin/MAGETWO-44174' into MPI-BUGFIXES · de98026c
  Viktor Tymchynskyi authored 9 years ago
  
  de98026c
- Merge remote-tracking branch 'origin/MAGETWO-43322' into PR-2 · b8d8100c
  Natalia Momotenko authored 9 years ago
  
  b8d8100c
- MTA-2712: Functional test maintenance. Part 1 · e9484459
  Dmytro Aponasenko authored 9 years ago
  
  e9484459
- MAGETWO-44072: Contribute Bugfixes by Ogres · 45ce4e45
  Maddy Chellathurai authored 9 years ago
```
- fixing obsolete code test
```
  45ce4e45
- MAGETWO-44282: Transparency level to the CC card for Braintree CC is not equal... · 3239df43
  Olga Matviienko authored 9 years ago
```
MAGETWO-44282: Transparency level to the CC card for Braintree CC is not equal to transparency level on other cc forms
```
  3239df43
- Merge remote-tracking branch 'mainlineCE/develop' into PR_Branch · bc09926a
  Maddy Chellathurai authored 9 years ago
  
  bc09926a
- MTA-2712: Functional test maintenance. Part 1 · 62629698
  Dmytro Aponasenko authored 9 years ago
  
  62629698
- Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42984-3 · 85431d7e
  Oleh Posyniak authored 9 years ago
  
  85431d7e
- Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-43646 · b2ca24c1
  Gurzhyi, Andrii authored 9 years ago
  
  b2ca24c1
- MAGETWO-42360: Broken "Add New Block" page layout · 58459e98
  Olga Matviienko authored 9 years ago
  
  58459e98
- Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-43948 · 2b11567d
  Ievgen Sentiabov authored 9 years ago
  
  2b11567d
- Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop · 9de8519b
  Dmytro Aponasenko authored 9 years ago
  
  9de8519b
Oct 16, 2015
- Merge pull request #10 from magento-folks/bugs · 24abff16
  Korshenko, Olexii(okorshenko) authored 9 years ago
```
[Folks] Bugfix
```
  24abff16
- MAGETWO-44072: Contribute Bugfixes by Ogres · c9733620
  Maddy Chellathurai authored 9 years ago
```
- updating composer.lock
```
  c9733620
- Merge remote-tracking branch 'ogresCE/MAGETWO-42678-db-validator-privileges' into PR_Branch · 3f08075b
  Maddy Chellathurai authored 9 years ago
  
  3f08075b
- Merge remote-tracking branch 'ogresCE/MAGETWO-42194-weak-key' into PR_Branch · ee73decb
  Maddy Chellathurai authored 9 years ago
  
  ee73decb
- Merge remote-tracking branch 'mainlineCE/develop' into PR_Branch · 900a477c
  Maddy Chellathurai authored 9 years ago
  
  900a477c
- MAGETWO-44072: Contribute Bugfixes by Ogres · 7d44d341
  Maddy Chellathurai authored 9 years ago
```
- fiixng versions
```
  7d44d341
- Merge remote-tracking branch 'ogresCE/MAGETWO-42842-Setup-Unit-Tests-CC' into PR_Branch · 963db552
  Maddy Chellathurai authored 9 years ago
  
  963db552
- MAGETWO-44072: Merge branch 'develop' of... · ad3ad4ca
  Safwan Khan authored 9 years ago
```
MAGETWO-44072: Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-42194-weak-key

Conflicts:
	app/code/Magento/EncryptionKey/Model/Resource/Key/Change.php
	composer.lock
```
  ad3ad4ca