Merge branch 'release/2019.2'

derUli · Mar 6, 2019 · 575f5ec · 575f5ec
2 parents cdfd8cd + d0ed92c
commit 575f5ec
Show file tree

Hide file tree

Showing 1,081 changed files with 13,541 additions and 95,680 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,6 @@ ulicms/content/modules/modstarter
 .modstarter
 ulicms/vendor/*
 .thumbs
+nbproject
+node_modules
+ulicms/content/configurations
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Der Uli im Netz
+Copyright (c) 2018, Der Uli im Netz
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ UliCMS requires some special modules for PHP
    * dom
    * xml
 
-For development you require the "composer" package manager.
+For development you require the "composer" and the "npm" (provied by Node.js) package manager.
 You have to run "composer install" to install dependencies.
 
 UliCMS should work on common shared webhosting environment.

diff --git a/doc-src/Neue Features in UliCMS 2019.1.odt → doc-src/Neue Features in UliCMS 2019.2.odt b/doc-src/Neue Features in UliCMS 2019.1.odt → doc-src/Neue Features in UliCMS 2019.2.odt
diff --git a/doc-src/old-kcfinder/kcfinder/browse.php b/doc-src/old-kcfinder/kcfinder/browse.php
diff --git a/doc-src/old-kcfinder/kcfinder/config.php b/doc-src/old-kcfinder/kcfinder/config.php
diff --git a/doc-src/old-kcfinder/kcfinder/core/.htaccess b/doc-src/old-kcfinder/kcfinder/core/.htaccess
diff --git a/doc-src/old-kcfinder/kcfinder/core/autoload.php b/doc-src/old-kcfinder/kcfinder/core/autoload.php