<!-- 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> ***: marclaporte has quit IRC (Read error: 110 (Connection timed out)) <br> latlink has quit IRC (Read error: 113 (No route to host)) <br> MatWho has quit IRC () <br> latlink has joined #tikiwiki <br> axold has quit IRC (Read error: 110 (Connection timed out)) <br> marclaporte has joined #tikiwiki marclaporte: <u>latlink</u>: Are you able to install profiles from profiles page? -: latlink no - but haven't tried with this new revision - should have tried that sorry voraistos: directory is broken in 3b3 with sefurl enabled <br> as a matter of fact, sefurl implementation is doomed -: latlink Marc - Just tried from profile page - "An error occured in a database query!" ***: SEWilco2 has joined #tikiwiki -: latlink Marc - Ok - went into MYSQL and looked at schema and the insert command is still failing due to the insert query 'params' is set to NULL which is not allowed. I guess same as before. <br> latlink So is the query string wrong or does the Schema need to allow NULL variables? ***: mlaporte has joined #tikiwiki <br> marclaporte has quit IRC (Read error: 110 (Connection timed out)) mlaporte: <u>latlink</u>: interesting <br> which versions of php and mysql? ***: latlink has quit IRC () <br> latlink has joined #tikiwiki -: latlink Hard to track down when i'm not used to the code - but trying to do my small bit mlaporte: I appreciate <br> You see, I saw that bug be4 <br> I was running php5 (via .htaccess) and mysql 4 <br> Them I upgraded server to php5 (no need for htaccess anymore( <br> and bug is not happening to me anymore <br> it happens anytime profiles have modules ***: mlaporte has quit IRC (leguin.freenode.net irc.freenode.net) <br> voraistos has quit IRC (leguin.freenode.net irc.freenode.net) <br> Beestje has quit IRC (leguin.freenode.net irc.freenode.net) <br> Caarrie has quit IRC (leguin.freenode.net irc.freenode.net) <br> danopia has quit IRC (leguin.freenode.net irc.freenode.net) <br> Tikiwiki|bot has quit IRC (leguin.freenode.net irc.freenode.net) <br> mlaporte has joined #tikiwiki <br> voraistos has joined #tikiwiki <br> Beestje has joined #tikiwiki <br> Caarrie has joined #tikiwiki <br> danopia has joined #tikiwiki <br> Tikiwiki|bot has joined #tikiwiki voraistos: mlaporte do you know who is in charge of sefurl? I sthere an associated project or something? Do you know how it is implemented in tiki? (I suspect smarty rewrites some URLs but I'm not quite sure) -: latlink Got ya - thanks for the notes - I'll look for feedback on the script v database schema - cheers ***: latlink has left <br> marclaporte has joined #tikiwiki mlaporte: <u>voraistos</u>: yes, yes, yes voraistos: can you tell me? ;) marclaporte: 1-sylvieg, 2-yes, 3-Smarty <br> what is doomed? voraistos: the design is flawed <br> deeply flawed <br> it's because for example some things are rewritten to the root <br> also, no URLs should be rewritten to the tiki directory <br> tw.org/tiki/tiki-index.php?page=HomePage should rewrite to tw.org/tw/wiki/HomePage <br> tiki -> tw is done using Alias <br> the "feature" has to be written in the URL too <br> otherwise, I can't have a wiki page called "forums" and forums on my tiki, as the URL for both would be tiki.org/forums <br> do you understand what I mean? <br> sylvieg did you read what I wrote ? mlaporte: back <br> We had several discussions about this topic <br> Once during lunch at a TikiFest in Montreal <br> There is no perfect solution <br> depends on use case <br> but maybe you have a better proposal :-) voraistos: my proposal is very similar to what the mediawiki guys do <br> everything cannot and shouldn't be sefURLed anyway <br> the "static" stuff should be. Things like wiki pages, forums, well, the actual content of a tiki site. <br> source, edit, admin and similar pages just shouldn't be visible to search engines <br> even banned in robots.txt <br> (and that's currently the case I think ;) ) ***: GillesM has quit IRC (leguin.freenode.net irc.freenode.net) <br> caralluna|away has quit IRC (leguin.freenode.net irc.freenode.net) voraistos: there is also the problem of multilingual tikis <br> the way it currently works in tiki is not good for sefurl ***: GillesM has joined #tikiwiki <br> caralluna|away has joined #tikiwiki <br> nkoth3__ has quit IRC () marclaporte: what do you do with wiki page calleds forums vs list of forums? <br> I would guess MediaWiki has simpler requirements voraistos: the thing is, mediawiki has ONE feature: wiki marclaporte: yup voraistos: that's why for tikiwiki, the feature must appear in the url <br> and for multilingual tikis, the language should appear in the URL too <br> even currently, I think that the lack of a language=lang in the URL is a problem. mlaporte: <u>voraistos</u>: having feature in the url is no good for some of my projects voraistos: hmm, can you give examples ? <br> URLs and such? <br> It should preferably be possible for the dmin to select how the url are rewritten marclaporte: http://tikiwiki.org/CGCOM -> sites like this <br> brochureware sites <br> they want shortest URLs <br> domain.com/About domain.com/Contact <br> not domain.com/wiki/About domain.com/wiki/Contact <br> they don't care about the wiki or Rewrite Rules potential conflicts voraistos: I suspect they don't have any other features ? marclaporte: hardly <br> and if so, conflicts are rare voraistos: Also, I'm not a security expert, but I can smell that having the url rewritten to tiki's root is a very bad idea marclaporte: could be conflict between tiki-contact.php and contact wiki page voraistos: yes marclaporte: other conflicts are with directory names voraistos: can wiki page names have a "/" ? marclaporte: yes, it can voraistos: what they could have though, is tiki installed in tiki.domain.com , serving content on www.domain.com marclaporte: http://doc.tikiwiki.org/modules tries to access directory and I am blocked. When in fact, I am trying to access http://doc.tikiwiki.org/tiki-index.php?page=modules <br> who is "they"? voraistos: "they" are the people who want very short URLs marclaporte: they have short URLS now <br> and it's simple voraistos: hmm yes but it doesn't work very well. And it becomes a problem when many tiki features are enabled marclaporte: that is why I told you there is no perfect solution <br> depends on the use case voraistos: yes, but there should be a solution for all cases marclaporte: I hope so <br> And I buy you a beer if you find <br> or juice, depending on your preference voraistos: buy me some "romanee conti" ;) marclaporte: Tiki should propose something (most sensible default, common use case) , but have a lot of configuration options <br> hehe voraistos: I'll try to make some sort of plan regarding "how things should work", so It can work for people who wouldn't mind having subdirs in their URL, and those who do mind. <br> but there will always be limitations/extra requirements for short Urls on the root ***: navster has joined #tikiwiki <br> Caarrie is now known as Caarrie|sleeping marclaporte: <u>voraistos</u>: : did you see wiki pages? Are you monitoring svn progress? voraistos: no. <br> Anything good I should be aware of ? <br> I don't monitor SVN as I don't know much about how to use it, and also I can't commit soo... ;) mlaporte: why can't you commit? marclaporte: http://doc.tikiwiki.org/tiki-index.php?page=Rewrite+Rules&bl=y <br> http://dev.tikiwiki.org/tiki-index.php?page=Search+engine+optimization <br> http://dev.tikiwiki.org/Commit voraistos: I can't because I'm useless and would cause more trouble than goodness :D Lucymoz: why does the feature have to appear in the url? voraistos: to avoid collisions and one URl = 2 or more different pages <br> example.org/forums can either be the wikipage "forums" or the forum list. Lucymoz: that's a faulty assumption <br> having the feature in the url isn't the only way to avoid collisions voraistos: It is one safe way <br> There's the problem of wikipage names and real directories. Lucymoz: ok, so wiki pages need some sort of distinction voraistos: I wrote something about how I think it should work, you both will probably like the stuff I say around line 40 <br> http://pastebin.com/f8332157 <br> marclaporte mlaporte Lucymoz Lucymoz: I don't understand what the urls have to do with being search friendly voraistos: brb SEWilco2: I'm about to shut down and don't have a web browser up, but my guess is it's something like example.org/wiki/forums, example.org/forums, example.org/forums/General, example.org/forums/General/Where+the+beef+is/reply/1 ***: SEWilco2 has quit IRC (Remote closed the connection) voraistos: <u>Lucymoz</u>: search engine frindly URLS are easily processed by search engines. Also the URL contains a good short description of what the page contains Lucymoz: Im not sure I agree that those are the best things to optimize for <br> obviously you don't want to obfuscate urls against search engines ***: aardvarq has quit IRC (Read error: 110 (Connection timed out)) <br> navster has quit IRC (Client Quit) <br> pkdille has quit IRC (Remote closed the connection) <br> Lucymoz has quit IRC (Read error: 110 (Connection timed out)) <br> pkdille has joined #tikiwiki marclaporte: <u>voraistos</u>: : should go in a wiki page ***: rlopez_ has joined #tikiwiki voraistos: marclaporte, what do you mean ? <br> as in wikipages should allow the ":" character in their title ? marclaporte: your proposal <br> instead of pastebin <br> <u>related</u>: http://dev.tikiwiki.org/tiki-index.php?page=Character+substitutions voraistos: oh do what you want <br> put whatever you want wherever you want <br> all Public domain ***: Wilkins has joined #tikiwiki mlaporte: me? <br> it's a wiki dude! <br> If you start a wik page, I may very well contribute to it ***: mlaporte has quit IRC ("CGI:IRC (Ping timeout)") rlopez_: hi <br> last tikifest in montreal i saw jb doing a demo with the jquery stuff <br> we would like to do apresentation remotely on some ideas we already have on workspaces <br> what software can we use for this? <br> have you done this before in a tikifest? (sure ;-) ) marclaporte: today, I was playing with Dimdim <br> BigBlueButton is another possibility rlopez_: Dimdim, sounds funny in spanish <br> thanks marc <br> i will have a look <br> what did jonny use for the last tikifest in montreal? <br> wow, just googling http://en.wikipedia.org/wiki/Comparison_of_web_conferencing_software <br> http://vyew.com/site/ + skype = free and good solution ***: mycomputer has joined #tikiwiki luciash: polom <br> >last --with luci Sug4r: [01:00:10] <marclaporte> luciash & others: can we close this? http://dev.tikiwiki.org/tiki-view_tracker_item.php?itemId=1212 CIA-46: tikiwiki: 03marclaporte * r18051 10/branches/3.0/templates/tiki-admin.tpl: [FIX] Ephemerides is a deleted feature. Remove some traces. luciash: <u>marclaporte</u>: yes, i think it works already (except localhosts) <br> <u>marclaporte</u>: now when changed back to "Summary" it will not be used in email subject anymore and users have to click all the watched mails to check what the report is about again:-/ marclaporte: you can change to subject <br> but change everywhere <br> 3 modules luciash: okay marclaporte: and in Your+Wish+Has+Been+Cast+Page luciash: i know it's not ideal solution but it's our dogfood like it is now <br> would be better by field ID <br> <u>marclaporte</u>: found only one module which uses &name=Summary marclaporte: maybe it's easy for Sylvie to fix <br> because she is amazing luciash: yes, she is :) <br> might be easy for anyone else too ***: rlopez_ has quit IRC ("Leaving") voraistos: k. I'm no php coder.. quick question, what does this mean? $wikilib->some_function(value, value, value); <br> I don't understand the $ (indicating a var) <br> does this mean, return the value of the function in wikilib to the var of the same name? luciash: freely translated it says "use included wikilib function some_function()" <br> the $wikilib is initiated somewhere earlier voraistos: so I need to add a $ for included libs? didn't know that :P ***: axold has joined #tikiwiki luciash: <u>voraistos</u>: it's simmilar as if you make call $this->some_function() indicating you're calling from inside the same class <br> <u>voraistos</u>: good example to study can be lib/webmail/tikimaillib.php voraistos: thanks :) ***: Wilkins has quit IRC (Read error: 60 (Operation timed out)) <br> Wilkins has joined #tikiwiki CIA-46: tikiwiki: 03nyloth * r18052 10/branches/3.0/get_strings.php: <br> tikiwiki: [ENH] translations: get_strings.php can now be called as a script in command line, without authentication. <br> tikiwiki: Usage example: <br> tikiwiki: php5 get_strings.php completion lang=fr <br> tikiwiki: + New param 'quiet' to reduce the verbosity (keeping only most important info), especially useful in command line <br> tikiwiki: Note: This enhencement has mainly been done to call get_strings.php directly from the release scripts, in order to release up-to-date files to simplify the work of translators. ***: rlopez_ has joined #tikiwiki CIA-46: tikiwiki: 03luciash * r18053 10/branches/3.0/img/tiki/tikilogo.png: [MOD] match the tiki 3.0 logo <br> tikiwiki: 03luciash * r18054 10/branches/3.0/lib/setup/tikisetup.class.php: [FIX] tiki setup: this is all ugly hardcoded html but the opening tags could match their closing tags at least ***: navster has joined #tikiwiki <br> rlopez_ has quit IRC ("Leaving") CIA-46: tikiwiki: 03luciash * r18055 10/branches/3.0/styles/thenews.css: [FIX] thenews theme: give every div in #tiki-center some padding and little margin to images by default <br> tikiwiki: 03luciash * r18056 10/branches/3.0/styles/thenews.css: [ENH] #sitelocbar: nicer padding <br> tikiwiki: 03luciash * r18057 10/branches/3.0/styles/thenews.css: [FIX] thenews: align the top line of #footer nicely with bottom lines of columns ***: Caarrie|sleeping is now known as Caarrie <br> rlopez_ has joined #tikiwiki <br> rodrigo_sampaio has joined #tikiwiki CIA-46: tikiwiki: 03luciash * r18058 10/branches/3.0/templates/tiki-install.tpl: tiki installer: replaced "Profile" from "Install/Upgrade" strings to prevent confusion (we don't upgrade only profiles), some simpification changes of "TikiWiki" to "Tiki" where appropriate ***: jerry| has joined #tikiwiki jerry|: hi everyone. I'm having a problem with my tikiwiki2.3 installation. I installed the wysiwyg plugin, and everything seems to work fine. But one user was editing a page in wysiwyg mode and it totally broke the page (a lot of javascript was posted on the bottom of the page) <br> i made a rollback. I can't reproduce the problem, maybe someone here knows to which action this is connected, so I can prevent it from happening again <br> the javascript is from "MultiPopup V2.09 Main Functions File Tooltip Replacement Script" ***: rlopez_ has quit IRC ("Leaving") CIA-46: tikiwiki: 03luciash * r18059 10/branches/3.0/templates/footer.tpl: extending the note that php tags in tpl require PHP Smarty secure mode off ***: rodrigo_sampaio has quit IRC ("Leaving.") <br> navster has quit IRC () CIA-46: tikiwiki: 03luciash * r18060 10/branches/3.0/templates/tiki-install.tpl: better message than "No Internet Connection has been found" when the installer cannot connect to the profiles repository for some reason (e.g. xmlrpc missing) <br> tikiwiki: 03luciash * r18061 10/branches/3.0/styles/transitions/2.0to3.0.css: .plugin-form-float must be above everything (set z-index to 1000) ***: Caarrie is now known as Caarrie|away <br> Beestje has quit IRC (Read error: 104 (Connection reset by peer)) CIA-46: tikiwiki: 03sylvieg * r18062 10/branches/3.0/ (5 files in 3 dirs): [FIX]perm: module last_tracker_items and last_modif_tracker_items checks perms on tracker + kill duplicate code + new param sort_mode + new param fieldId ***: jerry| has quit IRC ("Verlassend") <br> Caarrie|away is now known as Caarrie <br> rodrigo_sampaio has joined #tikiwiki CIA-46: tikiwiki: 03sylvieg * r18063 10/branches/3.0/tiki-sefurl.php: [FIX]sefurl: take away accent ***: SEWilco2 has joined #tikiwiki <br> Darkbee has joined #tikiwiki Darkbee: *tah dah* <br> v2.3 issue: Wiki Page Preview does not display uploaded images that contain special characters such as commas or spaces, however images are displayed when page is saved. Is this a known issue? CIA-46: tikiwiki: 03marclaporte * r18064 10/branches/3.0/db/ (5 files): [FIX] Avoir error message on install. Thanks Matthew. spoonypjk: <u>darkbee</u>: you might want to check the changelog for 2.4 and see if something like that was fixed?.. Darkbee: will do <br> I'm a little gun shy on updates at the moment. Something that worked in 2.2 got broken in 2.3 and I spent hours trying to find the problem thinking it was something I'd done wrong. :) Sylvie fixed though, thankfully once I realized it was a bug. <br> TikiWiki still rocks though. :) ***: navster-mobile has joined #tikiwiki <br> navster-mobile has quit IRC (Client Quit) CIA-46: tikiwiki: 03sylvieg * r18065 10/branches/3.0/lib/wiki-plugins/wikiplugin_include.php: <br> tikiwiki: [FIX]include plugin: the max_times was preventing to load more than 5 times the <br> tikiwiki: same page but with start and end different..... now test on start and end too -> <br> tikiwiki: perhaps max_times must be ignored if start and end are specified ***: rodrigo_sampaio1 has joined #tikiwiki <br> rodrigo_sampaio has quit IRC (Read error: 110 (Connection timed out)) spoonypjk: <u>darkbee</u>: understandable :). I'm in limbo at the moment trying to get a site up.. too close to the 3.0 release to want to use 2.x, but struggling with the 3.x bugs :) ***: Amorphous has quit IRC (Connection reset by peer) spoonypjk: If anyone else is awake.. i cant get thumbnails to work in 3.x (anywhere).. any pointers on where to start to troubleshoot? Darkbee: <u>spoonypjk</u>: 2.x works pretty solidly for the most part. Depends what you want to use it for. I don't touch any of the experimental stuff like WYSIWYG. spoonypjk: <u>darkbee</u>: does uploading images into wiki pages etc work okay from within a wiki page (without having to go off elsewhere and upload then come back?). have u got gmaps to work properly in 2.x? Darkbee: <u>spoonypjk</u>: Yes, you can upload ok, just doesn't preview if filename has certain characters. gmaps? Google Maps? I have an issue with that too, some user are reporting when adding their location that it doesn't remember the longitude (or latitude, I can't remember which). I've seen this myself once before but can't reproduce it. spoonypjk: <u>darkbee</u>: yeah thats the sort of thing I get constantly. and even if u manually enter it in it loses it. Darkbee: spoonypjk : users have had success at entering it manually. I don't know what the issue is, wondering if it's browser related, maybe conflicting firefox add-on. Not being able to reproduce it kinda makes it hard to trace the problem. spoonypjk: <u>darkbee</u>: with mine I think I've tried it in ie7,ff(win) and ff linux Darkbee: <u>spoonypjk</u>: problem with all of them? spoonypjk: yeah Darkbee: did you check Dev Tiki, see if anyone submitted a bug report? <br> I have to confess I haven't yet. spoonypjk: i think there were gmap related bugs.. but cant remember if it lined up wiht this one specifically. I've talked about it in here a couple times though :) if that counts. <br> theres a bug report for one of the gmap issues (not working with the tracker in 3.x) <br> hah theres a bug report for 2.x "gmap plugin does not work".. that kindof covers it :) Darkbee: maybe I'll go check that report out and add some comments of my own. ***: navster-mobile has joined #tikiwiki <br> Amorphous has joined #tikiwiki <br> rpg has joined #tikiwiki <br> navster-mobile has quit IRC ("Get Colloquy for iPhone! http://mobile.colloquy.info") <br> FrankP_german has joined #tikiwiki <br> navster-mobile has joined #tikiwiki marclaporte: polom CIA-46: tikiwiki: 03marclaporte * r18066 10/branches/3.0/templates/modules/ (mod-last_modif_tracker_items.tpl mod-last_tracker_items.tpl): [FIX] shorter URLs for 2 tracker modules, __like in since your last visit__ module ***: snarlydwarf has joined #tikiwiki <br> nikhilodeon has joined #tikiwiki nikhilodeon: hi, in tikiwiki how do i get to the page that has all the users who have visited the site? i can't seem to find it ***: Wilkins has quit IRC (Remote closed the connection) Darkbee: <u>nikhilodeon</u>: this one: tiki-syslog.php? nikhilodeon: <u>Darkbee</u>: this one is good, but there is one that is a little more general i think luminoso: how do directory batch upload works? <br> i mean: i should be allowed to select multiple files, right? <br> since a file choser dialog pops-up.. ***: Caarrie is now known as Caarrie|away <br> MatWho has joined #tikiwiki MatWho: hi all <br> just svn co branches/3.0 on to new server "Custom Site header" does not work anyone else have the same problem CIA-46: tikiwiki: 03jonnybradley * r18067 10/branches/3.0/ (lib/setup/js_detect.php templates/tiki.tpl): [MOD] Added new Smarty var $ie6 if IE6 browser detected and changed #col3 inline CSS style in tiki.tpl to suit MatWho: jonny can you fix tiki-admin.php?page=general "admin password" in Safari while your are at it ***: navster-mobile has quit IRC ("Get Colloquy for iPhone! http://mobile.colloquy.info") <br> navster-mobile has joined #tikiwiki <br> navster-mobile has quit IRC (Client Quit) <br> MatWho has left <br> Caarrie|away is now known as Caarrie SEWilco2: <u>luminoso</u>: Yes, select the files and click the button at the bottom. You have to select the directory to put the stuff into. <br> <u>luminoso</u>: I think you have to have at least one "Public" directory so it will show up as a choice for the destination. ***: navster-mobile has joined #tikiwiki <br> navster-mobile has quit IRC (Client Quit) <br> navster-mobile has joined #tikiwiki <br> navster-mobile has quit IRC (Client Quit) <br> navster-mobile has joined #tikiwiki <br> navster-mobile has quit IRC (Client Quit) CIA-46: tikiwiki: 03marclaporte * r18068 10/branches/3.0/templates/tiki-admin-include-profiles.tpl: [FIX] Adding padding to make profiles installer nicer. <br> tikiwiki: 03marclaporte * r18069 10/branches/3.0/lib/wiki-plugins/wikiplugin_dbreport.php: [FIX] dos2unix <br> tikiwiki: 03marclaporte * r18070 10/branches/3.0/lib/wiki-plugins/ (wikiplugin_dbreport.php wikiplugin_snarf.php): [FIX] Adding more security to two plugins. ***: Lucymoz has joined #tikiwiki CIA-46: tikiwiki: 03jonnybradley * r18071 10/branches/3.0/ (4 files in 4 dirs): <br> tikiwiki: [ENH] Cosmetic improvements to category picker - feedback welcome <br> tikiwiki: (Only in transitions CSS so far) <br> tikiwiki: 03marclaporte * r18072 10/branches/3.0/lib/wiki-plugins/wikiplugin_webservice.php: [FIX] link to doc ***: mycomputer_ has joined #tikiwiki <br> navster has joined #tikiwiki <br> mycomputer has quit IRC ("Quitte") luminoso: SEWilco2, is there any direct php page to login? <br> i want to hide right column since i am the only user SEWilco2: <u>luminoso</u>: /login or /tiki-login.php I think. luminoso: thank you SEWilco2: try it first luminoso: if i disable it there is a new login way <br> i only noticed it now <br> http://luminoso.ws/ <br> on the top ***: Caarrie is now known as Caarrie|away <br> rpg has quit IRC (Read error: 60 (Operation timed out)) <br> navster has quit IRC () <br> rpg has joined #tikiwiki <br> Lucymoz has quit IRC (Read error: 110 (Connection timed out)) CIA-46: tikiwiki: 03sylvieg * r18073 10/branches/3.0/tiki-listpages.php: [FIX]perms: tiki_p_lock is more a tiki_p_edit_categorized than a tiki_p_view_categorized ***: mycomputer_ has quit IRC ("Quitte") SEWilco2: Oh, goodie. Can't find the dimensions of a filegal image because the image file has no extension. Sigh. ***: Lucymoz has joined #tikiwiki luminoso: should't be one "tiki_p_list_articles"? ***: Caarrie|away is now known as Caarrie CIA-46: tikiwiki: 03sylvieg * r18074 10/branches/3.0/tiki-sefurl.php: [FIX]sefurl: keep the space as + - ex: lang[]=en&lang[]=fr et space -> lang%255B%255D%253Den%2526lang%255B%255D%253Dfr+et+spaces ***: FrankP_german has quit IRC ("Nettalk6 - www.ntalk.de") <br> Darkbee has quit IRC (Read error: 104 (Connection reset by peer)) <br> rpg has quit IRC (Read error: 113 (No route to host)) <br> Caarrie is now known as Caarrie|away <br> rodrigo_sampaio1 has quit IRC ("Leaving.") <br> SEWilco2 has left <br> nikhilodeon has quit IRC (Read error: 110 (Connection timed out)) <br> Simmi has joined #tikiwiki <br> Caarrie|away is now known as Caarrie CIA-46: tikiwiki: 03sylvieg * r18075 10/trunk/ (63 files in 25 dirs): [MRG] Automatic merge, branches/3.0 18022 to 18074 ***: navster-mobile has joined #tikiwiki <br> navster-mobile has quit IRC (Client Quit) <br> navster has joined #tikiwiki <br> snarlydwarf has quit IRC ("Ex-Chat") marclaporte: <u>sylvieg</u>: : are you getting lots of conflicts yet?