Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
584 commits 2 branches 0 tags 365 MiB
Commit graph

555 commits

Author SHA1 Message Date
Martin Michlmayr
44a6e3a6b4 Add Martin Michlmayr as Assistant Treasurer 2014-10-30 17:55:21 +01:00
Martin Michlmayr
38944d3bb4 Remove Loïc Dachary from the eval committee 
Loïc is on a leave of absence from the eval committee.
 2014-10-30 17:29:41 +01:00
Martin Michlmayr
abb606c99a Remove Loïc Dachary as Director 
Loïc resigned due to lack of time but hopes to return in the future.
 2014-10-30 17:26:09 +01:00
Martin Michlmayr
74e0db77f9 Update filing date for FY 2013 2014-10-22 19:57:29 -04:00
Martin Michlmayr
66b2dcb958 Add FY 2014 2014-10-05 20:40:18 -04:00
Martin Michlmayr
78a5af62d6 Update FY 2013 filing status 2014-10-05 20:38:31 -04:00
Martin Michlmayr
a6d8735044 Fix HTML syntax error 2014-10-05 19:30:32 -04:00
Martin Michlmayr
28bcd2bf2d Add LuxRender 2014-10-05 19:09:03 -04:00
Bradley M. Kuhn
c463114b6b Mark Galassi is now Board Chairperson. 2014-09-15 17:09:36 -04:00
Martin Michlmayr
5ef2da5c39 Add Martin Michlmayr to the board page 2014-09-15 16:26:54 -04:00
Bradley M. Kuhn
12da2f4229 Update to current amounts. 2014-08-12 18:23:48 -04:00
Bradley M. Kuhn
328a972416 Merge upstream change w/ my change to donate page 2014-07-30 13:10:51 -04:00
Bradley M. Kuhn
7538e2881e Update Monthly Donation form to fix PayPal problem 
On a monthly subscription box, PayPal silently fails to allow the user
to select any option but the first one (despite selecting another value
from the form) if you name the values the same.

It's somewhat obvious when you review the form code that PayPal gives
you that all the value="" fields were the same, and thus the incorrect
behavior is somewhat unsurprising.

I fixed this by modifying the buttons to include the amount in words.
 2014-07-30 13:08:03 -04:00
Martin Michlmayr
611b14240a Update bio of Martin Michlmayr 2014-07-16 14:56:45 -04:00
Martin Michlmayr
ca961add01 Reduce whitespace/linebreaks in HTML output 2014-07-16 13:35:35 -04:00
Martin Michlmayr
6c75aa824d Use same logic for blogs as for news 
Put the code for blog.1 within the if block of blog.0, as this is the
logic used for news.  As a result, the <hr> divider for blogs is now
in the "shaded" element (as it already is with news).
 2014-07-15 18:30:25 -04:00
Martin Michlmayr
4802759d06 Put "Conservancy Blog" heading in shaded element for consistency with news 2014-07-15 18:27:24 -04:00
Bradley M. Kuhn
55d84a19b1 .* no longer desirable in /admin in urls.py 
According to:
http://stackoverflow.com/questions/10145583/django-1-4-and-noreversematch-at-admin-error

the .* was no longer correct.  It is herein removed.
 2014-07-14 14:49:17 -04:00
Bradley M. Kuhn
835d482604 No longer "stash" the GET object in self. 
I don't think this was actually necessary ultimately.  I think the older
code, herein removed, in item_author_email() was wrong-headed in the
first place, or at the very least, was overkill.

Each item has a distinct author, according to the BlogEntry model.  So,
I think this is actually what we want.  I noticed the author filed isn't
properly going into the RSS at the moment anyway, but I'm somewhat past
caring about that, as long as the URLs now work to get author- and tag-
specific feeds.
 2014-07-14 14:39:10 -04:00
Bradley M. Kuhn
387275c9d4 GET object is accessible everywhere in BlogFeed. 
This solution is likely a hack to ensure the GET object is regularly
accessible.
 2014-07-14 13:10:23 -04:00
