marclaporte: joined #tikiwiki lukeg: joined #tikiwiki Lonecrow: joined #tikiwiki lukeg: joined #tikiwiki Gwayne: joined #tikiwiki dabright: joined #tikiwiki SkiNut: joined #tikiwiki Tiki-KGB: 03lindonb r50299 10trunk/doc/devtools/satis.json * tablesorter: add latest version 2.15.9 Gwayne: joined #tikiwiki redflo: joined #tikiwiki shizzle_: joined #tikiwiki shizzle: joined #tikiwiki Tiki-KGB: 03xavidp r50300 10branches/12.x/tiki-admin.php
[FIX]Usability: add a new case to display the rating icon as enabled in the admin panels
03xavidp r50301 10branches/12.x/templates/admin/include_rating.tpl
[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
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). Telesight: joined #tikiwiki Tiki|bot: joined #tikiwiki
New Forum Posts: Missing charset in email header - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=51495
joined #tikiwiki JoseLuis: joined #tikiwiki
Hello, anyone with tiki + ldap config knowledge? lphuberdeau: joined #tikiwiki Tiki-KGB: 03jonnybradley r50302 10branches/12.x/tiki-socialnetworks_firstlogin.php
[FIX] socialnetworks: Facebook login form appears in a colorbox, so display middle without module zones etc
03jonnybradley r50303 10branches/12.x/ 10templates/tiki-socialnetworks_firstlogin.tpl 10templates/tiki-socialnetworks_firstlogin_launcher.tpl
[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) JoseLuis: [11:38] <JoseLuis> Hello, anyone with tiki + ldap config knowledge? Lonecrow: joined #tikiwiki marclaporte: joined #tikiwiki JoseLuis: ....disappointed...
runs... away
Will left feedback for anyone who might (not) read.
I have installed several php installs apps with ldap/AD support without any problems...
after reading all the documentation and wikis + how-tos + foruns..
nothing..
I created a php file with this data: gavincrenshaw: joined #tikiwiki Lonecrow: joined #tikiwiki
joined #tikiwiki gavincrenshaw: joined #tikiwiki lukeg: joined #tikiwiki robertplummer: joined #tikiwiki
better late than never ;)
polom all marclaporte: joined #tikiwiki xavi1: joined #tikiwiki Tiki-KGB: 03xavidp r50304 10branches/12.x/lang/ca/language.php * a few more lphuberdeau: joined #tikiwiki Tiki-KGB: 03xavidp r50305 10branches/12.x/templates/admin/include_rating.tpl
[FIX]A new preference and permission related to ratings in wiki pages added to the Rating admin panel xavi: Jyhem ?
never mind, found it marclaporte: joined #tikiwiki Tiki-KGB: 03xavidp r50306 10(17 files in 10 dirs)
[MRG] Automatic merge, branches/12.x 50269 to 50305
Conflicts manually resolved in:
* templates/modules/mod-login_box.tpl (jonnyb)
* templates/tiki-install.tpl (lindon)
Please revise the merge in trunk of your changes. nataliaf: joined #tikiwiki jonnyb: joined #tikiwiki
hi xavi xavi: hi jonnyb jonnyb: i was just trying to resolve those conflicts too - now have double trouble! :) xavi: I did my best to get your commit in 12.x merge to trunk
oups, sorry jonnyb: Lindon's one was the worst... xavi: s/merge/merged jonnyb: hey, no probs, thanks for diving in!
maybe we should coordinate here when there's a chewy conflict xavi: you are welcome! :-) jonnyb: (when i say "we" i mean "I" ;) ) xavi: yep, I didn't see you here on irc, nor lindon, so I gave it a go
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)
same with lindons
hopefully, everything is fine in trunk nowadays Tiki-KGB: 03jonnybradley r50307 10trunk/templates/ 10tiki-install.tpl 10modules/mod-login_box.tpl
[FIX] couple of bootstrap classes missed from merge r50306 (but thanks Xavi, was a toughie!) xavi: thanks, jonnyb. I'm not yet with tiki13 bootstrap classes and such... 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
very hard to spot in the diffs xavi: ok, thks jonnyb: I also tested locally, nice to see the installer looking so modern - well done to the bootstrap guys! Tiki-KGB: 03xavidp r50308 10branches/12.x/templates/tiki-show_content.tpl * [FIX]The right preference name was wiki_simple_ratings aalex: joined #tikiwiki Tiki-KGB: 03jonnybradley r50309 10branches/12.x/lib/core/Tracker/Field/Icon.php * [FIX] trackers: Export raw icon src in csv mode TomJarvis: joined #tikiwiki Tiki-KGB: 03koohiisan r50310 10branches/experimental/wikiLingo/lib/wikiLingo_tiki/WikiLingoEvents.php * Modify to include full URL in FutureLink metadata.
03xavidp r50311 10branches/12.x/templates/admin/include_rating.tpl
[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 )
03xavidp r50312 10branches/12.x/lang/ca/language.php * A few more xavi: left #tikiwiki Tiki-KGB: 03xavidp r50313 10trunk/templates/admin/include_rating.tpl 10trunk/lang/ca/language.php 10trunk/lib/core/Tracker/Field/Icon.php 10trunk
[MRG] Automatic merge, branches/12.x 50305 to 50312
Manually Reverted 'templates/tiki-show_content.tpl' since this file doesn't exist in trunk
Tiki|bot: joined #tikiwiki