Tiki-KGB: 03lindonb r62873 10trunk/doc/.htaccess 10trunk/lib/prefs/feature.php 10trunk * [MRG] Automatic merge, branches/17.x 62863 to 62872
03lindonb r62874 10branches/17.x/lib/tikiaccesslib.php
[FIX] check origin: properly check host and port; place log entry before switch so the code can always be reached
03lindonb r62875 10branches/17.x/ 10(6 files)
[FIX] implement checkOrigin() to avoid false CSRF errors. Fixes r62751 and r62753
03lindonb r62876 10(8 files in 3 dirs) * [MRG] Automatic merge, branches/17.x 62872 to 62875 amette_: joined #tikiwiki brolin_empey: joined #tikiwiki Telesight: joined #tikiwiki jonnyb: joined #tikiwiki fabricius: joined #tikiwiki jonnyb: joined #tikiwiki Tiki-KGB: 03drsassafras r62877 10branches/17.x/doc/.htaccess
[rb/r62870] [FIX] file whitelisting - access to regular.cycle needed on dogfood server
03drsassafras r62878 10trunk/doc/.htaccess 10trunk * [MRG] Automatic merge, branches/17.x 62875 to 62877
03drsassafras r62879 10branches/17.x/ 10(76 files in 57 dirs) * [FIX] EOL and encoding fixes, dos2unix
03chealer r62880 10trunk/lib/smarty_tiki/function.menu.php * [REF] Add comment on cssmenu and JavaScript
03drsassafras r62881 10trunk/tests/testfile.txt
[MRG] Automatic merge, branches/17.x 62877 to 62879 - dummy merge. Script failed with EOL changes fabricius: joined #tikiwiki Tiki-KGB: 03chealer r62882 10trunk/lib/smarty_tiki/function.menu.php * [REF] Clarify
03drsassafras r62883 10trunk/ 10(76 files in 57 dirs) * [FIX] EOL and BOM encoding, dos2unix
03chealer r62884 10trunk/lib/smarty_tiki/function.menu.php * [REF] Optimize (drilldown)
03chealer r62885 10trunk/lib/smarty_tiki/function.menu.php * [REF] Optimize (don't load menu.js for Bootstrap menus)
03chealer r62886 10trunk/modules/mod-func-menu.php * [REF] FIXME: Conflicting options css and bootstrap jonnyb: joined #tikiwiki Tiki-KGB: 03chealer r62887 10trunk/templates/tiki-user_menu.tpl * [REF] Reformat amette__: joined #tikiwiki Tiki-KGB: joined #tikiwiki
03chealer r62888 10trunk/templates/bootstrap_menu.tpl * [REF] Reformat fleg[m]: joined #tikiwiki Tiki-KGB: 03chealer r62889 10trunk/templates/bootstrap_menu.tpl
Add a space between item.class and "active" class
Not sure if this fixes anything (I don't see any rule for active), but this makes all cases consistent.
03lindonb r62890 10branches/17.x/lib/tikiaccesslib.php
[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
03chealer r62891 10trunk/lib/smarty_tiki/function.menu.php * [REF] get_menu_with_selections(): Optimize and comment block element
03lindonb r62892 10trunk/lib/tikiaccesslib.php 10trunk
[MRG] Automatic merge, branches/17.x 62879 to 62890
Conflicts in lib/tikiaccesslib.php resolved manually