Compare commits

..

No commits in common. "master" and "greennet" have entirely different histories.

474 changed files with 501 additions and 6716 deletions

View File

@ -1,4 +1,4 @@
image: ruby:2.6.6 image: ruby:2.5.3
stages: stages:
- test - test

View File

@ -1,5 +1,5 @@
# Serve .html files without extensions and allow directory listings # Serve .html files without extensions
Options +MultiViews +Indexes Options +MultiViews
# If a SVG and a PNG exists the prefer the SVG # If a SVG and a PNG exists the prefer the SVG
AddType image/svg+xml;qs=0.9 svg sgvz AddType image/svg+xml;qs=0.9 svg sgvz
AddType image/png;qs=0.8 png AddType image/png;qs=0.8 png
@ -12,31 +12,3 @@ AddOutputFilter DEFLATE html
AddOutputFilter DEFLATE svg AddOutputFilter DEFLATE svg
AddOutputFilter DEFLATE css AddOutputFilter DEFLATE css
AddOutputFilter DEFLATE js AddOutputFilter DEFLATE js
# URL's that changed
Redirect /co-op/the-dot-project https://www.coops.tech/co-op/dot-project
Redirect /coops/ https://www.coops.tech/co-op/
Redirect /technology/gnu-bash https://www.coops.tech/technology/bash
Redirect /co-op/graphics-coop https://www.coops.tech/co-op/form-and-function
# Canonical URLs redirect to the domain with a www
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTP_HOST} ^coops\.tech$
RewriteRule ^/?(.*) https://www.coops.tech/$1 [R,L]
</IfModule>
# Redirect HTTP to HTTPS
# https://wiki.apache.org/httpd/RewriteHTTPToHTTPS
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
</IfModule>
# Strict Transport Security Header, this prevents clients
# with STS support from accessing the site using HTTP
# https://stackoverflow.com/questions/24144552/how-to-set-hsts-header-from-htaccess-only-on-https
Header set Strict-Transport-Security "max-age=31536000" env=HTTPS
# Directory Listings
HeaderName /top.html
ReadmeName /bot.html
IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=*
IndexOptions Charset=UTF-8 SuppressHTMLPreamble XHTML TrackModified IconsAreLinks
IndexOptions SuppressDescription

View File

@ -1 +1 @@
2.6.6 2.5.3

View File

