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

1066 commits

Author SHA1 Message Date
Brett Smith
9c9f745677 static: Add stickered laptop image. 2016-12-07 10:29:25 -05:00
Brett Smith
cf5b073d44 urls: Route /error/NNN/ to static.views.handler. 
Since our Apache configuration uses `ErrorDocument NNN /error/NNN/`,
this is necessary to return the correct status code in those cases.
 2016-12-05 21:43:51 -05:00
Brett Smith
58e22337b0 static: Errors return proper HTTP response code. 2016-12-05 21:15:01 -05:00
Brett Smith
3fe5f09d18 static: Remove hardcoded path. 2016-12-05 21:14:45 -05:00
Brett Smith
9822895971 supporter: Fix JS syntax to check donation upgrade amount. 2016-12-02 15:26:36 -05:00
Brett Smith
6fe13959a3 supporter: Support donors upgrading to supporters. 
With a valid URL, a past donor can upgrade to a supporter by donating
the rest of the amount.  Django validates the data and, if it passes,
puts it in the form.  The JavaScript does most of the work from there.
 2016-12-02 12:50:21 -05:00
Brett Smith
d28ffd68ca supporter: HTML5 improvements to form. 
* Use "number" type for a better prompt.
* Use new standard "min" attribute for richer validation.
 2016-12-02 12:35:19 -05:00
Brett Smith
4afce1eadc appeal: Fix object structure passed into $().multiprogressbar. 2016-12-02 10:13:25 -05:00
Brett Smith
2c5a5f3a95 appeal: Fix jQuery chaining that didn't work. 2016-12-02 10:11:21 -05:00
Brett Smith
6908c135f2 appeal: Progress bar emphasizes current match program. 2016-12-02 10:09:12 -05:00
Brett Smith
dd8d159fcb css: Add styles for blog pictures. 2016-12-01 15:04:55 -05:00
Brett Smith
4cbf566e31 contractpatch: Page layout adjustments. 
Try to make sections clearer and avoid the "big monolith of text"
feeling.
 2016-11-30 16:24:28 -05:00
Brett Smith
a1ec899670 css: Start a separate stylesheet for "big screen" styles. 
I'm about to add more and I *suspect* this will be easier to maintain
in the long term, rather than duplicating the conditional many times.
 2016-11-30 16:18:06 -05:00
Brett Smith
8b1a03ede2 supporter: Add Chinese translation of Principles as accomplishment. 2016-11-29 13:53:23 -05:00
Brett Smith
26674d8c5a supporter: Link to main ContractPatch site. 2016-11-29 13:53:08 -05:00
Brett Smith
1637a36dfe js: Fix math again. 
I misunderstood how multiprogressbar works.  Values aren't expected to
progressively grow larger; it takes care of the summing itself.
 2016-11-29 13:45:44 -05:00
Brett Smith
52bcf1152a js: Set default noCommaSiteMiddleGoal. 2016-11-29 13:29:12 -05:00
Brett Smith
05290a6352 js: Fix needProgress math. 2016-11-29 13:25:53 -05:00
Brett Smith
8cb1f3f685 js: Use three-part progressbar when no middle goal defined. 
Since our current fundraiser doesn't have a "middle goal," this makes
it a little easier to maintain the template and do the math.
 2016-11-29 13:13:40 -05:00
Brett Smith
d359dc690a copyleft: English Principles link to Chinese translation. 2016-11-28 12:14:44 -05:00
Bradley M. Kuhn
a2e1eda555 Various wordsmith and formatting changes. 
You should feel free to revert these if you feel them incorrect.
 2016-11-22 10:25:30 -08:00
Bradley M. Kuhn
1ae1aeca02 Add additional space. 
I'm quite sure reimbursementrequests, despite how often we do them,
cannot be turned into one word just yet -- at least in English anyway.
 2016-11-22 10:00:34 -08:00
Tony Sebro
01fa72ba1e remove spurious word "source". 
bkuhn committing on behalf of Tony:

<tony> bkuhn: if you're making edits, please change "free and open
       source society" to "free and open society".  My Kallithea set up
       is still giving me problems (even after I uploaded my SSH key).
       I'll connect w/ Brett to fix next week.
 2016-11-22 09:59:39 -08:00
