<!-- Some styling for better description lists --><style type='text/css'>dt { font-weight: bold;float: left;display:inline;margin-right: 1em} dd { display:block; margin-left: 2em}</style>

   Tiki-KGB: [REV] Revert r54139 because not doing the merge properly to populate the svn merginfo.
   <br> 03lindonb r54142 10(6 files in 5 dirs) * [MRG] Automatic merge, branches/14.x 54136 to 54140
   <br> 03lindonb r54143 10branches/14.x/templates/tiki-view_forum.tpl * iconset conversion
   <br> 03lindonb r54144 10trunk/templates 10trunk/templates/tiki-view_forum.tpl 10trunk * [MRG] Automatic merge, branches/14.x 54140 to 54143
   <br> 03lindonb r54145 10branches/14.x/templates/tiki-view_forum.tpl
   <br> [FIX] forum: remove badge formatting so you can tell the attachment count is a link
   <br> 03lindonb r54146 10trunk/templates 10trunk/templates/tiki-view_forum.tpl 10trunk * [MRG] Automatic merge, branches/14.x 54143 to 54145
   <br> 03walper r54147 10trunk/_htaccess
   <br> [ENH] Slightly optimized htaccess following googles cache directive advise. Disabled cache-control in favour of expires. Separate modified since definitions for js/css and images.
   <br> 03walper r54148 10trunk/doc/devtools/svntools.php * [FIX] Fixed developer svn tools like svnbranchupdate to work on windows.
   lindonb: joined #tikiwiki
   Tiki-KGB: 03lindonb r54149 10branches/ 1014.x/themes/base_files/iconsets/glyphicons.php 1014.x/lib/smarty_tiki/modifier.iconify.php 1014.x/themes/base_files/iconsets/default.php
   <br> iconset conversion for the smarty modifier iconify, which is used to show an icon for filetypes in attachment listings (icons used in file galleries to represent file types are not affected by this commit)
   <br> 03lindonb r54150 10trunk/themes/base_files/iconsets/default.php 10trunk/themes/base_files/iconsets/glyphicons.php 10trunk/lib/smarty_tiki/modifier.iconify.php 10trunk * [MRG] Automatic merge, branches/14.x 54145 to 54149
   <br> 03lindonb r54151 10branches/14.x/templates/tiki-view_forum_thread.tpl * iconset conversion and some indenting
   <br> 03lindonb r54152 10trunk/templates/tiki-view_forum_thread.tpl 10trunk/templates 10trunk * [MRG] Automatic merge, branches/14.x 54149 to 54151
   <br> 03lindonb r54153 10branches/14.x/lib/theme/iconsetlib.php
   <br> [FIX] iconsets: keep individual icon settings from being overridden; external link icon was breaking for legacy icons since specific external link append setting of .gif was being overridden by general legacy iconset append of .png
   <br> 03lindonb r54154 10trunk/lib/theme/iconsetlib.php 10trunk * [MRG] Automatic merge, branches/14.x 54151 to 54153
   <br> 03lindonb r54155 10branches/14.x/lib/setup/wiki.php
   <br> [FIX] iconsets: get rid of hardcoded legacy icons on default home page - was also causing oversized plugin edit icons to appear. Don't think the icons add much here.
   <br> 03lindonb r54156 10trunk/lib/setup/wiki.php 10trunk * [MRG] Automatic merge, branches/14.x 54153 to 54155
   <br> 03lindonb r54157 10branches/14.x/templates/tiki-view_forum_thread.tpl * icons - use ellipsis for thread actions
   <br> 03lindonb r54158 10branches/14.x/templates/tiki-wiki_topline.tpl * [FIX] ellipsis hover - allow for nonhover with mobile
   <br> 03lindonb r54159 10branches/14.x/templates/modules/mod-quickadmin.tpl * [FIX] ellipsis hover - allow for nonhover with mobile
   <br> 03lindonb r54160 10(5 files in 4 dirs) * [MRG] Automatic merge, branches/14.x 54155 to 54159
   <br> 03lindonb r54161 10branches/ 1014.x/templates/comment-footer.tpl 1014.x/templates/tiki-view_forum_thread.tpl 1014.x/themes/base_files/iconsets/legacy.php
   <br> [FIX] forum thread: iconset conversion and get button to jump to top of page to work again.
   <br> 03lindonb r54162 10(5 files in 4 dirs) * [MRG] Automatic merge, branches/14.x 54159 to 54161
   <br> 03lindonb r54163 10branches/ 1014.x/themes/base_files/iconsets/legacy.php 1014.x/templates/tiki-list_trackers.tpl * iconset conversion; also legacy icon for duplicate was broken
   <br> 03lindonb r54164 10trunk/templates/tiki-list_trackers.tpl 10trunk/templates 10trunk/themes/base_files/iconsets/legacy.php 10trunk * [MRG] Automatic merge, branches/14.x 54161 to 54163
   gezza: joined #tikiwiki
   <br> hi lindonb, are you around?
   techz_: joined #tikiwiki
   Telesight: joined #tikiwiki
   Tiki|bot: New Forum Posts: Tracker Feeding Data Channel - https://tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55063
   <br> New Forum Posts: File Gallery issue: Upload was not successful. Duplicate file content. TIki 9.9 - https://tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55057
   <br> New Forum Posts: Tiki 14 theme management documentation - https://tiki.org/tiki-view_forum_thread.php?forumId=26&amp;comments_parentId=55053
   <br> New Forum Posts: Tracker Feeding Data Channel - http://tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55063
   <br> New Forum Posts: File Gallery issue: Upload was not successful. Duplicate file content. TIki 9.9 - http://tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55057
   <br> New Forum Posts: Tiki 14 theme management documentation - http://tiki.org/tiki-view_forum_thread.php?forumId=26&amp;comments_parentId=55053
   fabricius: joined #tikiwiki
   Tiki|bot: New Forum Posts: Tracker Feeding Data Channel - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55063
   <br> New Forum Posts: File Gallery issue: Upload was not successful. Duplicate file content. TIki 9.9 - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55057
   <br> New Forum Posts: Tiki 14 theme management documentation - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=26&amp;comments_parentId=55053
   chibaguy: joined #tikiwiki
   <br> polom
   Tiki|bot: New Forum Posts: Tracker Feeding Data Channel - http://tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55063
   <br> New Forum Posts: File Gallery issue: Upload was not successful. Duplicate file content. TIki 9.9 - http://tiki.org/tiki-view_forum_thread.php?forumId=4&amp;comments_parentId=55057
   <br> New Forum Posts: Tiki 14 theme management documentation - http://tiki.org/tiki-view_forum_thread.php?forumId=26&amp;comments_parentId=55053
   chibaguy_: joined #tikiwiki
   lindonb: joined #tikiwiki
   fabricius: joined #tikiwiki
   chibaguy: joined #tikiwiki
   <br> joined #tikiwiki
   Tiki|bot: Recent Bug:  - http://dev.tiki.org/item5568
   Tiki-KGB: 03lindonb r54165 10branches/ 10(5 files in 3 dirs)
   <br> [FIX] allow smarty button function to display icon and text; use icons with text on main buttons on tiki-forums.tpl
   <br> 03lindonb r54166 10(7 files in 5 dirs) * [MRG] Automatic merge, branches/14.x 54163 to 54165
   <br> 03lindonb r54167 10branches/14.x/templates/tiki-admin_forums.tpl * add icons to main top buttons
   fabricius: joined #tikiwiki
   Tiki-KGB: 03lindonb r54168 10branches/ 1014.x/templates/tiki-admin_forums.tpl 1014.x/templates/tiki-forum_import.tpl 1014.x/lib/smarty_tiki/block.self_link.php 1014.x/templates/tiki-forums.tpl
   <br> more icons to top buttons; add space between button icon and text within smarty function
   <br> 03lindonb r54169 10(6 files in 4 dirs) * [MRG] Automatic merge, branches/14.x 54165 to 54168
   <br> 03lindonb r54170 10branches/14.x/templates/tiki-view_forum.tpl * add top button icons and reorder buttons
   Tiki|bot: New Forum Posts: How can i check a trackeritem permission? (usecase: item is restricted by a category field). - http://tiki.org/tiki-view_forum_thread.php?forumId=26&amp;comments_parentId=55066
   Tiki-KGB: 03lindonb r54171 10branches/14.x/templates/tiki-adminusers.tpl
   <br> add icons to main top buttons; remove admin users button since we're already on that page
   <br> 03lindonb r54172 10branches/ 1014.x/themes/base_files/iconsets/legacy.php 1014.x/templates/tiki-adminusers.tpl 1014.x/templates/tiki-admingroups.tpl * more icons in top buttons
   <br> 03lindonb r54173 10(6 files in 4 dirs) * [MRG] Automatic merge, branches/14.x 54168 to 54172
   jonnyb: joined #tikiwiki
   <br> Hi lindonb - going great in 14.x i see! :) (and thanks for all the merges!)
   lindonb: yes, lots of icons to convert!
   <br> btw, couldn’t figure out how to replace a hard-coded on in tiki-tracker.js. tried an ajax service which seemed like was returning the right html but still didn’t work
   <br> gave up for now
   Tiki-KGB: 03lindonb r54174 10branches/ 1014.x/themes/base_files/iconsets/glyphicons.php 1014.x/themes/base_files/iconsets/legacy.php 1014.x/templates/tiki-objectpermissions.tpl 1014.x/themes/base_files/iconsets/default.php * more icons for top buttons
   <br> 03lindonb r54175 10(6 files in 4 dirs) * [MRG] Automatic merge, branches/14.x 54172 to 54174
   chibaguy: joined #tikiwiki
   jonnyb: <u>lindonb</u>: how about setting them as jqueryTiki properties in setup/javascript.php?
   <br> hi chibaguy
   lindonb: <u>jonnyb</u>: that’s probably the way to go - will try it later
   Tiki-KGB: 03jonnybradley r54176 10branches/14.x/lib/parser/parserlib.php
   <br> [FIX] wiki: Move calculation of whether to suppress icons for current plugin nearer to plugin execution and restore the option afterwards (included page edit section icons don't work)
   <br> 03lindonb r54177 10branches/ 1014.x/themes/base_files/iconsets/legacy.php 1014.x/themes/base_files/iconsets/glyphicons.php 1014.x/templates/tiki-list_file_gallery.tpl 1014.x/themes/base_files/iconsets/default.php * iconset conversion
   <br> 03lindonb r54178 10(7 files in 5 dirs) * [MRG] Automatic merge, branches/14.x 54174 to 54177
   Tiki|bot: Recent Bug:  - http://dev.tiki.org/item5569
   <br> New Forum Posts: Fix for Trackerfield "Dynamic Item Lists" - Where to go? - http://tiki.org/tiki-view_forum_thread.php?forumId=26&amp;comments_parentId=55067
   chibaguy: joined #tikiwiki
   fabricius: joined #tikiwiki
   <br> joined #tikiwiki
   <br> joined #tikiwiki
   chibaguy: joined #tikiwiki
   fabricius: joined #tikiwiki