Skip to content

rebase to main #408

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

Open
wants to merge 14 commits into
base: v1.8
Choose a base branch
from
Open

rebase to main #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
80ee545
Remove X-Frame-Options for login page
kilbot Jul 25, 2025
06b1c7b
add security check for receipt templates
kilbot Jul 25, 2025
664ac9a
fix: emails for POS orders
kilbot Jul 25, 2025
57368ff
chore(i18n): update languages/woocommerce-pos.pot
kilbot Jul 25, 2025
b3b2e0d
Add logging for wcposdev
kilbot Jul 25, 2025
97475be
Merge branch 'main' of https://github.com/wcpos/woocommerce-pos
kilbot Jul 25, 2025
1ae6e23
clean up and bump version
kilbot Jul 25, 2025
2740dce
fix tests
kilbot Jul 25, 2025
e36ea64
Fix: New Order emails to send after order calculations
kilbot Aug 6, 2025
30c0481
Update readme.txt
kilbot Aug 6, 2025
efafbea
Update pos.php
DAnn2012 Sep 23, 2025
2c5f647
Update pos.php
DAnn2012 Sep 24, 2025
2d2858d
Merge pull request #406 from DAnn2012/patch-1
kilbot Sep 24, 2025
f7920ae
Merge branch 'v1.8' into v1.8-1
kilbot Sep 24, 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
4 changes: 3 additions & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: kilbot
Tags: ecommerce, point-of-sale, pos, inventory, woocommerce
Requires at least: 5.6
Tested up to: 6.8
Stable tag: 1.7.12
Stable tag: 1.7.13
License: GPL-3.0
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -88,6 +88,8 @@ There is more information on our website at [https://wcpos.com](https://wcpos.co

== Changelog ==


=======
Copy link

@cursor cursor bot Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Changelog Merge Conflict Marker

A Git merge conflict marker ======= and an empty line were accidentally committed in the changelog section of readme.txt. These appear to be leftover from a merge resolution.

Fix in Cursor Fix in Web

= 1.8.0 - 2025/08/XX =

= 1.7.13 - 2025/08/06 =
Expand Down
2 changes: 1 addition & 1 deletion templates/pos.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!DOCTYPE html>
<html>
<head>
<title><?php esc_attr_e( 'Point of Sale', 'woocommerce-pos' ); ?> - <?php esc_html( bloginfo( 'name' ) ); ?></title>
<title><?php esc_html_e( 'Point of Sale', 'woocommerce-pos' ); ?> - <?php echo esc_html( bloginfo( 'name' ) ); ?></title>
<meta charset="utf-8"/>

<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
Expand Down