Commits · b91c873313bd35ba86c393e8ebdf9db1c67e62d2 · Shrey Patel / DBMS inventory manager

Dec 04, 2023
- fixed org creation page · b91c8733
  Shrey Patel authored 1 year ago
  
  b91c8733
- Working partly. · acda3fb4
  Sarthak Shrivastava authored 1 year ago
  
  acda3fb4
- Merge branch 'OrgManagement' · 553f34f9
  Sarthak Shrivastava authored 1 year ago
  
  # Conflicts: # inventory-manager/src/App.jsx # phase 1.sql # src/main/java/com/example/accessingdatamysql/Request.java
  553f34f9
- Merge branch 'org_auth' · 23ea077c
  Sarthak Shrivastava authored 1 year ago
  
  # Conflicts: # inventory-manager/src/App.jsx # inventory-manager/src/components/myorg/OrganizationDetails.jsx # src/main/java/com/example/accessingdatamysql/item/ItemController.java
  23ea077c
- Added support for request acceptance for items, modified schema. · 969c1f23
  Sarthak Shrivastava authored 1 year ago
  
  969c1f23
- Added support for actually adding user to organization · 3286c357
  Sarthak Shrivastava authored 1 year ago
  
  3286c357
- logged in users can view requests they've sent · 2abdb287
  Veda Hegde authored 1 year ago
  
  2abdb287
- Added ability to accept and deny requests. · fdb59daa
  Sarthak Shrivastava authored 1 year ago
  
  fdb59daa
- rebasing w main - got rid of orgId field for reqs · c9bd91d1
  Veda Hegde authored 1 year ago
  
  c9bd91d1
- ignoring pacakge.json · 2bbeb2dd
  Veda Hegde authored 1 year ago
  
  2bbeb2dd
- Upgraded mui dependencies to be compatible with react 18. · 3a06ae00
  Sarthak Shrivastava authored 1 year ago and Veda Hegde committed 1 year ago
  
  3a06ae00
- implemented support for clicking a row in ListAllOrgs -> prefilling fields in CreateRequest · d395f174
  Veda Hegde authored 1 year ago
  
  d395f174
- resolved merge conflict · d9926eda
  Veda Hegde authored 1 year ago
  
  d9926eda
- sorting/filtering for viewing orgs · 516d3edd
  Veda Hegde authored 1 year ago
  
  516d3edd
- Functional Organization Request View. · a187ca9e
  Sarthak Shrivastava authored 1 year ago
  
  a187ca9e
- Fixed Request Entity. · 86e5e438
  Sarthak Shrivastava authored 1 year ago
  
  86e5e438
- Merge branch 'org_auth' into 'main' · 15b64762
  Sarthak Shrivastava authored 1 year ago
  
  Org auth See merge request shreyp2305/dbms-inventory-manager!10
  15b64762
- Org auth · 9ddeba48
  Sarthak Shrivastava authored 1 year ago
  
  9ddeba48
- Added dynamic location creation support. · 8425e52c
  Sarthak Shrivastava authored 1 year ago
  
  8425e52c
- Added location viewing and deletion support · 72d5c8be
  Sarthak Shrivastava authored 1 year ago
  
  72d5c8be
- Organization Location view done · 96268b5c
  Sarthak Shrivastava authored 1 year ago
  
  96268b5c
- More bug fixes with item creation · 2b84311e
  Sarthak Shrivastava authored 1 year ago
  
  2b84311e
- Item creation, deletion update working correctly + bugfix · 4507c4de
  Sarthak Shrivastava authored 1 year ago
  
  4507c4de
Dec 03, 2023
- ignoring pacakge.json · 2653034a
  Veda Hegde authored 1 year ago
  
  2653034a
- Merge branch 'OrgManagement' of... · 09ef9862
  Veda Hegde authored 1 year ago
  
  Merge branch 'OrgManagement' of https://git.cs.vt.edu/shreyp2305/dbms-inventory-manager into OrgManagement
  09ef9862
- implemented support for clicking a row in ListAllOrgs -> prefilling fields in CreateRequest · dcb15eeb
  Veda Hegde authored 1 year ago
  
  dcb15eeb
- Change Item with location working correctly. · 5cd01fe5
  Sarthak Shrivastava authored 1 year ago
  
  5cd01fe5
- Change Item without location working. · 1678c28a
  Sarthak Shrivastava authored 1 year ago
  
  1678c28a
- Work in progress change item · 4ec76f7c
  Sarthak Shrivastava authored 1 year ago
  
  4ec76f7c
- Added end point for updating items. · 9c0b4863
  Sarthak Shrivastava authored 1 year ago
  
  9c0b4863
- Added dynamic Item deletion based on permission. · 97325ffd
  Sarthak Shrivastava authored 1 year ago
  
  97325ffd
- Added Item Detailed view · 5819a6d4
  Sarthak Shrivastava authored 1 year ago
  
  5819a6d4
- Added Organization Items list view, with filtering, searching etc. · d92022be
  Sarthak Shrivastava authored 1 year ago
  
  d92022be
- Changes to SQL file to support Item categories, Item class. Incomplete controller code. · 8841dad7
  Sarthak Shrivastava authored 1 year ago
  
  8841dad7
- Upgraded mui dependencies to be compatible with react 18. · 5de99e73
  Sarthak Shrivastava authored 1 year ago
  
  5de99e73
- Fixed small bug with transfer ownership not working correctly. · 8ded46bb
  Sarthak Shrivastava authored 1 year ago
  
  8ded46bb
- resolved merge conflict · 24a762ba
  Veda Hegde authored 1 year ago
  
  24a762ba
- Merge branch 'OrgManagement' of... · d0d5f2fd
  Veda Hegde authored 1 year ago
  
  Merge branch 'OrgManagement' of https://git.cs.vt.edu/shreyp2305/dbms-inventory-manager into OrgManagement
  d0d5f2fd
Dec 02, 2023

sorting/filtering for viewing orgs · f0c30b34
Veda Hegde authored 1 year ago

f0c30b34

# 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

b7114811