[02:04]  torsten1 joined #tikiwiki
[04:18] Tiki-KGB 03lindonb r62873 10trunk/doc/.htaccess 10trunk/lib/prefs/feature.php 10trunk * [MRG] Automatic merge, branches/17.x 62863 to 62872
[04:28] Tiki-KGB 03lindonb r62874 10branches/17.x/lib/tikiaccesslib.php
[04:28] Tiki-KGB [FIX] check origin: properly check host and port; place log entry before switch so the code can always be reached
[04:34] Tiki-KGB 03lindonb r62875 10branches/17.x/ 10(6 files)
[04:34] Tiki-KGB [FIX] implement checkOrigin() to avoid false CSRF errors. Fixes r62751 and r62753
[04:36] Tiki-KGB 03lindonb r62876 10(8 files in 3 dirs) * [MRG] Automatic merge, branches/17.x 62872 to 62875
[05:40]  amette_ joined #tikiwiki
[08:47]  brolin_empey joined #tikiwiki
[10:00]  Telesight joined #tikiwiki
[12:17]  jonnyb joined #tikiwiki
[14:11]  fabricius joined #tikiwiki
[15:07]  jonnyb joined #tikiwiki
[17:02] Tiki-KGB 03drsassafras r62877 10branches/17.x/doc/.htaccess
[17:02] Tiki-KGB [rb/r62870] [FIX] file whitelisting - access to regular.cycle needed on dogfood server
[18:32] Tiki-KGB 03drsassafras r62878 10trunk/doc/.htaccess 10trunk * [MRG] Automatic merge, branches/17.x 62875 to 62877
[18:36] Tiki-KGB 03drsassafras r62879 10branches/17.x/ 10(76 files in 57 dirs) * [FIX] EOL and encoding fixes, dos2unix
[18:40] Tiki-KGB 03chealer r62880 10trunk/lib/smarty_tiki/function.menu.php * [REF] Add comment on cssmenu and JavaScript
[18:42] Tiki-KGB 03drsassafras r62881 10trunk/tests/testfile.txt
[18:42] Tiki-KGB [MRG] Automatic merge, branches/17.x 62877 to 62879 - dummy merge. Script failed with EOL changes
[18:50]  fabricius joined #tikiwiki
[19:02] Tiki-KGB 03chealer r62882 10trunk/lib/smarty_tiki/function.menu.php * [REF] Clarify
[19:04] Tiki-KGB 03drsassafras r62883 10trunk/ 10(76 files in 57 dirs) * [FIX] EOL and BOM encoding, dos2unix
[19:12] Tiki-KGB 03chealer r62884 10trunk/lib/smarty_tiki/function.menu.php * [REF] Optimize (drilldown)
[19:52] Tiki-KGB 03chealer r62885 10trunk/lib/smarty_tiki/function.menu.php * [REF] Optimize (don't load menu.js for Bootstrap menus)
[20:00] Tiki-KGB 03chealer r62886 10trunk/modules/mod-func-menu.php * [REF] FIXME: Conflicting options css and bootstrap
[20:05]  jonnyb joined #tikiwiki
[20:12] Tiki-KGB 03chealer r62887 10trunk/templates/tiki-user_menu.tpl * [REF] Reformat
[22:38]  amette__ joined #tikiwiki
[22:47]  Tiki-KGB joined #tikiwiki
[23:00] Tiki-KGB 03chealer r62888 10trunk/templates/bootstrap_menu.tpl * [REF] Reformat
[23:04]  fleg[m] joined #tikiwiki
[23:12] Tiki-KGB 03chealer r62889 10trunk/templates/bootstrap_menu.tpl
[23:12] Tiki-KGB Add a space between item.class and "active" class
[23:12] Tiki-KGB Not sure if this fixes anything (I don't see any rule for active), but this makes all cases consistent.
[23:24] Tiki-KGB 03lindonb r62890 10branches/17.x/lib/tikiaccesslib.php
[23:24] Tiki-KGB [FIX] remove checking for $jit as this weakens test; failure of check not recognized in some cases; remove unnecessary return false commands; add csrf error function; add ability to display an error page; better error and log messages
[23:52] Tiki-KGB 03chealer r62891 10trunk/lib/smarty_tiki/function.menu.php * [REF] get_menu_with_selections(): Optimize and comment block element
[23:58] Tiki-KGB 03lindonb r62892 10trunk/lib/tikiaccesslib.php 10trunk
[23:58] Tiki-KGB [MRG] Automatic merge, branches/17.x 62879 to 62890
[23:58] Tiki-KGB Conflicts in lib/tikiaccesslib.php resolved manually