From 531a97a3c9af08bc0a0c1e97894658061fa2eeb2 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Fri, 20 Oct 2023 18:25:55 +1100 Subject: [PATCH] Eliminate "conservancy" and "apps" subdirectories The directory nesting is unnecessary here and confusing to navigate. I've moved all apps to the project subdirectory, currently called "www", but soon to be renamed "conservancy". I've also moved manage.py to the top-level directory. --- manage.py | 19 ++++++++ .../apps => assignment}/__init__.py | 0 www/{conservancy/apps => }/assignment/apps.py | 2 +- .../apps => }/assignment/forms.py | 0 .../assignment/migrations/0001_initial.py | 0 .../migrations/0002_auto_20211206_2237.py | 0 .../migrations/0003_auto_20211206_2249.py | 0 .../migrations/0004_auto_20230127_0602.py | 0 .../migrations}/__init__.py | 0 .../apps => }/assignment/models.py | 0 .../apps => }/assignment/terms.py | 0 www/{conservancy/apps => }/assignment/urls.py | 0 .../apps => }/assignment/views.py | 0 .../migrations => blog}/__init__.py | 0 www/{conservancy/apps => }/blog/admin.py | 0 www/{conservancy/apps => }/blog/models.py | 2 +- www/{conservancy/apps => }/blog/urls.py | 0 www/{conservancy/apps => }/blog/views.py | 0 www/{conservancy => }/bsoup.py | 0 .../apps/blog => ccs_upload}/__init__.py | 0 .../apps => }/ccs_upload/forms.py | 0 www/{conservancy/apps => }/ccs_upload/urls.py | 0 .../apps => }/ccs_upload/views.py | 0 www/conservancy/__init__.py | 42 ---------------- www/conservancy/static/__init__.py | 0 .../apps/ccs_upload => contacts}/__init__.py | 0 www/{conservancy/apps => }/contacts/admin.py | 0 www/{conservancy/apps => }/contacts/models.py | 0 www/{conservancy/apps => }/contacts/urls.py | 2 +- www/{conservancy/apps => }/contacts/views.py | 0 .../contacts => contractpatch}/__init__.py | 0 .../apps => }/contractpatch/urls.py | 0 .../apps => }/contractpatch/views.py | 0 .../apps/contractpatch => events}/__init__.py | 0 www/{conservancy/apps => }/events/admin.py | 0 www/{conservancy/apps => }/events/models.py | 0 www/{conservancy/apps => }/events/urls.py | 4 +- .../apps => }/events/view_helpers.py | 0 www/{conservancy/apps => }/events/views.py | 0 www/{conservancy => }/feeds.py | 4 +- .../apps/events => fossy}/__init__.py | 0 www/{conservancy/apps => }/fossy/admin.py | 0 www/{conservancy/apps => }/fossy/apps.py | 2 +- www/{conservancy/apps => }/fossy/forms.py | 0 .../fossy/migrations/0001_initial.py | 0 .../migrations/0002_auto_20230130_1841.py | 0 .../fossy => fossy/migrations}/__init__.py | 0 www/{conservancy/apps => }/fossy/models.py | 0 www/{conservancy/apps => }/fossy/urls.py | 0 www/{conservancy/apps => }/fossy/views.py | 0 www/{conservancy => }/frontpage.py | 6 +-- .../fossy/migrations => fundgoal}/__init__.py | 0 www/{conservancy/apps => }/fundgoal/admin.py | 0 .../fundgoal/migrations/0001_initial.py | 0 .../fundgoal/migrations/0002_goalprovider.py | 0 ...0003_fundraisinggoal_fundraiser_endtime.py | 0 .../migrations}/__init__.py | 0 www/{conservancy/apps => }/fundgoal/models.py | 0 .../fundraiser_goal_banner_partial.html | 0 www/{conservancy/apps => }/fundgoal/views.py | 0 .../local_context_processors.py | 2 +- www/manage.py | 15 ------ www/{conservancy => }/middleware.py | 0 .../fundgoal/migrations => news}/__init__.py | 0 www/{conservancy/apps => }/news/admin.py | 0 www/{conservancy/apps => }/news/models.py | 2 +- .../news => news/templatetags}/__init__.py | 0 .../news/templatetags/date_within.py | 0 .../apps => }/news/templatetags/fill_url.py | 0 .../apps => }/news/templatetags/min.py | 0 .../apps => }/news/templatetags/subtract.py | 0 www/{conservancy/apps => }/news/urls.py | 0 www/{conservancy/apps => }/news/views.py | 0 www/{conservancy => }/settings.py | 46 +++++++++--------- www/{conservancy => }/sponsors.py | 2 +- .../news/templatetags => staff}/__init__.py | 0 www/{conservancy/apps => }/staff/admin.py | 0 .../staff/migrations/0001_initial.py | 0 .../migrations/0002_auto_20211128_2112.py | 0 .../staff => staff/migrations}/__init__.py | 0 www/{conservancy/apps => }/staff/models.py | 0 www/{conservancy => }/static/GPLv3 | 0 .../static/GiveUpGitHub/index.html | 0 .../staff/migrations => static}/__init__.py | 0 .../static/about/board/index.html | 0 .../static/about/contact/accounts-taxinfo.asc | 0 .../static/about/contact/index.html | 0 .../static/about/eval-committee/index.html | 0 www/{conservancy => }/static/about/index.html | 0 .../static/about/license/index.html | 0 .../static/about/outside/index.html | 0 .../static/about/staff/index.html | 0 .../static/about/transparency/index.html | 0 .../static/activities/index.html | 0 www/{conservancy => }/static/coming-soon.html | 0 .../static/copyleft-compliance/about.html | 0 .../enforcement-strategy.html | 0 .../firmware-liberation.html | 0 .../static/copyleft-compliance/glossary.html | 0 .../static/copyleft-compliance/help.html | 0 .../static/copyleft-compliance/index.html | 0 .../linux-vs-vmkernel_de.png | Bin .../linux-vs-vmkernel_de.svg | 0 .../linux-vs-vmkernel_en.png | Bin .../linux-vs-vmkernel_en.svg | 0 .../linux-vs-vmkernel_en_scaled.png | Bin .../copyleft-compliance/past-lawsuits.html | 0 .../copyleft-compliance/principles.cn.html | 0 .../copyleft-compliance/principles.cn.pdf | Bin .../copyleft-compliance/principles.html | 0 .../copyleft-compliance/principles.kr.html | 0 .../copyleft-compliance/principles.kr.pdf | Bin .../vizio-filing-press-release.html | 0 .../static/copyleft-compliance/vizio.html | 0 .../vmware-code-similarity.html | 0 .../vmware-lawsuit-appeal.html | 0 .../vmware-lawsuit-faq.html | 0 .../static/css/conservancy-bigscreen.css | 0 .../static/css/conservancy.css | 0 www/{conservancy => }/static/css/forms.css | 0 www/{conservancy => }/static/css/tachyons.css | 0 .../static/docs/2010-07-27_dj-opinion.pdf | Bin .../static/docs/2010_Killed-by-Code.pdf | Bin ...16-02-23_Contracts_Committee_testimony.pdf | Bin .../2017-08-01_1201-exemption-renewal.pdf | Bin .../docs/2018-01-03_Arista_amicus-brief.pdf | Bin ...nservancy-USPTO-Petition-re-rule-2_189.pdf | Bin ...14_Comment-Class-11_networking-devices.pdf | Bin ...2-14_Comment-Class-13_privacy-research.pdf | Bin ...lass-16_copyright-license-invesigation.pdf | Bin ...ter-to-Biden-on-cybersecurity-and-FOSS.pdf | Bin ...ability-and-Autonomy-in-Our-Technology.txt | 0 ...-Karen_KU-Leuven_Honorary-Doctorate.en.txt | 0 ...-Karen_KU-Leuven_Honorary-Doctorate.nl.txt | 0 .../static/docs/GiveUpGitHub-README.md | 0 .../SupportGiveUpGitHub-README-snippet.md | 0 ..._anonymous-linux-enforcement-agreement.pdf | Bin .../blank_linux-enforcement-agreement.pdf | Bin .../docs/busybox-complaint-2009-12-14.pdf | Bin ...ancy-1201-long-form-comment-2015-02-06.pdf | Bin ...1201-petition-2014-10-31-no-letterhead.odt | Bin .../conservancy-1201-petition-2014-10-31.odt | Bin .../conservancy-1201-petition-2014-10-31.pdf | Bin .../docs/conservancy-CHAR-500-fy-2008.pdf | Bin .../docs/conservancy-form-990-fy-2008.pdf | Bin .../docs/conservancy_CHAR-500_fy-2006.pdf | Bin .../docs/conservancy_CHAR-500_fy-2007.pdf | Bin .../docs/conservancy_CHAR-500_fy-2009.pdf | Bin .../docs/conservancy_CHAR-500_fy-2010.pdf | Bin .../docs/conservancy_CHAR-500_fy-2011.pdf | Bin .../docs/conservancy_CHAR-500_fy-2012.pdf | Bin .../docs/conservancy_CHAR-500_fy-2013.pdf | Bin .../docs/conservancy_CHAR-500_fy-2015.pdf | Bin .../docs/conservancy_CHAR-500_fy-2016.pdf | Bin .../docs/conservancy_CHAR-500_fy-2017.pdf | Bin .../static/docs/conservancy_Form-1023.pdf | 0 .../docs/conservancy_Form-990_fy-2007.pdf | Bin .../docs/conservancy_Form-990_fy-2009.pdf | Bin .../docs/conservancy_Form-990_fy-2010.pdf | Bin .../docs/conservancy_Form-990_fy-2011.pdf | Bin .../docs/conservancy_Form-990_fy-2012.pdf | Bin .../docs/conservancy_Form-990_fy-2013.pdf | Bin .../docs/conservancy_Form-990_fy-2014.pdf | Bin .../docs/conservancy_Form-990_fy-2015.pdf | Bin .../docs/conservancy_Form-990_fy-2016.pdf | Bin .../docs/conservancy_Form-990_fy-2017.pdf | Bin .../conservancy_annual-report_fy-2011.odp | Bin .../conservancy_annual-report_fy-2011.pdf | Bin .../conservancy_annual-report_fy-2012.odp | Bin .../conservancy_annual-report_fy-2012.pdf | Bin .../conservancy_annual-report_fy-2013.odp | Bin .../conservancy_annual-report_fy-2013.pdf | Bin .../static/docs/conservancy_by-laws.pdf | Bin ...nservancy_certificate-of-incorporation.pdf | Bin .../conservancy_independent-audit_fy-2010.pdf | Bin .../conservancy_independent-audit_fy-2011.pdf | Bin .../conservancy_independent-audit_fy-2012.pdf | Bin .../conservancy_independent-audit_fy-2013.pdf | Bin .../conservancy_independent-audit_fy-2014.pdf | Bin .../conservancy_independent-audit_fy-2015.pdf | Bin .../conservancy_independent-audit_fy-2016.pdf | Bin .../conservancy_independent-audit_fy-2017.pdf | Bin ...n_expert-report-in-neo4j_5-18-cv-07182.pdf | Bin .../docs/sfc-introduction-vtt-captions.txt | 0 ...conservancy-v-vizio-announce-press-kit.pdf | Bin ...nservancy-v-vizio-complaint-2021-10-19.pdf | Bin ...re-freedom-conservancy-v-vizio-q-and-a.pdf | Bin ...freedom-conservancy_CHAR500_fy-2018-19.pdf | Bin ...re-freedom-conservancy_CHAR500_fy-2019.pdf | Bin ...re-freedom-conservancy_CHAR500_fy-2020.pdf | Bin ...freedom-conservancy_CHAR500_fy-2021-22.pdf | Bin ...reedom-conservancy_Form-990_fy-2018-19.pdf | Bin ...e-freedom-conservancy_Form-990_fy-2019.pdf | Bin ...e-freedom-conservancy_Form-990_fy-2020.pdf | Bin ...reedom-conservancy_Form-990_fy-2021-22.pdf | Bin ...nservancy_independent-audit_fy-2018-19.pdf | Bin ...-conservancy_independent-audit_fy-2019.pdf | Bin ...-conservancy_independent-audit_fy-2020.pdf | Bin ...nservancy_independent-audit_fy-2021-22.pdf | Bin .../docs/sponsorship-agreement-template.odt | Bin .../docs/sponsorship-agreement-template.pdf | Bin .../docs/sponsorship-agreement-template.tex | 0 .../static/donate/index.html | 0 .../static/error/401/index.html | 0 .../static/error/403/index.html | 0 .../static/error/404/index.html | 0 .../static/error/500/index.html | 0 www/{conservancy => }/static/favicon.ico | Bin www/{conservancy => }/static/fossy.html | 0 www/{conservancy => }/static/fossy/index.html | 0 .../static/google536264c707362f55.html | 0 .../static/img/2015-10_KCC_karen-speaking.jpg | Bin .../static/img/2015-10_KCC_other-speakers.jpg | Bin ...n-testifying-by-David-Moore-CC-BY-SA-4.jpg | Bin .../img/2016-10_Hackey-New-School-1.jpg | Bin .../img/2016-10_Hackey-New-School-2.jpg | Bin .../img/2016-10_Karen-OSCon-EU-keynote.png | Bin .../img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg | Bin .../static/img/2016_OutreachyBoothAtTapia.JPG | Bin .../img/2017-01_LCA-Outreachy-donations.png | Bin .../img/2017-02-fosdem-bradley-keynote.jpg | Bin ...017-02-fosdem-kid-plays-at-godot-booth.jpg | Bin .../img/2017-02-fosdem-stand-karen-mike.jpg | Bin ...7-04_karen_defibrillator-interrogation.jpg | Bin ...7-04_karen_nurse-calling-manufacturers.jpg | Bin .../static/img/2017-06_tony_OSCon-award.jpg | Bin .../static/img/2017-09_froscon-signs.jpg | Bin .../img/2017-09_karen-speaking-guadec.jpg | Bin .../img/2017-09_outreachy-alums-debconf.jpg | Bin .../static/img/2017-11_blog_currency.jpg | Bin .../2017-12_blog_ChrisNeugebauer_poster.png | Bin .../img/2017-12_blog_Judy-Gichoya_poster.png | Bin .../2017-12_blog_group-support-thumbnail.png | Bin .../img/2017-12_blog_gsoc-member-projects.jpg | Bin .../static/img/2017-CWL-intro-poster.png | Bin .../img/2017-JeremiahFoster_thumbnail.png | Bin .../2017_GNUToolsCauldron_courtesy_of_mjw.jpg | Bin .../2018-03_blog_Sandler-at-LibrePlanet.jpg | Bin ...lly-de-Blanc-match-announcement-poster.png | Bin .../img/2018-MollyandKarenatDebConf.jpg | Bin .../2018-MollyandKarenatDebConf_cropped.png | Bin .../2018_ConservancyCatsCC.BY.SA_byVMB.jpeg | Bin ...b-Nicholson_LibrePlanet-keynote-poster.png | Bin ...Nicholson_LibrePlenet-keynote-poster-2.png | Bin .../img/2018_Deb-Nicholson_headshot.jpg | Bin .../2018_ElanaHashman_ARR_CourtesyofElana.jpg | Bin ...018_ElanaHashman_ARR_CourtesyofElana_2.jpg | Bin .../img/2018_GSOC-byJoshSimmons_high.JPG | Bin .../static/img/2018_KeithandCat.jpg | Bin ...tNotWiki_CC.BY.SA_by_tef_on_Wikipedia.jpeg | Bin .../static/img/2018_MicroBlocks1.JPG | Bin .../static/img/2018_MicroBlocks2.JPG | Bin .../static/img/2018_Microblocks3.jpeg | Bin .../static/img/2018_MollyandBash.jpg | Bin .../static/img/2018_Sageanddaughter.jpg | Bin .../img/2019-02_FOSDEM_keynote-poster.png | Bin .../img/2019-04_Nicholson-Deb_LibrePlanet.png | Bin .../2019-08-26_GUADECSupporterNightOne.jpg | Bin .../2019-08-26_GUADECSupporterNightThree.jpg | Bin .../2019-08-26_GUADECSupporterNightTwo.jpg | Bin ...-08-26_Neil-alone_GUADECSupporterNight.jpg | Bin ...-KarenatAbstractionsCC.BY_SarahWithee.jpeg | Bin ...8_KarenAbstractions_CC.BY Zach Harris.jpeg | Bin .../static/img/2019-10-24_BowieExplained.png | Bin .../static/img/2019-10-24_KarenExplained.png | Bin ...12_TheBestCats_CC.BY_byDanielleSucher.jpeg | Bin ...uhn_atKernelRecipes_byPatrickBoettcher.jpg | Bin .../img/20190204_CopyleftConfFromDeb.jpg | Bin .../img/20191116_FaifcastLiveAtSeaGL1.jpg | Bin .../img/20191116_FaifcastLiveAtSeaGL2.jpg | Bin .../img/20191116_FaifcastLiveAtSeaGL3.jpg | Bin ...ineConf2019-Group-1_by_Francois_Gouget.jpg | Bin .../2019_CopyleftConfByLeslieHawthorn.jpeg | Bin ...9_CopyleftConfByLeslieHawthorn_cropped.png | Bin ...hotoofDebNicholson_CC.BY_by_AdamMonsen.jpg | Bin .../static/img/2019_RB_group.gif | Bin .../static/img/2020-01-17_bkuhn_lca-2020.png | Bin ...2020-04_Deb-Nicholson_CHAOSScon-poster.png | Bin .../static/img/2020-07_MicroBlocks1.png | Bin .../static/img/2020-07_MicroBlocks2.png | Bin .../img/2020-12-04_lots-vintage-shirts.jpg | Bin ...econdAnnualCopyleftConf_byDebNicholson.jpg | Bin ...02.03_Copyleft.CC.BY.SA_byDebNicholson.png | Bin ...0131_AISession_CC.BY.SA_byPeterWolanin.jpg | Bin ...AfterParty_CC.BY.SA_byPeterWolanin.jpg.jpg | Bin ...131_AfterParty_CC.BY.SA_byPeterWolanin.xcf | Bin ...rParty_CC.BY.SA_byPeterWolanin_cropped.png | Bin ..._Allison_Randal_CC.BY.SA_byEvanCarroll.jpg | Bin .../static/img/2020_JeremyAllison.jpg | Bin .../static/img/2020_Leslie-Hawthorn.jpg | Bin .../img/2020_Sebro-Tony_CopyleftConf.jpg | Bin .../static/img/2020_Sebro_Tony.jpg | Bin .../static/img/2020_Sharp_headshot.jpg | Bin .../2020_WineBottle_CC.BY.SA_KarenSandler.png | Bin ...-Legal-Policy-DevRoom_organizers-panel.png | Bin .../static/img/Backdrop-Logo-Vertical.png | Bin .../static/img/BeerMatsfromLamby.jpeg | Bin ...A_Outreachy_at_Tapia_2016_Lidza_Louina.jpg | Bin .../static/img/DanielVetter_bw.jpg | Bin .../img/FariUse_Rainbow Logos from Reddit.png | Bin .../static/img/GiveUpGitHub.png | Bin .../static/img/GiveUpGitHub.svg | 0 www/{conservancy => }/static/img/QEMU.svg | 0 .../static/img/Sebro-headshot.jpg | Bin .../static/img/ShraddhaBarkepicture.jpg | Bin ...anav_Jain-Photo_CC-BY-NC-SA_Sage Sharp.jpg | Bin www/{conservancy => }/static/img/Vaishali.jpg | Bin .../static/img/banners/2018-individual.jpg | Bin .../static/img/banners/2018-project.jpg | Bin .../img/banners/2019-individuals-banner.png | Bin .../banners/2019-member-projects-banner.png | Bin .../2019_conservancy-card-terminal-snow.gif | Bin .../static/img/brett-in-2018-shirt.jpg | Bin .../static/img/cc-by-sa_88x31.png | Bin .../conservancy-accounting-campaign-logo.png | Bin .../static/img/conservancy-header.svg | 0 .../static/img/conservancy-logo.png | Bin .../static/img/conservancy-logo.svg | 0 .../static/img/conservancy-logo_package.zip | Bin .../static/img/conservancy-staff-photo.jpg | Bin .../img/conservancy-supporter-header.png | Bin .../img/conservancy-supporter-heart-3x.png | Bin .../conservancy-supporter-heart-supporter.svg | 0 .../img/conservancy-supporter-heart.png | Bin .../img/conservancy-supporter-heart.svg | 0 .../static/img/conservancy-t-shirt.jpg | Bin .../static/img/conservancy_64x64.png | Bin .../static/img/feed-icon-14x14.png | Bin .../static/img/font_awesome.svg | 0 .../static/img/gpl-heart.png | Bin www/{conservancy => }/static/img/headerbg.png | Bin www/{conservancy => }/static/img/jondale.jpg | Bin .../static/img/laptop-stickers-bro-mug.jpg | Bin www/{conservancy => }/static/img/lawall.jpg | Bin .../static/img/member-project-logos.png | Bin .../static/img/naomiwutweet.png | Bin .../img/people/Christoph-Hellwig_2015.jpg | Bin .../img/people/bdale-headshot-smaller.jpg | Bin .../static/img/people/bdale-headshot.jpg | Bin www/{conservancy => }/static/img/pono.jpg | Bin .../projects/2018-10_Reproducible-Builds.svg | 0 .../static/img/projects/CWL-Logo-nofonts.svg | 0 .../static/img/projects/argouml.jpg | Bin .../static/img/projects/bongo.png | Bin .../static/img/projects/boost.png | Bin .../static/img/projects/bro.png | Bin .../static/img/projects/buildbot.png | Bin .../static/img/projects/busybox.png | Bin .../static/img/projects/clojars.png | Bin .../static/img/projects/coreboot.svg | 0 .../static/img/projects/darcs.svg | 0 .../static/img/projects/etherpad.svg | 0 .../static/img/projects/evergreen.svg | 0 .../static/img/projects/freedv.png | Bin .../static/img/projects/git.png | Bin .../static/img/projects/godot/godot-logo.svg | 0 .../static/img/projects/harvey.svg | 0 .../static/img/projects/homebrew.svg | 0 .../static/img/projects/inkscape.svg | 0 .../static/img/projects/k3d.png | Bin .../static/img/projects/kallithea.svg | 0 .../static/img/projects/librehealth.png | Bin .../static/img/projects/luxrender.png | Bin .../static/img/projects/mercurial.svg | 0 .../static/img/projects/metalink.svg | 0 .../static/img/projects/microblocks.png | Bin .../static/img/projects/north-bay-python.png | Bin .../static/img/projects/opentripplanner.png | Bin .../static/img/projects/openwrt-2020.svg | 0 .../static/img/projects/openwrt.png | Bin .../static/img/projects/outreachy.png | Bin .../img/projects/outreachy/2016-05_team.jpg | Bin .../static/img/projects/phpmyadmin.png | Bin .../static/img/projects/pypy.svg | 0 .../static/img/projects/qemu.svg | 0 .../static/img/projects/racket.svg | 0 .../static/img/projects/samba.png | Bin .../static/img/projects/selenium.png | Bin .../static/img/projects/sourceware.svg | 0 .../static/img/projects/spec-ops.png | Bin .../static/img/projects/squeak.svg | 0 .../static/img/projects/sugar-labs.svg | 0 .../projects/sugar/2015_Turtle-Art-Day.jpg | Bin .../static/img/projects/surveyos.png | Bin .../static/img/projects/swig.jpg | Bin .../img/projects/teaching-open-source.png | Bin .../static/img/projects/twisted.svg | 0 .../static/img/projects/wine.png | Bin .../static/img/projects/xapian.png | Bin ...ervancy-Supporters-by-Carlo-Piana-CC-0.jpg | Bin .../static/img/sfc_holiday_card_2021.jpg | Bin .../sfc_holiday_card_video_done_smaller.mp4 | Bin .../static/img/sponsors/ardc.svg | 0 .../static/img/sponsors/arm.png | Bin .../static/img/sponsors/codeweavers.png | Bin .../static/img/sponsors/fossa.png | Bin .../static/img/sponsors/google.png | Bin .../static/img/sponsors/ifixit.png | Bin .../static/img/sponsors/indeed.png | Bin .../static/img/sponsors/intel.png | Bin .../static/img/sponsors/jmp.svg | 0 .../static/img/sponsors/lwn.png | Bin .../static/img/sponsors/mozilla.png | Bin .../static/img/sponsors/sakai.png | Bin .../static/img/sponsors/sentry.png | Bin .../static/img/supporter-badge.png | Bin .../static/img/supporter-card-1.svg | 0 .../static/img/supporter-card-2.svg | 0 .../static/img/supporter-night-button.png | Bin .../img/supporter-payment-button-annual.png | Bin .../img/supporter-payment-button-monthly.png | Bin .../img/supporter-payment-button-renewal.png | Bin .../static/img/sustainer.svg | 0 .../static/img/tshirt-2022.png | Bin .../static/js/conservancy.js | 0 .../static/js/jquery-1.7.2.js | 0 .../static/js/supporter-page.js | 0 www/{conservancy => }/static/learn/index.html | 0 .../static/npoacct/index.html | 0 www/{conservancy => }/static/press/index.html | 0 .../static/press/inthenews.html | 0 www/{conservancy => }/static/press/kit.html | 0 www/{conservancy => }/static/press/qanda.html | 0 .../static/press/vizio-coverage.html | 0 .../static/privacy-policy/index.html | 0 .../projects/apply/ConservancyFSATemplate.pdf | Bin .../apply/conservancy-fsa-template.odt | Bin .../apply/conservancy-fsa-template.tex | 0 .../static/projects/apply/index.html | 0 .../static/projects/current/index.html | 0 .../static/projects/index.html | 0 ...5723d4fa0cd23ff52a8945bd8b82d0b80b590.html | 0 ...7e1b02e2093594db118aaa956da8c93129d58.html | 0 .../policies/conflict-of-interest-policy.html | 0 ...e065865d3a0b78bb5f2d894c5f955e49e4f0f.html | 0 ...bc93469c1bb9ceb479f32c29fd7a8ee3521e3.html | 0 ...ea2c1e51c72e115dcceeede92e755a1d41da6.html | 0 ...1de38c2eab014dbfb776460c7600716bd6653.html | 0 ...ecf976cff8bf611cc045e6f351ce36f1009bb.html | 0 ...dcdd92fc61f3f150e1c65782c0fe527c8ff52.html | 0 ...0a68c8e10ab4ea1f68faaf6573c141bbe7614.html | 0 ...7fadc65c41438dd5dfeec3544bf80b53e4cea.html | 0 ...2754decec9bf4b88c10accd4e44b33e4664e6.html | 0 ...40cc7e0181236b3b5a988328ab2ae82cd7c03.html | 0 ...14f1e18273e4f164e3b3a689a086fd511ba26.html | 0 .../policies/conservancy-travel-policy.html | 0 .../static/projects/policies/index.html | 0 .../projects/policies/publish-policy.py | 0 .../static/projects/services/index.html | 0 www/{conservancy => }/static/robots.txt | 0 .../static/sustainer/event.html | 0 .../sustainer/original-supporter-appeal.html | 0 .../static/sustainer/thank-you-event.html | 0 .../static/sustainer/thank-you.html | 0 www/{conservancy => }/static/views.py | 0 .../apps => }/summit_registration/__init__.py | 0 .../apps => }/summit_registration/admin.py | 0 .../apps => }/summit_registration/models.py | 0 .../apps => }/summit_registration/urls.py | 2 +- .../apps => }/summit_registration/views.py | 2 +- .../apps => }/supporter/__init__.py | 0 www/{conservancy/apps => }/supporter/urls.py | 2 +- www/{conservancy/apps => }/supporter/views.py | 2 +- .../apps => }/supporters/__init__.py | 0 .../apps => }/supporters/admin.py | 0 .../apps => }/supporters/models.py | 0 www/{conservancy => }/templates/500.html | 0 .../templates/assignment/assignment_form.html | 0 .../templates/assignment/base_assignment.html | 0 .../templates/assignment/thanks.html | 0 .../templates/base_about.html | 0 .../templates/base_blog.html | 0 .../templates/base_compliance.html | 0 .../templates/base_conservancy.html | 0 .../templates/base_error.html | 0 .../templates/base_learn.html | 0 .../templates/base_news.html | 0 .../templates/base_press.html | 0 .../templates/base_projects.html | 0 .../templates/base_standard.html | 0 .../templates/base_vizio.html | 0 .../templates/blog/entry_archive_day.html | 0 .../templates/blog/entry_archive_month.html | 0 .../templates/blog/entry_archive_year.html | 0 .../templates/blog/entry_detail.html | 0 .../templates/blog/entry_list.html | 0 .../templates/blog/entry_partial.html | 0 .../templates/blog/query.html | 0 .../templates/ccs_upload/upload.html | 0 .../templates/contractpatch/index.html | 0 www/{conservancy => }/templates/feeds.html | 0 .../templates/feeds/blog_description.html | 0 .../templates/feeds/blog_title.html | 0 .../templates/feeds/news_description.html | 0 .../templates/feeds/news_title.html | 0 .../templates/feeds/omnibus_description.html | 0 .../templates/feeds/omnibus_title.html | 0 .../templates/fossy/base.html | 0 .../fossy/community_track_proposal_form.html | 0 .../templates/fossy/thanks.html | 0 .../templates/frontpage.html | 0 .../news/pressrelease_archive_day.html | 0 .../news/pressrelease_archive_month.html | 0 .../news/pressrelease_archive_year.html | 0 .../templates/news/pressrelease_detail.html | 0 .../templates/news/pressrelease_list.html | 0 .../templates/news/pressrelease_partial.html | 0 .../templates/opengraph_partial.html | 0 .../templates/opengraph_urllist_partial.html | 0 .../templates/socials_partial.html | 0 www/{conservancy => }/templates/sponsors.html | 0 .../templates/submenus/learn_partial.html | 0 .../templates/submenus/news_partial.html | 0 .../templates/submenus/press_partial.html | 0 .../submenus/what_we_do_partial.html | 0 .../submenus/who_we_are_partial.html | 0 .../templates/supporter/banners.html | 0 .../templates/supporter/form_partial.html | 0 .../templates/supporter/index.html | 0 www/{conservancy => }/urls.py | 20 ++++---- www/{conservancy/apps => }/worldmap/README | 0 .../apps => }/worldmap/__init__.py | 0 www/{conservancy/apps => }/worldmap/admin.py | 0 www/{conservancy/apps => }/worldmap/models.py | 0 .../apps => }/worldmap/templates/kml | 0 www/wsgi.py | 7 ++- 526 files changed, 76 insertions(+), 109 deletions(-) create mode 100755 manage.py rename www/{conservancy/apps => assignment}/__init__.py (100%) rename www/{conservancy/apps => }/assignment/apps.py (63%) rename www/{conservancy/apps => }/assignment/forms.py (100%) rename www/{conservancy/apps => }/assignment/migrations/0001_initial.py (100%) rename www/{conservancy/apps => }/assignment/migrations/0002_auto_20211206_2237.py (100%) rename www/{conservancy/apps => }/assignment/migrations/0003_auto_20211206_2249.py (100%) rename www/{conservancy/apps => }/assignment/migrations/0004_auto_20230127_0602.py (100%) rename www/{conservancy/apps/assignment => assignment/migrations}/__init__.py (100%) rename www/{conservancy/apps => }/assignment/models.py (100%) rename www/{conservancy/apps => }/assignment/terms.py (100%) rename www/{conservancy/apps => }/assignment/urls.py (100%) rename www/{conservancy/apps => }/assignment/views.py (100%) rename www/{conservancy/apps/assignment/migrations => blog}/__init__.py (100%) rename www/{conservancy/apps => }/blog/admin.py (100%) rename www/{conservancy/apps => }/blog/models.py (99%) rename www/{conservancy/apps => }/blog/urls.py (100%) rename www/{conservancy/apps => }/blog/views.py (100%) rename www/{conservancy => }/bsoup.py (100%) rename www/{conservancy/apps/blog => ccs_upload}/__init__.py (100%) rename www/{conservancy/apps => }/ccs_upload/forms.py (100%) rename www/{conservancy/apps => }/ccs_upload/urls.py (100%) rename www/{conservancy/apps => }/ccs_upload/views.py (100%) delete mode 100644 www/conservancy/__init__.py delete mode 100644 www/conservancy/static/__init__.py rename www/{conservancy/apps/ccs_upload => contacts}/__init__.py (100%) rename www/{conservancy/apps => }/contacts/admin.py (100%) rename www/{conservancy/apps => }/contacts/models.py (100%) rename www/{conservancy/apps => }/contacts/urls.py (58%) rename www/{conservancy/apps => }/contacts/views.py (100%) rename www/{conservancy/apps/contacts => contractpatch}/__init__.py (100%) rename www/{conservancy/apps => }/contractpatch/urls.py (100%) rename www/{conservancy/apps => }/contractpatch/views.py (100%) rename www/{conservancy/apps/contractpatch => events}/__init__.py (100%) rename www/{conservancy/apps => }/events/admin.py (100%) rename www/{conservancy/apps => }/events/models.py (100%) rename www/{conservancy/apps => }/events/urls.py (87%) rename www/{conservancy/apps => }/events/view_helpers.py (100%) rename www/{conservancy/apps => }/events/views.py (100%) rename www/{conservancy => }/feeds.py (98%) rename www/{conservancy/apps/events => fossy}/__init__.py (100%) rename www/{conservancy/apps => }/fossy/admin.py (100%) rename www/{conservancy/apps => }/fossy/apps.py (64%) rename www/{conservancy/apps => }/fossy/forms.py (100%) rename www/{conservancy/apps => }/fossy/migrations/0001_initial.py (100%) rename www/{conservancy/apps => }/fossy/migrations/0002_auto_20230130_1841.py (100%) rename www/{conservancy/apps/fossy => fossy/migrations}/__init__.py (100%) rename www/{conservancy/apps => }/fossy/models.py (100%) rename www/{conservancy/apps => }/fossy/urls.py (100%) rename www/{conservancy/apps => }/fossy/views.py (100%) rename www/{conservancy => }/frontpage.py (81%) rename www/{conservancy/apps/fossy/migrations => fundgoal}/__init__.py (100%) rename www/{conservancy/apps => }/fundgoal/admin.py (100%) rename www/{conservancy/apps => }/fundgoal/migrations/0001_initial.py (100%) rename www/{conservancy/apps => }/fundgoal/migrations/0002_goalprovider.py (100%) rename www/{conservancy/apps => }/fundgoal/migrations/0003_fundraisinggoal_fundraiser_endtime.py (100%) rename www/{conservancy/apps/fundgoal => fundgoal/migrations}/__init__.py (100%) rename www/{conservancy/apps => }/fundgoal/models.py (100%) rename www/{conservancy/apps => }/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html (100%) rename www/{conservancy/apps => }/fundgoal/views.py (100%) rename www/{conservancy => }/local_context_processors.py (93%) delete mode 100755 www/manage.py rename www/{conservancy => }/middleware.py (100%) rename www/{conservancy/apps/fundgoal/migrations => news}/__init__.py (100%) rename www/{conservancy/apps => }/news/admin.py (100%) rename www/{conservancy/apps => }/news/models.py (99%) rename www/{conservancy/apps/news => news/templatetags}/__init__.py (100%) rename www/{conservancy/apps => }/news/templatetags/date_within.py (100%) rename www/{conservancy/apps => }/news/templatetags/fill_url.py (100%) rename www/{conservancy/apps => }/news/templatetags/min.py (100%) rename www/{conservancy/apps => }/news/templatetags/subtract.py (100%) rename www/{conservancy/apps => }/news/urls.py (100%) rename www/{conservancy/apps => }/news/views.py (100%) rename www/{conservancy => }/settings.py (79%) rename www/{conservancy => }/sponsors.py (93%) rename www/{conservancy/apps/news/templatetags => staff}/__init__.py (100%) rename www/{conservancy/apps => }/staff/admin.py (100%) rename www/{conservancy/apps => }/staff/migrations/0001_initial.py (100%) rename www/{conservancy/apps => }/staff/migrations/0002_auto_20211128_2112.py (100%) rename www/{conservancy/apps/staff => staff/migrations}/__init__.py (100%) rename www/{conservancy/apps => }/staff/models.py (100%) rename www/{conservancy => }/static/GPLv3 (100%) rename www/{conservancy => }/static/GiveUpGitHub/index.html (100%) rename www/{conservancy/apps/staff/migrations => static}/__init__.py (100%) rename www/{conservancy => }/static/about/board/index.html (100%) rename www/{conservancy => }/static/about/contact/accounts-taxinfo.asc (100%) rename www/{conservancy => }/static/about/contact/index.html (100%) rename www/{conservancy => }/static/about/eval-committee/index.html (100%) rename www/{conservancy => }/static/about/index.html (100%) rename www/{conservancy => }/static/about/license/index.html (100%) rename www/{conservancy => }/static/about/outside/index.html (100%) rename www/{conservancy => }/static/about/staff/index.html (100%) rename www/{conservancy => }/static/about/transparency/index.html (100%) rename www/{conservancy => }/static/activities/index.html (100%) rename www/{conservancy => }/static/coming-soon.html (100%) rename www/{conservancy => }/static/copyleft-compliance/about.html (100%) rename www/{conservancy => }/static/copyleft-compliance/enforcement-strategy.html (100%) rename www/{conservancy => }/static/copyleft-compliance/firmware-liberation.html (100%) rename www/{conservancy => }/static/copyleft-compliance/glossary.html (100%) rename www/{conservancy => }/static/copyleft-compliance/help.html (100%) rename www/{conservancy => }/static/copyleft-compliance/index.html (100%) rename www/{conservancy => }/static/copyleft-compliance/linux-vs-vmkernel_de.png (100%) rename www/{conservancy => }/static/copyleft-compliance/linux-vs-vmkernel_de.svg (100%) rename www/{conservancy => }/static/copyleft-compliance/linux-vs-vmkernel_en.png (100%) rename www/{conservancy => }/static/copyleft-compliance/linux-vs-vmkernel_en.svg (100%) rename www/{conservancy => }/static/copyleft-compliance/linux-vs-vmkernel_en_scaled.png (100%) rename www/{conservancy => }/static/copyleft-compliance/past-lawsuits.html (100%) rename www/{conservancy => }/static/copyleft-compliance/principles.cn.html (100%) rename www/{conservancy => }/static/copyleft-compliance/principles.cn.pdf (100%) rename www/{conservancy => }/static/copyleft-compliance/principles.html (100%) rename www/{conservancy => }/static/copyleft-compliance/principles.kr.html (100%) rename www/{conservancy => }/static/copyleft-compliance/principles.kr.pdf (100%) rename www/{conservancy => }/static/copyleft-compliance/vizio-filing-press-release.html (100%) rename www/{conservancy => }/static/copyleft-compliance/vizio.html (100%) rename www/{conservancy => }/static/copyleft-compliance/vmware-code-similarity.html (100%) rename www/{conservancy => }/static/copyleft-compliance/vmware-lawsuit-appeal.html (100%) rename www/{conservancy => }/static/copyleft-compliance/vmware-lawsuit-faq.html (100%) rename www/{conservancy => }/static/css/conservancy-bigscreen.css (100%) rename www/{conservancy => }/static/css/conservancy.css (100%) rename www/{conservancy => }/static/css/forms.css (100%) rename www/{conservancy => }/static/css/tachyons.css (100%) rename www/{conservancy => }/static/docs/2010-07-27_dj-opinion.pdf (100%) rename www/{conservancy => }/static/docs/2010_Killed-by-Code.pdf (100%) rename www/{conservancy => }/static/docs/2016-02-23_Contracts_Committee_testimony.pdf (100%) rename www/{conservancy => }/static/docs/2017-08-01_1201-exemption-renewal.pdf (100%) rename www/{conservancy => }/static/docs/2018-01-03_Arista_amicus-brief.pdf (100%) rename www/{conservancy => }/static/docs/2019-09-18_Conservancy-USPTO-Petition-re-rule-2_189.pdf (100%) rename www/{conservancy => }/static/docs/2020-12-14_Comment-Class-11_networking-devices.pdf (100%) rename www/{conservancy => }/static/docs/2020-12-14_Comment-Class-13_privacy-research.pdf (100%) rename www/{conservancy => }/static/docs/2020-12-14_Comment-Class-16_copyright-license-invesigation.pdf (100%) rename www/{conservancy => }/static/docs/2022-02-01_open-letter-to-Biden-on-cybersecurity-and-FOSS.pdf (100%) rename www/{conservancy => }/static/docs/2023-01-31_KU-Lueven_Sandler-Karen_Software-Rights-Accountability-and-Autonomy-in-Our-Technology.txt (100%) rename www/{conservancy => }/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.en.txt (100%) rename www/{conservancy => }/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.nl.txt (100%) rename www/{conservancy => }/static/docs/GiveUpGitHub-README.md (100%) rename www/{conservancy => }/static/docs/SupportGiveUpGitHub-README-snippet.md (100%) rename www/{conservancy => }/static/docs/blank_anonymous-linux-enforcement-agreement.pdf (100%) rename www/{conservancy => }/static/docs/blank_linux-enforcement-agreement.pdf (100%) rename www/{conservancy => }/static/docs/busybox-complaint-2009-12-14.pdf (100%) rename www/{conservancy => }/static/docs/conservancy-1201-long-form-comment-2015-02-06.pdf (100%) rename www/{conservancy => }/static/docs/conservancy-1201-petition-2014-10-31-no-letterhead.odt (100%) rename www/{conservancy => }/static/docs/conservancy-1201-petition-2014-10-31.odt (100%) rename www/{conservancy => }/static/docs/conservancy-1201-petition-2014-10-31.pdf (100%) rename www/{conservancy => }/static/docs/conservancy-CHAR-500-fy-2008.pdf (100%) rename www/{conservancy => }/static/docs/conservancy-form-990-fy-2008.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2006.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2007.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2009.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2010.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2011.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2012.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2013.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2015.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2016.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_CHAR-500_fy-2017.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-1023.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2007.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2009.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2010.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2011.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2012.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2013.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2014.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2015.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2016.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_Form-990_fy-2017.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_annual-report_fy-2011.odp (100%) rename www/{conservancy => }/static/docs/conservancy_annual-report_fy-2011.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_annual-report_fy-2012.odp (100%) rename www/{conservancy => }/static/docs/conservancy_annual-report_fy-2012.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_annual-report_fy-2013.odp (100%) rename www/{conservancy => }/static/docs/conservancy_annual-report_fy-2013.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_by-laws.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_certificate-of-incorporation.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2010.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2011.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2012.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2013.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2014.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2015.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2016.pdf (100%) rename www/{conservancy => }/static/docs/conservancy_independent-audit_fy-2017.pdf (100%) rename www/{conservancy => }/static/docs/kuhn_expert-report-in-neo4j_5-18-cv-07182.pdf (100%) rename www/{conservancy => }/static/docs/sfc-introduction-vtt-captions.txt (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy-v-vizio-q-and-a.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_CHAR500_fy-2018-19.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_CHAR500_fy-2019.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_CHAR500_fy-2020.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_CHAR500_fy-2021-22.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_Form-990_fy-2018-19.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_Form-990_fy-2019.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_Form-990_fy-2020.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_Form-990_fy-2021-22.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_independent-audit_fy-2018-19.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_independent-audit_fy-2019.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_independent-audit_fy-2020.pdf (100%) rename www/{conservancy => }/static/docs/software-freedom-conservancy_independent-audit_fy-2021-22.pdf (100%) rename www/{conservancy => }/static/docs/sponsorship-agreement-template.odt (100%) rename www/{conservancy => }/static/docs/sponsorship-agreement-template.pdf (100%) rename www/{conservancy => }/static/docs/sponsorship-agreement-template.tex (100%) rename www/{conservancy => }/static/donate/index.html (100%) rename www/{conservancy => }/static/error/401/index.html (100%) rename www/{conservancy => }/static/error/403/index.html (100%) rename www/{conservancy => }/static/error/404/index.html (100%) rename www/{conservancy => }/static/error/500/index.html (100%) rename www/{conservancy => }/static/favicon.ico (100%) rename www/{conservancy => }/static/fossy.html (100%) rename www/{conservancy => }/static/fossy/index.html (100%) rename www/{conservancy => }/static/google536264c707362f55.html (100%) rename www/{conservancy => }/static/img/2015-10_KCC_karen-speaking.jpg (100%) rename www/{conservancy => }/static/img/2015-10_KCC_other-speakers.jpg (100%) rename www/{conservancy => }/static/img/2016-02-23_karen-testifying-by-David-Moore-CC-BY-SA-4.jpg (100%) rename www/{conservancy => }/static/img/2016-10_Hackey-New-School-1.jpg (100%) rename www/{conservancy => }/static/img/2016-10_Hackey-New-School-2.jpg (100%) rename www/{conservancy => }/static/img/2016-10_Karen-OSCon-EU-keynote.png (100%) rename www/{conservancy => }/static/img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg (100%) rename www/{conservancy => }/static/img/2016_OutreachyBoothAtTapia.JPG (100%) rename www/{conservancy => }/static/img/2017-01_LCA-Outreachy-donations.png (100%) rename www/{conservancy => }/static/img/2017-02-fosdem-bradley-keynote.jpg (100%) rename www/{conservancy => }/static/img/2017-02-fosdem-kid-plays-at-godot-booth.jpg (100%) rename www/{conservancy => }/static/img/2017-02-fosdem-stand-karen-mike.jpg (100%) rename www/{conservancy => }/static/img/2017-04_karen_defibrillator-interrogation.jpg (100%) rename www/{conservancy => }/static/img/2017-04_karen_nurse-calling-manufacturers.jpg (100%) rename www/{conservancy => }/static/img/2017-06_tony_OSCon-award.jpg (100%) rename www/{conservancy => }/static/img/2017-09_froscon-signs.jpg (100%) rename www/{conservancy => }/static/img/2017-09_karen-speaking-guadec.jpg (100%) rename www/{conservancy => }/static/img/2017-09_outreachy-alums-debconf.jpg (100%) rename www/{conservancy => }/static/img/2017-11_blog_currency.jpg (100%) rename www/{conservancy => }/static/img/2017-12_blog_ChrisNeugebauer_poster.png (100%) rename www/{conservancy => }/static/img/2017-12_blog_Judy-Gichoya_poster.png (100%) rename www/{conservancy => }/static/img/2017-12_blog_group-support-thumbnail.png (100%) rename www/{conservancy => }/static/img/2017-12_blog_gsoc-member-projects.jpg (100%) rename www/{conservancy => }/static/img/2017-CWL-intro-poster.png (100%) rename www/{conservancy => }/static/img/2017-JeremiahFoster_thumbnail.png (100%) rename www/{conservancy => }/static/img/2017_GNUToolsCauldron_courtesy_of_mjw.jpg (100%) rename www/{conservancy => }/static/img/2018-03_blog_Sandler-at-LibrePlanet.jpg (100%) rename www/{conservancy => }/static/img/2018-11_Molly-de-Blanc-match-announcement-poster.png (100%) rename www/{conservancy => }/static/img/2018-MollyandKarenatDebConf.jpg (100%) rename www/{conservancy => }/static/img/2018-MollyandKarenatDebConf_cropped.png (100%) rename www/{conservancy => }/static/img/2018_ConservancyCatsCC.BY.SA_byVMB.jpeg (100%) rename www/{conservancy => }/static/img/2018_Deb-Nicholson_LibrePlanet-keynote-poster.png (100%) rename www/{conservancy => }/static/img/2018_Deb-Nicholson_LibrePlenet-keynote-poster-2.png (100%) rename www/{conservancy => }/static/img/2018_Deb-Nicholson_headshot.jpg (100%) rename www/{conservancy => }/static/img/2018_ElanaHashman_ARR_CourtesyofElana.jpg (100%) rename www/{conservancy => }/static/img/2018_ElanaHashman_ARR_CourtesyofElana_2.jpg (100%) rename www/{conservancy => }/static/img/2018_GSOC-byJoshSimmons_high.JPG (100%) rename www/{conservancy => }/static/img/2018_KeithandCat.jpg (100%) rename www/{conservancy => }/static/img/2018_MattNotWiki_CC.BY.SA_by_tef_on_Wikipedia.jpeg (100%) rename www/{conservancy => }/static/img/2018_MicroBlocks1.JPG (100%) rename www/{conservancy => }/static/img/2018_MicroBlocks2.JPG (100%) rename www/{conservancy => }/static/img/2018_Microblocks3.jpeg (100%) rename www/{conservancy => }/static/img/2018_MollyandBash.jpg (100%) rename www/{conservancy => }/static/img/2018_Sageanddaughter.jpg (100%) rename www/{conservancy => }/static/img/2019-02_FOSDEM_keynote-poster.png (100%) rename www/{conservancy => }/static/img/2019-04_Nicholson-Deb_LibrePlanet.png (100%) rename www/{conservancy => }/static/img/2019-08-26_GUADECSupporterNightOne.jpg (100%) rename www/{conservancy => }/static/img/2019-08-26_GUADECSupporterNightThree.jpg (100%) rename www/{conservancy => }/static/img/2019-08-26_GUADECSupporterNightTwo.jpg (100%) rename www/{conservancy => }/static/img/2019-08-26_Neil-alone_GUADECSupporterNight.jpg (100%) rename www/{conservancy => }/static/img/2019-08-KarenatAbstractionsCC.BY_SarahWithee.jpeg (100%) rename www/{conservancy => }/static/img/2019-08_KarenAbstractions_CC.BY Zach Harris.jpeg (100%) rename www/{conservancy => }/static/img/2019-10-24_BowieExplained.png (100%) rename www/{conservancy => }/static/img/2019-10-24_KarenExplained.png (100%) rename www/{conservancy => }/static/img/2019-12-12_TheBestCats_CC.BY_byDanielleSucher.jpeg (100%) rename www/{conservancy => }/static/img/2019.09_CC.BY.SA_BradleyKuhn_atKernelRecipes_byPatrickBoettcher.jpg (100%) rename www/{conservancy => }/static/img/20190204_CopyleftConfFromDeb.jpg (100%) rename www/{conservancy => }/static/img/20191116_FaifcastLiveAtSeaGL1.jpg (100%) rename www/{conservancy => }/static/img/20191116_FaifcastLiveAtSeaGL2.jpg (100%) rename www/{conservancy => }/static/img/20191116_FaifcastLiveAtSeaGL3.jpg (100%) rename www/{conservancy => }/static/img/2019_CC.0_WineConf2019-Group-1_by_Francois_Gouget.jpg (100%) rename www/{conservancy => }/static/img/2019_CopyleftConfByLeslieHawthorn.jpeg (100%) rename www/{conservancy => }/static/img/2019_CopyleftConfByLeslieHawthorn_cropped.png (100%) rename www/{conservancy => }/static/img/2019_FSFAwardPhotoofDebNicholson_CC.BY_by_AdamMonsen.jpg (100%) rename www/{conservancy => }/static/img/2019_RB_group.gif (100%) rename www/{conservancy => }/static/img/2020-01-17_bkuhn_lca-2020.png (100%) rename www/{conservancy => }/static/img/2020-04_Deb-Nicholson_CHAOSScon-poster.png (100%) rename www/{conservancy => }/static/img/2020-07_MicroBlocks1.png (100%) rename www/{conservancy => }/static/img/2020-07_MicroBlocks2.png (100%) rename www/{conservancy => }/static/img/2020-12-04_lots-vintage-shirts.jpg (100%) rename www/{conservancy => }/static/img/2020.02.03_CC.BY.SA_SecondAnnualCopyleftConf_byDebNicholson.jpg (100%) rename www/{conservancy => }/static/img/2020.02.03_Copyleft.CC.BY.SA_byDebNicholson.png (100%) rename www/{conservancy => }/static/img/20200131_AISession_CC.BY.SA_byPeterWolanin.jpg (100%) rename www/{conservancy => }/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.jpg.jpg (100%) rename www/{conservancy => }/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.xcf (100%) rename www/{conservancy => }/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin_cropped.png (100%) rename www/{conservancy => }/static/img/2020_Allison_Randal_CC.BY.SA_byEvanCarroll.jpg (100%) rename www/{conservancy => }/static/img/2020_JeremyAllison.jpg (100%) rename www/{conservancy => }/static/img/2020_Leslie-Hawthorn.jpg (100%) rename www/{conservancy => }/static/img/2020_Sebro-Tony_CopyleftConf.jpg (100%) rename www/{conservancy => }/static/img/2020_Sebro_Tony.jpg (100%) rename www/{conservancy => }/static/img/2020_Sharp_headshot.jpg (100%) rename www/{conservancy => }/static/img/2020_WineBottle_CC.BY.SA_KarenSandler.png (100%) rename www/{conservancy => }/static/img/2021-02-07_FOSDEM-Legal-Policy-DevRoom_organizers-panel.png (100%) rename www/{conservancy => }/static/img/Backdrop-Logo-Vertical.png (100%) rename www/{conservancy => }/static/img/BeerMatsfromLamby.jpeg (100%) rename www/{conservancy => }/static/img/CC.BY.SA_Outreachy_at_Tapia_2016_Lidza_Louina.jpg (100%) rename www/{conservancy => }/static/img/DanielVetter_bw.jpg (100%) rename www/{conservancy => }/static/img/FariUse_Rainbow Logos from Reddit.png (100%) rename www/{conservancy => }/static/img/GiveUpGitHub.png (100%) rename www/{conservancy => }/static/img/GiveUpGitHub.svg (100%) rename www/{conservancy => }/static/img/QEMU.svg (100%) rename www/{conservancy => }/static/img/Sebro-headshot.jpg (100%) rename www/{conservancy => }/static/img/ShraddhaBarkepicture.jpg (100%) rename www/{conservancy => }/static/img/Urvika_Gola_former_Outreachy_intern_with_former_Google_Summer_of_Code_intern_Pranav_Jain-Photo_CC-BY-NC-SA_Sage Sharp.jpg (100%) rename www/{conservancy => }/static/img/Vaishali.jpg (100%) rename www/{conservancy => }/static/img/banners/2018-individual.jpg (100%) rename www/{conservancy => }/static/img/banners/2018-project.jpg (100%) rename www/{conservancy => }/static/img/banners/2019-individuals-banner.png (100%) rename www/{conservancy => }/static/img/banners/2019-member-projects-banner.png (100%) rename www/{conservancy => }/static/img/banners/2019_conservancy-card-terminal-snow.gif (100%) rename www/{conservancy => }/static/img/brett-in-2018-shirt.jpg (100%) rename www/{conservancy => }/static/img/cc-by-sa_88x31.png (100%) rename www/{conservancy => }/static/img/conservancy-accounting-campaign-logo.png (100%) rename www/{conservancy => }/static/img/conservancy-header.svg (100%) rename www/{conservancy => }/static/img/conservancy-logo.png (100%) rename www/{conservancy => }/static/img/conservancy-logo.svg (100%) rename www/{conservancy => }/static/img/conservancy-logo_package.zip (100%) rename www/{conservancy => }/static/img/conservancy-staff-photo.jpg (100%) rename www/{conservancy => }/static/img/conservancy-supporter-header.png (100%) rename www/{conservancy => }/static/img/conservancy-supporter-heart-3x.png (100%) rename www/{conservancy => }/static/img/conservancy-supporter-heart-supporter.svg (100%) rename www/{conservancy => }/static/img/conservancy-supporter-heart.png (100%) rename www/{conservancy => }/static/img/conservancy-supporter-heart.svg (100%) rename www/{conservancy => }/static/img/conservancy-t-shirt.jpg (100%) rename www/{conservancy => }/static/img/conservancy_64x64.png (100%) rename www/{conservancy => }/static/img/feed-icon-14x14.png (100%) rename www/{conservancy => }/static/img/font_awesome.svg (100%) rename www/{conservancy => }/static/img/gpl-heart.png (100%) rename www/{conservancy => }/static/img/headerbg.png (100%) rename www/{conservancy => }/static/img/jondale.jpg (100%) rename www/{conservancy => }/static/img/laptop-stickers-bro-mug.jpg (100%) rename www/{conservancy => }/static/img/lawall.jpg (100%) rename www/{conservancy => }/static/img/member-project-logos.png (100%) rename www/{conservancy => }/static/img/naomiwutweet.png (100%) rename www/{conservancy => }/static/img/people/Christoph-Hellwig_2015.jpg (100%) rename www/{conservancy => }/static/img/people/bdale-headshot-smaller.jpg (100%) rename www/{conservancy => }/static/img/people/bdale-headshot.jpg (100%) rename www/{conservancy => }/static/img/pono.jpg (100%) rename www/{conservancy => }/static/img/projects/2018-10_Reproducible-Builds.svg (100%) rename www/{conservancy => }/static/img/projects/CWL-Logo-nofonts.svg (100%) rename www/{conservancy => }/static/img/projects/argouml.jpg (100%) rename www/{conservancy => }/static/img/projects/bongo.png (100%) rename www/{conservancy => }/static/img/projects/boost.png (100%) rename www/{conservancy => }/static/img/projects/bro.png (100%) rename www/{conservancy => }/static/img/projects/buildbot.png (100%) rename www/{conservancy => }/static/img/projects/busybox.png (100%) rename www/{conservancy => }/static/img/projects/clojars.png (100%) rename www/{conservancy => }/static/img/projects/coreboot.svg (100%) rename www/{conservancy => }/static/img/projects/darcs.svg (100%) rename www/{conservancy => }/static/img/projects/etherpad.svg (100%) rename www/{conservancy => }/static/img/projects/evergreen.svg (100%) rename www/{conservancy => }/static/img/projects/freedv.png (100%) rename www/{conservancy => }/static/img/projects/git.png (100%) rename www/{conservancy => }/static/img/projects/godot/godot-logo.svg (100%) rename www/{conservancy => }/static/img/projects/harvey.svg (100%) rename www/{conservancy => }/static/img/projects/homebrew.svg (100%) rename www/{conservancy => }/static/img/projects/inkscape.svg (100%) rename www/{conservancy => }/static/img/projects/k3d.png (100%) rename www/{conservancy => }/static/img/projects/kallithea.svg (100%) rename www/{conservancy => }/static/img/projects/librehealth.png (100%) rename www/{conservancy => }/static/img/projects/luxrender.png (100%) rename www/{conservancy => }/static/img/projects/mercurial.svg (100%) rename www/{conservancy => }/static/img/projects/metalink.svg (100%) rename www/{conservancy => }/static/img/projects/microblocks.png (100%) rename www/{conservancy => }/static/img/projects/north-bay-python.png (100%) rename www/{conservancy => }/static/img/projects/opentripplanner.png (100%) rename www/{conservancy => }/static/img/projects/openwrt-2020.svg (100%) rename www/{conservancy => }/static/img/projects/openwrt.png (100%) rename www/{conservancy => }/static/img/projects/outreachy.png (100%) rename www/{conservancy => }/static/img/projects/outreachy/2016-05_team.jpg (100%) rename www/{conservancy => }/static/img/projects/phpmyadmin.png (100%) rename www/{conservancy => }/static/img/projects/pypy.svg (100%) rename www/{conservancy => }/static/img/projects/qemu.svg (100%) rename www/{conservancy => }/static/img/projects/racket.svg (100%) rename www/{conservancy => }/static/img/projects/samba.png (100%) rename www/{conservancy => }/static/img/projects/selenium.png (100%) rename www/{conservancy => }/static/img/projects/sourceware.svg (100%) rename www/{conservancy => }/static/img/projects/spec-ops.png (100%) rename www/{conservancy => }/static/img/projects/squeak.svg (100%) rename www/{conservancy => }/static/img/projects/sugar-labs.svg (100%) rename www/{conservancy => }/static/img/projects/sugar/2015_Turtle-Art-Day.jpg (100%) rename www/{conservancy => }/static/img/projects/surveyos.png (100%) rename www/{conservancy => }/static/img/projects/swig.jpg (100%) rename www/{conservancy => }/static/img/projects/teaching-open-source.png (100%) rename www/{conservancy => }/static/img/projects/twisted.svg (100%) rename www/{conservancy => }/static/img/projects/wine.png (100%) rename www/{conservancy => }/static/img/projects/xapian.png (100%) rename www/{conservancy => }/static/img/scaled-LLW-2015-Conservancy-Supporters-by-Carlo-Piana-CC-0.jpg (100%) rename www/{conservancy => }/static/img/sfc_holiday_card_2021.jpg (100%) rename www/{conservancy => }/static/img/sfc_holiday_card_video_done_smaller.mp4 (100%) rename www/{conservancy => }/static/img/sponsors/ardc.svg (100%) rename www/{conservancy => }/static/img/sponsors/arm.png (100%) rename www/{conservancy => }/static/img/sponsors/codeweavers.png (100%) rename www/{conservancy => }/static/img/sponsors/fossa.png (100%) rename www/{conservancy => }/static/img/sponsors/google.png (100%) rename www/{conservancy => }/static/img/sponsors/ifixit.png (100%) rename www/{conservancy => }/static/img/sponsors/indeed.png (100%) rename www/{conservancy => }/static/img/sponsors/intel.png (100%) rename www/{conservancy => }/static/img/sponsors/jmp.svg (100%) rename www/{conservancy => }/static/img/sponsors/lwn.png (100%) rename www/{conservancy => }/static/img/sponsors/mozilla.png (100%) rename www/{conservancy => }/static/img/sponsors/sakai.png (100%) rename www/{conservancy => }/static/img/sponsors/sentry.png (100%) rename www/{conservancy => }/static/img/supporter-badge.png (100%) rename www/{conservancy => }/static/img/supporter-card-1.svg (100%) rename www/{conservancy => }/static/img/supporter-card-2.svg (100%) rename www/{conservancy => }/static/img/supporter-night-button.png (100%) rename www/{conservancy => }/static/img/supporter-payment-button-annual.png (100%) rename www/{conservancy => }/static/img/supporter-payment-button-monthly.png (100%) rename www/{conservancy => }/static/img/supporter-payment-button-renewal.png (100%) rename www/{conservancy => }/static/img/sustainer.svg (100%) rename www/{conservancy => }/static/img/tshirt-2022.png (100%) rename www/{conservancy => }/static/js/conservancy.js (100%) rename www/{conservancy => }/static/js/jquery-1.7.2.js (100%) rename www/{conservancy => }/static/js/supporter-page.js (100%) rename www/{conservancy => }/static/learn/index.html (100%) rename www/{conservancy => }/static/npoacct/index.html (100%) rename www/{conservancy => }/static/press/index.html (100%) rename www/{conservancy => }/static/press/inthenews.html (100%) rename www/{conservancy => }/static/press/kit.html (100%) rename www/{conservancy => }/static/press/qanda.html (100%) rename www/{conservancy => }/static/press/vizio-coverage.html (100%) rename www/{conservancy => }/static/privacy-policy/index.html (100%) rename www/{conservancy => }/static/projects/apply/ConservancyFSATemplate.pdf (100%) rename www/{conservancy => }/static/projects/apply/conservancy-fsa-template.odt (100%) rename www/{conservancy => }/static/projects/apply/conservancy-fsa-template.tex (100%) rename www/{conservancy => }/static/projects/apply/index.html (100%) rename www/{conservancy => }/static/projects/current/index.html (100%) rename www/{conservancy => }/static/projects/index.html (100%) rename www/{conservancy => }/static/projects/policies/conflict-of-interest-policy.9ed5723d4fa0cd23ff52a8945bd8b82d0b80b590.html (100%) rename www/{conservancy => }/static/projects/policies/conflict-of-interest-policy.d477e1b02e2093594db118aaa956da8c93129d58.html (100%) rename www/{conservancy => }/static/projects/policies/conflict-of-interest-policy.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.11ae065865d3a0b78bb5f2d894c5f955e49e4f0f.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.3b1bc93469c1bb9ceb479f32c29fd7a8ee3521e3.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.44cea2c1e51c72e115dcceeede92e755a1d41da6.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.4b21de38c2eab014dbfb776460c7600716bd6653.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.676ecf976cff8bf611cc045e6f351ce36f1009bb.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.783dcdd92fc61f3f150e1c65782c0fe527c8ff52.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.96a0a68c8e10ab4ea1f68faaf6573c141bbe7614.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.9ef7fadc65c41438dd5dfeec3544bf80b53e4cea.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.bfc2754decec9bf4b88c10accd4e44b33e4664e6.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.d3640cc7e0181236b3b5a988328ab2ae82cd7c03.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.efb14f1e18273e4f164e3b3a689a086fd511ba26.html (100%) rename www/{conservancy => }/static/projects/policies/conservancy-travel-policy.html (100%) rename www/{conservancy => }/static/projects/policies/index.html (100%) rename www/{conservancy => }/static/projects/policies/publish-policy.py (100%) rename www/{conservancy => }/static/projects/services/index.html (100%) rename www/{conservancy => }/static/robots.txt (100%) rename www/{conservancy => }/static/sustainer/event.html (100%) rename www/{conservancy => }/static/sustainer/original-supporter-appeal.html (100%) rename www/{conservancy => }/static/sustainer/thank-you-event.html (100%) rename www/{conservancy => }/static/sustainer/thank-you.html (100%) rename www/{conservancy => }/static/views.py (100%) rename www/{conservancy/apps => }/summit_registration/__init__.py (100%) rename www/{conservancy/apps => }/summit_registration/admin.py (100%) rename www/{conservancy/apps => }/summit_registration/models.py (100%) rename www/{conservancy/apps => }/summit_registration/urls.py (54%) rename www/{conservancy/apps => }/summit_registration/views.py (91%) rename www/{conservancy/apps => }/supporter/__init__.py (100%) rename www/{conservancy/apps => }/supporter/urls.py (91%) rename www/{conservancy/apps => }/supporter/views.py (94%) rename www/{conservancy/apps => }/supporters/__init__.py (100%) rename www/{conservancy/apps => }/supporters/admin.py (100%) rename www/{conservancy/apps => }/supporters/models.py (100%) rename www/{conservancy => }/templates/500.html (100%) rename www/{conservancy => }/templates/assignment/assignment_form.html (100%) rename www/{conservancy => }/templates/assignment/base_assignment.html (100%) rename www/{conservancy => }/templates/assignment/thanks.html (100%) rename www/{conservancy => }/templates/base_about.html (100%) rename www/{conservancy => }/templates/base_blog.html (100%) rename www/{conservancy => }/templates/base_compliance.html (100%) rename www/{conservancy => }/templates/base_conservancy.html (100%) rename www/{conservancy => }/templates/base_error.html (100%) rename www/{conservancy => }/templates/base_learn.html (100%) rename www/{conservancy => }/templates/base_news.html (100%) rename www/{conservancy => }/templates/base_press.html (100%) rename www/{conservancy => }/templates/base_projects.html (100%) rename www/{conservancy => }/templates/base_standard.html (100%) rename www/{conservancy => }/templates/base_vizio.html (100%) rename www/{conservancy => }/templates/blog/entry_archive_day.html (100%) rename www/{conservancy => }/templates/blog/entry_archive_month.html (100%) rename www/{conservancy => }/templates/blog/entry_archive_year.html (100%) rename www/{conservancy => }/templates/blog/entry_detail.html (100%) rename www/{conservancy => }/templates/blog/entry_list.html (100%) rename www/{conservancy => }/templates/blog/entry_partial.html (100%) rename www/{conservancy => }/templates/blog/query.html (100%) rename www/{conservancy => }/templates/ccs_upload/upload.html (100%) rename www/{conservancy => }/templates/contractpatch/index.html (100%) rename www/{conservancy => }/templates/feeds.html (100%) rename www/{conservancy => }/templates/feeds/blog_description.html (100%) rename www/{conservancy => }/templates/feeds/blog_title.html (100%) rename www/{conservancy => }/templates/feeds/news_description.html (100%) rename www/{conservancy => }/templates/feeds/news_title.html (100%) rename www/{conservancy => }/templates/feeds/omnibus_description.html (100%) rename www/{conservancy => }/templates/feeds/omnibus_title.html (100%) rename www/{conservancy => }/templates/fossy/base.html (100%) rename www/{conservancy => }/templates/fossy/community_track_proposal_form.html (100%) rename www/{conservancy => }/templates/fossy/thanks.html (100%) rename www/{conservancy => }/templates/frontpage.html (100%) rename www/{conservancy => }/templates/news/pressrelease_archive_day.html (100%) rename www/{conservancy => }/templates/news/pressrelease_archive_month.html (100%) rename www/{conservancy => }/templates/news/pressrelease_archive_year.html (100%) rename www/{conservancy => }/templates/news/pressrelease_detail.html (100%) rename www/{conservancy => }/templates/news/pressrelease_list.html (100%) rename www/{conservancy => }/templates/news/pressrelease_partial.html (100%) rename www/{conservancy => }/templates/opengraph_partial.html (100%) rename www/{conservancy => }/templates/opengraph_urllist_partial.html (100%) rename www/{conservancy => }/templates/socials_partial.html (100%) rename www/{conservancy => }/templates/sponsors.html (100%) rename www/{conservancy => }/templates/submenus/learn_partial.html (100%) rename www/{conservancy => }/templates/submenus/news_partial.html (100%) rename www/{conservancy => }/templates/submenus/press_partial.html (100%) rename www/{conservancy => }/templates/submenus/what_we_do_partial.html (100%) rename www/{conservancy => }/templates/submenus/who_we_are_partial.html (100%) rename www/{conservancy => }/templates/supporter/banners.html (100%) rename www/{conservancy => }/templates/supporter/form_partial.html (100%) rename www/{conservancy => }/templates/supporter/index.html (100%) rename www/{conservancy => }/urls.py (80%) rename www/{conservancy/apps => }/worldmap/README (100%) rename www/{conservancy/apps => }/worldmap/__init__.py (100%) rename www/{conservancy/apps => }/worldmap/admin.py (100%) rename www/{conservancy/apps => }/worldmap/models.py (100%) rename www/{conservancy/apps => }/worldmap/templates/kml (100%) diff --git a/manage.py b/manage.py new file mode 100755 index 00000000..51055cea --- /dev/null +++ b/manage.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python +"""Django command-line utility for administration tasks. + +See https://docs.djangoproject.com/en/4.0/ref/django-admin/ +""" +import os +import sys + +if __name__ == '__main__': + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'www.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) diff --git a/www/conservancy/apps/__init__.py b/www/assignment/__init__.py similarity index 100% rename from www/conservancy/apps/__init__.py rename to www/assignment/__init__.py diff --git a/www/conservancy/apps/assignment/apps.py b/www/assignment/apps.py similarity index 63% rename from www/conservancy/apps/assignment/apps.py rename to www/assignment/apps.py index 4a25076b..ac76db17 100644 --- a/www/conservancy/apps/assignment/apps.py +++ b/www/assignment/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class AssignmentConfig(AppConfig): - name = 'conservancy.apps.assignment' + name = 'www.assignment' diff --git a/www/conservancy/apps/assignment/forms.py b/www/assignment/forms.py similarity index 100% rename from www/conservancy/apps/assignment/forms.py rename to www/assignment/forms.py diff --git a/www/conservancy/apps/assignment/migrations/0001_initial.py b/www/assignment/migrations/0001_initial.py similarity index 100% rename from www/conservancy/apps/assignment/migrations/0001_initial.py rename to www/assignment/migrations/0001_initial.py diff --git a/www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py b/www/assignment/migrations/0002_auto_20211206_2237.py similarity index 100% rename from www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py rename to www/assignment/migrations/0002_auto_20211206_2237.py diff --git a/www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py b/www/assignment/migrations/0003_auto_20211206_2249.py similarity index 100% rename from www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py rename to www/assignment/migrations/0003_auto_20211206_2249.py diff --git a/www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py b/www/assignment/migrations/0004_auto_20230127_0602.py similarity index 100% rename from www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py rename to www/assignment/migrations/0004_auto_20230127_0602.py diff --git a/www/conservancy/apps/assignment/__init__.py b/www/assignment/migrations/__init__.py similarity index 100% rename from www/conservancy/apps/assignment/__init__.py rename to www/assignment/migrations/__init__.py diff --git a/www/conservancy/apps/assignment/models.py b/www/assignment/models.py similarity index 100% rename from www/conservancy/apps/assignment/models.py rename to www/assignment/models.py diff --git a/www/conservancy/apps/assignment/terms.py b/www/assignment/terms.py similarity index 100% rename from www/conservancy/apps/assignment/terms.py rename to www/assignment/terms.py diff --git a/www/conservancy/apps/assignment/urls.py b/www/assignment/urls.py similarity index 100% rename from www/conservancy/apps/assignment/urls.py rename to www/assignment/urls.py diff --git a/www/conservancy/apps/assignment/views.py b/www/assignment/views.py similarity index 100% rename from www/conservancy/apps/assignment/views.py rename to www/assignment/views.py diff --git a/www/conservancy/apps/assignment/migrations/__init__.py b/www/blog/__init__.py similarity index 100% rename from www/conservancy/apps/assignment/migrations/__init__.py rename to www/blog/__init__.py diff --git a/www/conservancy/apps/blog/admin.py b/www/blog/admin.py similarity index 100% rename from www/conservancy/apps/blog/admin.py rename to www/blog/admin.py diff --git a/www/conservancy/apps/blog/models.py b/www/blog/models.py similarity index 99% rename from www/conservancy/apps/blog/models.py rename to www/blog/models.py index 73bf8028..58d8d608 100644 --- a/www/conservancy/apps/blog/models.py +++ b/www/blog/models.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from django.conf import settings from django.db import models -from ... import bsoup +from .. import bsoup from ..staff.models import Person diff --git a/www/conservancy/apps/blog/urls.py b/www/blog/urls.py similarity index 100% rename from www/conservancy/apps/blog/urls.py rename to www/blog/urls.py diff --git a/www/conservancy/apps/blog/views.py b/www/blog/views.py similarity index 100% rename from www/conservancy/apps/blog/views.py rename to www/blog/views.py diff --git a/www/conservancy/bsoup.py b/www/bsoup.py similarity index 100% rename from www/conservancy/bsoup.py rename to www/bsoup.py diff --git a/www/conservancy/apps/blog/__init__.py b/www/ccs_upload/__init__.py similarity index 100% rename from www/conservancy/apps/blog/__init__.py rename to www/ccs_upload/__init__.py diff --git a/www/conservancy/apps/ccs_upload/forms.py b/www/ccs_upload/forms.py similarity index 100% rename from www/conservancy/apps/ccs_upload/forms.py rename to www/ccs_upload/forms.py diff --git a/www/conservancy/apps/ccs_upload/urls.py b/www/ccs_upload/urls.py similarity index 100% rename from www/conservancy/apps/ccs_upload/urls.py rename to www/ccs_upload/urls.py diff --git a/www/conservancy/apps/ccs_upload/views.py b/www/ccs_upload/views.py similarity index 100% rename from www/conservancy/apps/ccs_upload/views.py rename to www/ccs_upload/views.py diff --git a/www/conservancy/__init__.py b/www/conservancy/__init__.py deleted file mode 100644 index a1dc7528..00000000 --- a/www/conservancy/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ -import hashlib - -from django.conf import settings - - -class ParameterValidator: - def __init__(self, given_hash_or_params, params_hash_key=None): - if params_hash_key is None: - self.given_hash = given_hash_or_params - else: - self.given_hash = given_hash_or_params.get(params_hash_key) - seed = getattr(settings, 'CONSERVANCY_SECRET_KEY', '').encode('utf-8') - self.hasher = hashlib.sha256(seed) - if isinstance(self.given_hash, str): - self.hash_type = type(self.given_hash) - else: - self.hash_type = type(self.hasher.hexdigest()) - self.valid = None - if not (self.given_hash and seed): - self.fail() - - def __enter__(self): - self.valid = self.valid and None - return self - - def __exit__(self, exc_type, exc_value, exc_tb): - if exc_type is None: - self.check() - else: - self.fail() - - def validate(self, data): - self.valid = self.valid and None - self.hasher.update(data) - - def check(self): - if self.valid or (self.valid is None): - self.valid = self.hash_type(self.hasher.hexdigest()) == self.given_hash - return self.valid - - def fail(self): - self.valid = False diff --git a/www/conservancy/static/__init__.py b/www/conservancy/static/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/www/conservancy/apps/ccs_upload/__init__.py b/www/contacts/__init__.py similarity index 100% rename from www/conservancy/apps/ccs_upload/__init__.py rename to www/contacts/__init__.py diff --git a/www/conservancy/apps/contacts/admin.py b/www/contacts/admin.py similarity index 100% rename from www/conservancy/apps/contacts/admin.py rename to www/contacts/admin.py diff --git a/www/conservancy/apps/contacts/models.py b/www/contacts/models.py similarity index 100% rename from www/conservancy/apps/contacts/models.py rename to www/contacts/models.py diff --git a/www/conservancy/apps/contacts/urls.py b/www/contacts/urls.py similarity index 58% rename from www/conservancy/apps/contacts/urls.py rename to www/contacts/urls.py index e344847b..bb0ae07c 100644 --- a/www/conservancy/apps/contacts/urls.py +++ b/www/contacts/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import include, patterns, url -urlpatterns = patterns('conservancy.apps.contacts.views', +urlpatterns = patterns('www.contacts.views', (r'^/?$', 'subscribe'), ) diff --git a/www/conservancy/apps/contacts/views.py b/www/contacts/views.py similarity index 100% rename from www/conservancy/apps/contacts/views.py rename to www/contacts/views.py diff --git a/www/conservancy/apps/contacts/__init__.py b/www/contractpatch/__init__.py similarity index 100% rename from www/conservancy/apps/contacts/__init__.py rename to www/contractpatch/__init__.py diff --git a/www/conservancy/apps/contractpatch/urls.py b/www/contractpatch/urls.py similarity index 100% rename from www/conservancy/apps/contractpatch/urls.py rename to www/contractpatch/urls.py diff --git a/www/conservancy/apps/contractpatch/views.py b/www/contractpatch/views.py similarity index 100% rename from www/conservancy/apps/contractpatch/views.py rename to www/contractpatch/views.py diff --git a/www/conservancy/apps/contractpatch/__init__.py b/www/events/__init__.py similarity index 100% rename from www/conservancy/apps/contractpatch/__init__.py rename to www/events/__init__.py diff --git a/www/conservancy/apps/events/admin.py b/www/events/admin.py similarity index 100% rename from www/conservancy/apps/events/admin.py rename to www/events/admin.py diff --git a/www/conservancy/apps/events/models.py b/www/events/models.py similarity index 100% rename from www/conservancy/apps/events/models.py rename to www/events/models.py diff --git a/www/conservancy/apps/events/urls.py b/www/events/urls.py similarity index 87% rename from www/conservancy/apps/events/urls.py rename to www/events/urls.py index addc19bc..2f62a4ce 100644 --- a/www/conservancy/apps/events/urls.py +++ b/www/events/urls.py @@ -14,12 +14,12 @@ info_dict = { # make_object_list=True)), # ) -# urlpatterns += patterns('conservancy.apps.events.views', +# urlpatterns += patterns('www.events.views', # (r'^/?$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)), # (r'^(?P\d{4})/(?P[-\w]+)/$', 'event_detail', dict(info_dict, slug_field='slug')), # (r'^ics/$', 'future_event_ics', info_dict), # ) -urlpatterns = patterns('conservancy.apps.events.views', +urlpatterns = patterns('www.events.views', (r'^.*$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)), ) diff --git a/www/conservancy/apps/events/view_helpers.py b/www/events/view_helpers.py similarity index 100% rename from www/conservancy/apps/events/view_helpers.py rename to www/events/view_helpers.py diff --git a/www/conservancy/apps/events/views.py b/www/events/views.py similarity index 100% rename from www/conservancy/apps/events/views.py rename to www/events/views.py diff --git a/www/conservancy/feeds.py b/www/feeds.py similarity index 98% rename from www/conservancy/feeds.py rename to www/feeds.py index 1dc04ec9..562ab3d0 100644 --- a/www/conservancy/feeds.py +++ b/www/feeds.py @@ -8,8 +8,8 @@ from django.contrib.syndication.views import Feed from django.shortcuts import render from django.utils.feedgenerator import Rss201rev2Feed -from .apps.blog.models import Entry as BlogEntry -from .apps.news.models import PressRelease +from .blog.models import Entry as BlogEntry +from .news.models import PressRelease class ConservancyFeedBase(Feed): diff --git a/www/conservancy/apps/events/__init__.py b/www/fossy/__init__.py similarity index 100% rename from www/conservancy/apps/events/__init__.py rename to www/fossy/__init__.py diff --git a/www/conservancy/apps/fossy/admin.py b/www/fossy/admin.py similarity index 100% rename from www/conservancy/apps/fossy/admin.py rename to www/fossy/admin.py diff --git a/www/conservancy/apps/fossy/apps.py b/www/fossy/apps.py similarity index 64% rename from www/conservancy/apps/fossy/apps.py rename to www/fossy/apps.py index e49acacd..ba2ca4ad 100644 --- a/www/conservancy/apps/fossy/apps.py +++ b/www/fossy/apps.py @@ -2,4 +2,4 @@ from django.apps import AppConfig class FOSSYConfig(AppConfig): - name = 'conservancy.apps.fossy' + name = 'www.fossy' diff --git a/www/conservancy/apps/fossy/forms.py b/www/fossy/forms.py similarity index 100% rename from www/conservancy/apps/fossy/forms.py rename to www/fossy/forms.py diff --git a/www/conservancy/apps/fossy/migrations/0001_initial.py b/www/fossy/migrations/0001_initial.py similarity index 100% rename from www/conservancy/apps/fossy/migrations/0001_initial.py rename to www/fossy/migrations/0001_initial.py diff --git a/www/conservancy/apps/fossy/migrations/0002_auto_20230130_1841.py b/www/fossy/migrations/0002_auto_20230130_1841.py similarity index 100% rename from www/conservancy/apps/fossy/migrations/0002_auto_20230130_1841.py rename to www/fossy/migrations/0002_auto_20230130_1841.py diff --git a/www/conservancy/apps/fossy/__init__.py b/www/fossy/migrations/__init__.py similarity index 100% rename from www/conservancy/apps/fossy/__init__.py rename to www/fossy/migrations/__init__.py diff --git a/www/conservancy/apps/fossy/models.py b/www/fossy/models.py similarity index 100% rename from www/conservancy/apps/fossy/models.py rename to www/fossy/models.py diff --git a/www/conservancy/apps/fossy/urls.py b/www/fossy/urls.py similarity index 100% rename from www/conservancy/apps/fossy/urls.py rename to www/fossy/urls.py diff --git a/www/conservancy/apps/fossy/views.py b/www/fossy/views.py similarity index 100% rename from www/conservancy/apps/fossy/views.py rename to www/fossy/views.py diff --git a/www/conservancy/frontpage.py b/www/frontpage.py similarity index 81% rename from www/conservancy/frontpage.py rename to www/frontpage.py index da7624df..84858c1a 100644 --- a/www/conservancy/frontpage.py +++ b/www/frontpage.py @@ -2,9 +2,9 @@ from datetime import datetime from django.shortcuts import render -from .apps.blog.models import Entry -from .apps.news.models import PressRelease -from .apps.supporters.models import Supporter +from .blog.models import Entry +from .news.models import PressRelease +from .supporters.models import Supporter def view(request): diff --git a/www/conservancy/apps/fossy/migrations/__init__.py b/www/fundgoal/__init__.py similarity index 100% rename from www/conservancy/apps/fossy/migrations/__init__.py rename to www/fundgoal/__init__.py diff --git a/www/conservancy/apps/fundgoal/admin.py b/www/fundgoal/admin.py similarity index 100% rename from www/conservancy/apps/fundgoal/admin.py rename to www/fundgoal/admin.py diff --git a/www/conservancy/apps/fundgoal/migrations/0001_initial.py b/www/fundgoal/migrations/0001_initial.py similarity index 100% rename from www/conservancy/apps/fundgoal/migrations/0001_initial.py rename to www/fundgoal/migrations/0001_initial.py diff --git a/www/conservancy/apps/fundgoal/migrations/0002_goalprovider.py b/www/fundgoal/migrations/0002_goalprovider.py similarity index 100% rename from www/conservancy/apps/fundgoal/migrations/0002_goalprovider.py rename to www/fundgoal/migrations/0002_goalprovider.py diff --git a/www/conservancy/apps/fundgoal/migrations/0003_fundraisinggoal_fundraiser_endtime.py b/www/fundgoal/migrations/0003_fundraisinggoal_fundraiser_endtime.py similarity index 100% rename from www/conservancy/apps/fundgoal/migrations/0003_fundraisinggoal_fundraiser_endtime.py rename to www/fundgoal/migrations/0003_fundraisinggoal_fundraiser_endtime.py diff --git a/www/conservancy/apps/fundgoal/__init__.py b/www/fundgoal/migrations/__init__.py similarity index 100% rename from www/conservancy/apps/fundgoal/__init__.py rename to www/fundgoal/migrations/__init__.py diff --git a/www/conservancy/apps/fundgoal/models.py b/www/fundgoal/models.py similarity index 100% rename from www/conservancy/apps/fundgoal/models.py rename to www/fundgoal/models.py diff --git a/www/conservancy/apps/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/www/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html similarity index 100% rename from www/conservancy/apps/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html rename to www/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html diff --git a/www/conservancy/apps/fundgoal/views.py b/www/fundgoal/views.py similarity index 100% rename from www/conservancy/apps/fundgoal/views.py rename to www/fundgoal/views.py diff --git a/www/conservancy/local_context_processors.py b/www/local_context_processors.py similarity index 93% rename from www/conservancy/local_context_processors.py rename to www/local_context_processors.py index 5a902426..a2345bc2 100644 --- a/www/conservancy/local_context_processors.py +++ b/www/local_context_processors.py @@ -1,7 +1,7 @@ from datetime import datetime as DateTime from . import settings -from .apps.fundgoal.models import FundraisingGoal +from .fundgoal.models import FundraisingGoal SITE_FUNDGOAL = 'cy2022-end-year-match' diff --git a/www/manage.py b/www/manage.py deleted file mode 100755 index 764f1029..00000000 --- a/www/manage.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - -if __name__ == "__main__": - www_path = os.path.abspath(os.path.dirname(sys.argv[0])) - if www_path not in sys.path: - sys.path.append(www_path) - - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "conservancy.settings") - - from django.core.management import execute_from_command_line - - execute_from_command_line(sys.argv) diff --git a/www/conservancy/middleware.py b/www/middleware.py similarity index 100% rename from www/conservancy/middleware.py rename to www/middleware.py diff --git a/www/conservancy/apps/fundgoal/migrations/__init__.py b/www/news/__init__.py similarity index 100% rename from www/conservancy/apps/fundgoal/migrations/__init__.py rename to www/news/__init__.py diff --git a/www/conservancy/apps/news/admin.py b/www/news/admin.py similarity index 100% rename from www/conservancy/apps/news/admin.py rename to www/news/admin.py diff --git a/www/conservancy/apps/news/models.py b/www/news/models.py similarity index 99% rename from www/conservancy/apps/news/models.py rename to www/news/models.py index b19cea09..d9edf28c 100644 --- a/www/conservancy/apps/news/models.py +++ b/www/news/models.py @@ -4,7 +4,7 @@ from django.conf import settings from django.contrib.sites.models import Site from django.db import models -from ... import bsoup +from .. import bsoup from ..events.models import Event from ..staff.models import Person diff --git a/www/conservancy/apps/news/__init__.py b/www/news/templatetags/__init__.py similarity index 100% rename from www/conservancy/apps/news/__init__.py rename to www/news/templatetags/__init__.py diff --git a/www/conservancy/apps/news/templatetags/date_within.py b/www/news/templatetags/date_within.py similarity index 100% rename from www/conservancy/apps/news/templatetags/date_within.py rename to www/news/templatetags/date_within.py diff --git a/www/conservancy/apps/news/templatetags/fill_url.py b/www/news/templatetags/fill_url.py similarity index 100% rename from www/conservancy/apps/news/templatetags/fill_url.py rename to www/news/templatetags/fill_url.py diff --git a/www/conservancy/apps/news/templatetags/min.py b/www/news/templatetags/min.py similarity index 100% rename from www/conservancy/apps/news/templatetags/min.py rename to www/news/templatetags/min.py diff --git a/www/conservancy/apps/news/templatetags/subtract.py b/www/news/templatetags/subtract.py similarity index 100% rename from www/conservancy/apps/news/templatetags/subtract.py rename to www/news/templatetags/subtract.py diff --git a/www/conservancy/apps/news/urls.py b/www/news/urls.py similarity index 100% rename from www/conservancy/apps/news/urls.py rename to www/news/urls.py diff --git a/www/conservancy/apps/news/views.py b/www/news/views.py similarity index 100% rename from www/conservancy/apps/news/views.py rename to www/news/views.py diff --git a/www/conservancy/settings.py b/www/settings.py similarity index 79% rename from www/conservancy/settings.py rename to www/settings.py index 3fd906f8..05ad3f5e 100644 --- a/www/conservancy/settings.py +++ b/www/settings.py @@ -19,10 +19,10 @@ from pathlib import Path -from djangocommonsettings import * +from .djangocommonsettings import * SITE_ID = 2 -ROOT_URLCONF = 'conservancy.urls' +ROOT_URLCONF = 'www.urls' FORCE_CANONICAL_HOSTNAME = False if DEBUG else 'sfconservancy.org' @@ -87,31 +87,31 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.humanize', 'django.contrib.staticfiles', - 'conservancy.apps.blog', - 'conservancy.apps.contacts', - 'conservancy.apps.contractpatch', - 'conservancy.apps.events', - 'conservancy.apps.news', - 'conservancy.apps.staff', - # 'conservancy.apps.summit_registration', - 'conservancy.apps.worldmap', - 'conservancy.apps.supporters', - 'conservancy.apps.fundgoal', - 'conservancy.apps.assignment', - 'conservancy.apps.fossy', - 'podjango', - 'usethesource.apps.UseTheSourceConfig', + 'www.blog', + 'www.contacts', + 'www.contractpatch', + 'www.events', + 'www.news', + 'www.staff', + # 'www.summit_registration', + 'www.worldmap', + 'www.supporters', + 'www.fundgoal', + 'www.assignment', + 'www.fossy', + 'www.podjango', + 'www.usethesource.apps.UseTheSourceConfig', ] DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' -BASE_DIR = Path(__file__).resolve().parent.parent +BASE_DIR = Path(__file__).resolve().parent TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [ - BASE_DIR / 'conservancy' / 'templates', - BASE_DIR / 'conservancy' / 'static', + BASE_DIR / 'templates', + BASE_DIR / 'static', ], 'APP_DIRS': True, 'OPTIONS': { @@ -120,8 +120,8 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - 'conservancy.local_context_processors.host_url', - 'conservancy.local_context_processors.sitefundraiser', + 'www.local_context_processors.host_url', + 'www.local_context_processors.sitefundraiser', ] } } @@ -129,7 +129,7 @@ TEMPLATES = [ STATIC_ROOT = BASE_DIR.parent / 'collected_static' STATICFILES_DIRS = [ - BASE_DIR / 'conservancy' / 'static', + BASE_DIR / 'static', ] MIDDLEWARE = [ @@ -137,6 +137,6 @@ MIDDLEWARE = [ 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - 'conservancy.middleware.ForceCanonicalHostnameMiddleware', + 'www.middleware.ForceCanonicalHostnameMiddleware', # 'django.middleware.doc.XViewMiddleware', ] diff --git a/www/conservancy/sponsors.py b/www/sponsors.py similarity index 93% rename from www/conservancy/sponsors.py rename to www/sponsors.py index be0480ff..845d5609 100644 --- a/www/conservancy/sponsors.py +++ b/www/sponsors.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta from django.shortcuts import render -from .apps.supporters.models import Supporter +from .supporters.models import Supporter def view(request): diff --git a/www/conservancy/apps/news/templatetags/__init__.py b/www/staff/__init__.py similarity index 100% rename from www/conservancy/apps/news/templatetags/__init__.py rename to www/staff/__init__.py diff --git a/www/conservancy/apps/staff/admin.py b/www/staff/admin.py similarity index 100% rename from www/conservancy/apps/staff/admin.py rename to www/staff/admin.py diff --git a/www/conservancy/apps/staff/migrations/0001_initial.py b/www/staff/migrations/0001_initial.py similarity index 100% rename from www/conservancy/apps/staff/migrations/0001_initial.py rename to www/staff/migrations/0001_initial.py diff --git a/www/conservancy/apps/staff/migrations/0002_auto_20211128_2112.py b/www/staff/migrations/0002_auto_20211128_2112.py similarity index 100% rename from www/conservancy/apps/staff/migrations/0002_auto_20211128_2112.py rename to www/staff/migrations/0002_auto_20211128_2112.py diff --git a/www/conservancy/apps/staff/__init__.py b/www/staff/migrations/__init__.py similarity index 100% rename from www/conservancy/apps/staff/__init__.py rename to www/staff/migrations/__init__.py diff --git a/www/conservancy/apps/staff/models.py b/www/staff/models.py similarity index 100% rename from www/conservancy/apps/staff/models.py rename to www/staff/models.py diff --git a/www/conservancy/static/GPLv3 b/www/static/GPLv3 similarity index 100% rename from www/conservancy/static/GPLv3 rename to www/static/GPLv3 diff --git a/www/conservancy/static/GiveUpGitHub/index.html b/www/static/GiveUpGitHub/index.html similarity index 100% rename from www/conservancy/static/GiveUpGitHub/index.html rename to www/static/GiveUpGitHub/index.html diff --git a/www/conservancy/apps/staff/migrations/__init__.py b/www/static/__init__.py similarity index 100% rename from www/conservancy/apps/staff/migrations/__init__.py rename to www/static/__init__.py diff --git a/www/conservancy/static/about/board/index.html b/www/static/about/board/index.html similarity index 100% rename from www/conservancy/static/about/board/index.html rename to www/static/about/board/index.html diff --git a/www/conservancy/static/about/contact/accounts-taxinfo.asc b/www/static/about/contact/accounts-taxinfo.asc similarity index 100% rename from www/conservancy/static/about/contact/accounts-taxinfo.asc rename to www/static/about/contact/accounts-taxinfo.asc diff --git a/www/conservancy/static/about/contact/index.html b/www/static/about/contact/index.html similarity index 100% rename from www/conservancy/static/about/contact/index.html rename to www/static/about/contact/index.html diff --git a/www/conservancy/static/about/eval-committee/index.html b/www/static/about/eval-committee/index.html similarity index 100% rename from www/conservancy/static/about/eval-committee/index.html rename to www/static/about/eval-committee/index.html diff --git a/www/conservancy/static/about/index.html b/www/static/about/index.html similarity index 100% rename from www/conservancy/static/about/index.html rename to www/static/about/index.html diff --git a/www/conservancy/static/about/license/index.html b/www/static/about/license/index.html similarity index 100% rename from www/conservancy/static/about/license/index.html rename to www/static/about/license/index.html diff --git a/www/conservancy/static/about/outside/index.html b/www/static/about/outside/index.html similarity index 100% rename from www/conservancy/static/about/outside/index.html rename to www/static/about/outside/index.html diff --git a/www/conservancy/static/about/staff/index.html b/www/static/about/staff/index.html similarity index 100% rename from www/conservancy/static/about/staff/index.html rename to www/static/about/staff/index.html diff --git a/www/conservancy/static/about/transparency/index.html b/www/static/about/transparency/index.html similarity index 100% rename from www/conservancy/static/about/transparency/index.html rename to www/static/about/transparency/index.html diff --git a/www/conservancy/static/activities/index.html b/www/static/activities/index.html similarity index 100% rename from www/conservancy/static/activities/index.html rename to www/static/activities/index.html diff --git a/www/conservancy/static/coming-soon.html b/www/static/coming-soon.html similarity index 100% rename from www/conservancy/static/coming-soon.html rename to www/static/coming-soon.html diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/static/copyleft-compliance/about.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/about.html rename to www/static/copyleft-compliance/about.html diff --git a/www/conservancy/static/copyleft-compliance/enforcement-strategy.html b/www/static/copyleft-compliance/enforcement-strategy.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/enforcement-strategy.html rename to www/static/copyleft-compliance/enforcement-strategy.html diff --git a/www/conservancy/static/copyleft-compliance/firmware-liberation.html b/www/static/copyleft-compliance/firmware-liberation.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/firmware-liberation.html rename to www/static/copyleft-compliance/firmware-liberation.html diff --git a/www/conservancy/static/copyleft-compliance/glossary.html b/www/static/copyleft-compliance/glossary.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/glossary.html rename to www/static/copyleft-compliance/glossary.html diff --git a/www/conservancy/static/copyleft-compliance/help.html b/www/static/copyleft-compliance/help.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/help.html rename to www/static/copyleft-compliance/help.html diff --git a/www/conservancy/static/copyleft-compliance/index.html b/www/static/copyleft-compliance/index.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/index.html rename to www/static/copyleft-compliance/index.html diff --git a/www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_de.png b/www/static/copyleft-compliance/linux-vs-vmkernel_de.png similarity index 100% rename from www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_de.png rename to www/static/copyleft-compliance/linux-vs-vmkernel_de.png diff --git a/www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_de.svg b/www/static/copyleft-compliance/linux-vs-vmkernel_de.svg similarity index 100% rename from www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_de.svg rename to www/static/copyleft-compliance/linux-vs-vmkernel_de.svg diff --git a/www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_en.png b/www/static/copyleft-compliance/linux-vs-vmkernel_en.png similarity index 100% rename from www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_en.png rename to www/static/copyleft-compliance/linux-vs-vmkernel_en.png diff --git a/www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_en.svg b/www/static/copyleft-compliance/linux-vs-vmkernel_en.svg similarity index 100% rename from www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_en.svg rename to www/static/copyleft-compliance/linux-vs-vmkernel_en.svg diff --git a/www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_en_scaled.png b/www/static/copyleft-compliance/linux-vs-vmkernel_en_scaled.png similarity index 100% rename from www/conservancy/static/copyleft-compliance/linux-vs-vmkernel_en_scaled.png rename to www/static/copyleft-compliance/linux-vs-vmkernel_en_scaled.png diff --git a/www/conservancy/static/copyleft-compliance/past-lawsuits.html b/www/static/copyleft-compliance/past-lawsuits.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/past-lawsuits.html rename to www/static/copyleft-compliance/past-lawsuits.html diff --git a/www/conservancy/static/copyleft-compliance/principles.cn.html b/www/static/copyleft-compliance/principles.cn.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/principles.cn.html rename to www/static/copyleft-compliance/principles.cn.html diff --git a/www/conservancy/static/copyleft-compliance/principles.cn.pdf b/www/static/copyleft-compliance/principles.cn.pdf similarity index 100% rename from www/conservancy/static/copyleft-compliance/principles.cn.pdf rename to www/static/copyleft-compliance/principles.cn.pdf diff --git a/www/conservancy/static/copyleft-compliance/principles.html b/www/static/copyleft-compliance/principles.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/principles.html rename to www/static/copyleft-compliance/principles.html diff --git a/www/conservancy/static/copyleft-compliance/principles.kr.html b/www/static/copyleft-compliance/principles.kr.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/principles.kr.html rename to www/static/copyleft-compliance/principles.kr.html diff --git a/www/conservancy/static/copyleft-compliance/principles.kr.pdf b/www/static/copyleft-compliance/principles.kr.pdf similarity index 100% rename from www/conservancy/static/copyleft-compliance/principles.kr.pdf rename to www/static/copyleft-compliance/principles.kr.pdf diff --git a/www/conservancy/static/copyleft-compliance/vizio-filing-press-release.html b/www/static/copyleft-compliance/vizio-filing-press-release.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/vizio-filing-press-release.html rename to www/static/copyleft-compliance/vizio-filing-press-release.html diff --git a/www/conservancy/static/copyleft-compliance/vizio.html b/www/static/copyleft-compliance/vizio.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/vizio.html rename to www/static/copyleft-compliance/vizio.html diff --git a/www/conservancy/static/copyleft-compliance/vmware-code-similarity.html b/www/static/copyleft-compliance/vmware-code-similarity.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/vmware-code-similarity.html rename to www/static/copyleft-compliance/vmware-code-similarity.html diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html b/www/static/copyleft-compliance/vmware-lawsuit-appeal.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html rename to www/static/copyleft-compliance/vmware-lawsuit-appeal.html diff --git a/www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html b/www/static/copyleft-compliance/vmware-lawsuit-faq.html similarity index 100% rename from www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html rename to www/static/copyleft-compliance/vmware-lawsuit-faq.html diff --git a/www/conservancy/static/css/conservancy-bigscreen.css b/www/static/css/conservancy-bigscreen.css similarity index 100% rename from www/conservancy/static/css/conservancy-bigscreen.css rename to www/static/css/conservancy-bigscreen.css diff --git a/www/conservancy/static/css/conservancy.css b/www/static/css/conservancy.css similarity index 100% rename from www/conservancy/static/css/conservancy.css rename to www/static/css/conservancy.css diff --git a/www/conservancy/static/css/forms.css b/www/static/css/forms.css similarity index 100% rename from www/conservancy/static/css/forms.css rename to www/static/css/forms.css diff --git a/www/conservancy/static/css/tachyons.css b/www/static/css/tachyons.css similarity index 100% rename from www/conservancy/static/css/tachyons.css rename to www/static/css/tachyons.css diff --git a/www/conservancy/static/docs/2010-07-27_dj-opinion.pdf b/www/static/docs/2010-07-27_dj-opinion.pdf similarity index 100% rename from www/conservancy/static/docs/2010-07-27_dj-opinion.pdf rename to www/static/docs/2010-07-27_dj-opinion.pdf diff --git a/www/conservancy/static/docs/2010_Killed-by-Code.pdf b/www/static/docs/2010_Killed-by-Code.pdf similarity index 100% rename from www/conservancy/static/docs/2010_Killed-by-Code.pdf rename to www/static/docs/2010_Killed-by-Code.pdf diff --git a/www/conservancy/static/docs/2016-02-23_Contracts_Committee_testimony.pdf b/www/static/docs/2016-02-23_Contracts_Committee_testimony.pdf similarity index 100% rename from www/conservancy/static/docs/2016-02-23_Contracts_Committee_testimony.pdf rename to www/static/docs/2016-02-23_Contracts_Committee_testimony.pdf diff --git a/www/conservancy/static/docs/2017-08-01_1201-exemption-renewal.pdf b/www/static/docs/2017-08-01_1201-exemption-renewal.pdf similarity index 100% rename from www/conservancy/static/docs/2017-08-01_1201-exemption-renewal.pdf rename to www/static/docs/2017-08-01_1201-exemption-renewal.pdf diff --git a/www/conservancy/static/docs/2018-01-03_Arista_amicus-brief.pdf b/www/static/docs/2018-01-03_Arista_amicus-brief.pdf similarity index 100% rename from www/conservancy/static/docs/2018-01-03_Arista_amicus-brief.pdf rename to www/static/docs/2018-01-03_Arista_amicus-brief.pdf diff --git a/www/conservancy/static/docs/2019-09-18_Conservancy-USPTO-Petition-re-rule-2_189.pdf b/www/static/docs/2019-09-18_Conservancy-USPTO-Petition-re-rule-2_189.pdf similarity index 100% rename from www/conservancy/static/docs/2019-09-18_Conservancy-USPTO-Petition-re-rule-2_189.pdf rename to www/static/docs/2019-09-18_Conservancy-USPTO-Petition-re-rule-2_189.pdf diff --git a/www/conservancy/static/docs/2020-12-14_Comment-Class-11_networking-devices.pdf b/www/static/docs/2020-12-14_Comment-Class-11_networking-devices.pdf similarity index 100% rename from www/conservancy/static/docs/2020-12-14_Comment-Class-11_networking-devices.pdf rename to www/static/docs/2020-12-14_Comment-Class-11_networking-devices.pdf diff --git a/www/conservancy/static/docs/2020-12-14_Comment-Class-13_privacy-research.pdf b/www/static/docs/2020-12-14_Comment-Class-13_privacy-research.pdf similarity index 100% rename from www/conservancy/static/docs/2020-12-14_Comment-Class-13_privacy-research.pdf rename to www/static/docs/2020-12-14_Comment-Class-13_privacy-research.pdf diff --git a/www/conservancy/static/docs/2020-12-14_Comment-Class-16_copyright-license-invesigation.pdf b/www/static/docs/2020-12-14_Comment-Class-16_copyright-license-invesigation.pdf similarity index 100% rename from www/conservancy/static/docs/2020-12-14_Comment-Class-16_copyright-license-invesigation.pdf rename to www/static/docs/2020-12-14_Comment-Class-16_copyright-license-invesigation.pdf diff --git a/www/conservancy/static/docs/2022-02-01_open-letter-to-Biden-on-cybersecurity-and-FOSS.pdf b/www/static/docs/2022-02-01_open-letter-to-Biden-on-cybersecurity-and-FOSS.pdf similarity index 100% rename from www/conservancy/static/docs/2022-02-01_open-letter-to-Biden-on-cybersecurity-and-FOSS.pdf rename to www/static/docs/2022-02-01_open-letter-to-Biden-on-cybersecurity-and-FOSS.pdf diff --git a/www/conservancy/static/docs/2023-01-31_KU-Lueven_Sandler-Karen_Software-Rights-Accountability-and-Autonomy-in-Our-Technology.txt b/www/static/docs/2023-01-31_KU-Lueven_Sandler-Karen_Software-Rights-Accountability-and-Autonomy-in-Our-Technology.txt similarity index 100% rename from www/conservancy/static/docs/2023-01-31_KU-Lueven_Sandler-Karen_Software-Rights-Accountability-and-Autonomy-in-Our-Technology.txt rename to www/static/docs/2023-01-31_KU-Lueven_Sandler-Karen_Software-Rights-Accountability-and-Autonomy-in-Our-Technology.txt diff --git a/www/conservancy/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.en.txt b/www/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.en.txt similarity index 100% rename from www/conservancy/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.en.txt rename to www/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.en.txt diff --git a/www/conservancy/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.nl.txt b/www/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.nl.txt similarity index 100% rename from www/conservancy/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.nl.txt rename to www/static/docs/2023-02-02_Sandler-Karen_KU-Leuven_Honorary-Doctorate.nl.txt diff --git a/www/conservancy/static/docs/GiveUpGitHub-README.md b/www/static/docs/GiveUpGitHub-README.md similarity index 100% rename from www/conservancy/static/docs/GiveUpGitHub-README.md rename to www/static/docs/GiveUpGitHub-README.md diff --git a/www/conservancy/static/docs/SupportGiveUpGitHub-README-snippet.md b/www/static/docs/SupportGiveUpGitHub-README-snippet.md similarity index 100% rename from www/conservancy/static/docs/SupportGiveUpGitHub-README-snippet.md rename to www/static/docs/SupportGiveUpGitHub-README-snippet.md diff --git a/www/conservancy/static/docs/blank_anonymous-linux-enforcement-agreement.pdf b/www/static/docs/blank_anonymous-linux-enforcement-agreement.pdf similarity index 100% rename from www/conservancy/static/docs/blank_anonymous-linux-enforcement-agreement.pdf rename to www/static/docs/blank_anonymous-linux-enforcement-agreement.pdf diff --git a/www/conservancy/static/docs/blank_linux-enforcement-agreement.pdf b/www/static/docs/blank_linux-enforcement-agreement.pdf similarity index 100% rename from www/conservancy/static/docs/blank_linux-enforcement-agreement.pdf rename to www/static/docs/blank_linux-enforcement-agreement.pdf diff --git a/www/conservancy/static/docs/busybox-complaint-2009-12-14.pdf b/www/static/docs/busybox-complaint-2009-12-14.pdf similarity index 100% rename from www/conservancy/static/docs/busybox-complaint-2009-12-14.pdf rename to www/static/docs/busybox-complaint-2009-12-14.pdf diff --git a/www/conservancy/static/docs/conservancy-1201-long-form-comment-2015-02-06.pdf b/www/static/docs/conservancy-1201-long-form-comment-2015-02-06.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy-1201-long-form-comment-2015-02-06.pdf rename to www/static/docs/conservancy-1201-long-form-comment-2015-02-06.pdf diff --git a/www/conservancy/static/docs/conservancy-1201-petition-2014-10-31-no-letterhead.odt b/www/static/docs/conservancy-1201-petition-2014-10-31-no-letterhead.odt similarity index 100% rename from www/conservancy/static/docs/conservancy-1201-petition-2014-10-31-no-letterhead.odt rename to www/static/docs/conservancy-1201-petition-2014-10-31-no-letterhead.odt diff --git a/www/conservancy/static/docs/conservancy-1201-petition-2014-10-31.odt b/www/static/docs/conservancy-1201-petition-2014-10-31.odt similarity index 100% rename from www/conservancy/static/docs/conservancy-1201-petition-2014-10-31.odt rename to www/static/docs/conservancy-1201-petition-2014-10-31.odt diff --git a/www/conservancy/static/docs/conservancy-1201-petition-2014-10-31.pdf b/www/static/docs/conservancy-1201-petition-2014-10-31.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy-1201-petition-2014-10-31.pdf rename to www/static/docs/conservancy-1201-petition-2014-10-31.pdf diff --git a/www/conservancy/static/docs/conservancy-CHAR-500-fy-2008.pdf b/www/static/docs/conservancy-CHAR-500-fy-2008.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy-CHAR-500-fy-2008.pdf rename to www/static/docs/conservancy-CHAR-500-fy-2008.pdf diff --git a/www/conservancy/static/docs/conservancy-form-990-fy-2008.pdf b/www/static/docs/conservancy-form-990-fy-2008.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy-form-990-fy-2008.pdf rename to www/static/docs/conservancy-form-990-fy-2008.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2006.pdf b/www/static/docs/conservancy_CHAR-500_fy-2006.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2006.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2006.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2007.pdf b/www/static/docs/conservancy_CHAR-500_fy-2007.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2007.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2007.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2009.pdf b/www/static/docs/conservancy_CHAR-500_fy-2009.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2009.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2009.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2010.pdf b/www/static/docs/conservancy_CHAR-500_fy-2010.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2010.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2010.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2011.pdf b/www/static/docs/conservancy_CHAR-500_fy-2011.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2011.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2011.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2012.pdf b/www/static/docs/conservancy_CHAR-500_fy-2012.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2012.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2012.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2013.pdf b/www/static/docs/conservancy_CHAR-500_fy-2013.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2013.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2013.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2015.pdf b/www/static/docs/conservancy_CHAR-500_fy-2015.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2015.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2015.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2016.pdf b/www/static/docs/conservancy_CHAR-500_fy-2016.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2016.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2016.pdf diff --git a/www/conservancy/static/docs/conservancy_CHAR-500_fy-2017.pdf b/www/static/docs/conservancy_CHAR-500_fy-2017.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_CHAR-500_fy-2017.pdf rename to www/static/docs/conservancy_CHAR-500_fy-2017.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-1023.pdf b/www/static/docs/conservancy_Form-1023.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-1023.pdf rename to www/static/docs/conservancy_Form-1023.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2007.pdf b/www/static/docs/conservancy_Form-990_fy-2007.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2007.pdf rename to www/static/docs/conservancy_Form-990_fy-2007.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2009.pdf b/www/static/docs/conservancy_Form-990_fy-2009.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2009.pdf rename to www/static/docs/conservancy_Form-990_fy-2009.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2010.pdf b/www/static/docs/conservancy_Form-990_fy-2010.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2010.pdf rename to www/static/docs/conservancy_Form-990_fy-2010.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2011.pdf b/www/static/docs/conservancy_Form-990_fy-2011.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2011.pdf rename to www/static/docs/conservancy_Form-990_fy-2011.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2012.pdf b/www/static/docs/conservancy_Form-990_fy-2012.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2012.pdf rename to www/static/docs/conservancy_Form-990_fy-2012.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2013.pdf b/www/static/docs/conservancy_Form-990_fy-2013.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2013.pdf rename to www/static/docs/conservancy_Form-990_fy-2013.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2014.pdf b/www/static/docs/conservancy_Form-990_fy-2014.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2014.pdf rename to www/static/docs/conservancy_Form-990_fy-2014.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2015.pdf b/www/static/docs/conservancy_Form-990_fy-2015.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2015.pdf rename to www/static/docs/conservancy_Form-990_fy-2015.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2016.pdf b/www/static/docs/conservancy_Form-990_fy-2016.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2016.pdf rename to www/static/docs/conservancy_Form-990_fy-2016.pdf diff --git a/www/conservancy/static/docs/conservancy_Form-990_fy-2017.pdf b/www/static/docs/conservancy_Form-990_fy-2017.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_Form-990_fy-2017.pdf rename to www/static/docs/conservancy_Form-990_fy-2017.pdf diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2011.odp b/www/static/docs/conservancy_annual-report_fy-2011.odp similarity index 100% rename from www/conservancy/static/docs/conservancy_annual-report_fy-2011.odp rename to www/static/docs/conservancy_annual-report_fy-2011.odp diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2011.pdf b/www/static/docs/conservancy_annual-report_fy-2011.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_annual-report_fy-2011.pdf rename to www/static/docs/conservancy_annual-report_fy-2011.pdf diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2012.odp b/www/static/docs/conservancy_annual-report_fy-2012.odp similarity index 100% rename from www/conservancy/static/docs/conservancy_annual-report_fy-2012.odp rename to www/static/docs/conservancy_annual-report_fy-2012.odp diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2012.pdf b/www/static/docs/conservancy_annual-report_fy-2012.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_annual-report_fy-2012.pdf rename to www/static/docs/conservancy_annual-report_fy-2012.pdf diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2013.odp b/www/static/docs/conservancy_annual-report_fy-2013.odp similarity index 100% rename from www/conservancy/static/docs/conservancy_annual-report_fy-2013.odp rename to www/static/docs/conservancy_annual-report_fy-2013.odp diff --git a/www/conservancy/static/docs/conservancy_annual-report_fy-2013.pdf b/www/static/docs/conservancy_annual-report_fy-2013.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_annual-report_fy-2013.pdf rename to www/static/docs/conservancy_annual-report_fy-2013.pdf diff --git a/www/conservancy/static/docs/conservancy_by-laws.pdf b/www/static/docs/conservancy_by-laws.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_by-laws.pdf rename to www/static/docs/conservancy_by-laws.pdf diff --git a/www/conservancy/static/docs/conservancy_certificate-of-incorporation.pdf b/www/static/docs/conservancy_certificate-of-incorporation.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_certificate-of-incorporation.pdf rename to www/static/docs/conservancy_certificate-of-incorporation.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2010.pdf b/www/static/docs/conservancy_independent-audit_fy-2010.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2010.pdf rename to www/static/docs/conservancy_independent-audit_fy-2010.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2011.pdf b/www/static/docs/conservancy_independent-audit_fy-2011.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2011.pdf rename to www/static/docs/conservancy_independent-audit_fy-2011.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2012.pdf b/www/static/docs/conservancy_independent-audit_fy-2012.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2012.pdf rename to www/static/docs/conservancy_independent-audit_fy-2012.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2013.pdf b/www/static/docs/conservancy_independent-audit_fy-2013.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2013.pdf rename to www/static/docs/conservancy_independent-audit_fy-2013.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2014.pdf b/www/static/docs/conservancy_independent-audit_fy-2014.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2014.pdf rename to www/static/docs/conservancy_independent-audit_fy-2014.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2015.pdf b/www/static/docs/conservancy_independent-audit_fy-2015.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2015.pdf rename to www/static/docs/conservancy_independent-audit_fy-2015.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2016.pdf b/www/static/docs/conservancy_independent-audit_fy-2016.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2016.pdf rename to www/static/docs/conservancy_independent-audit_fy-2016.pdf diff --git a/www/conservancy/static/docs/conservancy_independent-audit_fy-2017.pdf b/www/static/docs/conservancy_independent-audit_fy-2017.pdf similarity index 100% rename from www/conservancy/static/docs/conservancy_independent-audit_fy-2017.pdf rename to www/static/docs/conservancy_independent-audit_fy-2017.pdf diff --git a/www/conservancy/static/docs/kuhn_expert-report-in-neo4j_5-18-cv-07182.pdf b/www/static/docs/kuhn_expert-report-in-neo4j_5-18-cv-07182.pdf similarity index 100% rename from www/conservancy/static/docs/kuhn_expert-report-in-neo4j_5-18-cv-07182.pdf rename to www/static/docs/kuhn_expert-report-in-neo4j_5-18-cv-07182.pdf diff --git a/www/conservancy/static/docs/sfc-introduction-vtt-captions.txt b/www/static/docs/sfc-introduction-vtt-captions.txt similarity index 100% rename from www/conservancy/static/docs/sfc-introduction-vtt-captions.txt rename to www/static/docs/sfc-introduction-vtt-captions.txt diff --git a/www/conservancy/static/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf b/www/static/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf rename to www/static/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf b/www/static/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf rename to www/static/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy-v-vizio-q-and-a.pdf b/www/static/docs/software-freedom-conservancy-v-vizio-q-and-a.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy-v-vizio-q-and-a.pdf rename to www/static/docs/software-freedom-conservancy-v-vizio-q-and-a.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2018-19.pdf b/www/static/docs/software-freedom-conservancy_CHAR500_fy-2018-19.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2018-19.pdf rename to www/static/docs/software-freedom-conservancy_CHAR500_fy-2018-19.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2019.pdf b/www/static/docs/software-freedom-conservancy_CHAR500_fy-2019.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2019.pdf rename to www/static/docs/software-freedom-conservancy_CHAR500_fy-2019.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2020.pdf b/www/static/docs/software-freedom-conservancy_CHAR500_fy-2020.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2020.pdf rename to www/static/docs/software-freedom-conservancy_CHAR500_fy-2020.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2021-22.pdf b/www/static/docs/software-freedom-conservancy_CHAR500_fy-2021-22.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_CHAR500_fy-2021-22.pdf rename to www/static/docs/software-freedom-conservancy_CHAR500_fy-2021-22.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2018-19.pdf b/www/static/docs/software-freedom-conservancy_Form-990_fy-2018-19.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2018-19.pdf rename to www/static/docs/software-freedom-conservancy_Form-990_fy-2018-19.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2019.pdf b/www/static/docs/software-freedom-conservancy_Form-990_fy-2019.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2019.pdf rename to www/static/docs/software-freedom-conservancy_Form-990_fy-2019.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2020.pdf b/www/static/docs/software-freedom-conservancy_Form-990_fy-2020.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2020.pdf rename to www/static/docs/software-freedom-conservancy_Form-990_fy-2020.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2021-22.pdf b/www/static/docs/software-freedom-conservancy_Form-990_fy-2021-22.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_Form-990_fy-2021-22.pdf rename to www/static/docs/software-freedom-conservancy_Form-990_fy-2021-22.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2018-19.pdf b/www/static/docs/software-freedom-conservancy_independent-audit_fy-2018-19.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2018-19.pdf rename to www/static/docs/software-freedom-conservancy_independent-audit_fy-2018-19.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2019.pdf b/www/static/docs/software-freedom-conservancy_independent-audit_fy-2019.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2019.pdf rename to www/static/docs/software-freedom-conservancy_independent-audit_fy-2019.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2020.pdf b/www/static/docs/software-freedom-conservancy_independent-audit_fy-2020.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2020.pdf rename to www/static/docs/software-freedom-conservancy_independent-audit_fy-2020.pdf diff --git a/www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2021-22.pdf b/www/static/docs/software-freedom-conservancy_independent-audit_fy-2021-22.pdf similarity index 100% rename from www/conservancy/static/docs/software-freedom-conservancy_independent-audit_fy-2021-22.pdf rename to www/static/docs/software-freedom-conservancy_independent-audit_fy-2021-22.pdf diff --git a/www/conservancy/static/docs/sponsorship-agreement-template.odt b/www/static/docs/sponsorship-agreement-template.odt similarity index 100% rename from www/conservancy/static/docs/sponsorship-agreement-template.odt rename to www/static/docs/sponsorship-agreement-template.odt diff --git a/www/conservancy/static/docs/sponsorship-agreement-template.pdf b/www/static/docs/sponsorship-agreement-template.pdf similarity index 100% rename from www/conservancy/static/docs/sponsorship-agreement-template.pdf rename to www/static/docs/sponsorship-agreement-template.pdf diff --git a/www/conservancy/static/docs/sponsorship-agreement-template.tex b/www/static/docs/sponsorship-agreement-template.tex similarity index 100% rename from www/conservancy/static/docs/sponsorship-agreement-template.tex rename to www/static/docs/sponsorship-agreement-template.tex diff --git a/www/conservancy/static/donate/index.html b/www/static/donate/index.html similarity index 100% rename from www/conservancy/static/donate/index.html rename to www/static/donate/index.html diff --git a/www/conservancy/static/error/401/index.html b/www/static/error/401/index.html similarity index 100% rename from www/conservancy/static/error/401/index.html rename to www/static/error/401/index.html diff --git a/www/conservancy/static/error/403/index.html b/www/static/error/403/index.html similarity index 100% rename from www/conservancy/static/error/403/index.html rename to www/static/error/403/index.html diff --git a/www/conservancy/static/error/404/index.html b/www/static/error/404/index.html similarity index 100% rename from www/conservancy/static/error/404/index.html rename to www/static/error/404/index.html diff --git a/www/conservancy/static/error/500/index.html b/www/static/error/500/index.html similarity index 100% rename from www/conservancy/static/error/500/index.html rename to www/static/error/500/index.html diff --git a/www/conservancy/static/favicon.ico b/www/static/favicon.ico similarity index 100% rename from www/conservancy/static/favicon.ico rename to www/static/favicon.ico diff --git a/www/conservancy/static/fossy.html b/www/static/fossy.html similarity index 100% rename from www/conservancy/static/fossy.html rename to www/static/fossy.html diff --git a/www/conservancy/static/fossy/index.html b/www/static/fossy/index.html similarity index 100% rename from www/conservancy/static/fossy/index.html rename to www/static/fossy/index.html diff --git a/www/conservancy/static/google536264c707362f55.html b/www/static/google536264c707362f55.html similarity index 100% rename from www/conservancy/static/google536264c707362f55.html rename to www/static/google536264c707362f55.html diff --git a/www/conservancy/static/img/2015-10_KCC_karen-speaking.jpg b/www/static/img/2015-10_KCC_karen-speaking.jpg similarity index 100% rename from www/conservancy/static/img/2015-10_KCC_karen-speaking.jpg rename to www/static/img/2015-10_KCC_karen-speaking.jpg diff --git a/www/conservancy/static/img/2015-10_KCC_other-speakers.jpg b/www/static/img/2015-10_KCC_other-speakers.jpg similarity index 100% rename from www/conservancy/static/img/2015-10_KCC_other-speakers.jpg rename to www/static/img/2015-10_KCC_other-speakers.jpg diff --git a/www/conservancy/static/img/2016-02-23_karen-testifying-by-David-Moore-CC-BY-SA-4.jpg b/www/static/img/2016-02-23_karen-testifying-by-David-Moore-CC-BY-SA-4.jpg similarity index 100% rename from www/conservancy/static/img/2016-02-23_karen-testifying-by-David-Moore-CC-BY-SA-4.jpg rename to www/static/img/2016-02-23_karen-testifying-by-David-Moore-CC-BY-SA-4.jpg diff --git a/www/conservancy/static/img/2016-10_Hackey-New-School-1.jpg b/www/static/img/2016-10_Hackey-New-School-1.jpg similarity index 100% rename from www/conservancy/static/img/2016-10_Hackey-New-School-1.jpg rename to www/static/img/2016-10_Hackey-New-School-1.jpg diff --git a/www/conservancy/static/img/2016-10_Hackey-New-School-2.jpg b/www/static/img/2016-10_Hackey-New-School-2.jpg similarity index 100% rename from www/conservancy/static/img/2016-10_Hackey-New-School-2.jpg rename to www/static/img/2016-10_Hackey-New-School-2.jpg diff --git a/www/conservancy/static/img/2016-10_Karen-OSCon-EU-keynote.png b/www/static/img/2016-10_Karen-OSCon-EU-keynote.png similarity index 100% rename from www/conservancy/static/img/2016-10_Karen-OSCon-EU-keynote.png rename to www/static/img/2016-10_Karen-OSCon-EU-keynote.png diff --git a/www/conservancy/static/img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg b/www/static/img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg similarity index 100% rename from www/conservancy/static/img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg rename to www/static/img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg diff --git a/www/conservancy/static/img/2016_OutreachyBoothAtTapia.JPG b/www/static/img/2016_OutreachyBoothAtTapia.JPG similarity index 100% rename from www/conservancy/static/img/2016_OutreachyBoothAtTapia.JPG rename to www/static/img/2016_OutreachyBoothAtTapia.JPG diff --git a/www/conservancy/static/img/2017-01_LCA-Outreachy-donations.png b/www/static/img/2017-01_LCA-Outreachy-donations.png similarity index 100% rename from www/conservancy/static/img/2017-01_LCA-Outreachy-donations.png rename to www/static/img/2017-01_LCA-Outreachy-donations.png diff --git a/www/conservancy/static/img/2017-02-fosdem-bradley-keynote.jpg b/www/static/img/2017-02-fosdem-bradley-keynote.jpg similarity index 100% rename from www/conservancy/static/img/2017-02-fosdem-bradley-keynote.jpg rename to www/static/img/2017-02-fosdem-bradley-keynote.jpg diff --git a/www/conservancy/static/img/2017-02-fosdem-kid-plays-at-godot-booth.jpg b/www/static/img/2017-02-fosdem-kid-plays-at-godot-booth.jpg similarity index 100% rename from www/conservancy/static/img/2017-02-fosdem-kid-plays-at-godot-booth.jpg rename to www/static/img/2017-02-fosdem-kid-plays-at-godot-booth.jpg diff --git a/www/conservancy/static/img/2017-02-fosdem-stand-karen-mike.jpg b/www/static/img/2017-02-fosdem-stand-karen-mike.jpg similarity index 100% rename from www/conservancy/static/img/2017-02-fosdem-stand-karen-mike.jpg rename to www/static/img/2017-02-fosdem-stand-karen-mike.jpg diff --git a/www/conservancy/static/img/2017-04_karen_defibrillator-interrogation.jpg b/www/static/img/2017-04_karen_defibrillator-interrogation.jpg similarity index 100% rename from www/conservancy/static/img/2017-04_karen_defibrillator-interrogation.jpg rename to www/static/img/2017-04_karen_defibrillator-interrogation.jpg diff --git a/www/conservancy/static/img/2017-04_karen_nurse-calling-manufacturers.jpg b/www/static/img/2017-04_karen_nurse-calling-manufacturers.jpg similarity index 100% rename from www/conservancy/static/img/2017-04_karen_nurse-calling-manufacturers.jpg rename to www/static/img/2017-04_karen_nurse-calling-manufacturers.jpg diff --git a/www/conservancy/static/img/2017-06_tony_OSCon-award.jpg b/www/static/img/2017-06_tony_OSCon-award.jpg similarity index 100% rename from www/conservancy/static/img/2017-06_tony_OSCon-award.jpg rename to www/static/img/2017-06_tony_OSCon-award.jpg diff --git a/www/conservancy/static/img/2017-09_froscon-signs.jpg b/www/static/img/2017-09_froscon-signs.jpg similarity index 100% rename from www/conservancy/static/img/2017-09_froscon-signs.jpg rename to www/static/img/2017-09_froscon-signs.jpg diff --git a/www/conservancy/static/img/2017-09_karen-speaking-guadec.jpg b/www/static/img/2017-09_karen-speaking-guadec.jpg similarity index 100% rename from www/conservancy/static/img/2017-09_karen-speaking-guadec.jpg rename to www/static/img/2017-09_karen-speaking-guadec.jpg diff --git a/www/conservancy/static/img/2017-09_outreachy-alums-debconf.jpg b/www/static/img/2017-09_outreachy-alums-debconf.jpg similarity index 100% rename from www/conservancy/static/img/2017-09_outreachy-alums-debconf.jpg rename to www/static/img/2017-09_outreachy-alums-debconf.jpg diff --git a/www/conservancy/static/img/2017-11_blog_currency.jpg b/www/static/img/2017-11_blog_currency.jpg similarity index 100% rename from www/conservancy/static/img/2017-11_blog_currency.jpg rename to www/static/img/2017-11_blog_currency.jpg diff --git a/www/conservancy/static/img/2017-12_blog_ChrisNeugebauer_poster.png b/www/static/img/2017-12_blog_ChrisNeugebauer_poster.png similarity index 100% rename from www/conservancy/static/img/2017-12_blog_ChrisNeugebauer_poster.png rename to www/static/img/2017-12_blog_ChrisNeugebauer_poster.png diff --git a/www/conservancy/static/img/2017-12_blog_Judy-Gichoya_poster.png b/www/static/img/2017-12_blog_Judy-Gichoya_poster.png similarity index 100% rename from www/conservancy/static/img/2017-12_blog_Judy-Gichoya_poster.png rename to www/static/img/2017-12_blog_Judy-Gichoya_poster.png diff --git a/www/conservancy/static/img/2017-12_blog_group-support-thumbnail.png b/www/static/img/2017-12_blog_group-support-thumbnail.png similarity index 100% rename from www/conservancy/static/img/2017-12_blog_group-support-thumbnail.png rename to www/static/img/2017-12_blog_group-support-thumbnail.png diff --git a/www/conservancy/static/img/2017-12_blog_gsoc-member-projects.jpg b/www/static/img/2017-12_blog_gsoc-member-projects.jpg similarity index 100% rename from www/conservancy/static/img/2017-12_blog_gsoc-member-projects.jpg rename to www/static/img/2017-12_blog_gsoc-member-projects.jpg diff --git a/www/conservancy/static/img/2017-CWL-intro-poster.png b/www/static/img/2017-CWL-intro-poster.png similarity index 100% rename from www/conservancy/static/img/2017-CWL-intro-poster.png rename to www/static/img/2017-CWL-intro-poster.png diff --git a/www/conservancy/static/img/2017-JeremiahFoster_thumbnail.png b/www/static/img/2017-JeremiahFoster_thumbnail.png similarity index 100% rename from www/conservancy/static/img/2017-JeremiahFoster_thumbnail.png rename to www/static/img/2017-JeremiahFoster_thumbnail.png diff --git a/www/conservancy/static/img/2017_GNUToolsCauldron_courtesy_of_mjw.jpg b/www/static/img/2017_GNUToolsCauldron_courtesy_of_mjw.jpg similarity index 100% rename from www/conservancy/static/img/2017_GNUToolsCauldron_courtesy_of_mjw.jpg rename to www/static/img/2017_GNUToolsCauldron_courtesy_of_mjw.jpg diff --git a/www/conservancy/static/img/2018-03_blog_Sandler-at-LibrePlanet.jpg b/www/static/img/2018-03_blog_Sandler-at-LibrePlanet.jpg similarity index 100% rename from www/conservancy/static/img/2018-03_blog_Sandler-at-LibrePlanet.jpg rename to www/static/img/2018-03_blog_Sandler-at-LibrePlanet.jpg diff --git a/www/conservancy/static/img/2018-11_Molly-de-Blanc-match-announcement-poster.png b/www/static/img/2018-11_Molly-de-Blanc-match-announcement-poster.png similarity index 100% rename from www/conservancy/static/img/2018-11_Molly-de-Blanc-match-announcement-poster.png rename to www/static/img/2018-11_Molly-de-Blanc-match-announcement-poster.png diff --git a/www/conservancy/static/img/2018-MollyandKarenatDebConf.jpg b/www/static/img/2018-MollyandKarenatDebConf.jpg similarity index 100% rename from www/conservancy/static/img/2018-MollyandKarenatDebConf.jpg rename to www/static/img/2018-MollyandKarenatDebConf.jpg diff --git a/www/conservancy/static/img/2018-MollyandKarenatDebConf_cropped.png b/www/static/img/2018-MollyandKarenatDebConf_cropped.png similarity index 100% rename from www/conservancy/static/img/2018-MollyandKarenatDebConf_cropped.png rename to www/static/img/2018-MollyandKarenatDebConf_cropped.png diff --git a/www/conservancy/static/img/2018_ConservancyCatsCC.BY.SA_byVMB.jpeg b/www/static/img/2018_ConservancyCatsCC.BY.SA_byVMB.jpeg similarity index 100% rename from www/conservancy/static/img/2018_ConservancyCatsCC.BY.SA_byVMB.jpeg rename to www/static/img/2018_ConservancyCatsCC.BY.SA_byVMB.jpeg diff --git a/www/conservancy/static/img/2018_Deb-Nicholson_LibrePlanet-keynote-poster.png b/www/static/img/2018_Deb-Nicholson_LibrePlanet-keynote-poster.png similarity index 100% rename from www/conservancy/static/img/2018_Deb-Nicholson_LibrePlanet-keynote-poster.png rename to www/static/img/2018_Deb-Nicholson_LibrePlanet-keynote-poster.png diff --git a/www/conservancy/static/img/2018_Deb-Nicholson_LibrePlenet-keynote-poster-2.png b/www/static/img/2018_Deb-Nicholson_LibrePlenet-keynote-poster-2.png similarity index 100% rename from www/conservancy/static/img/2018_Deb-Nicholson_LibrePlenet-keynote-poster-2.png rename to www/static/img/2018_Deb-Nicholson_LibrePlenet-keynote-poster-2.png diff --git a/www/conservancy/static/img/2018_Deb-Nicholson_headshot.jpg b/www/static/img/2018_Deb-Nicholson_headshot.jpg similarity index 100% rename from www/conservancy/static/img/2018_Deb-Nicholson_headshot.jpg rename to www/static/img/2018_Deb-Nicholson_headshot.jpg diff --git a/www/conservancy/static/img/2018_ElanaHashman_ARR_CourtesyofElana.jpg b/www/static/img/2018_ElanaHashman_ARR_CourtesyofElana.jpg similarity index 100% rename from www/conservancy/static/img/2018_ElanaHashman_ARR_CourtesyofElana.jpg rename to www/static/img/2018_ElanaHashman_ARR_CourtesyofElana.jpg diff --git a/www/conservancy/static/img/2018_ElanaHashman_ARR_CourtesyofElana_2.jpg b/www/static/img/2018_ElanaHashman_ARR_CourtesyofElana_2.jpg similarity index 100% rename from www/conservancy/static/img/2018_ElanaHashman_ARR_CourtesyofElana_2.jpg rename to www/static/img/2018_ElanaHashman_ARR_CourtesyofElana_2.jpg diff --git a/www/conservancy/static/img/2018_GSOC-byJoshSimmons_high.JPG b/www/static/img/2018_GSOC-byJoshSimmons_high.JPG similarity index 100% rename from www/conservancy/static/img/2018_GSOC-byJoshSimmons_high.JPG rename to www/static/img/2018_GSOC-byJoshSimmons_high.JPG diff --git a/www/conservancy/static/img/2018_KeithandCat.jpg b/www/static/img/2018_KeithandCat.jpg similarity index 100% rename from www/conservancy/static/img/2018_KeithandCat.jpg rename to www/static/img/2018_KeithandCat.jpg diff --git a/www/conservancy/static/img/2018_MattNotWiki_CC.BY.SA_by_tef_on_Wikipedia.jpeg b/www/static/img/2018_MattNotWiki_CC.BY.SA_by_tef_on_Wikipedia.jpeg similarity index 100% rename from www/conservancy/static/img/2018_MattNotWiki_CC.BY.SA_by_tef_on_Wikipedia.jpeg rename to www/static/img/2018_MattNotWiki_CC.BY.SA_by_tef_on_Wikipedia.jpeg diff --git a/www/conservancy/static/img/2018_MicroBlocks1.JPG b/www/static/img/2018_MicroBlocks1.JPG similarity index 100% rename from www/conservancy/static/img/2018_MicroBlocks1.JPG rename to www/static/img/2018_MicroBlocks1.JPG diff --git a/www/conservancy/static/img/2018_MicroBlocks2.JPG b/www/static/img/2018_MicroBlocks2.JPG similarity index 100% rename from www/conservancy/static/img/2018_MicroBlocks2.JPG rename to www/static/img/2018_MicroBlocks2.JPG diff --git a/www/conservancy/static/img/2018_Microblocks3.jpeg b/www/static/img/2018_Microblocks3.jpeg similarity index 100% rename from www/conservancy/static/img/2018_Microblocks3.jpeg rename to www/static/img/2018_Microblocks3.jpeg diff --git a/www/conservancy/static/img/2018_MollyandBash.jpg b/www/static/img/2018_MollyandBash.jpg similarity index 100% rename from www/conservancy/static/img/2018_MollyandBash.jpg rename to www/static/img/2018_MollyandBash.jpg diff --git a/www/conservancy/static/img/2018_Sageanddaughter.jpg b/www/static/img/2018_Sageanddaughter.jpg similarity index 100% rename from www/conservancy/static/img/2018_Sageanddaughter.jpg rename to www/static/img/2018_Sageanddaughter.jpg diff --git a/www/conservancy/static/img/2019-02_FOSDEM_keynote-poster.png b/www/static/img/2019-02_FOSDEM_keynote-poster.png similarity index 100% rename from www/conservancy/static/img/2019-02_FOSDEM_keynote-poster.png rename to www/static/img/2019-02_FOSDEM_keynote-poster.png diff --git a/www/conservancy/static/img/2019-04_Nicholson-Deb_LibrePlanet.png b/www/static/img/2019-04_Nicholson-Deb_LibrePlanet.png similarity index 100% rename from www/conservancy/static/img/2019-04_Nicholson-Deb_LibrePlanet.png rename to www/static/img/2019-04_Nicholson-Deb_LibrePlanet.png diff --git a/www/conservancy/static/img/2019-08-26_GUADECSupporterNightOne.jpg b/www/static/img/2019-08-26_GUADECSupporterNightOne.jpg similarity index 100% rename from www/conservancy/static/img/2019-08-26_GUADECSupporterNightOne.jpg rename to www/static/img/2019-08-26_GUADECSupporterNightOne.jpg diff --git a/www/conservancy/static/img/2019-08-26_GUADECSupporterNightThree.jpg b/www/static/img/2019-08-26_GUADECSupporterNightThree.jpg similarity index 100% rename from www/conservancy/static/img/2019-08-26_GUADECSupporterNightThree.jpg rename to www/static/img/2019-08-26_GUADECSupporterNightThree.jpg diff --git a/www/conservancy/static/img/2019-08-26_GUADECSupporterNightTwo.jpg b/www/static/img/2019-08-26_GUADECSupporterNightTwo.jpg similarity index 100% rename from www/conservancy/static/img/2019-08-26_GUADECSupporterNightTwo.jpg rename to www/static/img/2019-08-26_GUADECSupporterNightTwo.jpg diff --git a/www/conservancy/static/img/2019-08-26_Neil-alone_GUADECSupporterNight.jpg b/www/static/img/2019-08-26_Neil-alone_GUADECSupporterNight.jpg similarity index 100% rename from www/conservancy/static/img/2019-08-26_Neil-alone_GUADECSupporterNight.jpg rename to www/static/img/2019-08-26_Neil-alone_GUADECSupporterNight.jpg diff --git a/www/conservancy/static/img/2019-08-KarenatAbstractionsCC.BY_SarahWithee.jpeg b/www/static/img/2019-08-KarenatAbstractionsCC.BY_SarahWithee.jpeg similarity index 100% rename from www/conservancy/static/img/2019-08-KarenatAbstractionsCC.BY_SarahWithee.jpeg rename to www/static/img/2019-08-KarenatAbstractionsCC.BY_SarahWithee.jpeg diff --git a/www/conservancy/static/img/2019-08_KarenAbstractions_CC.BY Zach Harris.jpeg b/www/static/img/2019-08_KarenAbstractions_CC.BY Zach Harris.jpeg similarity index 100% rename from www/conservancy/static/img/2019-08_KarenAbstractions_CC.BY Zach Harris.jpeg rename to www/static/img/2019-08_KarenAbstractions_CC.BY Zach Harris.jpeg diff --git a/www/conservancy/static/img/2019-10-24_BowieExplained.png b/www/static/img/2019-10-24_BowieExplained.png similarity index 100% rename from www/conservancy/static/img/2019-10-24_BowieExplained.png rename to www/static/img/2019-10-24_BowieExplained.png diff --git a/www/conservancy/static/img/2019-10-24_KarenExplained.png b/www/static/img/2019-10-24_KarenExplained.png similarity index 100% rename from www/conservancy/static/img/2019-10-24_KarenExplained.png rename to www/static/img/2019-10-24_KarenExplained.png diff --git a/www/conservancy/static/img/2019-12-12_TheBestCats_CC.BY_byDanielleSucher.jpeg b/www/static/img/2019-12-12_TheBestCats_CC.BY_byDanielleSucher.jpeg similarity index 100% rename from www/conservancy/static/img/2019-12-12_TheBestCats_CC.BY_byDanielleSucher.jpeg rename to www/static/img/2019-12-12_TheBestCats_CC.BY_byDanielleSucher.jpeg diff --git a/www/conservancy/static/img/2019.09_CC.BY.SA_BradleyKuhn_atKernelRecipes_byPatrickBoettcher.jpg b/www/static/img/2019.09_CC.BY.SA_BradleyKuhn_atKernelRecipes_byPatrickBoettcher.jpg similarity index 100% rename from www/conservancy/static/img/2019.09_CC.BY.SA_BradleyKuhn_atKernelRecipes_byPatrickBoettcher.jpg rename to www/static/img/2019.09_CC.BY.SA_BradleyKuhn_atKernelRecipes_byPatrickBoettcher.jpg diff --git a/www/conservancy/static/img/20190204_CopyleftConfFromDeb.jpg b/www/static/img/20190204_CopyleftConfFromDeb.jpg similarity index 100% rename from www/conservancy/static/img/20190204_CopyleftConfFromDeb.jpg rename to www/static/img/20190204_CopyleftConfFromDeb.jpg diff --git a/www/conservancy/static/img/20191116_FaifcastLiveAtSeaGL1.jpg b/www/static/img/20191116_FaifcastLiveAtSeaGL1.jpg similarity index 100% rename from www/conservancy/static/img/20191116_FaifcastLiveAtSeaGL1.jpg rename to www/static/img/20191116_FaifcastLiveAtSeaGL1.jpg diff --git a/www/conservancy/static/img/20191116_FaifcastLiveAtSeaGL2.jpg b/www/static/img/20191116_FaifcastLiveAtSeaGL2.jpg similarity index 100% rename from www/conservancy/static/img/20191116_FaifcastLiveAtSeaGL2.jpg rename to www/static/img/20191116_FaifcastLiveAtSeaGL2.jpg diff --git a/www/conservancy/static/img/20191116_FaifcastLiveAtSeaGL3.jpg b/www/static/img/20191116_FaifcastLiveAtSeaGL3.jpg similarity index 100% rename from www/conservancy/static/img/20191116_FaifcastLiveAtSeaGL3.jpg rename to www/static/img/20191116_FaifcastLiveAtSeaGL3.jpg diff --git a/www/conservancy/static/img/2019_CC.0_WineConf2019-Group-1_by_Francois_Gouget.jpg b/www/static/img/2019_CC.0_WineConf2019-Group-1_by_Francois_Gouget.jpg similarity index 100% rename from www/conservancy/static/img/2019_CC.0_WineConf2019-Group-1_by_Francois_Gouget.jpg rename to www/static/img/2019_CC.0_WineConf2019-Group-1_by_Francois_Gouget.jpg diff --git a/www/conservancy/static/img/2019_CopyleftConfByLeslieHawthorn.jpeg b/www/static/img/2019_CopyleftConfByLeslieHawthorn.jpeg similarity index 100% rename from www/conservancy/static/img/2019_CopyleftConfByLeslieHawthorn.jpeg rename to www/static/img/2019_CopyleftConfByLeslieHawthorn.jpeg diff --git a/www/conservancy/static/img/2019_CopyleftConfByLeslieHawthorn_cropped.png b/www/static/img/2019_CopyleftConfByLeslieHawthorn_cropped.png similarity index 100% rename from www/conservancy/static/img/2019_CopyleftConfByLeslieHawthorn_cropped.png rename to www/static/img/2019_CopyleftConfByLeslieHawthorn_cropped.png diff --git a/www/conservancy/static/img/2019_FSFAwardPhotoofDebNicholson_CC.BY_by_AdamMonsen.jpg b/www/static/img/2019_FSFAwardPhotoofDebNicholson_CC.BY_by_AdamMonsen.jpg similarity index 100% rename from www/conservancy/static/img/2019_FSFAwardPhotoofDebNicholson_CC.BY_by_AdamMonsen.jpg rename to www/static/img/2019_FSFAwardPhotoofDebNicholson_CC.BY_by_AdamMonsen.jpg diff --git a/www/conservancy/static/img/2019_RB_group.gif b/www/static/img/2019_RB_group.gif similarity index 100% rename from www/conservancy/static/img/2019_RB_group.gif rename to www/static/img/2019_RB_group.gif diff --git a/www/conservancy/static/img/2020-01-17_bkuhn_lca-2020.png b/www/static/img/2020-01-17_bkuhn_lca-2020.png similarity index 100% rename from www/conservancy/static/img/2020-01-17_bkuhn_lca-2020.png rename to www/static/img/2020-01-17_bkuhn_lca-2020.png diff --git a/www/conservancy/static/img/2020-04_Deb-Nicholson_CHAOSScon-poster.png b/www/static/img/2020-04_Deb-Nicholson_CHAOSScon-poster.png similarity index 100% rename from www/conservancy/static/img/2020-04_Deb-Nicholson_CHAOSScon-poster.png rename to www/static/img/2020-04_Deb-Nicholson_CHAOSScon-poster.png diff --git a/www/conservancy/static/img/2020-07_MicroBlocks1.png b/www/static/img/2020-07_MicroBlocks1.png similarity index 100% rename from www/conservancy/static/img/2020-07_MicroBlocks1.png rename to www/static/img/2020-07_MicroBlocks1.png diff --git a/www/conservancy/static/img/2020-07_MicroBlocks2.png b/www/static/img/2020-07_MicroBlocks2.png similarity index 100% rename from www/conservancy/static/img/2020-07_MicroBlocks2.png rename to www/static/img/2020-07_MicroBlocks2.png diff --git a/www/conservancy/static/img/2020-12-04_lots-vintage-shirts.jpg b/www/static/img/2020-12-04_lots-vintage-shirts.jpg similarity index 100% rename from www/conservancy/static/img/2020-12-04_lots-vintage-shirts.jpg rename to www/static/img/2020-12-04_lots-vintage-shirts.jpg diff --git a/www/conservancy/static/img/2020.02.03_CC.BY.SA_SecondAnnualCopyleftConf_byDebNicholson.jpg b/www/static/img/2020.02.03_CC.BY.SA_SecondAnnualCopyleftConf_byDebNicholson.jpg similarity index 100% rename from www/conservancy/static/img/2020.02.03_CC.BY.SA_SecondAnnualCopyleftConf_byDebNicholson.jpg rename to www/static/img/2020.02.03_CC.BY.SA_SecondAnnualCopyleftConf_byDebNicholson.jpg diff --git a/www/conservancy/static/img/2020.02.03_Copyleft.CC.BY.SA_byDebNicholson.png b/www/static/img/2020.02.03_Copyleft.CC.BY.SA_byDebNicholson.png similarity index 100% rename from www/conservancy/static/img/2020.02.03_Copyleft.CC.BY.SA_byDebNicholson.png rename to www/static/img/2020.02.03_Copyleft.CC.BY.SA_byDebNicholson.png diff --git a/www/conservancy/static/img/20200131_AISession_CC.BY.SA_byPeterWolanin.jpg b/www/static/img/20200131_AISession_CC.BY.SA_byPeterWolanin.jpg similarity index 100% rename from www/conservancy/static/img/20200131_AISession_CC.BY.SA_byPeterWolanin.jpg rename to www/static/img/20200131_AISession_CC.BY.SA_byPeterWolanin.jpg diff --git a/www/conservancy/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.jpg.jpg b/www/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.jpg.jpg similarity index 100% rename from www/conservancy/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.jpg.jpg rename to www/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.jpg.jpg diff --git a/www/conservancy/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.xcf b/www/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.xcf similarity index 100% rename from www/conservancy/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.xcf rename to www/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin.xcf diff --git a/www/conservancy/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin_cropped.png b/www/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin_cropped.png similarity index 100% rename from www/conservancy/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin_cropped.png rename to www/static/img/20200131_AfterParty_CC.BY.SA_byPeterWolanin_cropped.png diff --git a/www/conservancy/static/img/2020_Allison_Randal_CC.BY.SA_byEvanCarroll.jpg b/www/static/img/2020_Allison_Randal_CC.BY.SA_byEvanCarroll.jpg similarity index 100% rename from www/conservancy/static/img/2020_Allison_Randal_CC.BY.SA_byEvanCarroll.jpg rename to www/static/img/2020_Allison_Randal_CC.BY.SA_byEvanCarroll.jpg diff --git a/www/conservancy/static/img/2020_JeremyAllison.jpg b/www/static/img/2020_JeremyAllison.jpg similarity index 100% rename from www/conservancy/static/img/2020_JeremyAllison.jpg rename to www/static/img/2020_JeremyAllison.jpg diff --git a/www/conservancy/static/img/2020_Leslie-Hawthorn.jpg b/www/static/img/2020_Leslie-Hawthorn.jpg similarity index 100% rename from www/conservancy/static/img/2020_Leslie-Hawthorn.jpg rename to www/static/img/2020_Leslie-Hawthorn.jpg diff --git a/www/conservancy/static/img/2020_Sebro-Tony_CopyleftConf.jpg b/www/static/img/2020_Sebro-Tony_CopyleftConf.jpg similarity index 100% rename from www/conservancy/static/img/2020_Sebro-Tony_CopyleftConf.jpg rename to www/static/img/2020_Sebro-Tony_CopyleftConf.jpg diff --git a/www/conservancy/static/img/2020_Sebro_Tony.jpg b/www/static/img/2020_Sebro_Tony.jpg similarity index 100% rename from www/conservancy/static/img/2020_Sebro_Tony.jpg rename to www/static/img/2020_Sebro_Tony.jpg diff --git a/www/conservancy/static/img/2020_Sharp_headshot.jpg b/www/static/img/2020_Sharp_headshot.jpg similarity index 100% rename from www/conservancy/static/img/2020_Sharp_headshot.jpg rename to www/static/img/2020_Sharp_headshot.jpg diff --git a/www/conservancy/static/img/2020_WineBottle_CC.BY.SA_KarenSandler.png b/www/static/img/2020_WineBottle_CC.BY.SA_KarenSandler.png similarity index 100% rename from www/conservancy/static/img/2020_WineBottle_CC.BY.SA_KarenSandler.png rename to www/static/img/2020_WineBottle_CC.BY.SA_KarenSandler.png diff --git a/www/conservancy/static/img/2021-02-07_FOSDEM-Legal-Policy-DevRoom_organizers-panel.png b/www/static/img/2021-02-07_FOSDEM-Legal-Policy-DevRoom_organizers-panel.png similarity index 100% rename from www/conservancy/static/img/2021-02-07_FOSDEM-Legal-Policy-DevRoom_organizers-panel.png rename to www/static/img/2021-02-07_FOSDEM-Legal-Policy-DevRoom_organizers-panel.png diff --git a/www/conservancy/static/img/Backdrop-Logo-Vertical.png b/www/static/img/Backdrop-Logo-Vertical.png similarity index 100% rename from www/conservancy/static/img/Backdrop-Logo-Vertical.png rename to www/static/img/Backdrop-Logo-Vertical.png diff --git a/www/conservancy/static/img/BeerMatsfromLamby.jpeg b/www/static/img/BeerMatsfromLamby.jpeg similarity index 100% rename from www/conservancy/static/img/BeerMatsfromLamby.jpeg rename to www/static/img/BeerMatsfromLamby.jpeg diff --git a/www/conservancy/static/img/CC.BY.SA_Outreachy_at_Tapia_2016_Lidza_Louina.jpg b/www/static/img/CC.BY.SA_Outreachy_at_Tapia_2016_Lidza_Louina.jpg similarity index 100% rename from www/conservancy/static/img/CC.BY.SA_Outreachy_at_Tapia_2016_Lidza_Louina.jpg rename to www/static/img/CC.BY.SA_Outreachy_at_Tapia_2016_Lidza_Louina.jpg diff --git a/www/conservancy/static/img/DanielVetter_bw.jpg b/www/static/img/DanielVetter_bw.jpg similarity index 100% rename from www/conservancy/static/img/DanielVetter_bw.jpg rename to www/static/img/DanielVetter_bw.jpg diff --git a/www/conservancy/static/img/FariUse_Rainbow Logos from Reddit.png b/www/static/img/FariUse_Rainbow Logos from Reddit.png similarity index 100% rename from www/conservancy/static/img/FariUse_Rainbow Logos from Reddit.png rename to www/static/img/FariUse_Rainbow Logos from Reddit.png diff --git a/www/conservancy/static/img/GiveUpGitHub.png b/www/static/img/GiveUpGitHub.png similarity index 100% rename from www/conservancy/static/img/GiveUpGitHub.png rename to www/static/img/GiveUpGitHub.png diff --git a/www/conservancy/static/img/GiveUpGitHub.svg b/www/static/img/GiveUpGitHub.svg similarity index 100% rename from www/conservancy/static/img/GiveUpGitHub.svg rename to www/static/img/GiveUpGitHub.svg diff --git a/www/conservancy/static/img/QEMU.svg b/www/static/img/QEMU.svg similarity index 100% rename from www/conservancy/static/img/QEMU.svg rename to www/static/img/QEMU.svg diff --git a/www/conservancy/static/img/Sebro-headshot.jpg b/www/static/img/Sebro-headshot.jpg similarity index 100% rename from www/conservancy/static/img/Sebro-headshot.jpg rename to www/static/img/Sebro-headshot.jpg diff --git a/www/conservancy/static/img/ShraddhaBarkepicture.jpg b/www/static/img/ShraddhaBarkepicture.jpg similarity index 100% rename from www/conservancy/static/img/ShraddhaBarkepicture.jpg rename to www/static/img/ShraddhaBarkepicture.jpg diff --git a/www/conservancy/static/img/Urvika_Gola_former_Outreachy_intern_with_former_Google_Summer_of_Code_intern_Pranav_Jain-Photo_CC-BY-NC-SA_Sage Sharp.jpg b/www/static/img/Urvika_Gola_former_Outreachy_intern_with_former_Google_Summer_of_Code_intern_Pranav_Jain-Photo_CC-BY-NC-SA_Sage Sharp.jpg similarity index 100% rename from www/conservancy/static/img/Urvika_Gola_former_Outreachy_intern_with_former_Google_Summer_of_Code_intern_Pranav_Jain-Photo_CC-BY-NC-SA_Sage Sharp.jpg rename to www/static/img/Urvika_Gola_former_Outreachy_intern_with_former_Google_Summer_of_Code_intern_Pranav_Jain-Photo_CC-BY-NC-SA_Sage Sharp.jpg diff --git a/www/conservancy/static/img/Vaishali.jpg b/www/static/img/Vaishali.jpg similarity index 100% rename from www/conservancy/static/img/Vaishali.jpg rename to www/static/img/Vaishali.jpg diff --git a/www/conservancy/static/img/banners/2018-individual.jpg b/www/static/img/banners/2018-individual.jpg similarity index 100% rename from www/conservancy/static/img/banners/2018-individual.jpg rename to www/static/img/banners/2018-individual.jpg diff --git a/www/conservancy/static/img/banners/2018-project.jpg b/www/static/img/banners/2018-project.jpg similarity index 100% rename from www/conservancy/static/img/banners/2018-project.jpg rename to www/static/img/banners/2018-project.jpg diff --git a/www/conservancy/static/img/banners/2019-individuals-banner.png b/www/static/img/banners/2019-individuals-banner.png similarity index 100% rename from www/conservancy/static/img/banners/2019-individuals-banner.png rename to www/static/img/banners/2019-individuals-banner.png diff --git a/www/conservancy/static/img/banners/2019-member-projects-banner.png b/www/static/img/banners/2019-member-projects-banner.png similarity index 100% rename from www/conservancy/static/img/banners/2019-member-projects-banner.png rename to www/static/img/banners/2019-member-projects-banner.png diff --git a/www/conservancy/static/img/banners/2019_conservancy-card-terminal-snow.gif b/www/static/img/banners/2019_conservancy-card-terminal-snow.gif similarity index 100% rename from www/conservancy/static/img/banners/2019_conservancy-card-terminal-snow.gif rename to www/static/img/banners/2019_conservancy-card-terminal-snow.gif diff --git a/www/conservancy/static/img/brett-in-2018-shirt.jpg b/www/static/img/brett-in-2018-shirt.jpg similarity index 100% rename from www/conservancy/static/img/brett-in-2018-shirt.jpg rename to www/static/img/brett-in-2018-shirt.jpg diff --git a/www/conservancy/static/img/cc-by-sa_88x31.png b/www/static/img/cc-by-sa_88x31.png similarity index 100% rename from www/conservancy/static/img/cc-by-sa_88x31.png rename to www/static/img/cc-by-sa_88x31.png diff --git a/www/conservancy/static/img/conservancy-accounting-campaign-logo.png b/www/static/img/conservancy-accounting-campaign-logo.png similarity index 100% rename from www/conservancy/static/img/conservancy-accounting-campaign-logo.png rename to www/static/img/conservancy-accounting-campaign-logo.png diff --git a/www/conservancy/static/img/conservancy-header.svg b/www/static/img/conservancy-header.svg similarity index 100% rename from www/conservancy/static/img/conservancy-header.svg rename to www/static/img/conservancy-header.svg diff --git a/www/conservancy/static/img/conservancy-logo.png b/www/static/img/conservancy-logo.png similarity index 100% rename from www/conservancy/static/img/conservancy-logo.png rename to www/static/img/conservancy-logo.png diff --git a/www/conservancy/static/img/conservancy-logo.svg b/www/static/img/conservancy-logo.svg similarity index 100% rename from www/conservancy/static/img/conservancy-logo.svg rename to www/static/img/conservancy-logo.svg diff --git a/www/conservancy/static/img/conservancy-logo_package.zip b/www/static/img/conservancy-logo_package.zip similarity index 100% rename from www/conservancy/static/img/conservancy-logo_package.zip rename to www/static/img/conservancy-logo_package.zip diff --git a/www/conservancy/static/img/conservancy-staff-photo.jpg b/www/static/img/conservancy-staff-photo.jpg similarity index 100% rename from www/conservancy/static/img/conservancy-staff-photo.jpg rename to www/static/img/conservancy-staff-photo.jpg diff --git a/www/conservancy/static/img/conservancy-supporter-header.png b/www/static/img/conservancy-supporter-header.png similarity index 100% rename from www/conservancy/static/img/conservancy-supporter-header.png rename to www/static/img/conservancy-supporter-header.png diff --git a/www/conservancy/static/img/conservancy-supporter-heart-3x.png b/www/static/img/conservancy-supporter-heart-3x.png similarity index 100% rename from www/conservancy/static/img/conservancy-supporter-heart-3x.png rename to www/static/img/conservancy-supporter-heart-3x.png diff --git a/www/conservancy/static/img/conservancy-supporter-heart-supporter.svg b/www/static/img/conservancy-supporter-heart-supporter.svg similarity index 100% rename from www/conservancy/static/img/conservancy-supporter-heart-supporter.svg rename to www/static/img/conservancy-supporter-heart-supporter.svg diff --git a/www/conservancy/static/img/conservancy-supporter-heart.png b/www/static/img/conservancy-supporter-heart.png similarity index 100% rename from www/conservancy/static/img/conservancy-supporter-heart.png rename to www/static/img/conservancy-supporter-heart.png diff --git a/www/conservancy/static/img/conservancy-supporter-heart.svg b/www/static/img/conservancy-supporter-heart.svg similarity index 100% rename from www/conservancy/static/img/conservancy-supporter-heart.svg rename to www/static/img/conservancy-supporter-heart.svg diff --git a/www/conservancy/static/img/conservancy-t-shirt.jpg b/www/static/img/conservancy-t-shirt.jpg similarity index 100% rename from www/conservancy/static/img/conservancy-t-shirt.jpg rename to www/static/img/conservancy-t-shirt.jpg diff --git a/www/conservancy/static/img/conservancy_64x64.png b/www/static/img/conservancy_64x64.png similarity index 100% rename from www/conservancy/static/img/conservancy_64x64.png rename to www/static/img/conservancy_64x64.png diff --git a/www/conservancy/static/img/feed-icon-14x14.png b/www/static/img/feed-icon-14x14.png similarity index 100% rename from www/conservancy/static/img/feed-icon-14x14.png rename to www/static/img/feed-icon-14x14.png diff --git a/www/conservancy/static/img/font_awesome.svg b/www/static/img/font_awesome.svg similarity index 100% rename from www/conservancy/static/img/font_awesome.svg rename to www/static/img/font_awesome.svg diff --git a/www/conservancy/static/img/gpl-heart.png b/www/static/img/gpl-heart.png similarity index 100% rename from www/conservancy/static/img/gpl-heart.png rename to www/static/img/gpl-heart.png diff --git a/www/conservancy/static/img/headerbg.png b/www/static/img/headerbg.png similarity index 100% rename from www/conservancy/static/img/headerbg.png rename to www/static/img/headerbg.png diff --git a/www/conservancy/static/img/jondale.jpg b/www/static/img/jondale.jpg similarity index 100% rename from www/conservancy/static/img/jondale.jpg rename to www/static/img/jondale.jpg diff --git a/www/conservancy/static/img/laptop-stickers-bro-mug.jpg b/www/static/img/laptop-stickers-bro-mug.jpg similarity index 100% rename from www/conservancy/static/img/laptop-stickers-bro-mug.jpg rename to www/static/img/laptop-stickers-bro-mug.jpg diff --git a/www/conservancy/static/img/lawall.jpg b/www/static/img/lawall.jpg similarity index 100% rename from www/conservancy/static/img/lawall.jpg rename to www/static/img/lawall.jpg diff --git a/www/conservancy/static/img/member-project-logos.png b/www/static/img/member-project-logos.png similarity index 100% rename from www/conservancy/static/img/member-project-logos.png rename to www/static/img/member-project-logos.png diff --git a/www/conservancy/static/img/naomiwutweet.png b/www/static/img/naomiwutweet.png similarity index 100% rename from www/conservancy/static/img/naomiwutweet.png rename to www/static/img/naomiwutweet.png diff --git a/www/conservancy/static/img/people/Christoph-Hellwig_2015.jpg b/www/static/img/people/Christoph-Hellwig_2015.jpg similarity index 100% rename from www/conservancy/static/img/people/Christoph-Hellwig_2015.jpg rename to www/static/img/people/Christoph-Hellwig_2015.jpg diff --git a/www/conservancy/static/img/people/bdale-headshot-smaller.jpg b/www/static/img/people/bdale-headshot-smaller.jpg similarity index 100% rename from www/conservancy/static/img/people/bdale-headshot-smaller.jpg rename to www/static/img/people/bdale-headshot-smaller.jpg diff --git a/www/conservancy/static/img/people/bdale-headshot.jpg b/www/static/img/people/bdale-headshot.jpg similarity index 100% rename from www/conservancy/static/img/people/bdale-headshot.jpg rename to www/static/img/people/bdale-headshot.jpg diff --git a/www/conservancy/static/img/pono.jpg b/www/static/img/pono.jpg similarity index 100% rename from www/conservancy/static/img/pono.jpg rename to www/static/img/pono.jpg diff --git a/www/conservancy/static/img/projects/2018-10_Reproducible-Builds.svg b/www/static/img/projects/2018-10_Reproducible-Builds.svg similarity index 100% rename from www/conservancy/static/img/projects/2018-10_Reproducible-Builds.svg rename to www/static/img/projects/2018-10_Reproducible-Builds.svg diff --git a/www/conservancy/static/img/projects/CWL-Logo-nofonts.svg b/www/static/img/projects/CWL-Logo-nofonts.svg similarity index 100% rename from www/conservancy/static/img/projects/CWL-Logo-nofonts.svg rename to www/static/img/projects/CWL-Logo-nofonts.svg diff --git a/www/conservancy/static/img/projects/argouml.jpg b/www/static/img/projects/argouml.jpg similarity index 100% rename from www/conservancy/static/img/projects/argouml.jpg rename to www/static/img/projects/argouml.jpg diff --git a/www/conservancy/static/img/projects/bongo.png b/www/static/img/projects/bongo.png similarity index 100% rename from www/conservancy/static/img/projects/bongo.png rename to www/static/img/projects/bongo.png diff --git a/www/conservancy/static/img/projects/boost.png b/www/static/img/projects/boost.png similarity index 100% rename from www/conservancy/static/img/projects/boost.png rename to www/static/img/projects/boost.png diff --git a/www/conservancy/static/img/projects/bro.png b/www/static/img/projects/bro.png similarity index 100% rename from www/conservancy/static/img/projects/bro.png rename to www/static/img/projects/bro.png diff --git a/www/conservancy/static/img/projects/buildbot.png b/www/static/img/projects/buildbot.png similarity index 100% rename from www/conservancy/static/img/projects/buildbot.png rename to www/static/img/projects/buildbot.png diff --git a/www/conservancy/static/img/projects/busybox.png b/www/static/img/projects/busybox.png similarity index 100% rename from www/conservancy/static/img/projects/busybox.png rename to www/static/img/projects/busybox.png diff --git a/www/conservancy/static/img/projects/clojars.png b/www/static/img/projects/clojars.png similarity index 100% rename from www/conservancy/static/img/projects/clojars.png rename to www/static/img/projects/clojars.png diff --git a/www/conservancy/static/img/projects/coreboot.svg b/www/static/img/projects/coreboot.svg similarity index 100% rename from www/conservancy/static/img/projects/coreboot.svg rename to www/static/img/projects/coreboot.svg diff --git a/www/conservancy/static/img/projects/darcs.svg b/www/static/img/projects/darcs.svg similarity index 100% rename from www/conservancy/static/img/projects/darcs.svg rename to www/static/img/projects/darcs.svg diff --git a/www/conservancy/static/img/projects/etherpad.svg b/www/static/img/projects/etherpad.svg similarity index 100% rename from www/conservancy/static/img/projects/etherpad.svg rename to www/static/img/projects/etherpad.svg diff --git a/www/conservancy/static/img/projects/evergreen.svg b/www/static/img/projects/evergreen.svg similarity index 100% rename from www/conservancy/static/img/projects/evergreen.svg rename to www/static/img/projects/evergreen.svg diff --git a/www/conservancy/static/img/projects/freedv.png b/www/static/img/projects/freedv.png similarity index 100% rename from www/conservancy/static/img/projects/freedv.png rename to www/static/img/projects/freedv.png diff --git a/www/conservancy/static/img/projects/git.png b/www/static/img/projects/git.png similarity index 100% rename from www/conservancy/static/img/projects/git.png rename to www/static/img/projects/git.png diff --git a/www/conservancy/static/img/projects/godot/godot-logo.svg b/www/static/img/projects/godot/godot-logo.svg similarity index 100% rename from www/conservancy/static/img/projects/godot/godot-logo.svg rename to www/static/img/projects/godot/godot-logo.svg diff --git a/www/conservancy/static/img/projects/harvey.svg b/www/static/img/projects/harvey.svg similarity index 100% rename from www/conservancy/static/img/projects/harvey.svg rename to www/static/img/projects/harvey.svg diff --git a/www/conservancy/static/img/projects/homebrew.svg b/www/static/img/projects/homebrew.svg similarity index 100% rename from www/conservancy/static/img/projects/homebrew.svg rename to www/static/img/projects/homebrew.svg diff --git a/www/conservancy/static/img/projects/inkscape.svg b/www/static/img/projects/inkscape.svg similarity index 100% rename from www/conservancy/static/img/projects/inkscape.svg rename to www/static/img/projects/inkscape.svg diff --git a/www/conservancy/static/img/projects/k3d.png b/www/static/img/projects/k3d.png similarity index 100% rename from www/conservancy/static/img/projects/k3d.png rename to www/static/img/projects/k3d.png diff --git a/www/conservancy/static/img/projects/kallithea.svg b/www/static/img/projects/kallithea.svg similarity index 100% rename from www/conservancy/static/img/projects/kallithea.svg rename to www/static/img/projects/kallithea.svg diff --git a/www/conservancy/static/img/projects/librehealth.png b/www/static/img/projects/librehealth.png similarity index 100% rename from www/conservancy/static/img/projects/librehealth.png rename to www/static/img/projects/librehealth.png diff --git a/www/conservancy/static/img/projects/luxrender.png b/www/static/img/projects/luxrender.png similarity index 100% rename from www/conservancy/static/img/projects/luxrender.png rename to www/static/img/projects/luxrender.png diff --git a/www/conservancy/static/img/projects/mercurial.svg b/www/static/img/projects/mercurial.svg similarity index 100% rename from www/conservancy/static/img/projects/mercurial.svg rename to www/static/img/projects/mercurial.svg diff --git a/www/conservancy/static/img/projects/metalink.svg b/www/static/img/projects/metalink.svg similarity index 100% rename from www/conservancy/static/img/projects/metalink.svg rename to www/static/img/projects/metalink.svg diff --git a/www/conservancy/static/img/projects/microblocks.png b/www/static/img/projects/microblocks.png similarity index 100% rename from www/conservancy/static/img/projects/microblocks.png rename to www/static/img/projects/microblocks.png diff --git a/www/conservancy/static/img/projects/north-bay-python.png b/www/static/img/projects/north-bay-python.png similarity index 100% rename from www/conservancy/static/img/projects/north-bay-python.png rename to www/static/img/projects/north-bay-python.png diff --git a/www/conservancy/static/img/projects/opentripplanner.png b/www/static/img/projects/opentripplanner.png similarity index 100% rename from www/conservancy/static/img/projects/opentripplanner.png rename to www/static/img/projects/opentripplanner.png diff --git a/www/conservancy/static/img/projects/openwrt-2020.svg b/www/static/img/projects/openwrt-2020.svg similarity index 100% rename from www/conservancy/static/img/projects/openwrt-2020.svg rename to www/static/img/projects/openwrt-2020.svg diff --git a/www/conservancy/static/img/projects/openwrt.png b/www/static/img/projects/openwrt.png similarity index 100% rename from www/conservancy/static/img/projects/openwrt.png rename to www/static/img/projects/openwrt.png diff --git a/www/conservancy/static/img/projects/outreachy.png b/www/static/img/projects/outreachy.png similarity index 100% rename from www/conservancy/static/img/projects/outreachy.png rename to www/static/img/projects/outreachy.png diff --git a/www/conservancy/static/img/projects/outreachy/2016-05_team.jpg b/www/static/img/projects/outreachy/2016-05_team.jpg similarity index 100% rename from www/conservancy/static/img/projects/outreachy/2016-05_team.jpg rename to www/static/img/projects/outreachy/2016-05_team.jpg diff --git a/www/conservancy/static/img/projects/phpmyadmin.png b/www/static/img/projects/phpmyadmin.png similarity index 100% rename from www/conservancy/static/img/projects/phpmyadmin.png rename to www/static/img/projects/phpmyadmin.png diff --git a/www/conservancy/static/img/projects/pypy.svg b/www/static/img/projects/pypy.svg similarity index 100% rename from www/conservancy/static/img/projects/pypy.svg rename to www/static/img/projects/pypy.svg diff --git a/www/conservancy/static/img/projects/qemu.svg b/www/static/img/projects/qemu.svg similarity index 100% rename from www/conservancy/static/img/projects/qemu.svg rename to www/static/img/projects/qemu.svg diff --git a/www/conservancy/static/img/projects/racket.svg b/www/static/img/projects/racket.svg similarity index 100% rename from www/conservancy/static/img/projects/racket.svg rename to www/static/img/projects/racket.svg diff --git a/www/conservancy/static/img/projects/samba.png b/www/static/img/projects/samba.png similarity index 100% rename from www/conservancy/static/img/projects/samba.png rename to www/static/img/projects/samba.png diff --git a/www/conservancy/static/img/projects/selenium.png b/www/static/img/projects/selenium.png similarity index 100% rename from www/conservancy/static/img/projects/selenium.png rename to www/static/img/projects/selenium.png diff --git a/www/conservancy/static/img/projects/sourceware.svg b/www/static/img/projects/sourceware.svg similarity index 100% rename from www/conservancy/static/img/projects/sourceware.svg rename to www/static/img/projects/sourceware.svg diff --git a/www/conservancy/static/img/projects/spec-ops.png b/www/static/img/projects/spec-ops.png similarity index 100% rename from www/conservancy/static/img/projects/spec-ops.png rename to www/static/img/projects/spec-ops.png diff --git a/www/conservancy/static/img/projects/squeak.svg b/www/static/img/projects/squeak.svg similarity index 100% rename from www/conservancy/static/img/projects/squeak.svg rename to www/static/img/projects/squeak.svg diff --git a/www/conservancy/static/img/projects/sugar-labs.svg b/www/static/img/projects/sugar-labs.svg similarity index 100% rename from www/conservancy/static/img/projects/sugar-labs.svg rename to www/static/img/projects/sugar-labs.svg diff --git a/www/conservancy/static/img/projects/sugar/2015_Turtle-Art-Day.jpg b/www/static/img/projects/sugar/2015_Turtle-Art-Day.jpg similarity index 100% rename from www/conservancy/static/img/projects/sugar/2015_Turtle-Art-Day.jpg rename to www/static/img/projects/sugar/2015_Turtle-Art-Day.jpg diff --git a/www/conservancy/static/img/projects/surveyos.png b/www/static/img/projects/surveyos.png similarity index 100% rename from www/conservancy/static/img/projects/surveyos.png rename to www/static/img/projects/surveyos.png diff --git a/www/conservancy/static/img/projects/swig.jpg b/www/static/img/projects/swig.jpg similarity index 100% rename from www/conservancy/static/img/projects/swig.jpg rename to www/static/img/projects/swig.jpg diff --git a/www/conservancy/static/img/projects/teaching-open-source.png b/www/static/img/projects/teaching-open-source.png similarity index 100% rename from www/conservancy/static/img/projects/teaching-open-source.png rename to www/static/img/projects/teaching-open-source.png diff --git a/www/conservancy/static/img/projects/twisted.svg b/www/static/img/projects/twisted.svg similarity index 100% rename from www/conservancy/static/img/projects/twisted.svg rename to www/static/img/projects/twisted.svg diff --git a/www/conservancy/static/img/projects/wine.png b/www/static/img/projects/wine.png similarity index 100% rename from www/conservancy/static/img/projects/wine.png rename to www/static/img/projects/wine.png diff --git a/www/conservancy/static/img/projects/xapian.png b/www/static/img/projects/xapian.png similarity index 100% rename from www/conservancy/static/img/projects/xapian.png rename to www/static/img/projects/xapian.png diff --git a/www/conservancy/static/img/scaled-LLW-2015-Conservancy-Supporters-by-Carlo-Piana-CC-0.jpg b/www/static/img/scaled-LLW-2015-Conservancy-Supporters-by-Carlo-Piana-CC-0.jpg similarity index 100% rename from www/conservancy/static/img/scaled-LLW-2015-Conservancy-Supporters-by-Carlo-Piana-CC-0.jpg rename to www/static/img/scaled-LLW-2015-Conservancy-Supporters-by-Carlo-Piana-CC-0.jpg diff --git a/www/conservancy/static/img/sfc_holiday_card_2021.jpg b/www/static/img/sfc_holiday_card_2021.jpg similarity index 100% rename from www/conservancy/static/img/sfc_holiday_card_2021.jpg rename to www/static/img/sfc_holiday_card_2021.jpg diff --git a/www/conservancy/static/img/sfc_holiday_card_video_done_smaller.mp4 b/www/static/img/sfc_holiday_card_video_done_smaller.mp4 similarity index 100% rename from www/conservancy/static/img/sfc_holiday_card_video_done_smaller.mp4 rename to www/static/img/sfc_holiday_card_video_done_smaller.mp4 diff --git a/www/conservancy/static/img/sponsors/ardc.svg b/www/static/img/sponsors/ardc.svg similarity index 100% rename from www/conservancy/static/img/sponsors/ardc.svg rename to www/static/img/sponsors/ardc.svg diff --git a/www/conservancy/static/img/sponsors/arm.png b/www/static/img/sponsors/arm.png similarity index 100% rename from www/conservancy/static/img/sponsors/arm.png rename to www/static/img/sponsors/arm.png diff --git a/www/conservancy/static/img/sponsors/codeweavers.png b/www/static/img/sponsors/codeweavers.png similarity index 100% rename from www/conservancy/static/img/sponsors/codeweavers.png rename to www/static/img/sponsors/codeweavers.png diff --git a/www/conservancy/static/img/sponsors/fossa.png b/www/static/img/sponsors/fossa.png similarity index 100% rename from www/conservancy/static/img/sponsors/fossa.png rename to www/static/img/sponsors/fossa.png diff --git a/www/conservancy/static/img/sponsors/google.png b/www/static/img/sponsors/google.png similarity index 100% rename from www/conservancy/static/img/sponsors/google.png rename to www/static/img/sponsors/google.png diff --git a/www/conservancy/static/img/sponsors/ifixit.png b/www/static/img/sponsors/ifixit.png similarity index 100% rename from www/conservancy/static/img/sponsors/ifixit.png rename to www/static/img/sponsors/ifixit.png diff --git a/www/conservancy/static/img/sponsors/indeed.png b/www/static/img/sponsors/indeed.png similarity index 100% rename from www/conservancy/static/img/sponsors/indeed.png rename to www/static/img/sponsors/indeed.png diff --git a/www/conservancy/static/img/sponsors/intel.png b/www/static/img/sponsors/intel.png similarity index 100% rename from www/conservancy/static/img/sponsors/intel.png rename to www/static/img/sponsors/intel.png diff --git a/www/conservancy/static/img/sponsors/jmp.svg b/www/static/img/sponsors/jmp.svg similarity index 100% rename from www/conservancy/static/img/sponsors/jmp.svg rename to www/static/img/sponsors/jmp.svg diff --git a/www/conservancy/static/img/sponsors/lwn.png b/www/static/img/sponsors/lwn.png similarity index 100% rename from www/conservancy/static/img/sponsors/lwn.png rename to www/static/img/sponsors/lwn.png diff --git a/www/conservancy/static/img/sponsors/mozilla.png b/www/static/img/sponsors/mozilla.png similarity index 100% rename from www/conservancy/static/img/sponsors/mozilla.png rename to www/static/img/sponsors/mozilla.png diff --git a/www/conservancy/static/img/sponsors/sakai.png b/www/static/img/sponsors/sakai.png similarity index 100% rename from www/conservancy/static/img/sponsors/sakai.png rename to www/static/img/sponsors/sakai.png diff --git a/www/conservancy/static/img/sponsors/sentry.png b/www/static/img/sponsors/sentry.png similarity index 100% rename from www/conservancy/static/img/sponsors/sentry.png rename to www/static/img/sponsors/sentry.png diff --git a/www/conservancy/static/img/supporter-badge.png b/www/static/img/supporter-badge.png similarity index 100% rename from www/conservancy/static/img/supporter-badge.png rename to www/static/img/supporter-badge.png diff --git a/www/conservancy/static/img/supporter-card-1.svg b/www/static/img/supporter-card-1.svg similarity index 100% rename from www/conservancy/static/img/supporter-card-1.svg rename to www/static/img/supporter-card-1.svg diff --git a/www/conservancy/static/img/supporter-card-2.svg b/www/static/img/supporter-card-2.svg similarity index 100% rename from www/conservancy/static/img/supporter-card-2.svg rename to www/static/img/supporter-card-2.svg diff --git a/www/conservancy/static/img/supporter-night-button.png b/www/static/img/supporter-night-button.png similarity index 100% rename from www/conservancy/static/img/supporter-night-button.png rename to www/static/img/supporter-night-button.png diff --git a/www/conservancy/static/img/supporter-payment-button-annual.png b/www/static/img/supporter-payment-button-annual.png similarity index 100% rename from www/conservancy/static/img/supporter-payment-button-annual.png rename to www/static/img/supporter-payment-button-annual.png diff --git a/www/conservancy/static/img/supporter-payment-button-monthly.png b/www/static/img/supporter-payment-button-monthly.png similarity index 100% rename from www/conservancy/static/img/supporter-payment-button-monthly.png rename to www/static/img/supporter-payment-button-monthly.png diff --git a/www/conservancy/static/img/supporter-payment-button-renewal.png b/www/static/img/supporter-payment-button-renewal.png similarity index 100% rename from www/conservancy/static/img/supporter-payment-button-renewal.png rename to www/static/img/supporter-payment-button-renewal.png diff --git a/www/conservancy/static/img/sustainer.svg b/www/static/img/sustainer.svg similarity index 100% rename from www/conservancy/static/img/sustainer.svg rename to www/static/img/sustainer.svg diff --git a/www/conservancy/static/img/tshirt-2022.png b/www/static/img/tshirt-2022.png similarity index 100% rename from www/conservancy/static/img/tshirt-2022.png rename to www/static/img/tshirt-2022.png diff --git a/www/conservancy/static/js/conservancy.js b/www/static/js/conservancy.js similarity index 100% rename from www/conservancy/static/js/conservancy.js rename to www/static/js/conservancy.js diff --git a/www/conservancy/static/js/jquery-1.7.2.js b/www/static/js/jquery-1.7.2.js similarity index 100% rename from www/conservancy/static/js/jquery-1.7.2.js rename to www/static/js/jquery-1.7.2.js diff --git a/www/conservancy/static/js/supporter-page.js b/www/static/js/supporter-page.js similarity index 100% rename from www/conservancy/static/js/supporter-page.js rename to www/static/js/supporter-page.js diff --git a/www/conservancy/static/learn/index.html b/www/static/learn/index.html similarity index 100% rename from www/conservancy/static/learn/index.html rename to www/static/learn/index.html diff --git a/www/conservancy/static/npoacct/index.html b/www/static/npoacct/index.html similarity index 100% rename from www/conservancy/static/npoacct/index.html rename to www/static/npoacct/index.html diff --git a/www/conservancy/static/press/index.html b/www/static/press/index.html similarity index 100% rename from www/conservancy/static/press/index.html rename to www/static/press/index.html diff --git a/www/conservancy/static/press/inthenews.html b/www/static/press/inthenews.html similarity index 100% rename from www/conservancy/static/press/inthenews.html rename to www/static/press/inthenews.html diff --git a/www/conservancy/static/press/kit.html b/www/static/press/kit.html similarity index 100% rename from www/conservancy/static/press/kit.html rename to www/static/press/kit.html diff --git a/www/conservancy/static/press/qanda.html b/www/static/press/qanda.html similarity index 100% rename from www/conservancy/static/press/qanda.html rename to www/static/press/qanda.html diff --git a/www/conservancy/static/press/vizio-coverage.html b/www/static/press/vizio-coverage.html similarity index 100% rename from www/conservancy/static/press/vizio-coverage.html rename to www/static/press/vizio-coverage.html diff --git a/www/conservancy/static/privacy-policy/index.html b/www/static/privacy-policy/index.html similarity index 100% rename from www/conservancy/static/privacy-policy/index.html rename to www/static/privacy-policy/index.html diff --git a/www/conservancy/static/projects/apply/ConservancyFSATemplate.pdf b/www/static/projects/apply/ConservancyFSATemplate.pdf similarity index 100% rename from www/conservancy/static/projects/apply/ConservancyFSATemplate.pdf rename to www/static/projects/apply/ConservancyFSATemplate.pdf diff --git a/www/conservancy/static/projects/apply/conservancy-fsa-template.odt b/www/static/projects/apply/conservancy-fsa-template.odt similarity index 100% rename from www/conservancy/static/projects/apply/conservancy-fsa-template.odt rename to www/static/projects/apply/conservancy-fsa-template.odt diff --git a/www/conservancy/static/projects/apply/conservancy-fsa-template.tex b/www/static/projects/apply/conservancy-fsa-template.tex similarity index 100% rename from www/conservancy/static/projects/apply/conservancy-fsa-template.tex rename to www/static/projects/apply/conservancy-fsa-template.tex diff --git a/www/conservancy/static/projects/apply/index.html b/www/static/projects/apply/index.html similarity index 100% rename from www/conservancy/static/projects/apply/index.html rename to www/static/projects/apply/index.html diff --git a/www/conservancy/static/projects/current/index.html b/www/static/projects/current/index.html similarity index 100% rename from www/conservancy/static/projects/current/index.html rename to www/static/projects/current/index.html diff --git a/www/conservancy/static/projects/index.html b/www/static/projects/index.html similarity index 100% rename from www/conservancy/static/projects/index.html rename to www/static/projects/index.html diff --git a/www/conservancy/static/projects/policies/conflict-of-interest-policy.9ed5723d4fa0cd23ff52a8945bd8b82d0b80b590.html b/www/static/projects/policies/conflict-of-interest-policy.9ed5723d4fa0cd23ff52a8945bd8b82d0b80b590.html similarity index 100% rename from www/conservancy/static/projects/policies/conflict-of-interest-policy.9ed5723d4fa0cd23ff52a8945bd8b82d0b80b590.html rename to www/static/projects/policies/conflict-of-interest-policy.9ed5723d4fa0cd23ff52a8945bd8b82d0b80b590.html diff --git a/www/conservancy/static/projects/policies/conflict-of-interest-policy.d477e1b02e2093594db118aaa956da8c93129d58.html b/www/static/projects/policies/conflict-of-interest-policy.d477e1b02e2093594db118aaa956da8c93129d58.html similarity index 100% rename from www/conservancy/static/projects/policies/conflict-of-interest-policy.d477e1b02e2093594db118aaa956da8c93129d58.html rename to www/static/projects/policies/conflict-of-interest-policy.d477e1b02e2093594db118aaa956da8c93129d58.html diff --git a/www/conservancy/static/projects/policies/conflict-of-interest-policy.html b/www/static/projects/policies/conflict-of-interest-policy.html similarity index 100% rename from www/conservancy/static/projects/policies/conflict-of-interest-policy.html rename to www/static/projects/policies/conflict-of-interest-policy.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.11ae065865d3a0b78bb5f2d894c5f955e49e4f0f.html b/www/static/projects/policies/conservancy-travel-policy.11ae065865d3a0b78bb5f2d894c5f955e49e4f0f.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.11ae065865d3a0b78bb5f2d894c5f955e49e4f0f.html rename to www/static/projects/policies/conservancy-travel-policy.11ae065865d3a0b78bb5f2d894c5f955e49e4f0f.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.3b1bc93469c1bb9ceb479f32c29fd7a8ee3521e3.html b/www/static/projects/policies/conservancy-travel-policy.3b1bc93469c1bb9ceb479f32c29fd7a8ee3521e3.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.3b1bc93469c1bb9ceb479f32c29fd7a8ee3521e3.html rename to www/static/projects/policies/conservancy-travel-policy.3b1bc93469c1bb9ceb479f32c29fd7a8ee3521e3.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.44cea2c1e51c72e115dcceeede92e755a1d41da6.html b/www/static/projects/policies/conservancy-travel-policy.44cea2c1e51c72e115dcceeede92e755a1d41da6.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.44cea2c1e51c72e115dcceeede92e755a1d41da6.html rename to www/static/projects/policies/conservancy-travel-policy.44cea2c1e51c72e115dcceeede92e755a1d41da6.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.4b21de38c2eab014dbfb776460c7600716bd6653.html b/www/static/projects/policies/conservancy-travel-policy.4b21de38c2eab014dbfb776460c7600716bd6653.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.4b21de38c2eab014dbfb776460c7600716bd6653.html rename to www/static/projects/policies/conservancy-travel-policy.4b21de38c2eab014dbfb776460c7600716bd6653.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.676ecf976cff8bf611cc045e6f351ce36f1009bb.html b/www/static/projects/policies/conservancy-travel-policy.676ecf976cff8bf611cc045e6f351ce36f1009bb.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.676ecf976cff8bf611cc045e6f351ce36f1009bb.html rename to www/static/projects/policies/conservancy-travel-policy.676ecf976cff8bf611cc045e6f351ce36f1009bb.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.783dcdd92fc61f3f150e1c65782c0fe527c8ff52.html b/www/static/projects/policies/conservancy-travel-policy.783dcdd92fc61f3f150e1c65782c0fe527c8ff52.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.783dcdd92fc61f3f150e1c65782c0fe527c8ff52.html rename to www/static/projects/policies/conservancy-travel-policy.783dcdd92fc61f3f150e1c65782c0fe527c8ff52.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.96a0a68c8e10ab4ea1f68faaf6573c141bbe7614.html b/www/static/projects/policies/conservancy-travel-policy.96a0a68c8e10ab4ea1f68faaf6573c141bbe7614.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.96a0a68c8e10ab4ea1f68faaf6573c141bbe7614.html rename to www/static/projects/policies/conservancy-travel-policy.96a0a68c8e10ab4ea1f68faaf6573c141bbe7614.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.9ef7fadc65c41438dd5dfeec3544bf80b53e4cea.html b/www/static/projects/policies/conservancy-travel-policy.9ef7fadc65c41438dd5dfeec3544bf80b53e4cea.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.9ef7fadc65c41438dd5dfeec3544bf80b53e4cea.html rename to www/static/projects/policies/conservancy-travel-policy.9ef7fadc65c41438dd5dfeec3544bf80b53e4cea.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.bfc2754decec9bf4b88c10accd4e44b33e4664e6.html b/www/static/projects/policies/conservancy-travel-policy.bfc2754decec9bf4b88c10accd4e44b33e4664e6.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.bfc2754decec9bf4b88c10accd4e44b33e4664e6.html rename to www/static/projects/policies/conservancy-travel-policy.bfc2754decec9bf4b88c10accd4e44b33e4664e6.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.d3640cc7e0181236b3b5a988328ab2ae82cd7c03.html b/www/static/projects/policies/conservancy-travel-policy.d3640cc7e0181236b3b5a988328ab2ae82cd7c03.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.d3640cc7e0181236b3b5a988328ab2ae82cd7c03.html rename to www/static/projects/policies/conservancy-travel-policy.d3640cc7e0181236b3b5a988328ab2ae82cd7c03.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.efb14f1e18273e4f164e3b3a689a086fd511ba26.html b/www/static/projects/policies/conservancy-travel-policy.efb14f1e18273e4f164e3b3a689a086fd511ba26.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.efb14f1e18273e4f164e3b3a689a086fd511ba26.html rename to www/static/projects/policies/conservancy-travel-policy.efb14f1e18273e4f164e3b3a689a086fd511ba26.html diff --git a/www/conservancy/static/projects/policies/conservancy-travel-policy.html b/www/static/projects/policies/conservancy-travel-policy.html similarity index 100% rename from www/conservancy/static/projects/policies/conservancy-travel-policy.html rename to www/static/projects/policies/conservancy-travel-policy.html diff --git a/www/conservancy/static/projects/policies/index.html b/www/static/projects/policies/index.html similarity index 100% rename from www/conservancy/static/projects/policies/index.html rename to www/static/projects/policies/index.html diff --git a/www/conservancy/static/projects/policies/publish-policy.py b/www/static/projects/policies/publish-policy.py similarity index 100% rename from www/conservancy/static/projects/policies/publish-policy.py rename to www/static/projects/policies/publish-policy.py diff --git a/www/conservancy/static/projects/services/index.html b/www/static/projects/services/index.html similarity index 100% rename from www/conservancy/static/projects/services/index.html rename to www/static/projects/services/index.html diff --git a/www/conservancy/static/robots.txt b/www/static/robots.txt similarity index 100% rename from www/conservancy/static/robots.txt rename to www/static/robots.txt diff --git a/www/conservancy/static/sustainer/event.html b/www/static/sustainer/event.html similarity index 100% rename from www/conservancy/static/sustainer/event.html rename to www/static/sustainer/event.html diff --git a/www/conservancy/static/sustainer/original-supporter-appeal.html b/www/static/sustainer/original-supporter-appeal.html similarity index 100% rename from www/conservancy/static/sustainer/original-supporter-appeal.html rename to www/static/sustainer/original-supporter-appeal.html diff --git a/www/conservancy/static/sustainer/thank-you-event.html b/www/static/sustainer/thank-you-event.html similarity index 100% rename from www/conservancy/static/sustainer/thank-you-event.html rename to www/static/sustainer/thank-you-event.html diff --git a/www/conservancy/static/sustainer/thank-you.html b/www/static/sustainer/thank-you.html similarity index 100% rename from www/conservancy/static/sustainer/thank-you.html rename to www/static/sustainer/thank-you.html diff --git a/www/conservancy/static/views.py b/www/static/views.py similarity index 100% rename from www/conservancy/static/views.py rename to www/static/views.py diff --git a/www/conservancy/apps/summit_registration/__init__.py b/www/summit_registration/__init__.py similarity index 100% rename from www/conservancy/apps/summit_registration/__init__.py rename to www/summit_registration/__init__.py diff --git a/www/conservancy/apps/summit_registration/admin.py b/www/summit_registration/admin.py similarity index 100% rename from www/conservancy/apps/summit_registration/admin.py rename to www/summit_registration/admin.py diff --git a/www/conservancy/apps/summit_registration/models.py b/www/summit_registration/models.py similarity index 100% rename from www/conservancy/apps/summit_registration/models.py rename to www/summit_registration/models.py diff --git a/www/conservancy/apps/summit_registration/urls.py b/www/summit_registration/urls.py similarity index 54% rename from www/conservancy/apps/summit_registration/urls.py rename to www/summit_registration/urls.py index 7542bcec..3245b9d2 100644 --- a/www/conservancy/apps/summit_registration/urls.py +++ b/www/summit_registration/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import include, patterns, url -urlpatterns = patterns('conservancy.apps.summit_registration.views', +urlpatterns = patterns('www.summit_registration.views', (r'^/?$', 'register'), ) diff --git a/www/conservancy/apps/summit_registration/views.py b/www/summit_registration/views.py similarity index 91% rename from www/conservancy/apps/summit_registration/views.py rename to www/summit_registration/views.py index 8fe75929..35763060 100644 --- a/www/conservancy/apps/summit_registration/views.py +++ b/www/summit_registration/views.py @@ -1,4 +1,4 @@ -from conervancy.apps.summit_registration.models import SummitRegistration +from www.summit_registration.models import SummitRegistration from django import forms from django.shortcuts import render diff --git a/www/conservancy/apps/supporter/__init__.py b/www/supporter/__init__.py similarity index 100% rename from www/conservancy/apps/supporter/__init__.py rename to www/supporter/__init__.py diff --git a/www/conservancy/apps/supporter/urls.py b/www/supporter/urls.py similarity index 91% rename from www/conservancy/apps/supporter/urls.py rename to www/supporter/urls.py index 9c75f89c..f03af00b 100644 --- a/www/conservancy/apps/supporter/urls.py +++ b/www/supporter/urls.py @@ -2,7 +2,7 @@ from django.conf.urls import url from django.views.generic import TemplateView from . import views as supp_views -from ...static import views as static_views +from ..static import views as static_views INDEX_VIEW = supp_views.index urlpatterns = [ diff --git a/www/conservancy/apps/supporter/views.py b/www/supporter/views.py similarity index 94% rename from www/conservancy/apps/supporter/views.py rename to www/supporter/views.py index 718e9d91..cd0f0666 100644 --- a/www/conservancy/apps/supporter/views.py +++ b/www/supporter/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render -from ... import ParameterValidator +from .. import ParameterValidator def index(request): diff --git a/www/conservancy/apps/supporters/__init__.py b/www/supporters/__init__.py similarity index 100% rename from www/conservancy/apps/supporters/__init__.py rename to www/supporters/__init__.py diff --git a/www/conservancy/apps/supporters/admin.py b/www/supporters/admin.py similarity index 100% rename from www/conservancy/apps/supporters/admin.py rename to www/supporters/admin.py diff --git a/www/conservancy/apps/supporters/models.py b/www/supporters/models.py similarity index 100% rename from www/conservancy/apps/supporters/models.py rename to www/supporters/models.py diff --git a/www/conservancy/templates/500.html b/www/templates/500.html similarity index 100% rename from www/conservancy/templates/500.html rename to www/templates/500.html diff --git a/www/conservancy/templates/assignment/assignment_form.html b/www/templates/assignment/assignment_form.html similarity index 100% rename from www/conservancy/templates/assignment/assignment_form.html rename to www/templates/assignment/assignment_form.html diff --git a/www/conservancy/templates/assignment/base_assignment.html b/www/templates/assignment/base_assignment.html similarity index 100% rename from www/conservancy/templates/assignment/base_assignment.html rename to www/templates/assignment/base_assignment.html diff --git a/www/conservancy/templates/assignment/thanks.html b/www/templates/assignment/thanks.html similarity index 100% rename from www/conservancy/templates/assignment/thanks.html rename to www/templates/assignment/thanks.html diff --git a/www/conservancy/templates/base_about.html b/www/templates/base_about.html similarity index 100% rename from www/conservancy/templates/base_about.html rename to www/templates/base_about.html diff --git a/www/conservancy/templates/base_blog.html b/www/templates/base_blog.html similarity index 100% rename from www/conservancy/templates/base_blog.html rename to www/templates/base_blog.html diff --git a/www/conservancy/templates/base_compliance.html b/www/templates/base_compliance.html similarity index 100% rename from www/conservancy/templates/base_compliance.html rename to www/templates/base_compliance.html diff --git a/www/conservancy/templates/base_conservancy.html b/www/templates/base_conservancy.html similarity index 100% rename from www/conservancy/templates/base_conservancy.html rename to www/templates/base_conservancy.html diff --git a/www/conservancy/templates/base_error.html b/www/templates/base_error.html similarity index 100% rename from www/conservancy/templates/base_error.html rename to www/templates/base_error.html diff --git a/www/conservancy/templates/base_learn.html b/www/templates/base_learn.html similarity index 100% rename from www/conservancy/templates/base_learn.html rename to www/templates/base_learn.html diff --git a/www/conservancy/templates/base_news.html b/www/templates/base_news.html similarity index 100% rename from www/conservancy/templates/base_news.html rename to www/templates/base_news.html diff --git a/www/conservancy/templates/base_press.html b/www/templates/base_press.html similarity index 100% rename from www/conservancy/templates/base_press.html rename to www/templates/base_press.html diff --git a/www/conservancy/templates/base_projects.html b/www/templates/base_projects.html similarity index 100% rename from www/conservancy/templates/base_projects.html rename to www/templates/base_projects.html diff --git a/www/conservancy/templates/base_standard.html b/www/templates/base_standard.html similarity index 100% rename from www/conservancy/templates/base_standard.html rename to www/templates/base_standard.html diff --git a/www/conservancy/templates/base_vizio.html b/www/templates/base_vizio.html similarity index 100% rename from www/conservancy/templates/base_vizio.html rename to www/templates/base_vizio.html diff --git a/www/conservancy/templates/blog/entry_archive_day.html b/www/templates/blog/entry_archive_day.html similarity index 100% rename from www/conservancy/templates/blog/entry_archive_day.html rename to www/templates/blog/entry_archive_day.html diff --git a/www/conservancy/templates/blog/entry_archive_month.html b/www/templates/blog/entry_archive_month.html similarity index 100% rename from www/conservancy/templates/blog/entry_archive_month.html rename to www/templates/blog/entry_archive_month.html diff --git a/www/conservancy/templates/blog/entry_archive_year.html b/www/templates/blog/entry_archive_year.html similarity index 100% rename from www/conservancy/templates/blog/entry_archive_year.html rename to www/templates/blog/entry_archive_year.html diff --git a/www/conservancy/templates/blog/entry_detail.html b/www/templates/blog/entry_detail.html similarity index 100% rename from www/conservancy/templates/blog/entry_detail.html rename to www/templates/blog/entry_detail.html diff --git a/www/conservancy/templates/blog/entry_list.html b/www/templates/blog/entry_list.html similarity index 100% rename from www/conservancy/templates/blog/entry_list.html rename to www/templates/blog/entry_list.html diff --git a/www/conservancy/templates/blog/entry_partial.html b/www/templates/blog/entry_partial.html similarity index 100% rename from www/conservancy/templates/blog/entry_partial.html rename to www/templates/blog/entry_partial.html diff --git a/www/conservancy/templates/blog/query.html b/www/templates/blog/query.html similarity index 100% rename from www/conservancy/templates/blog/query.html rename to www/templates/blog/query.html diff --git a/www/conservancy/templates/ccs_upload/upload.html b/www/templates/ccs_upload/upload.html similarity index 100% rename from www/conservancy/templates/ccs_upload/upload.html rename to www/templates/ccs_upload/upload.html diff --git a/www/conservancy/templates/contractpatch/index.html b/www/templates/contractpatch/index.html similarity index 100% rename from www/conservancy/templates/contractpatch/index.html rename to www/templates/contractpatch/index.html diff --git a/www/conservancy/templates/feeds.html b/www/templates/feeds.html similarity index 100% rename from www/conservancy/templates/feeds.html rename to www/templates/feeds.html diff --git a/www/conservancy/templates/feeds/blog_description.html b/www/templates/feeds/blog_description.html similarity index 100% rename from www/conservancy/templates/feeds/blog_description.html rename to www/templates/feeds/blog_description.html diff --git a/www/conservancy/templates/feeds/blog_title.html b/www/templates/feeds/blog_title.html similarity index 100% rename from www/conservancy/templates/feeds/blog_title.html rename to www/templates/feeds/blog_title.html diff --git a/www/conservancy/templates/feeds/news_description.html b/www/templates/feeds/news_description.html similarity index 100% rename from www/conservancy/templates/feeds/news_description.html rename to www/templates/feeds/news_description.html diff --git a/www/conservancy/templates/feeds/news_title.html b/www/templates/feeds/news_title.html similarity index 100% rename from www/conservancy/templates/feeds/news_title.html rename to www/templates/feeds/news_title.html diff --git a/www/conservancy/templates/feeds/omnibus_description.html b/www/templates/feeds/omnibus_description.html similarity index 100% rename from www/conservancy/templates/feeds/omnibus_description.html rename to www/templates/feeds/omnibus_description.html diff --git a/www/conservancy/templates/feeds/omnibus_title.html b/www/templates/feeds/omnibus_title.html similarity index 100% rename from www/conservancy/templates/feeds/omnibus_title.html rename to www/templates/feeds/omnibus_title.html diff --git a/www/conservancy/templates/fossy/base.html b/www/templates/fossy/base.html similarity index 100% rename from www/conservancy/templates/fossy/base.html rename to www/templates/fossy/base.html diff --git a/www/conservancy/templates/fossy/community_track_proposal_form.html b/www/templates/fossy/community_track_proposal_form.html similarity index 100% rename from www/conservancy/templates/fossy/community_track_proposal_form.html rename to www/templates/fossy/community_track_proposal_form.html diff --git a/www/conservancy/templates/fossy/thanks.html b/www/templates/fossy/thanks.html similarity index 100% rename from www/conservancy/templates/fossy/thanks.html rename to www/templates/fossy/thanks.html diff --git a/www/conservancy/templates/frontpage.html b/www/templates/frontpage.html similarity index 100% rename from www/conservancy/templates/frontpage.html rename to www/templates/frontpage.html diff --git a/www/conservancy/templates/news/pressrelease_archive_day.html b/www/templates/news/pressrelease_archive_day.html similarity index 100% rename from www/conservancy/templates/news/pressrelease_archive_day.html rename to www/templates/news/pressrelease_archive_day.html diff --git a/www/conservancy/templates/news/pressrelease_archive_month.html b/www/templates/news/pressrelease_archive_month.html similarity index 100% rename from www/conservancy/templates/news/pressrelease_archive_month.html rename to www/templates/news/pressrelease_archive_month.html diff --git a/www/conservancy/templates/news/pressrelease_archive_year.html b/www/templates/news/pressrelease_archive_year.html similarity index 100% rename from www/conservancy/templates/news/pressrelease_archive_year.html rename to www/templates/news/pressrelease_archive_year.html diff --git a/www/conservancy/templates/news/pressrelease_detail.html b/www/templates/news/pressrelease_detail.html similarity index 100% rename from www/conservancy/templates/news/pressrelease_detail.html rename to www/templates/news/pressrelease_detail.html diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/templates/news/pressrelease_list.html similarity index 100% rename from www/conservancy/templates/news/pressrelease_list.html rename to www/templates/news/pressrelease_list.html diff --git a/www/conservancy/templates/news/pressrelease_partial.html b/www/templates/news/pressrelease_partial.html similarity index 100% rename from www/conservancy/templates/news/pressrelease_partial.html rename to www/templates/news/pressrelease_partial.html diff --git a/www/conservancy/templates/opengraph_partial.html b/www/templates/opengraph_partial.html similarity index 100% rename from www/conservancy/templates/opengraph_partial.html rename to www/templates/opengraph_partial.html diff --git a/www/conservancy/templates/opengraph_urllist_partial.html b/www/templates/opengraph_urllist_partial.html similarity index 100% rename from www/conservancy/templates/opengraph_urllist_partial.html rename to www/templates/opengraph_urllist_partial.html diff --git a/www/conservancy/templates/socials_partial.html b/www/templates/socials_partial.html similarity index 100% rename from www/conservancy/templates/socials_partial.html rename to www/templates/socials_partial.html diff --git a/www/conservancy/templates/sponsors.html b/www/templates/sponsors.html similarity index 100% rename from www/conservancy/templates/sponsors.html rename to www/templates/sponsors.html diff --git a/www/conservancy/templates/submenus/learn_partial.html b/www/templates/submenus/learn_partial.html similarity index 100% rename from www/conservancy/templates/submenus/learn_partial.html rename to www/templates/submenus/learn_partial.html diff --git a/www/conservancy/templates/submenus/news_partial.html b/www/templates/submenus/news_partial.html similarity index 100% rename from www/conservancy/templates/submenus/news_partial.html rename to www/templates/submenus/news_partial.html diff --git a/www/conservancy/templates/submenus/press_partial.html b/www/templates/submenus/press_partial.html similarity index 100% rename from www/conservancy/templates/submenus/press_partial.html rename to www/templates/submenus/press_partial.html diff --git a/www/conservancy/templates/submenus/what_we_do_partial.html b/www/templates/submenus/what_we_do_partial.html similarity index 100% rename from www/conservancy/templates/submenus/what_we_do_partial.html rename to www/templates/submenus/what_we_do_partial.html diff --git a/www/conservancy/templates/submenus/who_we_are_partial.html b/www/templates/submenus/who_we_are_partial.html similarity index 100% rename from www/conservancy/templates/submenus/who_we_are_partial.html rename to www/templates/submenus/who_we_are_partial.html diff --git a/www/conservancy/templates/supporter/banners.html b/www/templates/supporter/banners.html similarity index 100% rename from www/conservancy/templates/supporter/banners.html rename to www/templates/supporter/banners.html diff --git a/www/conservancy/templates/supporter/form_partial.html b/www/templates/supporter/form_partial.html similarity index 100% rename from www/conservancy/templates/supporter/form_partial.html rename to www/templates/supporter/form_partial.html diff --git a/www/conservancy/templates/supporter/index.html b/www/templates/supporter/index.html similarity index 100% rename from www/conservancy/templates/supporter/index.html rename to www/templates/supporter/index.html diff --git a/www/conservancy/urls.py b/www/urls.py similarity index 80% rename from www/conservancy/urls.py rename to www/urls.py index 14185379..706fc68d 100644 --- a/www/conservancy/urls.py +++ b/www/urls.py @@ -22,7 +22,7 @@ from django.urls import include, path from django.contrib import admin from . import feeds, frontpage, sponsors -from .apps.fundgoal import views as fundgoal_views +from .fundgoal import views as fundgoal_views from .static import views as static_views admin.autodiscover() @@ -42,8 +42,8 @@ urlpatterns = [ url(r'^feeds/news/?$', feeds.PressReleaseFeed()), url(r'^feeds/omnibus/?$', feeds.OmnibusFeed()), url(r'^feeds/?$', feeds.view), - url(r'^news/', include('conservancy.apps.news.urls')), - url(r'^blog/', include('conservancy.apps.blog.urls')), + url(r'^news/', include('www.news.urls')), + url(r'^blog/', include('www.blog.urls')), # formerly static templated things... (dirs with templates) url(r'^error/(40[134]|500)(?:/index\.html|/|)$', static_views.handler), url(r'^error', static_views.index), @@ -56,16 +56,16 @@ urlpatterns = [ url(r'^projects', static_views.index), url(r'^GiveUpGitHub', static_views.index), url(r'^npoacct', static_views.index, {'fundraiser_sought': 'npoacct'}), - url(r'^contractpatch', include('conservancy.apps.contractpatch.urls')), + url(r'^contractpatch', include('www.contractpatch.urls')), url(r'^overview', static_views.index), url(r'^privacy-policy', static_views.index), - url(r'^sustainer/', include('conservancy.apps.supporter.urls')), + url(r'^sustainer/', include('www.supporter.urls')), url(r'^coming-soon.html', static_views.index), url(r'^fundraiser_data', fundgoal_views.view), - url(r'^ccs-upload/', include('conservancy.apps.ccs_upload.urls', namespace='ccs_upload')), - url(r'^assignment/', include('conservancy.apps.assignment.urls')), + url(r'^ccs-upload/', include('www.ccs_upload.urls', namespace='ccs_upload')), + url(r'^assignment/', include('www.assignment.urls')), url(r'^fossy/$', static_views.index), - url(r'^fossy/', include('conservancy.apps.fossy.urls')), - url(r'^cast/', include('podjango.urls')), - path('usethesource/', include('usethesource.urls')), + url(r'^fossy/', include('www.fossy.urls')), + url(r'^cast/', include('www.podjango.urls')), + path('usethesource/', include('www.usethesource.urls')), ] diff --git a/www/conservancy/apps/worldmap/README b/www/worldmap/README similarity index 100% rename from www/conservancy/apps/worldmap/README rename to www/worldmap/README diff --git a/www/conservancy/apps/worldmap/__init__.py b/www/worldmap/__init__.py similarity index 100% rename from www/conservancy/apps/worldmap/__init__.py rename to www/worldmap/__init__.py diff --git a/www/conservancy/apps/worldmap/admin.py b/www/worldmap/admin.py similarity index 100% rename from www/conservancy/apps/worldmap/admin.py rename to www/worldmap/admin.py diff --git a/www/conservancy/apps/worldmap/models.py b/www/worldmap/models.py similarity index 100% rename from www/conservancy/apps/worldmap/models.py rename to www/worldmap/models.py diff --git a/www/conservancy/apps/worldmap/templates/kml b/www/worldmap/templates/kml similarity index 100% rename from www/conservancy/apps/worldmap/templates/kml rename to www/worldmap/templates/kml diff --git a/www/wsgi.py b/www/wsgi.py index 5c5d4c12..53d8fe70 100644 --- a/www/wsgi.py +++ b/www/wsgi.py @@ -1,7 +1,12 @@ +"""WSGI config for project project. + +It exposes the WSGI callable as a module-level variable named ``application``. +""" + import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'conservancy.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'www.settings') application = get_wsgi_application()