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

Launch staging to main #88

Merged
merged 261 commits into from
Apr 15, 2023
Merged

Launch staging to main #88

merged 261 commits into from
Apr 15, 2023

Conversation

mjhuff
Copy link
Contributor

@mjhuff mjhuff commented Apr 15, 2023

No description provided.

andrewaltman1 and others added 30 commits March 28, 2023 20:14
@andrewaltman1
working on state
4c78264
@andrewaltman1
added redux and components
71c6c41
@andrewaltman1
refactored destination render
9e152d9
@andrewaltman1
remote inputs update state
7702987
@andrewaltman1
started two component remote approach
83ea373
@andrewaltman1
origin and destination are seperated
e4d13d4
@ZGDJ
fleshed out api calls
685bc75
@mjhuff
Merge pull request #5 from oslabs-beta/sdk-library
30493fa 
fleshed out api calls
@mjhuff
Fixed AWS logic.
4a82a76
@ZGDJ
Merge pull request #6 from oslabs-beta/workingAWSLogic
06d2425 
Fixed AWS logic.
@andrewaltman1
more work on onChange
10ce5b0
@andrewaltman1
fixing difference issues
7940264
@andrewaltman1
starting work on overlay
d30778d
@andrewaltman1
finished remote component logic
8bd3e45
Merge branch 'dev' into overlay
ce26a08
Merge pull request #7 from oslabs-beta/overlay
dc0f900 
Finished the logic for remote components
@andrewaltman1
finished the overlay functionality
d6ba576
@andrewaltman1
Merge branch 'overlay' of https://github.com/oslabs-beta/CloudShift i…
602bdb6 
…nto overlay
@mjhuff
Added getBuckets rclone logic
09b39d5
@andrewaltman1
Merge pull request #8 from oslabs-beta/getBucketsReduxLogic
2000ddb 
Get buckets redux logic
@andrewaltman1
finished bucket drop down
604ce03
@mjhuff
BucketListing now working with backend
8245e0e
@mjhuff
Merge pull request #9 from oslabs-beta/workingListBuckets
da6f57e 
BucketListing now working with backend
@andrewaltman1
pulled down dev changes
5f7644f
@andrewaltman1
pulled down dev changes
2428e86
@mjhuff
Updated listBuckets to support CF
5038185
@mjhuff
Merge pull request #10 from oslabs-beta/cloudflareListBucketsUpdate
c31835a 
Updated listBuckets to support CF
Merge branch 'overlay' of https://github.com/oslabs-beta/CloudShift i…
a3c113e 
…nto overlay
Merge branch 'dev' into bucket-merge
a23bffb
working remote buckets
4d0bba5
mjhuff and others added 24 commits April 15, 2023 15:21
@mjhuff
Finished basic readme
937fa9e
Merge pull request #81 from oslabs-beta/readme
391f05d 
Readme
@mjhuff
Update README.md
dd513de
@mjhuff
Merge pull request #82 from oslabs-beta/patch-1
1fa1da9 
Update README.md
@mjhuff
Update README.md
ed12f31 
Fixed additional formatting issues.
@mjhuff
Merge pull request #83 from oslabs-beta/patch-2
d91d34a 
Update README.md
@mjhuff
Update README.md
4033cdb
@mjhuff
Merge pull request #84 from oslabs-beta/patch-3
700f181 
Update README.md
@mjhuff
New logo & readme fixes
c51ea0e
@mjhuff
Added banner to imgur
2cccb79
@mjhuff
solved merge conflict with dev
4307495
@mjhuff
Merge pull request #85 from oslabs-beta/readme
4224c29 
Readme
styling adapts to changing browser size
149b29d
@mjhuff
Merge branch 'resizing' of https://github.com/oslabs-beta/CloudShift …
8d48bef 
…into dev
@mjhuff
Fixed minor CSS bugs
82dcae0
@mjhuff @actions-user
Prettified Code!
b99b4cb
@andrewaltman1
Merge pull request #86 from oslabs-beta/cssUpdates
5995bb3 
Css updates
@mjhuff
updated package*.json
8012236
@mjhuff
added build
f7541ca
@mjhuff
solved staging merge conflicts
7c15bb4
@mjhuff
Merge pull request #87 from oslabs-beta/softLaunchToStaging
e881d41 
Soft launch to staging
@mjhuff
Delete test directory
5549177
@mjhuff
Delete jest.config.js
4c2ea85
@mjhuff
Removed CICD for main
fd2bc85
@andrewaltman1
Copy link
Contributor

Well done team.

@andrewaltman1 andrewaltman1 reopened this Apr 15, 2023
andrewaltman1
andrewaltman1 approved these changes Apr 15, 2023
View reviewed changes
Copy link
Contributor

@andrewaltman1 andrewaltman1 left a comment

Choose a reason for hiding this comment

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

Great work team.

@andrewaltman1 andrewaltman1 merged commit ad7f51c into main Apr 15, 2023
@andrewaltman1 andrewaltman1 deleted the launchStagingToMain branch April 15, 2023 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewaltman1 andrewaltman1 andrewaltman1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mjhuff @andrewaltman1 @ZGDJ @iredonkulousv2