Resolve main staging conflict - updated commit history #52
Conversation
This file contains hidden or 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
* adjusting versions * Add whitelisting feature * Wrap the sendStats function inside a try catch block to trap error --------- Co-authored-by: ritesh-cs <ritesh@ritesh.com>
* adjusting versions * Add whitelisting feature * Wrap the sendStats function inside a try catch block to trap error * Merging in license (#23) * removed * removed icon * Rename LICENSE to LICENSE.MD * Create LICENSE * removed wrong license * Update LICENSE (#22) --------- Co-authored-by: ritesh-cs <ritesh@ritesh.com>
ritesh-cs
approved these changes
Dec 23, 2025
Harman-rd
added a commit
that referenced
this pull request
Dec 23, 2025
* Integrated whitelist functionality and production stability fixes * Features & Improvements - Implemented whitelist functionality and domain settings. - Wrapped sendStats function in a try-catch block to trap errors. - Added tracking enhancements and UI bug fixes (Ref: #39). - Removed unnecessary debugger permissions. - Standardized project licensing (Consolidated as LICENSE.MD). - Adjusted and synchronized version numbers to 2.2.1. *Maintenance & History Sync - Resolved significant history divergence between staging and main. - Fixed persistent manifest.json and service worker conflicts. Consolidated previous merge PRs (#24, #48, #49, #51, #52). --------- Co-authored-by: ritesh-cs <ritesh@ritesh.com> Co-authored-by: David Messinger <dmessing@users.noreply.github.com> Co-authored-by: Andre Garcia <andrecastrogarcia2@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
updated commit history