| ←Prev date Next date→ Show only urls | (Click on time to select a line by its url) |
| Who | What | When |
|---|---|---|
| *** | xSmurf has quit IRC (Remote host closed the connection) | [00:24] |
| xSmurf has joined #tikiwiki | [00:29] | |
| ........ (idle for 36mn) | ||
| xen216 has quit IRC (Ping timeout: 240 seconds) | [01:05] | |
| xen216 has joined #tikiwiki | [01:19] | |
| .... (idle for 17mn) | ||
| xen216 has quit IRC (Ping timeout: 252 seconds)
Caarrie|away is now known as Caarrie|sleeping Caarrie has joined #tikiwiki Caarrie|sleeping has quit IRC (Ping timeout: 276 seconds) goj|ghost has joined #tikiwiki | [01:36] | |
| goj has quit IRC (Ping timeout: 276 seconds)
goj|ghost is now known as goj | [01:55] | |
| ..... (idle for 21mn) | ||
| CIA-87 has quit IRC (Ping timeout: 260 seconds) | [02:16] | |
| nkoth has quit IRC (Quit: nkoth)
xen216 has joined #tikiwiki CIA-83 has joined #tikiwiki | [02:27] | |
| .... (idle for 16mn) | ||
| CIA-83 | 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 | [02:48] |
| ......... (idle for 40mn) | ||
| 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) | [03:29] | |
| 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." | [03:40] | |
| ....... (idle for 30mn) | ||
| *** | xen216 has quit IRC (Ping timeout: 264 seconds) | [04:10] |
| ....... (idle for 33mn) | ||
| xSmurf has quit IRC (Read error: Connection reset by peer)
xSmurf has joined #tikiwiki d6chung has quit IRC (Ping timeout: 260 seconds) | [04:43] | |
| d6chung has joined #tikiwiki | [04:51] | |
| ..... (idle for 23mn) | ||
| CIA-83 | tikiwiki: 03chealer * r34617 10/branches/7.x/ (lang/de/language.php lib/prefs/tiki.php): tiki_domain_prefix description: s/unify URLs/standardize URLs/ | [05:14] |
| *** | xen216 has joined #tikiwiki
xen216 has quit IRC (Read error: Connection reset by peer) | [05:20] |
| .... (idle for 16mn) | ||
| Tiki|bot | 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 | [05:36] |
| ..... (idle for 22mn) | ||
| *** | CIA-83 has quit IRC (Remote host closed the connection) | [05:58] |
| .... (idle for 16mn) | ||
| CIA-87 has joined #tikiwiki
chealer has quit IRC (Ping timeout: 246 seconds) | [06:14] | |
| chealer has joined #tikiwiki | [06:22] | |
| chealer has quit IRC (Remote host closed the connection) | [06:28] | |
| ..... (idle for 21mn) | ||
| coaboa has joined #tikiwiki | [06:49] | |
| ............ (idle for 55mn) | ||
| Bernard has joined #tikiwiki | [07:44] | |
| ................ (idle for 1h15mn) | ||
| Tiki|bot | 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 | [08:59] |
| ...... (idle for 25mn) | ||
| *** | Caarrie is now known as Caarrie|away | [09:24] |
| chealer has joined #tikiwiki
chealer has quit IRC (Changing host) chealer has joined #tikiwiki | [09:29] | |
| ............ (idle for 58mn) | ||
| goj|ghost has joined #tikiwiki
goj has quit IRC (Ping timeout: 260 seconds) goj|ghost is now known as goj | [10:27] | |
| ..... (idle for 24mn) | ||
| rodrigo_sampaio has joined #tikiwiki
rodrigo_sampaio has quit IRC (Client Quit) rodrigo_sampaio has joined #tikiwiki | [10:54] | |
| luciash | oikin oikin | [10:58] |
| *** | rodrigo_sampaio1 has joined #tikiwiki
rodrigo_sampaio has quit IRC (Read error: Connection reset by peer) | [11:06] |
| ..... (idle for 20mn) | ||
| rodrigo_sampaio has joined #tikiwiki
rodrigo_sampaio1 has quit IRC (Read error: Operation timed out) | [11:27] | |
| ricks99 has joined #tikiwiki | [11:36] | |
| ......... (idle for 41mn) | ||
| CIA-87 | tikiwiki: 03chibaguy * r34619 10/branches/7.x/templates/modules/mod-login_box.tpl: [FIX] Reinstate span for down-arrow on popup login link button. | [12:17] |
| *** | Bernard has quit IRC (Quit: Leaving.) | [12:17] |
| CIA-87 | tikiwiki: 03chibaguy * r34620 10/branches/7.x/styles/layout/layout.css: [FIX] Default positioning for header-mode login form. | [12:18] |
| .... (idle for 15mn) | ||
| *** | Bernard has joined #tikiwiki | [12:33] |
| CIA-87 | tikiwiki: 03chibaguy * r34621 10/branches/7.x/styles/fivealive.css: [FIX] Remove gap between bottom of header login button and menu bar. | [12:38] |
| ...... (idle for 28mn) | ||
| *** | rodrigo_sampaio1 has joined #tikiwiki
rodrigo_sampaio has quit IRC (Ping timeout: 240 seconds) radek82 has joined #tikiwiki | [13:06] |
| .... (idle for 17mn) | ||
| CIA-87 | 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 | [13:26] |
| *** | rodrigo_sampaio1 has quit IRC (Read error: Connection reset by peer)
rodrigo_sampaio has joined #tikiwiki ricks99 has quit IRC (Ping timeout: 240 seconds) | [13:30] |
| Caarrie|away has quit IRC (Quit: bye see you later)
Caarrie has joined #tikiwiki Caarrie is now known as Caarrie|away | [13:44] | |
| ..... (idle for 20mn) | ||
| CIA-87 | tikiwiki: 03chibaguy * r34624 10/branches/7.x/styles/business.css: [FIX] Inconsistent padding on header login button's normal and hover states; nicer background. | [14:07] |
| *** | rodrigo_sampaio has quit IRC (Ping timeout: 240 seconds)
nkoth has joined #tikiwiki | [14:12] |
| ricks99 has joined #tikiwiki
ricks99 has quit IRC (Remote host closed the connection) ricks99 has joined #tikiwiki Nils^ has joined #tikiwiki | [14:25] | |
| Nils^ | 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 | [14:32] |
| *** | rodrigo_sampaio has joined #tikiwiki | [14:44] |
| Nils^ | oh! If I choose an image with "Image" in the wiki editor thumbnail does not work. but with "Choose or upload images" it does | [14:57] |
| .... (idle for 17mn) | ||
| *** | rodrigo_sampaio has quit IRC (Ping timeout: 260 seconds)
jonnyb has joined #tikiwiki | [15:14] |
| jonnyb | poloms in the rain
hi luciash: how's the 3d browser hunt going? (read your updates to dev.t.o/tiki7) | [15:23] |
| .... (idle for 17mn) | ||
| Tiki|bot | Recent Bug: Tracker item: #3902 - - Object permissions for menus: not functional - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=3902 | [15:41] |
| CIA-87 | 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 | [15:47] |
| jonnyb | 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) | [15:48] |
| *** | ricks99 has quit IRC (Remote host closed the connection) | [15:48] |
| mlpvolt | hi sylvie if you are around, couple quick questions about Plugin Tracker Toggle | [15:49] |
| *** | Nils^ has left | [15:49] |
| mlpvolt | 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? | [15:50] |
| *** | WhiteCalf has quit IRC (Read error: Connection reset by peer)
WhiteCalf has joined #tikiwiki | [15:53] |
| ..... (idle for 23mn) | ||
| TN_ has joined #tikiwiki | [16:16] | |
| TN_ | ? 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 | [16:17] |
| CIA-87 | tikiwiki: 03sylvieg * r34626 10/branches/7.x/ (lib/setup/tikiIndex.php tiki-setup.php): [FIX]prefs: useUrl was not working since ... 4 | [16:19] |
| *** | TN_ has quit IRC (Quit: Page closed)
ricks99 has joined #tikiwiki | [16:27] |
| CIA-87 | tikiwiki: 03sylvieg * r34627 10/branches/7.x/lib/setup/tikiIndex.php: typo | [16:35] |
| sylvieg | what is the syntax for the svn $Id$ | [16:35] |
| CIA-87 | tikiwiki: 03sylvieg * r34628 10/branches/7.x/lib/setup/tikiIndex.php: typo= sorry | [16:37] |
| sylvieg | :-( none worked
and the doc said $Id$ :-( | [16:37] |
| *** | Caarrie has joined #tikiwiki
Bernard1 has joined #tikiwiki Bernard has quit IRC (Read error: Connection reset by peer) Caarrie|away has quit IRC (Disconnected by services) Caarrie is now known as Caarrie|away | [16:42] |
| chealer | hi jonnyb, I did not | [16:45] |
| jonnyb | hi chealer - i turned off htmlpurifier on that server (it's a weird client one)
sylvieg: isn't it $Id: $ | [16:46] |
| chealer | jonnyb: ah, well do note that I never tried to use HTMLPurifier | [16:47] |
| *** | emijrp has joined #tikiwiki | [16:47] |
| chealer | sylvieg: the file is missing the Id svn keyword (property not set) | [16:47] |
| jonnyb | the wysiwyg profile turns it on i think (you mean you never tested it? ;) ) | [16:47] |
| chealer | 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. | [16:48] |
| sylvieg | I do not understand why commit 34626 did not work - it was $Id: $ | [16:48] |
| jonnyb | as chealer said, did you add the svn:keyword property? | [16:49] |
| chealer | sylvieg: see r34545
jonnyb: the exact name is "svn:keywordS" | [16:49] |
| jonnyb | thanks, the gui usually gets it right for me :P | [16:52] |
| *** | damian has joined #tikiwiki | [16:53] |
| sylvieg | sylvieg is lost or blind | [16:54] |
| chealer | jonnyb: regarding the Tiki7 schedule, May 22nd is gone already | [16:59] |
| jonnyb | true - did i put that in for RC1? (i meant tomorrow of course, wrong Friday?) | [16:59] |
| *** | Bernard1 has quit IRC (Read error: Connection reset by peer)
Bernard has joined #tikiwiki | [16:59] |
| chealer | jonnyb: yes, changing to May 27nd then | [17:00] |
| jonnyb | sylvieg: are you using any sort of gui utility for svn? or command line? | [17:00] |
| chealer | or 27th | [17:00] |
| jonnyb | thanks chealer :) | [17:00] |
| sylvieg | command line | [17:00] |
| jonnyb | jonnyb checks svn help prop
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 | [17:01] |
| *** | rodrigo_sampaio has joined #tikiwiki | [17:06] |
| sylvieg | $Id$ should work - but it did not .... | [17:07] |
| *** | ibrrorg has joined #tikiwiki | [17:07] |
| ibrrorg | 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? | [17:10] |
| jonnyb | ibrrorg: which file is line 106 in? and what do you do to get the error? | [17:11] |
| ibrrorg | 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 | [17:11] |
| jonnyb | rodrigo_sampaio: i'm doing a branchupdate and i got a conflict on lang/fr/language.php again - keep trunk version or incoming? | [17:12] |
| ibrrorg | collaborative community is the set profile | [17:12] |
| *** | emijrp has quit IRC (Quit: Ex-Chat) | [17:12] |
| rodrigo_sampaio | jonnyb: trunk version as usual | [17:12] |
| ibrrorg | i don't really 'do' anything other than load a page | [17:12] |
| jonnyb | 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' | [17:13] |
| ibrrorg | ok do i contact my sitehost to update this or what should i do?
or goto the file php.ini | [17:14] |
| jonnyb | 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) | [17:16] |
| ibrrorg | 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 | [17:17] |
| jonnyb | which hosting co is it? tiki usually works | [17:17] |
| CIA-87 | tikiwiki: 03jonnybradley * r34629 10/trunk/ (15 files in 12 dirs): [MRG] Automatic merge, branches/7.x 34607 to 34628 | [17:17] |
| ibrrorg | fatcow
i installed it from their script central type of thing | [17:17] |
| jonnyb | and what's your memory_limit currently set to? | [17:18] |
| ibrrorg | couldnt tell u w/out instructions to find it | [17:18] |
| jonnyb | 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 | [17:19] |
| ibrrorg | 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? | [17:19] |
| CIA-87 | 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 | [17:22] |
| *** | Bernard has quit IRC (*.net *.split)
amette has quit IRC (*.net *.split) Bernard has joined #tikiwiki amette has joined #tikiwiki Bernard has quit IRC (Ping timeout: 250 seconds) rodrigo_sampaio has quit IRC (Remote host closed the connection) Bernard has joined #tikiwiki | [17:24] |
| ibrrorg | @jonnyb: in the php core i found this: memory_limit 18M 18M is that what you wanted? | [17:30] |
| jonnyb | 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) | [17:31] |
| *** | rodrigo_sampaio has joined #tikiwiki | [17:31] |
| ricks99 | 18M is not enough. Minimum is 32M, 64 recommended. See http://doc.tiki.org/Requirements | [17:31] |
| jonnyb | if they offer tiki as part of the package they should let you have enough RAM to run it, i think | [17:32] |
| ibrrorg | 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 | [17:32] |
| jonnyb | good luck | [17:32] |
| *** | conner_bw has joined #tikiwiki | [17:33] |
| CIA-87 | 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 | [17:36] |
| ibrrorg | @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 | [17:48] |
| jonnyb | cool, sounds promising | [17:48] |
| ricks99 | for best results, set as much as possible, 128M is good :) | [17:49] |
| ibrrorg | 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 | [17:49] |
| ricks99 | complex trackers take a lot of memory | [17:51] |
| ibrrorg | 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 | [17:53] |
| *** | ibrrorg has quit IRC (Quit: Page closed) | [17:56] |
| chealer | rodrigo_sampaio, jonnyb: why would we take just one version?
Cc: sylvieg | [18:04] |
| rodrigo_sampaio | chealer: ??? | [18:05] |
| 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 | [18:05] |
| rodrigo_sampaio | 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. | [18:09] |
| chealer | I did the modification to 7.x BTW, and I expect it to be merged | [18:09] |
| rodrigo_sampaio | 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 | [18:09] |
| chealer | 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 | [18:11] |
| rodrigo_sampaio | 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 | [18:13] |
| chealer | yes, when merges are being done
rodrigo_sampaio: I think we have the problem of merging for any kind of file | [18:14] |
| rodrigo_sampaio | 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 | [18:16] |
| chealer | 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 | [18:17] |
| rodrigo_sampaio | 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) | [18:19] |
| chealer | 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)? | [18:28] |
| ........ (idle for 36mn) | ||
| *** | rtdos has quit IRC (Remote host closed the connection)
rodrigo_sampaio has quit IRC (Quit: Leaving.) rodrigo_sampaio has joined #tikiwiki | [19:05] |
| chealer | 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/ | [19:10] |
| rodrigo_sampaio | chealer: you could use mergelang.pl to update trunk version of lang/fr/language.php
with the changes from branches/7.x | [19:11] |
| jonnyb | the past few conflict in lang have been resolved by using the trunk version (so changes to 7.x don't get merged back) | [19:11] |
| chealer | jonnyb: yes, that's the problem. there are a few commits to 7.x which are not backports | [19:12] |
| rodrigo_sampaio | chealer: you can use doc/devtools/mergelang.php to update trunk with the changes from 7.x
ops mergelang.pl | [19:12] |
| CIA-87 | tikiwiki: 03luciash * r34632 10/branches/7.x/tiki-freetag3d_xmlrpc.php: [FIX] Freetags Morcego 3D browser: did not work because of missing include | [19:13] |
| jonnyb | i also think that 7.x should be the master copy while merging is happening | [19:13] |
| *** | rtdos has joined #tikiwiki | [19:13] |
| jonnyb | like all the other files
but happy to do what you guys think best | [19:13] |
| luciash | polom | [19:13] |
| jonnyb | hi luciash - you fixed the 3d thing? nice! :) | [19:14] |
| luciash | yup :) | [19:14] |
| chealer | jonnyb: what do you mean by master copy? | [19:14] |
| jonnyb | the one to use when there are conflicts | [19:15] |
| chealer | 33891, 34156, 34161, 34162, 34164, 34256, 34615-34618 | [19:15] |
| luciash | jonnyb: it's not easy to debug java applet, it was trial and error reverse engineering ;) | [19:15] |
| jonnyb | usually the way forward... | [19:16] |
| chealer | I don't think there should be a "master copy". that means work will be lost | [19:16] |
| jonnyb | but when there are two different versions of the same line in a language you don't understand how do you choose? | [19:16] |
| *** | ricks99 has quit IRC (Quit: Get the best-selling Tiki books (paperback and ebook) at http://www.lulu.com/spotlight/ricks99) | [19:17] |
| chealer | 34161 and 34162 were manually merged | [19:17] |
| *** | emijrp has joined #tikiwiki | [19:19] |
| chealer | jonnyb: you shouldn't. either we set policy so this doesn't happen or you find someone who understands | [19:19] |
| CIA-87 | tikiwiki: 03luciash * r34633 10/branches/7.x/templates/tiki-browse_freetags.tpl: [FIX] Freetags Morcego 3D browser: wrong preference name for nodeCharge applet param | [19:19] |
| jonnyb | yes, it's hard enough tracking the php conflicts | [19:20] |
| luciash | jonnyb: can i try the merge ? | [19:24] |
| jonnyb | coo, yes - please do
should be an easy one (but you never can tell) the info is on dev.t.o/svntips | [19:25] |
| luciash | ok, svn up first
can i --ignore-externals ? | [19:25] |
| jonnyb | the script does it for you (with externals for extra safety and slowness) | [19:26] |
| luciash | aha
running oopsie, "Working copy has uncommited changes. Revert or commit them before merging a branch." ;) i'll rather checkout trunk fresh | [19:26] |
| jonnyb | my new php toy phpstorm has an excellent "shelve" function - really handy :) | [19:30] |
| luciash | :) | [19:31] |
| chealer | 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) | [19:32] |
| jonnyb | not too bad then, good detective work chealer | [19:37] |
| chealer | jonnyb: yeah, except that's by far the most important one | [19:40] |
| jonnyb | would be :P | [19:40] |
| rodrigo_sampaio | chealer: have you tried mergelang.pl? | [19:43] |
| chealer | rodrigo_sampaio: if I did, a long time ago (not today) | [19:44] |
| CIA-87 | tikiwiki: 03sampaioprimo * r34634 10/trunk/lang/fr/language.php: merge r34618 | [19:46] |
| *** | damian has quit IRC (Remote host closed the connection) | [19:46] |
| rodrigo_sampaio | chealer: please check if r34634 is correct
chealer: that is what was missing? | [19:46] |
| Tiki|bot | Recent Bug: Tracker item: #3903 - - Using Wiki Editor Buttons - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=3903 | [19:47] |
| chealer | 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 | [19:48] |
| luciash | 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 | [19:50] |
| *** | emijrp has quit IRC (Quit: Ex-Chat)
xen216 has joined #tikiwiki | [19:51] |
| chealer | rodrigo_sampaio: thank you very much rodrigo, it seems good. I'll verify, did you get the conflict? | [19:53] |
| rodrigo_sampaio | chealer: no conflicts | [19:53] |
| chealer | hum, yet jonnyb said he had one :-? | [19:54] |
| rodrigo_sampaio | 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 | [19:54] |
| *** | damian has joined #tikiwiki | [19:55] |
| chealer | jonnyb: are you sure you used enough diplomacy? | [19:56] |
| *** | damian is now known as creativetux | [19:56] |
| jonnyb | well... i checked with rodrigo_sampaio :) | [19:56] |
| *** | creativetux is now known as damian | [19:56] |
| rodrigo_sampaio | chealer: we have also to decide what do we do from now on regarding the translations | [19:56] |
| chealer | 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 | [19:57] |
| jonnyb | how do you mean? the last update i did got a conflict | [19:58] |
| rodrigo_sampaio | chealer: ok | [19:58] |
| chealer | jonnyb: sorry, I was kidding, but why would you have more conflicts than rodrigo_sampaio? which version of the Subversion program do you use? | [19:59] |
| jonnyb | 1.6.something | [19:59] |
| chealer | I figure different svn versions could cause it | [19:59] |
| *** | Bernard has quit IRC (Quit: Leaving.) | [19:59] |
| chealer | rodrigo_sampaio: you must also use svn 1.6.something? | [19:59] |
| jonnyb | ah, no, i don't think so | [19:59] |
| rodrigo_sampaio | chealer: 1.6.12 | [20:00] |
| *** | damian has quit IRC (Read error: Connection reset by peer) | [20:00] |
| chealer | jonnyb: file merging is implemented in svn, no? | [20:02] |
| jonnyb | no, you have to use another tool
the aptana/subclipse one is quite good | [20:02] |
| chealer | jonnyb: which? when I svn up and changes are merged, what is doing it? | [20:03] |
| jonnyb | svn merges non-conflicted changes
it's just conflict resolution you need to do "by hand" | [20:03] |
| chealer | jonnyb: yes, but your svn found the changes to fr/language.php to be conflicting while rodrigo_sampaio's svn apparently didn't | [20:04] |
| jonnyb | after i did the merge? | [20:05] |
| *** | rodrigo_sampaio has quit IRC (Quit: Leaving.) | [20:05] |
| chealer | 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 | [20:06] |
| jonnyb | 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 | [20:08] |
| chealer | 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) | [20:10] |
| CIA-87 | tikiwiki: 03luciash * r34635 10/branches/7.x/tiki-freetag3d_xmlrpc.php: [ENH] Freetags Morcego 3D browser: remove redundant includes and requires -- thanks chealer | [20:18] |
| Tiki|bot | 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 | [20:20] |
| *** | conner_bw has quit IRC (Quit: conner_bw) | [20:25] |
| Tiki|bot | New Forum Posts: Problem with the listing of wiki pages - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=41348 | [20:30] |
| ...... (idle for 28mn) | ||
| luciash | hmm, seems it didn't work
"svn: Write error: Broken pipe" or can i ignore it ? jonnyb: ^ | [20:58] |
| jonnyb | you ignore that one | [20:59] |
| luciash | ok | [21:00] |
| jonnyb | it takes age, go make coffee
:) | [21:00] |
| CIA-87 | tikiwiki: 03luciash * r34636 10/trunk/ (3 files in 2 dirs): [MRG] Automatic merge, branches/7.x 34628 to 34635 | [21:01] |
| luciash | done ;) | [21:01] |
| jonnyb | yay!
welcome to the club | [21:01] |
| luciash | heheh
eazy peazy | [21:02] |
| jonnyb | until you get a conflict | [21:02] |
| luciash | 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 | [21:03] |
| ...... (idle for 29mn) | ||
| jonnyb | done for today - more tomorrow... | [21:35] |
| *** | jonnyb has quit IRC (Quit: I am going outside... I may be some time...) | [21:35] |
| CIA-87 | tikiwiki: 03marclaporte * r34637 10/trunk/lib/userslib.php: proper feature checks on permissions | [21:40] |
| *** | therafost has joined #tikiwiki | [21:42] |
| therafost | er.. hi?
!help | [21:42] |
| Tiki|bot | You can get a more complete list of commands that work with this bot at http://tiki.org/TikiBot . | [21:43] |
| therafost | [hello]
[anyone there?] | [21:45] |
| luciash | hi therafost | [21:47] |
| *** | radek82 has quit IRC (Quit: Leaving) | [21:47] |
| CIA-87 | 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 | [21:59] |
| 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 | [22:07] | |
| .... (idle for 17mn) | ||
| tikiwiki: 03marclaporte * r34641 10/trunk/lib/userslib.php: proper feature checks on permissions | [22:24] | |
| therafost | Hi folks - I have a tikiwiki problem with wiki syntax help on my forums - how do I stop it showing? Anyone know? | [22:26] |
| luciash | how does it show ? | [22:27] |
| *** | nkoth has quit IRC (Quit: nkoth) | [22:27] |
| therafost | 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 | [22:28] |
| luciash | hmm, what tiki version ? | [22:28] |
| therafost | 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 | [22:29] |
| luciash | 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 | [22:32] |
| therafost | I probably could but I'm scared to update - struggling enough with this without trying to figure out a whole new version lol | [22:34] |
| luciash | do u want to hide it completely or only collapse the expanded help section ? | [22:35] |
| therafost | 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 | [22:35] |
| luciash | 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 | [22:37] |
| therafost | just checking...
there's a box for Edit CSS | [22:37] |
| luciash | ok, that's something else ...
r u ok to edit one file on your server ? styles/darkroom.css is the one | [22:41] |
| therafost | will have a go my friend | [22:42] |
| luciash | 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} | [22:42] |
| therafost | ok - I just copy that to the end of the file... | [22:44] |
| *** | nkoth has joined #tikiwiki | [22:45] |
| Tiki|bot | 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 | [22:45] |
| therafost | 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? | [22:48] |
| luciash | nope, one folder up
styles/darkroom.css file that's your theme file | [22:49] |
| therafost | ha ha I can see it cheers...
Think I've done it... so I'll just take a look... | [22:50] |
| luciash | if u want to do the same with the Wiki help bar, add this there as well: .help_section_select {display: none} | [22:54] |
| therafost | My friend - I think you are a genius... | [22:54] |
| luciash | :D | [22:54] |
| therafost | not sure what you mean on this one? is it the green plus sign bit ? | [22:55] |
| luciash | not at all, just little experienced ...
yes it is now useless when you want the help hidden completely | [22:55] |
| therafost | 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... | [22:56] |
| luciash | np, u r welcome | [22:56] |
| therafost | I'm off to bed and i will now be able to sleep thanx to u cheers and goodnight my friend | [22:57] |
| luciash | nite nite | [22:57] |
| *** | therafost has quit IRC (Quit: Page closed) | [22:58] |
| .... (idle for 19mn) | ||
| Tiki|bot | New Forum Posts: Link or include an article in another article - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=41351 | [23:17] |
| ←Prev date Next date→ Show only urls | (Click on time to select a line by its url) |