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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
j2blake 2014-03-26 16:07:00 -04:00
commit 267572efe2
3 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
utilities/acceptance-tests/suites/LinkedOpenData/TestLinkedOpenData.html → utilities/acceptance-tests/testApp/TestLinkedOpenData.html
View file

@ -78,7 +78,7 @@ function TestLOD() {
function requestWithAcceptHeader(uri, mimetype) {
var parms = {
url: "individual/" + uri,
url: "/vivo/individual/" + uri,
headers: {Accept: mimetype},
dataType: "text",
complete: displayResult
@ -89,7 +89,7 @@ function TestLOD() {
function requestWithFormat(uri, format) {
var parms = {
url: "individual/" + uri + "?format=" + format,
url: "/vivo/individual/" + uri + "?format=" + format,
dataType: "text",
complete: displayResult
};
@ -99,7 +99,7 @@ function TestLOD() {
function requestWithExtension(uri, extension) {
var parms = {
url: "individual/" + uri + "/" + uri + "." + extension,
url: "/vivo/individual/" + uri + "/" + uri + "." + extension,
dataType: "text",
complete: displayResult
};

16
utilities/acceptance-tests/testApp/js/jquery.js vendored Normal file
View file

File diff suppressed because one or more lines are too long