Bradley M. Kuhn
e75642ed47 use get_object() in BlogFeed to get request object 
Upon reading
https://docs.djangoproject.com/en/dev/ref/contrib/syndication/#a-complex-example

I think that this is what I need to do to forward-port this Django 1.2
to Django 1.4's Feed objects.
 2014-07-14 12:35:08 -04:00
Bradley M. Kuhn
2a572dcffa Fix regression introduced in commit early today. 
6a2918c288 introduced a removal of this
line.  This line is necessary for the front page to work.
 2014-07-14 12:08:53 -04:00
Bradley M. Kuhn
252f29af81 Make sure return values match title. 
I received this error from the feeds:

AttributeError at /feeds/news/

'PressRelease' object has no attribute 'title'

Request Method: 	GET
Request URL: 	http://sfconservancy.org/feeds/news/
Django Version: 	1.4.5
Exception Type: 	AttributeError

'PressRelease' object has no attribute 'title'
Exception Location: 	/var/www/conservancy/feeds.py in item_title, line 46

I think this change fixes that.
 2014-07-14 11:56:30 -04:00
Bradley M. Kuhn
527ad3087f Additional argument was likely incorrect. 
Rereading https://docs.djangoproject.com/en/1.4/ref/contrib/syndication/
shows that the first argument should no longer be that class.
 2014-07-14 11:49:03 -04:00
Bradley M. Kuhn
61476fdb5c First attempt to follow Django 1.4 feed classes. 
I followed the instructions at
https://docs.djangoproject.com/en/1.4/ref/contrib/syndication/
and attempted to get these feeds to match that one.
 2014-07-14 11:03:54 -04:00
Bradley M. Kuhn
10b785b04d Need to import these classes for urls to use them. 2014-07-14 10:55:58 -04:00
Bradley M. Kuhn
2c63f6b33e Try putting these settings in each class. 
I am not sure what the loop was for anyway.
 2014-07-14 10:54:25 -04:00
Bradley M. Kuhn
18addfe969 Additional issues deal with feed_dict deprecation. 2014-07-14 10:52:41 -04:00
Bradley M. Kuhn
6a2918c288 In Django 1.2, feed_dict was deprecated. 
Therefore, change this to use the method explained at:

https://docs.djangoproject.com/en/dev/releases/1.2/#feed-in-django-contrib-syndication-feeds
 2014-07-14 10:49:29 -04:00
Bradley M. Kuhn
f18e922cf8 Merge branch 'master' of gitorious.org:conservancy/website 2014-07-14 10:22:44 -04:00
Bradley M. Kuhn
7835493122 Apparently, "Feed" is now capitalized. 
http://stackoverflow.com/questions/6642829/how-to-resolve-could-not-import-django-contrib-syndication-views-feed-error-in
 2014-07-14 10:20:15 -04:00
Martin Michlmayr
6dcb45d412 Update number of member projects 2014-07-09 16:43:01 -04:00
Bradley M. Kuhn
d70e6f3f8b Update for Djnango 1.4.5: admin.site.urls 
http://stackoverflow.com/questions/5503616/how-to-correct-this-error-adminsite-object-has-no-attribute-root
 2014-07-08 13:33:06 -04:00
Bradley M. Kuhn
85e9253eec Update for Djnango 1.4.5: feeds import. 2014-07-08 13:25:48 -04:00
Bradley M. Kuhn
639860b6e0 Fix alphabetical order problem from last commit. 2014-07-04 10:29:44 -04:00
Bradley M. Kuhn
b1a18a5aec Kallithea is Conservancy's newest member project. 
See http://sfconservancy.org/news/2014/jul/04/kallithea-joins/ for the
full announcement.
 2014-07-04 10:26:01 -04:00
