[00:11] diggy128 joined #tikiwiki [00:38] marclaporte joined #tikiwiki [00:54] lukeg joined #tikiwiki [01:12] Lonecrow joined #tikiwiki [01:13] lukeg joined #tikiwiki [01:38] Gwayne joined #tikiwiki [01:44] dabright joined #tikiwiki [02:20] SkiNut joined #tikiwiki [04:40] Tiki-KGB 03lindonb r50299 10trunk/doc/devtools/satis.json * tablesorter: add latest version 2.15.9 [06:22] Gwayne joined #tikiwiki [08:45] redflo joined #tikiwiki [08:50] shizzle_ joined #tikiwiki [09:11] shizzle joined #tikiwiki [09:22] Tiki-KGB 03xavidp r50300 10branches/12.x/tiki-admin.php [09:22] Tiki-KGB [FIX]Usability: add a new case to display the rating icon as enabled in the admin panels [09:28] Tiki-KGB 03xavidp r50301 10branches/12.x/templates/admin/include_rating.tpl [09:28] Tiki-KGB [FIX]Usabiity: show the pref to enable voting in comments also in the admin rating panel, and the permission needed also to display comments in wiki pages for users, in order to be comprehensive with the information shown about the perms involved. Thanks twilli. Also removed 'tiki_p_' from all permission names displayed in that admin panel to make them fit better in the space avai [09:28] Tiki-KGB tikiwikilable, and since it is just some sort of quick reminder of what to look for (and tiki_p_ is common for all so not critical info there). [11:17] Telesight joined #tikiwiki [11:23] Tiki|bot joined #tikiwiki [11:24] Tiki|bot New Forum Posts: Missing charset in email header - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=51495 [12:05] Tiki|bot joined #tikiwiki [12:34] JoseLuis joined #tikiwiki [12:38] JoseLuis Hello, anyone with tiki + ldap config knowledge? [13:03] lphuberdeau joined #tikiwiki [13:18] Tiki-KGB 03jonnybradley r50302 10branches/12.x/tiki-socialnetworks_firstlogin.php [13:18] Tiki-KGB [FIX] socialnetworks: Facebook login form appears in a colorbox, so display middle without module zones etc [13:22] Tiki-KGB 03jonnybradley r50303 10branches/12.x/ 10templates/tiki-socialnetworks_firstlogin.tpl 10templates/tiki-socialnetworks_firstlogin_launcher.tpl [13:22] Tiki-KGB [FIX] socialnetworks: Avoid conflict between terms & conditions and fb first login form - more robust fix to come when not merging with trunk (thanks BSfez and luciash) [14:39] JoseLuis [11:38] Hello, anyone with tiki + ldap config knowledge? [15:12] Lonecrow joined #tikiwiki [15:16] marclaporte joined #tikiwiki [15:22] JoseLuis ....disappointed... [15:22] JoseLuis runs... away [15:23] JoseLuis Will left feedback for anyone who might (not) read. [15:24] JoseLuis I have installed several php installs apps with ldap/AD support without any problems... [15:24] JoseLuis after reading all the documentation and wikis + how-tos + foruns.. [15:24] JoseLuis nothing.. [15:25] JoseLuis I created a php file with this data: [15:28] gavincrenshaw joined #tikiwiki [15:38] Lonecrow joined #tikiwiki [15:41] Lonecrow joined #tikiwiki [15:53] gavincrenshaw joined #tikiwiki [16:03] lukeg joined #tikiwiki [16:11] robertplummer joined #tikiwiki [16:11] robertplummer better late than never ;) [16:11] robertplummer polom all [16:12] marclaporte joined #tikiwiki [16:41] xavi1 joined #tikiwiki [16:42] Tiki-KGB 03xavidp r50304 10branches/12.x/lang/ca/language.php * a few more [17:18] lphuberdeau joined #tikiwiki [17:24] Tiki-KGB 03xavidp r50305 10branches/12.x/templates/admin/include_rating.tpl [17:24] Tiki-KGB [FIX]A new preference and permission related to ratings in wiki pages added to the Rating admin panel [17:39] xavi Jyhem ? [17:40] xavi never mind, found it [17:52] marclaporte joined #tikiwiki [18:02] Tiki-KGB 03xavidp r50306 10(17 files in 10 dirs) [18:02] Tiki-KGB [MRG] Automatic merge, branches/12.x 50269 to 50305 [18:02] Tiki-KGB Conflicts manually resolved in: [18:02] Tiki-KGB * templates/modules/mod-login_box.tpl (jonnyb) [18:02] Tiki-KGB * templates/tiki-install.tpl (lindon) [18:02] Tiki-KGB Please revise the merge in trunk of your changes. [18:06] nataliaf joined #tikiwiki [18:11] jonnyb joined #tikiwiki [18:12] jonnyb hi xavi [18:12] xavi hi jonnyb [18:13] jonnyb i was just trying to resolve those conflicts too - now have double trouble! :) [18:13] xavi I did my best to get your commit in 12.x merge to trunk [18:13] xavi oups, sorry [18:13] jonnyb Lindon's one was the worst... [18:13] xavi s/merge/merged [18:13] jonnyb hey, no probs, thanks for diving in! [18:14] jonnyb maybe we should coordinate here when there's a chewy conflict [18:14] xavi you are welcome! :-) [18:14] jonnyb (when i say "we" i mean "I" ;) ) [18:14] xavi yep, I didn't see you here on irc, nor lindon, so I gave it a go [18:15] xavi I looked at the diff on 12.x of your changes, and reproduced them in trunk after the svnmerge (I marked them as resolved, but I didn't resolve them until later, by hand) [18:15] xavi same with lindons [18:16] xavi hopefully, everything is fine in trunk nowadays [18:20] Tiki-KGB 03jonnybradley r50307 10trunk/templates/ 10tiki-install.tpl 10modules/mod-login_box.tpl [18:20] Tiki-KGB [FIX] couple of bootstrap classes missed from merge r50306 (but thanks Xavi, was a toughie!) [18:21] xavi thanks, jonnyb. I'm not yet with tiki13 bootstrap classes and such... [18:21] jonnyb only a couple of classes had been added in trunk and missed in your merge, only spotted as i had the files open anyway [18:21] jonnyb very hard to spot in the diffs [18:21] xavi ok, thks [18:22] jonnyb I also tested locally, nice to see the installer looking so modern - well done to the bootstrap guys! [18:30] Tiki-KGB 03xavidp r50308 10branches/12.x/templates/tiki-show_content.tpl * [FIX]The right preference name was wiki_simple_ratings [19:07] aalex joined #tikiwiki [19:34] Tiki-KGB 03jonnybradley r50309 10branches/12.x/lib/core/Tracker/Field/Icon.php * [FIX] trackers: Export raw icon src in csv mode [19:56] TomJarvis joined #tikiwiki [20:14] Tiki-KGB 03koohiisan r50310 10branches/experimental/wikiLingo/lib/wikiLingo_tiki/WikiLingoEvents.php * Modify to include full URL in FutureLink metadata. [21:36] Tiki-KGB 03xavidp r50311 10branches/12.x/templates/admin/include_rating.tpl [21:36] Tiki-KGB [FIX]Usability: warn the admin about a preference that needs to be disabled in order to get the form to rate comments on wiki pages working. Thanks twilli for reporting the issue related (Re: https://dev.tiki.org/wish5165 ) [21:36] Tiki-KGB 03xavidp r50312 10branches/12.x/lang/ca/language.php * A few more [21:41] xavi left #tikiwiki [21:42] Tiki-KGB 03xavidp r50313 10trunk/templates/admin/include_rating.tpl 10trunk/lang/ca/language.php 10trunk/lib/core/Tracker/Field/Icon.php 10trunk [21:42] Tiki-KGB [MRG] Automatic merge, branches/12.x 50305 to 50312 [21:42] Tiki-KGB Manually Reverted 'templates/tiki-show_content.tpl' since this file doesn't exist in trunk [21:42] Tiki-KGB [23:50] Tiki|bot joined #tikiwiki