fluid-work IRC Logs-2011-06-20

Owned by Fluid IRC Log Bot
Last updated: Jun 20, 2011Version comment
15 min read

[08:15:43 CDT(-0500)] <heidi> Justin_o when git says i have unmerged files, is there a way to list what those files are?
[08:16:11 CDT(-0500)] <Justin_o> heidi: try "git status -s
[08:16:12 CDT(-0500)] <Justin_o> "
[08:16:27 CDT(-0500)] <heidi> Justin_o aha of course, duh. thanks!
[08:16:38 CDT(-0500)] <Justin_o> np (smile)
[08:19:53 CDT(-0500)] <heidi> jhung when you merged my stuff in and had conflicts, did you fix them and push again?
[08:20:07 CDT(-0500)] <heidi> i'm just merging your fat panel stuff in now and getting some conflicts
[08:20:20 CDT(-0500)] <heidi> but just want to see if you've already fixed em (tongue)
[08:20:46 CDT(-0500)] <jhung> heidi: I didn't have a chance to fix 'em.
[08:20:53 CDT(-0500)] <heidi> okay np
[08:20:54 CDT(-0500)] <jhung> we can go through it together if it helps.
[08:36:50 CDT(-0500)] <heidi> jhung np it's two files. i'm going through now
[08:36:57 CDT(-0500)] <heidi> are you working on UIO today or other stuff?
[08:37:14 CDT(-0500)] <jhung> heidi: I'll be working on Uploader today.
[08:37:20 CDT(-0500)] <heidi> k!
[08:40:10 CDT(-0500)] <jhung> justin_o, mlam: good morning.
[08:40:19 CDT(-0500)] <mlam> morning jhung
[08:40:33 CDT(-0500)] <Justin_o> jhung: hello
[08:40:38 CDT(-0500)] <jhung> can either of you point me to the location where Uploader error messages are stored?
[08:41:16 CDT(-0500)] <Justin_o> jhung: which error messages are you looking for?
[08:41:48 CDT(-0500)] <jhung> Justin_o: the file size is too large, and too many files in queue error messages.
[08:42:22 CDT(-0500)] <mlam> jhung: I can find it for you. colinclark did a lot of refactoring for that piece, so i'm sure the messages have moved
[08:42:52 CDT(-0500)] <Justin_o> jhung: as a start they are probably only in a branch, you can see the pull request here https://github.com/fluid-project/infusion/pull/80
[08:43:17 CDT(-0500)] <jhung> mlam:in that case don't worry about it. I was looking for a quick out. (wink) I'll stop being lazy and do it myself. (big grin)
[08:43:23 CDT(-0500)] <jhung> justin_o: thanks!
[08:43:26 CDT(-0500)] <mlam> (smile)
[08:57:48 CDT(-0500)] <heidi> harriswong what was the jira for that TOC issue. did you let Justin_o know?
[08:59:18 CDT(-0500)] <harriswong> heidi: FLUID-4295. Not yet, letting him know now.
[08:59:32 CDT(-0500)] <heidi> thanks
[09:22:27 CDT(-0500)] <huslage> ohai
[09:42:04 CDT(-0500)] <harriswong> heidi: i have talked to cindyli and justin_o, 4295 might be related to the hide/show functionality that's missing in toc. I am adding it it now
[09:42:41 CDT(-0500)] <heidi> harriswong not sure what you mean, but thanks for fixing it (smile)
[09:43:32 CDT(-0500)] <harriswong> heidi: oh, basically table of content has 1 functionality missing, adding that in now and hopefully that's the problem.
[09:45:48 CDT(-0500)] <heidi> k cool
[09:59:08 CDT(-0500)] <heidi> hey cindyli i think instead of commenting on http://issues.fluidproject.org/browse/FLUID-4294 it should be a new jira
[10:00:17 CDT(-0500)] <heidi> btw Justin_o should that jira ^ be 1.4 ?
[10:00:29 CDT(-0500)] <cindyli> heidi: ok
[10:12:50 CDT(-0500)] <heidi> hey jhung i'm getting a 10px margin on the top of the panels now - do you have that as well?
[10:12:57 CDT(-0500)] <heidi> top of the tabs rather
[10:14:37 CDT(-0500)] <jhung> heidi: which code should I be using?
[10:14:59 CDT(-0500)] <heidi> jhung when you load fat panel in your 4230-jhung branch
[10:15:20 CDT(-0500)] <heidi> something's messed up...
[10:16:18 CDT(-0500)] <jhung> k let me pull in a fresh copy. I think mine is tainted.
[10:18:45 CDT(-0500)] <jhung> heidi: ugh. I see now. Lots of things exploded.
[10:19:10 CDT(-0500)] <heidi> jhung hmm... i just wonder what happened here
[10:19:23 CDT(-0500)] <jhung> heidi: maybe back out the last change and see?
[10:19:59 CDT(-0500)] <heidi> jhung yeah... just so many branches merged in (yours, and 4228 and 4229) it's hard to figure what's what... fun. i'll try to figure it out
[10:22:05 CDT(-0500)] <cindyli> heidi: Justin_o, i've created a new jira (http://issues.fluidproject.org/browse/FLUID-4296) for what was commented in 4294, but didn't add it into bug parade. should it be in?
[10:22:28 CDT(-0500)] <heidi> cindyli - i think so as it's a bug in UIO
[10:23:31 CDT(-0500)] <cindyli> heidi: Justin_o, ok, added 4296 into bug parade
[10:45:58 CDT(-0500)] <harriswong> heidi: fyi, FLUID-4295 is a a related to FLUID-4284
[10:47:32 CDT(-0500)] <heidi> harriswong ah, looks like cindyli found this bug awhile ago. feel free to close mine as duplicate
[10:47:56 CDT(-0500)] <heidi> tho harriswong i think it happens in all UIO layouts right?
[10:48:00 CDT(-0500)] <heidi> not just fat panel
[10:48:20 CDT(-0500)] <cindyli> yes, heidi
[10:48:50 CDT(-0500)] <heidi> so harriswong maybe close cindy's as the dup
[10:49:31 CDT(-0500)] <harriswong> heidi: ok
[12:54:08 CDT(-0500)] <michelled> colinclark, Bosmon4, cindyli: my FLUID-4207 branch is ready to be reviewed
[12:54:21 CDT(-0500)] <michelled> UIEnhancer is in better shape now and there are more tests for it
[12:54:38 CDT(-0500)] <colinclark> michelled: Okay, I can take a look this afternoon
[12:54:48 CDT(-0500)] <colinclark> I've got one to review for Boz, too
[12:59:28 CDT(-0500)] <jhung> heidi: I just checked out a clean copy of my FLUID-4230 branch and it's clean.
[12:59:52 CDT(-0500)] <jhung> all styles show up nicely etc.
[13:00:12 CDT(-0500)] <heidi> jhung okay good to know - thanks!
[13:00:40 CDT(-0500)] <jhung> perhaps start a new directory and do a clean checkout from my branch there, heidi... then merge in other stuff slowly?
[13:00:52 CDT(-0500)] <heidi> jhung yep might have to do that...
[13:00:56 CDT(-0500)] <heidi> oyy
[13:01:54 CDT(-0500)] <jhung> heidi: perhaps justin_o, michelled, or colinclark have good approaches for handling this?
[13:02:13 CDT(-0500)] <heidi> jhung i'll figure it out, thanks
[13:25:10 CDT(-0500)] <Justin_o_> jameswy: how do you feel about the uiOptions fat panel updating as it closes?
[13:26:50 CDT(-0500)] <jameswy> Justin_o_: Elaborate.
[13:28:13 CDT(-0500)] <mlam> jameswy: We're having some issues with the fat panel to refresh it's view while the panel is hidden
[13:29:00 CDT(-0500)] <mlam> from a programmatic perspective, we need the panel to be visible to have access to the panel values
[13:30:06 CDT(-0500)] <mlam> the only way we have been able to have things working is with this sequence: show panel, make some changes, click on the hide panel and before the panel fully hides, the user sees the fat panel update for a split second
[13:30:20 CDT(-0500)] <jameswy> So you're saying the order of interactions is: 1. use controls on UIO + simultaneous change on actual page, 2. click hide on UIO, 3. changes reflected on UIO, 4. panel close ?s
[13:30:30 CDT(-0500)] <jameswy> Right.
[13:30:33 CDT(-0500)] <jameswy> Hm.
[13:30:47 CDT(-0500)] <jameswy> I'd say I feel it's better, but it's still a bug.
[13:32:02 CDT(-0500)] <mlam> I find it to be pretty awkward for the user to get a quick preview of the changes before the panel hides. It doesn't seem elegant enough. But I'm not sure how we can improve it with the current programmatic limitations
[13:32:56 CDT(-0500)] <Bosmon5> mlam - can you explain what you have observed the limitations to be?
[13:33:01 CDT(-0500)] <Bosmon5> What have you tried, and what have you observed?
[13:34:15 CDT(-0500)] <mlam> Bosmon5: The problem we have found is that we need to have the refreshView call while the panel itself is still visible
[13:34:39 CDT(-0500)] <Bosmon5> mlam - did you discover that you can reliably track the event which cases the panel to become visible and invisible?
[13:34:47 CDT(-0500)] <Bosmon5> And which refreshView call do you mean, exactly?
[13:35:36 CDT(-0500)] <Bosmon5> which causes, sorry
[13:35:56 CDT(-0500)] <mlam> Bosmon5: yes, we have. We're referring to the refreshView call in uiEnhancer
[13:36:56 CDT(-0500)] <Bosmon5> mlam - why can't you just create an event to always broadcast the most recent dialog values to an object held on the outside of the iframe?
[13:39:00 CDT(-0500)] <mlam> so we would have to separate the refreshView() call from the onSave event, right?
[13:39:23 CDT(-0500)] <Bosmon5> mlam - yes - but you could just treat it as if it were another "settingsStore"
[13:40:33 CDT(-0500)] <mlam> but it wouldn't actually be another store, right?
[14:26:19 CDT(-0500)] <michelled> mlam: I'm sorry to distract you - you had a fix a while ago for the problem of uploader not degrading to a single file when JS was off
[14:26:26 CDT(-0500)] <michelled> colinclark pushed that fix
[14:26:45 CDT(-0500)] <michelled> mlam: did it actually fix the issue? I'm doing some JIRA gardening and the bug is still unresolved
[14:27:09 CDT(-0500)] <mlam> michelled: Yah, it's fixed. The JIRA should've been changed to resolved then closed.
[14:27:15 CDT(-0500)] <michelled> thx
[14:27:20 CDT(-0500)] <mlam> np
[14:27:44 CDT(-0500)] <michelled> oh, also there are fresh donuts over here - they are pretty yummy (smile)
[14:31:22 CDT(-0500)] <heidi> jhung just cleaning up styles... for tabs it looks like we set some stuff, then over-ride it a few lines down :o trying to strip it down...
[14:38:48 CDT(-0500)] <heidi> did someone say donuts... dohh!
[14:43:10 CDT(-0500)] <michelled> heidi: there are disadvantages to working from home (wink)
[14:43:20 CDT(-0500)] <heidi> hehe
[14:43:27 CDT(-0500)] <michelled> heidi: do you know if the tweaking for the yellow and black themes is done?
[14:43:34 CDT(-0500)] <heidi> i'm eating dried fruit. not as good
[14:43:44 CDT(-0500)] <michelled> this JIRA is assigned to me but it probably should be in someone else's hands: http://issues.fluidproject.org/browse/FLUID-4218
[14:43:45 CDT(-0500)] <heidi> michelled the theme file itself? haven't touched them
[14:44:22 CDT(-0500)] <heidi> michelled haven't they been added to trunk?
[14:44:34 CDT(-0500)] <michelled> I think we decided I would merge it in and then you and jameswy would look at fixing the details
[14:45:25 CDT(-0500)] <heidi> michelled seems fine so far, will have to test it more once done with UIO - applying the theme to diff pages
[14:45:35 CDT(-0500)] <heidi> if you have time for that, i guess that would be good
[14:45:49 CDT(-0500)] <heidi> just adding fl-theme-blackYellow to different pages and seeing how it looks?
[14:46:16 CDT(-0500)] <heidi> but haven't noticed anything that needs fixing yet
[14:46:42 CDT(-0500)] <michelled> heidi: when I select the yellow on black theme in the fat panel demo I can no longer read the text for the widgets
[14:47:11 CDT(-0500)] <heidi> michelled yeah the tweaking for fat panel isn't done yet
[14:47:24 CDT(-0500)] <michelled> heidi: who's working on that?
[14:47:28 CDT(-0500)] <heidi> once it is, i'll submit a pull request for all 3 layouts tweaks... there's so much over lap
[14:47:31 CDT(-0500)] <heidi> i am
[14:47:41 CDT(-0500)] <heidi> it's not work on the theme itself tho, it's just on UIO
[14:47:57 CDT(-0500)] <michelled> I think it's all related, isn't it?
[14:48:13 CDT(-0500)] <heidi> so far it's UIO that needs tweaking, not the themes
[14:48:16 CDT(-0500)] <jhung> heidi: okay. Cleanups are good. Thanks for cleaning that up.
[14:49:07 CDT(-0500)] <michelled> heidi: so there are things people need to do to their pages for the themes to work?
[14:49:19 CDT(-0500)] <heidi> michelled no
[14:55:34 CDT(-0500)] <michelled> heidi: I'm not understanding - why do I lose my text when I select the yellow and black theme in fat panel?
[14:57:12 CDT(-0500)] <heidi> michelled which text
[14:57:33 CDT(-0500)] <michelled> heidi: the label for the widget
[14:57:38 CDT(-0500)] <michelled> for example 'text size'
[14:58:27 CDT(-0500)] <heidi> michelled because fat panel UIO has the background colour over-riding the themes which is incorrect and something that i fixed but haven't sent a pull request for
[14:58:28 CDT(-0500)] <heidi> not done yet
[14:58:48 CDT(-0500)] <michelled> ok
[14:59:05 CDT(-0500)] <michelled> I reassigned that JIRA to anastasiac because that was what we had decided when I merged in the themes
[14:59:33 CDT(-0500)] <michelled> anastasiac: if you are working on that you will probably want to coordinate with heidi to see the most recent work she has done that's not in the repo
[14:59:45 CDT(-0500)] <anastasiac> michelled, thanks
[15:00:10 CDT(-0500)] <michelled> heidi: is it possible to get some of this work into the project repo so we don't end up with lots of overlapping branches again?
[15:00:13 CDT(-0500)] <anastasiac> heidi, is your work in your own repo, in a branch?
[15:00:13 CDT(-0500)] <heidi> anastasiac are you still working on the theme?
[15:01:27 CDT(-0500)] <anastasiac> heidi, not right now. I'll have to refresh my memory of the status of that work. I think I was under the impression that you or jameswy were working on it
[15:02:48 CDT(-0500)] <heidi> anastasiac michelled some of the files UIO uses are shared among all of the layouts. i'm trying to get all 3 in good shape so that those shared files don't have to be consistently reviewed. there's also a lot of css clean up that still has to happen. just waiting till i get to the point where they're all cleaned up and trimmed down. there are three branches for each layout, but my goal is to have one pull request that tweaks all o
[15:02:48 CDT(-0500)] <heidi> them correctly.
[15:03:01 CDT(-0500)] <michelled> harriswong: did you upgrade the version of the tooltip plugin in the branch for 3909? http://issues.fluidproject.org/browse/FLUID-3909
[15:03:15 CDT(-0500)] <heidi> anastasiac was there work remaining to be done on the theme?
[15:03:40 CDT(-0500)] <michelled> heidi: good to know
[15:03:42 CDT(-0500)] <anastasiac> heidi, I think the icons were not ready when I left off
[15:04:40 CDT(-0500)] <heidi> anastasiac jhung did you add the icons to the yellow black themes
[15:06:05 CDT(-0500)] <anastasiac> heidi, jhung: I just tested the latest code in the master repo: the icons are not yet implemented. I can take that on, if that's helpful
[15:06:09 CDT(-0500)] <anastasiac> oh, wait
[15:06:16 CDT(-0500)] <anastasiac> now I remember the problem, heidi
[15:06:21 CDT(-0500)] <jhung> heidi: I added yellow-black icons for UIO.
[15:06:29 CDT(-0500)] <anastasiac> the icons were hard-coded into the templates, and couldn't be changed by css
[15:07:12 CDT(-0500)] <heidi> anastasiac that's been fixed, but not pulled in yet
[15:07:22 CDT(-0500)] <heidi> jhung you added the general theme icons to the theme css files?
[15:07:23 CDT(-0500)] <michelled> speaking of icons, did anyone deal with the HC and HCI icons? http://issues.fluidproject.org/browse/FLUID-4287
[15:08:10 CDT(-0500)] <anastasiac> ok, heidi, how should we proceed? I can help with that work, if that helps you. Do you want me to work directly in your branch, or can your branch be pushed to master yet, or should I fork your repo?
[15:08:28 CDT(-0500)] <heidi> anastasiac i'm not sure what work you're thinking of
[15:08:45 CDT(-0500)] <harriswong> michelled: I believe the version we upgraded to is not as new as the one i mentioned in the 3909 jira. Verifying.
[15:09:10 CDT(-0500)] <anastasiac> ok, heidi, I think I've misunderstood. Your branch is using the new icons for yellow/black themes?
[15:09:20 CDT(-0500)] <heidi> anastasiac the UIO specific ones, yep
[15:09:37 CDT(-0500)] <heidi> i think if i remember right that themes have their own general icons
[15:09:40 CDT(-0500)] <michelled> harriswong: does the version we upgraded to fix the 3909 issue?
[15:09:41 CDT(-0500)] <anastasiac> so what work is it that's not done yet?
[15:09:41 CDT(-0500)] <heidi> i didn't do anything with those
[15:09:49 CDT(-0500)] <heidi> i'm not sure
[15:09:54 CDT(-0500)] * anastasiac was in a different headspace - sorry for being out of touch!
[15:10:16 CDT(-0500)] <heidi> the themes are working fine for me, for UIO
[15:10:22 CDT(-0500)] <anastasiac> ah, icons for the widgets - right
[15:10:43 CDT(-0500)] <heidi> but yeah there might be new general ones that need to be added to the css, i think jhung made some
[15:10:46 CDT(-0500)] <heidi> unrelated to UIO
[15:11:02 CDT(-0500)] <anastasiac> ok, I'll have a look and see where that's at, heidi. jhung, are those the icons you created? i.e. for the widget?
[15:11:18 CDT(-0500)] <jhung> heidi: yeah I made some. They should be attached to a jira.
[15:11:30 CDT(-0500)] <heidi> jhung but you didn't add to the theme css files
[15:11:37 CDT(-0500)] <jhung> heidi: no
[15:11:41 CDT(-0500)] <heidi> jhung let anastasiac know which jira
[15:11:42 CDT(-0500)] <jhung> I was only workiing on UIO
[15:11:55 CDT(-0500)] <heidi> for the general icons
[15:11:56 CDT(-0500)] <jhung> looking now
[15:12:32 CDT(-0500)] <heidi> anastasiac i guess FLUID-4287 is related to that stuff too
[15:13:03 CDT(-0500)] <anastasiac> jhung, I found widget icons on 4218; I can implement those
[15:13:43 CDT(-0500)] <anastasiac> heidi, yes: 4287 needs the same widget icons for HC/HCI. Maybe jhung can help?
[15:14:12 CDT(-0500)] <jhung> anastasiac: yes 4218 is the one. Let me take a look at 4287...
[15:15:54 CDT(-0500)] <harriswong> michelled: sorry it took a while to get back to you. No, our upgrade does not include the fix.
[15:16:13 CDT(-0500)] <jhung> anastasiac: Okay. I can take on creating icons for FLUID-4287. I probably won't get to this until tomorrow. That okay?
[15:16:22 CDT(-0500)] <michelled> ok, thanks harriswong - can you comment on that JIRA so we know the full status?
[15:16:31 CDT(-0500)] <harriswong> michelled: I will update the jira. The version we have in trunk is Dec 03, 2010. The fix they have is May 29, 2011
[15:16:37 CDT(-0500)] <anastasiac> jhung, certainly, tomorrow is fine! I have plenty to keep me busy (smile)
[15:16:45 CDT(-0500)] <michelled> thanks harriswong!
[15:21:47 CDT(-0500)] <harriswong> michelled: updated #3909
[15:21:55 CDT(-0500)] <michelled> thx
[15:22:17 CDT(-0500)] <harriswong> np
[15:22:47 CDT(-0500)] <harriswong> michelled: Please let me know if i am not clear enough on the jira comment
[15:24:19 CDT(-0500)] <michelled> that's fine, thx
[15:38:27 CDT(-0500)] <michelled> jameswy: is there still work going on for http://issues.fluidproject.org/browse/FLUID-4177
[15:40:24 CDT(-0500)] <jameswy> michelled: No, none that I'm aware of. Can we keep this issue open for a bit, but downgrade it from critical? I need to spend time rethinking things a bit on that one. I'm not sure it actually makes sense for the default styles.
[15:40:43 CDT(-0500)] <michelled> sure
[15:42:18 CDT(-0500)] <heidi> Justin_o in some UIO demos we have fluid.fullNoPreviewUIOptions("#myUIOptions"); and in fat panel we have fluid.fatPanelUIOptions(".flc-uiOptions-fatPanel");
[15:42:40 CDT(-0500)] <heidi> i know the container name doesn't really matter, but feel like this should be consistent among demos?
[15:42:51 CDT(-0500)] <heidi> is the flc- classname what we use for other components?
[15:45:35 CDT(-0500)] <michelled> heidi, jameswy: do you think work is done for this JIRA? http://issues.fluidproject.org/browse/FLUID-4228
[15:45:44 CDT(-0500)] <Justin_o> heidi: hmm.. i'm not sure we have decided on anything in particular, but I agree something consistent would be nice
[15:45:54 CDT(-0500)] <Justin_o> anastasiac: do you know what we typically use?
[15:45:57 CDT(-0500)] <michelled> heidi: I also think consistency would be good
[15:46:16 CDT(-0500)] <heidi> michelled yep but waiting to send pull request until others are ready (4229 same boat) ...just finishing 4230
[15:46:17 CDT(-0500)] <michelled> I'm becoming more convinced that the base component name is a good container default
[15:46:34 CDT(-0500)] <michelled> like you have in the fat panel demo
[15:46:48 CDT(-0500)] <heidi> michelled i think it might be easier for implementers to have that guideline maybe
[15:46:51 CDT(-0500)] <heidi> help frame things
[15:47:01 CDT(-0500)] <heidi> ill stick with flc'ing then (smile)
[15:47:04 CDT(-0500)] <anastasiac> re naming: I think we should reserve "flc-*" for selectors actually defined by a componetn
[15:47:12 CDT(-0500)] <heidi> ah
[15:47:21 CDT(-0500)] <heidi> so not flc-
[15:47:21 CDT(-0500)] <heidi> hm
[15:47:26 CDT(-0500)] <anastasiac> if it's not defined by the component, but used in a demo, it should probably be different
[15:47:29 CDT(-0500)] <michelled> heidi: what branch is all that work in?
[15:47:32 CDT(-0500)] <anastasiac> it will help readers distinguish
[15:47:55 CDT(-0500)] <heidi> michelled i'm working in 4230 now and have merged in 4228 and 4229
[15:48:09 CDT(-0500)] <anastasiac> we can use the same convention, just start it with something else; but for a demo, I think an ID is ok, too
[15:48:34 CDT(-0500)] <heidi> anastasiac the myuioptions might be a better way to go then
[15:48:58 CDT(-0500)] <anastasiac> better than flc-, yes
[15:49:03 CDT(-0500)] <heidi> okay
[15:49:21 CDT(-0500)] <heidi> i think i was confusing myself with the meaning of the flc- bit so thanks anastasiac
[15:49:28 CDT(-0500)] <anastasiac> np
[15:50:59 CDT(-0500)] <anastasiac> heidi, which branch do you have the yellow/black themes working in UI options in?
[15:51:32 CDT(-0500)] <heidi> anastasiac i'd use jhung's right now: his branch is FLUID-4230-jhung in his repo
[15:51:43 CDT(-0500)] <anastasiac> heidi, thanks
[15:54:47 CDT(-0500)] <michelled> heidi: I'm confused by these JIRAs and branches. Wasn't all this work done in the big merge branch and the put into the project repo?
[15:55:30 CDT(-0500)] <heidi> michelled some of it was started there yes
[15:55:46 CDT(-0500)] <heidi> right now there are three very related jiras (4228, 4229, 4230) that are the 3 layouts.
[15:56:13 CDT(-0500)] <heidi> to pull them in separately doesn't work because they have so many shared resources
[15:56:19 CDT(-0500)] <michelled> heidi: can you clarify on the JIRA issues what's in the project repo and what's outstanding?
[15:56:45 CDT(-0500)] <michelled> I had expected that all of the JIRAs in the merge branch were done and in
[15:57:26 CDT(-0500)] <heidi> michelled they were in, and now i'm tweaking the layouts. tweaking means: making them look nicer, browser fixes, linearization fixes, icons added etc
[15:57:30 CDT(-0500)] <harriswong> Justin_o: I have fixed the unit test and ToC, would you like to take a look at it?
[15:57:59 CDT(-0500)] <heidi> michelled i'm hoping to send a pull request soon (tomorrow or next day) for 4230 which will be everything
[15:58:12 CDT(-0500)] <heidi> i know it's kind of confusing
[15:58:20 CDT(-0500)] <heidi> but it's because of how related they all are to each other
[15:59:44 CDT(-0500)] <michelled> ya, we should have closed them when the merge branch went in and the opened ones that weren't so interrelated
[16:00:08 CDT(-0500)] <michelled> I think we are going to confuse ourselves in the future if we ever need to follow any these changes back
[16:03:13 CDT(-0500)] <heidi> michelled i could send pull requests for each of the 3 layouts
[16:03:34 CDT(-0500)] <heidi> but it would be.... hmm, ugly
[16:03:43 CDT(-0500)] <michelled> well, the pull requests is only part of it
[16:03:56 CDT(-0500)] <michelled> one of our main lines of communication with our future selves is JIRA
[16:05:57 CDT(-0500)] <michelled> heidi: oh, sorry I misunderstood
[16:06:44 CDT(-0500)] <heidi> issues.fluid is down for me
[16:07:01 CDT(-0500)] <michelled> heidi: but the issues listed in 4267 aren't closed and don't mention having had anything committed
[16:07:01 CDT(-0500)] <michelled> and in fact, I now know, they actually aren't complete
[16:07:10 CDT(-0500)] <heidi> what is 4267?
[16:08:54 CDT(-0500)] <michelled> 4267 is the great UI Options merge branch (smile)
[16:09:47 CDT(-0500)] <michelled> it covers 15 JIRA issues
[16:10:13 CDT(-0500)] <heidi> ah
[16:10:17 CDT(-0500)] <michelled> some of which were updated when the merge branch went in and some which weren't
[16:10:34 CDT(-0500)] <heidi> michelled yeah so our first version for 4228, 4229, and 4230 were pulled in when that happened
[16:10:34 CDT(-0500)] <michelled> it was my (incorrect) understanding that all the JIRA issues it covered were done
[16:10:53 CDT(-0500)] <heidi> right, they weren't done
[16:11:22 CDT(-0500)] <michelled> heidi: so I think what we need is comments on the JIRA issues that say what was pulled in with 4267 and what is remaining
[16:11:35 CDT(-0500)] <michelled> that way when you do your next pull request it will be easier to do the code review
[16:11:40 CDT(-0500)] <michelled> heidi: make sense?
[16:12:11 CDT(-0500)] <heidi> michelled you mean comment on say 4228 that the next pull request includes x additional things
[16:12:31 CDT(-0500)] <heidi> i sorta get it
[16:15:01 CDT(-0500)] <michelled> yes, and also comment with what the pull of the 4267 merge branch contained
[16:15:06 CDT(-0500)] <michelled> heidi ^
[16:16:00 CDT(-0500)] <heidi> k i'll try. layouts are tricky cos it's not like x solves y... lots of stuff was moved around, deleted, reworked...
[16:16:34 CDT(-0500)] <michelled> so a comment on 4228 that says 'x things were done and included in the 4267 merge at aa5efc1e1a20aaa152f2e7e2d4edfbb35e08c5ea' and 'y things are still being worked on'
[16:17:02 CDT(-0500)] <heidi> michelled ok sounds good - thanks
[16:17:17 CDT(-0500)] <michelled> thanks heidi