diff --git a/gastsystem/index.php b/gastsystem/index.php index be920ab..1e5293b 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.5.11  
+
1.5.12  
diff --git a/gastsystem/install.php b/gastsystem/install.php index 8f5f26a..2c9bcc9 100644 --- a/gastsystem/install.php +++ b/gastsystem/install.php @@ -90,10 +90,10 @@ if (isset($_POST['code'])) { } else { echo ""; echo "Installation Gastsystem"; - echo ''; + echo ''; echo ""; echo "
"; - echo "Installation OrderSprinter-Gastsystem 1.5.11

"; + echo "Installation OrderSprinter-Gastsystem 1.5.12

"; echo "
"; echo "
"; echo "
"; diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index ffb021d..cb61cda 100644 Binary files a/javaprinter/javaprinter.jar and b/javaprinter/javaprinter.jar differ diff --git a/javaprinter/javaprinter_lib/LICENSE-apache-commons-codec.txt b/javaprinter/javaprinter_lib/LICENSE-apache-commons.txt similarity index 100% rename from javaprinter/javaprinter_lib/LICENSE-apache-commons-codec.txt rename to javaprinter/javaprinter_lib/LICENSE-apache-commons.txt diff --git a/javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt b/javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt new file mode 100644 index 0000000..b3b90dc --- /dev/null +++ b/javaprinter/javaprinter_lib/LICENSE_usb-api_CommonPublicLicense.txt @@ -0,0 +1 @@ +see https://en.wikipedia.org/wiki/Common_Public_License \ No newline at end of file diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 5dac6f4..e59c61c 100644 Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ diff --git a/spider/install/installer.php b/spider/install/installer.php index ed6c56d..5863ef4 100644 --- a/spider/install/installer.php +++ b/spider/install/installer.php @@ -85,7 +85,7 @@ class Installer { } Database::dropTables($pdo); Database::createEmptyTables($pdo, $prefix); - Database::setVersion($pdo,$prefix,"1.5.11"); + Database::setVersion($pdo,$prefix,"1.5.12"); Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour return array("status" => "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinter-LIZENZ.html b/webapp/OrderSprinter-LIZENZ.html index cf22c0d..52c1a39 100644 --- a/webapp/OrderSprinter-LIZENZ.html +++ b/webapp/OrderSprinter-LIZENZ.html @@ -19,6 +19,11 @@ +

OrderSprinter unterliegt der Creative Commons Lizenz BY-NC-ND (siehe unten). Allerdings werden bestimmte Bibliotheken verwendet, die anderen (freien) Lizenzen unterliegen. Die eingebundenen Bibliotheken und deren Lizenzen befinden sich in den Unterordnern 3rdParty der jeweiligen Webkomponente bzw. dem Unterordner javaprinter_lib des Javaprinters. + +

+ +
diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 5dac6f4..e59c61c 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index 4efc332..7e05d4b 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + @@ -13,8 +13,8 @@ - - + +