Bradley M. Kuhn
0f00a679a4 Update progress & note it's only updated monthly. 
I've not been on top of updating this, but I'll usually do it at least
monthly now.
 2014-07-04 10:25:21 -04:00
Bradley M. Kuhn
865a56a6d6 Better spacing between donation types. 2014-06-13 08:15:05 -04:00
Bradley M. Kuhn
77f6c9ffa3 Better instructions and detail about wire transfer donations. 2014-06-13 08:13:33 -04:00
Tony Sebro
ee30bcb2bf updated outside counsel list to include Pam Chestek. 2014-05-29 18:15:29 -04:00
Bradley M. Kuhn
8dd4396a59 Karen is an employee now. 2014-05-05 13:27:25 -04:00
Martin Michlmayr
350bdfa106 Move the hr into the shaded div 
Move the hr into the shaded div, as is already the case with news.
 2014-05-02 12:27:13 -04:00
Martin Michlmayr
cb8f62370d Fix HTML </div> error on frontpage 
One too many <div> elements were closed when no blogs were displayed.

Note that the logic between news and blogs is different: news opens
one "shaded" div and puts all news in it.  In the case of blogs, one
"shaded" div is created for each blog entry displayed.
 2014-05-01 19:27:04 -04:00
Bradley M. Kuhn
de0b3fbb09 Include donations in progress bar through 2014-04-20. 
mjw insisted that I update this more often; he's right about that. :)
 2014-04-30 11:15:06 -07:00
Bradley M. Kuhn
24a8201313 Updates to the FSA template from Conservancy's internal repository. 
Included is now the ODT version of the template, that Tony and Karen insisted
on. :)
 2014-04-24 11:29:13 -04:00
Bradley M. Kuhn
9e7875d5d7 Update Karen's Bio on Eval Committee page as well. 2014-04-23 13:20:41 -04:00
Martin Michlmayr
c0bf257532 Close mainContent <div> element 2014-04-17 19:07:13 -04:00
Martin Michlmayr
cc031b3b61 Fix syntax for HTML comment 2014-04-17 19:01:51 -04:00
Martin Michlmayr
5456654ed2 Fix number of current projects 2014-04-17 13:07:29 -04:00
Martin Michlmayr
80392225ca Use HTML element for ampersand 2014-04-17 13:04:05 -04:00
Martin Michlmayr
e4a92f8bab Use American English for consistency 2014-04-17 12:54:13 -04:00
Martin Michlmayr
d7ace48349 Use Conservancy instead of SFC for consistency 2014-04-17 12:54:08 -04:00
Martin Michlmayr
ce2eeafb29 Fix HTML error - opening element used to close paragraph 2014-04-17 12:53:47 -04:00
Martin Michlmayr
e37dc9ceae Fix use of <p> in relation to <ul> 2014-04-17 12:53:35 -04:00
Martin Michlmayr
6e8d7dd68a Add missing </a> 2014-04-17 12:53:29 -04:00
Martin Michlmayr
5b627813e4 Fix error ID "sponsor" already defined 
An id can only be used once, you'd have to use a "class", but since the
<ul> element has an id the individual list elements will get the right
CSS values.
 2014-04-17 12:53:21 -04:00
