[00:45]  Tiki|bot joined #tikiwiki
[01:20]  Tiki|bot joined #tikiwiki
[01:24]  Gwayne joined #tikiwiki
[01:36]  fabricius joined #tikiwiki
[01:50] Tiki|bot New Forum Posts: Module Visability Control - http://tiki.org/tiki-view_forum_thread.php?forumId=2&comments_parentId=50909
[03:52]  marclaporte joined #tikiwiki
[05:10]  Tiki|bot joined #tikiwiki
[05:11]  chibaguy joined #tikiwiki
[06:05]  Tiki|bot joined #tikiwiki
[06:20] Tiki-KGB 03chibaguy r49404 10trunk/styles/layout/design.css * [REF] Chosen selector widths conflict with Bootstrap grid.
[06:30]  Tiki|bot joined #tikiwiki
[06:40] Tiki-KGB 03chibaguy r49405 10trunk/templates/ 10(12 files in 6 dirs) * [REF] Class "clear" replaced with "clearfix", for Bootstrap conformity.
[06:40] Tiki-KGB 03chibaguy r49406 10trunk/styles/layout/design.css * [REF] Class "clear" replaced with "clearfix", for Bootstrap conformity.
[06:46] Tiki-KGB 03chibaguy r49407 10trunk/templates/debug/function.debugger.tpl * [REF] Shift to bootstrap.css class for same effect.
[06:46] Tiki-KGB 03chibaguy r49408 10trunk/styles/layout/design.css * [REF] Shift to bootstrap.css class for same effect.
[06:50] Tiki-KGB 03chibaguy r49409 10trunk/templates/debug/function.debugger.tpl * [REF] Shift to bootstrap.css class for same effect.
[06:50] Tiki-KGB 03chibaguy r49410 10trunk/styles/layout/design.css * [REF] Shift to bootstrap.css class for same effect.
[06:54] Tiki-KGB 03chibaguy r49411 10trunk/styles/layout/design.css * [REF] Shift to bootstrap.css class for same effect.
[07:08] Tiki-KGB 03chibaguy r49412 10trunk/styles/layout/design.css
[07:08] Tiki-KGB [REF] Some micromanagement rules removed. Hopefully the instances will be covered by bootstrappification. If not, these items can be addressed again.
[07:34] Tiki-KGB 03chibaguy r49413 10trunk/ 10templates/wiki_edit.tpl 10styles/layout/design.css 10templates/tiki-admin_notifications.tpl 10lib/toolbars/toolbarslib.php * [REF] Shift to bootstrap.css classes for same effect.
[07:48]  Telesight joined #tikiwiki
[07:53]  Telesight left #tikiwiki
[08:24]  xavi joined #tikiwiki
[08:32]  Telesight joined #tikiwiki
[08:34]  redflo joined #tikiwiki
[10:54]  rodrigoprimo joined #tikiwiki
[11:24]  rodrigoprimo joined #tikiwiki
[12:33] Tiki|bot New Forum Posts: Module Visability Control - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=2&comments_parentId=50909
[12:33] Tiki|bot New Forum Posts: Blank Page after adding Add This code - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50902
[12:33] Tiki|bot New Forum Posts: Add New Syntax Tip to Gallery Upload - https://suite.tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50896
[12:43] Tiki|bot New Forum Posts: Module Visability Control - http://tiki.org/tiki-view_forum_thread.php?forumId=2&comments_parentId=50909
[12:43] Tiki|bot New Forum Posts: Blank Page after adding Add This code - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50902
[12:43] Tiki|bot New Forum Posts: Add New Syntax Tip to Gallery Upload - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=50896
[13:23]  fabricius joined #tikiwiki
[13:26]  jonnyb joined #tikiwiki
[13:35]  arildb joined #tikiwiki
[13:42] jonnyb polom xavi here too :)
[13:43] xavi he he , hi jonnyb here too :-)
[13:43] jonnyb guess this s5 in mobile mode conversation might be relevant to others...
[13:45] jonnyb it looks like this link: http://seeds4c.org/show:140125+El+programari+lliure+és+bo+per+a+tu?mobile_mode=y works ok in firefox but not in safari - odd...
[13:47] jonnyb in safari it looks like there's no html head element somehow
[13:47] xavi mmm, jonnyb, it doesn't display the mobile mode in firefox for me in Android
[13:48] jonnyb actually, if i go and switch to mobile also in firefox i get the same
[13:48] xavi nor in chrome for android either
[13:48] jonnyb i'm trying on normal browsers at the moment
[13:48] xavi ok
[13:48] jonnyb looks like tiki's not rendering the page properly in mobile mode
[13:49] xavi in normal browsers on a pc (gnu/linux here at the moment): it  works fine for me (Chrome and FF on Ubuntu)
[13:50] jonnyb if you go into mobile mode first?
[13:50] jonnyb hmmm
[13:50] xavi double checking, just in case, on the pc...
[13:51] luciash hiiiiiiiya ! all
[13:51] jonnyb polom luciash
[13:51] xavi yes, confirmed. they both (ff and chrome) display the slideshow as expected on a pc
[13:52] * jonnyb debugs
[13:52] xavi hi luciash
[13:52] luciash yo xavi
[13:52] jonnyb xavi: that's very odd - for me i definitely get a page without any css or javascript in it
[13:53] xavi mm, jonnyb, chrome 31 here. Maybe version specific issue?
[13:53] luciash jonnyb: hi, it sounds like server side problem to me
[13:53] luciash jonnyb: memore exhausted or script timeout
[13:53] jonnyb me 2
[13:53] luciash memory
[13:54] jonnyb wonder if it's more smarty weirdness
[13:55] luciash i have seen it recently on one of mine when i was messing with trackers
[13:56] luciash when i corrected my tracker fields item lists or links, it gone away... but generally i think it eat too many resources and my server got exhausted and responed by half-rendered pages after long loading
[13:58] jonnyb aha, found it - __someone__ has overridden tiki_full.tpl in mobile and it's very out of date... ;)
[13:58] xavi aha... (__someone__: is it going to be me???? :-) )
[13:58] jonnyb no... maybe not
[13:59] xavi I didn't mean to do that, if it was me
[13:59] jonnyb $Id: tiki_full.tpl 44972 2013-02-25 16:13:14Z luciash
[13:59] jonnyb :)
[13:59] xavi oups
[13:59] jonnyb no {* mobile *} comments :(
[13:59] luciash huh ?
[14:00]  Tiki|bot joined #tikiwiki
[14:00] luciash last february I did something on that file indeed
[14:00] luciash but what does it say ?
[14:00] jonnyb looks like not you luciash - r44972 was innocent i think
[14:00] jonnyb html5 stuff
[14:01] luciash i mean what you mean by "no {* mobile *} comments" ?
[14:02] jonnyb in the mobile forked tpls i've been trying to add comments where stuff was changed to work in mobile, so updating them is easier
[14:02] jonnyb but looks like i didn't in this case
[14:05] jonnyb i think it was a left over from the (bad) old xajax days in tiki 6
[14:05] xavi ok
[14:06] xavi so that there are chances that jquery.s5 would work on mobile "as is", once this is fixed?
[14:06]  lphuberdeau joined #tikiwiki
[14:08]  marclaporte joined #tikiwiki
[14:09] jonnyb maybe
[14:09] jonnyb just trying it locally on my phone (but for some reason it's showing my local 12.x in Spanish on my phone - wtf?)
[14:13] jonnyb hmm, sort of works... will commit
[14:15] xavi hehe, your phone keeps trying to learn Spanish for you. Nice OS, then :-)
[14:15] jonnyb ha ha
[14:16] Tiki-KGB 03jonnybradley r49414 10branches/12.x/templates/styles/mobile/tiki_full.tpl
[14:16] Tiki-KGB [FIX] mobile: Resync tiki_full.tpl to get slideshows working (sort of) in mobile mode (hadn't been updated since 2011! Thanks Xavi)
[14:16] jonnyb i actually ended up on my local 11.x site, which is currently being Spanish
[14:16] xavi ah, ok :-)
[14:16] xavi I'll update my server and retest :-)
[14:18] * xavi loves svn
[14:18] * jonnyb loves svn 99% of the time
[14:21] xavi :-)
[14:22] xavi jonnyb, gorgeous, it works for me in FF on Android! :-)
[14:22] jonnyb 8)
[14:24] xavi and (almost the) same for Chrome on Android. The only difference for me is that the background image of the theme is not loaded
[14:24] jonnyb nice, not too bad then?
[14:24] xavi mmm, oh, sorry, it seems to be loaded maybe, much in amich lighter grey
[14:25] xavi yes, not bad at all, In fact, almost perfect, I would say. Thanks! :-)
[14:26] xavi ok, to make it perfect in mobile, I might contribute, if I get some minor guidance... ;-)
[14:26] xavi the bottom bar, seems not mobile ready: too smal font for the text in that bottom bar
[14:26] xavi maybe some css is missing...
[14:27] xavi and once the buttons of the bottom bar are shown, they are way too small for mobile... and I might know already how to fix that...
[14:27]  arildb_ joined #tikiwiki
[14:30] xavi ok, fixing my previous findings: font size seems to be ok in jquery.s5 in mobile mode. Footer font size depends on the width of the screen, and that's why it looks too small when in a smartphone in portrait mode. In landscape, everything is much mroe readable, of course
[14:30] xavi but buttons size, yes, they need to be made mobile-ready... There i go right now then...
[14:30] * xavi tries to fix this before his late lunch
[14:48] xavi mmmm, jonnyb, I've updated locally the templates/tiki-show_page_raw.tpl to add the data-role="controlgroup" data-type="horizontal" in the div container of the icons & buttons, and data-role="button" inside the a tags (all conditional to {if $prefs.mobile_mode eq "y"}), but now way....
[14:49] xavi I see that the buttons and links (and container divs) are also present in ./vendor/jquery/jquery-s5/jquery.s5.js ...
[14:49] xavi ... but I'm reluctant to change them there, since it's a file in "vendors", and in addition, I'm not sure of the translation to javascript of: {if $prefs.mobile_mode eq "y"}data-role="button" {/if}
[14:54] jonnyb hmm, yes - jquery-s5 is a separate project run by Robert - think it's on github now?
[14:55] jonnyb so no tiki specific stuff should go in there
[14:57] jonnyb ok, off for lunch too, bbl
[15:05]  Tiki|bot joined #tikiwiki
[15:07] xavi ok, thanks. bbl (lunch here also)
[15:11]  MagicFab_ joined #tikiwiki
[15:11]  MagicFab_ joined #tikiwiki
[15:16] Tiki-KGB 03xavidp r49415 03branches/12.x/templates/styles/mobile/tiki-show_page_raw.tpl
[15:16] Tiki-KGB [ENH]Tweaks to tiki-show_page_raw.tpl to make it adapted to mobile mode (work in progress, keeping changes between conditional if clauses so that this file could replace the original one in ./templates). Step 1 out of 2. Clone of original tpl to ease keeping track of changes.
[15:18] Tiki-KGB 03xavidp r49416 10branches/12.x/templates/styles/mobile/tiki-show_page_raw.tpl
[15:18] Tiki-KGB [ENH]Tweaks to tiki-show_page_raw.tpl to make it adapted to mobile mode (work in progress, keeping changes between conditional if clauses so that this file could replace the original one in ./templates). Step 2 out of 2. Changes included.
[15:20] xavi and I asked Robert on how to proceed to fix the size of those buttons in mobile mode
[15:20] xavi bbl
[15:36]  arildb__ joined #tikiwiki
[15:39]  jonnyb joined #tikiwiki
[16:13]  rodrigoprimo joined #tikiwiki
[16:35]  marclaporte joined #tikiwiki
[16:36] jonnyb hi marclaporte
[16:40] jonnyb backsoon...
[16:40]  Tiki|bot joined #tikiwiki
[16:47]  Tiki|bot joined #tikiwiki
[16:52]  MagicFab_ joined #tikiwiki
[16:54]  jonnyb joined #tikiwiki
[17:15] Tiki|bot New Forum Posts: Tiki Webinars 2014 - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=50913
[17:16] xavi polom-again
[17:17] jonnyb re-hi xavi
[17:17] xavi I'm willing to search for a pattern in $_SERVER['HTTP_REFERER'], in wikilib.php, but for some reason, 		 var_dump($_SERVER['HTTP_REFERER']); returns null, unless I also do a var_dump($_SERVER);
[17:17] xavi hi jonnyb
[17:18] xavi how should I proceed, to be able to do some preg_match against $_SERVER['HTTP_REFERER'] inside wikilib.php?
[17:25] xavi Jyhem maybe ?
[17:26]  marclaporte joined #tikiwiki
[17:30] jonnyb sry, here again xavi
[17:30] xavi ok
[17:31] jonnyb i don't really follow - you mean like a file search (in phpstorm for instance?)
[17:32] Tiki-KGB 03lphuberdeau r49417 10trunk/lib/parser/parserlib.php * [FIX] Notice
[17:34] xavi jonnyb: nope. just in the php code at run time.
[17:36] xavi I mean, do you know why var_dump($_SERVER['HTTP_REFERER']) returns null, but var_dump($_SERVER) returns all the $_SERVER values?
[17:36] Tiki-KGB 03lphuberdeau r49418 10trunk/ 10(8 files in 7 dirs)
[17:36] jonnyb of course... i can't see why that should happen - $_SERVER is just a "normal" array (sort of)
[17:36] Tiki-KGB [NEW] Adding terms and conditions feature to manage terms page and make sure users approved the latest approved terms before accessing the site
[17:37] xavi jonnyb: I mean, do you know why var_dump($_SERVER['HTTP_REFERER']) returns null, but var_dump($_SERVER) returns all the $_SERVER values?
[17:38] jonnyb maybe HTTP_REFERER is just null? it would be empty if you go straight to a page (like by pasting in the url)
[17:38] xavi and when var_dump($_SERVER['HTTP_REFERER']) is included next to var_dump($_SERVER), then var_dump($_SERVER['HTTP_REFERER']) displays the referes?
[17:38] xavi I'm playing with sefurf pages
[17:39] xavi I was to tweak wikilib.php to allow showing the presentation by including the alias of the page after the show. I.e.: "show:PageAlias"
[17:40] xavi let me explain: http://seeds4c.org/FCTiA is a page alias of the real page. Once written, the real page is shown.
[17:40] jonnyb hmm, good luck - aliases are weird ;)
[17:41] xavi however, when I type http://seeds4c.org/show:FCTiA , then the real page is shown through tiki-index.php, not through the tiki-slideshow.php
[17:42] xavi I managed to get the desired behavior with a preg_match to $_SERVER['HTTP_REFERER'] (to search for "show:" or  "tiki-slideshow"), but for some reason, $_SERVER['HTTP_REFERER'] only gets the real value when I do a var_dump of the whole $_SERVER
[17:45]  Tiki|bot joined #tikiwiki
[17:50]  yo_bj joined #tikiwiki
[17:52] jonnyb i don't understand why you're looking at the referrer? that's the page before the one you're on now
[17:53] jonnyb i think...
[17:53] yo_bj hi all
[17:53] yo_bj anyone up for a toolbar question?
[17:53] jonnyb hi yo_bj
[17:53] jonnyb go for it :)
[17:53] yo_bj admin stuff: v 9.7, running on ubuntu 12.04 LTS
[17:54] yo_bj Trying to add the TOC formatting tool button to the wysiwyg toolbar, but even though I've saved it in Admin Toolbars, the button's not showing up in the editor for any user, including admin. I've cleared the cache and tested in multiple browsers. Any idea what's going on?
[17:54] yo_bj jonnyb: thx :)
[17:55] jonnyb didn't know there was a TOC formatting tool button...
[17:55] yo_bj https://doc.tiki.org/PluginMaketoc
[17:56] Tiki-KGB 03lphuberdeau r49419 10branches/12.x/lib/jquery_tiki/tiki-jquery.js
[17:56] Tiki-KGB [FIX] Trigger chosen event on update so the list gets updated, remove * for all -- which does not exist in any way, replace autocomplete filter with normal title search, which is less confusing with the search label
[17:56] jonnyb are you using wysiwyg in wiki mode? or html (TOC is a wiki feature so won't work in html)
[17:58] yo_bj looking at the config, so it might be a bit before I hunt that config line down
[17:58] jonnyb on admin/wysiwyg
[17:59] jonnyb or you can just look at the source of a wysiwyg page
[17:59]  MagicFab_ joined #tikiwiki
[17:59] yo_bj cheers
[18:03] yo_bj page source is html
[18:04] yo_bj admin/wysiwyg has "content is parsed like wiki page" checked, along with the two sub options below it
[18:06] jonnyb but "Use Wiki syntax in WYSIWYG" is off i'm guessing
[18:06] jonnyb {maketoc} will only work on wiki pages i'm afraid
[18:06] yo_bj nope, that option is on
[18:07] yo_bj well, shoot. it was worth a try. thx for the help :)
[18:07] jonnyb maybe the page was made before that was turned on
[18:07] yo_bj will try to create a new page to see what happens
[18:07] jonnyb try making a new page - the source should be in wiki syntax
[18:07] jonnyb then maybe maketoc will work (but not sure about it appearing on the toolbar)
[18:08] Tiki-KGB 03lphuberdeau r49420 10trunk/lib/jquery_tiki/tiki-jquery.js 03trunk/templates/styles/mobile/tiki-show_page_raw.tpl 10trunk/templates/styles/mobile/tiki_full.tpl 10trunk * [MRG] Automatic merge, branches/12.x 49396 to 49419
[18:08] yo_bj gah - editor toolbar is now missing a lot more options
[18:08] yo_bj with the new page
[18:10] jonnyb that's cos you're only seeing the non-html ones
[18:10] jonnyb hi arildb
[18:10] arildb hi jonnyb
[18:11] yo_bj sadly, i need the html options, so i guess maketoc will be out of reach
[18:11] xavi ko, beyond myskills this $_SERVER['HTTP_REFERER'] thing
[18:12] jonnyb yo_bj: you'll need to turn  "Use Wiki syntax in WYSIWYG" off then
[18:12] jonnyb in tiki 12 there's an "autotoc" function arildb added, i think that works on html pages
[18:12] yo_bj yep, that's what i did, created a new page and the html options are back
[18:12] yo_bj saw that
[18:12] jonnyb :)
[18:12] yo_bj it looks nice, but i'm stuck on 9 for a bit
[18:12] xavi jonnyb, I looking at that because when I visit http://example.com/show:AliasName tiki returns http://example.com/RealPage instead of http://example.com/show:RealPage
[18:13] yo_bj at least until i get time to upgrade
[18:13] yo_bj ;)
[18:13] xavi s/I looking/I was looking
[18:13] yo_bj jonnyb: cheers for the help. at least i know why it wasn't working :)
[18:13] jonnyb xavi: ah, i see - makes sense
[18:13]  yo_bj left #tikiwiki
[18:15]  Tiki|bot joined #tikiwiki
[18:15] xavi I could fix that by adding 			$script_name = 'tiki-slideshow.php'; in wikilib.php, around line 1152 (function sefurl), but I need to know when the initial url contained "show:" or "tiki-slideshow.php"
[18:17] xavi and I don't know how to get that initial url once I'm there... $_SERVER['HTTP_REFERER'] was one way, but it gets null when you don't do var_dump($_SERVER). So I'm out of ideas...
[18:22] jonnyb it's probably hidden away in route.php
[18:22] jonnyb sorry xavi, need to focus on this stuff (map weirdness)
[18:24] xavi ok, np, thanks for feedback. Good luck with your map laberynth
[18:38] Tiki-KGB 03lphuberdeau r49421 10trunk/lib/core/Services/User/ConditionsController.php * [MOD] Obtain the ideal terms and conditions translation for the user
[18:44] Tiki-KGB 03lphuberdeau r49422 10trunk/lib/core/Services/User/ConditionsController.php * [MOD] Do not check for terms multiple times within the same session
[18:52] Tiki-KGB 03xavidp r49423 10branches/12.x/lib/modules/modlib.php
[18:52] Tiki-KGB [ENH]Improved documentation with the sections keywords shown explicitly to facilitate users' life. Thanks drsassafras for pointing that need in the forums.
[19:11]  lphuberdeau joined #tikiwiki
[19:15]  surfhai joined #tikiwiki
[19:16] Tiki-KGB 03jonnybradley r49424 10branches/12.x/lib/jquery_tiki/tiki-maps.js
[19:16] Tiki-KGB [FIX] maps: Create features from files in the usual "Editable" vector layer so previous ability to define the "depth" order form the {searchlayer} sub-plugin sort_mode param. Also use the properties.color setting from the file if it exists.
[19:20]  Tiki|bot joined #tikiwiki
[19:35]  Tiki|bot joined #tikiwiki
[19:35]  dmn_c joined #tikiwiki
[19:38] Tiki-KGB 03xavidp r49425 10branches/12.x/ 03img/icons/large/admin_panel48x48.png 10tiki-wizard_admin.php 10templates/tiki-wizard_admin.tpl 10templates/wizard/admin_wizard.tpl
[19:38] Tiki-KGB [ENH]Admin wizard synchronized with the improved version in trunk, as agreed weeks ago in the devel list.
[19:38] Tiki-KGB [bp/r49023]NULL               (I only backported the addition of img/icons/large/admin_panel48x48.png out of that commit r49023)
[19:38] Tiki-KGB [bp/r49047][FIX] Hide the admin wizard toc on the front page. Avoid indicating that it is the required process steps
[19:38] Tiki-KGB [bp/r49048][FIX] Make the wizard toc items for the profiles part link to the correct page.
[19:38] Tiki-KGB [bp/r49052][ENH]Minor changes to make the config wizard dialog clearer and more consisten.
[19:38] Tiki-KGB [bp/r49071][MOD]Fix consistency with icon size. Add '12' to the congratulations message about the Tiki instance so that it can be applicable for upgrades also. Add more spacing between the two first lines.
[19:38] Tiki-KGB [bp/r49072][FIX] Do not hard-code the version number
[19:38] Tiki-KGB [bp/r49073][FIX] wording. The recommendation is to start with "this approach". Not any of the others
[19:44] Tiki-KGB 03lphuberdeau r49426 10branches/12.x/lib/core/Math/Formula/ 10Function/Avg.php 10Function/SplitList.php * [FIX] Handle empty lists in calculations
[19:44]  kbishop joined #tikiwiki
[19:46] Tiki|bot New Forum Posts: images in dev.t.o/img/wiki_up/ gone? ("No route found") - http://tiki.org/tiki-view_forum_thread.php?forumId=26&comments_parentId=50918
[19:46] kbishop Hello I'm working with  trunk as a developer and having issues loading bootstrap.js
[19:50] lphuberdeau should get loaded by default in trunk
[19:52] kbishop what if it doesn't?
[19:56]  fabricius joined #tikiwiki
[20:00] xavi jonnyb or lphuberdeau: I'm to merge 12.x to trunk, and I get a tree conflict of an icon, which I cloned by hand from trunk to 12.x. But after svnbranchupdate.php, svn complains that the file remains in conflict
[20:01] xavi I tried the tips a our documentation at: http://dev.tiki.org/Commit+to+a+proposals+branch
[20:01] lphuberdeau svn revert on the directory
[20:02] xavi but neither "svn revolved this_file" nor "svn resolve --accept working this_file" work
[20:02] xavi opk, I'll try with revent (thanks)
[20:02] xavi revert
[20:04] Tiki-KGB 03lphuberdeau r49427 10branches/12.x/lib/core/Search/ContentSource/CommentSource.php * [FIX] Notice
[20:05] kbishop Working with trunk and having issues loading bootstrap.js. Any help would be appreciated
[20:05]  Tiki|bot joined #tikiwiki
[20:06] lphuberdeau kbishop: I just verified, bootstrap.js is loaded in trunk and works just fine
[20:07] kbishop Is there a way to set it up or something?
[20:09] lphuberdeau bootstrap is bundled and enabled by default in trunk
[20:09] lphuberdeau you have nothing to do
[20:11] kbishop ok what could it be than?
[20:13] lphuberdeau are you getting any errors?
[20:14] kbishop 404 not found
[20:14] kbishop for bootstrap.js
[20:14] xavi bbl
[20:15] kbishop and bootstrap.min.css
[20:17] lphuberdeau make sure to run composer
[20:35]  kbishop joined #tikiwiki
[20:35]  kbishop joined #tikiwiki
[20:36] xavi back
[20:36] xavi lphuberdeau: the conflict is with img/icons/large/admin_panel48x48.png. But all the other files are merged ok.
[20:36] xavi how can I fix or revert just this file?
[20:37] lphuberdeau if they are the same, it should be simpler just to revert
[20:37] xavi I did cd img/icons/large/. And then:  "svn revert ./"
[20:37] xavi and went back to tiki root, and run "svn ci -F svn-commit.tmp". however, it still compain that that file remains in conflict
[20:37] lphuberdeau if it's a single file, do it on the file
[20:38] xavi ok, I'll try. And do I need to re-launch the "php doc/devtools/svnbranchupdate.php branches/12.x"?
[20:38] xavi or just "svn ci -F svn-commit.tmp"?
[20:38] lphuberdeau just the commit part
[20:38] xavi ok
[20:39] lphuberdeau the update script won't run anyway with files left to commit
[20:39] xavi ok :-)
[20:39] xavi commit going through! thanks lphuberdeau
[20:40] Tiki-KGB 03xavidp r49428 10(5 files in 4 dirs) * [MRG] Automatic merge, branches/12.x 49419 to 49426
[20:40] xavi I'll document that in http://dev.tiki.org/Semi-automatic+merging+period#Merging_from_stable_to_trunk
[20:42]  marclaporte joined #tikiwiki
[20:46] jonnyb xavi: you should be able to resolve the conflict (svn resolve) but i can't remember the syntax exactly - doesn't you have a GUI for this kind of thing?
[20:48] xavi phone
[20:49] jonnyb np :)
[20:49] jonnyb i think the command would be:
[20:49] jonnyb svn resolve --accept working img/icons/large/admin_panel48x48.png
[20:54] xavi back
[20:54] xavi mmm
[20:56] xavi how can I know?
[20:56] xavi I did run your command, and nothing was returned as output. And that svn tree seems up to date with HEAD, nothing to commit, nothing to update
[20:57] xavi ^ jonnyb
[20:57] jonnyb yes, it would only work if there was a conflict, so tricky to test i geuss
[20:58] xavi ok, just in case, I'll add the command to the doc/dev page
[20:58] jonnyb you get these tree conflicts if any file appears or disappears on both sides of the merge
[20:59] jonnyb i would have thought your Meld tool would have a "resolve" option, no?
[20:59] xavi yes, but I might have made a mistake (no perms to save, or something when I did merge the changes, it seems)
[21:00] xavi I'll investigate next time I find something similar
[21:00] kbishop lphuberdeau : it worked great. thanx alot
[21:00] xavi fyi, doc page update at: http://dev.tiki.org/Semi-automatic+merging+period#Q:_How_to_resolve_a_tree_conflict_
[21:02] jonnyb thanks xavi :)
[21:02] xavi yw
[21:02] xavi and I added a link from a new page I created for me (I never remember the long url): http://dev.tiki.org/merge
[21:06]  marclaporte joined #tikiwiki
[21:18] Tiki-KGB 03lphuberdeau r49429 10trunk/ 10templates/tiki-page_bar.tpl 10lib/init/smarty.php * [FIX] Do not show 'More' if empty
[21:18]  marclaporte joined #tikiwiki
[21:22] Tiki-KGB 03xavidp r49430 10branches/12.x/img/icons/large/admin_panel48x48.png
[21:22] Tiki-KGB [ENH]Reduce area of screenshot, so that details of smaller area aer enlarged, and added black margin
[21:22] Tiki-KGB 03xavidp r49431 10trunk/img/icons/large/admin_panel48x48.png 10trunk/lib/core/Search/ContentSource/CommentSource.php 10trunk * [MRG] Automatic merge, branches/12.x 49426 to 49430
[21:23] xavi ok, enough for today
[21:23] xavi c u
[21:23]  xavi left #tikiwiki
[21:34] jonnyb me2... over
[21:36] Tiki-KGB 03lphuberdeau r49432 10trunk/templates/ 10comment/list.tpl 10layouts/internal/ajax.tpl
[21:36] Tiki-KGB [ENH] Include the title block in ajax request response, avoids having to include it in the content, which causes double-headers in modals.
[21:43]  marclaporte joined #tikiwiki
[21:45] fabricius polom
[21:45] fabricius just updated the webinars for 2014 - thx to Pascal for mentioning
[21:46] fabricius lphuberdeau: are you still there?
[21:46] lphuberdeau yes
[21:47] fabricius lphuberdeau: issue: trunk menus
[21:48] fabricius lphuberdeau: before the TikiFestBootstrap we had a discussion about the menus and superfish
[21:48] fabricius you made some changes
[21:48] fabricius Tiki menus in the left column and the topbar then acted "bootstrap alike"
[21:49] fabricius but not everywhere
[21:49] lphuberdeau don't recall
[21:49] fabricius wouldn't it be the time - if not already made - to make the menus acting bootstrap alike everywhere
[21:52] fabricius at that time you mentioned, that you wanted superfish to be removed, but I answered, that we needed superfish for wikistructure menus
[21:52] fabricius and you made the Tikimenus with bootstrap having one more level than the original bootstrap menu
[21:53] fabricius still not recall?
[21:53] fabricius you made some preperations code wise from where we could build upon
[22:30]  Tiki|bot joined #tikiwiki
[22:36]  arildb_ joined #tikiwiki
[22:42] Tiki-KGB 03lphuberdeau r49433 10trunk/ 10templates/tiki-list_trackers.tpl 10templates/tracker/replace.tpl 10lib/core/Services/Tracker/Controller.php
[22:42] Tiki-KGB [ENH] Converting the add tracker/edit tracker interface to bootstrap modal, partially converting form
[23:10]  Tiki|bot joined #tikiwiki
[23:46] Tiki-KGB 03lphuberdeau r49434 10trunk/ 10(8 files in 6 dirs) * [ENH] Use the modal-footer component to display form buttons