Sourceforge browse svn is down.... hi marclaporte. I have a question about svn merges. Changes I made in trunk got written over by a merge from 2.0. Is this because merges aren't "smart" or is it a temporary svn problem? or http://tikiwiki.org/TikiFest -> Montreal in Feb 2009 (well, marc, it's not just for you to answer that. I combined hello and question in one line by mistake.) I think smartness is cause unsmartness that's why we should merge often I think it would be hard for a merge to be smart enough. It can't tell why files are changed, etc. http://books.slashdot.org/article.pl?sid=08/07/21/1342209&from=rss <--- as I was talking about shopping carts marclaporte: I will be in March in SF,CA The comments on that slashdot page get pretty interesting toward the bottom -- about security problems with drupal and problems with modules and drupal versions. Things to keep in mind re any Tiki ecommerce plans. polom marclaporte: glop marclaporte: I will be end of march in SF... too far from the TikiFest... California? Anyone recognize this line in tiki-bot_bar.tpl: >>>>>>> .merge-right.r13786 ? Looks like someone's note to self. marclaporte: yes california marclaporte: I cannot move from one place to the other as there is one month difference between the 2 ...but isn't in comment tags. marclaporte: you should send an e-mail to all the security reviewer and tell them a version 2.0RC is out if they want to do their magic and let us know, we will credit them accordingly franck: that is a great idea but I have too much on my plate hehehhe someone else could do well do we have a list? I found only 3 e-mails of auditors, may be I'm missing some? can someone help get more e-mails? allo marclaporte: on the tw site there is no more a link on how to report a security issue on info? yes ricks99_ : is in charge of info just add in the main menu under community a link to security.tikiwiki.org ricks99_: hello? marclaporte: I found only 3 e-mails of security reviewer? where can I find more? could you check your archives in security@tikwiki.org I'm ready to send an e-mail It's funny how svn commit messages are sometimes fast and sometimes slow. I guess due to changes at sourceforge. chibaguy: that line comes from a diff merge, someone modified and then updated and it attempted to auto-merge ah, I see. so it alerts humans to check the files? yep, it has to be edited manually then i'm noit sure in which cases this exactly occurs but before every commit one should quickly test and check the file anyway hello I am coding for a wiki plugin annotation for tikiwiki whose purpose is to provide user interface to make/add annotations to an image. Can anyone guide me for wiki staging and approval? what i intend to do is replace the content X of wiki page content with Y and changes should only be in the staging article and not in the live article hello I am reposting my problem.....I am not sure whether the last time I posted it whether I was connected to the server or not I am coding for a wiki plugin "ANNOTATION" for tikiwiki whose purpose is to provide user interface for the contributors to make/edit annotations on the images on a wiki page Can anyone guide me wiki staging and approval? shishir_gsoc: hi! shishir_gsoc: : thanks for helping out Presently when I perform any changes to the the annotations they are saved to the live article shishir_gsoc: : nelson ko is the best person to ask questions about staging lphuberdeau is best to ask about pluginannotations ok.........well he is my mentor b tis presently offline *but hehe so I thought why not take help from here :-) chibaguy: Hi, I have a question regarding tikinewt in IE7. Have you noticed that on most pages "col2" which holds the left modules resides under the middle section rahter than beside it? Is there a fix? RobFerguson, it was behaving in IE7 the last I checked, but I don't use iE7 except to check, so maybe something changed. I'll take another look. Do you have a public url I could see? yes, it is tw.tanjir.net In the theme that you're using now, there seems to be a div tag problem, causing the left column to start where the center ends. (Themes using the *litecss method work well but are sensitive to extra or missing /div tags, etc. i have an extra? I'm not sure, but you see the staggered columns? yes, this is the problem Ah, it's OK in firefox.... yep So probably not a broken div. Maybe a margins problem. except i also notice too that on the admin-categories page "col2" isnt in the correct hierarchy, rather it is render someplace earlier which seems to break it Did you change the left or right column widths? (in css) yes, i changed them both, i can try again There are column widths and margins that are the same figures. These must be the same (right side the same, left side the same). If you add a border to a side column, you have to reduce the column width by the same number of pixels. I need to make a troubleshooting page for this stuff.) is that the part where it says /* change this in your stylesheet too when you change the width of #col2 */ Yes. i have both col2 and col3 at 0px I'm not sure giving #col1 a width will work. col2 is 200px currently i think thats stock What is the col2 at 0px? yes for margin 200px width #c1c2 #wrapper .marginleft should be 200px if #col2 width is 200px. ok i just set that, doesnt seem to take, perhaps it needs more? Try comparing to a stock tikinewt.css. yeah also why im trying this, the admin-categories of a stock tiki-newt behaves differently as well, it for sure on a stock install performs in the way im experiencing now while* OK, I'm having a look at my site in IE7 and Tikinewt.... tiki-admin_categories.php behaves strangely for you? yes col2 seems to be ealier in the hierarchy rather than be inside middle it is beside it, in the DOM Hmm, it seems normal for me. I can't exactly visualize what you're seeing there. Maybe if you could make a screenshot? yeah im seeing what i thought before, maybe im dreaming :) Well, this layout method is kinda tricky. how so I mean the column widths and margins have to be right (internally consistent). did you get my send request for the image? And since there are no tables to contain problems, a missing or extra div tag part can throw off the whole page. Yes. (will be back soon -- family calling.) chibaguy: why we do not use in tiki.tpl