Martin Michlmayr
46e66f42af Remove empty list element 2014-04-17 12:53:00 -04:00
Bradley M. Kuhn
f2e173d19e Update my bio. 2014-04-02 08:12:30 -04:00
Bradley M. Kuhn
14ae2f83ae Update to Karen's bio, as she emailed to me last night. 2014-04-02 08:01:32 -04:00
Bradley M. Kuhn
40c267daa1 Revert that last one, that's not the right way to do this. 2014-03-31 18:46:16 -04:00
Bradley M. Kuhn
c2a1250eac Put the time in 24 hour notion. 2014-03-31 18:44:05 -04:00
Bradley M. Kuhn
09d7a3aa2c Remove <br>'s, extra line, and fix variable name. 2014-03-31 18:41:43 -04:00
Bradley M. Kuhn
f3548d51a0 Rework how blog authors appear. 2014-03-31 18:39:35 -04:00
Bradley M. Kuhn
d66597edeb Fix div's, I think. 2014-03-31 18:36:21 -04:00
Bradley M. Kuhn
d24d3763b3 Improve template for blog when two appear. 2014-03-31 18:34:01 -04:00
Bradley M. Kuhn
f9eaefc173 Updated my bio. 2014-03-31 10:22:09 -04:00
Bradley M. Kuhn
00355badf7 Correct my title. 2014-03-31 10:16:01 -04:00
Bradley M. Kuhn
4519cfe1a3 Update Karen's bio. 2014-03-31 10:02:26 -04:00
Bradley M. Kuhn
a34a6dd73f Karen Sandler is now Executive Director. 
Also, update her bio to note she's not at GF anymore.
 2014-03-31 10:00:28 -04:00
Bradley M. Kuhn
068aa9ae7e David Marin and Amanda Halpin sponsorship. 2014-03-10 12:54:39 -04:00
Bradley M. Kuhn
28b11c9b11 Amarok left Conservancy officially today. 2014-02-28 09:33:19 -05:00
Bradley M. Kuhn
5bc1f84a77 Updated based on this week's donations. 2014-02-28 09:32:21 -05:00
Bradley M. Kuhn
3964c3e91f Add elections to Conservancy's list of member project services. 2014-02-27 11:51:47 -05:00
Bradley M. Kuhn
b04bb89f0f Update based on recent donations. 2014-02-26 09:00:29 -05:00
Bradley M. Kuhn
6218d22b9c Make a small PNG file for use in GSoC 2014. 2014-02-13 19:17:08 -05:00
Bradley M. Kuhn
620ec59177 FY 2012 Annual Report. 2014-01-29 17:55:45 -05:00
Bradley M. Kuhn
823907e67c FY 2012 Form 990, 990-T, CHAR-500 and auditors' report. 2014-01-14 19:57:21 -05:00
Bradley M. Kuhn
d6734debbf Updated number to current donation amounts. 2013-12-31 10:42:50 -05:00
Bradley M. Kuhn
e357a9f7eb Monthly donation. 2013-12-17 21:35:09 -05:00
Bradley M. Kuhn
0e4e179be8 Add monthly donation option. 2013-12-17 21:33:01 -05:00
Bradley M. Kuhn
89f09a40cd Note stock donation possibility. 2013-12-17 21:32:49 -05:00
Bradley M. Kuhn
b4edc163d0 Move flattr link to bottom of page. 2013-12-17 21:32:34 -05:00
Bradley M. Kuhn
4297294546 Correct donate line; reword text slightly. 2013-12-17 09:23:53 -05:00
Bradley M. Kuhn
dcd7e50659 Link to donate on the same page. 2013-12-17 09:20:35 -05:00
Bradley M. Kuhn
30de6b6930 Add javascript for donate box. 2013-12-17 09:19:05 -05:00
Bradley M. Kuhn
d9f1d9b840 W3C Validator says type= is required. 2013-12-17 09:15:03 -05:00
Bradley M. Kuhn
3e845e84f5 Fix tags and add <a> for donate. 2013-12-17 09:12:44 -05:00
Bradley M. Kuhn
2649c84625 Fix classifications for Django. 2013-12-17 09:07:33 -05:00
Bradley M. Kuhn
79d48bd96a Add missing period. 2013-12-17 09:06:29 -05:00
Bradley M. Kuhn
512bf5ce7d Fix closing tags and such. 2013-12-17 09:05:45 -05:00
Bradley M. Kuhn
c9c5c85c1c Add floating Donate box like the campaign page has. 2013-12-17 09:02:34 -05:00
Bradley M. Kuhn
cf0e2c12d4 Don't use fully qualified URL for our own site. 2013-12-17 08:58:54 -05:00
Bradley M. Kuhn
5f3048622f Fix unclosed <a> tag. 2013-12-17 08:58:20 -05:00
Bradley M. Kuhn
59054724bb Add long-overdue description page for GPL Compliance Project for Linux Developers. 2013-12-17 08:56:59 -05:00
Bradley M. Kuhn
f7f6f2b9a0 Forgot to remove Google Checkout from campaign page. 2013-12-06 17:45:56 -05:00
Bradley M. Kuhn
6e934f9439 OpenTripPlanner has joined Conservancy! 2013-11-22 11:29:20 -05:00
Bradley M. Kuhn
e153e3dbcb Updated to 30 members per yesterday's announcement. (HT tbm) 2013-11-21 11:58:08 -05:00
Bradley M. Kuhn
413b280e01 Buildbot has joined Conservancy! 2013-11-19 18:06:55 -05:00
Bradley M. Kuhn
ffe1caff9c Google discontinues Google checkout tomorrow. 
https://support.google.com/checkout/sell/answer/3080449?hl=en-GB
 2013-11-19 16:43:28 -05:00
