litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dev-isf

Browse source 
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
This commit is contained in:
brianjlowe 2013-09-23 16:19:05 -04:00
commit 90512bdc1c
16 changed files with 893 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
View file

@ -154,6 +154,12 @@ return this.objectPropertyStatementDao; }
throw new RuntimeException(
"WebappDaoFactory.checkURI() not implemented.");
}
@Override
public boolean hasExistingURI(String uriStr) {
throw new RuntimeException(
"WebappDaoFactory.hasExistingURI() not implemented.");
}
@Override
public Set<String> getNonuserNamespaces() {