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