Goobi.Presentation

Merge lp:goobi-presentation/1.0 into lp:goobi-presentation/1.1

  1. 1.0
  2. Merge into 1.1
Proposed by Sebastian Meyer
Status: Merged
Merged at revision: 38
Proposed branch: lp:goobi-presentation/1.0
Merge into: lp:goobi-presentation/1.1
Diff against target: 26 lines (+3/-2)
2 files modified
dlf/ext_emconf.php (+1/-1)
dlf/plugins/pageview/viewer.js (+2/-1)
To merge this branch: bzr merge lp:goobi-presentation/1.0
Reviewer Review Type Date Requested Status
Sebastian Meyer Approve
Review via email: mp+73512@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastian Meyer (sebastian-meyer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dlf/ext_emconf.php'
2--- dlf/ext_emconf.php 2011-08-10 16:23:26 +0000
3+++ dlf/ext_emconf.php 2011-08-31 11:20:01 +0000
4@@ -39,7 +39,7 @@
5 'modify_tables' => '',
6 'clearCacheOnLoad' => FALSE,
7 'lockType' => '',
8- 'version' => '1.0.1',
9+ 'version' => '1.0.2',
10 'constraints' => array(
11 'depends' => array(
12 'php' => '5.3.0-',
13
14=== modified file 'dlf/plugins/pageview/viewer.js'
15--- dlf/plugins/pageview/viewer.js 2011-03-09 15:36:27 +0000
16+++ dlf/plugins/pageview/viewer.js 2011-08-31 11:20:01 +0000
17@@ -47,7 +47,8 @@
18 maxExtent: new OpenLayers.Bounds(0, 0, size_disp.w, size_disp.h),
19 controls: [new OpenLayers.Control.Navigation()],
20 numZoomLevels: 7,
21- fractionalZoom: true
22+ fractionalZoom: true,
23+ theme: null
24 };
25 this.map = new OpenLayers.Map("tx-dlf-map", options);
26 var bounds = new OpenLayers.Bounds(0, 0, size_disp.w, size_disp.h);

Subscribers

People subscribed via source and target branches

to all changes: