paulproteus | git whatever | 00:00 |
---|---|---|
paulproteus | git push | 00:00 |
paulproteus | cd /path/to/place/with/commits/ | 00:00 |
paulproteus | git reset --hard # harshly undoes all local changes | 00:00 |
paulproteus | git pull | 00:00 |
paulproteus | Having said that, http://wiki.creativecommons.org/Git_phrasebook#Undo_local_changes_to_a_file . | 00:00 |
nkinkade | paulproteus: how about this?: | 00:00 |
nkinkade | a7 $ cp support.js /tmp | 00:01 |
nkinkade | a7 $ git checkout support.js | 00:01 |
paulproteus | nkinkade, Then how will git know what to base support.js off? | 00:01 |
nkinkade | cp /tmp/support.js ./ | 00:01 |
paulproteus | You need to also copy the .git directory. | 00:01 |
nkinkade | I'm just going to do what I've got in mind, and if it fucks up, then I'll figure out how to correct it. | 00:01 |
paulproteus | Cool. | 00:02 |
nkinkade | This isn't working in #cc | 00:02 |
Bovinity | nkinkade: do you want me to undo what i was doing in the zupport theme directory? | 00:02 |
nkinkade | Bovinity: No need. | 00:05 |
nkinkade | I think. | 00:05 |
nkinkade | Bovinity: The git clone on support is read-only? | 00:07 |
nkinkade | Seems it is. | 00:08 |
Bovinity | nkinkade: yessir. in theory it should also be a production named branch, but it's just RO 2008 | 00:08 |
nkinkade | Bovinity: Okay, it should be ready to go. | 00:18 |
Bovinity | nkinkade: great | 00:19 |
Bovinity | collaborate! | 00:22 |
Bovinity | i forgot to push some changes, all good now :D | 00:22 |
mecredis | Bovinity: | 00:37 |
mecredis | oops, uh | 00:37 |
mecredis | so any idea if we have SVG versions of http://creativecommons.org/license/cc-gpl | 00:38 |
mecredis | etc | 00:38 |
Bovinity | mecredis: of the whole icon, no. Of the circle-cc icons, yes | 00:38 |
mecredis | hrm | 00:39 |
mecredis | like the badge | 00:39 |
mecredis | we don't have | 00:39 |
Bovinity | the whole badge, no | 00:39 |
* mecredis launches Adobe Illustrator | 00:39 | |
mecredis | ok | 00:39 |
Bovinity | not hard to replicate | 00:39 |
mecredis | indeed | 00:39 |
mecredis | though the font choice | 00:39 |
mecredis | any idea? | 00:39 |
Bovinity | the font that was used was helvetica [bold] condensed | 00:40 |
Bovinity | we've been using Silkscreen for pixel fonty goodness, though | 00:40 |
mecredis | ok | 00:40 |
mecredis | right | 00:40 |
paulproteus | Danger: Helvetica | 00:41 |
*** K`Tetch has joined #cc | 01:04 | |
*** Bovinity has quit IRC | 01:25 | |
*** mikahl has left #CC | 01:27 | |
*** adjohn has joined #cc | 01:35 | |
*** adjohn_ has quit IRC | 01:37 | |
*** stweston has joined #cc | 02:06 | |
stweston | hello, all | 02:06 |
*** rohitj has joined #cc | 02:06 | |
stweston | question for people here: would it be a good idea to create an Operating System licensed under the CC? | 02:07 |
stweston | hello? | 02:09 |
paulproteus | Use software licenses for software! | 02:10 |
stweston | okay... | 02:10 |
paulproteus | CC licenses aren't bidirectionally compatible with any free/open source software licenses, so that's not recommended. | 02:10 |
stweston | well, I'd /like/ to sell a linux system, but I see that as being not possible due to the fact that the GNU GPL is kinda... well... not right for it. | 02:11 |
stweston | for selling software, I mean. | 02:11 |
greg-g | eh? you can sell GPL licensed code | 02:11 |
stweston | really? | 02:11 |
greg-g | see: Novell, Redhat | 02:12 |
stweston | aah... | 02:12 |
paulproteus | Canonical | 02:12 |
stweston | well, then... how do they do it? | 02:12 |
greg-g | paulproteus: I was thinking of ones that actually made money ;) | 02:12 |
paulproteus | Oh, who cares about that!? | 02:12 |
stweston | exactly... Ubuntu is kinda /always/ free. | 02:12 |
* paulproteus is joking! | 02:12 | |
stweston | okay... | 02:12 |
paulproteus | RedHat is a profitable company, as is Novell. | 02:12 |
stweston | I knew that, but how so? | 02:13 |
stweston | as in, how do they do that? | 02:13 |
greg-g | stweston: Redhat sells their linux distrobution by selling it to companies | 02:13 |
stweston | greg-g: ... | 02:13 |
stweston | greg-g: what do you mean? | 02:13 |
greg-g | they specifically sell the support services they provide to those companies | 02:13 |
stweston | well, I'm looking to make a profit on the software itself, while still having it be open for people to distribute... | 02:14 |
greg-g | specifically, they sell* | 02:14 |
stweston | such as, selling the copies, but letting others distribute the discs. | 02:14 |
*** [mharrison] has joined #cc | 02:14 | |
greg-g | stweston: right, and the GPL does not prevent you from doing that | 02:14 |
stweston | really? | 02:14 |
stweston | I didn't know that. | 02:14 |
stweston | or at least, I didn't think of it that way... | 02:15 |
greg-g | You can sell the software, but you must also make the source code available to those who you sell it to for free | 02:15 |
stweston | I see. | 02:15 |
stweston | so, you /could/, essentially, make the source available on a web site, and simply have others buy the actual copies? | 02:16 |
stweston | or what? | 02:16 |
greg-g | sure | 02:16 |
stweston | I see. | 02:16 |
stweston | and then comes the question: /how/ (as in, what format) is the source code distributed? | 02:17 |
stweston | I mean, you couldn't make a huge linux distro be on one web page - you'd have to make it available in some format or another. | 02:17 |
greg-g | stweston: this is pretty offtopic for this channel, but, if you are serious about setting up your own distrobution you should take a look at how debian (or debian based) distros satisfy the availability of source code requirement | 02:19 |
stweston | all right. thanks | 02:19 |
stweston | sorry this got off topic. See ya, and thanks again! | 02:19 |
greg-g | no worries, all the best | 02:19 |
stweston | yeah! | 02:19 |
stweston | wish me luck in making ZerOS! | 02:19 |
stweston | (remember that name, 'cuz it might become big!) | 02:20 |
*** stweston has left #cc | 02:20 | |
greg-g | god speed dear sir, god speed. | 02:20 |
greg-g | I can't wait to install ZerOS on my computer! | 02:21 |
*** stevel has quit IRC | 03:05 | |
*** nkinkade has quit IRC | 03:12 | |
*** mlinksva_ has quit IRC | 03:15 | |
*** is4 has quit IRC | 03:42 | |
*** [mharrison] has quit IRC | 04:34 | |
*** jgay has quit IRC | 05:04 | |
*** cacimar has quit IRC | 05:04 | |
*** balor has joined #cc | 08:46 | |
*** sama has joined #cc | 09:08 | |
*** rohitj has quit IRC | 09:57 | |
*** balor has quit IRC | 11:15 | |
*** Danny_B has quit IRC | 11:52 | |
*** Danny_B has joined #cc | 11:52 | |
*** parkerhiggins has quit IRC | 13:27 | |
*** parkerhiggins has joined #cc | 13:27 | |
*** is4 has joined #cc | 14:28 | |
*** mlinksva_ has joined #cc | 15:00 | |
*** nkinkade has joined #cc | 15:31 | |
*** is4 has quit IRC | 15:48 | |
*** Steren has joined #cc | 15:53 | |
Steren | hi | 15:54 |
*** Roderick_ has quit IRC | 16:07 | |
*** balor has joined #cc | 16:32 | |
*** scandal has joined #cc | 16:34 | |
*** scandal has left #cc | 16:34 | |
*** is4 has joined #cc | 16:37 | |
Steren | Is nathany on vacation ? | 16:39 |
*** stevel_ has joined #cc | 16:44 | |
nkinkade | Steren: yes. | 16:45 |
Steren | thanks | 16:45 |
mecredis | nkinkade: how is your gmail? | 16:51 |
nkinkade | mecredis: It's worked fine this morning. | 16:53 |
mecredis | I have been cursed by the gods of gmail then | 16:53 |
mecredis | oh well | 16:53 |
mecredis | well that has just about ground my day to a hault | 16:58 |
*** rohitj has joined #cc | 17:00 | |
mecredis | is back | 17:01 |
*** sama_ has joined #cc | 17:26 | |
*** Bovinity has joined #cc | 17:34 | |
*** sama has quit IRC | 17:42 | |
*** cacimar has joined #cc | 18:06 | |
*** Steren has quit IRC | 18:06 | |
nkinkade | paulproteus: Did you install fortune on every server? | 19:03 |
paulproteus | nkinkade, a4 5 6 7 I think. | 19:07 |
paulproteus | Maybe a 5 6 7 8. | 19:07 |
nkinkade | What for? | 19:07 |
nkinkade | For fun. | 19:07 |
paulproteus | I used this cool tool called cssh/clusterssh <packages.debian.org/clusterssh>. | 19:07 |
paulproteus | So Alex et al. can use fortune -o. | 19:07 |
Bovinity | man, my life is complete now. | 19:25 |
*** nathany has joined #cc | 20:15 | |
*** nathany has quit IRC | 20:19 | |
*** krnl_ has joined #cc | 21:06 | |
*** krnl_ has left #cc | 21:07 | |
*** cacimar has quit IRC | 21:21 | |
*** balor has quit IRC | 21:25 | |
*** Steren has joined #cc | 21:40 | |
nkinkade | Bovinity: ? | 21:44 |
Bovinity | nkinkade: ping | 21:44 |
nkinkade | In support.js on production you've got a line that skips auto-selecting the donation amount if id=15 or split=1. | 21:44 |
nkinkade | Is that just to avoid JS errors on pages that don't have the fields where that would make sensej? | 21:45 |
Bovinity | nkinkade: that may be a remnant from when i had the idea to split donation pages up, for whatever reason there was at the time. | 21:45 |
nkinkade | Bovinity: It make sense because there's not point in trying to check a donation radio button that doesn't exists. | 21:46 |
nkinkade | However, for my premium auto-selection stuff I sort of hijacked the if/thens that select the donation button, and it's getting circumvented by that earlier rule. | 21:47 |
nkinkade | I'm just trying to figure out if I should break those out into their own part, or if I'm safe to remove that check for id=15 and split=1. | 21:48 |
nkinkade | I suppose the consequence of removing that check would be some JS errors, not that anyone would see them unless they had debugging on. | 21:49 |
Bovinity | nkinkade: are we using the contribution page with id 15? | 21:49 |
nkinkade | Bovinity: It's the recurring contribution page. | 21:49 |
nkinkade | Yeah, we're using it. | 21:49 |
Bovinity | ok, i must be confusing it with something else | 21:49 |
nkinkade | Look at line 162 of support.js. | 21:50 |
nkinkade | Bovinity: ^^ | 21:50 |
nkinkade | That should clear it up. | 21:50 |
nkinkade | Then look at the changes I made yesterday for auto-selecting the premiums, they are below line 162, and hence not getting triggered, but they need to be. | 21:50 |
Bovinity | nkinkade: yeah, i see it. i'm not entirely seeing the problem.. it checks for !split, so your if split will work on page 15. | 21:51 |
nkinkade | But I need it to work when split is present. | 21:51 |
Bovinity | but it wouldn't hurt anything to remove that check | 21:51 |
nkinkade | split will be present on recurring contributions. | 21:52 |
Bovinity | and it will | 21:52 |
nkinkade | And setPremium() isn't getting set on the recurring page because of that. | 21:52 |
nkinkade | I see why you put that check in there, and if you think it needs to stay then I'll move the setPremium stuff somewhere else. | 21:53 |
Bovinity | nkinkade: other than some JS errors, that function would be fine without the check | 21:55 |
nkinkade | Bovinity: Now that I look at it like you say, it should be going past, sorry. | 21:55 |
nkinkade | So why was that check there? | 21:55 |
nkinkade | Bovinity: If you think it was a remnant as you say above, then I'll just remove it. | 21:56 |
Bovinity | just quit the function early | 21:57 |
nkinkade | Bovinity: Nevermind. I just figured it out. Sorry about the false alarm, and misreading line 162. Turns out that donation==100 wasn't true because on the recurring form donation=100.00. | 22:01 |
nkinkade | So that raises another issue ... do you know if there's any reason for that other than just an oversight? | 22:02 |
nkinkade | Or was it intentional. | 22:02 |
Bovinity | nkinkade: the missing decimal? | 22:02 |
nkinkade | Yeah. | 22:02 |
nkinkade | I was never entering the if donation=100 block and I just didn't notice that donation was actually 100.00. | 22:03 |
nkinkade | s/I/it/ | 22:03 |
Bovinity | the table sends donation=100.. | 22:03 |
Bovinity | i guess i should have thought to typecast or just make it a float, and ensure it's consistent | 22:04 |
nkinkade | The "Join" button sends 100, the "Montly" button sends 100.00. | 22:04 |
Bovinity | oversight | 22:04 |
nkinkade | I guess it had the unintended benefit of never enter a block that would try to operate on non-existent elements. | 22:05 |
nkinkade | Bovinity: I'll just change the page to send 100 for both one-time and monthly payments. | 22:06 |
Bovinity | nkinkade: ok! | 22:06 |
*** Muniz has joined #cc | 22:10 | |
*** Muniz has left #cc | 22:11 | |
*** tanjir has joined #cc | 22:22 | |
*** jgay has joined #cc | 22:38 | |
nkinkade | mlinksva_: A company down in Argentina did a really nice Spanish version of the video "Get Creative" ... I'm uploading it to Revver, and just wanted to double check with you to make sure that was okay, and also that we link to from support/videos. | 22:39 |
mlinksva_ | nkinkade: revver might not be the best choice, seems some of the videos on support/videos aren't working now ... maybe blip.tv and/or archive.org | 22:44 |
mlinksva_ | there are also (at least pt and it) other translations linked to from http://mirrors.creativecommons.org/getcreative/ | 22:44 |
nkinkade | mlinksva_: I've been noticing that Revver's site has been screwed for a few hours now, at least. | 22:45 |
mlinksva_ | probably best to link all the translations from both places | 22:45 |
nkinkade | mlinksva_: So you think blip.tv is fine and/or archive.org. Should it be linked to from support/videos? | 22:46 |
nkinkade | Ah, didn't ready your post before hitting Enter | 22:46 |
nkinkade | I'll put this video up on blip.tv and also the IT and PT ones, and then link to them all from support/videos. | 22:47 |
mlinksva_ | cool | 22:48 |
nkinkade | mlinksva_: Not sure if this matters or not, but I just noticed a discrepancy between the Deed for the by-nc-sa 1.0 license and the legalcode. | 23:00 |
nkinkade | The deed indicates that it can be licensed under this "or a similar" license. | 23:00 |
*** jgay has quit IRC | 23:03 | |
*** Steren has quit IRC | 23:03 | |
nkinkade | Bovinity: You can work with FLV files? | 23:26 |
Bovinity | nkinkade: i can probably convert FLV movies | 23:27 |
nkinkade | The guy sent me an MPEG video and it works, but the quality was drastically reduced from the SWF. | 23:27 |
nkinkade | If you think you might be able to do a decent conversion, then I may ask him if he'll send me the FLV file. | 23:28 |
Bovinity | they should just send us the FLA | 23:28 |
Generated by irclog2html.py 2.6 by Marius Gedminas - find it at mg.pov.lt!