Skip to content
Snippets Groups Projects

Regular merge of develop

Merged Regular merge of develop
develop into master
1 unresolved thread
Merged Laurent Heirendt requested to merge develop into master
1 unresolved thread
Compare
and
12 files
+ 56
− 5
Compare changes
  • Side-by-side
  • Inline
Files
12
.ci/.autoRedirect
+ 5
− 5
@@ -35,11 +35,11 @@
@@ -35,11 +35,11 @@
if (sub.length > 0) {
if (sub.length > 0) {
UrlExists(internalURL+'/stable/internal/'+sub, function(status){
UrlExists(internalURL+'/stable/internal/'+sub, function(status){
if (status == 200) { // if sub-card is internal in the internal directory and exists
if (status == 200) { // if sub-card is internal in the internal directory and exists
window.location.href = internalURL+'/stable/internal/'+sub;
window.location.href = internalURL+'/stable/internal/cards/'+sub;
} else {
} else {
UrlExists(internalURL+'/stable/external/'+sub, function(status){
UrlExists(internalURL+'/stable/external/'+sub, function(status){
if (status == 200) { // if sub-card is internal in the external directory and exists
if (status == 200) { // if sub-card is internal in the external directory and exists
window.location.href = internalURL+'/stable/external/'+sub;
window.location.href = internalURL+'/stable/external/cards/'+sub;
} else {
} else {
window.location.href = internalURL+'/stable/404.html';
window.location.href = internalURL+'/stable/404.html';
}
}
@@ -58,9 +58,9 @@
@@ -58,9 +58,9 @@
// external pages
// external pages
} else {
} else {
if (sub.length > 0) { sub = 'external/'+sub; }
if (sub.length > 0) { sub = 'external/'+sub; }
UrlExists(externalURL+'/stable/'+sub, function(status){
UrlExists(externalURL+'/stable/cards/'+sub, function(status){
if (status == 200) { // if sub-car is internal and exists
if (status == 200) { // if sub-card is internal and exists
window.location.href = externalURL+'/stable/'+sub;
window.location.href = externalURL+'/stable/cards/'+sub;
} else {
} else {
window.location.href = externalURL+'/stable/404.html';
window.location.href = externalURL+'/stable/404.html';
}
}