Tiki|bot: joined #tikiwiki
New Forum Posts: pretty trackers using a tpl file -> how to automatically display field name and description - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=51712 Tiki-KGB: 03lindonb r50681 10trunk/templates/tiki-install.tpl 10trunk
[MRG] Automatic merge, branches/12.x 50677 to 50679
Conflicts in templates/tiki-install.tpl fixed manually.
Please test as I don't have a multi-tiki installation and disturbingly it seems like some previous 12.x changes never made it in (now added in this commit).
Please note any change to tiki-install.tpl in 12.x will almost certainly need to be manually merged due to significant refactoring of this file in trunk with r49550 before the security fixes started.
03lindonb r50682 10branches/12.x/templates/tiki-adminusers.tpl
[FIX] adminusers: Improve (hopefully) "perform with selected" action form behavior by using cancel button and other changes (thanks jonny).
03lindonb r50683 10trunk/templates/tiki-adminusers.tpl 10trunk
[MRG] Automatic merge, branches/12.x 50679 to 50682
Conflicts in templates/tiki-adminusers.tpl resolved manually.
03lindonb r50684 10trunk/templates/tiki-adminusers.tpl * [FIX] adminusers: Lost some bootstrap classes in r50683 merge
03lindonb r50685 10trunk/doc/devtools/satis.json
tablesorter: add latest version 2.15.13; remove versions used in alpha and beta tagged releases that have been superseded with a final tag version (i.e., leave version related to latest 12.1alpha still being tested) lindonb: joined #tikiwiki Tiki|bot: joined #tikiwiki drsassafras: joined #tikiwiki Tiki-KGB: 03lindonb r50686 10trunk/ 10composer.json 10composer.lock 10doc/devtools/satis.json
add latest tablesorter version 2.15.13 and remove 2.15.9 from repository; looks wikiLingo was updated as well. diggy128: joined #tikiwiki Tiki|bot: joined #tikiwiki Telesight: joined #tikiwiki Tiki-KGB: 03jonnybradley r50687 10branches/12.x/templates/tiki-adminusers.tpl
[FIX] adminusers: Fire events to update Chosen menus and change cancel-choice to a class (as there are 3 of them) chibaguy: joined #tikiwiki lindonb: joined #tikiwiki Tiki-KGB: 03jonnybradley r50688 10trunk/templates/tiki-install.tpl * [FIX] installer: Reapply bootstrap classes (mostly)
03jonnybradley r50689 10trunk/templates/tiki-adminusers.tpl 10trunk
[MRG] Automatic merge, branches/12.x 50682 to 50687
Conflict fixed on templates/tiki-adminusers.tpl chibaguy: joined #tikiwiki Tiki-KGB: 03jonnybradley r50690 10branches/12.x/templates/tiki-adminusers.tpl
[FIX] adminusers: Remove duplicate class attributes on a couple of buttons (and add superfluous bootstrap class to prevent conflict on merge, hopefully)
03jonnybradley r50691 10trunk * [MRG] Automatic merge, branches/12.x 50687 to 50690 Tiki|bot: joined #tikiwiki fabricius: joined #tikiwiki marclaporte: joined #tikiwiki Tiki|bot: joined #tikiwiki lindonb: joined #tikiwiki marclapo1: joined #tikiwiki Tiki-KGB: 03lindonb r50692 10trunk/lib/core/Table/Code/Other.php * [FIX] tablesorter: better logic for creating page dropdown when using ajax
03lindonb r50693 10trunk/ 10lib/core/Table/Code/Pager.php 10lib/jquery_tiki/tablesorter/style.css 10lib/core/Table/Code/WidgetOptions.php
[FIX] tablesorter: better logic for creating pagination info when using ajax (goes with r50692; simplify functions when external filter is used; add styling for new date field type chibaguy: joined #tikiwiki diggy128: joined #tikiwiki Tiki|bot: joined #tikiwiki
joined #tikiwiki marclapo1: joined #tikiwiki marclaporte: joined #tikiwiki marclapo1: joined #tikiwiki Tiki-KGB: 03lindonb r50694 10trunk/lib/core/Table/Code/Pager.php
[FIX] tablesorter: Make sure to fetch only the tbody rows so that the count is accurate; other minor cleanup. arildb: joined #tikiwiki drtic1: joined #tikiwiki
joined #tikiwiki arildb_: joined #tikiwiki Tiki-KGB: 03jonnybradley r50695 10branches/12.x/ 10templates/wiki-plugins/wikiplugin_kaltura.tpl 10lib/wiki-plugins/wikiplugin_kaltura.php 10lib/videogals/kalturalib.php
[FIX] kaltura: Make playlists work as expected in the plugin (thanks marclaporte)
03jonnybradley r50696 10branches/ 1011.x/lib/wiki-plugins/wikiplugin_kaltura.php 1011.x 1011.x/lib/videogals/kalturalib.php 1011.x/templates/wiki-plugins/wikiplugin_kaltura.tpl
[bp/r50695] [FIX] kaltura: Make playlists work as expected in the plugin (thanks marclaporte)
03jonnybradley r50697 10trunk/lib/wiki-plugins/wikiplugin_kaltura.php 10trunk/templates/wiki-plugins/wikiplugin_kaltura.tpl 10trunk/lib/videogals/kalturalib.php 10trunk * [MRG] Automatic merge, branches/12.x 50690 to 50695 marclaporte: joined #tikiwiki Tiki|bot: joined #tikiwiki
New Forum Posts: Captcha image not displaying - http://tiki.org/tiki-view_forum_thread.php?forumId=6&comments_parentId=51717 Tiki|Log: joined #tikiwiki Topic: for #tikiwikiis now Tiki Wiki CMS Groupware - the Free & Open Source Web Application with the most built-in features! Latest Tiki LTS version 12.0 (Altair) is out! Question? Just ask! We log the channel @ http://irc.tiki.org (start line with [off] to exclude message from log) leagris: joined #tikiwiki