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

500 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley M. Kuhn
6275e3e377 Add missing npoacct selection box. 2014-12-01 13:13:04 -05:00
Bradley M. Kuhn
694e773ee5 Add Django templating and donation box. 2014-12-01 13:11:36 -05:00
Bradley M. Kuhn
ae1bbf964b Initial draft of supporter page. 2014-12-01 13:02:02 -05:00
Bradley M. Kuhn
8e728d010c Campaign is no longer "campaign", but npoacct. 
Changes in preparation of launching supporter program; no longer
highlight this as the "campaign".
 2014-12-01 13:01:06 -05:00
Bradley M. Kuhn
ce76203321 Rename file to new directory. 
/campaign will now be redirected to npoacct in apache config.
 2014-12-01 12:57:21 -05:00
Martin Michlmayr
15bd2a9add Fix some HTML syntax errors 2014-11-11 18:03:03 -05:00
Martin Michlmayr
82c58e3758 HTML tag "acronym" has been replaced by "abbr" in HTML5 2014-11-11 18:00:29 -05:00
Martin Michlmayr
1909b80564 Convert img border to CSS via style 2014-11-11 18:00:02 -05:00
Martin Michlmayr
fffb27d71d Use HTML5 2014-11-01 11:33:25 +01:00
Bradley M. Kuhn
3507839c63 Rename file names to remove the word "draft". 
RedirectPermeant's have been added server-side to handle the fact that
the URLs were already live.
 2014-10-31 13:06:39 -04:00
Bradley M. Kuhn
023ceb3435 Fix formatting error that Tony corrected. 2014-10-31 12:41:38 -04:00
Bradley M. Kuhn
5228b0a867 Update to versions with the Letterhead. 2014-10-31 12:39:15 -04:00
Bradley M. Kuhn
e6bfa35ad1 Updated to add CC0 waiver in it. 2014-10-31 12:37:24 -04:00
Bradley M. Kuhn
f58126eecd Rename file to no letterhead version, 
letterhead version is coming shortly.
 2014-10-31 12:30:08 -04:00
Bradley M. Kuhn
186819ccfb Add DMCA Petition files, as they were filed today. 2014-10-31 12:24:45 -04:00
Martin Michlmayr
7871c5e7a9 Cosmetic fix 2014-10-30 18:10:49 +01:00
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