Karen M. Sandler
b37026be4d Rewrite of paragraph pasted into XMPP. 
bkuhn committed this on behalf of Karen.  She pasted this into an XMPP
chat before boarding a plane.
 2016-11-22 09:58:41 -08:00
Brett Smith
c7fb837aba appeal: Add missing Oxford comma. 2016-11-22 09:52:27 -08:00
Brett Smith
52ed68053d appeal: Minor layout cleanups. 
Forward port of e303e2776d from Brett.
 2016-11-22 09:51:03 -08:00
Bradley M. Kuhn
232310f75d A few additional changes, apparently from Brett. 
Step 4 in backport of unversioned changes from Brett done in
01ab5892ba.
 2016-11-22 09:45:30 -08:00
Bradley M. Kuhn
368fc07f6f Switch link to be all blog posts on ContractPatch 
Step 3 in backport of unversioned changes from Brett done in
01ab5892ba.
 2016-11-22 09:39:33 -08:00
Bradley M. Kuhn
99059c2b6f Various editorial changes, apparently from Brett. 
Step 2 in backport of unversioned changes from Brett done in
01ab5892ba.
 2016-11-22 09:38:36 -08:00
Bradley M. Kuhn
20f778565b Switch to unicode alt's for imgs 
Step 1 in backport of unversioned changes from Brett done in
01ab5892ba.
 2016-11-22 09:27:36 -08:00
Bradley M. Kuhn
1d83205723 Two small formatting changes. 
Step 0 in backport of unversioned changes from Brett done in
01ab5892ba.
 2016-11-22 09:24:53 -08:00
Bradley M. Kuhn
4b2ac8402b Remove https?://sfconservancy.org/ for this site. 
This is for deployment on sfconservancy.org, and as such, nothing should
begin with http://sfconservancy.org/ https://sfconservancy.org/.

Brett did this change before committing the initial version of the 2016
appeal.
 2016-11-22 08:56:17 -08:00
Bradley M. Kuhn
6802f6a78e Revert back 2016 appeal to Karen's version. 
Something was wrong with the version Brett committed.  It seemed to
merge text from Karen's 2016 version and the original 2015 version in
odd ways, particularly at the beginning.  This commit reverts back to
the version as Karen wanted it last night.  I will next forward-port
patches from Brett and those Karen gave this morning.
 2016-11-22 08:54:02 -08:00
Brett Smith
210745ab10 appeal: Add missing Oxford comma. 2016-11-22 09:00:43 -05:00
Brett Smith
e303e2776d appeal: Minor layout cleanups. 2016-11-22 08:53:52 -05:00
Brett Smith
01ab5892ba appeal: Update for 2016. 2016-11-22 08:31:27 -05:00
Brett Smith
6f06967a30 frontpage: Reduce the two-column width split to 67em. 
This brings the columns from a target width of about 60 characters to
about 52.
 2016-11-22 08:20:04 -05:00
Brett Smith
b12b2bb59a copyleft: Add Chinese translation of Principles. 2016-11-21 15:56:02 -05:00
Brett Smith
7e8d0538aa site: Font size adjustments throughout. 2016-11-17 11:35:22 -05:00
Brett Smith
4663e609ec site: Use default font size globally. 2016-11-17 11:04:09 -05:00
Brett Smith
d2657eddd0 frontpage: Adjust column presentation. 2016-11-17 10:56:58 -05:00
Brett Smith
b331d52331 frontpage: Reorganize. 
* Put news and blogs up front.
* Use 30 days as the cutoff for everything, consistently.
* Allow columns to collapse.  Hopefully this is the start of a nicer
  view on mobile.
* Reduce shading.
 2016-11-17 10:40:22 -05:00
Bradley M. Kuhn
78e99181af Anchor for Compliance Program for Linux Developers 
I think I'd already linked to this elsewhere even and forgot to add it.
 2016-11-16 09:05:13 -08:00
Brett Smith
1662bf983e sponsors: Add Target. 2016-11-09 12:34:20 -05:00
Bradley M. Kuhn
99078190bd s/enforcement/compliance/ 
Karen asked for this change.
 2016-11-05 20:53:25 -07:00
