Merge branch 'master' into development (b4e5f892) · Commits · uib-ub / Spesialsamlingene / marcus-lodspeakr · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

marcus-lodspeakr
- Activity
- Members
- Labels
- Wiki

Snippets Groups Projects

b4e5f892

Commit b4e5f892 authored 13 years ago by alvaro

Downloads
- Plain Diff

Merge branch 'master' into development

parents e83b787e f641c028

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

classes/Utils.php 20 additions, 19 deletions

classes/Utils.php
classes/modules/serviceModule.php 3 additions, 3 deletions

classes/modules/serviceModule.php
classes/modules/typeModule.php 11 additions, 9 deletions

classes/modules/typeModule.php
classes/modules/uriModule.php 6 additions, 3 deletions

classes/modules/uriModule.php
index.php 2 additions, 2 deletions

index.php
models/type.rdfs:Resource/html.queries/main.query 0 additions, 18 deletions

models/type.rdfs:Resource/html.queries/main.query
models/type.rdfs:Resource/html.queries/po.query 9 additions, 0 deletions

models/type.rdfs:Resource/html.queries/po.query
models/type.rdfs:Resource/html.queries/sp.query 9 additions, 0 deletions

models/type.rdfs:Resource/html.queries/sp.query
static/css/basic.css 1 addition, 3 deletions

static/css/basic.css
utils/lodspk.sh 32 additions, 7 deletions

utils/lodspk.sh
utils/modules/default.php 27 additions, 0 deletions

utils/modules/default.php
utils/modules/restore.sh 5 additions, 1 deletion

utils/modules/restore.sh
views/type.rdfs:Resource/html.template 29 additions, 26 deletions

views/type.rdfs:Resource/html.template

with 154 additions and 91 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment