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.

Sign up for GitHub

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

Jump to bottom

[UPMERGE] 2.0 -> bootstrap-admin-panel #16250

Merged
merged 36 commits into from
May 13, 2024
Merged

[UPMERGE] 2.0 -> bootstrap-admin-panel #16250

merged 36 commits into from
May 13, 2024

Commits on May 8, 2024

  1. [Maintenance] Update docker docs

    @Wojdylak
    Wojdylak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6ca4a6a View commit details
    Browse the repository at this point in the history

  2. [Maintenance] Remove unnecessary line

    @Wojdylak
    Wojdylak committed May 8, 2024
    Configuration menu
    Copy the full SHA
    3fa947e View commit details
    Browse the repository at this point in the history

  3. Add wider support for deprecation contract

    @Jibbarth
    Jibbarth committed May 8, 2024
    Configuration menu
    Copy the full SHA
    ac1d727 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Fix potential xss in admin panel

    @mpysiak
    mpysiak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    d4812f9 View commit details
    Browse the repository at this point in the history

  2. Use function from UIBundle

    @mpysiak
    mpysiak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    29d18a3 View commit details
    Browse the repository at this point in the history

  3. Fix product-auto-complete

    @mpysiak
    mpysiak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    c11c424 View commit details
    Browse the repository at this point in the history

  4. Add js sanitizeInput function

    @mpysiak
    mpysiak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0a7fe9e View commit details
    Browse the repository at this point in the history

  5. Add sanitizer function to UIBundle

    @mpysiak
    mpysiak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    89880cd View commit details
    Browse the repository at this point in the history

  6. Use function from UIBundle

    @mpysiak
    mpysiak committed May 9, 2024
    Configuration menu
    Copy the full SHA
    19cea9a View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. [AddressBook] Add scenario for preventing from a potential XSS attack

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    3d66fb0 View commit details
    Browse the repository at this point in the history

  2. [Checkout] Add scenario for preventing from a potential XSS attack

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9255540 View commit details
    Browse the repository at this point in the history

  3. [Behat] Minor scenarios improvements after code review

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    30de6ff View commit details
    Browse the repository at this point in the history

  4. Test adding new taxon

    @mpysiak
    mpysiak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a17de6d View commit details
    Browse the repository at this point in the history

  5. Test adding new simple product

    @mpysiak
    mpysiak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d25edf3 View commit details
    Browse the repository at this point in the history

  6. Test adding similar products

    @mpysiak
    mpysiak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    63c3cf7 View commit details
    Browse the repository at this point in the history

  7. Fixes after CR

    @mpysiak
    mpysiak committed May 10, 2024
    Configuration menu
    Copy the full SHA
    679e793 View commit details
    Browse the repository at this point in the history

  8. bug #69 Fix potential xss in AdressBook and Checkout (mpysiak, GSadee) 

    This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.12
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

Fixes CVE-2024-29376. Reported here: https://github.com/r2tunes/Reports/blob/main/Sylius.md


Commits
-------

0a7fe9e Add js sanitizeInput function
89880cd Add sanitizer function to UIBundle
19cea9a Use function from UIBundle
3d66fb0 [AddressBook] Add scenario for preventing from a potential XSS attack
9255540 [Checkout] Add scenario for preventing from a potential XSS attack
30de6ff [Behat] Minor scenarios improvements after code review
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    9427336 View commit details
    Browse the repository at this point in the history

  9. bug #76 Fix potential xss in admin panel (mpysiak) 

    This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.12
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | n/a
| License         | MIT

Fixes potential xss in admin panel (Taxons and Products)

Commits
-------

d4812f9 Fix potential xss in admin panel
29d18a3 Use function from UIBundle
c11c424 Fix product-auto-complete
a17de6d Test adding new taxon
d25edf3 Test adding new simple product
63c3cf7 Test adding similar products
679e793 Fixes after CR
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    ba4b66d View commit details
    Browse the repository at this point in the history

  10. [Behat] Minor scenarios improvements

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    3b82e93 View commit details
    Browse the repository at this point in the history

  11. bugfix #16241 [Security] Fixes for potential XSS in the Checkout, Add… 

    …ress Book and Admin Panel (GSadee)

This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.12
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | 
| License         | MIT

This PR aims to solve 2 issues:

