forked from PrestaShop/PrestaShop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'PrestaShop:develop' into 35591-regression-migrated-attr…
…ibutes-pages
- Loading branch information
Showing
132 changed files
with
2,120 additions
and
2,178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
name: Setup Keycloak | ||
description: Checkout Keycloak Module for installation and to launch Keycloak docker | ||
|
||
runs: | ||
using: 'composite' | ||
steps: | ||
- uses: actions/checkout@v4 | ||
name: Checkout Keycloak module | ||
with: | ||
repository: PrestaShop/keycloak_connector_demo | ||
ref: v1.1.0 | ||
path: keycloak_connector_demo | ||
|
||
- name: Build Keycloak docker and install module via CLI command | ||
run: USER_ID=$(id -u) GROUP_ID=$(id -g) docker compose -f keycloak_connector_demo/docker-compose-ui.yml up -d | ||
shell: bash |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 0 additions & 95 deletions
95
admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
admin-dev/themes/default/template/controllers/attributes/helpers/form/index.php
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
admin-dev/themes/default/template/controllers/attributes/helpers/index.php
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
admin-dev/themes/default/template/controllers/attributes/index.php
This file was deleted.
Oops, something went wrong.
33 changes: 0 additions & 33 deletions
33
admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
admin-dev/themes/default/template/controllers/attributes_groups/helpers/index.php
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/index.php
This file was deleted.
Oops, something went wrong.
33 changes: 0 additions & 33 deletions
33
admin-dev/themes/default/template/controllers/attributes_groups/helpers/list/list_header.tpl
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.