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

Solutions #32

Merged
merged 78 commits into from
Oct 23, 2024
Merged

Solutions #32

merged 78 commits into from
Oct 23, 2024

Conversation

circlecube
Copy link
Member

Proposed changes

Draft PR to house all solutions related work so we can see it all in once place.

Type of Change

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

Video

Checklist

  • I have read the CONTRIBUTING doc
  • I have viewed my change in a web-browser
  • Linting and tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

officiallygod and others added 30 commits October 10, 2024 12:40
@officiallygod
Making it work
7093f12
@officiallygod
More
f5a783c
@officiallygod
Code
5da675a
@officiallygod
Update index.jsx
76da00c
@officiallygod
Code Dump
56bbf03
@officiallygod
Update index.jsx
5dc96ac
@officiallygod
Update stylesheet.scss
3ce7001
@officiallygod
Something
1ca2b09
@officiallygod
Update installer.js
e9f1d6c
@circlecube
tweak error state
1b2b339
@circlecube
version bump to beta.2 and update build files
2f855de
@circlecube
remove html from error state (for now)
b19c54d
@officiallygod
Update dataAttrListener.js
bf5b754
@arunshenoy99
Add Support for Premium Plugin Activations
cffa06c
@arunshenoy99
Updates
10e2a25
@arunshenoy99
Use activated_plugin
f0e519a
@officiallygod
Hooks
fd38ffc
@officiallygod
Build
9de51c8
@officiallygod
Update InstallerListener.php
b114923
@arunshenoy99
Remove unncessary check
443b90a
@officiallygod
Add Contact Support Button
1496c5e
@officiallygod
Better Icon
d324f9f
@arunshenoy99
Minor changes to support PLS, add provider, lint fixes
14f86d4
@arunshenoy99
Remove whitespace
609adbd
@arunshenoy99
Update WP CLI command
cd1f05b
@wpscholar
Merge branch 'enhance/activate-premium-plugin' into integration
5e2c0d9 
# Conflicts:
#	includes/WPAdmin/Listeners/InstallerListener.php
#	src/Installer/components/Modal/index.jsx
#	src/Scripts/dataAttrListener.js
@wpscholar
Add .nvmrc
e50544c
@wpscholar
Update NPM deps
9e95820
@wpscholar
Restore data attribute listener
75bafe9
@wpscholar
Run build
b4f3c71
@circlecube
Copy link
Member Author

circlecube commented Oct 18, 2024 •
edited
Loading

Sorry, @arunshenoy99. I must have botched the merge conflict. There were a lot of overlaps in the code changed there and in the other branches. It's probably best for whoever made the changes to revert my merge and try again since they'll be more familiar with the changes. I assumed they'd already been pulled in once my merge showed no changes.

officiallygod and others added 17 commits October 21, 2024 13:11
@circlecube circlecube marked this pull request as ready for review October 22, 2024 22:18
@arunshenoy99 arunshenoy99 merged commit b5ef14e into main Oct 23, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arunshenoy99 arunshenoy99 arunshenoy99 approved these changes

@abhijitb abhijitb Awaiting requested review from abhijitb

@wpscholar wpscholar Awaiting requested review from wpscholar

@officiallygod officiallygod Awaiting requested review from officiallygod

Assignees

@arunshenoy99 arunshenoy99

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@circlecube @arunshenoy99 @officiallygod @wpscholar