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.

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

Support retirement of classes #7 #25

Merged
merged 48 commits into from
Jun 20, 2024

Conversation

soimugeoWB
Copy link
Collaborator

@soimugeoWB soimugeoWB commented Jun 18, 2024

soimugeo and others added 30 commits May 15, 2024 18:15
… deleting parents seem to delete more than the selected parents. still need to add comment for entity update.
…rotege-gwt-ui into Support_hierarchy_change_operations_#8

� Conflicts:
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/project/ProjectPresenter.java
…ub.com/protegeproject/webprotege-gwt-ui into Support_hierarchy_change_operations_#8

� Conflicts:
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/project/ProjectPresenter.java
…tege-gwt-ui into Support_hierarchy_change_operations_#8

� Conflicts:
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/inject/ClientProjectModule.java
…tege-gwt-ui into Support_hierarchy_change_operations_#8

� Conflicts:
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/perspective/PerspectivePresenter.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/portlet/AbstractWebProtegePortletPresenter.java
…ttps://github.com/protegeproject/webprotege-gwt-ui into Support_retirement_of_classes_#7

� Conflicts:
�	pom.xml
�	webprotege-gwt-ui-client/pom.xml
�	webprotege-gwt-ui-server-core/pom.xml
�	webprotege-gwt-ui-server/pom.xml
�	webprotege-gwt-ui-shared-core/pom.xml
�	webprotege-gwt-ui-shared/pom.xml
soimugeoWB and others added 18 commits June 17, 2024 11:25
…ons_#8' into Support-retirement-of-classes-#7

# Conflicts:
#	pom.xml
#	webprotege-gwt-ui-client/pom.xml
#	webprotege-gwt-ui-server-core/pom.xml
#	webprotege-gwt-ui-server/pom.xml
#	webprotege-gwt-ui-shared-core/pom.xml
#	webprotege-gwt-ui-shared/pom.xml
…eleased-classes-#17' into Support-retirement-of-classes-#7

# Conflicts:
#	pom.xml
#	webprotege-gwt-ui-client/pom.xml
#	webprotege-gwt-ui-server-core/pom.xml
#	webprotege-gwt-ui-server/pom.xml
#	webprotege-gwt-ui-shared-core/pom.xml
#	webprotege-gwt-ui-shared/pom.xml
…/protegeproject/webprotege-gwt-ui into Support_retirement_of_classes_#7

� Conflicts:
�	pom.xml
�	webprotege-gwt-ui-client/pom.xml
�	webprotege-gwt-ui-server-core/pom.xml
�	webprotege-gwt-ui-server/pom.xml
�	webprotege-gwt-ui-shared-core/pom.xml
�	webprotege-gwt-ui-shared/pom.xml
…tege-gwt-ui into Support_retirement_of_classes_#7

� Conflicts:
�	pom.xml
�	webprotege-gwt-ui-client/pom.xml
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/Messages.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/parents/EditParentsPresenter.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/parents/EditParentsView.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/parents/EditParentsViewImpl.java
�	webprotege-gwt-ui-client/src/main/java/edu/stanford/bmir/protege/web/client/hierarchy/parents/EditParentsViewImpl.ui.xml
�	webprotege-gwt-ui-server-core/pom.xml
�	webprotege-gwt-ui-server/pom.xml
�	webprotege-gwt-ui-shared-core/pom.xml
�	webprotege-gwt-ui-shared/pom.xml
�	webprotege-gwt-ui-shared/src/main/java/edu/stanford/bmir/protege/web/shared/hierarchy/ChangeEntityParentsResult.java
…Deserializer

Fix a NPE that would occur if only a value is present
…Deserializer

Fix serialization issues for pure strings
…-gwt-ui into Support_retirement_of_classes_#7

� Conflicts:
�	pom.xml
�	webprotege-gwt-ui-client/pom.xml
�	webprotege-gwt-ui-server-core/pom.xml
�	webprotege-gwt-ui-server/pom.xml
�	webprotege-gwt-ui-shared-core/pom.xml
�	webprotege-gwt-ui-shared/pom.xml
@soimugeoWB
Copy link
Collaborator Author

this is done, but we need to merge backend-api and backend-server first

@soimugeoWB soimugeoWB requested a review from alexsilaghi June 20, 2024 10:15
@soimugeoWB soimugeoWB marked this pull request as ready for review June 20, 2024 10:16
@soimugeoWB soimugeoWB merged commit b57b6d8 into master-who Jun 20, 2024
1 check passed
@soimugeoWB soimugeoWB deleted the Support_retirement_of_classes_#7 branch August 19, 2024 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants