Merge branch 'release/0.5.0'

Author: bensinober

CHANGELOG.md

@@ -12,14 +12,37 @@ a secrets.env:
 The resulting compose file can then be used with `docker-compose up -d` to provision.
 
 # Releases
-## 0.4.0 (2016-11-09)
 
-GITREF: 5180ccb93e764f80f627d2a76d49bbe1c3d4ab32
-KOHA:   90437fe3ee4e3d5af59182d7f3be477940b484f4
+## 0.5.0 (2016-11-16)
+
+GITREF:
+KOHA:   3df1e1097b2fa4d2eae7766745fc172184d2644c
 
+- koha:
+  - add pickupnumber to reserves table, update schema and add pickupnumber trigger
+  - boost starman workers
+  - replacementprice for Spill
+  - rewrite pidgeon service to use tempfiles
+  - add itemnumber to reserveslip for correct generation
+- sip:
+  - fix for missing AO in self checkout machines
+  - checkin: Override current location, set to institution ID (excluding API branch)
+- patron-client:
+  - update patron overview to use new pickupnumber
 - catalinker:
-  - add alternativeName to autorities
-  
+  - fix replacing resource DEICH-435
+  - when patchcing objects, do not delete empty values DEICH-462
+  - add created and modified timestamp to all authorities DEICH-433
+  - map 300$a as extent or number of pages depending on mediatype DEICH-427
+  - fix composition type search
+- services:
+  - make publication class number searchable as 'kd' DEICH-161
+
+## 0.4.0 (2016-11-10) Bugfix release
+
+- catalinker:
+  - DEICH-430_alternativt_navn_på_flere_autoriteter'
+
 ## 0.3.0 (2016-11-09)
 
 GITREF: 5eb52acd085ec5e88c19020a9c49ad44250bda68

docker-compose/docker-compose-template-dev-CI.yml

@@ -213,7 +213,7 @@ services:
 
   sip_proxy:
     container_name: sip_proxy
-    image: "digibib/sip2proxy:ab3fdece55099862069f04ef21acb01665598f82"
+    image: "digibib/sip2proxy:a387e6d35e38c488b0f4ec7bc0c7292e19dd61df"
     networks:
       - backend
     ports:
@@ -225,7 +225,7 @@ services:
       - "-log-messages=true"
       - "-replace-10=true"
       - "-log-metrics-every-s=300"
-      - "-asciify=false"
+      - "-ensure-branch=true"
     logging:
       driver: "json-file"
       options:

docker-compose/docker-compose-template-dev.yml

@@ -229,7 +229,7 @@ services:
 
   sip_proxy:
     container_name: sip_proxy
-    image: "digibib/sip2proxy:ab3fdece55099862069f04ef21acb01665598f82"
+    image: "digibib/sip2proxy:a387e6d35e38c488b0f4ec7bc0c7292e19dd61df"
     networks:
       - backend
     ports:
@@ -241,7 +241,7 @@ services:
       - "-log-messages=true"
       - "-replace-10=true"
       - "-log-metrics-every-s=300"
-      - "-asciify=false"
+      - "-ensure-branch=true"
     logging:
       driver: "json-file"
       options:

docker-compose/docker-compose-template-prod.yml

@@ -172,7 +172,7 @@ services:
 
   sip_proxy:
     container_name: sip_proxy
-    image: "digibib/sip2proxy:ab3fdece55099862069f04ef21acb01665598f82"
+    image: "digibib/sip2proxy:a387e6d35e38c488b0f4ec7bc0c7292e19dd61df"
     networks:
       - backend
     ports:
@@ -184,7 +184,7 @@ services:
       - "-log-messages=true"
       - "-replace-10=true"
       - "-log-metrics-every-s=300"
-      - "-asciify=false"
+      - "-ensure-branch=true"
     logging:
       driver: "journald"
 

docker-compose/docker-compose.env

@@ -2,7 +2,7 @@ export SIP_PORT=6001
 export SIP_PROXY_PORT=6002
 export SIP_AUTOPASS=secret
 export SIP_AUTOPASS_ENCRYPTED=encryptme
-export KOHA_IMAGE_TAG=90437fe3ee4e3d5af59182d7f3be477940b484f4
+export KOHA_IMAGE_TAG=3df1e1097b2fa4d2eae7766745fc172184d2644c
 export KOHA_ADMINUSER=admin
 export KOHA_ADMINPASS=secret
 export KOHA_INSTANCE=name

redef/catalinker/client/scss/style.scss

@@ -271,19 +271,23 @@ body {
           &:empty:after {
             font-size: 0px;
           }
-          &.for-checkbox {
+          &.for-one-liner {
             display: inline;
+            min-width: 104px;
           }
         }
-        .checkbox {
-          margin-top: 11px;
+        .one-liner {
+          margin-top: 13px;
         }
         .input-wrapper .label {
           padding: 12px 12px 4px 0px;
         }
         .panel-part {
-          &.for-checkbox {
+          &.for-one-liner {
             display: flex;
+            &:not(.last-one) {
+              margin-bottom: -24px;
+            }
           }
           &.first {
             border-top: 1px solid lightgrey;
@@ -321,6 +325,9 @@ body {
               border: none;
               padding: 13px;
               display: none;
+              &+span>.add-new-btn-row {
+                margin-top: 13px;
+              }
             }
             display: flex;
             flex-direction: column;
@@ -372,7 +379,7 @@ body {
             background: $input-background;
             input[type=checkbox] {
               width: auto;
-              margin-top: -2px;
+              margin-top: -4px;
             }
             .explanation {
               margin-left: 0.5em;
@@ -706,6 +713,7 @@ body {
           label {
             padding-right: 25px;
             padding-left: 5px;
+            margin-top: 8px;
           }
         }
         a.delete {
@@ -770,7 +778,7 @@ body {
               margin-bottom: -1px;
               .value input[type=checkbox] {
                 width: auto;
-                margin-top: -2px;
+                margin-top: -5px;
               }
               .label {
                 background: inherit;