Bradley M. Kuhn
875a3650f3 Minor changes to formatting and header text. 
The email address to contact about the GPL Compliance Program for Linux
Developers was incorrect, that's fixed to
<linux-services@sfconservancy.org> instead of
<compliance@sfconservancy.org>.

Add "Template Only" as a background image to the actual text to
discourage people from signing this unilaterally.
 2016-11-03 18:21:01 -07:00
Bradley M. Kuhn
8777ac2383 Add links to template agreements. 
But encourage people not to sign them.
 2016-11-03 18:06:09 -07:00
Bradley M. Kuhn
7495b1f4f8 Add QEMU to this list. 2016-11-03 18:03:01 -07:00
Bradley M. Kuhn
5754f877c5 Add paragraph about principles-discuss. 
Welcome those who visit this page to join the principles-discuss mailing
list.  In doing so, also make a link to the principles themselves.
 2016-11-03 18:02:30 -07:00
Bradley M. Kuhn
03727955d9 Publish copies of the Linux enforcement agreements 2016-11-03 09:51:57 -07:00
Brett Smith
3705a2ba1d static: Re-fix path manipulation in index. 
* Strip any leading / to treat it as a relative path.
* Append `index.html` before converting to bytes.
 2016-11-03 10:58:23 -04:00
Brett Smith
93787dc820 static: Don't try to render non-template files as templates. 2016-11-03 10:34:01 -04:00
Brett Smith
6b1b3b8f2e static: Encode paths as UTF-8 before translating to the filesystem. 2016-11-03 10:34:01 -04:00
Brett Smith
39314c254e static: Use built-in methods for path manipulation. 2016-11-02 16:45:34 -04:00
Brett Smith
9e983208a0 img: Add images for Karen's OSCON EU news item. 2016-10-26 17:23:28 -04:00
Bradley M. Kuhn
2ecf537e33 Update my bio to the current version. 
This is the current version that i use when submitting talks.
 2016-10-24 14:07:08 -07:00
Bradley M. Kuhn
75846d7f35 Merge my local changes with upstream changes. 2016-10-24 13:44:42 -07:00
Bradley M. Kuhn
dde4afdd11 Rename members directory -> projects directory. 
As part of the transition to have the canonical URL for member projects
be "projects" instead of "members", rename the directories.

The following rewrite rule will be needed in Apache configuration now:
         RewriteRule    ^/?members?/index.html$ supporter/ [L, R]
         RewriteRule    ^/?members?/(.+)$ projects/$1 [L, R]
         RewriteRule    ^/?members?/?$ supporter/ [L, R]
 2016-10-24 13:40:04 -07:00
Bradley M. Kuhn
811d2b70b4 Rename Members->Projects in menu navigation et al 
Due to confusion about "members" and "supporters", we want at least the
menu navigation to not use the phrase "members" since some Supporters
expect that to refer to a type of donor.

While we will not be rebranding "member projects" fully at this time, we
want to favor the term projects.

A few additional changes, in particular moving files from members/ ->
projects/ directory will be needed in next commit.
 2016-09-30 13:46:51 -04:00
Bradley M. Kuhn
be762220af Foresight project wound down a while back. 
Foresight project isn't active anymore and informed us a while back that
they weren't.  We left them up for a time, but it was confusing
 2016-09-30 10:23:28 -04:00
Brett Smith
2ed9964157 npoacct: Update quote from SPI. 2016-09-27 15:23:02 -04:00
Bradley M. Kuhn
a9ce40d5d0 Ladies T-shirt sizing requests for monthly/renewal 2016-09-22 17:21:04 -07:00
Bradley M. Kuhn
b4ea2c419e Fitted t-shirt change. 2016-09-22 08:12:51 -07:00
Bradley M. Kuhn
b853fb05a4 Loïc link direclty. 2016-09-22 08:12:45 -07:00
Brett Smith
ec26bfc846 supporter-page.js: Add my copyright. 2016-09-09 15:39:21 -04:00
Brett Smith
ab29d45639 Supporter page: Try #2 for scroll to type selection after window ready. 
* Trigger on the "load" event rather than "ready".
* Install the handler outside document's "ready" handler so it should
  take effect more reliably.
 2016-09-09 15:16:46 -04:00
