=== olive_ is now known as olive === ianmcorvidae|alt is now known as ianmcorvidae === evilnhandler_ is now known as evilnhandler === Tm_T_ is now known as Tm_Tr [06:49] good morning === AlanChicken is now known as AlanBell [07:30] good morning === daker__ is now known as daker === Pendulum_ is now known as Pendulum === Joeb454_ is now known as Joeb454 [11:13] mhall119, cjohnston: is 0.3.3 almost ready to be released? [11:13] or could this one be included https://code.launchpad.net/~ronnie.vd.c/loco-directory/my-teams/+merge/54126 (combination of teams-page, bzr_apps, and twidenash) === ianmcorvidae|alt is now known as ianmcorvidae [13:28] Ronnie: didn't we already merge in those twidenash changes? [13:29] and the bzr-apps changes too? [13:29] mhall119: oh your right, twidenash is already merged. Then the branch is: My-teams + your bzr apps (https://code.launchpad.net/~mhall119/loco-directory/bzr-apps-upgrades/+merge/54010) [13:30] the bzr is still opebn [13:30] okay, then it shouldn't be in yours unless yours depends on mine [13:31] it looks like you've merged in other branches into your my-teams branch [13:31] some which are already in trunk, and some which aren't [13:31] mine depends on yours, but you can merge yours first, then mine. bzr will reconize that bzr-apps is already merged [13:32] does it need to depend on mine? [13:33] from what i remember, it was a lot easier to merge your changes. else it would lead to conflicts or not-working code [13:35] ok, then mine should have been marked as a prerequisite branch in your merge proposal, that way it wouldn't show my changes as part of your diff [13:35] it was about the location of twidenash (before and after bzr-apps) and the name of the command (twidentica -> twidenash) [13:35] right, I remember that now [13:35] how to mark it as prerequisite branch? [13:36] when you're creating the merge proposal there is a field for it, at the bottom [13:36] found it, under the edit button [13:36] it doesn't look like you can add it after the MP is created though [13:36] oh, ok [13:36] if you set it, then your diff will only show your changes, not mine too [13:37] cjohnston: you awake yet? [13:37] mhall119: looks better now: https://code.launchpad.net/~ronnie.vd.c/loco-directory/my-teams/+merge/56147 [13:39] much better, that cut your number of lines changed by half [13:52] Ronnie: the IRC Channel links on my-teams doesn't seem to work [13:52] the code looks unfinished [13:56] mhall119: what part of the code looks unfinished? [13:56] Ronnie: my_teams.html line 58 [14:02] mhall119: the rss TODO, refferes to this bug/merge request: https://code.launchpad.net/~ronnie.vd.c/loco-directory/rss/+merge/51800 [14:05] the chat page, not sure what to do with that. i think embedding should be avoided on the teams page, maybe http://loco.ubuntu.com/irc/ should accept channels like http://loco.ubuntu.com/irc/?channels=ubuntu-us [14:06] we already have webchat embedded in the team details page [14:07] i know, but i think its not a good idea to do it the in "my-teams" page [14:07] ok, yeah I agree with that [14:11] Ronnie: http://paste.ubuntu.com/589258/ [14:11] hi [14:11] that will make the IRC Channel link point to the embedded webchat in the team's page [14:11] mhall119: looks like a good solution for now === txwikinger2 is now known as txwikinger [15:14] http://www.lczajkowski.com/2011/04/04/why-being-an-approved-loco-team-doesnt-actually-matter-a-jot/ food for thought folks [15:19] hi czajkowski :) [15:21] Daniel0108: hi [15:22] I really like your blog, czajkowski :) [15:22] thanks [15:40] Ronnie, daker: do you think you have a moment to look at https://code.launchpad.net/~raoul-snyman/ubuntu-packaging-guide/new-colours/+merge/56010 and see if that's roughly how you would have done it? [15:40] (if you want to play around with it, you need to install python-sphinx and run "make html" to see the changes) [15:41] a quick look at it would be much appreciated - as it's not my area of expertise :) [15:42] dholbach: how to run/view it? [15:43] sudo apt-get install python-sphinx; make html; firefox _build/html/index.html [15:44] (oh, and check out the branch - but I guess that's obvious :)) [15:44] ah got it [15:45] its a start, but not yet 'ubuntu-ish' [15:46] dholbach: what was the original theme / website url? [15:47] Ronnie, you mean how it looked before? http://daniel.holba.ch/temp/guide [15:47] yes, thx [15:55] dholbach: can you use the ubuntu-community-webthemes/light-django-theme? [15:58] mhall119, I have no idea [15:58] I never did anything like this before and it's not my branch :) [16:00] okay [16:03] this page seems to be outdated https://wiki.ubuntu.com/LoCoCouncil/LoCoTeamReApproval. How can i find out who is our council contact? [16:07] serfus: hmmm, I think that might be the most up to date, which isn't optimal [16:08] i see.. well, i'd be happy if one of the councilors would ping me when available [16:08] thanks mhall119 [16:09] czajkowski: ^^ [16:09] hey serfus [16:10] serfus, how can I help you? [16:11] howdy leogg [16:11] leogg, i was wondering which one of you is the contact for ubuntu israel [16:13] serfus, we haven't appointed anyone for israel yet, do you need help with something? [16:14] leogg, may i pm? [16:14] serfus, sure! === cprofitt_ is now known as cprofitt === jledbetter_ is now known as jledbetter === johnc4511 is now known as johnc4510 === daker is now known as daker_ === akgraner` is now known as akgraner [19:29] mhall119: i dont want to be [19:30] you don't want to be what? [19:30] you asked if i was awake [19:30] like 6 hours ago [19:30] i answered [19:31] where you sleeping or working 6 hours ago? [19:32] class [19:32] ah [19:32] anyway, I was pinging you for code reviews, if you're up to it [19:45] umm, what does locobot do? :) [19:49] iirc it loge [19:49] logs [19:55] crap! I forget the monthly report ¬_¬ [20:04] mhall119: https://code.launchpad.net/~mhall119/summit/auto-slots/+merge/56027 [20:10] mhall119: if you look at http://127.0.0.1:8000/uds-o/2011-05-09/ do you have a link on room 1? [20:13] cjohnston: yes I do [20:14] any idea what its from [20:14] mhall119: https://code.launchpad.net/~mhall119/summit/add-crews/+merge/56021 [20:15] cjohnston: nope [20:16] responded to those two [20:17] I responded back to the first one [20:18] both now [20:18] lol [20:19] the 15 minute breaks will take some re-factoring of the code to fit in [21:03] new blog post up! http://mhall119.com/2011/04/ubuntu-summit-jam/ [21:32] https://wiki.ubuntu.com/FrenchTeam/TeamReports/11/March done [22:06] Greetings. [22:47] *yawn* morning