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

WIP: Take over Changes form v2.5.2-rc4 #380

Merged
merged 33 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
64f9f5b
WIP: Take over Changes form v2.5.2-rc4
mariolorenz Jan 9, 2025
4d12481
codestyle
mariolorenz Jan 9, 2025
fea6f29
rebuild resources
mariolorenz Jan 9, 2025
05fe9cf
take over changes #879
mariolorenz Jan 9, 2025
a7db7fa
take over changes from smarty
mariolorenz Jan 10, 2025
39247b9
Update Client Version
mariolorenz Jan 10, 2025
e9bb0af
fixed base twig template and ShopControl (renamed base method)
HonkDerHase Jan 10, 2025
39d610a
fix PSR2-Namespaces
mariolorenz Jan 10, 2025
0666747
Merge remote-tracking branch 'origin/PAYPAL-890_OXID7_TakeOver_v252-r…
mariolorenz Jan 10, 2025
baf762c
ACDC template, vaulting checkbox
HonkDerHase Jan 10, 2025
9a0fa52
Merge remote-tracking branch 'origin/PAYPAL-890_OXID7_TakeOver_v252-r…
HonkDerHase Jan 10, 2025
e7df452
remove unecessary comments
mariolorenz Jan 10, 2025
46727db
take over changes from OXID6.3
mariolorenz Jan 10, 2025
aabf216
fix this->getConfig
mariolorenz Jan 10, 2025
7cc50af
fix path smarty-tpls
mariolorenz Jan 10, 2025
7e84bce
fix selflinks
mariolorenz Jan 10, 2025
1c684d5
fix getDefaultShippingPriceForExpress
mariolorenz Jan 10, 2025
7ecacf8
fix cast
mariolorenz Jan 10, 2025
5682566
fix this->getConfig
mariolorenz Jan 10, 2025
ecfd841
fix SslSelfLink & problem
HonkDerHase Jan 10, 2025
32857fe
decode JSON on empty string should not raise exception
HonkDerHase Jan 10, 2025
5aff2f7
use Getter instead direct access config
mariolorenz Jan 10, 2025
7a64a74
fix p24 required parameter missing (email)
HonkDerHase Jan 10, 2025
5a0188a
Merge remote-tracking branch 'origin/PAYPAL-890_OXID7_TakeOver_v252-r…
HonkDerHase Jan 10, 2025
4380399
update resources and cleanup smarty tpls
mariolorenz Jan 11, 2025
e61a321
Apple Pay eligibility variable fix in onboarding
mariolorenz Jan 16, 2025
f617e3d
WIP: TakeOver Vaulting
mariolorenz Jan 16, 2025
b2e69a1
take over from OXID6.3
mariolorenz Jan 17, 2025
97d9ecf
fix wrong styles
mariolorenz Jan 17, 2025
66af591
optimize vaulting-templates
mariolorenz Jan 17, 2025
2579be2
fix smarty applePay
mariolorenz Jan 17, 2025
b11c342
take over applePay to twig
mariolorenz Jan 17, 2025
3212be4
cleanUp in Smarty
mariolorenz Jan 17, 2025
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
7,263 changes: 1 addition & 7,262 deletions assets/css/bootstrap.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/bootstrap.min.css

Large diffs are not rendered by default.

109 changes: 1 addition & 108 deletions assets/css/paypal-admin.css

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

Loading
Loading