Skip to content

Commit

Permalink
Merge branch 'main' into next-6.7
Browse files Browse the repository at this point in the history
  • Loading branch information
bojanrajh committed Jan 13, 2025
2 parents 7a673b1 + 8928a6e commit 2e23d9e
Show file tree
Hide file tree
Showing 99 changed files with 2,320 additions and 1,225 deletions.
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Shopware platform editor configuration normalization
# http://editorconfig.org/

# This is the top-most .editorconfig file; do not search in parent directories.
root = true

# All files.
[*]
end_of_line = lf
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.idea
/dictionary.dic
.DS_Store

# VSCode-Project
/.vscode/
!/.vscode/settings.json
.vscode
/dictionary.dic
3 changes: 2 additions & 1 deletion .lycheeignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ https://nuxt.com/docs/guide/directory-structure/pages
https://github.com/shopware/shopware/blob/trunk/src/Core/Content/Test/Product/SalesChannel/Listing/CachedProductListingRouteTest.php
https://github.com/shopware/shopware/blob/trunk/src/Core/Content/Test/Product/Cart/ProductCartTest.php
https://github.com/shopware/shopware/blob/6.4.17.0/src/Core/Framework/Update/Services/UpdateHtaccess.php
https://github.com/shopware/shopware/blob/trunk/src/Core/Checkout/Customer/Rule/IsNewCustomerRule.php
https://github.com/shopware/shopware/blob/trunk/src/Core/Checkout/Customer/Rule/IsNewCustomerRule.php
https://www.tim-wellhausen.de/papers/ExpandAndContract/ExpandAndContract.html
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.detectIndentation": false
}
Loading

0 comments on commit 2e23d9e

Please sign in to comment.