diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e0ba7e95..b979e9c50 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,10 +18,12 @@ ### CHANGED - **[CORE]** Berechtigungsprüfung wurde angepasst damit deaktivierte Benutzer keine Berechtigungen mehr haben - **[FAS]** Mitarbeiterexport exportiert jetzt nur noch die markierten Personen +- **[CORE]** Has many as possible javascripts and css present in the repository were removed. Their lack is overcome by the packages in the composer. In the meanwhile also the versions were updated ### Updateinfo - **[CORE]** Infoscreen wurde umbenannt (informationsbildschirm.php) - **[CORE]** Moodle Schnittstelle wurde aus dem Core entfernt und in ein eigenes Addon verschoben. Moodle Versionen < 2.4 werden nicht mehr unterstützt +- **[CORE]** Update campus.tbl_templates (contentmittitel and contentohnetitel) with system/templates/contentmittitel_xslt_xhtml.xslt andsystem/templates/contentohnetitel_xslt_xhtml.xslt ## [3.2] diff --git a/composer.json b/composer.json index 1911d9274..94c17e1d9 100755 --- a/composer.json +++ b/composer.json @@ -106,18 +106,6 @@ } } }, - { - "type": "package", - "package": { - "name": "edweezy/bootstrap-colorpicker", - "version": "1.0", - "source": { - "url": "https://github.com/edweezy/bootstrap-colorpicker.git", - "type": "git", - "reference": "600e960b13aa395e2f6783e0a10f97d4b0f0c33f" - } - } - }, { "type": "package", "package": { @@ -220,7 +208,8 @@ "alvaro-prieto/colResizable": "^1.6", "tapmodo/Jcrop": "^2.0", "joeldbirch/superfish": "^1.7", - "jquery/sizzle": "^1.0" + "jquery/sizzle": "^1.0", + "tomazdragar/SimpleCropper": "^1.0" }, "require-dev": { "squizlabs/php_codesniffer": "2.*" diff --git a/composer.lock b/composer.lock index f32348b8a..0da9a9b1f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "103a2e39e5cecacf7f2a7188ba9a3c7b", - "content-hash": "3925c56e7a33930a684da03e85cae6e5", + "hash": "79a093497d04fa084ff4dece7cd1be4b", + "content-hash": "991e0fcfbc30ca3d04fd35eb36206c1e", "packages": [ { "name": "alvaro-prieto/colResizable", @@ -2225,6 +2225,16 @@ ], "time": "2017-08-30 12:11:58" }, + { + "name": "tomazdragar/SimpleCropper", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/tomazdragar/SimpleCropper.git", + "reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde" + }, + "type": "library" + }, { "name": "twig/twig", "version": "v1.28.2", @@ -2719,16 +2729,6 @@ } ], "packages-dev": [ - { - "name": "edweezy/bootstrap-colorpicker", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/edweezy/bootstrap-colorpicker.git", - "reference": "600e960b13aa395e2f6783e0a10f97d4b0f0c33f" - }, - "type": "library" - }, { "name": "jquery-archive/jquery-metadata", "version": "1.0", @@ -2816,16 +2816,6 @@ "standards" ], "time": "2016-11-30 04:02:31" - }, - { - "name": "tomazdragar/SimpleCropper", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/tomazdragar/SimpleCropper.git", - "reference": "9750b81fa55ed07b3b429297d18ffbeac07a2cde" - }, - "type": "library" } ], "aliases": [],