Skip to content

Commit

Permalink
Merge branch 'master-who' of https://github.com/protegeproject/webpro…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
soimugeo committed Jun 18, 2024
2 parents 4c7c3ee + a937aef commit e3e564b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-gwt-ui</artifactId>
<version>5.0.14-WHO</version>
<version>5.0.15-WHO</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion webprotege-gwt-ui-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-gwt-ui</artifactId>
<version>5.0.14-WHO</version>
<version>5.0.15-WHO</version>
</parent>

<artifactId>webprotege-gwt-ui-client</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions webprotege-gwt-ui-client/src/main/module.gwt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
Trim down the permutations that are compiled. We need CSS3 features and so don't support
earlier versions of IE.
-->
<!-- <set-property name="user.agent" value="gecko1_8,safari"/>-->
<set-property name="user.agent" value="gecko1_8"/>
<set-property name="user.agent" value="gecko1_8,safari"/>

<set-property-fallback name="locale" value="en"/>
<extend-property name="locale" values="en"/>
Expand Down
2 changes: 1 addition & 1 deletion webprotege-gwt-ui-server-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>webprotege-gwt-ui</artifactId>
<groupId>edu.stanford.protege</groupId>
<version>5.0.14-WHO</version>
<version>5.0.15-WHO</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion webprotege-gwt-ui-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-gwt-ui</artifactId>
<version>5.0.14-WHO</version>
<version>5.0.15-WHO</version>
</parent>

<artifactId>webprotege-gwt-ui-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion webprotege-gwt-ui-shared-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>webprotege-gwt-ui</artifactId>
<groupId>edu.stanford.protege</groupId>
<version>5.0.14-WHO</version>
<version>5.0.15-WHO</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion webprotege-gwt-ui-shared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-gwt-ui</artifactId>
<version>5.0.14-WHO</version>
<version>5.0.15-WHO</version>
</parent>

<artifactId>webprotege-gwt-ui-shared</artifactId>
Expand Down

0 comments on commit e3e564b

Please sign in to comment.