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 2.1 updates #214

Merged
merged 46 commits into from
Oct 27, 2023
Merged

Merge 2.1 updates #214

merged 46 commits into from
Oct 27, 2023

Conversation

timparsons
Copy link
Member

No description provided.

BrapiCoordinatorSelby and others added 30 commits July 20, 2023 15:42
@BrapiCoordinatorSelby
fixes #60 and #61, adding delete endpoints
ed34886
@BrapiCoordinatorSelby
fixes #63, #64, and #65, add new ontology endpoints
c0fcdfe
@BrapiCoordinatorSelby
solves issues #66, #67, #68, #69, and #70
9b672e3
@BrapiCoordinatorSelby
fixed small test bug
5036a32
@BrapiCoordinatorSelby
fixes issues #71, #72, #73, #74, #137, #138, #104, #105, #106, #107, #…
2547f14 
…180, #181, #182, #183, #188, #189, #190, #191, #161, #162, #133, #134, #135, #136
@BrapiCoordinatorSelby
unit tests pass
1960393
@BrapiCoordinatorSelby
fixes issues #75, #76, #77, #78, #139, #140. Dependant on #199
49fe7ca
@BrapiCoordinatorSelby
JUnits pass
ec1ea1d
@BrapiCoordinatorSelby
fixes #126, #127, #128. Dependent on #199
0e46ced
@BrapiCoordinatorSelby
fixes #123, #124, #125, #153, #154. Dependent on #199
ab279e3
@BrapiCoordinatorSelby
fixes issues #79, #80, #81, #82, #83, #84, #85. Dependent on #199
f83a2c7
@BrapiCoordinatorSelby
fixes #86
494dfc7
@BrapiCoordinatorSelby
tests pass
034d272
@BrapiCoordinatorSelby
fixes #174, #175, #176, #177, #178, #179, #157, #158. Dependant on #199
79fc2f7
@BrapiCoordinatorSelby
fixes #184, #185, #186, #187, #155, #156, #159, #160, #129, #130, #131,
e89e963 
#132. Dependent on #199
@BrapiCoordinatorSelby
fixes #145, #146, #163, #164, #165, #166, #96, #97, #98, #99. Depende…
5b4427e 
…nt on #199
@BrapiCoordinatorSelby
Merge branch 'develop-2.1' into issue-145
e762c89
@BrapiCoordinatorSelby
fixes #147, #148, #100, #101, #102, #103. Dependent on #199
04a9340
@BrapiCoordinatorSelby
fixes issues #87, #88, #89, #90, #142, #141. dependent on #199
4381dd2
@BrapiCoordinatorSelby
fixes issues #167, #168, #169, #170, #171, #172, #173. Dependent on #199
73ddaf6
@BrapiCoordinatorSelby
fixes issues #91, #92, #93, #94, #95, #143, #144, #149, #150, #109, #110
38f6f3a 
, #111, #112, #113, #114. Dependent on #199
@BrapiCoordinatorSelby
fixes issues #151, #152, #117, #118, #119, #120, #121, #115, #116. De…
6f33afe 
…pendent on #199
@timparsons
Merge remote-tracking branch 'origin/issue-60' into develop-2.1
d15cd26
@timparsons
Merge remote-tracking branch 'origin/issue-63' into develop-2.1
a8b345a
@timparsons
Merge remote-tracking branch 'origin/issue-66' into develop-2.1
8426c6d
@timparsons
Merge remote-tracking branch 'origin/issue-71' into develop-2.1
dd03cc9
@timparsons
Merge remote-tracking branch 'origin/issue-75' into develop-2.1
e5ab34d
@timparsons
Merge remote-tracking branch 'origin/issue-126' into develop-2.1
ae4f19e
@timparsons
Merge remote-tracking branch 'origin/issue-123' into develop-2.1
8d48ce0
@timparsons
Merge remote-tracking branch 'origin/issue-79' into develop-2.1
20b6436
@timparsons timparsons changed the base branch from develop-2.1 to develop October 20, 2023 01:57
@timparsons timparsons marked this pull request as ready for review October 20, 2023 01:57
BrapiCoordinatorSelby
BrapiCoordinatorSelby approved these changes Oct 27, 2023
View reviewed changes
Copy link
Collaborator

@BrapiCoordinatorSelby BrapiCoordinatorSelby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the following commits
82a5ff8
6d12ba5
ab6e426

All looks good

@timparsons timparsons changed the base branch from develop to develop-2.1 October 27, 2023 13:25
@timparsons timparsons merged commit 78b2e9a into develop-2.1 Oct 27, 2023
1 check passed
@timparsons timparsons deleted the feature/merge-2.1-updates branch October 27, 2023 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BrapiCoordinatorSelby BrapiCoordinatorSelby BrapiCoordinatorSelby approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@timparsons @BrapiCoordinatorSelby