cjohnston | james_w: bug #777171 when there was a '%' in I believe it was the spec url it broke tons o stuff | 02:26 |
---|---|---|
ubot4 | Launchpad bug 777171 in summit "Percent signs in the wiki field break summit (affects: 2) (heat: 11)" [Critical,In progress] https://launchpad.net/bugs/777171 | 02:26 |
cjohnston | The URL was changed to make it work because it broke iirc a day or two befor | 02:27 |
cjohnston | ee uds | 02:27 |
cjohnston | mhall119: I just got that NoReverseMatch: Reverse for 'summit.schedule.decorators.inner' with arguments '('',)' and keyword arguments '{}' not found. that someone was showing the other day | 02:53 |
cjohnston | YAY!!!! | 02:55 |
mhall119 | do you have a traceback? | 02:55 |
cjohnston | wait what | 02:56 |
mhall119 | for the NoReverseMatch | 02:56 |
cjohnston | DONE to INPROGRESS == !FAIL | 02:56 |
cjohnston | http://paste.ubuntu.com/623032/ | 02:56 |
mhall119 | something is calling reverse() on a view func, which is wrapped by that decorator | 02:56 |
mhall119 | cjohnston: it should be in progress, since I haven't gotten the new package built and deployed to cranberry | 02:56 |
cjohnston | ok | 02:57 |
cjohnston | https://code.launchpad.net/~nigelbabu/summit/782062-fix-naming/+merge/62044 | 02:57 |
mhall119 | cjohnston: see if you get it in 2.6 | 02:57 |
cjohnston | thats the merge | 02:57 |
mhall119 | that's the merge that causes the problem? | 02:57 |
cjohnston | I believe so | 02:57 |
mhall119 | cjohnston: what page did yu get that error on? | 03:04 |
cjohnston | both admin and by date | 03:05 |
mhall119 | any admin page? | 03:07 |
cjohnston | yes | 03:07 |
cjohnston | i reverted it out, stopped having it, and now have merged it back in with no problems so far | 03:07 |
cjohnston | although refresh that merge and look at my comment | 03:08 |
mhall119 | cjohnston: I think we need to ask Daviey why they have this weird custom NameField anyway | 03:09 |
cjohnston | mhall119: whats the PPA with the django and south packages | 03:19 |
cjohnston | mhall119: nigelb https://code.launchpad.net/~chrisjohnston/ubuntu-community-webthemes/topnav/+merge/64110 | 03:49 |
nigelb | wow | 05:47 |
nigelb | I wake up to see bunch of code reviews | 05:47 |
nigelb | Best day EVER. | 05:47 |
nigelb | cjohnston: the ++ characters are URL safe. | 05:48 |
* nigelb hugs james_w | 05:49 | |
daker | cjohnston, yes that was me who reported that problem | 09:50 |
daker | good morning everyone | 09:51 |
Daviey | mhall119, uh? | 10:31 |
Daviey | mhall119, need more info :) | 10:32 |
nigelb | Daviey: heh | 11:31 |
daker | any simple tuto on how to configure mod_wsgi (apache & django) ? | 12:03 |
cjohnston | nigelb: are you happy? work was finally done.. thanks to james_w | 12:12 |
nigelb | cjohnston: Yup, thanks for landing those :) | 12:12 |
cjohnston | https://code.launchpad.net/~nigelbabu/summit/irc-channels/+merge/63281 I'd rather this be fixed more better instead of hacked on later | 12:13 |
cjohnston | Nigel, try pulling up the All Sessions ical.. I got that reverse {} thing there again | 12:16 |
nigelb | cjohnston: I marked it as needs review myself. Will do work on it tonight. | 12:22 |
nigelb | cjohnston: Do you have '.' in any of the session names in your db? | 12:22 |
nigelb | cjohnston: that's how I got that the last time | 12:23 |
cjohnston | possibly.. i imported from lp | 12:23 |
nigelb | cjohnston: then you do. | 12:23 |
nigelb | cjohnston: you need to install sqlite database browser and manually change them I guess | 12:23 |
nigelb | It took me 2 hours of debugging to figure out why that bit was failing :/ | 12:23 |
cjohnston | nigelb: you good with https://code.launchpad.net/~chrisjohnston/ubuntu-community-webthemes/topnav | 12:24 |
nigelb | cjohnston: Aha, I wanted to you about that. Point me to the place where it actually needs fixing so I can figure out if its good? | 12:25 |
cjohnston | I have issues where it doesnt always show up correctly for me.. and I had to use it in status to get it to work | 12:25 |
nigelb | cjohnston: ok, which bit of status is fixed with this code then? | 12:26 |
nigelb | That way I can use firebug to remove that code and see it fail | 12:26 |
cjohnston | http://summit.ubuntu.com/uds-m/2010-05-11/ | 12:26 |
cjohnston | ouch.. that needs help | 12:26 |
cjohnston | ok.. maybe not | 12:26 |
cjohnston | it didnt load the css | 12:27 |
cjohnston | thats the mothership | 12:27 |
cjohnston | the 20px part | 12:27 |
nigelb | cjohnston: for summit, whether I add or remove the 20px, its not showing me any visible change. | 12:28 |
cjohnston | it shouldnt | 12:28 |
cjohnston | it *normally* works fine for me | 12:28 |
nigelb | cjohnston: er, basically, I'm trying to know what problem you fixed. | 12:28 |
cjohnston | but i get times where the header is misaligned | 12:29 |
nigelb | but that's probably because of something else right? | 12:29 |
nigelb | like the CSS not loading? | 12:30 |
nigelb | Also, you used px, I'd rather we used em, since lot of that code seems to be in em. | 12:30 |
cjohnston | I dont think so, because other than the header being misaligned it was fine.. I asked mhall119 what he thought it was, and that was his answer. | 12:31 |
nigelb | In that case, I'd rather have mhall119 +1-ing that. | 12:32 |
nigelb | I still don't know what you've fixed. | 12:32 |
cjohnston | ok.. im trying to get it to reproduce | 12:32 |
cjohnston | just defining the height of the white "mothership" | 12:32 |
nigelb | but the thing is, whether I put in or not, it works. | 12:33 |
nigelb | cjohnston: did we decide to hide the etherpad if the user wasn't logged in? | 12:50 |
cjohnston | I think it was only display the non-editable one | 12:52 |
Pendulum | win 31 | 13:01 |
Pendulum | fail :( | 13:01 |
nigelb | cjohnston: Where you around when mhall119 and I were discussing tarmac? | 13:16 |
cjohnston | im gonna say np | 13:17 |
cjohnston | no | 13:17 |
cjohnston | why | 13:21 |
nigelb | cjohnston: Do you know what it does? | 13:22 |
cjohnston | no | 13:22 |
nigelb | cjohnston: Okay, so tarmac does code landing. Once it has been approved (we can put workflows here - like two +1). We can also get it to run tests before its run etc. But essentially, this means once the code looks good, we can have tarmac land the changes | 13:23 |
cjohnston | gotcha | 13:23 |
cjohnston | similar to lp | 13:24 |
nigelb | yup | 13:24 |
nigelb | "Its like PQM but sucks less" - rockstar. | 13:24 |
nigelb | mhall119 and I were toying with the idea of running it on one of our machines and run every 1 hour. | 13:24 |
cjohnston | ic | 13:25 |
cjohnston | I could do it on mine if needed. | 13:25 |
cjohnston | nigelb: you should fix my wireless stuff | 13:25 |
nigelb | cjohnston: wireless and I have issues :_) | 13:25 |
cjohnston | me too as of a couple days ago | 13:26 |
nigelb | cjohnston: Anyway, what are your thoughts on using tarmac? | 13:27 |
cjohnston | Sounds good to me.. Atleast check it out and see how it works | 13:28 |
cjohnston | see if we like it | 13:28 |
nigelb | okay. I'll poke at this tonight | 13:28 |
nigelb | this would get our work out faster. | 13:28 |
nigelb | vednis: Hi, I mailed you yesterday about help with getting a testing suite for summit. Will you be having some free time to guide me on this? | 13:29 |
mhall119 | nigelb: we use px instead of em because the topnav height is px limited | 14:07 |
cjohnston | mornin mhall119 | 14:09 |
mhall119 | morning | 14:10 |
cjohnston | mhall119: I tried doing loaddata and it wanted fixtures | 14:15 |
cjohnston | I'm not really sure what that meant | 14:15 |
mhall119 | rename the file to loco_directory.json | 14:21 |
cjohnston | ok | 14:21 |
cjohnston | gotcha | 14:21 |
nigelb | mhall119: I was trying to figure out how that merge makes a difference. I couldn't find any difference with it applied and without, that's why I was hesitant | 14:34 |
cjohnston | nigelb: Install instructions for loco-directory to install in a virtualenv is done correct? | 14:35 |
nigelb | cjohnston: I haven't looked at it yet. mhall119 did it. | 14:35 |
cjohnston | o | 14:36 |
mhall119 | cjohnston: I wouldn't call it done, no, but there's some quick setup steps in the wiki | 14:36 |
nigelb | mhall119: could you link me to it? | 14:37 |
mhall119 | https://wiki.ubuntu.com/LoCoDirectory/Development#Using%20Virtualenv | 14:38 |
nigelb | cjohnston: IMPROGRESS -> clearly you need a spelling lesson :P | 14:39 |
nigelb | mhall119: thanks | 14:39 |
cjohnston | I Wanted to see if my app would email me | 14:39 |
cjohnston | hehe | 14:39 |
mhall119 | nigelb: that means it's making improper progress | 14:40 |
nigelb | haha | 14:41 |
nigelb | mhall119: How does writing it as a file inside the code base sound? | 14:46 |
nigelb | that way, we can point to people, bzr branch, and following instructions in $foo file. | 14:46 |
* nigelb hugs james_w again. | 14:47 | |
nigelb | :-) | 14:47 |
mhall119 | nigelb: I'd love to make it a bash script | 14:47 |
nigelb | mhall119: hrm, there are projects that do that. I'll poke around that idea later today. | 14:48 |
nigelb | mhall119: problem there is it might break workflow for those using virtualenvwrapper (like me) | 14:48 |
mhall119 | we use Fabric in ISD, but I don't think we need to make that a dependency for LTP or Summit | 14:48 |
nigelb | neither do I. | 14:48 |
nigelb | I've seen the ISD fabric scripts | 14:48 |
mhall119 | heh | 14:50 |
Daviey | mhall119: did you expand on what you wanted me for? | 14:54 |
mhall119 | Daviey: I just wanted to know what the reason for having a custom NameField type in Summit was | 14:58 |
Daviey | mhall119: where? | 14:59 |
Daviey | (where in summit) | 14:59 |
mhall119 | summitmodel.py Summit.name | 15:02 |
mhall119 | meetingmodel.py Meeting.name | 15:02 |
mhall119 | roommodel.py Room.name | 15:02 |
Daviey | mhall119: i'll have to check it out.. was it something i introduced? | 15:03 |
mhall119 | I don't know, it's been there for a while, so might have been pre-you | 15:04 |
mhall119 | but I figured you've been hacking on it longer than the rest of us, so you might know | 15:04 |
Daviey | currently tied up.. will look through it iab | 15:04 |
mhall119 | ok, thanks | 15:04 |
mhall119 | Daviey: also, do you know any good resources for learning ensemble? | 15:04 |
Daviey | mhall119: currently no.. it's being documented at the moment.. but not quite devops friendly. | 15:05 |
Daviey | mhall119: have you read Clint's blog post? | 15:05 |
mhall119 | nope | 15:05 |
Daviey | http://fewbar.com/2011/06/so-what-is-ensemble-anyway/ | 15:06 |
mhall119 | thanks | 15:07 |
daker | mhall119, any good/simple tuto on mod_wsgi and apache ? | 15:15 |
mhall119 | hmmm, not really tutorials, just config option descriptions | 15:19 |
mhall119 | I used those + existing configs as examples | 15:19 |
=== vednis is now known as mars | ||
cjohnston | Ronnie: ping | 15:20 |
Ronnie | cjohnston: pong | 15:20 |
cjohnston | https://code.launchpad.net/~ronnie.vd.c/ubuntu-community-webthemes/django-table-style/+merge/56763 | 15:20 |
cjohnston | We need to update the tables to follow the guidelines | 15:20 |
Ronnie | arent these like the guidelines | 15:21 |
Ronnie | i made them with the guidelines next to it | 15:21 |
daker | mhall119, any example of a working wsgi file and apache config ? | 15:22 |
cjohnston | The table headers should be #aea79f, text in the header should be ffffff | 15:22 |
mhall119 | daker: I can get you one | 15:22 |
daker | thanks | 15:23 |
Ronnie | cjohnston: can you make a comment to it, ill look another time to it | 15:24 |
cjohnston | ok | 15:24 |
cjohnston | are there any diff viewers that are really easy to view side by side changes? | 15:42 |
cjohnston | between two different files, not two different revisions | 15:42 |
mhall119 | nigelb or cjohnston: do you think you guys can help walk me through setting up launchpad on an ec2 instance at some point? | 15:42 |
nigelb | mhall119: any time. | 15:42 |
nigelb | mhall119: Its one script. just run it and you're good to go. | 15:42 |
cjohnston | I don't know that I know how | 15:43 |
mhall119 | cjohnston: I thought you set it up locally | 15:43 |
cjohnston | just to work on it, not run it | 15:43 |
mhall119 | nigelb: you got one running in a VM didn't you? | 15:43 |
nigelb | mhall119: I run it on my machine normally. | 15:43 |
mhall119 | good enough for me | 15:44 |
mhall119 | I'm planning on making an ensemble setup that's summit+launchpad and one that's LTP+launchpad | 15:44 |
mhall119 | running on ec2 | 15:44 |
cjohnston | yippie | 15:44 |
mhall119 | I wonder if I should add etherpad to the summit ensemble | 15:45 |
mhall119 | nigelb: AlanBell: are there working etherpad packages now? | 15:46 |
cjohnston | nigelb: it sucks that 'pad' is so UDS.. would be nice if there were two i guess | 15:46 |
nigelb | mhall119: yes | 15:46 |
mhall119 | in a ppa? | 15:46 |
nigelb | mhall119: yes | 15:46 |
nigelb | cjohnston: #blame AlanBell | 15:46 |
mhall119 | okay, I'll get that info from you when I'm ready for it | 15:47 |
Ronnie | cjohnston: you can use `meld` to view side by side changes in 2 or 3 files | 15:47 |
cjohnston | nigelb: if you create a team pad, it has an admin.. do you have to be part of the team to work on them | 15:47 |
cjohnston | ty Ronnie | 15:47 |
nigelb | cjohnston: depends on the permission per pad. | 15:48 |
cjohnston | gotcha | 15:48 |
nigelb | cjohnston: By default I think its restricted only to team. Can be changed per pad. | 15:48 |
nigelb | I don't about global though | 15:48 |
cjohnston | Ronnie: I have a bunch of the css already done that matches the guide from doing status.. I'm just moving that over for now.. since its already done.. plus i have a little insite to the new guidelines | 15:49 |
Ronnie | oh, are there coming any new guidelines | 15:49 |
cjohnston | yes | 15:49 |
Ronnie | cool | 15:49 |
cjohnston | Ronnie: thanks for meld.. very nice! | 15:50 |
Ronnie | yes, meld is really good | 15:51 |
cjohnston | Ronnie: https://code.launchpad.net/~chrisjohnston/ubuntu-community-webthemes/tables | 15:53 |
mhall119 | daker: http://people.ubuntu.com/~mhall119/wsgi/ | 15:55 |
daker | thanks ツ | 15:55 |
mhall119 | np, let me know if you have any questions | 15:55 |
daker | sure | 15:55 |
Ronnie | cjohnston: how are links being displayed in the tables? | 15:56 |
cjohnston | i dont understand | 15:56 |
Ronnie | <a href=""> what color do they have | 15:56 |
cjohnston | that hasnt changed | 15:56 |
Ronnie | an i also think its better to use tabel.basic (or something). not all tables are used as actual tables | 15:57 |
Ronnie | some are for layout, and does not need the lyout | 15:57 |
Ronnie | cjohnston: do you think you would be able to send a copy of the new (not released) guidelines? | 15:58 |
cjohnston | I don't have it | 16:00 |
Ronnie | oke | 16:01 |
cjohnston | All I have is a conversation with yaili when I was working on status :-/ | 16:01 |
cjohnston | And I did just confirm it with her again 15 minutes ago | 16:01 |
daker | mhall119, WSGIProcessGroup apps.mhall119.com <= apps.mhall119.com is the domaine name ? | 16:02 |
mhall119 | it doesn't have to be, it's just a unique name for the process group | 16:04 |
mhall119 | the examples I saw used the site FQDN, to make sure you don't end up with conflicts if you run multiple vhosts | 16:05 |
daker | ah ok | 16:11 |
daker | mhall119, is mhall119.com hosted on amazon ? | 16:32 |
mhall119 | daker: yup | 16:43 |
mhall119 | t1.micro | 16:43 |
daker | is it powerful ? | 16:45 |
mhall119 | not really | 16:45 |
mhall119 | but it'll run a few websites with low traffic just fine | 16:46 |
mhall119 | and it's free for a year | 16:46 |
mhall119 | can't beat that | 16:46 |
mhall119 | http://aws.amazon.com/free/ | 16:47 |
daker | mhall119, is it safe to give them the CC ? since i don't trust anyone after sony has been hacked | 16:53 |
cjohnston | daker: its amazon.. id say so | 17:00 |
cjohnston | well.. as safe as it can be | 17:00 |
mhall119 | CC? | 17:06 |
mhall119 | oh, credit card | 17:06 |
mhall119 | nobody is perfectly safe, but you gotta trust someone or else not participate in online commerce | 17:07 |
daker | :/ | 17:07 |
mhall119 | mainly the problem is with the whole credit card model | 17:07 |
* mhall119 wants a PKI-enabled payment service | 17:08 | |
daker | i think i'll run a website | 17:17 |
cjohnston | Do we want 'My Teams' to show in the top nav even when the user isnt logged in, and just redirect them to login first? | 17:27 |
=== daker is now known as daker_ | ||
cjohnston | would someone mind reviewing https://code.launchpad.net/~chrisjohnston/loco-directory/vevent/+merge/61021 real quick please | 18:47 |
mhall119 | approved, I assume you tested it | 18:54 |
cjohnston | ya | 18:55 |
cjohnston | mhall119: Ronnie nigelb any idea why this is causing conflicting files? https://code.launchpad.net/~ronnie.vd.c/ubuntu-community-webthemes/django-forms/+merge/53998 | 19:18 |
cjohnston | Conflict adding file media/images/error.png. Moved existing file to media/images/error.png.moved. | 19:18 |
cjohnston | Conflict adding file media/images/gradient.png. Moved existing file to media/images/gradient.png.moved. | 19:18 |
cjohnston | Conflict adding file media/images/help.png. Moved existing file to media/images/help.png.moved. | 19:18 |
cjohnston | Conflict adding file templates/form.html. Moved existing file to templates/form.html.moved. | 19:18 |
cjohnston | so mhall119, I have to specify what revision of the theme I want to download? | 19:38 |
Ronnie | cjohnston: i think i did something wrong with one of my merges, but dont excactly know what | 19:39 |
cjohnston | with that one Ronnie if I tried it in a clean branch it worked | 19:39 |
Ronnie | hmmz | 19:40 |
mhall119 | cjohnston: you don't need a specific rev number, no | 19:46 |
mhall119 | I think -1 will give you the latest | 19:47 |
cjohnston | it was set at 32 | 19:47 |
cjohnston | i updated it to 35 | 19:47 |
mhall119 | right, it's probably a good idea to peg the theme at a specific rev, since we may do stuff for, say, summit that isn't ready to go into LTP | 19:47 |
cjohnston | have i given out enough spam today? | 19:47 |
mhall119 | dunno, I don't see any of it | 19:48 |
cjohnston | mhall119: are we planning on upgrading summit to use bzr apps? | 19:48 |
cjohnston | mhall119: https://code.launchpad.net/loco-directory/+activereviews look at what we are down to | 19:48 |
mhall119 | I would like to, yes | 19:48 |
cjohnston | cool | 19:48 |
cjohnston | mhall119: nigelb thoughts... ? https://code.launchpad.net/~akshaytayal/loco-directory/fixes-616383/+merge/54246 looks like http://dl.dropbox.com/u/2494160/Selection_013.png | 19:56 |
cjohnston | I kinda like somethign like http://dl.dropbox.com/u/2494160/2011-06-10_14-55-14_739.jpg better | 19:57 |
nigelb | cjohnston: you'er project manager, pick one ;) | 19:57 |
cjohnston | whos project manager, what? https://launchpad.net/community-web-projects | 19:59 |
cjohnston | read the text | 19:59 |
cjohnston | not the driver | 19:59 |
cjohnston | driver just means that nigelb forces me to do it all | 20:00 |
nigelb | basically we're unanimously forcing you to do all LD work :P | 20:00 |
nigelb | WTF. | 20:00 |
nigelb | cjohnston: when did you add that in? | 20:00 |
cjohnston | ;-) | 20:00 |
cjohnston | seriously tho, id like feedback | 20:01 |
nigelb | cjohnston: what you like the one that looks like LP right? | 20:03 |
cjohnston | yup | 20:03 |
cjohnston | the screenshot, imo contains text thats way too small, and there is no deliniation between the columns or anything | 20:04 |
nigelb | I agree. | 20:05 |
nigelb | If we're going with the first one, at least there needs to be some sort of alternate background color or something | 20:05 |
cjohnston | thats not allowed for in the guidelines | 20:06 |
mhall119 | cjohnston: simple way to choose, which one has code? | 20:06 |
cjohnston | true.. but this is just changing theming.. so not bad | 20:07 |
nigelb | mhall119: I was getting there :) | 20:08 |
nigelb | mhall119, cjohnston: I'm trying out tarmac with summit. If something breaks, I'll back it out manually :-) | 20:36 |
nigelb | So far, its *totally* awesome. | 20:36 |
nigelb | We can be much much more productive with this. | 20:36 |
nigelb | mhall119, cjohnston: w00t, this is awesome!! | 20:38 |
nigelb | https://code.launchpad.net/~summit-hackers/summit/trunk | 20:38 |
nigelb | I think I need to tweak the commit format a bit but otherwise awesome. | 20:39 |
cjohnston | cool | 20:39 |
cjohnston | can you setup the one instance to do LTP and summit | 20:40 |
cjohnston | and do you have the system, the connection, and the uptime to be the provider? | 20:40 |
nigelb | cjohnston: I do. | 20:41 |
cjohnston | sweet | 20:42 |
nigelb | cjohnston: look at the last 2 changelog entries for summit. | 20:44 |
nigelb | cjohnston: Better way to track who committed and who reviewed :-) | 20:44 |
cjohnston | cool | 20:45 |
cjohnston | and how does it test it | 20:46 |
nigelb | cjohnston: we can add hooks for it to run tests if any. | 20:47 |
cjohnston | mhall119: if os.path.isdir(os.path.join(path, "bzr_apps", ".bzr")): where is path defined? | 20:49 |
cjohnston | nm | 20:50 |
cjohnston | i found t | 20:50 |
cjohnston | it | 20:50 |
mhall119 | nigelb: \o/ | 21:00 |
nigelb | mhall119: setting up a cron now | 21:03 |
nigelb | I'll email the list about this soonish :) | 21:03 |
cjohnston | nigelb: does it only accept reviews from authorized reviewers? | 21:04 |
nigelb | mhall119: ^^ | 21:04 |
nigelb | cjohnston: if it doesn't do it already, I can write the code to do it by Monday ;) | 21:16 |
nigelb | cjohnston: Do you want me to disable it till that happens? | 21:17 |
cjohnston | i think so | 21:19 |
cjohnston | its easy enough to revert out | 21:19 |
cjohnston | but we shouldnt just let anyone commit either | 21:20 |
nigelb | cjohnston: I tend to agree. I just checked out the plugin system. I can hack on it tomorrow and get it reviewed by rockstar on Monday. | 21:25 |
cjohnston | cool | 21:25 |
nigelb | cjohnston: anymore thoughts on https://code.launchpad.net/~nigelbabu/summit/782062-fix-naming/+merge/62044 | 21:26 |
nigelb | cjohnston: only . causes breakage, + doesn't | 21:26 |
cjohnston | When i tried yesterday, iw as getting breakage yesterday | 21:27 |
nigelb | cjohnston: yes, because you hadn't fixed your already existing database entries | 21:28 |
S[h]O[r]T | can someone fix the 404 on this URL? :) https://help.ubuntu.com/11.04/installation-guide/example-preseed.txt. It is linked from https://help.ubuntu.com/11.04/installation-guide/amd64/preseed-contents.html | 21:30 |
cjohnston | S[h]O[r]T: you will need to talk to the docs team #ubuntu-docs | 21:30 |
S[h]O[r]T | ill hop over there then, thanks | 21:30 |
nigelb | mdke would be the person you might to ping about this. | 21:30 |
nigelb | cjohnston: merging that branch will not fix your problems :) | 21:34 |
nigelb | cjohnston: merging the branch, deleting the db, and getting data from LP again will though. | 21:34 |
cjohnston | umm.. soo it isnt going to fix anything thats already happened in summit | 21:36 |
nigelb | No | 21:36 |
nigelb | It will fix the future imports to be correct | 21:37 |
mhall119 | cjohnston: only people on the owning team can change it to approved | 21:38 |
cjohnston | ? | 21:39 |
cjohnston | the merge? | 21:39 |
cjohnston | ok | 21:39 |
mhall119 | IIRC, tarmac only merged branched that have status==Approved | 21:39 |
mhall119 | and only people on the team can do that | 21:39 |
cjohnston | ok.. so not just a review == approved | 21:39 |
nigelb | no | 21:39 |
cjohnston | then +1 | 21:39 |
nigelb | okay, all set | 21:39 |
=== head_v is now known as head_victim | ||
cjohnston | how can I make django create an account upon login if there isnt one | 22:57 |
cjohnston | create a user profile i guess | 22:57 |
Ronnie | cjohnston: there is an <<<<<< TREE in newstyle.css, i guess some wrong merge? | 23:54 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!