Merge branch 'org_auth'
# Conflicts: # inventory-manager/src/components/myorg/MyOrganizations.jsx # inventory-manager/src/components/myorg/OrganizationDetails.css # inventory-manager/src/components/myorg/OrganizationDetails.jsx # phase 1.sql # src/main/java/com/example/accessingdatamysql/myorg/MyOrgRosterRepository.java # src/main/java/com/example/accessingdatamysql/myorg/OrgRosterController.java
No related branches found
No related tags found
Showing
- inventory-manager/src/components/myorg/MyOrganizations.jsx 11 additions, 2 deletionsinventory-manager/src/components/myorg/MyOrganizations.jsx
- inventory-manager/src/components/myorg/OrganizationDetails.css 15 additions, 0 deletions...tory-manager/src/components/myorg/OrganizationDetails.css
- inventory-manager/src/components/myorg/OrganizationDetails.jsx 25 additions, 0 deletions...tory-manager/src/components/myorg/OrganizationDetails.jsx
- inventory-manager/src/components/user/AccountInformation.jsx 1 addition, 1 deletioninventory-manager/src/components/user/AccountInformation.jsx
- phase 1.sql 18 additions, 20 deletionsphase 1.sql
- src/main/java/com/example/accessingdatamysql/myorg/MyOrgRosterRepository.java 88 additions, 7 deletions...ample/accessingdatamysql/myorg/MyOrgRosterRepository.java
- src/main/java/com/example/accessingdatamysql/myorg/OrgRosterController.java 18 additions, 6 deletions...example/accessingdatamysql/myorg/OrgRosterController.java
Loading
Please register or sign in to comment