- Potential Cross Site Scripting (XSS) via the "Province" field in the Checkout and Address Book (https://github.com/r2tunes/Reports/blob/main/Sylius.md)
- Potential Cross Site Scripting (XSS) via the "Name" field (Taxons, Products, Options, Variants) in the Admin Panel


Commits
-------
  Fix potential xss in admin panel
  Use function from UIBundle
  Fix product-auto-complete
  Add js sanitizeInput function
  Add sanitizer function to UIBundle
  Use function from UIBundle
  [AddressBook] Add scenario for preventing from a potential XSS attack
  [Checkout] Add scenario for preventing from a potential XSS attack
  [Behat] Minor scenarios improvements after code review
  Test adding new taxon
  Test adding new simple product
  Test adding similar products
  Fixes after CR
  bug #69 Fix potential xss in AdressBook and Checkout (mpysiak, GSadee)
  bug #76 Fix potential xss in admin panel (mpysiak)
  [Behat] Minor scenarios improvements
    @TheMilek
    TheMilek committed May 10, 2024
    Configuration menu
    Copy the full SHA
    fb0ecb2 View commit details
    Browse the repository at this point in the history

  12. minor #16232 [Maintenance] Update docker docs (Wojdylak) 

    This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.12
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | N/A
| License         | MIT


Commits
-------

6ca4a6a [Maintenance] Update docker docs
3fa947e [Maintenance] Remove unnecessary line
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    0773297 View commit details
    Browse the repository at this point in the history

  13. minor #16233 Add wider support for deprecation contract (Jibbarth) 

    This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A
|-----------------|-----
| Branch?         | 1.13
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | N/A
| License         | MIT

Hello, 

I wanted to add a library, but I got stuck with the deprecation-contract, the library I wanted only accept `^3.0`

As we can see on the [diff](symfony/deprecation-contracts@2.5...3.4), there is not so much change between the two version.

I think we can add that version too without changing anything else.

Tell me if I should target `1.12` instead. 

Thanks 


Commits
-------

ac1d727 Add wider support for deprecation contract
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a504048 View commit details
    Browse the repository at this point in the history

  14. Merge branch '1.12' into 1.13 

    * 1.12:
  [Behat] Minor scenarios improvements
  Fixes after CR
  Test adding similar products
  Test adding new simple product
  Test adding new taxon
  [Behat] Minor scenarios improvements after code review
  [Checkout] Add scenario for preventing from a potential XSS attack
  [AddressBook] Add scenario for preventing from a potential XSS attack
  Use function from UIBundle
  Add sanitizer function to UIBundle
  Add js sanitizeInput function
  Fix product-auto-complete
  Use function from UIBundle
  Fix potential xss in admin panel
  [Maintenance] Remove unnecessary line
  [Maintenance] Update docker docs
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    3bc2117 View commit details
    Browse the repository at this point in the history

  15. Merge branch '1.13' into 1.14 

    * 1.13:
  [Behat] Minor scenarios improvements
  Fixes after CR
  Test adding similar products
  Test adding new simple product
  Test adding new taxon
  [Behat] Minor scenarios improvements after code review
  [Checkout] Add scenario for preventing from a potential XSS attack
  [AddressBook] Add scenario for preventing from a potential XSS attack
  Use function from UIBundle
  Add sanitizer function to UIBundle
  Add js sanitizeInput function
  Fix product-auto-complete
  Use function from UIBundle
  Fix potential xss in admin panel
  Add wider support for deprecation contract
  [Maintenance] Remove unnecessary line
  [Maintenance] Update docker docs
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    6154b8c View commit details
    Browse the repository at this point in the history

  16. Merge branch '1.14' into 2.0 

    * 1.14:
  [Behat] Minor scenarios improvements
  Fixes after CR
  Test adding similar products
  Test adding new simple product
  Test adding new taxon
  [Behat] Minor scenarios improvements after code review
  [Checkout] Add scenario for preventing from a potential XSS attack
  [AddressBook] Add scenario for preventing from a potential XSS attack
  Use function from UIBundle
  Add sanitizer function to UIBundle
  Add js sanitizeInput function
  Fix product-auto-complete
  Use function from UIBundle
  Fix potential xss in admin panel
  Add wider support for deprecation contract
  [Maintenance] Remove unnecessary line
  [Maintenance] Update docker docs
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    01e7fa5 View commit details
    Browse the repository at this point in the history

  17. Change application's version to v1.12.16

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d29310a View commit details
    Browse the repository at this point in the history

  18. Generate changelog for v1.12.16

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    90d580f View commit details
    Browse the repository at this point in the history

  19. Change application's version to v1.12.17-dev

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    56c8725 View commit details
    Browse the repository at this point in the history

  20. Merge branch '1.12' into 1.13 

    * 1.12:
  Change application's version to v1.12.17-dev
  Generate changelog for v1.12.16
  Change application's version to v1.12.16
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    eb7b641 View commit details
    Browse the repository at this point in the history

  21. Merge branch '1.13' into 1.14 

    * 1.13:
  Change application's version to v1.12.17-dev
  Generate changelog for v1.12.16
  Change application's version to v1.12.16
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1fb4aa9 View commit details
    Browse the repository at this point in the history

  22. Merge branch '1.14' into 2.0 

    * 1.14:
  Change application's version to v1.12.17-dev
  Generate changelog for v1.12.16
  Change application's version to v1.12.16
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    0dd7b7f View commit details
    Browse the repository at this point in the history

  23. Change application's version to v1.13.1

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    22bc3d9 View commit details
    Browse the repository at this point in the history

  24. Generate changelog for v1.13.1

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f14bca0 View commit details
    Browse the repository at this point in the history

  25. Change application's version to v1.13.2-dev

    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    4244cfc View commit details
    Browse the repository at this point in the history

  26. Merge branch '1.13' into 1.14 

    * 1.13:
  Change application's version to v1.13.2-dev
  Generate changelog for v1.13.1
  Change application's version to v1.13.1
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    b260046 View commit details
    Browse the repository at this point in the history

  27. Merge branch '1.14' into 2.0 

    * 1.14:
  Change application's version to v1.13.2-dev
  Generate changelog for v1.13.1
  Change application's version to v1.13.1
    @GSadee
    GSadee committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1ccdd63 View commit details
    Browse the repository at this point in the history