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