Merge branch 'master' into adminModule (e90c6a66) · 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

e90c6a66

Commit e90c6a66 authored 12 years ago by alvaro

Downloads
- Plain Diff

Merge branch 'master' into adminModule

parents 27db486d e4b4defe

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

classes/modules/adminModule.php 688 additions, 0 deletions

classes/modules/adminModule.php
classes/modules/redirectModule.php 35 additions, 0 deletions

classes/modules/redirectModule.php
common.inc.php 2 additions, 1 deletion

common.inc.php
lib/Haanga/lib/Haanga/Extension/Filter/Googlevizannotatedtimeline.php 15 additions, 5 deletions

...ib/Haanga/Extension/Filter/Googlevizannotatedtimeline.php
lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php 1 addition, 1 deletion

...anga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php
lib/Haanga/lib/Haanga/Extension/Filter/Raphaeltimeline.php 75 additions, 0 deletions

lib/Haanga/lib/Haanga/Extension/Filter/Raphaeltimeline.php
utils/defaults/type/html.template 3 additions, 7 deletions

utils/defaults/type/html.template
utils/lodspk.sh 26 additions, 1 deletion

utils/lodspk.sh
utils/modules/detail-component.sh 52 additions, 0 deletions

utils/modules/detail-component.sh
utils/modules/start-endpoint.sh 18 additions, 0 deletions

utils/modules/start-endpoint.sh
utils/modules/stop-endpoint.sh 5 additions, 0 deletions

utils/modules/stop-endpoint.sh
utils/modules/test-endpoint.sh 6 additions, 0 deletions

utils/modules/test-endpoint.sh

with 926 additions and 15 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