Skip to content

Conversation

@jkrrv
Copy link
Member

@jkrrv jkrrv commented Dec 8, 2025

No description provided.

# Conflicts:
#	composer.json
#	i18n/TouchPoint-WP.pot
#	package.json
#	src/TouchPoint-WP/Involvement.php
#	src/TouchPoint-WP/Report.php
#	src/TouchPoint-WP/TouchPointWP.php
#	src/python/WebApi.py
#	src/templates/involvement-single.php
#	touchpoint-wp.php
…aving manually in each location.

Also making siteId truly global across sites.
jkrrv and others added 25 commits November 13, 2025 17:23
…teTimeExtended, Http)

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
…olors filter integration tests

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
…esting

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
…tions and remove old Brain Monkey tests

Co-authored-by: jkrrv <1238391+jkrrv@users.noreply.github.com>
@jkrrv jkrrv changed the base branch from master to next December 8, 2025 16:56
@jkrrv
Copy link
Member Author

jkrrv commented Dec 8, 2025

@copilot Please add logic for the ScheduleSet:mergeIfPossible() method to combine RRules when possible. When finished, all existing tests should pass. Do not modify any tests.

Copy link

Copilot AI commented Dec 8, 2025

@jkrrv I've opened a new pull request, #240, to work on those changes. Once the pull request is ready, I'll request review from you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants