amette_: joined #tikiwiki
left #tikiwiki fabricius: joined #tikiwiki
joined #tikiwiki Tiki-KGB: 03lindonb r63013 10trunk/lib/wiki-plugins/wikiplugin_customsearch.php 10trunk/lib/prefs/wiki.php 10trunk * [MRG] Automatic merge, branches/17.x 62994 to 63005
03lindonb r63014 10branches/17.x/lib/ 10jquery_tiki/tiki-jquery.js 10smarty_tiki/function.feedback.php
[FIX] feedback: Ajax feedback wasn't appearing in some cases; avoid using deprecated javascript escape function; throttle the number of times the scroll event causes the ajax feedback display function to fire; move code to tiki-jquery; other optimizations
03lindonb r63015 10trunk/lib/jquery_tiki/tiki-jquery.js 10trunk/lib/smarty_tiki/function.feedback.php 10trunk * [MRG] Automatic merge, branches/17.x 63005 to 63014 Telesight: joined #tikiwiki jonnyb: joined #tikiwiki fabricius: joined #tikiwiki
joined #tikiwiki Tiki-KGB: 03lindonb r63016 10trunk/lib/jquery_tiki/tiki-jquery.js
[FIX] Restore inadvertently reverted changes with the last semi-automatic merge r63015 fabricius: joined #tikiwiki Tiki-KGB: 03lindonb r63017 10branches/17.x/lib/core/TikiFilter/PreventXss.php * [FIX] Add attributes to xss filter
03lindonb r63018 10trunk 10trunk/lib/core/TikiFilter/PreventXss.php * [MRG] Automatic merge, branches/17.x 63014 to 63017
03lindonb r63019 10branches/16.x/lib/core/TikiFilter/PreventXss.php * [bp/r63017][FIX] Add attributes to xss filter
03lindonb r63020 10branches/17.x/lib/core/TikiFilter/PreventXss.php * [FIX] Remove unnecessary attributes committed in r63017
03lindonb r63021 10trunk 10trunk/lib/core/TikiFilter/PreventXss.php * [MRG] Automatic merge, branches/17.x 63017 to 63020
03lindonb r63022 10branches/15.x/lib/core/TikiFilter/PreventXss.php
[bp/r63017][FIX] Add attributes to xss filter. Not an exact backport - simply backporting the latest list of attributes from 17.x
03lindonb r63023 10branches/12.x/lib/core/TikiFilter/PreventXss.php
[bp/r63017][FIX] Add attributes to xss filter. Not an exact backport - simply backporting the latest list of attributes from 17.x
03lindonb r63024 10branches/16.x/lib/core/TikiFilter/PreventXss.php * [bp/r62084][FIX] Prevent bypassing of the xss filter by padding zeros
03lindonb r63025 10branches/15.x/lib/core/TikiFilter/PreventXss.php * [bp/r62084][FIX] Prevent bypassing of the xss filter by padding zeros
03lindonb r63026 10branches/12.x/lib/core/TikiFilter/PreventXss.php * [bp/r62084][FIX] Prevent bypassing of the xss filter by padding zeros
03lindonb r63027 10trunk/ 10templates/comment/list.tpl 10lib/core/Services/Comment/Controller.php
[fp/r62670 and r62671][FIX] comments: better filtering and escaping for comment object IDs. Not merged from 17.x for some reason. jonnyb: joined #tikiwiki torsten1: joined #tikiwiki