Load tinybutstrong via composer and remove constructor of tinyDoc.

In the long run use OpenTbs which is still maintained.
kimai · Jan 20, 2018 · 8e80c51 · 8e80c51
1 parent c81eb1a
commit 8e80c51
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 3,347 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,4 @@
 !/libraries/jQuery/
 !/libraries/phpclasses/
 !/libraries/phpjs/
-!/libraries/TinyButStrong/
+!/libraries/TinyButStrongPlugins/
diff --git a/composer.json b/composer.json
@@ -14,15 +14,16 @@
         "php": ">=5.4.0",
         "tecnickcom/tcpdf": "^6.2.12",
         "zendframework/zendframework1": "^1.12",
-        "phpoffice/phpexcel": "1.8.*"
+        "phpoffice/phpexcel": "1.8.*",
+        "tinybutstrong/tinybutstrong": "^3.10"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "malsup/form": "3.51"
     },
     "autoload": {
         "classmap" : [
-            "libraries/TinyButStrong"
+            "libraries/TinyButStrongPlugins"
         ],
         "psr-0": {
             "Kimai_": "libraries/"

diff --git a/composer.lock b/composer.lock