| *** [mharrison] has joined #cc | 00:37 | |
| *** Bovinity has quit IRC | 00:48 | |
| *** oshani has quit IRC | 01:50 | |
| *** kreynen has joined #cc | 01:50 | |
| *** K`Tetch has quit IRC | 02:01 | |
| *** pyrak has quit IRC | 02:01 | |
| *** K`Tetch has joined #cc | 02:03 | |
| *** kreynen_ has joined #cc | 02:07 | |
| *** stevel_ has quit IRC | 02:16 | |
| *** kreynen has quit IRC | 02:16 | |
| *** kreynen has joined #cc | 02:18 | |
| *** kreynen has quit IRC | 02:24 | |
| *** kreynen has joined #cc | 02:26 | |
| *** kreynen__ has joined #cc | 02:28 | |
| *** kreynen___ has joined #cc | 02:31 | |
| *** kreynen_ has quit IRC | 02:32 | |
| *** kreynen has quit IRC | 02:48 | |
| *** kreynen__ has quit IRC | 02:48 | |
| *** kreynen has joined #cc | 02:59 | |
| *** kreynen_ has joined #cc | 03:06 | |
| *** kreynen_ has quit IRC | 03:13 | |
| *** kreynen_ has joined #cc | 03:13 | |
| *** kreynen has quit IRC | 03:13 | |
| *** kreynen has joined #cc | 03:32 | |
| *** kreynen_ has quit IRC | 03:39 | |
| *** JED3 has quit IRC | 03:42 | |
| *** johndoigiii has joined #cc | 03:44 | |
| *** johndoigiii has quit IRC | 03:51 | |
| *** kreynen has quit IRC | 03:55 | |
| *** johndoigiii has joined #cc | 04:29 | |
| *** johndoigiii has quit IRC | 04:56 | |
| *** johndoigiii has joined #cc | 05:29 | |
| *** johndoigiii has quit IRC | 05:52 | |
| *** sama has joined #cc | 06:25 | |
| *** akozak has quit IRC | 07:03 | |
| *** pyrak has joined #cc | 07:10 | |
| *** UncleCJ2_ has joined #cc | 07:33 | |
| *** UncleCJ2_ has quit IRC | 07:38 | |
| *** pyrak has quit IRC | 07:43 | |
| *** ouswoo59 has quit IRC | 08:05 | |
| *** utwoo685 has quit IRC | 08:08 | |
| *** gimmulf_ has joined #cc | 08:44 | |
| *** gimmulf has quit IRC | 08:44 | |
| *** Roderick_ has quit IRC | 09:56 | |
| *** Roderick_ has joined #CC | 09:56 | |
| *** kreynen has joined #cc | 12:59 | |
| *** oshani has joined #cc | 13:07 | |
| *** gimmulf_ has quit IRC | 13:16 | |
| *** gimmulf has joined #cc | 13:16 | |
| *** nathany has joined #cc | 13:53 | |
| *** oshani has quit IRC | 14:02 | |
| *** kreynen has quit IRC | 14:02 | |
| *** K`Tetch_ has joined #cc | 14:02 | |
| *** oshani has joined #cc | 14:04 | |
| *** K`Tetch has quit IRC | 14:10 | |
| *** kreynen has joined #cc | 14:24 | |
| *** Roderick__ has joined #CC | 14:30 | |
| *** K`Tetch has joined #cc | 14:37 | |
| *** lotia has quit IRC | 14:42 | |
| *** K`Tetch_ has quit IRC | 14:50 | |
| *** lotia has joined #cc | 14:50 | |
| *** johndoigiii has joined #cc | 14:55 | |
| *** pyrak has joined #cc | 15:13 | |
| *** K`Tetch_ has joined #cc | 15:14 | |
| *** nkinkade has joined #cc | 15:21 | |
| *** K`Tetch has quit IRC | 15:24 | |
| *** Wolfman2000 has joined #cc | 15:27 | |
| *** oshani has quit IRC | 15:55 | |
| johndoigiii | nkinkade: hello | 16:02 |
|---|---|---|
| *** johndoigiii is now known as JED3 | 16:02 | |
| *** pyrak has quit IRC | 16:07 | |
| nkinkade | JED3: Hey. | 16:12 |
| *** pyrak has joined #cc | 16:14 | |
| *** stevel has joined #cc | 16:36 | |
| *** JED3 has quit IRC | 16:37 | |
| *** Bovinity has joined #cc | 16:38 | |
| *** johndoigiii has joined #cc | 16:40 | |
| *** pyrak has quit IRC | 16:45 | |
| *** oshani has joined #cc | 16:45 | |
| *** johndoigiii has quit IRC | 16:47 | |
| *** akozak has joined #cc | 16:49 | |
| nkinkade | haoyu_: You there? | 16:55 |
| haoyu_ | nkinkade, yes i'm here | 16:55 |
| nkinkade | I'm trying to fix the issue you're having with git. | 16:55 |
| nkinkade | You're right that it was a permission issue on the mw-ext/ directory. | 16:56 |
| * haoyu_ trying again | 16:56 | |
| nkinkade | But I'm not 100% sure that the gitosis.conf file will access a directory as an argument for a "writable" section. Maybe it takes globbing chars. Do you have a moment to test with me? | 16:56 |
| haoyu_ | anything I can help? | 16:56 |
| haoyu_ | Yes I'm testing | 16:57 |
| nkinkade | I just pushed the change. Try submodule update again. | 16:57 |
| haoyu_ | is just "git submodule update" enough? | 16:57 |
| haoyu_ | still get "ERROR:gitosis.serve.main:Repository read access denied" error | 16:58 |
| *** K`Tetch_ has quit IRC | 16:58 | |
| nkinkade | haoyu_: Let me try a wildcard like mw-ext/* ... one second. | 16:59 |
| nkinkade | haoyu_: I just pushed the changes ... give it one more shot. | 17:00 |
| haoyu_ | still get same error.. | 17:01 |
| *** balleyne has joined #cc | 17:02 | |
| nkinkade | Yeah: seems like maybe it doesn't support wildcards: | 17:03 |
| nkinkade | http://snaury.livejournal.com/113373.html | 17:03 |
| nkinkade | This guy wrote a patch to allow it to support it. | 17:03 |
| haoyu_ | em, how about the "git-daemon-export-ok" ? | 17:04 |
| nkinkade | I think those repositories are already exported as they are visible and can be cloned. This is more a matter of gitosis, I believe. | 17:07 |
| *** johndoigiii has joined #cc | 17:10 | |
| *** johndoigiii is now known as JED3 | 17:10 | |
| JED3 | hey nkinkade, sorry bout not responding, was gonna ask if you could look over my commit to the apache conf | 17:11 |
| nkinkade | Sure. One sec. | 17:11 |
| haoyu_ | I see. It is just only me who can't clone it... | 17:13 |
| haoyu_ | nkinkade, FYI, I get success with "git clone git://code.creativecommons.org/mw-ext/cite.git" | 17:14 |
| nkinkade | haoyu_: That is a read-only URL so anyone should have access to that. | 17:15 |
| haoyu_ | anway, git is super fast :) | 17:19 |
| JED3 | balleyne: hey blaise, you around? | 17:20 |
| balleyne | JED3: yep, I've got a meeting in 45 minutes though, but I can chat a bit | 17:20 |
| JED3 | okay, I'll pm you | 17:21 |
| akozak | nkinkade: Could we work to get me theming access on sj.cc sometime today? | 17:21 |
| nkinkade | akozak: Sure. I guess you'll need a shell account on a7 unless you want to do and test the changes locally on your machine then give them to me to install. | 17:22 |
| akozak | nkinkade: I'd rather have shell so you don't have to make the changes, but if you'd rather I didn't have a7 access, either way works. | 17:24 |
| Bovinity | akozak: also the command you're looking for, to branch teh theme, is "svn copy" (svn help copy) | 17:24 |
| akozak | Bovinity: That's it? | 17:25 |
| *** pyrak has joined #cc | 17:25 | |
| Bovinity | akozak: yeah, you just need to include the full urls for source and destination, then checkout the copy as usual | 17:26 |
| akozak | Bovinity: Full URL for destination, even if I'm sshed into a7? | 17:26 |
| Bovinity | akozak: you may be able to do: themes/$ svn cp cckubrick sj2.0 ; and hten commit sj2.0, but i can't remember. | 17:27 |
| Bovinity | (svn branching seems so archaic and ugly now...) | 17:28 |
| pyrak | yeah, as i recall, you can make a branch locally by just svn cp-ing somethign to branches, then commiting the whole thing | 17:41 |
| JED3 | thats right | 17:41 |
| *** JED3 has quit IRC | 17:43 | |
| akozak | nkinkade: Do I only have git write access right now (and not svn)? | 17:47 |
| *** everton137 has joined #cc | 17:48 | |
| nkinkade | akozak: I can give you a shell account if it's really necessary, that's not a problem ... but there's also a side of me that feels like shell access solely for the sake of tweaking a WP theme may not be totally necessary. | 17:48 |
| nkinkade | Do you have Apache running on your personal machine? | 17:48 |
| akozak | nkinkade: not atm. | 17:48 |
| nkinkade | akozak: You've only got git write access for the opened theme, I think. | 17:49 |
| akozak | ah ok | 17:49 |
| nkinkade | Do you need subversion access as well? | 17:49 |
| nkinkade | haoyu_: I just applied that guy's patch to our gitosis install ... can you try the submodule update just once more? | 17:50 |
| akozak | Well, I don't think I will if I won't have shell access on a7. | 17:50 |
| akozak | I could just do a read only copy of cckubrick | 17:50 |
| nkinkade | If you're making a totally custom them then it wouldn't be bad idea to put it under version control. | 17:51 |
| haoyu_ | nkinkade, yes it works now! :) | 17:51 |
| nkinkade | Thanks go out to Alexey Borzenkov for: http://git.kitsu.ru/patched/gitosis-gentoo.git?a=commitdiff;h=71cb44351f9511ecf628a6aa674da8364a0f1086 | 17:52 |
| akozak | nkinkade: I don't quite know how many changes I'll be making (I'm not really a programmer or designer). But I'm planning on changing colors and maybe adding a page nav or something. | 17:52 |
| nkinkade | nathany: I just applied the above patch to our gitosis module ... it's a python egg, actually. Is there anything special I should do for that? | 17:53 |
| nkinkade | akozak: We've got a special themes/ directory in our git repository. I can create a new repo under that dir for any changes you make to the cckubrik theme? | 17:54 |
| nathany | nkinkade: i don't understand what this patch is for | 17:54 |
| nkinkade | It allows me to specify this in gitosis.conf: | 17:55 |
| nkinkade | writable = mw-ext/* | 17:55 |
| nkinkade | for example. | 17:55 |
| akozak | nkinkade: That would work. Would you have to pull the changes on a7? | 17:55 |
| nkinkade | nathany: ^^ Before I would have had to list each and every module under mw-ext/ one by one to the writable section of the mediawiki group. | 17:56 |
| nkinkade | This way is far more painless. | 17:56 |
| nathany | nkinkade: got it; but fwiw i think the solution for the cc monitor issue is to use anonymous specifications for externals | 17:57 |
| nathany | that is, git:// instead of git@ | 17:57 |
| nkinkade | akozak: I could pull the changes on a7. But what I would recommend is that you get Apache and MySQL installed on your local machine then install WP there and do all your testing locally. | 17:57 |
| *** balleyne has quit IRC | 17:58 | |
| nkinkade | nathany: We could use anonymous clones for CC Monitor. | 17:58 |
| nkinkade | That seems reasonable. | 17:58 |
| nkinkade | Do you think that would be better in general? | 17:58 |
| nathany | nkinkade: generally if we're doing submodules we should -- otherwise anonymous clones of our code won't work | 17:59 |
| nathany | this is an unfortunate side effect of having different access methods for r/w v. r/o | 17:59 |
| nkinkade | Okay, I can revert that patch and just make all submodules r/o. | 17:59 |
| akozak | nkinkade: That's what I was assuming, but you would still need to pull to make any commits live after I've tested them, right? | 18:00 |
| nkinkade | akozak: Yeah. | 18:00 |
| akozak | ok | 18:00 |
| haoyu_ | I wonder is there a security hole as the repo is public accessible? eg. the value of "$wgSecretKey" is publicized? | 18:01 |
| nkinkade | haoyu_: Probably. | 18:02 |
| akozak | Bovinity: There's no reason to do testing of my kubrick branch on WPMU right? I could just use WP? | 18:03 |
| nkinkade | nathany: are we doing the donation software planning call? | 18:03 |
| nathany | nkinkade: yes, i'm dialing in now | 18:03 |
| Bovinity | akozak: it should work fine | 18:04 |
| Bovinity | akozak: tehre are some api differences between WP and WPMU, but they should be minor | 18:04 |
| *** johndoigiii has joined #cc | 18:05 | |
| nkinkade | johndoigiii: conf call? | 18:07 |
| johndoigiii | yeah, still happening right? | 18:08 |
| nkinkade | nathany and I are there right now. | 18:08 |
| nkinkade | johndoigiii: ^^ | 18:08 |
| johndoigiii | oh? hmm i must have entered in a wrong passcode | 18:08 |
| johndoigiii | yup sure did | 18:08 |
| johndoigiii | 1 sec | 18:08 |
| *** balleyne has joined #cc | 18:19 | |
| *** pyrak has quit IRC | 18:24 | |
| Bovinity | nkinkade: nathany: white board in middle room ok to clean off? | 18:24 |
| Bovinity | (civicrm/network notes by the look of it) | 18:25 |
| johndoigiii | yes | 18:25 |
| johndoigiii | theres a jpeg | 18:26 |
| *** pyrak has joined #cc | 18:29 | |
| pyrak | system76 support ppl think i'm an idiot | 18:33 |
| greg-g | haha, Tom's usually been a nice guy with me | 18:34 |
| haoyu_ | nkinkade, just to ask, is that possible to host other application (eg. Python web service) on monitor.(cc).org? | 18:34 |
| greg-g | pyrak: I have a Daru2 | 18:34 |
| pyrak | greg-g, cool. daru3 here. i actually think we may have had this conversation in #freeculture awhile back | 18:42 |
| pyrak | tom | 18:42 |
| akozak | nkinkade: got my local test of WP up and running, let me know when I can pull the theme. | 18:43 |
| pyrak | 's being nice, just holding my handle a little too much | 18:43 |
| pyrak | certainly it's better than if i were interacting with ppl at dell or something | 18:43 |
| *** gimmulf_ has joined #cc | 18:43 | |
| *** gimmulf has quit IRC | 18:43 | |
| greg-g | pyrak: ahh, yeah, he tends to do that. Which is a safe thing to do if you work in tech support, I suppose. better than the opposite | 18:43 |
| nkinkade | akozak: I'll let you know. I'll try to get it up in just a few minutes. | 18:43 |
| greg-g | pyrak: and yeah, I think we did talk about this before :) | 18:43 |
| akozak | heh, incoming links on a local wp install is interesting | 18:46 |
| nkinkade | Bovinity: Where is the cckubrick theme, again? | 18:51 |
| akozak | wordpressmu/trunk/cckubrick? | 18:52 |
| nkinkade | It's there, but I wasn't sure if there was some other standalone repository., | 18:53 |
| nkinkade | I'll just use that one to create the new git one. | 18:53 |
| *** sama has quit IRC | 19:02 | |
| haoyu_ | nkinkade, just to ask, is that possible to host other application (eg. Python web service) on monitor.(cc).org? | 19:04 |
| nkinkade | haoyu_: That depends on what it is. monitor hosts a lot of other stuff too. | 19:04 |
| nkinkade | And nathany should probably be involved in that decision as well. | 19:05 |
| haoyu_ | we want to host the wiki robot that update the cc monitor wiki pages as a web service | 19:05 |
| *** nathany is now known as nathany_call | 19:06 | |
| haoyu_ | so authorized users can trigger update | 19:06 |
| *** mecredis has quit IRC | 19:07 | |
| haoyu_ | we have two choice: host on CC, or host on a machine outside CC (eg. a machine in NUS) | 19:08 |
| nkinkade | haoyu_: Can you send an short email to webmaster@creativecommons, copying any other necessary people, outlining what the application is, how it's implemented, and why it should be on a7? | 19:12 |
| akozak | nkinkade: sorry to pile on another thing today, but do I need to go through you to add users on sj? | 19:14 |
| nkinkade | haoyu_: I just updated the submodules for the cc_monitor branch of mediawiki.git to be readonly clones, can remove your submodules and init them again to see if this works. Removing submodules is a multi-step process outlined here: http://wiki.creativecommons.org/User_talk:Nkinkade | 19:15 |
| nkinkade | Oppps: http://git.or.cz/gitwiki/GitSubmoduleTutorial | 19:15 |
| nkinkade | akozak: I thought you had admin rights for that blog, though john was having problems yesterday too. Problems that I have solved yet. | 19:15 |
| akozak | nkinkade: yea, I'm getting "Please enter correct verification number." trying to add a user. | 19:16 |
| akozak | I think that's the same issue | 19:16 |
| nkinkade | Yeah, that's what john was getting. I started to research yesterday, but got sidetracked. | 19:16 |
| nkinkade | Interesting, one of the first google results in a link to this channel, some random guy who showed up looking for support on that issue ... unrelated to CC. Weird. | 19:17 |
| nkinkade | If you can find anything out about it, then that would help. | 19:17 |
| akozak | I'll poke around. Sorry to add another thing to your queue... | 19:17 |
| nkinkade | johndoigiii: Are we talking about the rewrite rules on staging? | 19:17 |
| johndoigiii | yes nkinkade | 19:17 |
| nkinkade | johndoigiii: Which rule specifically isn't working? | 19:18 |
| nkinkade | Line number? | 19:18 |
| johndoigiii | line 53 | 19:18 |
| johndoigiii | ^/license/(.*) should match http://staging.creativecommons.org/license/ shouldn't it? | 19:19 |
| johndoigiii | the * qualifier is zero-or-more right? | 19:19 |
| nkinkade | You've got a redirect in there with [R], but I think when you specify that the second argument needs to be an absolute URL. | 19:21 |
| nkinkade | I could be mistaken, but I *think* you need something like: | 19:21 |
| nkinkade | RewriteRule ^/license/(.*) http://%{SERVER_NAME}/choose/$1 [R=301,L] | 19:22 |
| nkinkade | johndoigiii: ^^ | 19:22 |
| nkinkade | I'm pretty sure that mod_rewrite won't infer the full URL based on a relative one when it's asked to redirect. | 19:22 |
| johndoigiii | nkinkade: that makes sense | 19:23 |
| nkinkade | Also, I think you might be able t implement line 53 and 54 in one rule like: | 19:24 |
| nkinkade | RewriteRule ^/license(/?.*)$ http://%{SERVER_NAME}/choose$1 [R=301,L] | 19:25 |
| nkinkade | Maybe not. | 19:25 |
| akozak | hahaha it's really funny that if nathany had gone through the massive amount of trouble to help that guy asking about the WP error, it would have eventually become relevant to CC :P | 19:28 |
| *** K`Tetch has joined #cc | 19:28 | |
| nkinkade | johndoigiii: Do you want to implement that and let me know? | 19:30 |
| johndoigiii | nkinkade: working on it now | 19:35 |
| johndoigiii | wont the above rule match /licensefoobar/ as well though? | 19:36 |
| johndoigiii | which would make it interfere with /licenses/ | 19:36 |
| Bovinity | shouldn't "/license/" exist as an informational page? | 19:37 |
| johndoigiii | well currently thats the url for the chooser | 19:37 |
| Bovinity | yeah, and i completely like the idea of "/choose" | 19:39 |
| akozak | nkinkade: The error is a plugin issue, since the error isn't in the WP core | 19:43 |
| akozak | weird thing is it happens when I have no plugins activated | 19:44 |
| akozak | No maybe it's a plugin activated on a different blog | 19:44 |
| akozak | so* | 19:44 |
| nkinkade | akozak: Any ideas which plugin it could be? | 19:44 |
| *** javos_ has joined #cc | 19:45 | |
| akozak | nkinkade: Not yet | 19:45 |
| akozak | My guess is Unfiltered MU? | 19:46 |
| nkinkade | It's in this plugin: ./mu-plugins/wpmu-signup-captcha.php | 19:46 |
| akozak | hmm | 19:46 |
| akozak | nkinkade: that plugin isn't on the management screen, so it would have to be disabled some other way. | 19:49 |
| akozak | I wonder if any of the blogs are using it? | 19:49 |
| nkinkade | akozak: Things in the mu-plugins dir are activated automatically. | 19:49 |
| nkinkade | I just installed a new version of it. See if that helps. | 19:50 |
| nkinkade | akozak: The cckubrick theme is now available here: http://code.creativecommons.org/viewgit/themes/cckubrick.git/ | 19:51 |
| akozak | Awesome! | 19:51 |
| akozak | thanks nkinkade | 19:51 |
| akozak | nkinkade: still getting the error | 19:53 |
| *** UncleCJ has joined #cc | 19:56 | |
| nkinkade | akozak: Try it again. | 19:59 |
| nkinkade | I installed the plugin wrong. | 19:59 |
| nkinkade | I'm now getting yet another error. | 20:00 |
| akozak | nkinkade: I'm getting the same error | 20:01 |
| akozak | nkinkade: Also, should I create in git for my changes or should I just commit them to cckubrick.git? | 20:03 |
| akozak | create a branch* | 20:04 |
| nkinkade | I think you should use a branch. | 20:04 |
| akozak | ok | 20:04 |
| nkinkade | akozak: johndoigiii: You both should be able to add new users to WP-mu now. | 20:09 |
| nkinkade | I uninstalled that old broken plugin and put a different, newer one in it's place ... the actual WP plugin from reCAPTCHA. | 20:10 |
| johndoigiii | great thx | 20:10 |
| akozak | nkinkade: thanks | 20:10 |
| Bovinity | akozak: what kinds of changes were you thinking about making to CCK? | 20:12 |
| akozak | Bovinity: might be adding some page templates, possibly modifying the header to include page links, and fixing a tiny bug when the header toolbar is disabled | 20:14 |
| akozak | and maybe a color change | 20:14 |
| *** mecredis has joined #cc | 20:23 | |
| mecredis | johndoigiii: nathany_call should we do this call? | 20:24 |
| mecredis | conf line? | 20:24 |
| nathany_call | fine with me | 20:24 |
| nathany_call | was mike going to join as well? | 20:24 |
| mecredis | indeed | 20:25 |
| akozak | nkinkade: Can we add the SJ Kubrick branch theme to sj on a7? | 20:25 |
| akozak | to test this update protocol | 20:25 |
| akozak | All I've changed is the theme name | 20:25 |
| nkinkade | Yeah, I"ll add it. | 20:25 |
| akozak | ok cool | 20:25 |
| mecredis | ok ml said he's in | 20:26 |
| nkinkade | akozak: It's there now, called cckubrick-studentjournalism | 20:28 |
| nkinkade | Or I can call it whatever you want, really. | 20:28 |
| akozak | nkinkade: Ok thanks | 20:28 |
| nathany_call | mecredis: are you dialed in or am i in limbo? | 20:30 |
| mecredis | I'm dialed in | 20:30 |
| mecredis | jamming | 20:30 |
| mecredis | to hold music | 20:30 |
| nathany_call | weird | 20:30 |
| nathany_call | limbo | 20:30 |
| mecredis | oops | 20:30 |
| mecredis | wait | 20:31 |
| mecredis | no | 20:31 |
| mecredis | my fault | 20:31 |
| nathany_call | lol | 20:31 |
| mecredis | didn't catch my last digit | 20:31 |
| mecredis | one minute | 20:31 |
| johndoigiii | ha i did that earlier | 20:31 |
| nkinkade | akozak: You might want to change the theme name in style.css. | 20:33 |
| Bovinity | s/might want to/should/ | 20:33 |
| akozak | nkinkade: I had... did you use the sjkubrick branch or master? | 20:33 |
| nkinkade | I just did, sorry. | 20:33 |
| akozak | ok, can you do a quick pull? | 20:34 |
| akozak | Just to make sure it's all working ok | 20:34 |
| akozak | (and I fixed the footer) | 20:35 |
| akozak | Bovinity: using WP instead of WPMU breaks the cc kubrick footer | 20:37 |
| akozak | :( | 20:37 |
| Bovinity | akozak: not surprised | 20:37 |
| akozak | get_current_site() is a wpmu function | 20:38 |
| *** javos_ has left #cc | 20:38 | |
| pyrak | okay, this is weird | 20:55 |
| pyrak | both ffx and opera have decided to weirdly cache stylesheets | 20:55 |
| pyrak | ctrl+shift+r doesn't get them to look at the new sheet | 20:56 |
| haoyu_ | nkinkade, I don't understand this git commit "Merge branch 'cc_monitor' of git@code.creativecommons.org:mediawiki into cc_monitor" | 20:58 |
| nathany_call | mecredis: http://teamspace.creativecommons.org/Campaign_2009_Donation_Processing | 20:58 |
| haoyu_ | merge where to where? | 20:58 |
| johndoigiii | good example of the different methods via paypal : https://store.nationalreview.com/donate/ | 20:58 |
| nkinkade | haoyu_: Let me take a look. | 21:00 |
| haoyu_ | http://code.creativecommons.org/viewgit/mediawiki.git/commit/?h=cc_monitor&id=9bff3d5aaea717c56280189766d42e65bd4cb246 | 21:00 |
| haoyu_ | isn't it committed by you? | 21:01 |
| haoyu_ | it must be merged to the web server | 21:01 |
| nkinkade | haoyu_: Weird. I'm not sure what that was. | 21:03 |
| nkinkade | I shows that I changed LocalSettings.php, but I didn't knowingly make that change. | 21:04 |
| haoyu_ | It is I did the change | 21:04 |
| haoyu_ | you did the merge, you merged the change to the web server | 21:04 |
| nkinkade | haoyu_: Ah. Okay. That makes more sense. | 21:05 |
| haoyu_ | but the log message is really confusing... | 21:06 |
| nkinkade | I had done a git pull, which must have pulled in your change, then I pushed back to the repository. | 21:06 |
| nkinkade | Yeah, the log message is a bit confusing, but I think it's talking about two different branches: the local branch known as cc_monitor and the remote branch (origin/cc_monitor), also knows as cc_monitor. | 21:07 |
| nkinkade | Maybe this a case for using unique local branch names?? | 21:07 |
| haoyu_ | ah. I understand now. | 21:08 |
| haoyu_ | It will be more clear if I see the reversion path as gitk show | 21:09 |
| haoyu_ | nkinkade, I committed a new change, please pull to the server again | 21:11 |
| nkinkade | haoyu_: Done. | 21:11 |
| haoyu_ | thanks! :) | 21:12 |
| nkinkade | Hey haoyu_, were you able to remove the submodules and re-init them? | 21:28 |
| haoyu_ | I pulled the change of .gitmodules, removed the entry in .git/config and re-inited them | 21:29 |
| haoyu_ | But I haven't totally removed the submodules dirs. But I think it will work in this way. | 21:30 |
| *** K`Tetch_ has joined #cc | 21:31 | |
| nkinkade | Ah, cool. | 21:32 |
| nkinkade | I wasn't sure if it would be necessary to remove the modules or not. I'm just curious if that simple change to .gitmodules was enough to do what we wanted: to make the submodules r/o. | 21:33 |
| *** everton137 has quit IRC | 21:35 | |
| haoyu_ | eh, the things I did is not enough. because in Cite/.git/config it is still have url = git@code.creativecommons.org:mw-ext/cite.git | 21:37 |
| *** nathany_call is now known as nathany | 21:38 | |
| haoyu_ | I removed them and doing git submodule update again | 21:38 |
| haoyu_ | okey this time it is correct | 21:38 |
| nkinkade | Cool. | 21:40 |
| nkinkade | johndoigiii: Any news with staging/choose? | 21:40 |
| *** K`Tetch has quit IRC | 21:40 | |
| nkinkade | Looks like legalcode URLs are broken. | 21:40 |
| *** K`Tetch has joined #cc | 21:41 | |
| *** balleyne has quit IRC | 21:41 | |
| johndoigiii | working on it this very moment, for staging? | 21:41 |
| nkinkade | For example: http://staging.creativecommons.org/licenses/by/3.0/pl/legalcode | 21:41 |
| nkinkade | Yeah. | 21:41 |
| johndoigiii | fixed, yeah its from that one rewrite i was working on | 21:43 |
| *** K`Tetch_ has quit IRC | 21:50 | |
| *** nathany has quit IRC | 22:06 | |
| *** kreynen has quit IRC | 22:54 | |
| akozak | nkinkade or Bovinity, could you do a pull on a7 of sj kubrick? I'm done for today I think | 22:57 |
| nkinkade | akozak: Done. | 22:58 |
| akozak | thanks! | 22:58 |
| akozak | (done theming for today that is_ | 22:58 |
| nkinkade | Is your local install working okay for dev purposes? | 22:58 |
| akozak | well enough. | 22:58 |
| akozak | It can't display the footer | 22:59 |
| nkinkade | I know this isn't as convenient and if it becomes too burdensome having us pull changes, then I can give you an account. | 22:59 |
| nkinkade | I just like to go conservative to begin with. | 22:59 |
| akozak | nkinkade: Ok cool. | 22:59 |
| akozak | uh oh... | 22:59 |
| akozak | hmmm | 22:59 |
| akozak | Something went wrong. | 22:59 |
| akozak | oh nevermind | 23:00 |
| nkinkade | Phew. | 23:00 |
| akozak | Ha, I forgot to change the settings in wp admin | 23:00 |
| akozak | I'm pretty proud of this, my first heavy dose of wp theming. | 23:01 |
| akozak | I repurposed the cctools bar :) | 23:01 |
| pyrak | someone get the drain-o | 23:09 |
| pyrak | the tubes are clogged | 23:10 |
| pyrak | is the internet slow for anyone else? | 23:10 |
| *** papyromancer has joined #cc | 23:35 | |
| nkinkade | johndoigiii: Will staging work by the time you leave today? | 23:41 |
| nkinkade | I'm just trying to figure out if I should disable Nagios alerts so that my inbox doesn't fill with warnings. | 23:42 |
| johndoigiii | oh ha sorry, yeah I'll get it working | 23:42 |
| johndoigiii | i'll revert if not | 23:42 |
| akozak | nkinkade: I think I might end up needing shell on a7 to do pulls, since my local install is missing some functions... | 23:43 |
| akozak | I could always rm WP and install WPMU though... | 23:43 |
| akozak | hmmm | 23:43 |
| nkinkade | johndoigiii: Not a problem, but if it's down before you go just let me know so I can disable alerts for the evening. | 23:45 |
| Bovinity | or stub out the missing functions in functions.php, like if (!function_exists('get_current_site')) { function get_current_site() {} } | 23:45 |
| johndoigiii | ok will do | 23:45 |
| akozak | Bovinity: wouldn't that create an empty function if the function does exist and screw up the function on the live site? | 23:50 |
| akozak | sorry, I don't really know php | 23:50 |
| nkinkade | akozak: You should be able to login to a7 now. | 23:51 |
| nkinkade | Using the same public key as you do for a6. | 23:51 |
| akozak | nkinkade: ok thanks! | 23:51 |
| Bovinity | akozak: thus the ! in the if, "if the named function doesnt exist" is what it's asking | 23:51 |
| akozak | Bovinity: oh, duh ok. I didn't know that's what the ! did in php. | 23:52 |
| nkinkade | akozak: Your passwd is at /home/akozak/pw | 23:53 |
| nkinkade | You should change your password to something secure and then delete that file. | 23:53 |
| akozak | nkinkade: ok will do | 23:53 |
| nkinkade | The files you want are at a7:/var/www/labs.creativecommons.org/www/wp-content/themes/cckubrick-studentjournalism/ | 23:54 |
| akozak | nkinkade: excellent. pw changed/deleted, and successfully tested a pull. | 23:56 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!