[00:15]  fabricius joined #tikiwiki
[00:26]  fabricius joined #tikiwiki
[00:37]  amette__ left #tikiwiki
[00:37]  amette__ joined #tikiwiki
[02:07]  fabricius joined #tikiwiki
[02:15]  torsten1 joined #tikiwiki
[02:29]  jonnyb joined #tikiwiki
[03:12]  amette__ left #tikiwiki
[04:17]  jonnyb joined #tikiwiki
[07:54]  jonnyb joined #tikiwiki
[11:22]  Telesight joined #tikiwiki
[11:42]  jonnyb joined #tikiwiki
[11:53]  amette__ joined #tikiwiki
[13:15]  fabricius joined #tikiwiki
[13:23]  olinuxx joined #tikiwiki
[13:23]  olinuxx joined #tikiwiki
[13:26] Tiki-KGB 03jonnybradley r61849 10branches/experimental/h5p/storage/public * [SVN] h5p: Ignore everything in storage/public
[13:42] Tiki-KGB 03jonnybradley r61850 10branches/ 10(604 files in 182 dirs)
[13:42] Tiki-KGB [MRG] Automatic merge, trunk 61745 to 61845
[13:42] Tiki-KGB Conflicts fixed (with tf) on:
[13:42] Tiki-KGB admin/include_general.php
[13:42] Tiki-KGB admin/include_intertiki.php
[13:42] Tiki-KGB db/config/controllers.xml
[13:42] Tiki-KGB lib/core/Search/Indexer.php
[13:42] Tiki-KGB lib/core/Services/Edit/PluginController.php
[13:42] Tiki-KGB lib/core/Tiki/MemoryLimit.php
[13:43] Tiki-KGB lib/prefs/wikiplugin.php
[13:43] Tiki-KGB templates/admin/include_calendar.tpl
[13:43] Tiki-KGB templates/admin/include_print.tpl
[13:43] Tiki-KGB Setup and composer update to follow...
[13:50] Tiki-KGB 03jonnybradley r61851 10branches/experimental/h5p/vendor_bundled/composer.json * [FIX] h5p: Important bit missed from new composer.json
[14:36]  arildb joined #tikiwiki
[14:54] Tiki-KGB 03rjsmelo r61852 03branches/experimental/zf3-update * [ENH] Upgrade ZF depdendencies to the same level as ZF3
[15:10]  jonnyb joined #tikiwiki
[15:18] Tiki-KGB 03jonnybradley r61853 10branches/experimental/h5p/vendor_bundled/composer.json
[15:18] Tiki-KGB [FIX] h5p: Finally got the lib/core path right and added classmap additions for h5p to new composer.json
[15:20] Tiki-KGB 03jonnybradley r61854 10branches/experimental/h5p/vendor_bundled/composer.lock * [FIX] h5p: Rebuilt composer.lock for h5 branch
[15:50]  amette__ left #tikiwiki
[15:50]  amette__ joined #tikiwiki
[16:04] Tiki-KGB 03jonnybradley r61855 10branches/ 10experimental/h5p/lib/core/Services/H5P/Controller.php 10experimental/h5p/templates/tiki-list_file_gallery.tpl 10experimental/h5p/lib/core/H5P/H5PTiki.php
[16:04] Tiki-KGB [FIX] h5p: Clean uyp user prefs and results when deleting content (also add a create button on filegals)
[16:23]  arildb joined #tikiwiki
[16:38] Tiki-KGB 03jonnybradley r61856 10branches/ 10experimental/h5p/lib/core/Services/H5P/Controller.php 03experimental/h5p/templates/h5p/list_results.tpl
[16:38] Tiki-KGB [ENH] h5p: Q & D service to display h5p results at tiki-h5p-list_results (no pagination or much else yet)
[17:00] Tiki-KGB 03marclaporte r61857 10trunk/ 10lang/ko/language.php 10templates/tiki-accounting.tpl 10lang/de/language.php 10lang/fr/language.php * fix a typo
[17:48] Tiki-KGB 03rjsmelo r61858 10trunk/ 10vendor_bundled/composer.lock 10vendor_bundled/composer.json
[17:48] Tiki-KGB [ENH] Update composer requirements to align with the versions of Zend Framework 3
[17:50] Tiki-KGB 03rjsmelo r61859 04branches/experimental/zf3-update * [KIL] ZF3 upgrade done directly in trunk
[17:58]  fabricius joined #tikiwiki
[18:06] Tiki-KGB 03rjsmelo r61860 10trunk/lib/init/initlib.php
[18:06] Tiki-KGB [FIX] Check if vendor_custom exists (it should) to avoid throwing any errors in the DirectoryIterator
[19:02] Tiki-KGB 03marclaporte r61861 10trunk/lib/core/Tiki/Composer/CleanVendorAfterVendorBundledMigration.php * fix typo
[19:50]  jonnyb joined #tikiwiki
[21:08]  fabricius joined #tikiwiki
[21:38]  jonnyb joined #tikiwiki
[22:41]  Jyhem_laptop joined #tikiwiki
[22:52]  arildb_ joined #tikiwiki