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

Merge develop to main #438

Merged
merged 173 commits into from
Aug 24, 2023
Merged

Merge develop to main #438

merged 173 commits into from
Aug 24, 2023

Conversation

tholulomo
Copy link
Contributor

No description provided.

aswallace and others added 30 commits December 6, 2022 17:26
@aswallace
#254: Initial commit for SDD form
52193eb
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
9388396 
…into #254_sdd_curation_form_ui
@aswallace
#254: Update SDD form styling and data
dd0f4df
@tholulomo
chores(#390): Add swagger documentation yaml files
f881d0f
@tholulomo
feat(#390): Enable swagger on restful services
1489671
@tholulomo
feat(#390): Add isAdmin middleware verifier
beafcc8
@tholulomo
feat(#390): Update controllers requiring admin middleware service
8e70908
@tholulomo
feat(#390): Rename api documentation route
e7213c2
@tholulomo
feat(#390): Add swagger middleware logic and required env variables
2a577fa
@tholulomo
feat(#391): Add logic to convert curated json object to xml
68f8211
@tholulomo
Merge branch 'develop' of github.com:Duke-MatSci/materialsmine into #…
70ded9e 
…390_Swagger_doc
@tholulomo
✨feat(#390): complete admin elastic search api endpoint in swagger
33894d8
@tholulomo
Merge pull request #392 from Duke-MatSci/#390_Swagger_doc
f9e00a5 
✨ feat(#390): Swagger Doc
@tholulomo
perf(#391): Merge Upstream changes
d97be14
@tholulomo
feat(#391): Update base schema json and refactor curation controller
d91a7d4
@tholulomo
feat(#391): Linter and unit test fixes
f23889d
@aswallace
fix(#398): add Edge to supported browsers, update auth reroute
3dc7d95
@aswallace
docs(#396): add links to vue test utils and chai
11c5134
@tholulomo
Merge pull request #399 from Duke-MatSci/#398_authentication_bugs
2ba5670 
#398 authentication bugs
@aswallace
fix(#400): make Metamine homepage responsive for smaller screen sizes
ddea25d
@tholulomo
feat(#391): Update curated sample collection model
fabd5cf
@tholulomo
feat(#391): Refactor xml conversion logic
335d624
@tholulomo
feat(#391): Replace csv2json with csv-parser
24cdcb0
@tholulomo
feat(#391): Refactor base json structure
0043428
@tholulomo
feat(#391): Refactor curation unit test and mock data
89ae630
@tholulomo
feat(#391): Update curation routes api endpoints
2faba5f
@tholulomo
feat(#391): Update swagger doc with curation APIs
201e87c
@tholulomo
feat(#391): Add new config definitions for curation workflow
6146534
@tholulomo
Merge branch 'develop' of github.com:Duke-MatSci/materialsmine into #…
6c726e8 
…391_Xlsx_Curation
@tholulomo
feat(#391): Increase test coverage requirements
7ccde1e
aswallace and others added 26 commits July 21, 2023 16:25
@aswallace
feat(#425): remove polymerizer links from tools
cbbc723
@aswallace
feat(#428): update tools links on explorer page
b13924c
@tholulomo
Merge pull request #429 from Duke-MatSci/#425_bulk_curation_ui
c5fdaf9 
#425 bulk curation UI
@tholulomo
Merge pull request #419 from Duke-MatSci/#418_Remove_custom_filedepot…
29edb3d 
…_branch

Fixed #418
@tholulomo
Merge branch 'develop' into #416_Bulk_Curation
d5c4090
@tholulomo
feat(#416): Reusing imageTotal on search page to render total number …
4181343 
…of images
@tholulomo
Merge branch '#416_Bulk_Curation' of github.com:Duke-MatSci/materials…
ed1ddbb 
…mine into #416_Bulk_Curation
@tholulomo
feat(#416): Linting and text fixes
10a8ec1
@aswallace
Merge branch 'develop' of https://github.com/Duke-MatSci/materialsmine …
b9931f9 
…into #428_update_tools_page
@aswallace
feat(#428): update tool links and descriptions
254a0a1
@tholulomo
Merge pull request #430 from Duke-MatSci/#428_update_tools_page
6514b70 
#428 update tools page
@tholulomo
feat(#416): Merge upstream changes
fd0b70a
@tholulomo
feat(#416): Add bucket store link for admin user
a21f999
@tholulomo
feat(#416): Configure bucket storage proxy
d8fae4f
@tholulomo
feat(#416): Bucket store code fixes
57b5765
@tholulomo
feat(#416): Unit test fix
aaa0df3
@tholulomo
feat(#416): Unit test fix
50074c3
@aswallace
fix(#254): resolve SDD form errors and add basic unit tests
f272e3c
@tholulomo
Merge pull request #431 from Duke-MatSci/sdd_form_fixes
997bab9 
Resolve SDD form errors and add basic unit tests
@tholulomo
Merge pull request #420 from Duke-MatSci/#416_Bulk_Curation
dcbaefb 
#416 bulk curation
@tholulomo
feat(dynamfit): Add dynamfit temporarily
220d3cb
@tholulomo
feat(none): backend updates and fixes
80dcc56
@aswallace
feat(#253): update download links for sdd files
53250e3
@tholulomo
feat(non) Fix failing xml resolver test
e45b565
@tholulomo
Merge branch 'dev-fixes' of github-dukematsci:Duke-MatSci/materialsmi…
80ad7e0 
…ne into dev-fixes
@tholulomo
Merge pull request #437 from Duke-MatSci/dev-fixes
c438f35 
feat(none): backend updates and fixes
@tholulomo tholulomo merged commit 37c98be into main Aug 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpmccu jpmccu Awaiting requested review from jpmccu jpmccu is a code owner

@aswallace aswallace Awaiting requested review from aswallace aswallace is a code owner

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

Successfully merging this pull request may close these issues.
3 participants
@tholulomo @aswallace @jpmccu