@ -1,15 +1,8 @@
# CoTech Website # CoTech Website
This repo is [hosted at git.coop](https://git.coop/cotech/website) and [push mirrored to GitHub](https://github.com/cotech/jekyll-website).
If you would like to contribute to this repo you have two options:
1. [Join Webarchitects](https://webarch.coop/join) to [create an account at git.coop](https://webarch.coop/git#free) and then request access to the [CoTech group](https://git.coop/cotech) and when that has been grated you can update this repo directly.
2. Use a GitHub account to create a [pull request](https://github.com/cotech/jekyll-website/pulls) at GitHub and then ask someone who is a member of [Webarchitects](https://www.webarchitects.coop/) to [patch the repo for you](https://community.coops.tech/t/cotech-website-repo-mirroring-to-github/2818).
## Introduction ## Introduction
This is a port of the old WordPress version of the CoTech website to a statically-generated site using Jekyll. The site consists of a bunch of markdown files and images stored in git.coop. The Jekyll build process is automated so that there is no need to have Jekyll installed and running to make changes to the site. This is a port of the current WordPress version of the CoTech website to a statically-generated site using Jekyll. The site consists of a bunch of markdown files and images stored in git.coop. The Jekyll build process is automated so that there is no need to have Jekyll installed and running to make changes to the site.
* Live site: https://coops.tech/ * Live site: https://coops.tech/
* Dev site: https://dev.coops.tech/ * Dev site: https://dev.coops.tech/

View File

@ -1,4 +0,0 @@
---
title: The 10:10 Foundation
website: https://1010uk.org/
---

View File

@ -1,4 +0,0 @@
---
title: British Tinnitus Association
website: https://www.tinnitus.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Carefree
website: https://carefreespace.org/
---

View File

@ -1,4 +0,0 @@
---
title: Charity Digital
website: https://charitydigital.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: British Tinnitus Association
website: https://cyfannol.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Esmee Fairbairn
website: https://esmeefairbairn.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Family Lives
website: https://www.familylives.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Grassroots
website: https://www.prevent-suicide.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Make A Wish
website: https://www.make-a-wish.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Parkinsons UK
website: https://www.parkinsons.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: SARSAS
website: https://www.sarsas.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: South West Creative Technology Network
website: https://www.swctn.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Surviving Economic Abuse
website: https://survivingeconomicabuse.org/
---

View File

@ -1,4 +0,0 @@
---
title: Tech Talent Charter
website: https://www.techtalentcharter.co.uk/
---

View File

@ -1,4 +0,0 @@
---
title: The Catalyst
website: https://www.thecatalyst.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: West of England Combined Authority
website: https://www.westofengland-ca.gov.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Action for Children
website: https://www.actionforchildren.org.uk/
---

View File

@ -1,3 +0,0 @@
---
title: Action Aid
---

View File

@ -1,3 +0,0 @@
---
title: Allia Future Business Centre
---

View File

@ -1,4 +0,0 @@
---
title: Anna Freud Centre
website: https://www.annafreud.org/
---

View File

@ -1,4 +0,0 @@
---
title: AVA Project
website: https://avaproject.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Barbour Logic
website: http://www.barbourlogic.co.uk/
---

View File

@ -1,3 +0,0 @@
---
title: The British Association of Social Workers (BASW)
---

View File

@ -1,3 +0,0 @@
---
title: BBC ideas
---

View File

@ -1,4 +0,0 @@
---
title: Belfast City Council
website: https://www.belfastcity.gov.uk
---

View File

@ -1,5 +0,0 @@
---
title: BHRRC
website: https://www.business-humanrights.org/
---

View File

@ -1,4 +0,0 @@
---
title: Bioregional
website: https://www.bioregional.com/
---

View File

@ -1,3 +0,0 @@
---
title: Blake House
---

View File

@ -1,4 +0,0 @@
---
title: Blue Cross
website: https://www.bluecross.org.uk/
---

View File

@ -1,4 +1,3 @@
--- ---
title: Cairn Housing Association title: Cairn Housing Association
website: https://www.cairnha.com/
--- ---

View File

@ -1,3 +0,0 @@
---
title: Cardinus
---

View File

@ -1,4 +0,0 @@
---
title: Carers support centre
website: https://www.carerssupportcentre.org.uk/
---

View File

@ -1,4 +1,3 @@
--- ---
title: CAST title: CAST
website: https://www.wearecast.org.uk/
--- ---

View File

@ -1,4 +0,0 @@
---
title: Catapillr
website: https://www.catapillr.com
---

View File

@ -1,4 +1,3 @@
--- ---
title: CDS Co-operatives title: CDS Co-operatives
website: https://www.cds.coop/
--- ---

View File

@ -1,4 +0,0 @@
---
title: Childrens Health Scotland
website: https://www.childrenshealthscotland.org/
---

View File

@ -1,3 +0,0 @@
---
title: Climate Outreach
---

View File

@ -1,4 +0,0 @@
---
title: Comic Relief
website: https://www.comicrelief.com/
---

View File

@ -1,4 +0,0 @@
---
title: Common Futures
website: https://commonfutures.eu/
---

View File

@ -1,4 +0,0 @@
---
title: Coops UK
website: https://www.uk.coop/uk
---

View File

@ -1,5 +0,0 @@
---
title: Crown Commercial Service
website: https://www.crowncommercial.gov.uk/
---

View File

@ -1,3 +0,0 @@
---
title: The Centre for Sustainable Healthcare
---

View File

@ -1,4 +0,0 @@
---
title: Ctrl Group
website: https://www.ctrl-group.com/
---

View File

@ -1,4 +0,0 @@
---
title: Department for Culture, Media and Sport
website: https://www.gov.uk/government/organisations/department-for-digital-culture-media-sport
---

View File

@ -1,3 +0,0 @@
---
title: Deliveroo
---

View File

@ -1,4 +0,0 @@
---
title: ECAS
website: https://www.ecas.scot/
---

View File

@ -1,3 +0,0 @@
---
title: The Eden Project
---

View File

@ -1,4 +0,0 @@
---
title: en10ergy Limited
website: https://en10ergy.org.uk/
---

View File

@ -1,3 +0,0 @@
---
title: Envirogen
---

View File

@ -1,3 +0,0 @@
---
title: Ethical Consumer
---

View File

@ -1,3 +0,0 @@
---
title: FEPS
---

View File

@ -1,3 +0,0 @@
---
title: Food Standards Agency
---

View File

@ -1,4 +0,0 @@
---
title: Founders and Coders
website: https://www.foundersandcoders.com/
---

View File

@ -1,3 +0,0 @@
---
title: Freedom from Torture
---

View File

@ -1,4 +0,0 @@
---
title: Friend Indeed
website: https://www.friendindeed.org.uk/
---

View File

@ -1,3 +0,0 @@
---
title: Froglife
---

View File

@ -1,4 +0,0 @@
---
title: The Fundraising Regulator
website: https://www.fundraisingregulator.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Greenwich Co-operative Development Agency
website: https://gcda.coop/
---

View File

@ -1,4 +1,3 @@
--- ---
title: Global Canopy Programme title: Global Canopy Programme
website: https://www.globalcanopy.org/
--- ---

View File

@ -1,4 +0,0 @@
---
title: Greener Kirkcaldy
website: https://www.greenerkirkcaldy.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: Guys and St Thomas' Charity
website: https://www.gsttcharity.org.uk/
---

View File

@ -1,3 +0,0 @@
---
title: Haircuts 4 Homeless
---

View File

@ -1,3 +0,0 @@
---
title: Health In Touch
---

View File

@ -1,5 +0,0 @@
---
title: Hookline
website: http://hookline.tv/
---

View File

@ -1,4 +0,0 @@
---
title: IDEO
website: https://www.ideo.com/
---

View File

@ -1,3 +0,0 @@
---
title: International Federation of Social Workers
---

View File

@ -1,4 +1,3 @@
--- ---
title: Information Architecture Institute title: Information Architecture Institute
website: https://www.iainstitute.org/
--- ---

View File

@ -1,3 +0,0 @@
---
title: Invest SK
---

View File

@ -1,3 +0,0 @@
---
title: Institute for Strategic Dialogue
---

View File

@ -1,3 +0,0 @@
---
title: Just Eat
---

View File

@ -1,4 +0,0 @@
---
title: The Kaizen Partnership
website: http://wearekaizen.co.uk/
---

View File

@ -1,3 +0,0 @@
---
title: Kaspersky
---

View File

@ -1,3 +0,0 @@
---
title: Kindling Trust
---

View File

@ -1,3 +0,0 @@
---
title: Labour
---

View File

@ -1,4 +0,0 @@
---
title: Lancashire Women's Centres
website: https://lancashirewomen.org/
---

View File

@ -1,4 +0,0 @@
---
title: Law Centres Network
website: https://www.lawcentres.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: London Permaculture Network
website: https://www.londonpermaculture.com/
---

View File

@ -1,3 +0,0 @@
---
title: Magpas
---

View File

@ -1,5 +0,0 @@
---
title: MakieLab
website: https://twitter.com/makielab
---

View File

@ -1,3 +0,0 @@
---
title: Metal Culture
---

View File

@ -1,4 +0,0 @@
---
title: Muswell Hill Sustainability Group
website: https://mhsgroup.org/
---

View File

@ -1,3 +0,0 @@
---
title: Modern Art Oxford
---

View File

@ -1,4 +0,0 @@
---
title: MUBI
website: https://mubi.com/
---

View File

@ -1,4 +0,0 @@
---
title: Mudlark
website: https://twitter.com/wearemudlark
---

View File

@ -1,3 +0,0 @@
---
title: Mutuo
---

View File

@ -1,4 +0,0 @@
---
title: National Lottery
website: https://www.national-lottery.co.uk/
---

View File

@ -1,3 +0,0 @@
---
title: Near
---

View File

@ -1,4 +0,0 @@
---
title: New Economics Foundation
website: https://neweconomics.org/
---

View File

@ -1,3 +0,0 @@
---
title: National Health Service
---

View File

@ -1,4 +0,0 @@
---
title: National Institute for Health Research
website: https://www.nihr.ac.uk
---

View File

@ -1,4 +0,0 @@
---
title: North Bristol Advice Centre
website: http://www.northbristoladvice.org.uk/
---

View File

@ -1,4 +0,0 @@
---
title: National Ugly Mugs
website: https://uglymugs.org/
---

View File

@ -1,4 +0,0 @@
---
title: Off Grid Festival
website: https://offgrid-festival.co.uk/
---

View File

@ -1,3 +1,3 @@
--- ---
title: The Open University title: Open University
--- ---

View File

@ -1,4 +0,0 @@
---
title: The Open Co-op
website: https://open.coop/
---

View File

@ -1,4 +0,0 @@
---
title: openDemocracy
website: https://www.opendemocracy.net/
---

Some files were not shown because too many files have changed in this diff Show More