Merge remote-tracking branch 'upstream/master' (4ae70d52) · Commits · hammonds / dm-docs

Commit 4ae70d52 authored 5 years ago by hammonds

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/java/DmWebPortal/nbproject/project.properties

parents 246b324b 2f414389

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/AllowedPolicyValue.java 1 addition, 5 deletions

.../anl/aps/dm/portal/model/entities/AllowedPolicyValue.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/AllowedSettingValue.java 1 addition, 5 deletions

...anl/aps/dm/portal/model/entities/AllowedSettingValue.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/DataFolder.java 1 addition, 5 deletions

...java/gov/anl/aps/dm/portal/model/entities/DataFolder.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Endpoint.java 1 addition, 6 deletions

...c/java/gov/anl/aps/dm/portal/model/entities/Endpoint.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java 23 additions, 2 deletions

...java/gov/anl/aps/dm/portal/model/entities/Experiment.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/ExperimentPolicy.java 1 addition, 1 deletion

...ov/anl/aps/dm/portal/model/entities/ExperimentPolicy.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/ExperimentPolicyPropertyValue.java 1 addition, 4 deletions

.../portal/model/entities/ExperimentPolicyPropertyValue.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/ExperimentRoleType.java 1 addition, 4 deletions

.../anl/aps/dm/portal/model/entities/ExperimentRoleType.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/ExperimentStation.java 16 additions, 1 deletion

...v/anl/aps/dm/portal/model/entities/ExperimentStation.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/ExperimentType.java 6 additions, 1 deletion

.../gov/anl/aps/dm/portal/model/entities/ExperimentType.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/PolicyProperty.java 1 addition, 8 deletions

.../gov/anl/aps/dm/portal/model/entities/PolicyProperty.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/PolicyType.java 1 addition, 4 deletions

...java/gov/anl/aps/dm/portal/model/entities/PolicyType.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/SettingType.java 1 addition, 5 deletions

...ava/gov/anl/aps/dm/portal/model/entities/SettingType.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Storage.java 16 additions, 25 deletions

...rc/java/gov/anl/aps/dm/portal/model/entities/Storage.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/SystemRoleType.java 1 addition, 4 deletions

.../gov/anl/aps/dm/portal/model/entities/SystemRoleType.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserExperimentRole.java 1 addition, 1 deletion

.../anl/aps/dm/portal/model/entities/UserExperimentRole.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserExperimentRolePK.java 1 addition, 1 deletion

...nl/aps/dm/portal/model/entities/UserExperimentRolePK.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserInfo.java 1 addition, 1 deletion

...c/java/gov/anl/aps/dm/portal/model/entities/UserInfo.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserSetting.java 1 addition, 3 deletions

...ava/gov/anl/aps/dm/portal/model/entities/UserSetting.java
src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserSystemRole.java 1 addition, 1 deletion

.../gov/anl/aps/dm/portal/model/entities/UserSystemRole.java

with 77 additions and 87 deletions

Please register or to comment