Bradley M. Kuhn
fcffd1e873 Make it clear it's developers we need; separate hr more. 2013-11-15 14:25:09 -05:00
Bradley M. Kuhn
363df56194 Separate update more. 2013-11-15 14:24:22 -05:00
Bradley M. Kuhn
82b6ddf749 Add note about the project starting. 2013-11-15 14:21:42 -05:00
Bradley M. Kuhn
296f237b0a Add link to the Wiki. 2013-11-13 12:47:20 -05:00
Bradley M. Kuhn
ff1c40409d Fix typo in the height. 2013-10-10 10:35:47 -04:00
Bradley M. Kuhn
0a3928b135 Citrix became a sponsor a few weeks of Conservancy. 
I just received their logo this morning.
 2013-10-10 10:34:59 -04:00
Bradley M. Kuhn
2726656320 Updated with recently imported data from donations. 2013-10-09 12:11:24 -04:00
Bradley M. Kuhn
7c9bf099f2 phpMyAdmin has joined Conservancy: 
http://sfconservancy.org/news/2013/oct/07/phpMyAdmin-joins/
 2013-10-07 07:15:44 -04:00
Bradley M. Kuhn
d03fb818e2 Fix missing word. 2013-10-01 19:09:52 -04:00
Bradley M. Kuhn
a8ebfcec29 s/ecognition/recognition/ (spelling fix) 2013-10-01 18:49:36 -04:00
Bradley M. Kuhn
f07cb344c9 Updated FSA template to match current in use by Conservancy. 2013-09-30 17:47:48 -04:00
Bradley M. Kuhn
d9ea3af180 Mifos has spun out to the Mifos Initiative. 2013-09-24 09:54:20 -04:00
Bradley M. Kuhn
680f1f086b APRIL. 2013-09-24 09:54:06 -04:00
Bradley M. Kuhn
ffb4c20e3d Properly add April using the spelling they prefer. 2013-09-13 16:28:34 -04:00
Bradley M. Kuhn
2bd3fcbe3e Add APRIL to endorsement list. 2013-08-26 13:34:03 -04:00
Bradley M. Kuhn
89ce562e10 Note that the progress bar is now updated only weekly. 2013-07-30 17:51:23 -04:00
Bradley M. Kuhn
d7179594fb Updated to reflect recent donations. 2013-07-19 17:17:39 -04:00
Bradley M. Kuhn
01f2cca827 Updated from recent donation. 2013-07-08 18:04:55 -04:00
Bradley M. Kuhn
45c8785ad1 Include donations from the last few days. 2013-06-25 11:56:08 -04:00
Bradley M. Kuhn
e3d4ae0ffa Add donations for the last few days. 2013-06-20 13:41:21 -04:00
Bradley M. Kuhn
eb8665f3ec Donations from the last few days. 2013-06-18 13:11:23 -04:00
Bradley M. Kuhn
754ce012a5 Samsung is now a sponsor. 2013-06-18 12:55:42 -04:00
Bradley M. Kuhn
22549391a9 Updated recent donations. 2013-06-13 14:18:28 -04:00
Bradley M. Kuhn
722278cdfa Donations from the last few days. 2013-06-06 11:39:33 -04:00
Martin Michlmayr
38d6f6521b Typo fix 2013-06-06 08:13:10 -04:00
Martin Michlmayr
f91611b3db Add HP as a sponsor 2013-06-04 18:06:55 +01:00
Bradley M. Kuhn
7c04be601e Donations from over the weekend. 2013-06-03 12:01:31 -04:00
Jim Garrison
416a2787dd Removes last reference to Google Checkout being free for nonprofits. 
This finished what was partially fixed in be9ec7c6.

