marclaporte: joined #tikiwiki CIA-36: tikiwiki: 03robertplummer * r41228 10/branches/9.x/lib/core/JisonParser/ (Wiki.jison Wiki.js Wiki.php): [FIX] A few oddities with stealing newline characters, added whitespace, doubling speed again, now we are as fast or faster than the old parser with reasonable output results. -: Jyhem gives up on th tracker items categories :-( No idea how this accessors things are created.
marclaporte sends positive waves to jyhem
Jyhem too tired and wasted too much time. Plus, as you say, i may have misunderstood how it's meant to work goj_killedByISP: joined #tikiwiki Tiki|bot: New Forum Posts: SSL/HTTPS not working - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=6&comments_parentId=43914
New Forum Posts: Error in size of text anchor links - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=3&comments_parentId=43907
New Forum Posts: User registration form with Trackers: no Username shown... - http://suite.tiki.org/tiki-view_forum_thread.php?forumId=6&comments_parentId=43885
New Forum Posts: SSL/HTTPS not working - http://tiki.org/tiki-view_forum_thread.php?forumId=6&comments_parentId=43914
New Forum Posts: Error in size of text anchor links - http://tiki.org/tiki-view_forum_thread.php?forumId=3&comments_parentId=43907
New Forum Posts: User registration form with Trackers: no Username shown... - http://tiki.org/tiki-view_forum_thread.php?forumId=6&comments_parentId=43885 CIA-36: tikiwiki: 03lindonb * r41229 10/branches/9.x/templates/tiki-view_articles.tpl: Check that topic image exists first and check variables that are never set in tiki-view_articles (only set when called from plugin articles) arildb: joined #tikiwiki Tiki|bot: Recent Bug: Tracker item: #4207 - - maketoc problems on dev.tiki.org - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=4207 redflo: joined #tikiwiki CIA-36: tikiwiki: 03changi67 * r41230 10/branches/9.x/db/tiki.sql: [FIX] Correct declaration to be the same as the upgrade script
tikiwiki: 03changi67 * r41231 10/branches/8.x/db/tiki.sql: [BP/41230][FIX] Correct declaration to be the same as the upgrade script ricks99: joined #tikiwiki
polom y'all CIA-36: tikiwiki: 03ricks99 * r41232 10/branches/9.x/templates/tiki-install.tpl: [ENH]Prompt users to subscribe to newsletter or RSS feed in order to stay up-to-date and receive notification of new releases. More details http://dev.tiki.org/Update+notifier
tikiwiki: 03ricks99 * r41233 10/trunk/templates/tiki-install.tpl: [ENH] forward port of r41232. Prompt users to subscribe to newsletter or RSS feed in order to stay up-to-date and receive notification of new releases. More details http://dev.tiki.org/Update+notifier
tikiwiki: 03changi67 * r41234 10/branches/9.x/web_config: [REL] Sync htaccess and web_config changi|away: polom CIA-36: tikiwiki: 03changi67 * r41235 10/branches/9.x/lib/setup/twversion.class.php: [REL] Preparing 9.0alpha
tikiwiki: 03changi67 * r41236 10/branches/9.x/README: [REL] Update README file for 9.0alpha
tikiwiki: 03changi67 * r41237 10/branches/9.x/lang/ (49 files in 49 dirs): [REL] Update language.php files for 9.0alpha RobertPlummer: joined #tikiwiki
polom all changi|alpha: ricks99: Changelog updated with 805 new commits (revision 41232 to 39913), excluding duplicates, merges and release-related commits. CIA-36: tikiwiki: 03changi67 * r41238 10/branches/9.x/changelog.txt: [REL] Update changelog.txt for 9.0alpha changi|alpha: ricks99: Copyrights updated: +10 contributor(s), +2101 commit(s) RobertPlummer: changi|alpha: So the alpha is coming soon? CIA-36: tikiwiki: 03changi67 * r41239 10/branches/9.x/copyright.txt: [REL] Update copyright.txt for 9.0alpha changi|alpha: RobertPlummer: yes, should i stop ? :) RobertPlummer: Go, go, go!
changi|alpha: Don't let me stop you. ricks99: +1 marclaporte: RobertPlummer: any idea about https://trunkdev.tiki.org/Keywords (plugins no longer validated) changi|alpha: marclaporte: and unable to be validate RobertPlummer: It doesn't validate at all?
It doesn't let me login. CIA-36: tikiwiki: 03changi67 * r41240 10/branches/9.x/db/tiki-secdb_9.0_mysql.sql: [REL] SecDB for 9.0alpha marclaporte: That is another problem I noticed, which I thought was caused by upgrade issue RobertPlummer: marclaporte: but? marclaporte: maybe there are hints in upgrade error messages changi|alpha: RobertPlummer: retry RobertPlummer: cooking...
I'm in!
Ok, it can be approved. changi|alpha: RobertPlummer: yes, it's working, sorry RobertPlummer: There is something not being decoded right in the installer, I'm taking a look at it right now. CIA-36: tikiwiki: 03changi67 * r41241 10/tags/9.0alpha/: [REL] Tagging release changi|alpha: RobertPlummer: it's the one on trunkdoc that i can't approve
RobertPlummer: button are not displayed marclaporte: maybe because page is cached changi|alpha: _tiki.sql SUFFIX => OK
DROP TABLE => OK
STRUCTURE => OK
MyISAM => OK
CDN => OK
SEFURLs => OK
External LINKS => OK marclaporte: changi -> "eye of the eagle" ! RobertPlummer: where is that from? changi|alpha: RobertPlummer: pre check before doing a release :) RobertPlummer: I thought it might have been a reference to Rocky the movie.
But then I remembered "Eye of the __Tiger__". changi|alpha: RobertPlummer: you need to sleep :) RobertPlummer: :) changi|alpha: marc is saying that because i hate database diff, especially in upgrade RobertPlummer: wow, how is that done?
don't say meld, lol. radek82: joined #tikiwiki changi|alpha: meld ? RobertPlummer: its an app in linux changi|alpha: no, it's not meld, but a mix between shell script and vimdiff
9.0alpha local test => OK
upload in progress RobertPlummer: woohoo
I'm on the conversion script. changi|alpha: upload finished, download on sf.net and test please
marclaporte: !
RobertPlummer: !
ricks99: ! CIA-36: tikiwiki: 03changi67 * r41242 10/branches/9.x/lib/setup/twversion.class.php: [REL] Rename version for next release changi: alpha is packaged ricks99: thanks changi!
anyone know, what's the status of a 6.8LTS and 8.4? -: ricks99 thinks it would be useful to have one last 8.x (as 8.4) before 9.0 changi: ricks99: can do it now if you want ricks99: +1... anyone else mind? arildb: 8.4...yes, please! ricks99: anyone from quality team online? comments about 8.4 & 6.8LTS? changi: 1 left, and the quorum will be ok marclaporte: +1 to 8.4 changi: marclaporte: thx marclaporte: for 6.8: I what is the diff of commits between proposals and official branch?
hahahah changi|8_4! changi|8_4: marclaporte: i can use 8.4 so 8_4 is better than nothing :) CIA-36: tikiwiki: 03changi67 * r41243 10/branches/8.x/lib/setup/twversion.class.php: [REL] Preparing 8.4 release changi|8_4: s/can/can't/ CIA-36: tikiwiki: 03changi67 * r41244 10/branches/8.x/README: [REL] Update README file for 8.4
tikiwiki: 03changi67 * r41245 10/branches/8.x/lang/ (49 files in 49 dirs): [REL] Update language.php files for 8.4 changi|8_4: ricks99: >> Changelog updated with 151 new commits (revision 41231 to 39559), excluding duplicates, merges and release-related commits. CIA-36: tikiwiki: 03changi67 * r41246 10/branches/8.x/changelog.txt: [REL] Update changelog.txt for 8.4 changi|8_4: ricks99: >> Copyrights updated: +7 contributor(s), +1828 commit(s) CIA-36: tikiwiki: 03changi67 * r41247 10/branches/8.x/copyright.txt: [REL] Update copyright.txt for 8.4 ricks99: the 9.0alpha .zip and .7z files cleanly installed for me. great work all! CIA-36: tikiwiki: 03changi67 * r41248 10/branches/8.x/db/tiki-secdb_8.4_mysql.sql: [REL] SecDB for 8.4
tikiwiki: 03changi67 * r41249 10/tags/8.4/: [REL] Tagging release
tikiwiki: 03arildb * r41250 10/trunk/tiki-setup_base.php: [FIX] Check if the pref ids_enabled is set before comparing, to get rid of warning ricks99: changi|8_4: if possible, can you provide some basic stats (# of comments, # of contributors) for 8.4 and 9.0? changi|8_4: just look in the irc logs :)
you should found what you need ricks99: ah... tx! changi|8_4: ricks99: as usual, i now put all those information on irc to be sure you get it :) ricks99: you da' man! CIA-36: tikiwiki: 03lphuberdeau * r41251 10/branches/9.x/lib/wiki-plugins/wikiplugin_appframe.php: [MOD] Adding additional condition supported in appframe/cond changi|8_4: 8.4 local test => OK
upload finished, download on sf.net and test please CIA-36: tikiwiki: 03changi67 * r41252 10/branches/8.x/lib/setup/twversion.class.php: [REL] Finishing 8.4 release ricks99: changi: i see 9.0 stats. 8.4? RobertPlummer: Ok, I think I found it guys!
Woohoo!
The plugin wasen't being unprotected just before the fingerprint is being generated. changi: ricks99: icks99: >> Changelog updated with 151 new commits (revision 41231 to 39559), excluding duplicates, merges and release-related commits.
ricks99: Copyrights updated: +7 contributor(s), +1828 commit(s) RobertPlummer: So '<' would look like '~REAL_LT~' ricks99: thhanks again! chibaguy: joined #tikiwiki
polom changi: RobertPlummer: how do you fix that ? RobertPlummer: working on it right now.
I believe I have it, it is a 1 liner too.
Restoring db for a quick re-test.
hey guys, I get a white screen "An error occurred while performing the request". How do I check to see what the error is? jonnyb: joined #tikiwiki
pol or om? It's your choice... RobertPlummer: only half today? jonnyb: feeling mean!
get the rest tomorrow (or yesterday?) RobertPlummer: think I found the bug that is leading to some plugins not being validated. jonnyb: i found an odd one too - if you paste stuff into wysiwyg source mode, then save, it saves the parsed version! :( At least of disabled plugins...
might be causing all sorts of trouble elsewhere i think RobertPlummer: told you, url encoding is what should be used there.
as soon as you start messing with entities, it is trouble.
but you know it better than me, I digress. jonnyb: not sure what that's got to do with it saving parsed stuff... but i do agree, it's just not a change to make now RobertPlummer: The problem is in the conversion I think, back and forth from the system before it can save it. jonnyb: anyway, it should be json and stuck on the data attributes now, i think - mucho safer RobertPlummer: YES!
But isn't that yet another conversion? jonnyb: nope, it's my plugins_remove function to allow plugins to filter themselves... RobertPlummer: It should all be in wiki syntax and only output should be show. jonnyb: that's another big vote for me rewriting properly now RobertPlummer: what you see should be a reflection of the source, not actual. jonnyb: are you talking about tiki 10? (lost me i'm afraid) RobertPlummer: quasiwig :)
Yea, just wishful thinking. jonnyb: we have wiki wysiwyg, just needs finishing some more
done a merge recently? it'll need the version manually reverting due to the release (for which thanks changi!) RobertPlummer: I have not done one this morning. no. jonnyb: :) RobertPlummer: I'm busy restoring over and over demo.t.o on my local to fix the html entities converter jonnyb: ah, nice
i'll do one later - btw, where is your converter? need to frob some code RobertPlummer: frob?
lib/wiki/wikilib.php jonnyb: ah, thx - was in the wrong file RobertPlummer: I ran the installer after a restore of demo.t.o and users_users dir goes away, whats up with that? jonnyb: frob is sort of rob with an f in front of it which now you ask i have no idea why :)
you mean table i guess? not good RobertPlummer: typo? -: ricks99 needs to add "frob" to his Tiki glossary :) jonnyb: hi ricks99 :) i think i originally heard it last century sometime, so i don't think it's just me - seems fitting for "borrowing" code ricks99: hiya jonnyb jonnyb: RobertPlummer: did chasing those notices down help? (seems unlikely to me) RobertPlummer: Not looked into it.
frob = find and rob?
users_users is there, just on second page, whew. jonnyb: :D RobertPlummer: Yea, I know. I didn't know phpmyadmin had that for table view.
Looks like it is a golden fix guys. CIA-36: tikiwiki: 03robertplummer * r41253 10/branches/9.x/lib/parser/parserlib.php: [FIX] Html entities weren't being unprotected when plugin needed fingerprint, unprotected to fix RobertPlummer: changi: When is the next go around with trunkdev.tiki.org being restored and svn'ed up? jonnyb: well done RobertPlummer - nice catch benoitg: joined #tikiwiki RobertPlummer: jonnyb: My objections with wysiwyg editor is that it is very buggy, and I'm not sure it ever could be feasible to have it work completely with modern browsers the way they are. Html to 2 browsers is not the same on another. It causes problems when you are constantly converting back and forth from html to wiki syntax. After I make more progress with ForwardLink protocol I have funding for the new parser and quasiwig. If ther
e is ample time, I would like to start migrating towards it.
jonnyb: I'll say that quasiwyg is a stretch and nowhere near alpha, but please don't discount the idea that it is a migration path from wysiwyg. jonnyb: that's more or less what i thought when replacing fckeditor 2, and it ended up being so over complicated, but tiki does that sometimes
trying to do the visual representations of plugin output was a mistake i think now - should have used a simple ckeditor "fake entity" image to represent them RobertPlummer: I understand, good point. But think about this, modern wysiwyg editors are already flawed because they rely on the browser to talk back and forth between the user and the system. In quasiwyg you tell the browser to shut up and server, nothing else. jonnyb: also it would be an idea to have the option of using other wysiwyg editors (tinymce seems a lot simpler) RobertPlummer: tinymce seems to have better documentation too. But doesn't have as good functionality(?) jonnyb: hmm, don't quite follow - the browser still has to render the html, that's all they do surely? RobertPlummer: (i don't know, I've not used it)
right, the browser just renderes (or serves) the user with the output of their wiki syntax. jonnyb: werdpress uses it, but no wiki syntax - seems lighter and feels more stable
so what's the difference with that and out current htmltowiki mode? RobertPlummer: That like saying "all the wiki, with none of the wiki". jonnyb: (apart from the html conversion to wiki being a bit lacking?) RobertPlummer: The html comes from the qysiwyg editor, no?
sorry, slipped, wysiwyg jonnyb: no, ckeditor just gets html changi: RobertPlummer: 18 :)
RobertPlummer: i can do it now if you want RobertPlummer: But you have to convert wiki to html and then back.
changi: Lets do it!
I don't want to do any converting, I want wiki syntax with a real time out put of it. jonnyb: RobertPlummer: yes - i don't see how you can not if you want wiki in the database
ckeditor does do some reformatting and sort of purifying in the browser, no way to stop it afaik RobertPlummer: jonnyb: Have you seen the demo in lib/core/JisonParser/Wiki/Demo.html? changi: RobertPlummer: in progress
jonnyb: hi jonnyb: hi changi RobertPlummer: Imagine the 2 controls, but rather than side by side, the output (which is on the right) on top of the textarea (on the right).
The preview then becomes the edit area, the user knows no different.
but when you go to save, there is no converting of anything to anything, you already have source, just grab it from the textarea.
jonnyb: You follow?
jonnyb: If you look at the demo, it would be much easier to understand. jonnyb: you mean lib/core/JisonParser/Wiki/Test.html? RobertPlummer: yup
Right now I think line breaks aren't working, but it is just a proof of concept. jonnyb: no, still don't get it - you mean the preview can be editable? RobertPlummer: EXACTLY! jonnyb: how? RobertPlummer: Textarea is buggy, right? jonnyb: which one? block.textarea.php? RobertPlummer: We will use codemirror as a platform for integrating one with the other. benoitg: joined #tikiwiki RobertPlummer: you see textarea is buggy between browsers, it is hard to select text, find the carat, past text or remove text, but codemirror has a whole api for that.
By using codemirror + a parser + some javascript to tie them together, we simplify the process of wysiwyg. jonnyb: personally i find codemirror less stable than the webkit one
sounds worth a go i guess RobertPlummer: less stable than textarea cross browser?
(that is a nasty can of worms)
If there was an easier platform to modify textareas without using codemirro I'm open to it, we just need a way to modify text for the end user. jonnyb: you mean IE i guess - yes, selection tracking is a contsant thorn RobertPlummer: Anyway, that is the plan, I hope to start making progress with it by the mid year. jonnyb: not even consistent between IE versions :P
coolio! RobertPlummer: But we will see, I have a lot to do yet with ForwardLink Protocol. CIA-36: tikiwiki: 03lphuberdeau * r41254 10/branches/9.x/lib/wiki-plugins/wikiplugin_appframe.php: [FIX] Accordion would gather too many objects at once RobertPlummer: changi: How are things looking? CIA-36: tikiwiki: 03lphuberdeau * r41255 10/branches/9.x/ (3 files in 3 dirs): [MOD] Adding configuration options to the tracker_input module RobertPlummer: changi: Restored yet? arildb: jonnyb and RobertPlummer: The new encoding of < and > seems to completely break the maketoc plugin in wysiwyg.
The reason is that the following statements never find a header: $data = preg_replace('/</([a-z]+)><h([1-6])>/im', "</\1>n<h\2>", $data);
$data = preg_replace('/^s+<h([1-6])>/im', "<h\1>", $data); // headings with leading spaces
$data = preg_replace('//><h([1-6])>/im', "/>n<h\1>", $data); // headings after /> tag changi: RobertPlummer: trunkdev is up2date arildb: in parserlib.php line2042: private function parse_data_process_maketoc( &$data, $options, $noparsed) jonnyb: hi arildb - that sounds possible - sounds like it needs "unprotecting" before matching
but i wonder why only in wysiwyg - possibly it happens in wiki pages with allowHtml on too? arildb: that could be
the check is: if ($need_maketoc && $prefs["feature_wysiwyg"] == 'y' && $prefs["wysiwyg_htmltowiki"] != 'y') { RobertPlummer: arildb: Be careful there, that as a nasty nasty mess to get into. -: jonnyb agrees RobertPlummer: jonnyb: I honestly feel that turning off plugins inside wysiwyg would be a fix. jonnyb: i think the check should be on $is_html on the page
you can still have html wysiwyg (or not) pages when wysiwyg_htmltowiki
me too RobertPlummer: jonnyb: if you did that, and left the ability to click and edit, it would be a fix, because it would be more stable. jonnyb: quite a big change this late in the branch, no? RobertPlummer: I like the real time stuff, but not at the cost of stability.
jonnyb: Either it needs fixed one way or the other. jonnyb: but this isn't while editing is it, arildb?
that's why i suspect it would also fail on html wiki pages arildb: no, this is while displaying the page jonnyb: or am i wrong there?
thought so RobertPlummer: What is the source? jonnyb: http://dev.tiki.org/tiki-pagehistory.php?page=WYSIWYG+testing&source=0
i'm just trying to get that page working locally to investigate arildb: see parserlib.php line 2042: private function parse_data_process_maketoc( &$data, $options, $noparsed) jonnyb: that's when i found the problem with html and disabled plugins (fix for which on it's way) RobertPlummer: jonnyb: marc told me about a few things that looked like it is being html encoded to many times and not ever decoded.
draw for one doesn't look right. jonnyb: i know, he mailed me RobertPlummer: I need to head out for a bit.
be back later. jonnyb: k, cu l8r marclaporte: joined #tikiwiki CIA-36: tikiwiki: 03gta74 * r41256 10/branches/8.x/lang/de/language.php: [TRA] full translation Tiki|bot: Recent Bug: Tracker item: #4208 - - Category field does not handle 0 as Parent Category - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=4208 jonnyb: wysiwyg preview seems broken again :( arildb: yes, it does jonnyb. It was working after your "session". Hopefully the just released 9.0 version is OK jonnyb: seems to be only when you stick the preview in the popup window, think i know why... CIA-36: tikiwiki: 03jonnybradley * r41257 10/branches/9.x/lib/parser/parserlib.php:
tikiwiki: [FIX] parser: Change the plugin_remove function to use WikiParser_PluginMatcher instead of parse_first.
tikiwiki: Fixes an issue on html pages when saving markup containing disabled plugins (the "Plugin disabled" remarksbox was getting saved in the page).
tikiwiki: Also, will be *much* cheaper to process as parse_first executes all the plugins as well. jonnyb: changi: collation fix just ran for me locally - all seems fine, thx changi: jonnyb: nice to hear that
jonnyb: i was thinking limitting the table to name for those who are using shared hosting jonnyb: how do you mean? changi: limit table names to tiki_ messu_ users_ jonnyb: ah right - yes, that would be polite :)
(not that the other charset ones do, do they?) changi: no they don't:)
we are little brutal with that arildb: jonnyb: in parserlib create_page, $parserlib->plugins_replace($data, $noparsed); is called after calling HTMLPurifier. Shouldn't that be $parserlib->plugins_replace($data, $noparsed, truel); ? changi: arildb: i love the truel :) arildb: :-) true..of course jonnyb: true for html you mean arildb? arildb: jonnyb: It's only called for html jonnyb: i thought it was (maybe i only fixed the update_page one) arildb: ok for update_page
changi: btw. I downloaded and installed 8.4...looks good jonnyb: arildb: yes, you're right - update_page got done but not create changi: arildb: thx nkoth|nelson: joined #tikiwiki
anyone else noticed that admin panel Save Changes button has gone missing in 9.x? jonnyb: hi nkoth|nelson - what all of them? nkoth|nelson: yes, all of them jonnyb: which theme? fine in jqui nkoth|nelson: wait, ot's back jonnyb: :) nkoth|nelson: strange arildb: jonnyb: Are you fixing create_page, or should I? jonnyb: arildb: please do if you're on it, thanks arildb: will do CIA-36: tikiwiki: 03eromneg * r41258 10/branches/9.x/ (lib/setup/error_reporting.php templates/footer.tpl): [FIX] error reporting 'leak' to main page content for particular E_USER_NOTICE. Add extra logic to error_reporting.php and additional conditions for showing the error button in footer.tpl Tiki|bot: Recent Bug: Tracker item: #4209 - - Only first-level categories can be selected for categorizing a tracker - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=4209 nkoth|nelson: I see, the missing save button is onlly in Admin ...community CIA-36: tikiwiki: 03arildb * r41259 10/branches/9.x/lib/tikilib.php: [FIX] plugins_replace must use is_html = true for create_page, when html is processed jonnyb: odd - i have one (says Change preferences) - two, in fact! nkoth|nelson: I have a css problem CIA-36: tikiwiki: 03jonnybradley * r41260 10/branches/9.x/ (lib/ajax/autosave.js tiki-auto_save.php): [FIX] preview: Fix preview display in popup window for html/non-html pages in both editors. Also fix url_decode for page names
tikiwiki: 03lphuberdeau * r41261 10/branches/9.x/ (4 files in 3 dirs): [MOD] Allowing to redirect upon successful insert
tikiwiki: 03lphuberdeau * r41262 10/branches/9.x/lib/wiki-plugins/wikiplugin_appframe.php: [FIX] Accordion, again ricks99: anyone.... RSS feed for tiki calendar (http://info.tiki.org/tiki-calendar_rss.php is gone :( eromneg: joined #tikiwiki jonnyb: ricks99: shouldn't it be feed://info.tiki.org/tiki-calendars_rss.php (also doesn't seem to be doing anything tho)
ah, just slow... ricks99: hmm...
link from admin page is "calendar"
info running 6.LTS
too bad changi just built 6.8 this morning :(
wonder if it is wong in other versions... jonnyb: stinky - probably changi: ricks99: 6.8 is not built ricks99: ah..
thx
do i commit to proposals/6? changi: ricks99: ask jonny
ricks99: i'm not in quality team jonnyb: good question - i think in theory the quality team is "resting", so both maybe? (and 9 and 8 ;) ) ricks99: 8 is done, right?
done=closed.
changi just ran the 8.4 this morning jonnyb: yes, i guess so ricks99: k. i will commit to 6.x, 9.x, and trunk -: ricks99 surprised that it wasn't found earlier... maybe he's the only one still using RSS jonnyb: you don't need to do trunk, but if you do please make sure it's exactly the same (to avoid conflicts) ricks99: exactly the same as... ? changi: ricks99: don't commit in trunk, easier :)
jonny will be pleased to merge it :) ricks99: lol jonnyb: exactly the same including white spaces, case sensitive etc ricks99: good thing most of my sites are all 6.x LTS :) jonnyb: i'll do a merge in a minute CIA-36: tikiwiki: 03ricks99 * r41263 10/branches/6.x/templates/tiki-admin_include_rss.tpl: [FIX] incorrect URL link for calendar RSS from admin page jonnyb: by the way, anyone know what the policy is now on lang file conflicts (just got some) - keeping trunk version was previous behaviour, i guess it's the same ricks99: jonnyb: ok for me to commit to 9.x?
language, yes, keep trunk jonnyb: yes please :)
thanks ricks99 CIA-36: tikiwiki: 03jonnybradley * r41264 10/branches/9.x/lib/parser/parserlib.php: [FIX] wysiwyg: No longer need to encode entities for plugin output ricks99: ahhh.. it was correct in 9
cool
and... it will b in 6.8 :-) -: ricks99 happy arildb: joined #tikiwiki changi: ricks99: you don't need much to be happy
:) ricks99: nope... just a working rss link. :) changi: ricks99: you want me to update info.tiki.org ? ricks99: pls do. tx changi: ricks99: will have no effect, it's based on proposals.
could you commit it there ? ricks99: sure thing... jonnyb: er... ricks99? I think we should still be doing the same discipline of backporting things to 6.x from 9.x/trunk even if we're not using proposals
did you do it in 9.x (maybe i missed it)
was waiting to do a merge... CIA-36: tikiwiki: 03ricks99 * r41265 10/branches/proposals/6.x/templates/tiki-admin_include_rss.tpl: [[FIX] incorrect URL link for calendar RSS from admin page. Backport of 41263 ricks99: jonnyb: was already correct in 9.
was only broken in 6 jonnyb: oh right, jolly good :) changi: ricks99: done :) jonnyb: (but strange) ricks99: possibly something that got fixed a while back, but forgot to backport.
thnx changi Tiki|bot: Recent Bug: Tracker item: #4210 - - Plugin Lastmod - http://dev.tiki.org/tiki-view_tracker_item.php?trackerId=5&itemId=4210 CIA-36: tikiwiki: 03jonnybradley * r41266 10/branches/9.x/lib/parser/parserlib.php: [FIX] wysiwyg: Un, then re-protect special chars when parsing html headings for maketoc (thanks arildb) jonnyb: by the way arildb - you need to use double quotes on maketoc to get the title to work - i tried to fix the regexp for ages, couldn't get it (this time) arildb: ok. does it work OK with double quotes?
there is also another bug in maketoc. (as you can see on the wysiwyg testing page). If the header contains another tag, maketoc fails to parse it. The first header contains a <br>. Thus missed.
trying to change to double quotes jonnyb: best of luck! :) arildb: :-) ...was hoping you had time, but jonnyb: :) arildb: double quotes OK CIA-36: tikiwiki: 03jonnybradley * r41267 10/trunk/ (100 files in 72 dirs):
tikiwiki: [MRG] Automatic merge, branches/9.x 41183 to 41266
tikiwiki: Fixed lang file conflicts using "mine-conflict" jonnyb: by the way arildb, the line height thing is due to the body definition in most of the css files: font: 76%/1.5em - seems better with font: 76%/150% but i'm not sure about this, let's ask chibaguy when he's about? arildb: I wouldn't worry too much about that one. I am not bothered by it. It's just a part of the test. However, if there is a fix. that's better jonnyb: likewise Tiki|bot: New Forum Posts: Optimizing Search Results - http://tiki.org/tiki-view_forum_thread.php?forumId=4&comments_parentId=43933 -: changi watching London Boulevard _qP: joined #tikiwiki -: jonnyb googles jonnyb: at least it has http://www.imdb.com/name/nm0461136/ in it :P -: jonnyb curses Mac OS copy and paste... jonnyb: Keira Knightley i meant
Oh, i do like phpstorm! i just (by mistake) asked it to do a full diff preview of the last merge to trunk and it ran out of RAM, but offered me a dialog to raise it which worked like a charm (so much nicer than having to hack the ini file as in eclipse/aptana) nkoth|nelson: jonnyb: so f I have a fix is it enough that I commit only to 9.x (are you runnning the automatic merges?) arildb_: joined #tikiwiki jonnyb: yes please - all seems to be going ok so far (famous last words ;) ) CIA-36: tikiwiki: 03nkoth * r41268 10/branches/9.x/lib/filegals/filegallib.php: [FIX] transform image as long as there is max width or height marclaporte: joined #tikiwiki benoitg: joined #tikiwiki jonnyb: hi marclaporte here too :) arildb: jonnyb: The maketoc fix seems to work in 9.x, but not in trunk. It displays the test headers as: !head 1 !!head 2 !head 1a CIA-36: tikiwiki: 03lphuberdeau * r41269 10/branches/9.x/lib/core/Tracker/Field/GeographicFeature.php: [FIX] Typo arildb: any idea? CIA-36: tikiwiki: 03lphuberdeau * r41270 10/branches/9.x/lib/core/Tracker/Field/ItemLink.php: [NEW] Adding an option to index field from the remote tracker when using item link jonnyb: ik, nasty - a merge failure? arildb: I am having problems getting the full download from SVN (seems to always fail somewhere in the externals sync)...So, the error may be on my side.
The source for my test is: <p> {maketoc}</p> <h1> head 1</h1> <h2> head 2</h2> <h1> head 1a</h1>
If you have a trunk installation maybe you have time to create a test page?
Resulting display in trunk is: !head 1 !!head 2 !head 1a jonnyb: actually wrestling with a WSoD on trunk here at the moment! :) will try and check it when/if i get it working... arildb: ok, thanks jonnyb: i did notice that <hn> tags get "de-parsed" to wiki syntax in there and was a bit surprised it works at all - the maketoc code is pretty old (and mysterious) arildb: ah...maybe the html flag is missing? RobertPlummer: back
jonnyb: what is the status with parser? jonnyb: looking good, i think
could be arildb RobertPlummer: I tested up changes to the parser for plugin fingerprint, and it still looks like it might be broken.
Have you had any problems? jonnyb: RobertPlummer: arildb is having fun with maketoc in html pages RobertPlummer: Having fun, or going mad? arildb: we are getting there slowly.... RobertPlummer: (from the 3rd person they can look the same) arildb: The html flags look ok jonnyb: i'm in trunk at the mo - finding IDS_Monitor causing issues
arildb: that bit should be the same in 9.x and trunk - must be another difference somewhere RobertPlummer: ok, so I will keep working on this fingerprint issue. arildb: jonnyb: yes, I think you are right jonnyb: i'll try a diff on parserlib RobertPlummer: arildb: What is the problem with maketoc? jonnyb: no, not parserlib arildb: works ok in 9.x, but in trunk, using <p> {maketoc}</p> <h1> head 1</h1> <h2> head 2</h2> <h1> head 1a</h1>...produces !head 1 !!head 2 !head 1a jonnyb: after maketoc messes with the headings get shown as wiki syntax RobertPlummer: sounds like a ~np~ issue. CIA-36: tikiwiki: 03jonnybradley * r41271 10/trunk/ (db/ids_config.ini tiki-setup_base.php):
tikiwiki: [FIX] phpids: Doesn't seem to like the themegen cookie (as it can have "closed" in it?)
tikiwiki: Also show some sort of error message when a request has been prevented instead of a WSoD RobertPlummer: I think I see a potential issue in the plugins args, they aren't being decoded before the check of fingerprint.
This is in the conversion script. arildb_: joined #tikiwiki RobertPlummer: jonnyb: I'm trying some new stuff with the script, it just isn't working in some cases.
jonnyb: I'm not sure if it is an encoding problem (!= utf8) or what. jonnyb: yum, sounds like fun (fading here, will catch up tomorrow) RobertPlummer: jonnyb: I've moved from htmlspecialchars_decode to html_entity_decode, trying an upgrade right now on demo.t.o. redflo: joined #tikiwiki RobertPlummer: jonnyb: Or maybe the first one needs to be htmlspecialchars_decode and the second one needs to be html_entity_decode arildb: I just sync'd with trunk. When trying to access Tiki, I get: "Request prevented" jonnyb: arildb: i just lost an hour or 2 with that - it's some new security stuff :(
before r41271 you just got a white page arildb: how do I get Tiki started again? jonnyb: can you debug? arildb: so, this is an improvement :( ...yes, I can debug..will try jonnyb: you could try deleting all your cookies for a start arildb: ok jonnyb: i found the themegen cookie was triggering it, but it uses the php session so store "hits" so maybe a new session (i.e. cookie) will clear it arildb: worked !!! Thanks jonnyb jonnyb: grand arildb_: joined #tikiwiki RobertPlummer: jonnyb: Is it possible that some plugins are 3 times html encoded?
I'm forcing html double decoding and seeing if that does the trick, if it doesn't then it could be 3 times encoded. pkdille: joined #tikiwiki
joined #tikiwiki CIA-36: tikiwiki: 03pkdille * r41272 10/branches/9.x/lib/ (parser/parserlib.php tiki-js.js): [FIX] showhide parameter of maketoc. Collateral damage of r24793