Tiki-KGB: 03lindonb r62250 10trunk/lib/tikilib.php
[REF] For url safe sequence, only replace + and / and strip the = sign. Using a ~ for = still caused some escaping issues so strip since it is only a padding character.
03lindonb r62251 10trunk/lib/core/Services/Menu/Controller.php
[REF] menu: update function for new ticket system so use of smarty function {ticket} will still work after it was updated
03lindonb r62252 10trunk/ 10tiki-contact.php 10tiki-adminusers.php
[REF] update for new ticket system so use of smarty function {ticket} in related form will still work after it was updated Bsfez: joined #tikiwiki Tiki|bot: Recent Bug: - http://dev.tiki.org/item6323
Recent Bug: - http://dev.tiki.org/item6324 Bsfez: joined #tikiwiki
joined #tikiwiki
joined #tikiwiki
joined #tikiwiki
joined #tikiwiki chibaguy: joined #tikiwiki
polom Bsfez: joined #tikiwiki redflo: joined #tikiwiki amette__: joined #tikiwiki fabricius: joined #tikiwiki kotten_: joined #tikiwiki Bsfez: joined #tikiwiki fabricius: joined #tikiwiki chibaguy: Hi amette_, any idea when https://12xthemes.tiki.org/ will be back up? Bsfez: joined #tikiwiki amette__: left #tikiwiki montefuscolo: joined #tikiwiki amette__: joined #tikiwiki Tiki-KGB: 03jonnybradley r62253 10(15 files in 12 dirs)
[MRG] Automatic merge, branches/17.x 62218 to 62245
Tree conflicts (local file obstruction, incoming file add upon merge)
'lib/core/Services/Xmpp'
'lib/prefs/xmpp.php'
'lib/prefs/xmpp.php'
'lib/xmpp'
'modules/mod-func-xmpp.php'
'modules/mod-func-xmpp.php'
'templates/modules/mod-xmpp.tpl'
'templates/xmpp-client.tpl'
> marked as resolved
Conflict discovered in file 'vendor_bundled/composer.json'.
> resolved manually but no change
Conflict discovered in file 'vendor_bundled/composer.lock'.
> resolved by: php temp/composer.phar update -d vendor_bundled --prefer-dist amette__: chibaguy : it's back now, there were some weirdnesses with mysql open_files_limit chibaguy: Ah, ok great. Thanks. Bsfez: hi Am, chi nelsonko: joined #tikiwiki Tiki-KGB: 03yonixxx r62254 10trunk/templates/tiki-edit_report.tpl * [FIX]There is no admin report page so the link show an error. amette__: left #tikiwiki Tiki-KGB: 03yonixxx r62255 10branches/17.x/templates/tiki-edit_report.tpl * [FIX][bp/62254]There is no admin report page so the link show an error. amette__: joined #tikiwiki Tiki-KGB: 03yonixxx r62256 10branches/16.x/templates/tiki-edit_report.tpl * [FIX][bp/62254]There is no admin report page so the link show an error. amette__: left #tikiwiki Tiki-KGB: 03yonixxx r62257 10branches/15.x/templates/tiki-edit_report.tpl * [FIX][bp/62254]There is no admin report page so the link show an error. Bsfez: lu !
:D Tiki-KGB: 03jonnybradley r62258 10branches/17.x/templates/trackerinput/showtikiorg.tpl * [REL] Add the 17.x branch to show.tiki.org (TODO refactor ;) amette__: joined #tikiwiki Tiki-KGB: 03jonnybradley r62259 10branches/ 1016.x/templates/trackerinput/showtikiorg.tpl 1016.x/templates 1016.x * [bp/r62258][REL] Add the 17.x branch to show.tiki.org (TODO refactor ;)
03jonnybradley r62260 10trunk/templates/trackerinput/showtikiorg.tpl 10trunk * [MRG] Automatic merge, branches/17.x 62245 to 62258 Jyhem: pomopom Telesight: joined #tikiwiki fabricius: wodowod Jyhem
joined #tikiwiki torsten1: joined #tikiwiki amette__: left #tikiwiki Tiki-KGB: 03kroky6 r62261 10branches/17.x/lib/ 10objectlib.php 10smarty_tiki/function.object_link.php 10core/Tracker/Field/Relation.php 10core/Services/Tracker/Utilities.php
[FIX] Relation field edge cases - circular refresh on save depleting function call stack, orphan field relations when target objects have been deleted
03kroky6 r62262 10branches/ 10(5 files in 5 dirs)
[bp/62261] [FIX] Relation field edge cases - circular refresh on save depleting function call stack, orphan field relations when target objects have been deleted
03kroky6 r62263 10branches/ 10(5 files in 5 dirs)
[bp/62261] [FIX] Relation field edge cases - circular refresh on save depleting function call stack, orphan field relations when target objects have been deleted
03kroky6 r62264 10(5 files in 5 dirs) * [MRG] Automatic merge, branches/17.x 62258 to 62261