Patch submitted by Jim Garrison <jim@garrison.cc>.

Signed-Off-By: Bradley M. Kuhn <bkuhn@sfconservancy.org>
 2013-06-03 11:02:49 -04:00
Bradley M. Kuhn
348069b73d Recent donations. 2013-05-30 13:24:50 -04:00
Bradley M. Kuhn
890db3efbe Donation from yesterday. 2013-05-24 16:53:31 -04:00
Bradley M. Kuhn
b720d966ea Update from donations yesterday. 2013-05-23 12:11:29 -04:00
Bradley M. Kuhn
2682a4a484 Additional donation received today. 2013-05-22 10:48:13 -04:00
Bradley M. Kuhn
aa0bd86a5e Fix bad HTML tag. 2013-05-20 10:16:48 -04:00
Bradley M. Kuhn
0cf1e235ab Add two large donations announced today. 2013-05-20 10:04:22 -04:00
Bradley M. Kuhn
180876ecf5 Red Hat is now a sponsor. 2013-05-20 10:03:07 -04:00
Bradley M. Kuhn
2fcf94fc7d Add donation. 2013-05-18 08:32:49 -04:00
Bradley M. Kuhn
7548226145 Correct width and height. 2013-05-17 16:10:21 -04:00
Bradley M. Kuhn
336a94d644 It's a png, not a jpg. Also, no () on alt name. 2013-05-17 16:09:42 -04:00
Bradley M. Kuhn
ce0e1ead15 Add appendTo as a sponsor. 2013-05-17 16:08:34 -04:00
Bradley M. Kuhn
df56292717 Additional donation this week. 2013-05-16 16:44:11 -04:00
Bradley M. Kuhn
3cb2120df3 Updated based on today's donations. 2013-05-13 15:30:40 -04:00
Bradley M. Kuhn
6d317c06f0 Increase progress bar for donations from the last 24 hours. 2013-05-07 12:22:34 -04:00
Bradley M. Kuhn
51c90ba720 Updated campaign totals. 2013-05-06 10:21:51 -04:00
Bradley M. Kuhn
c10744ecd5 updated Loïc's bio, per his email to me with the new one. 2013-05-03 15:19:10 -04:00
Bradley M. Kuhn
c21a851310 .00 is too much detail. It was from a bad paste. 2013-05-03 10:05:26 -04:00
Bradley M. Kuhn
fbe4887276 Imported a few more donations. 2013-05-03 09:53:30 -04:00
Bradley M. Kuhn
6c61d85270 Imported today's transactions. Adds $545 not yet imported. 2013-05-02 20:50:08 -04:00
Bradley M. Kuhn
ee7aa6257a Updated percentage based on today's PayPal donations. 2013-05-02 18:55:34 -04:00
Bradley M. Kuhn
ba3e5070d7 Full PayPal donations and invoice-related pledges. 2013-05-02 07:57:57 -04:00
Bradley M. Kuhn
384eb14ada Another donation. 2013-05-01 14:19:28 -04:00
Bradley M. Kuhn
46a734557d Updated based on a few more donations. 2013-05-01 14:12:42 -04:00