Brett Smith
fa6a61ed9b Supporter page: Scroll to type selection after window ready. 2016-09-09 14:51:11 -04:00
Brett Smith
9d30d7431a Supporter page: Make supporter type selections act like tabs. 
* Scroll to the type selection when the visitor follows a link to a
  specific type.
* Don't scroll the page when the user changes their selection.
 2016-09-09 14:35:15 -04:00
Brett Smith
c2ee1c761d Supporter page: Remove debug log. 2016-09-09 12:11:29 -04:00
Brett Smith
86ef51db5d Supporter page: Refactor JavaScript. 
This isn't intended to have any functional change, it's just DRYing up
the code to simplify functional changes later.
 2016-09-09 12:10:41 -04:00
Brett Smith
e9f01f106a 2015-supporter-appeal: Fix typo. 2016-09-09 12:10:09 -04:00
Martin Michlmayr
2d57f2dd77 Move Stormy Peters to Director Emeritus 
Stormy Peters resigned after 5 years on the board.  Thank you for
your contribution!
 2016-09-02 20:00:43 -07:00
Bradley M. Kuhn
4256fb3962 Update Adam's title. 2016-09-01 16:44:44 -07:00
Bradley M. Kuhn
a5d2e900d4 Asheesh no longer Executive Director of OpenHatch 2016-09-01 16:41:15 -07:00
Bradley M. Kuhn
9d681f5b3a Simon is no longer president 2016-09-01 16:40:57 -07:00
Bradley M. Kuhn
adfbd2ffc4 Remove Quoting Karen quote 
Quoting Karen from the time when she was Executive Director of GNOME
Foundation probably isn't helpful now that she's our Executive Director.
 2016-09-01 16:38:47 -07:00
Bradley M. Kuhn
3ebf6a740b Even more removal of deprecated stuff. 
The base template has most of this now.
 2016-09-01 16:37:18 -07:00
Bradley M. Kuhn
18a9b4ec21 Remove links to depreciated Javascript and CSS. 2016-09-01 16:36:17 -07:00
Bradley M. Kuhn
bfc34eff70 Remove counter box no longer used. 
We never hit the fundraising target, and did the best we could in
spending the funds, so there is no need to keep this progress bar.

Encourage people to donate to Support program.
 2016-09-01 16:34:44 -07:00
Brett Smith
ba80acf187 npoacct: Add news about Reimbursement system. 2016-08-31 16:47:45 -04:00
Brett Smith
63405c1dee npoacct: Remove fundraising references from page body. 2016-08-31 16:27:39 -04:00
Bradley M. Kuhn
35f2952db5 Add tech id in this tag. 2016-08-29 22:22:59 -07:00
Bradley M. Kuhn
9682d113c0 Samsung is no longer a sponsor of Conservancy. 2016-08-27 13:16:54 -07:00
Bradley M. Kuhn
6a3467eef3 Add Brett's bio. 2016-08-22 08:55:44 -07:00
Bradley M. Kuhn
4521dfa06a Add Google check details. 2016-08-19 07:45:51 -07:00
Bradley M. Kuhn
30fdeb75aa Merge branch 'master' of ssh://k.sfconservancy.org/website 2016-08-09 15:47:32 -07:00
Bradley M. Kuhn
59f08ae812 Various fixes from regenerated from Markdown source 2016-08-09 15:16:44 -07:00
Martin Michlmayr
bd5738bdca Fix typo 2016-08-09 14:28:34 -07:00
Bradley M. Kuhn
c41c973f99 Clarify this sentence. 2016-08-09 11:38:50 -07:00
Bradley M. Kuhn
73f0b434ca Shorten title. 2016-08-09 11:35:28 -07:00
Bradley M. Kuhn
787f58c121 Fix incorrect word. 2016-08-09 10:25:51 -07:00
Bradley M. Kuhn
ce6d470b04 Properly close ancor. 2016-08-09 08:30:00 -07:00
Bradley M. Kuhn
799a1122af Update timeline in "appeal" document. 2016-08-09 06:12:42 -07:00
Bradley M. Kuhn
c87d37688f Update FAQ entries from material from appeal. 2016-08-09 06:12:34 -07:00
Bradley M. Kuhn
d77fc565f8 Add menu item to CSS 2016-08-09 06:01:19 -07:00
Bradley M. Kuhn
651ac80b41 Proper placement of this <hr> tag. 2016-08-09 05:53:52 -07:00
Bradley M. Kuhn
654a38c6d5 Move Supporter button to top of page. 2016-08-09 05:52:50 -07:00
Bradley M. Kuhn
9a142ebfd7 Add link to partial source release. 2016-08-08 22:05:59 -07:00
Bradley M. Kuhn
2d694dafc2 Remove unprocessed backreference to footnote 2016-08-08 22:03:18 -07:00
Bradley M. Kuhn
20d1d04191 Fix code command formatting. 2016-08-08 21:57:27 -07:00
Bradley M. Kuhn
3d4bf5159b Update with various changes. 2016-08-08 21:55:58 -07:00
Bradley M. Kuhn
49aad6b046 Add introduction text. 2016-08-08 21:38:02 -07:00
Bradley M. Kuhn
7128285bcc VMware code similarity analysis. 2016-08-08 21:34:31 -07:00
Bradley M. Kuhn
80883cf4e8 Give more information 
... to quell silliness of people saying we don't take EUR.
 2016-07-14 11:16:17 -07:00
