/srv/irclogs.ubuntu.com/2011/04/04/#ubuntu-locoteams.txt

=== 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
YoBoYgood morning06:49
=== AlanChicken is now known as AlanBell
dholbachgood morning07:30
=== daker__ is now known as daker
=== Pendulum_ is now known as Pendulum
=== Joeb454_ is now known as Joeb454
Ronniemhall119, cjohnston: is 0.3.3 almost ready to be released?11:13
Ronnieor 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)11:13
=== ianmcorvidae|alt is now known as ianmcorvidae
mhall119Ronnie: didn't we already merge in those twidenash changes?13:28
mhall119and the bzr-apps changes too?13:29
Ronniemhall119: 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:29
Ronniethe bzr is still opebn13:30
mhall119okay, then it shouldn't be in yours unless yours depends on mine13:30
mhall119it looks like you've merged in other branches into your my-teams branch13:31
mhall119some which are already in trunk, and some which aren't13:31
Ronniemine depends on yours, but you can merge yours first, then mine. bzr will reconize that bzr-apps is already merged13:31
mhall119does it need to depend on mine?13:32
Ronniefrom what i remember, it was a lot easier to merge your changes. else it would lead to conflicts or not-working code13:33
mhall119ok, 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 diff13:35
Ronnieit was about the location of twidenash (before and after bzr-apps) and the name of the command (twidentica -> twidenash)13:35
mhall119right, I remember that now13:35
Ronniehow to mark it as prerequisite branch?13:35
mhall119when you're creating the merge proposal there is a field for it, at the bottom13:36
Ronniefound it, under the edit button13:36
mhall119it doesn't look like you can add it after the MP is created though13:36
mhall119oh, ok13:36
mhall119if you set it, then your diff will only show your changes, not mine too13:36
mhall119cjohnston: you awake yet?13:37
Ronniemhall119: looks better now: https://code.launchpad.net/~ronnie.vd.c/loco-directory/my-teams/+merge/5614713:37
mhall119much better, that cut your number of lines changed by half13:39
mhall119Ronnie: the IRC Channel links on my-teams doesn't seem to work13:52
mhall119the code looks unfinished13:52
Ronniemhall119: what part of the code looks unfinished?13:56
mhall119Ronnie: my_teams.html line 5813:56
Ronniemhall119: the rss TODO, refferes to this bug/merge request: https://code.launchpad.net/~ronnie.vd.c/loco-directory/rss/+merge/5180014:02
Ronniethe 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-us14:05
mhall119we already  have webchat embedded in the team details page14:06
Ronniei know, but i think its not a good idea to do it the in "my-teams" page14:07
mhall119ok, yeah I agree with that14:07
mhall119Ronnie: http://paste.ubuntu.com/589258/14:11
Daniel0108hi14:11
mhall119that will make the IRC Channel link point to the embedded webchat in the team's page14:11
Ronniemhall119: looks like a good solution for now14:11
=== txwikinger2 is now known as txwikinger
czajkowskihttp://www.lczajkowski.com/2011/04/04/why-being-an-approved-loco-team-doesnt-actually-matter-a-jot/  food for thought folks 15:14
Daniel0108hi czajkowski :)15:19
czajkowskiDaniel0108: hi15:21
Daniel0108I really like your blog, czajkowski :)15:22
czajkowskithanks 15:22
dholbachRonnie, 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
dholbach(if you want to play around with it, you need to install python-sphinx and run "make html" to see the changes)15:40
dholbacha quick look at it would be much appreciated - as it's not my area of expertise :)15:41
Ronniedholbach: how to run/view it?15:42
dholbachsudo apt-get install python-sphinx; make html; firefox _build/html/index.html15:43
dholbach(oh, and check out the branch - but I guess that's obvious :))15:44
Ronnieah got it15:44
Ronnieits a start, but not yet 'ubuntu-ish'15:45
Ronniedholbach: what was the original theme / website url?15:46
dholbachRonnie, you mean how it looked before? http://daniel.holba.ch/temp/guide15:47
Ronnieyes, thx15:47
mhall119dholbach: can you use the ubuntu-community-webthemes/light-django-theme?15:55
dholbachmhall119, I have no idea15:58
dholbachI never did anything like this before and it's not my branch :)15:58
mhall119okay16:00
serfusthis page seems to be outdated https://wiki.ubuntu.com/LoCoCouncil/LoCoTeamReApproval. How can i find out who is our council contact?16:03
mhall119serfus: hmmm, I think that might be the most up to date, which isn't optimal16:07
serfusi see.. well, i'd be happy if one of the councilors would ping me when available16:08
serfusthanks mhall119 16:08
mhall119czajkowski: ^^16:09
leogghey serfus 16:09
leoggserfus, how can I help you?16:10
serfushowdy leogg16:11
serfusleogg, i was wondering which one of you is the contact for ubuntu israel16:11
leoggserfus, we haven't appointed anyone for israel yet, do you need help with something?16:13
serfusleogg, may i pm?16:14
leoggserfus, sure!16:14
=== 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
cjohnstonmhall119: i dont want to be19:29
mhall119you don't want to be what?19:30
cjohnstonyou asked if i was awake19:30
mhall119like 6 hours ago19:30
cjohnstoni answered19:30
mhall119where you sleeping or working 6 hours ago?19:31
cjohnstonclass19:32
mhall119ah19:32
mhall119anyway, I was pinging you for code reviews, if you're up to it19:32
Daniel0108umm, what does locobot do? :)19:45
cjohnstoniirc it loge19:49
cjohnstonlogs19:49
YoBoYcrap! I forget the monthly report ¬_¬19:55
cjohnstonmhall119: https://code.launchpad.net/~mhall119/summit/auto-slots/+merge/5602720:04
cjohnstonmhall119: if you look at http://127.0.0.1:8000/uds-o/2011-05-09/ do you have a link on room 1?20:10
mhall119cjohnston: yes I do20:13
cjohnstonany idea what its from20:14
cjohnstonmhall119: https://code.launchpad.net/~mhall119/summit/add-crews/+merge/5602120:14
mhall119cjohnston: nope20:15
mhall119responded to those two20:16
cjohnstonI responded back to the first one20:17
cjohnston both now20:18
cjohnstonlol20:18
mhall119the 15 minute breaks will take some re-factoring of the code to fit in20:19
mhall119new blog post up! http://mhall119.com/2011/04/ubuntu-summit-jam/21:03
YoBoYhttps://wiki.ubuntu.com/FrenchTeam/TeamReports/11/March done21:32
BigWhaleGreetings.22:06
nigelb*yawn* morning22:47

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!