Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC-34832 nonsplit to split merge #1650

Merged
merged 51 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
060146e
FRW-8354: update composer lock
annakotiuk Nov 11, 2024
89cd142
FRW-8354: update composer lock
annakotiuk Nov 11, 2024
0bfcf1a
FRW-8354: update composer lock
annakotiuk Nov 11, 2024
5f9610f
FRW-8354: update composer lock
annakotiuk Nov 12, 2024
eb80ef8
FRW-8354: fix store creation
annakotiuk Nov 13, 2024
c0e378a
FRW-8354: fix entity search
annakotiuk Nov 13, 2024
ea46d80
FRW-8354: fix entity search
annakotiuk Nov 13, 2024
a4e9760
FRW-8354: fix entity search
annakotiuk Nov 13, 2024
1453710
FRW-8354: fix entity search
annakotiuk Nov 13, 2024
1f8281f
FRW-8354: fix entity search
annakotiuk Nov 13, 2024
006dabc
FRW-8354: CR fixes
annakotiuk Nov 17, 2024
669c3c4
FRW-8354: CR fixes
annakotiuk Nov 17, 2024
7ca3505
Merge branch 'master' into feature/frw-8354-create-dms-acceptance-tests
annakotiuk Nov 17, 2024
7c78743
FRW-8354: CR fixes
annakotiuk Nov 17, 2024
bddd458
FRW-8354: fix tests
annakotiuk Nov 17, 2024
5aa0a9c
FRW-8354: fix tests
annakotiuk Nov 18, 2024
459b506
FRW-8354: update composer lock
annakotiuk Nov 18, 2024
5778eff
FRW-8354: fix tests
annakotiuk Nov 18, 2024
ca48f9c
FRW-8354: fix tests
annakotiuk Nov 18, 2024
ea506dc
Merge branch 'master' into feature/frw-8354-create-dms-acceptance-tests
annakotiuk Nov 18, 2024
3dae4c0
FRW-8354: update composer
annakotiuk Nov 18, 2024
8ad4fbd
FRW-8354: fix tests
annakotiuk Nov 18, 2024
0481f45
FRW-8354: fix tests
annakotiuk Nov 18, 2024
793c07b
FRW-8354: fix tests
annakotiuk Nov 18, 2024
ab033df
FRW-8354: fix tests
annakotiuk Nov 18, 2024
6ad6ba5
FRW-8354: fix tests
annakotiuk Nov 18, 2024
7a54212
Merge branch 'master' into feature/frw-8354-create-dms-acceptance-tests
dmiseev Nov 20, 2024
e762586
Check cypress tests.
dmiseev Nov 20, 2024
71f35dd
Check cypress tests.
dmiseev Nov 20, 2024
aa14b26
Check cypress tests.
dmiseev Nov 20, 2024
518a17b
- Remove deployment configs for destroyed envs.
eduard-melnytskyi Nov 25, 2024
5551894
Fix formatting.
eduard-melnytskyi Nov 27, 2024
0088b06
Merge branch 'master' into feature/frw-8354-create-dms-acceptance-tests
annakotiuk Nov 27, 2024
82e33ef
FRW-8354: update composer lock
annakotiuk Nov 27, 2024
f2c75c6
FRW-8354: trigger pipelines
annakotiuk Nov 27, 2024
d355b8b
Trigger CI.
eduard-melnytskyi Nov 27, 2024
4712486
FRW-8354: update composer lock
annakotiuk Dec 1, 2024
687305c
Merge branch 'master' into feature/frw-8354-create-dms-acceptance-tests
annakotiuk Dec 1, 2024
becfad8
FRW-8354: update composer lock
annakotiuk Dec 1, 2024
e77a691
FRW-8354: fix store selection
annakotiuk Dec 2, 2024
5b5702f
FRW-8354: fix cms page test
annakotiuk Dec 2, 2024
f32734a
FRW-8354: fix styles
annakotiuk Dec 2, 2024
0834495
FRW-8354: fix cms page test
annakotiuk Dec 2, 2024
cf73c93
Merge pull request #9193 from spryker/platform-add-new-envs
eduard-melnytskyi Dec 4, 2024
f253b65
FRW-8354: rollback extra changes
annakotiuk Dec 5, 2024
982f683
Merge branch 'master' into feature/frw-8354-create-dms-acceptance-tests
annakotiuk Dec 5, 2024
ae97bca
Merge pull request #9156 from spryker/feature/frw-8354-create-dms-acc…
asmarovydlo Dec 5, 2024
3bc5d0c
Update composer lock file.
spryker-bot Dec 5, 2024
19f71b8
CC-34832 Moved remember me secret to environment variable. (#9218)
kraal-spryker Dec 9, 2024
3e0a742
Merge remote-tracking branch 'nonsplit/master' into bugfix/cc-34832/r…
spryker-bot Dec 9, 2024
5e2032b
CC-34832 Merge nonsplit/master.
spryker-bot Dec 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .git.docker
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ac17ea980d151c6b4dd83b7093c0c05a9205c244
ad894a70aad294f37781b1c362957822500f061c
118 changes: 58 additions & 60 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/Shared/config_default.php
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
// >>> Customer
$config[CustomerConstants::CUSTOMER_SECURED_PATTERN] = '(^/login_check$|^(/en|/de)?/customer($|/)|^(/en|/de)?/wishlist($|/)|^(/en|/de)?/shopping-list($|/)|^(/en|/de)?/quote-request($|/)|^(/en|/de)?/comment($|/)|^(/en|/de)?/company(?!/register)($|/)|^(/en|/de)?/multi-cart($|/)|^(/en|/de)?/shared-cart($|/)|^(/en|/de)?/cart(?!/add)($|/)|^(/en|/de)?/checkout($|/))|^(/en|/de)?/cart-reorder($|/)|^(/en|/de)?/order-amendment($|/)';
$config[CustomerConstants::CUSTOMER_ANONYMOUS_PATTERN] = '^/.*';
$config[CustomerPageConstants::CUSTOMER_REMEMBER_ME_SECRET] = 'hundnase';
$config[CustomerPageConstants::CUSTOMER_REMEMBER_ME_SECRET] = getenv('SPRYKER_CUSTOMER_REMEMBER_ME_SECRET');
$config[CustomerPageConstants::CUSTOMER_REMEMBER_ME_LIFETIME] = 31536000;

// >>> FILESYSTEM
Expand Down
Loading