Friday, 2010-10-08

*** JoiIto has quit IRC00:04
*** akozak has joined #cc00:31
*** JoiIto has joined #cc01:07
*** mralex has quit IRC01:22
*** akozak has quit IRC01:22
*** oshani has quit IRC01:39
*** DNS777 has quit IRC01:40
*** JoiIto has quit IRC01:40
*** DNS777 has joined #cc01:40
*** DNS777 has joined #cc01:40
*** oshani has joined #cc01:42
*** mralex has joined #cc01:52
*** mralex has joined #cc01:52
*** mralex has left #cc01:52
*** nkinkade has quit IRC02:17
*** nkinkade1 has joined #cc02:19
*** nkinkade1 has left #cc02:24
*** niekie has quit IRC03:36
*** nb has quit IRC03:36
*** niekie has joined #cc03:38
*** nb has joined #cc03:41
*** JoiIto has joined #cc03:52
*** JoiIto has quit IRC05:05
*** phurl_ has joined #cc05:21
*** Kaetemi has quit IRC06:16
*** oshani has quit IRC06:30
*** MarkDude has quit IRC08:48
*** karlcow has quit IRC08:54
*** enrry has joined #cc09:11
enrryhi all!09:12
*** nb has quit IRC09:15
*** nb has joined #cc09:25
*** thisisparker has joined #cc09:27
*** thisisparker has quit IRC10:08
*** thisisparker has joined #cc10:09
enrrysee you later!10:32
*** enrry has quit IRC10:32
*** thisisparker has quit IRC10:41
*** sudiptamondal has joined #cc11:05
*** thisisparker has joined #cc11:14
*** wormsxulla has quit IRC11:16
*** sudiptamondal has quit IRC11:20
*** wormsxulla has joined #cc11:21
*** JoiIto has joined #cc11:58
*** karlcow has joined #cc12:05
*** bassel has joined #cc12:21
*** JoiIto has quit IRC12:41
*** bassel has quit IRC13:01
*** tvol has joined #cc13:06
*** kreynen has joined #cc13:13
*** thisisparker has quit IRC13:24
*** erlehmann has joined #cc13:25
*** erlehmann has quit IRC13:28
*** erlehmann has joined #cc13:30
*** thisisparker has joined #cc13:31
*** Kaetemi has joined #cc13:44
*** Kaetemi has joined #cc13:44
*** thisisparker has quit IRC13:46
*** karlcow has quit IRC14:15
*** JoiIto has joined #cc14:16
*** karlcow has joined #cc14:25
*** karlcow has quit IRC14:42
*** Guest80112 is now known as cB14:55
*** cB is now known as Guest6789214:55
*** nkinkade has joined #cc14:55
*** karlcow has joined #cc14:59
*** JoiIto has quit IRC15:03
paroneayeanyergler: you around? :O15:11
*** karlcow has quit IRC15:19
CC_HudsonProject License RDF and Tools build (16): SUCCESS in 51 sec: http://code.creativecommons.org/hudson/job/License%20RDF%20and%20Tools/16/15:31
CC_Hudson* Christopher Allan Webber: Stub pdmark RDF15:31
CC_Hudson* Christopher Allan Webber: New merged index.rdf15:31
CC_Hudson* Christopher Allan Webber: Adding i18n title assertion for pdmark license rdf15:31
CC_Hudson* Christopher Allan Webber: Ran Public Domain Mark through the translation machinery15:31
CC_Hudson* Christopher Allan Webber: Fixing public domain mark URL and logo urls15:31
CC_Hudson* Christopher Allan Webber: license code pdmark->mark... nathan has declared it!15:31
CC_Hudson* Christopher Allan Webber: Public Domain Mark has a version number now.. 1.0! ;p15:31
CC_Hudson* Christopher Allan Webber: Using /p/mark/ instead of /l/mark/ for the logos.  See conversation in15:31
CC_Hudson* Christopher Allan Webber: Was missing dcq and foaf namespaces, hehhhhh15:31
CC_Hudson* Christopher Allan Webber: New merged index.rdf15:31
CC_Hudson* Christopher Allan Webber: Moving publicdomain mark rdf to the right filename15:31
CC_Hudson* Christopher Allan Webber: This version of Public Domain Mark is 1.0 baby, let the world know15:31
CC_Hudson* Christopher Allan Webber: Ran pdmark 1.0 through the translation machinery again15:31
CC_Hudson* Christopher Allan Webber: New merged index.rdf15:31
CC_Hudson* Christopher Allan Webber: New version number15:31
CC_Hudson* Christopher Allan Webber: /l/zero/ -> /p/zero/ ... see roundup 651.  Icon timeline paradox... prevented!15:31
CC_Hudson* Christopher Allan Webber: New merged index.rdf15:31
CC_HudsonProject cc.license build (33): SUCCESS in 2 min 26 sec: http://code.creativecommons.org/hudson/job/cc.license/33/15:35
CC_Hudson* Christopher Allan Webber: Early work on the Public Domain Mark formatter15:35
CC_Hudson* Christopher Allan Webber: Adding tests for the pdmark formatter15:35
CC_Hudson* Christopher Allan Webber: Removing old cc0 template garbage from pdmark.html15:35
CC_Hudson* Christopher Allan Webber: Closer to a first passing test15:35
CC_Hudson* Christopher Allan Webber: Fixed the expected output text so that it includes newlines.15:35
CC_Hudson* Christopher Allan Webber: Wrote documentation for the other fields and added their extraction15:35
CC_Hudson* Christopher Allan Webber: clarified that waive_cc0 is expected to be a boolean.15:35
CC_Hudson* Christopher Allan Webber: Public Domain Mark should actually be at15:35
CC_Hudson* Christopher Allan Webber: That old hack is no longer relevant and thus removed15:35
CC_Hudson* Christopher Allan Webber: we should be testing with the mark license here15:35
CC_Hudson* Christopher Allan Webber: license_info should be license_code here15:35
CC_Hudson* Christopher Allan Webber: Switching out that KeyError handling for checking the dictionary,15:35
CC_Hudson* Christopher Allan Webber: We're going to put the pdmark logo under /p/, not /l/15:35
CC_Hudson* Christopher Allan Webber: Adjusting unit test to expect logo in /p/ rather than /l/15:35
CC_Hudson* Christopher Allan Webber: norms_href and work_href both being axed15:35
CC_Hudson* Christopher Allan Webber: Oh right, also gotta remove those fields from the template.render call!15:35
CC_Hudson* Christopher Allan Webber: Put in msgids for the bodily text of the pdmark formatter15:35
CC_Hudson* Christopher Allan Webber: Forgot a close quote ;(15:36
CC_Hudson* Christopher Allan Webber: Whoops, forgot to add EXPECTED_PDMARK_CURATOR15:36
CC_Hudson* Christopher Allan Webber: Urg, EXPECTED_PDMARK_CURATOR -> EXPECTED_PDMARK_CURATOR_NOLINK15:36
CC_Hudson* Christopher Allan Webber: Corrected the test for EXPECTED_PDMARK_CURATOR_NOLINK15:36
CC_Hudson* Christopher Allan Webber: [_:curator] should be [_:publisher]15:36
CC_Hudson* Christopher Allan Webber: Accidental space inserted there.15:36
CC_Hudson* Christopher Allan Webber: A buildout config to prevent all the errors on hudson..15:36
CC_Hudson* Nathan R. Yergler: Removing duplicated lines; we extend the main buildout.cfg.15:36
CC_Hudson* Christopher Allan Webber: We're not using Jinja2 for PDM anymore..15:36
CC_Hudson* Christopher Allan Webber: Free of copyright -> free of known copyright15:36
CC_Hudson* Christopher Allan Webber: Changing creator->author and {author|curator}->{author|curator}_title15:36
CC_Hudson* Christopher Allan Webber: New development version number15:36
CC_Hudson* Christopher Allan Webber: Adding a colon here per Roundup 13515:36
CC_Hudson* Christopher Allan Webber: Adding a colon here per Roundup 13515:36
CC_Hudson* Christopher Allan Webber: New development version #15:36
CC_Hudson* Christopher Allan Webber: Merged pdmark, new version number15:36
paroneayeawhew look at all dem commits15:37
CC_HudsonProject cc.license build (34): SUCCESS in 1 min 47 sec: http://code.creativecommons.org/hudson/job/cc.license/34/15:38
CC_Hudson* Christopher Allan Webber: Early work on the Public Domain Mark formatter15:38
CC_Hudson* Christopher Allan Webber: Adding tests for the pdmark formatter15:38
CC_Hudson* Christopher Allan Webber: Removing old cc0 template garbage from pdmark.html15:38
CC_Hudson* Christopher Allan Webber: Closer to a first passing test15:38
CC_Hudson* Christopher Allan Webber: Fixed the expected output text so that it includes newlines.15:38
CC_Hudson* Christopher Allan Webber: Wrote documentation for the other fields and added their extraction15:38
CC_Hudson* Christopher Allan Webber: clarified that waive_cc0 is expected to be a boolean.15:38
CC_Hudson* Christopher Allan Webber: Public Domain Mark should actually be at15:38
CC_Hudson* Christopher Allan Webber: That old hack is no longer relevant and thus removed15:38
CC_Hudson* Christopher Allan Webber: we should be testing with the mark license here15:38
CC_Hudson* Christopher Allan Webber: license_info should be license_code here15:38
CC_Hudson* Christopher Allan Webber: Switching out that KeyError handling for checking the dictionary,15:38
CC_Hudson* Christopher Allan Webber: We're going to put the pdmark logo under /p/, not /l/15:38
CC_Hudson* Christopher Allan Webber: Adjusting unit test to expect logo in /p/ rather than /l/15:38
CC_Hudson* Christopher Allan Webber: norms_href and work_href both being axed15:38
CC_Hudson* Christopher Allan Webber: Oh right, also gotta remove those fields from the template.render call!15:38
CC_Hudson* Christopher Allan Webber: Put in msgids for the bodily text of the pdmark formatter15:38
CC_Hudson* Christopher Allan Webber: Tests for creator and curator, with, without, and only with, links15:38
CC_Hudson* Christopher Allan Webber: Forgot a close quote ;(15:38
CC_Hudson* Christopher Allan Webber: Whoops, forgot to add EXPECTED_PDMARK_CURATOR15:38
CC_Hudson* Christopher Allan Webber: Urg, EXPECTED_PDMARK_CURATOR -> EXPECTED_PDMARK_CURATOR_NOLINK15:38
CC_Hudson* Christopher Allan Webber: Corrected the test for EXPECTED_PDMARK_CURATOR_NOLINK15:38
CC_Hudson* Christopher Allan Webber: [_:curator] should be [_:publisher]15:38
CC_Hudson* Christopher Allan Webber: Accidental space inserted there.15:38
CC_Hudson* Christopher Allan Webber: A buildout config to prevent all the errors on hudson..15:38
CC_Hudson* Nathan R. Yergler: Install coverage along with our egg.15:38
CC_Hudson* Nathan R. Yergler: Ignore coverage and test report files.15:38
CC_Hudson* Nathan R. Yergler: A basic buildout.devel.cfg for master.15:38
CC_Hudson* Nathan R. Yergler: Removing duplicated lines; we extend the main buildout.cfg.15:38
CC_Hudson* Christopher Allan Webber: We're not using Jinja2 for PDM anymore..15:38
CC_Hudson* Christopher Allan Webber: Free of copyright -> free of known copyright15:38
CC_Hudson* Christopher Allan Webber: Changing creator->author and {author|curator}->{author|curator}_title15:38
CC_Hudson* Christopher Allan Webber: New development version number15:38
CC_Hudson* Christopher Allan Webber: Adding a colon here per Roundup 13515:38
CC_Hudson* Christopher Allan Webber: Adding a colon here per Roundup 13515:38
nkinkadeMy god CC_Hudson is the most annoying thing ever ... not only does it flood email messages, but also pollutes #cc.15:39
greg-g:) transparency, nkinkade, its called "transparency" not "pollution"15:47
paroneayeait's more semi-transparent pollution15:48
paroneayeaa smog, of sorts15:48
nkinkadeTransparency?  To who?  All 33 people who hang out in #cc?  Our git and subversion repositories are public and much more complete than these useless messages posted #cc.15:50
paroneayeait actually would be pretty nice if CC_Hudson only reported when a build failed15:51
greg-gnkinkade: I was joking :)15:51
greg-gparoneayea++15:51
nkinkade;-)15:51
paroneayeaanyway, I'm about to merge the cc.engine pdmark branch and push it15:51
*** Kaetemi has quit IRC15:51
paroneayeathe worst is yet to come! ;D15:51
nkinkadeI'm mostly just playing my well defined role of curmudgeon.15:51
greg-g:)15:52
nkinkadeBut I'm not lying when I say those commit messages are annoying, distract from actual conversations in #cc, and are generally worthless to just about everyone.15:52
paroneayeanyergler: ^^^^ see this conversation when you get online :)15:52
nkinkadeWe already get them at cc-commits@ via email, and anyone can view them at code.CC.org.15:52
nkinkadeIf someone can tell me one instance where a commit message posted to #cc made the difference between something working and not working, or the difference between a grave error being discovered and it not, then I won't say another word about it.15:54
paroneayeankinkade: I still contend that CC_Hudson would be immensely helpful if it only spoke when builds failed in #cc.15:54
nkinkadeparoneayea: That makes good sense to me.15:54
nkinkadeAnd I agree fully.15:54
greg-gnkinkade: well, no in #cc, but I every now and then read the cc-commits mail and caught an error in a license text change that could have been bad15:55
greg-gnot* in15:55
nkinkadegreg-g: Right, but I'm talking about messages to #cc, not the emails. :-)15:55
greg-gyeah yeah, just saying :)15:55
nkinkadeAnd what does that have to do with the price of tea in China?15:55
nkinkade;-)15:56
greg-gmaybe push hudson into #cc-commits ;)15:56
nkinkadeJust more pollution, if you ask me. :-)15:56
greg-g:)15:56
greg-gand on that note, time for lunch!15:56
* greg-g waves15:56
* paroneayea waves back15:56
* greg-g agress with paroneayea and nkinkade, for the record15:56
*** Guest67892 is now known as cB15:56
*** cB is now known as Guest1788115:57
*** erlehmann has quit IRC15:57
nkinkadeJust to be sure, it's not *that* big a deal, but I happened to be looking at #cc when a barrage of 50+ messages spewed into the channel, and it prompted me to comment.15:58
paroneayeatru enuf15:58
paroneayeanow brace yourself for another 200 :)15:58
paroneayeaI just merged pdmark in cc.engine!15:58
CC_HudsonProject cc.engine build (162): SUCCESS in 7 min 31 sec: http://code.creativecommons.org/hudson/job/cc.engine/162/16:02
CC_HudsonChristopher Allan Webber: Als9o apply that new deprecation phrasing to devnations_deed.pt16:02
paroneayeaals9o16:03
paroneayealearn to spell, cwebber16:03
paroneayeaLOLLLL16:03
CC_HudsonProject cc.engine build (163): SUCCESS in 5 min 16 sec: http://code.creativecommons.org/hudson/job/cc.engine/163/16:08
CC_Hudson* Christopher Allan Webber: Early version of the pdmark chooser landing16:08
CC_Hudson* Christopher Allan Webber: Adding zope.pagetemplate to setup.py (no longer a dependency in cc.license)16:08
CC_Hudson* Christopher Allan Webber: Template for the Public Domain Mark landing page16:08
CC_Hudson* Christopher Allan Webber: Early version of pdmark results page.  Still has some cc0 stuff left in it.16:08
CC_Hudson* Christopher Allan Webber: license code for public domain mark has gone from pdmark -> mark16:08
CC_Hudson* Christopher Allan Webber: pdmark results template updated to show the right (but currently nonexistant) logos16:08
CC_Hudson* Christopher Allan Webber: Yikes, that extra form shouldn't have been there16:08
CC_Hudson* Christopher Allan Webber: This one either!16:08
CC_Hudson* Christopher Allan Webber: Removing norms url and work url fields based on bugtracker / email conversations16:08
CC_Hudson* Christopher Allan Webber: Changing "your work" to "the marked work" in the (i) button16:08
CC_Hudson* Christopher Allan Webber: Added slightly-modified-from-cc0 metadata lead-in text, per diane's email16:08
CC_Hudson* Christopher Allan Webber: Alex Robert's pdmark mockup, without really any modifications.  We'll16:08
paroneayeaoh here we go16:08
CC_Hudson* Christopher Allan Webber: Trying to make this more like an actually extensible template16:08
CC_Hudson* Christopher Allan Webber: Some progress toward rendering the pdmark deed, though not rendering yet16:08
CC_Hudson* Christopher Allan Webber: Finally cleaned up this file so that it's semi-sort-of-valid-xml.16:08
CC_Hudson* Christopher Allan Webber: Some of the resources display!  Things are starting to be pretty!16:08
CC_Hudson* Christopher Allan Webber: PDMark and CC0 using the same base template?  HELLLLS YEAH16:08
CC_Hudson* Christopher Allan Webber: Add ccREL stuff at bottom of pdmark_deed.pt, as in zero_deed.pt16:08
CC_Hudson* Christopher Allan Webber: You use this tool at /choose/mark/16:08
CC_Hudson* Christopher Allan Webber: Adding labels for the different sections of the pdmark chooser16:08
CC_Hudson* Christopher Allan Webber: Removing the waive-under-cc0 bit from the chooser16:08
CC_Hudson* Christopher Allan Webber: Simple docstrings for the Public Domain Mark chooser views16:08
CC_Hudson* Christopher Allan Webber: Docstring for deed view16:08
CC_Hudson* Christopher Allan Webber: Added some comments for readability to the main deed view16:08
CC_Hudson* Christopher Allan Webber: Reproduced the generic view tests as simple JSON16:08
CC_Hudson* Christopher Allan Webber: JSON files use double quotes, not single... right16:08
CC_Hudson* Christopher Allan Webber: Switched testing code over to using the json file16:08
CC_Hudson* Christopher Allan Webber: Now we're able to test for strings in the body of a response!16:08
CC_Hudson* Christopher Allan Webber: Adding data for testing PDM deed.16:08
CC_Hudson* Christopher Allan Webber: Removing the extra comma and newline which broke the json parser16:08
CC_Hudson* Christopher Allan Webber: Test against the unicode body of the response16:08
CC_Hudson* Christopher Allan Webber: String tests for public domain mark chooser16:08
CC_Hudson* Christopher Allan Webber: Extended tests for chooser for when all fields filled out16:08
paroneayeacommit party all up in here16:08
CC_Hudson* Christopher Allan Webber: Fixing templates: just creator and curator, not creator_name & curator_name16:08
CC_Hudson* Christopher Allan Webber: Urp, accidentally changed the translation strings instead of the input16:08
CC_Hudson* Christopher Allan Webber: We were missing a close </div>16:08
CC_Hudson* Christopher Allan Webber: Not sure why we're having such terrible spacing issues... trying adding a <br /> here...16:08
CC_Hudson* Christopher Allan Webber: Removing the re import; unused16:08
CC_Hudson* Christopher Allan Webber: Make the test variable generic, might as well just set one variable to16:08
CC_Hudson* Christopher Allan Webber: Some mailbox test machinery and documentation.16:08
CC_Hudson* Christopher Allan Webber: Updating send_email to populate test inboxes; adding some more docs16:08
CC_Hudson* Christopher Allan Webber: Moved _activate_testing() out of ZPT testing area16:09
CC_Hudson* Christopher Allan Webber: self needs to be first argument of sendmail method, doh16:09
CC_Hudson* Christopher Allan Webber: Tests for util.send_email().16:09
CC_Hudson* Christopher Allan Webber: call util._clear_test_inboxes at *start* of fucntion16:09
CC_Hudson* Christopher Allan Webber: license_title, not license_name16:09
CC_Hudson* Christopher Allan Webber: Test for util.send_license_info_email16:09
CC_Hudson* Christopher Allan Webber: The id of this route was a duplicate, and also wrong.16:09
CC_Hudson* Christopher Allan Webber: Converted all the relevant views to use util.send_license_info_email16:09
CC_Hudson* Christopher Allan Webber: We won't have an email subscription option for Public Domain Mark.16:09
CC_Hudson* Christopher Allan Webber: successful_send is returned by util.send_license_info_email, so..16:09
CC_Hudson* Christopher Allan Webber: Require simplejson, since we'll need it in non-py2.6 environments16:09
CC_Hudson* Christopher Allan Webber: license.title should be license.title(target_lang)16:09
CC_Hudson* Christopher Allan Webber: Updating deed.zero.patent per alex's mockups16:09
CC_Hudson* Christopher Allan Webber: No endorsement text, and also publicity rights -> other rights16:09
CC_Hudson* Christopher Allan Webber: Namespacing these other_info blocks of text16:09
CC_Hudson* Christopher Allan Webber: Accidentally removed a <ul>16:09
CC_Hudson* Christopher Allan Webber: Added the "no warranty" other info helptext16:09
CC_Hudson* Christopher Allan Webber: Adding the endorsement popup16:09
CC_Hudson* Christopher Allan Webber: Updating the css style for the other-information header16:09
CC_Hudson* Christopher Allan Webber: Added the last paragraph to the CC0 deed disclaimer16:09
CC_Hudson* Christopher Allan Webber: Changing the order of the 2nd and 3rd other info bullets16:09
CC_Hudson* Christopher Allan Webber: Changing disclaimer bullet text per diane's email16:09
CC_Hudson* Christopher Allan Webber: Change to pop-up disclaimer text based on diane's email16:09
CC_Hudson* Christopher Allan Webber: target_lang wasn't being passed into publicdomain_result, page wasn't16:09
CC_Hudson* Christopher Allan Webber: help_rights_help stuff seems to be historical, removing16:09
CC_Hudson* Christopher Allan Webber: work details block16:09
CC_Hudson* Christopher Allan Webber: Changing anchors->spans (some meta details may be w/o link) and moving ids to the spans16:09
CC_Hudson* Christopher Allan Webber: Display:none on work details div16:09
CC_Hudson* Christopher Allan Webber: Added the norms and CC0 bits16:09
CC_Hudson* Christopher Allan Webber: The pdtool deeds use pddeed.js16:09
CC_Hudson* Christopher Allan Webber: Removing the paragraph elements at Doig's request16:09
CC_Hudson* Christopher Allan Webber: Throwing an id on the work details title16:09
CC_Hudson* Christopher Allan Webber: Changing helptext for affirmer per diane's email16:09
CC_Hudson* Christopher Allan Webber: Deleting learn more link in affirmer per diane's email16:09
CC_Hudson* Christopher Allan Webber: Goodbye CC0 (on PDM), we'll miss you16:09
CC_Hudson* Christopher Allan Webber: adding these separation divs per nathan's suggestion to fix the header-overlap-problem-thing16:09
CC_Hudson* Christopher Allan Webber: Moved what *was* the index (form) of pdmark to /choose/mark/details16:09
CC_Hudson* Christopher Allan Webber: Adding the /choose/mark intro page16:09
CC_Hudson* Nathan R. Yergler: Added buildout.devel.cfg so master will build on Hudson.16:09
CC_Hudson* Nathan R. Yergler: Install coverage during buildout.16:09
CC_Hudson* Christopher Allan Webber: Changes to /publicdomain/ per diane's document16:09
CC_Hudson* Christopher Allan Webber: Mark intro text paragraphs on /choose/mark/ for translation16:09
CC_Hudson* Christopher Allan Webber: Textual changes to /choose/ re: diane's doc16:09
CC_Hudson* Christopher Allan Webber: Bold the fact that this isn't a registration process.  It isn't!16:09
CC_Hudson* Christopher Allan Webber: "free of copyright" -> "free of known copyright"16:09
CC_Hudson* Christopher Allan Webber: Removing "Translations" link at top of deeds, per mike's request16:09
CC_Hudson* Christopher Allan Webber: Changing your->you hedre per diane's email16:09
CC_Hudson* Christopher Allan Webber: Removing phrase "if more than one", per diane's email16:09
CC_Hudson* Christopher Allan Webber: PDDC: now retired (and spending its days relaxing on a beach in Florida)16:09
CC_Hudson* Christopher Allan Webber: Oops, forgot to close this <h3>16:09
CC_Hudson* Christopher Allan Webber: REVERTME POSTLAUNCH: temporarily removing the msgids on deed.retired16:09
CC_Hudson* Christopher Allan Webber: We've retired the Publicdomain Certification!  Let chooser users know!16:09
CC_Hudson* Christopher Allan Webber: New deprecation phrasing16:09
CC_Hudson* Christopher Allan Webber: Als9o apply that new deprecation phrasing to devnations_deed.pt16:10
CC_Hudson* Christopher Allan Webber: New version number, pdmark merge!16:10
paroneayeankinkade: CC_Hudson noisy, I don't know what you're talking about16:10
nyerglerJHFC, just ask nicely and i'll make it only report failures16:10
paroneayea:D16:10
nyerglerparoneayea: have you merged cc.license yet?16:11
paroneayeanyergler: yes16:11
nyergler(and licenserdf, IIRC)16:11
paroneayeaand yes16:11
nyerglerb16:11
paroneayeab⍢d16:11
paroneayeatwo thumbs up16:11
nyerglerdb16:12
nyerglerthumb up fist bump16:12
paroneayea⍢db⍢16:12
paroneayea\⍢db⍢/16:12
nyerglerHudson will now only report failures and subsequent fixes to IRC16:13
paroneayea㎭ 2 thumbs up b益d16:13
paroneayeayay16:13
paroneayeathx nyergler !16:14
paroneayeanyergler: am I clear for go-live then?16:14
paroneayeaJED3: your js stuff is done?16:14
paroneayeaand committed and stuff16:14
nyerglerI think deedscraper needs merged, deployed, right?16:15
nyerglerregardless, we should be able to go live and just not have deed scraping at the moment16:15
nyerglerlet me look @ the checklist16:15
paroneayeaꙨ◦Ꙩ ~♪16:15
nyerglerparoneayea: have you or nkinkade merged the assets into trunk for ccwordpress?16:15
paroneayeankinkade did16:16
nyergler(i know i saw them committed yesterday, not sure if they were merged)16:16
paroneayeaoh16:16
paroneayeamerged, I dunno!16:16
paroneayeaI don't know the process for that16:16
paroneayeayou know I don't think I've ever done an svn branch merge16:16
nyergler:)16:16
nyerglerwe use svnmerge, which makes life much better (IMO)16:16
nyergleri'll check16:16
nyerglerlooks like that's just in trunk16:17
paroneayea16:17
nyerglernkinkade: if you're around and able to merge that to production, that'd be great; i'm updating my working copy now16:18
nyerglerso i can if you're busy16:18
*** oshani has joined #cc16:21
* nyergler is still running svn up16:24
nyergler<paroneayea> als9o16:29
nyergler<paroneayea> learn to spell, cwebber16:29
nyerglerisn't that spelled with a silent "9"?16:29
paroneayea:)16:29
paroneayeaoh right16:29
paroneayeaI should lay off teh cwebbers16:29
nyergleri don't know, if you lay off he'll probably just slack off16:29
nyergler;)16:29
paroneayeayeah, that guy...16:30
nkinkadenyergler: paroneayea:  Yeah, I can merge that commit to production from yesterday ... should I go ahead with that right now?16:34
nyerglernkinkade: yes, please16:34
nyerglerparoneayea: did you see mlinksva's email re: use guidelines icon?16:35
nyergler(~10 minutes ago)16:35
paroneayeanope, fetching mail now16:35
nyerglertwo questions:16:35
nyergler* where did that file wind up (I didn't see it in the assets commit)16:36
nyergler* is it named appropriately? :)16:36
paroneayeaI don't know what file we're referring to yet, but my mail is spamassassin-processing as we speak :)16:36
nyerglerthe check-mark icon for usage guidelines16:37
paroneayeaoic16:38
paroneayeawell it is there16:39
paroneayeahttp://staging.creativecommons.org/images/deed/norms-small.png16:40
paroneayeathere's also http://staging.creativecommons.org/images/deed/norms.png but I think that's unused16:40
paroneayeawhat *should* it be called?16:40
paroneayeausage-guidelines-small.png?16:40
nyerglerparoneayea: that sounds great16:42
*** akozak has joined #cc16:43
nyerglerprobably needs to be changed in either the javascript or template as well16:43
nyerglerif it's not obvious, JED3 can do that before we deploy the new scraper (since that'll only be visible once the new scraper is up)16:43
paroneayeaI think it's just the CSS16:50
paroneayeaor are we changing *all* use of the word "norm"16:50
paroneayeanot just that image16:50
nyerglerwhere else does it show up?16:50
* nyergler is amazed an svn up can take so long16:51
*** mralex has joined #cc16:53
nkinkadeparoneayea: There are conflicts in the merge of this file: www/includes/deed3.css16:53
nkinkadeI'm not sure how to resolve them.16:53
nkinkadeWould you like for me to send you the file so that you can resolve the conflicts, then send the file back to me?16:54
paroneayeasure16:54
paroneayeaI'll ediff it16:54
*** JED3 has quit IRC16:54
nkinkadeparoneayea: I just emailed it to you.16:56
*** oshani has quit IRC16:56
*** Guest17881 is now known as cB16:58
*** cB is now known as Guest4368016:58
nyerglerparoneayea: if there are places "norms" appears that we can quickly correct to "usage-guidelines" or "guidelines", that'd be best17:03
nyerglerparoneayea: nkinkade: i'm heading into a meeting, unfortunately17:03
*** oshani has joined #cc17:03
nyerglerparoneayea: i think you know what needs to be done to move the deployment forward -- once the assets are taken care of (including the icon), and eggs are built and in the basket,17:04
nyerglershould be good to push chooser + PDM out17:04
nyerglercall my cell if you need me (don't worry about interrupting)17:04
paroneayeanyergler: yeah... I'm "on lunch" but I think I have all I need from you now to start pushing out once I get back17:10
paroneayeathx!17:11
nyerglerb17:13
*** erlehmann has joined #cc17:31
*** MarkDude has joined #cc17:46
*** JED3 has joined #cc17:48
*** Guest43680 is now known as cB17:59
*** cB is now known as Guest97318:00
nyerglerJED3: can you go ahead and merge deedscraper and deploy?18:05
nyerglerparoneayea: not sure if you're still @ lunch, did you figure out the deed css merge?18:05
paroneayeanyergler: I just got back18:05
paroneayeaso working on it now :)18:06
JED3nyergler: sure thing18:06
nyerglerb18:06
JED3paroneayea: are there pdm eggs available yet?18:14
JED3...for cc.license and license.rdf18:15
paroneayeaJED3: yes18:15
paroneayeain fact they are now in the normal basket18:15
JED3paroneayea: rad thx18:15
*** DNS777 has quit IRC18:29
paroneayeaargh :(18:32
paroneayeabrb.18:32
*** paroneayea has quit IRC18:33
*** paroneayea has joined #cc18:40
akozakparoneayea, do you have a favorite monospace font?18:44
akozakJED3, same ^^18:44
akozakand mralex ^^18:44
akozakhah sorry I picked a bad day to ask18:45
JED3nyergler: launched pdm deedscraper18:46
nyerglerJED3: great18:46
nyerglerparoneayea: status check?18:46
nyerglerJED3: if things are merged, please delete the pdmark branch on code.cc.org18:47
JED3nyergler: will do18:47
nyerglerJED3: also, if we're still using the phrase "norms", we'd like to replace that with "usage guidelines" or "guidelines"18:47
JED3akozak: inconsolata, monaco, and droid sans mono18:47
nyergler(sorry)18:47
nyerglerakozak: inconsolata ftw18:47
mralexakozak: what JED3 said. Mostly Monaco since i'm a mac user ;)18:47
JED3nyergler: it uses "norms" in the response dict18:48
JED3does that matter though?18:48
nyerglersigh18:48
nyerglerif it's an easy fix, we'd like to replace :/18:48
paroneayeanyergler: ediff broke on my machine temporarily, had to restart emacs and get my beast of a set up working again, but... deed css merged18:50
paroneayeaI'll get to removing the pdmark branches in a few, took a note18:50
nyerglerb18:50
nyerglerparoneayea: branch removal is not at all urgent, would just like to keep those cleaned up18:51
nyerglermore interested in getting new chooser, deeds launched18:51
paroneayeankinkade: basically, I looked at the file's differences18:52
paroneayeapretty much, just copy over and check in from staging.creativecommons.org:/var/www/staging.creativecommons.org/www/includes/deed3.css18:52
paroneayeait's going to be that file verbatim anyway18:52
nkinkadeparoneayea: No need to do that, as svn resolve has the option to just use "theirs-full"18:53
paroneayeado that one then! :)18:53
nkinkadeparoneayea: Just so you know, should you need it in the future you can do it like:18:55
nkinkade$ svn resovle --accept theirs-full <some conflicted file>18:55
nkinkadeand svn help resolve will give you some other common scenarios for --accept18:56
paroneayeanoted in my notes file18:56
nkinkadeparoneayea: r14701 is the commit of that changeset to branches/production18:56
nyerglerJED3: http://labs.creativecommons.org/~nathan/info/decoupling.html18:57
*** oshani has quit IRC19:00
*** Guest973 is now known as cB19:01
*** oshani has joined #cc19:01
*** cB is now known as Guest3799419:01
nkinkadeI just learned something new ... fragment URLs will direct to a tag id, and not just <a name=''/>, as I thought before.19:02
nkinkadeI suppose that's old news, but new for me.19:02
nyerglernkinkade: i did not know that either19:08
*** jgay has joined #cc19:08
*** jgay has joined #cc19:08
nkinkadeIt's how the links at the top of /about/opportunities link to the sections of the page.19:10
paroneayeankinkade: yo19:14
nkinkadeparoneayea: Hey.19:14
paroneayeahttp://paste.pocoo.org/raw/272823/ (prettyish: http://paste.pocoo.org/show/272823/)19:15
paroneayeacould you apply that diff to deed3.css19:15
paroneayeaand also19:15
paroneayeacd images/deed19:15
paroneayeasvn mv norms.png usage-guidelines.png19:15
paroneayeasvn mv norms-small.png usage-guidelines-small.png19:15
nkinkadeparoneayea: I can do those things, but what's stopping you from doing them?19:16
paroneayeathat I have to do an svn checkout :)19:17
paroneayeaI can do them19:17
nkinkadeparoneayea: I'll do them here, but meanwhile, get yourself a checkout of ccwordpress. :_)19:17
nkinkade:-)19:17
paroneayeaok, doing so! :)19:18
nkinkadeparoneayea: http://code.creativecommons.org/viewsvn/ccwordpress/trunk/www/includes/deed3.css?r1=14702&r2=14701&pathrev=1470219:21
nkinkadeIs that right?19:21
paroneayeayup19:21
nkinkadeparoneayea: Shall I merge those changes to production, or do you want me to pull them down on staging first?19:23
*** oshani has joined #cc19:23
paroneayeahm19:23
paroneayeapull them down on staging, just so we can double check19:24
paroneayeathen it's golive time :D19:24
nkinkadeparoneayea: Done.  Check it on staging and let me know.19:25
paroneayeankinkade: looks grood19:40
paroneayeaupdate on production!19:40
nkinkadeparoneayea: Ugh.  I got 2 tree conflicts when I merged.19:46
paroneayeaurrrrrrrrrrrk :(19:46
*** MarkDude has quit IRC19:49
nkinkadeparoneayea: This is the error: >   local delete, incoming delete upon merge19:49
nkinkadeWas norms.png already in production at one point?19:50
greg-gparoneayea: Ride of the Valkyries it is then!19:52
nyerglerwhat's the path to that norms.png?19:52
paroneayeagreg-g: :D19:53
paroneayeaohh19:53
paroneayeamaybe norms.png shouldn't be moved!19:53
nkinkadewww/images/deed/norms.png19:53
paroneayeashoot19:53
paroneayeankinkade: well only norms-small.png really "needed" to be renamed, so could you move that one back maybe?19:54
nyerglerit looks like that file is already deleted19:54
paroneayeaoh!19:54
paroneayeawell okay19:54
nyerglerhttp://creativecommons.org/images/deed/norms.png19:54
nyergler40419:54
nyerglerif it's not in svn i say kill it19:54
nkinkadenyergler: paroneayea: So I should just resolve the conflict by forcing subversion to remove both norms.png and norms-small.png from production fully?19:58
paroneayeankinkade: yes.19:58
nkinkadeSo did this conflict arise because at some point someone svn rm'd those files from production, but had left them in staging?19:59
paroneayeamaybe19:59
paroneayeaalso it could be that they got *added* in staging.19:59
paroneayeasince I copied in a whole bunch of files from alex's mockups directory.20:00
paroneayeabut I dunno20:00
*** oshani has quit IRC20:00
paroneayeankinkade: let me know when it's safe to begin buildout20:00
nkinkadeparoneayea: I just pushed the merge to production.  You can now svn up production and do whatever you need to do.20:01
paroneayeayay, thx nkinkade20:02
paroneayeaFetching external item into 'includes/referrer'20:02
paroneayeasvn: Failed to add directory 'includes/referrer/javascript/src': an unversioned directory of the20:02
paroneayea same name already exists20:02
paroneayea??20:02
*** Guest37994 is now known as cB20:02
paroneayeanyergler: JED3: ^^^^20:03
*** oshani has joined #cc20:03
*** cB is now known as Guest1581920:03
nyerglerparoneayea: just move the src directory out of the way -- src.old or something20:03
JED3paroneayea: shizer, that svn:external needs to be removed as well20:04
paroneayeasvn upped!!  building out!!20:05
*** tvol has quit IRC20:07
*** oshani has quit IRC20:07
paroneayea:(20:08
paroneayeawell, it upgraded and reloaded okay20:08
paroneayeabut the assets don't appear to be there?20:08
paroneayeahttp://creativecommons.org/publicdomain/mark/1.0/20:08
paroneayeahttp://creativecommons.org/images/deed/deed-head-grey.png four oh four20:09
*** bassel has joined #cc20:09
paroneayeankinkade: ^^ ?20:10
paroneayeaoh hurm20:11
nkinkadeLooks like among other things pddeed.js is getting a 404 as well.20:12
paroneayeankinkade: it looks like it's not there http://code.creativecommons.org/svnroot/ccwordpress/branches/production/www/images/deed/20:12
nyerglerisn't pddeed.js part of scraper, JED3?20:12
nkinkadeparoneayea: I never touched those files.20:12
paroneayeankinkade: it should have merged in when you merged the stuff from staging into the production branch...20:13
nkinkadeThe only thing you had me do was to apply a patch to deed3.css and svn move a couple files.20:13
paroneayeaoh20:13
nkinkadeOh, that is, today, I mean.20:13
paroneayeaI thought you also did an svnmerge from trunk->production20:13
nkinkadeparoneayea: I merged the commit I made yesterday, and nothing more.20:13
nkinkader1470020:13
paroneayeaI'm confused :(20:14
nkinkadehttp://code.creativecommons.org/viewsvn?view=rev&revision=1470120:15
paroneayeahrm20:15
paroneayeawell basically20:15
nkinkadeI committed all outstanding changes to trunk, as you specified, which was r14700 ... then today I merged that commit to production, which resulted in r1470120:15
paroneayeathere are a whole bunch of new files that are in staging's www/, and they aren't in production's20:15
paroneayeaI don't know how svnmerge works :\20:16
paroneayeamy entire concept of merging is based on git... I figured all those files would get pulled in automatically20:16
nkinkadeparoneayea: It's possible that mralex added those image files in earlier commits.20:16
paroneayeayes, they were added in earlier commits20:16
nkinkadeparoneayea: We don't do wholesale merges with svn, but launch something on trunk, then merge specific commits.20:17
nkinkadeIf you want some specific commits, or a range of them, just let me know which and I'll merge them.20:17
nkinkadesvnmerge in this case is something like cherry-pick.20:17
paroneayeaarg20:17
paroneayeahttp://code.creativecommons.org/viewsvn/ccwordpress/trunk/www/images/deed/deed-foot-grey.png?revision=14666&view=markup that commit at the very least needs to be merged20:18
paroneayea1466620:18
nkinkadeThe reason we don't do a wholesale merge of all changes/commits is that there may be things in staging that we don't want on production.20:18
nyerglerlet me look @ the commit list20:18
paroneayeaI think that's the only one20:18
paroneayeaok20:18
nyergleror try that one :)20:18
nkinkadeI'll try that one.20:18
nkinkadeDamn ... merging caused a conflict in deed3.css.20:19
nkinkadeparoneayea: I think you'll need to take a look at it.20:19
nkinkadeThere must have been changes to deed3.css in 14666.20:20
paroneayeankinkade: doesn't matter, because you can just use deed3.css from staging as-is20:20
nkinkadeparoneayea: Okay, I'll just use the one on staging.20:20
paroneayea(the one currently on staging that is)20:21
nkinkadeparoneayea: Done.  14666 is now merge to production.20:21
nkinkadeTry to svn up and buildout again.20:22
paroneayeankinkade: nyergler: http://creativecommons.org/publicdomain/mark/1.0/ :)20:24
nkinkadeOr I guess buildout isn't necessary with just images.20:24
nkinkadeparoneayea: nyergler: Is it looking good now?20:25
paroneayeayup!20:25
nyergleri think so20:25
JED3awesome20:26
JED3scraping working as well http://labs.creativecommons.org/~nathan/tests/pdm/monalisa-staging.html20:26
paroneayea:D20:27
paroneayeahey JED320:27
JED3paroneayea: hey paroneayea20:27
nkinkadeThe language links at the bottom are about useless. :-)20:27
paroneayeankinkade: yes they are ;)20:27
paroneayeabut translations aren't out yet yadda yadda20:27
paroneayeawhen I tried svn'ing up it complained that includes/referrer existed and was a non-directory20:27
paroneayealooks like it's a symlink20:27
paroneayealrwxrwxrwx 1 root root 29 2010-10-08 15:22 referrer -> ../../deedscraper/javascript/20:28
paroneayea20:28
JED3http://creativecommons.org/about/mark20:28
paroneayeashould I care?20:28
JED3paroneayea: nope20:28
paroneayeaok, I won't!20:28
JED3however if you could delete the svn:external for metadata_scraper thatd be fantastic20:28
paroneayeaI don't know how to do that20:29
paroneayeaI don't know anything about you people and your essveeyenn exksternahls20:30
JED3haha okay, i'll do it real quick20:30
nyerglerJED3: /about/mark is published20:31
paroneayeanyergler: is it?20:31
paroneayeaThe page you were looking for was not found.20:31
JED3yeah getting a 404 here20:31
nyergleroh20:31
*** MarkDude has joined #cc20:31
nyerglerlooks like it has the slug /about/pdm20:31
nyergleri wonder where else we have /about/mark, and which it makes sense to change20:32
nyerglerchecking in with DP20:32
paroneayeajust pdmark/index.pt as far as the engine goes20:33
paroneayeaI can change that fast20:33
nyerglerparoneayea: please change /about/mark links to /about/pdm20:42
nyerglerthanks20:42
nkinkadeparoneayea: Do you feel that the PDM stuff is all under control in terms of ways that I might be needed?20:47
nkinkadeI'd like to go to a 5 o'clock yoga class that I've recently started attending.20:47
nkinkadeJust making sure that the fires are out, and that nothing critical will be needed in the next 1.5 hours.20:48
nyerglernkinkade: i think we're in good shape, thank20:48
nyerglers20:48
nkinkadeCool.20:48
nkinkadeJED3: With the i.CC.net stuff, are you set?20:48
JED3nkinkade: yes, i think so, thanks20:49
nkinkadeI suspect that you can 1) Add it as a ServerAlias of CC.net 2) Set up the redirect in CC.net 3) Disable the old i.CC.net vhost with a2dissite 4) reload Apache20:49
nkinkadeOr something along those lines, but I you seem to have it in hand anyway.20:49
paroneayeankinkade: yeah20:52
paroneayeaI think everything's good also20:52
paroneayeanyergler: updated the link20:55
nyerglerparoneayea: great20:55
JED3nkinkade: are you sure this wont require a separate vhost? the issue with only adding it as a serveralias is that i'm unable to configure the redirect to only happen for that specific URI (http://i.creativecommons.net/p/username) I need to match that pattern only for that subdomain and dont want to be redirecting support.cc.org/p/username or cc.net/p/username21:01
JED3not that those redirects will harm anything, but i'd rather not support them21:02
*** Guest15819 is now known as cB21:04
nyerglerJED3: i thought you could do a RewriteCond to test for the hostname21:04
*** cB is now known as Guest461321:04
nyerglerok, the namespace document has been updated with cc:useGuidelines21:07
JED3nyergler: yeah, but i was thinking that wouldn't be possible after the http to https redirect, never thought of putting the rule prior to that one though, doh21:10
JED3nyergler: nkinkade: thanks, working now21:10
nyerglerawesome21:10
JED3nyergler: just so that i'm clear, we will *not* be including useGuidelines in the marking html, correct?21:14
nyerglerJED3: correct21:15
JED3mralex: FYI i am going to uninstall the pathauto module on cc.net21:30
JED3because it is a total pita21:30
nyerglerparoneayea: one more minor tweak21:38
nyergler"learn more" under PDM on http://creativecommons.org/publicdomain/ should go to http://creativecommons.org/about/pdm21:39
paroneayeaindeed it should!21:41
nyergler:)21:42
*** erlehmann has quit IRC21:50
*** Guest4613 is now known as cB21:59
*** cB is now known as Guest2738421:59
*** erlehmann has joined #cc22:03
*** MarkDude has quit IRC22:07
*** jgay has quit IRC22:37
nyerglerparoneayea: JED3: thanks for the hard work with the launch today22:57
paroneayeanyergler: np!  I'm glad it went smoothly22:57
nyerglerparoneayea: i'm going to open a ticket for i18n-ification, that should probably be high on your list next week22:57
JED3nyergler: no prob! glad its out the door!22:57
paroneayeakk22:58
JED3...well mostly at least22:58
nyerglerit'd be good to have that available for translation when i'm on stage a week from today22:58
*** Guest27384 is now known as cB23:00
*** cB is now known as Guest8156523:01
nyerglerparoneayea: JED3: also, please take a look @ pdmark issues in Roundup and close as appropriate23:05
paroneayeanyergler: ok.. if only translation things are left for a ticket, should they be closed?23:20
paroneayeashould I make a translation extraction ticket?23:20
paroneayeaand close all the other stray ones I've left open for translation reasons23:21
*** mralex has quit IRC23:25
*** JoiIto has joined #cc23:44
*** kreynen has quit IRC23:45
*** papyromancer is now known as papy|away23:46
*** erlehmann has quit IRC23:51
nyerglerparoneayea: i'll leave that up to you23:53
nyerglermaybe let me know what you decide23:59

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