Skip to content

Syncing dev-integrate and main #1668

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

Merged
merged 52 commits into from
Jun 26, 2025
Merged

Syncing dev-integrate and main #1668

Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
fb23d79
Merge pull request #1606 from hubmapconsortium/uploadUpgrade
yuanzhou Apr 16, 2025
0323696
Merge pull request #1611 from hubmapconsortium/uploadUpgrade
yuanzhou Apr 18, 2025
1a5b523
Merge pull request #1612 from hubmapconsortium/uploadUpgrade
yuanzhou Apr 21, 2025
cf5e1b6
Merge pull request #1613 from hubmapconsortium/uploadUpgrade
yuanzhou Apr 21, 2025
46ffb09
Merge pull request #1614 from hubmapconsortium/uploadUpgrade
yuanzhou Apr 22, 2025
cce92b9
Merge pull request #1615 from hubmapconsortium/uploadUpgrade
yuanzhou Apr 22, 2025
8918d79
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou Apr 23, 2025
ebcdbfb
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou Apr 29, 2025
facbfe2
Resolve conflicts and merge PR #1618
yuanzhou Apr 29, 2025
9f626c9
Merge branch 'labID' of https://github.com/hubmapconsortium/ingest-ui…
yuanzhou May 1, 2025
ed6c871
Merge pull request #1622 from hubmapconsortium/labID
yuanzhou May 5, 2025
c458fa6
Merge pull request #1623 from hubmapconsortium/assignGroupRenderName
yuanzhou May 6, 2025
1182f2d
Merge pull request #1626 from hubmapconsortium/assignGroupRenderName
yuanzhou May 6, 2025
9061652
Merge pull request #1629 from hubmapconsortium/assignGroupRenderName
yuanzhou May 13, 2025
2b175a9
Merge pull request #1632 from hubmapconsortium/uploadSubmit
yuanzhou May 15, 2025
5c1f33b
Merge pull request #1634 from hubmapconsortium/uploadSubmit
yuanzhou May 16, 2025
29c7246
Merge pull request #1635 from hubmapconsortium/uploadSubmit
yuanzhou May 16, 2025
79ccd65
Merge pull request #1637 from hubmapconsortium/uploadSubmit
yuanzhou May 16, 2025
b3c5c8b
Merge pull request #1638 from hubmapconsortium/uploadSubmit
shirey May 20, 2025
c6a1df9
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou May 21, 2025
3dd0a1c
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou May 21, 2025
0b70e7e
Merge pull request #1640 from hubmapconsortium/publicationBulk
yuanzhou May 21, 2025
12d2324
Merge pull request #1642 from hubmapconsortium/publicationBulk
yuanzhou May 22, 2025
f0d788a
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou May 22, 2025
5540593
Merge pull request #1646 from hubmapconsortium/publicationBulk
yuanzhou Jun 4, 2025
62cb85e
Merge pull request #1647 from hubmapconsortium/publicationBulk
yuanzhou Jun 4, 2025
df0dc51
Merge pull request #1648 from hubmapconsortium/publicationBulk
yuanzhou Jun 4, 2025
04375a2
Merge pull request #1649 from hubmapconsortium/AdminSaveQA
yuanzhou Jun 4, 2025
a633867
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou Jun 5, 2025
e07cb45
Merge branch 'main' of https://github.com/hubmapconsortium/ingest-ui …
yuanzhou Jun 6, 2025
dcb8f8c
Updates Axios to 1.9.0 and axios-hooks to 5.1.1, Update Ingest and Se…
BirdMachine Jun 9, 2025
d57ca8c
Formatting fix
BirdMachine Jun 9, 2025
ecd720d
Fix unused vals
BirdMachine Jun 9, 2025
dc31c1a
Bit more Service Cleanup & addressing 'baseUrl' type usage
BirdMachine Jun 10, 2025
fbc444f
fixes
BirdMachine Jun 10, 2025
089d9e9
eslint object-curly-spacing
BirdMachine Jun 10, 2025
dd9d7fd
eslint space-before-blocks
BirdMachine Jun 10, 2025
7e374e9
ESLint tabbing fixes
BirdMachine Jun 10, 2025
def4061
ESLint keyword-spacing
BirdMachine Jun 10, 2025
d04cd0f
ESLint Quote Enforcement
BirdMachine Jun 10, 2025
0328d7f
ESLint Comma Spacing
BirdMachine Jun 10, 2025
e1af440
eslint file organizing
BirdMachine Jun 10, 2025
b0c31a1
More ESLint Organization & Restrictions for Dev/Test Deployment clarity
BirdMachine Jun 10, 2025
284ce23
Remove errant dolphin .directory file
BirdMachine Jun 10, 2025
7a016d1
add .directory to gitignore
BirdMachine Jun 10, 2025
00d489b
Merge pull request #1654 from hubmapconsortium/axiosDependabot
shirey Jun 11, 2025
86aac4f
Revert "Axios dependabot"
BirdMachine Jun 11, 2025
667be69
Merge pull request #1659 from hubmapconsortium/revert-1654-axiosDepen…
shirey Jun 11, 2025
db90dfa
Merge branch 'main' into dev-integrate
shirey Jun 11, 2025
692c69b
Merge pull request #1660 from hubmapconsortium/AxiosUpdate
shirey Jun 12, 2025
63cc08d
Merge pull request #1662 from hubmapconsortium/AxiosUpdate
shirey Jun 16, 2025
baaef1e
Merge branch 'main' into dev-integrate
shirey Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.