Kevin Brosnan
413d162e74 Remove problematic four digit CSS code 
Text is not dislpayed correctly with newer browsers, such as Firefox 49,
because of CSS color values. In current browsers the four digit values
are discarded as invalid CSS. Browsers are adding support for RGBA as a
valid CSS color value.

https://github.com/webcompat/web-bugs/issues/2628
 2016-06-08 13:39:35 -07:00
Bradley M. Kuhn
0deeb50191 Update info about FY 2015. 2016-05-10 11:30:28 -07:00
Bradley M. Kuhn
0a8bb49e20 Amended FY 2012 Form 990 as filed on 2015-01-09. 
There were a few typos in our FY 2012 Form 990.  Back on 2015-01-09, we
filed an amended Form 990.  I had forgotten until today (see commit
date) to update the website with it.  The author date of this commit
matches the date we filed.
 2016-05-10 11:24:43 -07:00
Bradley M. Kuhn
31c6c9ed33 Form should be singular here. 
This was likely a bad cut-and-paste from the years where we filed Form
990-T.
 2016-05-10 11:12:50 -07:00
Martin Michlmayr
af6102f3c1 Fix link to Git web site 
Fix link to Git web site.  I didn't notice that the https site
uses .com rather than .org.
 2016-05-07 20:21:09 -07:00
Martin Michlmayr
99e2a53de2 Use secure http for project links where possible 
Use secure http for project links where possible.  Thanks to Paul Wise.
 2016-05-07 20:06:53 -07:00
Martin Michlmayr
42ddcaed7b Update links to member projects 
Update links to member projects.  Thanks to Paul Wise for the updates.
 2016-05-07 20:03:45 -07:00
Bradley M. Kuhn
fb9c5cffd2 Comment out event, but leave text in. 
I want this here so it's ready in future.
 2016-04-28 12:58:05 -07:00
Bradley M. Kuhn
781a524676 Add LFNW thank-you. 2016-04-22 09:11:48 -07:00
Bradley M. Kuhn
438a278298 Remove LinuxConf AU match. 2016-04-22 09:09:43 -07:00
Karen M. Sandler
b9a2a729fb adding HPE logo 2016-03-30 21:54:38 -04:00
Karen M. Sandler
1582b52740 Removing reference to Supporter event that was held already on March 19, 2016 2016-03-19 23:12:34 -04:00
Karen M. Sandler
c3fe10e318 Adding text about Supporter-only event in Cambridge, MA on March 19 for new Supporters. 2016-03-14 20:52:26 -04:00
Karen M. Sandler
73b6813f2d Fixing number of current member projects 2016-03-14 14:31:21 -04:00
Karen M. Sandler
f4c4ad3fb4 Adding Spec-Ops to Current Member Projects page 2016-03-08 21:21:10 -05:00
Karen M. Sandler
8c756393c0 Adding Homebrew to Current Member Projects page 2016-03-08 21:13:54 -05:00
Martin Michlmayr
a17e1d7c73 Updated name of Martin Michlmayr's employer 2016-03-03 14:57:37 -08:00
Bradley M. Kuhn
b850e3dc5a Rework text about reporting violations. 
Include a link to my blog and how it's temporary.

