Skip to content

Merge v17.0.0 into master #301

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
Merged
jemzir merged 91 commits into from
Jan 4, 2023
Merged

Merge v17.0.0 into master #301

jemzir merged 91 commits into from
Jan 4, 2023

Conversation

@benmarg
Copy link
Contributor

@benmarg benmarg commented Jan 4, 2023

Reactime v17.0.0 main merge

benmarg and others added 30 commits December 7, 2022 10:27
@benmarg
fix: removed bug where all object properties were being assgined to u…
4ee3e09 
…ndefined
@benmarg
Merge pull request #1 from oslabs-beta/ben/fix/whitescreen
e81f97a 
fix: removed bug where all object properties were being assigned to undefined
@benmarg
fix: enable page refreshing
957c86f
@benmarg
Merge pull request #2 from oslabs-beta/ben/fix/config
7e33178 
fix: enable page refreshing
@benmarg
swapped the default graph orientation from horizontal to vertical
67e9073
@benmarg
Merge pull request #3 from oslabs-beta/ben/feat/swapOrientation
c0e470f 
feat: swapped the default graph orientation from horizontal to vertical
@benmarg
fix: removed bug causing infinite recursion/black screen
fdb65c5
@benmarg
updated readME for clearer info on how to contribute
43d6e98
@jemzir
added in comments on later work to do in file and additional property…
22a5f88 
… expect lines
@benmarg
Merge pull request #4 from oslabs-beta/ben/fix/blackscreenBug
0e3c761 
Ben/fix/blackscreen bug & README Update
@jemzir
changed adding children test descriptions of first few
3f993fc
@jemzir
updated helpers and time jump and tree
35ceda6
@jemzir
Merge branch 'dev' into james/test/tree-files
2f526d5
@benmarg
intitialize www
b76362d
@benmarg
t3 app initalized with tailwind boilerplate
fc300d6
@jemzir
miscellaneous router.tsx and linkFiber comments
09c4836
@jemzir
package json update -- needing to add in .env and package dependcy of…
e7ec702 
… @heroicons/react
@benmarg
updated version to 17.0.0
960755b
@ericsngyun
working on carousel finished blog layout beta
73e2825
@benmarg
initial nav bar, LandingPage, and TeamSection added
09336d0
@benmarg
added TS
5417e53
@ericsngyun
finished basic card slider need to add styling to match rest of app a…
d4e282c 
…nd added basic blog
@ericsngyun
merge finished
ff7de62
@benmarg
integrated new feature slide and Team Section, restyled NavBar
dfc2d34
@benmarg
Merge pull request #6 from oslabs-beta/compMerge
b076254 
integrated new feature slide and Team Section, restyled NavBar
@ericsngyun
merge commit
76aa6bf
@ericsngyun
merging recent pull
66b880a
@jemzir
Merge branch 'www' of https://github.com/oslabs-beta/reactime into www
3358d25
@ericsngyun
w
6c7f2da
@jemzir
changed the article to have differing names and more recent ones
c0ea50f
jemzir and others added 26 commits December 19, 2022 13:53
@jemzir
Merge pull request #5 from oslabs-beta/james/test/tree-files
3527ae8 
James/test/tree files
@jemzir
created backend for router and user schema via prisma
9a431f3 
Coauthored: James Nghiem, Benjamin Margolius, Eric Yun, Wilton Lee
@jemzir
configure the front end to be able to send requests to the backend
d4f9e7d 
Coauthors: James, Ben, Eric, Wilton
@jemzir
fixed frontEnd useMutation hook to work properly
ea1a529 
CoAuthors: James, Ben, Eric, Wilton
@jemzir
Merge pull request #18 from oslabs-beta/group/Newsletter
6cb86ac 
Group/newsletter
@benmarg
root node search bar swapped for a drop down
89f254d
@benmarg
Merge pull request #19 from oslabs-beta/rootNodeDropdown
1348597 
root node search bar swapped for a drop down
@jemzir
configured the tree tests and files to better describe tests as well …
35712f4 
…as functionality
@jemzir
Merge pull request #20 from oslabs-beta/jamesWilton/treeTest
562ae9f 
configured the tree tests and files to better describe tests as well …
@wiltonlee948
created new email page
e8f6bc3 
created new email page
@wiltonlee948
created input element and styled it
342da52
@wiltonlee948
created clickHandler function
6d53eb6
@wiltonlee948
created conditional rendering of elements
2ff4387
@wiltonlee948
added contributors
714c831
@wiltonlee948
updated readme
caac295
@wiltonlee948
Merge pull request #21 from oslabs-beta/emailAlerts
2eaedfc 
Added new email component
@wiltonlee948
added testing dependencies
db70a3a
@wiltonlee948
fixed jest configuration issue by adding tsconfig for jest
9216302
@wiltonlee948
connected new instance of db
290eab3
@wiltonlee948
created get request endpoint to fetch data from db
b92ac6a
@wiltonlee948
created unit tests for FeaturesSection component
c272f2c
@wiltonlee948
creating unit tests for blogs component
be67929
@wiltonlee948
added react testing library tests dependency
e1a8065
@wiltonlee948
added dependencies in root package.json
8f3da68
@wiltonlee948
Merge pull request #24 from oslabs-beta/testing
06a805a 
added unit tests for www directory
@benmarg
Merge pull request #300 from oslabs-beta/dev
7a2218e 
Dev
@benmarg benmarg changed the title Dev Merge v17.0.0 into master Jan 4, 2023
@jemzir jemzir merged commit c0d2e76 into master Jan 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jemzir jemzir jemzir approved these changes

@wiltonlee948 wiltonlee948 wiltonlee948 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.

4 participants

@benmarg @jemzir @wiltonlee948 @ericsngyun