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.

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

Jump to bottom

Dynamic Replies Feature - by MoveOn #2423

Merged
merged 104 commits into from
Sep 4, 2024
Merged

Dynamic Replies Feature - by MoveOn #2423

merged 104 commits into from
Sep 4, 2024

Conversation

mau11
Copy link
Member

@mau11 mau11 commented Aug 15, 2024

Fixes # (issue)

Description

Merged Spoke v14 + existing 14.1 updates to MoveOn's PR #2365

Checklist:

  • I have manually tested my changes on desktop and mobile
  • The test suite passes locally with my changes
  • If my change is a UI change, I have attached a screenshot to the description section of this pull request
  • My change is 300 lines of code or less, or has a documented reason in the description why it’s longer
  • I have made any necessary changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • My PR is labeled [WIP] if it is in progress

crayolakat and others added 30 commits December 1, 2022 14:12
@crayolakat
Cascade delete interaction step
3a39a6c
@crayolakat
Add catch
2fd7b02
@crayolakat
Change console.log to console.error
99aee7f
@crayolakat
Merge branch 'main' into cascade_delete_interaction_step
254ba40
@crayolakat
SQLite adjustments
383c065
@crayolakat
Update bug_report.md
bb47f9f
@crayolakat
Get contactTimezones when not caching
40095d9
@crayolakat
Grant permission to public schema
27fef93
@codygordon
bulk send batch progress UI
b62af01
@codygordon
remove package.json browser crypto fix
9b6ae4c
@crayolakat
Update HOWTO-configure-auth0.md
f2b1689
@codygordon
increase actions test timeouts to 15 min
7e6cdf2
@crayolakat
Update release notes
27b6f29
@crayolakat
Merge branch 'kathy_catch_batch_insert' into main-stage-13.2.0
c2df884
@crayolakat
Merge branch 'kathy-update-bug-report-template' into main-stage-13.2.0
cd105b4
@crayolakat
Update RELEASE_NOTES.md
1c0eba3
@crayolakat
Merge branch 'kathy-fix-contact-timezones' into main-stage-13.2.0
09ebfc9
@crayolakat
Update RELEASE_NOTES.md
9555186
@crayolakat
Merge branch 'bulk-send-progress-ui' into main-stage-13.2.0
f8b256e
@crayolakat
Update RELEASE_NOTES.md
4d3b134
@crayolakat
Merge branch 'kathy-pg-compatibility' into main-stage-13.2.0
baaa269
@crayolakat
Update RELEASE_NOTES.md
30c56fc
@crayolakat
Merge branch 'kathy-update-auth0-rule' into main-stage-13.2.0
64efc80
@crayolakat
Update RELEASE_NOTES.md
c822e8d
@ibrand
Update README.md to reflect the state of the Spoke hand off
edad853
@ibrand
add remote switching to the README
47ae9de
@ibrand
Merge pull request #5 from MoveOnOrg/ibrand-patch-1
39422f3 
Update README.md to reflect the state of the Spoke hand off
@crayolakat
Merge branch 'main-stage-13.2.0'
49415b9
@crayolakat
Update HOWTO-use_bulk_sending.md
d43a128
@crayolakat
Update Bandwidth docs
99acc07
sjwmoveon and others added 18 commits May 3, 2024 14:46
@sjwmoveon
Merge campaign_contact.updated_at fix
217d23a
@sjwmoveon
Add test for dynamicReassign method
4be13a6
@sjwmoveon
Merge pull request #13 from MoveOnOrg/updatedat
de74eb9 
Update campaign_contact.updated_at on change
@sjwmoveon
Use 'joinToken' in place of 'organizationUuid' since we are actually …
0dfcea5 
…using the joinToken value

Also remove an unnecessary import and fix a comment
@sjwmoveon
Merge pull request #14 from MoveOnOrg/dynamicreplies
77cc415 
Add dynamic replies feature
@sjwmoveon
Fix SonarCloud alert
716a154 
SonarCloud doesn't like raw http links, preferring https.  In this case the link should never be used so it makes no difference to switch to https.
@sjwmoveon
Merge pull request #16 from MoveOnOrg/sjwmoveon-patch-1
5941cc5 
Fix SonarCloud alert
@sjwmoveon
retrigger checks
14a5673
@sjwmoveon
retrigger checks x2
f01f203
@technicalex
retrigger checks x3
22977c9
@mau11
Remove MoveOn specific updates and clean up
cdeed25
@mau11
Revert "Upgrade Cypress"
64c9684 
This reverts commit bcd31a1.
@mau11
Merge branch 'stage-main-14.1' into MoveOnOrg/main
ea251f3
@mau11
Re-add models update from commit #64c96849
50d5ea4
@mau11
Remove console.logs and linter edits
105ba01
@mau11
Merge branch 'stage-main-14.1' into mz/merge-moveon-14.1
47e85d4
@mau11
Merge branch 'stage-main-14.1' into mz/merge-moveon-14.1
b70620d
@mau11
Revert "Remove console.logs and linter edits"
ec04d8c 
This reverts commit 105ba01.
@engelhartrueben engelhartrueben mentioned this pull request Aug 15, 2024
Merged
7 tasks
@mau11 mau11 marked this pull request as ready for review September 4, 2024 04:41
@engelhartrueben
Copy link
Collaborator

@mau11 please let me know when this is ready for review! I know there has been issues with Redis - so please let me know if/how I can support (:

@mau11
Copy link
Member Author

mau11 commented Sep 4, 2024

@mau11 please let me know when this is ready for review! I know there has been issues with Redis - so please let me know if/how I can support (:

Thanks! It's ready

@engelhartrueben
Copy link
Collaborator

engelhartrueben commented Sep 4, 2024 •
edited
Loading

Hi @mau11!

I have been playing around with this locally, and all looks pretty good. The only thing I will want to double check (probably after we merge this into stage-main-14.1 is that opt out language still persists, since that seems to be toyed with a bit.

I feel fairly confident merging this into 14.1 for further testing! We will need to check a lot of the styling, as I think that got messed up in one of the updates, specifically the "add" button
image
now floating in the top left when it should be bottom right

engelhartrueben
engelhartrueben approved these changes Sep 4, 2024
View reviewed changes
Copy link
Collaborator

@engelhartrueben engelhartrueben left a comment

Choose a reason for hiding this comment

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

🎉

@engelhartrueben engelhartrueben merged commit 1bf7c39 into stage-main-14.1 Sep 4, 2024
17 checks passed
@mau11 mau11 mentioned this pull request Sep 12, 2024
Merged
@mau11 mau11 mentioned this pull request Oct 18, 2024
Closed
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@engelhartrueben engelhartrueben engelhartrueben approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Spoke Release Schedule
Status: 14.1
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mau11 @engelhartrueben @crayolakat @codygordon @ibrand @sjwmoveon @technicalex