Make section heading about donating.
 2016-03-03 12:46:44 -08:00
Bradley M. Kuhn
5bcc11efe3 Add title for reporting violations. 2016-03-03 12:45:54 -08:00
Bradley M. Kuhn
b35093a2fd Add busybox complaint. 2016-03-03 12:41:26 -08:00
Bradley M. Kuhn
771b54759a We met the PIA and LCA matches. 2016-03-02 17:04:40 -08:00
Bradley M. Kuhn
f115eea74c Merge public master branch with my local changes. 2016-02-29 15:16:06 -08:00
Bradley M. Kuhn
810b4fd360 Add id for funding. 2016-02-29 13:31:47 -08:00
Martin Michlmayr
1389703dc4 Minor whitespace fix 
Since there's a whitespace after the opening bracket, there should
be whitespace before the closing bracket.
 2016-02-28 12:12:01 -08:00
Martin Michlmayr
d00623dbd1 Explain that link is Korean 
It may not be clear what the link is, particularly if you don't have
Hangul fonts installed.  I first thought it was a broken backlink.
 2016-02-28 12:10:07 -08:00
Bradley M. Kuhn
15ee2b6edd Update punctuation. 2016-02-23 19:46:59 -08:00
Bradley M. Kuhn
cd15ed755b moreCount variable no longer used. 2016-02-23 19:45:50 -08:00
Bradley M. Kuhn
e260280ee1 Fix math error. 2016-02-23 19:45:16 -08:00
Bradley M. Kuhn
99ff4771a1 Change bar to show totals in a different way. 
The achieved! text is removed, to just show the total Supporters, and
the middle part is how many more we need right now.
 2016-02-23 19:21:22 -08:00
Bradley M. Kuhn
093f131738 Rename file. 2016-02-23 14:27:06 -08:00
Karen M. Sandler
fc8a2ab27e adding pdf of testimony as delivered 2016-02-23 17:19:21 -05:00
Karen M. Sandler
d272ff9612 adding picture taken by David Moore, CC-BY-SA-4 2016-02-23 17:16:27 -05:00
Bradley M. Kuhn
a28825da29 Create a few id tags for linking directly to FAQs. 2016-02-21 14:23:29 -08:00
Bradley M. Kuhn
57b12bb58f Add missing inner <ul> 2016-02-19 21:00:49 -08:00
Bradley M. Kuhn
e278e509ca Add Auditor's report from FY 2014. 2016-02-19 20:58:16 -08:00
Bradley M. Kuhn
1079f138fe Add FY 2014 Form 990; note FY 2015 schedule. 2016-02-19 20:57:16 -08:00
Bradley M. Kuhn
169a27d9db Add Collabora as a sponsor. 2016-02-10 18:23:33 -08:00
Bradley M. Kuhn
3f05f9e5da Formatting fix. 2016-02-05 15:46:13 +11:00
Bradley M. Kuhn
c8d44ca4c3 More changes to reference LCA match. 2016-02-05 15:26:19 +11:00
Bradley M. Kuhn
07daa54e8e LCA Match. 2016-02-05 15:18:18 +11:00
Bradley M. Kuhn
e80af0e706 Add details about Belgium event. 
Make paragraph after that flow from it.
 2016-01-22 14:18:57 -08:00
Bradley M. Kuhn
e9ab6d6e98 Explain what the renewal is. 2016-01-21 15:49:27 -08:00
Bradley M. Kuhn
40182feb8a Note that monthly renewal is automatic. 2016-01-21 15:48:21 -08:00
Bradley M. Kuhn
d7b22940be Wordsmith that last commit a bit. 2016-01-21 13:18:34 -08:00
Bradley M. Kuhn
22b5528ae5 Note that annual supporters are not auto-renew. 
We long ago decided not to auto-renew annual supporters.  However, three
different potential supporters mentioned they were unsure, so this note
is added to clarify.
 2016-01-21 13:17:03 -08:00
Bradley M. Kuhn
88a3e3e33f Update text to note reaching 750 level. 2016-01-20 15:20:07 -08:00