tikiwiki: 03chealer * r34613 10/trunk/ (5 files in 2 dirs): small tuning of 2 similar plugin parameter descriptions. need update: de and hu tikiwiki: 03xen216 * r34614 10/branches/7.x/lib/wiki-plugins/wikiplugin_userlist.php: [FIX] #3850 fixed sql syntax error when using sort and group parameters together tikiwiki: 03chealer * r34615 10/branches/7.x/ (lang/ca/language.php templates/tiki-mods.tpl): tikiwiki: [FIX] Change "You will probably some find mods shown as being compatible with older versions of Tiki will work with later versions with little or no modification" tikiwiki: to "You will probably find mods shown as being compatible with older versions of Tiki will work with later versions with little or no modification" (guessed) tikiwiki: 03chealer * r34616 10/branches/7.x/ (3 files in 3 dirs): tikiwiki: [FIX] Change "Using Tiki with an incorrect database version usually provoke errors." tikiwiki: to "Using Tiki with an incorrect database version usually provokes errors." tikiwiki: 03chealer * r34617 10/branches/7.x/ (lang/de/language.php lib/prefs/tiki.php): tiki_domain_prefix description: s/unify URLs/standardize URLs/ New Forum Posts: How to place more than marker using Gmap plugin. - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=41342 New Forum Posts: Trackers: editing rights for specific fields and specific users - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=41343 oikin oikin tikiwiki: 03chibaguy * r34619 10/branches/7.x/templates/modules/mod-login_box.tpl: [FIX] Reinstate span for down-arrow on popup login link button. tikiwiki: 03chibaguy * r34620 10/branches/7.x/styles/layout/layout.css: [FIX] Default positioning for header-mode login form. tikiwiki: 03chibaguy * r34621 10/branches/7.x/styles/fivealive.css: [FIX] Remove gap between bottom of header login button and menu bar. tikiwiki: 03sampaioprimo * r34622 10/trunk/get_strings.php: don't translate system names tikiwiki: 03sampaioprimo * r34623 10/trunk/doc/devtools/update_english_strings.php: update_english_strings.php update untranslated entries tikiwiki: 03chibaguy * r34624 10/branches/7.x/styles/business.css: [FIX] Inconsistent padding on header login button's normal and hover states; nicer background. Greetings. I don't understand why thumbnails do not work. TikiWiki 6.3 I use the file galleries to save them (as the normal "Insert Image" on a wiki page looks there by default and the image gallery is deprecated). {IMG(src="display3",thumb="y",max="100",alt="Screenshot",imalign="right")}{IMG} results in the full 1920x1080 image on the page oh! If I choose an image with "Image" in the wiki editor thumbnail does not work. but with "Choose or upload images" it does poloms in the rain hi luciash: how's the 3d browser hunt going? (read your updates to dev.t.o/tiki7) Recent Bug: Tracker item: #3902 - - Object permissions for menus: not functional - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=3902 tikiwiki: 03eromneg * r34625 10/trunk/lib/newsletters/nllib.php: [FIX] convert emails to lower case when using a wiki page subscription in newsletters so that the same emails in different cases can be de-duped even when in multiple wiki pages hi all - anyone seen: Fatal error: Class 'HTMLPurifier_Config' not found in /var/www/.../lib/htmlpurifier_tiki/HTMLPurifier.tiki.php on line 46? seems to be the autoloader is failing (and i don't really understand them) hi sylvie if you are around, couple quick questions about Plugin Tracker Toggle does it require plugin div or will it evaluate html used in the page? should trackertoggle directly follow the div or is placement not so important? does it work with plugin tracker only? ? about 6.x profiles: i need a profile that allows several folks to contribute in a secure way should i use the community profile or intranet setup? 6.3 new install thanx @luciash: You probably remember me back in the 4.x days I just waited for tiki to mature a bit and am going to give it another shot for the tracker stuff to record railroads and such tikiwiki: 03sylvieg * r34626 10/branches/7.x/ (lib/setup/tikiIndex.php tiki-setup.php): [FIX]prefs: useUrl was not working since ... 4 tikiwiki: 03sylvieg * r34627 10/branches/7.x/lib/setup/tikiIndex.php: typo what is the syntax for the svn $Id$ tikiwiki: 03sylvieg * r34628 10/branches/7.x/lib/setup/tikiIndex.php: typo= sorry :-( none worked and the doc said $Id$ :-( hi jonnyb, I did not hi chealer - i turned off htmlpurifier on that server (it's a weird client one) sylvieg: isn't it $Id: $ jonnyb: ah, well do note that I never tried to use HTMLPurifier sylvieg: the file is missing the Id svn keyword (property not set) the wysiwyg profile turns it on i think (you mean you never tested it? ;) ) jonnyb: OK. yes I meant I never intentionally used, but if it's used more or less by default, I didn't see that error. I do not understand why commit 34626 did not work - it was $Id: $ as chealer said, did you add the svn:keyword property? sylvieg: see r34545 jonnyb: the exact name is "svn:keywordS" thanks, the gui usually gets it right for me :P jonnyb: regarding the Tiki7 schedule, May 22nd is gone already true - did i put that in for RC1? (i meant tomorrow of course, wrong Friday?) jonnyb: yes, changing to May 27nd then sylvieg: are you using any sort of gui utility for svn? or command line? or 27th thanks chealer :) command line hmm, i don't use that but it's to do with svn propset and propget e.g. svn propget svn:keywords tiki-index.php (returns Id) http://svnbook.red-bean.com/en/1.5/svn.advanced.externals.html not quite right as that about externals but same idea http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html $Id$ should work - but it did not .... I get this: Fatal error: Allowed memory size of 18874368 bytes exhausted (tried to allocate 311296 bytes) in /hermes/web01b/b217/moo.... on line 106 Is there something I need to change or is this just an error being worked on? ibrrorg: which file is line 106 in? and what do you do to get the error? it is an occassional error. this is a new 6.3 install and I have nothing in the wiki yet. Fatal error: Allowed memory size of 18874368 bytes exhausted (tried to allocate 311296 bytes) in /hermes/web01b/b217/moo.foreclosurepediaorg/scriptorum/templates_c/en^%%1D^1DA^1DA73D7C%%tiki-editpage.tpl.php on line 106 is the whole error rodrigo_sampaio: i'm doing a branchupdate and i got a conflict on lang/fr/language.php again - keep trunk version or incoming? collaborative community is the set profile jonnyb: trunk version as usual i don't really 'do' anything other than load a page what's your php momory_limit? (in php.ini) - looks like 18MB which isn't enough i'm afraid for 6.x you need about 64M at least it should say what it is in phpinfo (on the admin menu if you can get there) thanks rodrigo_sampaio - just checkin' ok do i contact my sitehost to update this or what should i do? or goto the file php.ini you can try uncommenting the line php_value memory_limit 128M in .htaccess (but it doesn't always work) if not it's the similar one in php.ini (and restart apache) so in essence this is a sitehost situation and if it cannot be changed by them i cannot use tiki? cause i cannot reset their server which hosting co is it? tiki usually works tikiwiki: 03jonnybradley * r34629 10/trunk/ (15 files in 12 dirs): [MRG] Automatic merge, branches/7.x 34607 to 34628 fatcow i installed it from their script central type of thing and what's your memory_limit currently set to? couldnt tell u w/out instructions to find it log in as admin and select phpinfo on the admin menu or just go to tiki-phpinfo.php if it's blowing up a lot im there looking for memory now man alll kinds of info but all i found that said memory was zend memory enabled is there a section i should goto? tikiwiki: 03eromneg * r34630 10/branches/7.x/lib/newsletters/nllib.php: [FIX] [bp34625] sorry - did this to trunk first. Convert emails to lower case when using a wiki page subscription in newsletters so that the same emails in different cases can be de-duped even when in multiple wiki pages @jonnyb: in the php core i found this: memory_limit 18M 18M is that what you wanted? yes, sounds like it's not enough to run tiki - sounds like you'll have to contact fatcow and ask them to raise it for you (to at least 64M) 18M is not enough. Minimum is 32M, 64 recommended. See http://doc.tiki.org/Requirements if they offer tiki as part of the package they should let you have enough RAM to run it, i think ok so i want to say something like i request that the memory limit in php be elevated to 64M and cite the doc ricks99 listed right? thanx to both BTW good luck tikiwiki: 03eromneg * r34631 10/branches/proposals/6.x/lib/newsletters/nllib.php: [FIX] [bp34630] Convert emails to lower case when using a wiki page subscription in newsletters so that the same emails in different cases can be de-duped even when in multiple wiki pages @jonnyb & ricks99: fatcow sent me to the php.ini file (in my control panel) and i set it to 64M so i will play with it a bit and advise cool, sounds promising for best results, set as much as possible, 128M is good :) it updated the memory_limit in the phpinfo() screen in tiki ... ok will do that now ricks any type of function i should try to 'put weight' on the system so to speak to see if it really did upgrade it? set it to 128M ricks complex trackers take a lot of memory alright ill set some up as i am doing some for tracking railroads anyway and touch base down the road. tell luciash hi (he'll remember us from attending a tikifest in the 3.x days in NYC) and ya'll take care rodrigo_sampaio, jonnyb: why would we take just one version? Cc: sylvieg chealer: ??? I may have short memory but I don't remember that the new policy does that rodrigo_sampaio: I would expect 7.x to be merged to trunk as usual chealer: I don't understand what is the problem since no one is committing changes to language.php files in branches/7.x, according to the new policy. I did the modification to 7.x BTW, and I expect it to be merged chealer: ahhh, so that is the problem :) chealer: my understanding of http://tiki.org/Translation+branching+strategy is that changes to language.php file should be done only on trunk and backported if desired chealer: there is the problem of merging if we change language.php files in other branches rodrigo_sampaio: the new policy says that translations are no exception. my understanding is that you can commit fixes to 7.x and expect them merged to trunk rodrigo_sampaio: but I agree the wording doesn't consider the merges chealer: "changes are done in trunk and can be backported if desired (although backports still don't need to be fixes)." chealer: apparently the same sentence is saying two different things yes, when merges are being done rodrigo_sampaio: I think we have the problem of merging for any kind of file chealer: what do you mean by when the merges are being done? can you elaborate? chealer: I think that regarding merging language files are a special case rodrigo_sampaio: I mean the new policy is clear when there are no merges are being done (currently 7.x is being merged to trunk). rodrigo_sampaio: but it's at least unclear on the possibility of committing to a branch being released when merges are being done so we need to choose what the policy is when merges are being done and reflect that chealer: ok, I see your point. I have a different understanding. What I understood from our discussion in Boston is that independently of merges happening or not you should commit to trunk. chealer: the thing is that when we are in the release process is more likely that someone will backport changes to language files this is the case for 7 chealer: whenever I export translations from i18n.tiki.org I commit to trunk and backport the changes to branches/7.x (true is that I'm not checking language files other than the ones modified in i18n.tiki.org, maybe I should start doing this) rodrigo_sampaio: that's fine because nothing says there are automatic backports from trunk to 7.x sylvieg: do you think there should be automatic merges of translations from 7.x to trunk (when automatic merges are being done for the rest of files)? rodrigo_sampaio, jonnyb: what do we do with commits already done on 7.x? http://sourceforge.net/apps/trac/tikiwiki/log/branches/7.x/lang/ chealer: you could use mergelang.pl to update trunk version of lang/fr/language.php with the changes from branches/7.x the past few conflict in lang have been resolved by using the trunk version (so changes to 7.x don't get merged back) jonnyb: yes, that's the problem. there are a few commits to 7.x which are not backports chealer: you can use doc/devtools/mergelang.php to update trunk with the changes from 7.x ops mergelang.pl tikiwiki: 03luciash * r34632 10/branches/7.x/tiki-freetag3d_xmlrpc.php: [FIX] Freetags Morcego 3D browser: did not work because of missing include i also think that 7.x should be the master copy while merging is happening like all the other files but happy to do what you guys think best polom hi luciash - you fixed the 3d thing? nice! :) yup :) jonnyb: what do you mean by master copy? the one to use when there are conflicts 33891, 34156, 34161, 34162, 34164, 34256, 34615-34618 jonnyb: it's not easy to debug java applet, it was trial and error reverse engineering ;) usually the way forward... I don't think there should be a "master copy". that means work will be lost but when there are two different versions of the same line in a language you don't understand how do you choose? 34161 and 34162 were manually merged jonnyb: you shouldn't. either we set policy so this doesn't happen or you find someone who understands tikiwiki: 03luciash * r34633 10/branches/7.x/templates/tiki-browse_freetags.tpl: [FIX] Freetags Morcego 3D browser: wrong preference name for nodeCharge applet param yes, it's hard enough tracking the php conflicts jonnyb: can i try the merge ? coo, yes - please do should be an easy one (but you never can tell) the info is on dev.t.o/svntips ok, svn up first can i --ignore-externals ? the script does it for you (with externals for extra safety and slowness) aha running oopsie, "Working copy has uncommited changes. Revert or commit them before merging a branch." ;) i'll rather checkout trunk fresh my new php toy phpstorm has an excellent "shelve" function - really handy :) :) 33893, 34156 and 34615-34617 were automatically merged, 34164 and 32256 were manually merged s/33893/33891/ s/32256/34256/ rodrigo_sampaio, jonnyb: that leaves only 34618 which was not completely merged (missing fr) not too bad then, good detective work chealer jonnyb: yeah, except that's by far the most important one would be :P chealer: have you tried mergelang.pl? rodrigo_sampaio: if I did, a long time ago (not today) tikiwiki: 03sampaioprimo * r34634 10/trunk/lang/fr/language.php: merge r34618 chealer: please check if r34634 is correct chealer: that is what was missing? Recent Bug: Tracker item: #3903 - - Using Wiki Editor Buttons - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=3903 luciash: I imagine that if freetag3d_xmlrpc.php manually included db/tiki-db.php, there was a reason it didn't include tiki-setup.php perhaps performance I must say I know nothing about that feature, but at first sight it's not just a missing include (including may fix it but I doubt it's the right fix) at least if it now includes tiki-setup it doesn't need to include the other files i reviewed how it's done for the Wiki 3D browser and spotted the missing include ok, i can remove them the sure thing is without the setup include it didn't work at all for freetags rodrigo_sampaio: thank you very much rodrigo, it seems good. I'll verify, did you get the conflict? chealer: no conflicts hum, yet jonnyb said he had one :-? chealer: all I did was svn merge -r34617:34618 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/7.x chealer: but it is indeed strange jonnyb: are you sure you used enough diplomacy? well... i checked with rodrigo_sampaio :) chealer: we have also to decide what do we do from now on regarding the translations jonnyb: which svn version is being so conflictual? rodrigo_sampaio: yes, I still hope to have sylvieg's opinion but if we don't I shall remember to do that soon how do you mean? the last update i did got a conflict chealer: ok jonnyb: sorry, I was kidding, but why would you have more conflicts than rodrigo_sampaio? which version of the Subversion program do you use? 1.6.something I figure different svn versions could cause it rodrigo_sampaio: you must also use svn 1.6.something? ah, no, i don't think so chealer: 1.6.12 jonnyb: file merging is implemented in svn, no? no, you have to use another tool the aptana/subclipse one is quite good jonnyb: which? when I svn up and changes are merged, what is doing it? svn merges non-conflicted changes it's just conflict resolution you need to do "by hand" jonnyb: yes, but your svn found the changes to fr/language.php to be conflicting while rodrigo_sampaio's svn apparently didn't after i did the merge? jonnyb: after r34629 but that didn't touch fr/language.php jonnyb: it seems to me that if rodrigo's svn was able to automatically merge, yours should have been able too but if he did his after i committed the resolved version it remembers that desicion (to keep the trunk version) the merge script checks to commit log for last merge revision jonnyb: rodrigo didn't use the Tiki merge script. otherwise it would have done nothing. he wrote he manually merged with "svn merge -r34617:34618 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/7.x" ("manually" meaning doing that revision specifically, but he didn't have to resolve any conflict) tikiwiki: 03luciash * r34635 10/branches/7.x/tiki-freetag3d_xmlrpc.php: [ENH] Freetags Morcego 3D browser: remove redundant includes and requires -- thanks chealer New Forum Posts: How to turn off wiki syntax help and plug-ins list - http://tiki.org/tiki-view_forum_thread.php?forumId=3&comments_parentId=41347 New Forum Posts: Problem with the listing of wiki pages - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=41348 hmm, seems it didn't work "svn: Write error: Broken pipe" or can i ignore it ? jonnyb: ^ you ignore that one ok it takes age, go make coffee :) tikiwiki: 03luciash * r34636 10/trunk/ (3 files in 2 dirs): [MRG] Automatic merge, branches/7.x 34628 to 34635 done ;) yay! welcome to the club heheh eazy peazy until you get a conflict weird is svn diff lib/newsletters/nllib.php did show no diff but still was marked as U there were just 3 files to merge in total ah, i understand, it was just updated in between (so marked U) in trunk, not to be merged, it seems ... --- Merging r34629 through r34635 into '.': U tiki-freetag3d_xmlrpc.php U lib/newsletters/nllib.php U templates/tiki-browse_freetags.tpl was the output fine done for today - more tomorrow... tikiwiki: 03marclaporte * r34637 10/trunk/lib/userslib.php: proper feature checks on permissions er.. hi? !help You can get a more complete list of commands that work with this bot at http://tiki.org/TikiBot . [hello] [anyone there?] hi therafost tikiwiki: 03luciash * r34638 10/branches/7.x/tiki-freetag3d_xmlrpc.php: [FIX] Freetags Morcego 3D browser: make the actionUrl work when feature_ajax is on; there does no such js function called browseToTag() exist tikiwiki: 03marclaporte * r34639 10/trunk/lib/userslib.php: proper feature checks on permissions tikiwiki: 03marclaporte * r34640 10/trunk/lib/userslib.php: AFAIK, Tools Calendar is the same thing as Action Calendar, but I can't test because feature seems buggy tikiwiki: 03marclaporte * r34641 10/trunk/lib/userslib.php: proper feature checks on permissions Hi folks - I have a tikiwiki problem with wiki syntax help on my forums - how do I stop it showing? Anyone know? how does it show ? It's when a user wants to put something into the forum - it appears with the whole list of wiki syntax underneath the input for a forum... it's confusing my users - al 5 of them lol hmm, what tiki version ? er.. thought you'd ask that one..I need a second or two to check the plesk. the site is therapeuticfostering.com... it's 3.2.0 version 5 yep does plesk offer update btw ? lates 3.x is 3.6 or 3.7 iirc s/lates/latest/ the quickest way is to hide it via CSS i think I probably could but I'm scared to update - struggling enough with this without trying to figure out a whole new version lol do u want to hide it completely or only collapse the expanded help section ? collapse it permanently - even get default for toggle as off and not on would do the green toggle plus sign needs to be off all the time I guess is there in 3.2 on Look & Feel admin panel a tab called Custom CSS ? i don't remember exactly and don't have any 3.2 on hand here just checking... there's a box for Edit CSS ok, that's something else ... r u ok to edit one file on your server ? styles/darkroom.css is the one will have a go my friend add this to the end of the file: #wiki_help {display: none} ah, rather add !important rule there like this: #wiki_help {display: none !important} ok - I just copy that to the end of the file... New Forum Posts: Enlazar o incluir un artículo en otro artículo - http://tiki.org/tiki-view_forum_thread.php?forumId=15&comments_parentId=41350 Hi there's a folder styles which has a folder darkroom but inside that are 2 png files and an index... is that the one? nope, one folder up styles/darkroom.css file that's your theme file ha ha I can see it cheers... Think I've done it... so I'll just take a look... if u want to do the same with the Wiki help bar, add this there as well: .help_section_select {display: none} My friend - I think you are a genius... :D not sure what you mean on this one? is it the green plus sign bit ? not at all, just little experienced ... yes it is now useless when you want the help hidden completely right oh wil give that a try but honestly - you've given your valuable time to a complete stranger and part muppet - you are a true diamond and many many thanks... np, u r welcome I'm off to bed and i will now be able to sleep thanx to u cheers and goodnight my friend nite nite New Forum Posts: Link or include an article in another article - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=41351