CIA-36: tikiwiki: 03jonnybradley * r41543 10/trunk/ (72 files in 66 dirs):
tikiwiki: [MRG] Automatic merge, branches/9.x 41500 to 41541
tikiwiki: Tree conflict on templates/tracker/update_item.tpl marked resolved (please check and avoid in future ;)
nkoth|nelson: left #tikiwiki
CIA-36: tikiwiki: 03jonnybradley * r41544 10/branches/9.x/lib/wiki/wikilib.php: [FIX] convertToTiki9: Change static calls to to instances on functions that use $this (TikiLib::genPass is still wrong but doesn't seem to generate a notice and $tikilib not available in installer)
tikiwiki: 03jonnybradley * r41545 10/branches/9.x/lib/parser/parserlib.php: [FIX] parser: Notices
tikiwiki: 03jonnybradley * r41546 10/branches/9.x/lib/payment/cartlib.php: [FIX] cart: Notices
tikiwiki: 03jonnybradley * r41547 10/branches/9.x/lib/wiki-plugins/wikiplugin_convene.php: [FIX] convene: Notices (only partially successful)
goj_killedByISP: joined #tikiwiki
rodrigoprimo: joined #tikiwiki
marclaporte: joined #tikiwiki
CIA-36: tikiwiki: 03nkoth * r41548 10/branches/9.x/lib/smarty_tiki/function.payment.php: [FIX] Translations not changing on language switching because cached version of templates has no lang prefix
mealstrom: joined #tikiwiki
xavi1: joined #tikiwiki
com_cy: joined #tikiwiki
redflo: joined #tikiwiki
Jyhem_laptop: joined #tikiwiki
Jyhem_laptop_: joined #tikiwiki
com_cy: joined #tikiwiki
Jyhem_laptop: polom
rodrigoprimo: joined #tikiwiki
RobertPlummer: joined #tikiwiki
polom all
Jyhem_laptop: joined #tikiwiki
xavi1: left #tikiwiki
Caarrie|away: joined #tikiwiki
radek82: joined #tikiwiki
jacmoe: joined #tikiwiki
arildb: joined #tikiwiki
sandroandrade: joined #tikiwiki
Bsfez: joined #tikiwiki
polom
RobertPlummer: polom
Bsfez: Hey robert great work you are producing with the team…
benoitg: joined #tikiwiki
Bsfez: (sry i was fighting with WYSIWYG and Visual Wiki) :)
benoitg: joined #tikiwiki
CIA-36: tikiwiki: 03yonixxx * r41549 10/branches/9.x/templates/tiki-edit_submission.tpl: [FIX]moved the antibot section so the buttons at the bottom keep being together
benoitg: joined #tikiwiki
Jyhem_laptop: polom RobertPlummer
RobertPlummer: polom Jyhem_laptop
grundsch: joined #tikiwiki
Hi there! I'm looking for an admin to do the "ceremony" to get commit access: I have a small bugfix that I've been asked to commit directly.
arildb: changi: can you look at the request from grundsch
..or sylvieg ... luciash ?
grundsch: :-)
arildb: grundsch: ...just give it a little time. Someone should come around
grundsch: fine for me!
arildb: Jyhem_laptop: can you help grundsch ?
-: Jyhem_laptop should be able. I just never did it before. let me look around
grundsch: thanks!
-: Jyhem_laptop figured it out! :-)
Jyhem_laptop: So, grundsch, do you know the three rules ?
grundsch: I think I do, I've read them somewhere on the wiki... ;-)
yep: respecte environment, commit early, commit often , and make it optional!
Jyhem_laptop: Good! Do you understand them ?
grundsch: ah, thats' a more tricky question, but I think so:
repsect environment: get feedback first, do not go like crazy, consider the large user base, ...
Jyhem_laptop: Well, if something is unclear, now is the opportunity to ask :)
grundsch: commit early/often: I'm less used to it, and I'm not planning to develop large chunk of code... so I hope not to have to use it
Jyhem_laptop: Yes, also, avoid breaking stuff other people use
grundsch: make it optional: looks basically as a good idea, will try! (but for the moment, mycommit will be a bugfix, not optinal :-)
Jyhem_laptop: It's about not waiting for everything to be perfect first (it never is).
grundsch: ok
Jyhem_laptop: and small chunks are easier to review
grundsch: ok, makes sense
Jyhem_laptop: what is your sourceforge nickname ?
grundsch: grundsch
:-)
Jyhem_laptop: Done!
grundsch: great! thanks a lot!
Jyhem_laptop: welcome grundsch !
grundsch: Thank you! Hope to be able to bring my small participation to this great project!
Jyhem_laptop: so now you have commit access. I'm glad you can participate
grundsch: yep! Now I need to read the rest of the "howto" before my first commit!
Jyhem_laptop: :)
grundsch: If I get stuck, I will allow myself to ask here, ok?
Jyhem_laptop: That's one of the purposes of this irc channel, yes
grundsch: ok, cool!
Jyhem_laptop_: joined #tikiwiki
RobertPlummer: grundsch: We look forward to working with you.
CIA-36: tikiwiki: 03nkoth * r41550 10/branches/9.x/lib/smarty_tiki/function.html_body_attributes.php: [FIX] tiki class should be in all pages including pages such as tiki-register, not just in section pages, otherwise it will be confused with wysiwyg and other bodys
jonnyb: joined #tikiwiki
hello_design: joined #tikiwiki
jonnyb: hot polom
RobertPlummer: jonnyb: ouch!
jonnyb: I love how you fixed the converter, I feel it was an outstanding move.
jonnyb: hi RobertPlummer
RobertPlummer: How long did it take you?
jonnyb: wasn't much fun, but needed doing
i did something similar for 6.0 i seem to recall
a couple of hours
RobertPlummer: Agreed, you were the man for the job.
I had no knowledge of how wiki was saved in the past.
jonnyb: ended up using the debugger evaluate box to mess about with the input to the fingerprint fn until i found what it used to be
RobertPlummer: Nice
CIA-36: tikiwiki: 03jonnybradley * r41551 10/branches/9.x/lib/wiki-plugins/wikiplugin_convene.php: [FIX] convene: Add icon class and size for better layout while loading
jonnyb: btw, there's still a notice in plugin convene on line 110 - can't see what's wrong
i get "Undefined offset: 1336431600" etc for each date
RobertPlummer: * jonnyb is truly the international developer man of mystery*
jonnyb: not a biggie but annoying (as i decided to try and fix it)
:D
RobertPlummer: I will see and fix.
jonnyb: some funny boolean thing i'm not seeing...
RobertPlummer: *flips open phpstorm*
jonnyb: i just love the way you can get to all the relevant files for a tiki page with so few keystrokes - i'm looking at tiki-admin_toolbars and you just need to type "tatoo" and it lists the php, tpl and js files for you (in Navigate->File...) - sweet!
RobertPlummer: :)
Makes php fun for the first time.
Ok so jonny, it is the || that is giving us fits.
If it were an && and the first most left statement is false it doesn't continue, but if it is || it continues to check.
Found a couple of them actually.
rodrigoprimo1: joined #tikiwiki
RobertPlummer: You and your warnings.
CIA-36: tikiwiki: 03robertplummer * r41552 10/branches/9.x/lib/wiki-plugins/wikiplugin_convene.php: [FIX] eliminate warnings
jonnyb: hmm, i had && at first but the logic was wrong i thought - i thought if the first part of an OR is true it didn't bother with the rest - but presumably you're right (odd thing was that the indexes it was saying weren't there, were)
-: jonnyb updates
RobertPlummer: Oh well, try it again.
Perhaps it was checking for a key as an int rather than a string?
jonnyb: thought of that - both were ints
RobertPlummer: *eyes go crossed*
jonnyb: i works, thanks! :) (sorry to waste your time)
but cleaning out notices occasionally fixes edge case bugs we hadn't spotted
Jyhem_laptop: Hi jonnyb
jonnyb: have a deep Lucene query - guessing that would be an LP thing?
hi Jyhem_laptop
Jyhem_laptop: I think I have digged out a general "self page" issue :-(
Placing a plugin into other places such as tiki-print.php or pagetab() makes pagination or column sorts all strange
http://demo.tiki.org/9x/tiki-index.php?page=trackerfilter+insert+with+appframe
david_: joined #tikiwiki
hello
Bsfez: joined #tikiwiki
david_: i havea question: does tikiwwiki have mailing lists?
CIA-36: tikiwiki: 03robertplummer * r41553 10/trunk/lib/jquery_tiki/tiki-trackers.js: [FIX] o != false, needed false
tikiwiki: 03robertplummer * r41554 10/trunk/lib/core/Feed/ForwardLink.php: [ENH] Migrated the code in keywords to be reusable, added Scientific field, Minimum Math needed, and Minimum Statistics needed editable interfaces.
changi: polom
jonnyb: polom changi
feel like a beta? :)
changi: i have one last issue
just a sec, i'm creating a wiki page on trunkdev.tiki.org with it
jonnyb: super - actual testing! :)
changi: http://trunkdev.tiki.org/changi
just have a look
RobertPlummer: you too, it's a parser issue
jonnyb: the problem is the &
:)
Jyhem_laptop: polom changi
changi: Jyhem_laptop: salut
Jyhem_laptop: i saw you yesterday at lunch time
RobertPlummer: Looks like the call to color text needs to be later.
after table?
changi: RobertPlummer: maybe, don't know
RobertPlummer: changi: Is simple wiki on?
changi: RobertPlummer: where is that ?
RobertPlummer: search admin I think.
Jyhem_laptop: Ahh, → impro. I nearly called you for coffee on the way back. But project is abit in a hurry
RobertPlummer: Anyway if it is on, it doesn't run.
changi: Jyhem_laptop: too easy to change & with et :)
CIA-36: tikiwiki: 03jonnybradley * r41555 10/branches/9.x/lib/core/Search/Index/Lucene.php: [FIX] uni-search: Filter out duplicate object hits that can creep into the index somehow
changi: jonnyb, RobertPlummer : an idea ?
jonnyb: sry - with you shortly (work)
-: Jyhem_laptop knew changi did not like simple solutions
changi: RobertPlummer: parsing table before color doesn't work
time to eat
bbl
-: Jyhem_laptop goes back home (hungry)
changi: back
jonnyb: maybe it's because ckeditor is enable but not used on this page ?
jonnyb: hi changi - i tried your table thing on my local 9.x and it worked fine
i have codemirror on, but that should only affect editing (as would wysiwyg)
is it the same on trunkdoc?
changi: i think, i have the same on my 6to9 tiki
jonnyb: trying on doc,
jonnyb: same page => same problem => :(
http://trunkdoc.tiki.org/changi
jonnyb: ew, except for entity problems (probably a copy/paste thing)
hmm, now failed - something fishy definitely happening
ok, it's something with the & chars
changi: jonnyb: definitely
jonnyb: ok, i had allow html on the local page - oops
will debug...
changi: jonnyb: think i found the problem
jonnyb: parserlib on line 52
jonnyb: oh? i was staring at line 1542 (was making my head hurt!)
-: jonnyb happily diverts to line 52
CIA-36: tikiwiki: 03yonixxx * r41556 10/branches/9.x/lang/he/language.php: [TRA] hebrew translation progress
changi: when you set html => "&" it works
:)
jonnyb: but i don't understand why, html is not enabled
jonnyb: does it break html mode? (probably)
i wouldn't touch that - house of cards (you'll end up chasing mangled entities for weeks!)
changi: jonnyb: the weird part is, is i activated html it works
jonnyb: we should ask RobertPlummer why the html for & is just & and not &
changi: RobertPlummer: !!
it does break the page when html is on
RobertPlummer: I forget why, but I believe it has to be that way.
Or at least I couldn't fix it.
jonnyb: i think the regexp on 1542 needs to be modified to cope with having these replacements in
RobertPlummer: Something with wysiwyg.
jonnyb: or we "unprotect" then reprotect either side of it
-: changi is lost with protect and unprotect things
changi: jonnyb: something is happening
i just switch off permi html and it now works
jonnyb: with the line 52 change still in?
changi: jonnyb: no i revert it
look at the page changi on dev
trunkdev sorry
jonnyb: que? how...
ah, i broke it again! :D
changi: no sorry, didn't save the file when revert was done :)
jonnyb: clicked edit to check the source and then cancel
changi: so definitily, must we activate allow_html to use & ?
jonnyb: no, we just need to fix the regexp to cope with having these ~REAL_AMP~ replacement tags in
CIA-36: tikiwiki: 03robertplummer * r41557 10/branches/9.x/lib/tikilib.php: [FIX] eliminate warnings by changing type that can be called statically
RobertPlummer: But it does deal with wyisywg, correct?
CIA-36: tikiwiki: 03robertplummer * r41558 10/trunk/lib/core/Feed/ForwardLink/PageLookup.php: [FIX] Ensure page lookup has a url before decoding it
changi: RobertPlummer: yes it's working
CIA-36: tikiwiki: 03robertplummer * r41559 10/trunk/lib/core/TikiFilter/PrepareInput.php: [NEW] Add methods to go to and from string directly and then prepair
tikiwiki: 03robertplummer * r41560 10/trunk/lib/wiki-plugins/wikiplugin_textlink.php: [FIX] Make sure date exists
jonnyb: hmm, unprotect/reprotect doesn't work as the new html tags end up encoded :(
RobertPlummer: In wysiwyg, correct?
changi: RobertPlummer: yes
RobertPlummer: jonnyb: ^
jonnyb: no, plain wiki
RobertPlummer: I'm telling you, I think that & should end up &.
You open a can of worms the other way.
it searches for '& ' correct?
changi: yes
RobertPlummer: (with space)
Is that the problem?
jonnyb: the problem is with the wiki colour tag - it uses ~ to detect the closing tag and finds ~REAL_AMP~ instead
RobertPlummer: So change those tags, they aren't anything special.
jonnyb: line 1541 of parserlib
RobertPlummer: In unprotect-reprotect
or protect-unprotect
(rather)
jonnyb: but then all the <span> tags get encoded
RobertPlummer: Make it some obscure character.
No no, I mean make ~REAL_AMP~ to like #$%REAL_AMP%$#
jonnyb: would rather just fix this little bit - don't want another month of debugging everything else
RobertPlummer: It is just simple search and replace.
redflo: joined #tikiwiki
changi: RobertPlummer: i try with "itisasimpleand"
RobertPlummer: don't work
RobertPlummer: jonnyb: Just change line 36-51 in parserlib.php, change the keys I mean.
If they are conflicting don't fix the parser, just change those keys.
changi: RobertPlummer: i did, like i said it doesn't work
RobertPlummer: Oh ok.
jonnyb: we'd need to use chars that aren't used in any other wiki tags
RobertPlummer: exactly.
jonnyb: % might be ok
RobertPlummer: %%%text%%%, you sure jonny?
isn't ^ centered?
jonnyb: that's line break...
RobertPlummer: Ah, good point.
changi: what about §
CIA-36: tikiwiki: 03robertplummer * r41561 10/trunk/lib/core/Tracker/Query.php: [FIX] I was calling static methods and shouldn't have been
jonnyb: trunkdoc is v slow...
changi: upgrade in progress
§and§ doesn't work too
jonnyb: § is used already for the unparsed plugin replacements
changi: ≤ :)
≤≥
RobertPlummer: €REAL_AMP€
jonnyb: :D
changi: RobertPlummer: lol
£REAL_AMP£ for jb
RobertPlummer: jbREAL_AMPjb
changi: RobertPlummer: doesn't work with €
RobertPlummer: is € not utf8 maybe?
jonnyb: ≤REAL_AMP≥ seems to work
CIA-36: tikiwiki: 03robertplummer * r41562 10/trunk/lib/core/Feed/ (4 files in 2 dirs): [FIX] Fixes to get rid of warnings
jonnyb: and it's symetrical :)
RobertPlummer: I like it
changi: jonnyb: not for me on trunkdev
jonnyb: are you editing in utf-8?
changi: jonnyb: yes
jonnyb: shall i commit? maybe there's another difference?
RobertPlummer: commit!
changi: jonnyb: commit
i'm proud we find the perfect caracter :)
jonnyb: it's working on dev, a closing tag was missing
jonnyb: prepare for a little conflict :)
CIA-36: tikiwiki: 03jonnybradley * r41563 10/branches/9.x/lib/parser/parserlib.php: [FIX] parser: Change the delimiters for the specialChars replacement tags to avoid conflict with wiki syntax (such as colour tags)
RobertPlummer: Did we just slide into beta?
*beta state*
changi: RobertPlummer: :)
jonnyb: the euro char was funnier, but not symetrical
RobertPlummer: If it works it works.
*jonnyb is a nut about symmetry*
jonnyb: :) :)
changi: jonnyb: (: :)
jonnyb: :D
changi: so beta ?
RobertPlummer: Funny stuff guys.
*chanting "beta, beta, beta"*
jacmoe: joined #tikiwiki
RobertPlummer: (in a non-spooky way)
lets merge first, no?
changi: RobertPlummer: yes
if you don't want to have nightmare
RobertPlummer: I've got a sure conflict that is about to happen to, is that ok?
jonnyb: phpstorm to the rescue!
RobertPlummer: Want me to merge since I've got this little nasty guy?
jonnyb: even the tree conflict i had yesterday wasn't too bad (in aptana they were horrid, had to use the CLI)
RobertPlummer: tiki-timesheet.php is going to be the offender.
jonnyb: yes please
changi: jonnyb: RobertPlummer just let me know when i can start
RobertPlummer: I will merge, then fix, then remerge.
Ok, give me 10-15 minutes.
Running initial merge.
changi: RobertPlummer: no problem
RobertPlummer: need to update my local branch
-: jonnyb gets a glass of something
changi: jonnyb: red wine for me
RobertPlummer: On a side note, I don't know if anyone has been watching. But I've finally achieved an exact parsing technique in jison's php port (JisonParser class)
changi: RobertPlummer: i saw that, did no take time to test
RobertPlummer: I had regular parsing working fine, but error handling would blow up.
CIA-36: tikiwiki: 03robertplummer * r41564 10/trunk/ (12 files in 10 dirs): [MRG] Automatic merge, branches/9.x 41541 to 41563
Bsfez: goodnight all from my side of the world… take care.
RobertPlummer: night
changi: Bsfez: night
CIA-36: tikiwiki: 03robertplummer * r41565 10/branches/9.x/ (lib/core/Services/Tracker/Controller.php tiki-timesheet.php): [FIX] Allow jquery to do most of the work through ajax
RobertPlummer: Once more we merge
I wonder if I'll get a double conflict...
yup!
jonnyb: RobertPlummer: have you worked out the phpstorm compare with branch thing? took me a while to figure it out but i have to working great now - prevents nasties like that
RobertPlummer: good find
rodrigoprimo: joined #tikiwiki
jonnyb: in the configure branches bit you just tell it about the branches dir and it works the rest out
hi rodrigoprimo (both of you) - here comes 9.0 beta! :)
RobertPlummer: jonnyb: What do you do when the files have been resolved, but the svn properties are messed up?
Does the script account for that?
When I do a diff on the files, it beings me to the properties.
changi: why not using --ignore-ancestry ?
RobertPlummer: I got it, svn cleanup.
Is that right?
*getting ready to hit enter*
changi: hit hit hi
t
RobertPlummer: Sending...
CIA-36: tikiwiki: 03robertplummer * r41566 10/trunk/ (. tiki-timesheet.php): [MRG] Automatic merge, branches/9.x 41563 to 41565
RobertPlummer: Orderly anarchy.
OK BETAS AWAY!
CIA-36: tikiwiki: 03changi67 * r41567 10/branches/9.x/lib/setup/twversion.class.php: [REL] Preparing 9.0Beta
changi: :)
RobertPlummer: if (jonnyb == superman) {changi = flash gordon};
CIA-36: tikiwiki: 03changi67 * r41568 10/branches/9.x/README: [REL] Update README file for 9.0beta
changi: RobertPlummer: i prefer hulk :)
will try to release it in less than 5 minutes :)
jonnyb: go changi, go!
changi: ssd is my partner :)
-: jonnyb is saving up for ssd's
CIA-36: tikiwiki: 03changi67 * r41569 10/branches/9.x/lang/ (49 files in 49 dirs): [REL] Update language.php files for 9.0beta
changi: for ricks: >> There were already some commits for the same final version number in the changelog. Merging them with the new ones.
>> Changelog updated with 137 new commits (revision 41565 to 41370), excluding duplicates, merges and release-related commits.
CIA-36: tikiwiki: 03changi67 * r41570 10/branches/9.x/changelog.txt: [REL] Update changelog.txt for 9.0beta
changi: for ricks99: Copyrights updated: +4 contributor(s), +323 commit(s)
CIA-36: tikiwiki: 03changi67 * r41571 10/branches/9.x/copyright.txt: [REL] Update copyright.txt for 9.0beta
changi: oh checking php will delayed the release.
takes time
CIA-36: tikiwiki: 03changi67 * r41572 10/branches/9.x/db/tiki-secdb_9.0_mysql.sql: [REL] SecDB for 9.0beta
tikiwiki: 03changi67 * r41573 10/tags/9.0beta/: [REL] Tagging release
-: changi pleased to announced beta :)
jonnyb: well done changi - thanks (will check a tarbal later, need to eat now)
changi: upload in progress
RobertPlummer: Can we get a link on http://info.tiki.org/Download?
changi: RobertPlummer: don't know
everything is on sf.net
just test it please
CIA-36: tikiwiki: 03changi67 * r41574 10/branches/9.x/lib/setup/twversion.class.php: [REL] Beta is now out
changi: ok guys, let's sleep a little
see ya
RobertPlummer: left #tikiwiki
CIA-36: tikiwiki: 03nkoth * r41575 10/branches/9.x/lib/userslib.php: [FIX] When number of periods is more than one, the prorating parameter was set wrong (on the whole period instead of first period as intended
benoitg: joined #tikiwiki
arildb: joined #tikiwiki
joined #tikiwiki
Jyhem_laptop: joined #tikiwiki