Merge branch 'master' into emaw/website-master

_clients/acorn.md

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

_clients/alpha-complex.md

@@ -0,0 +1,3 @@
+---
+title: The Alpha Complex
+---

_clients/generation-rent.md

@@ -0,0 +1,3 @@
+---
+title: Generation Rent
+---

_clients/land-explorer.md

@@ -0,0 +1,3 @@
+---
+title: Land Explorer
+---

_clients/political-education-network.md

@@ -0,0 +1,3 @@
+---
+title: Political Education Network
+---

_clients/reinventory.md

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

_clients/webpost.md

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

_clients/weco.md

@@ -0,0 +1,3 @@
+---
+title: We Collective
+---

_coops/code-operative.md

@@ -0,0 +1,49 @@
+---
+title: Code-Operative
+name: Code-Operative
+members: 8
+website: https://code-operative.co.uk
+email: contact@code-operative.co.uk
+twitter: code_operative
+github: Code-Operative
+address: Baltic Business Quarters, Abbott's Hill, Gateshead, United Kingdom, NE8 3DF
+latitude: 54.966587
+longitude: -1.595418
+clients:
+- acorn
+- weco
+- generation-rent
+- alpha-complex
+- land-explorer
+- webpost
+- reinventory
+- political-education-network
+services:
+- development
+- consultancy
+- database-solutions
+- machine-learning
+- web-design
+technologies:
+- angular
+- ionic
+- reactjs
+- node-js
+- javascript
+- htmlcss
+- django-2
+- python
+- laravel
+- php
+- c
+- net
+- java
+- google-maps
+- postgresql
+- sql-server
+- ubuntu
+---
+
+Code-Operative is a community of tech freelancers based in the North-East of England, with members and affiliates based further afield as well. Code-Op's processes are designed to bridge the gap between freelancers and the clients who need them, operating a not-for-profit model which puts quality and the needs of client and freelancer first.
+
+We can offer the traditional role-based services of an agency but we can also manage existing projects and build new systems from scratch.

_coops/webarchitects.md

@@ -1,7 +1,7 @@
 ---
 title: Webarchitects Co-operative
 name: Webarchitects Co-operative
-members: 60
+members: 3
 website: https://www.webarchitects.coop/
 email: info@webarch.net
 twitter: webarchcoop
@@ -124,9 +124,10 @@ technologies:
 - xen-hypervisor
 ---
 
-Webarchitects is a Sheffield based, small and friendly, multi-stakeholder co-operative which customers can join and which provides ethical and green, WordPress hosting, general web hosting, virtual servers, email services, domain name services and GNU/Linux sysadmin and devop support services to individuals and progressive organisations.
+[Webarchitects](https://www.webarchitects.coop/) is a Sheffield based, small and friendly, [multi-stakeholder co-operative](https://www.webarchitects.coop/about) which [customers can join](https://www.webarchitects.coop/join) and which provides [ethical](https://www.webarchitects.coop/ethics) and [green](https://www.webarchitects.coop/green-energy), [WordPress hosting](https://www.webarchitects.coop/wordpress), [Discourse hosting](https://www.webarchitects.coop/discourse), [Nextcloud hosting](https://www.webarchitects.coop/nextcloud), [general web hosting](https://www.webarchitects.coop/shared-hosting), [virtual servers](https://www.webarchitects.coop/virtual-servers), [email services](https://www.webarchitects.coop/email), [domain name services](https://www.webarchitects.coop/domain-names) and [GNU/Linux sysadmin](https://www.webarchitects.coop/support) and [DevOps support services](https://www.webarchitects.coop/development) to individuals and progressive organisations.
 
 The purpose of our co-operative is:
+
 > To enable the provision of internet based services for socially responsible groups and individuals, using free open source software wherever possible, in a manner that aims to minimise fossil fuel usage and ecological impacts and which also provides sustainable employment
 
-We offer free accounts on git.coop to members of our co-op, visit our website to find out more.
+We offer free accounts on our GitLab server at [git.coop](https://git.coop/) to members of our co-op, visit [our website](https://www.webarchitects.coop/) to find out more.

_includes/footer.html

@@ -19,9 +19,9 @@
     <div class="row">
       <div class="small-12 columns">
         <img src="/assets/img/coop-logo.png" class="float-center" />
-        <p>Site developed by <a href="http://glowboxdesign.co.uk/" target="_blank">Glowbox Design</a>, <a href="https://gofreerange.com/" target="_blank">Go Free Range</a> &amp; <a href="http://outlandish.com" target="_blank">Outlandish</a>.</p>
+        <p>Site developed by <a href="https://glowboxdesign.co.uk/" target="_blank">Glowbox Design</a>, <a href="https://gofreerange.com/" target="_blank">Go Free Range</a> &amp; <a href="https://outlandish.com" target="_blank">Outlandish</a>.</p>
         <p>Source code available on <a href="https://git.coop/cotech/website" target="_blank">git.coop</a>.</p>
-        <p>Hosted by <a href="https://www.webarchitects.coop/" target="_blank">Webarchitects</a> for CoTech &#xa9;2018</p>
+        <p>Hosted by <a href="https://www.webarchitects.coop/" target="_blank">Webarchitects</a> for CoTech &#xa9;2019</p>
       </div>
     </div>
   </div>

_services/machine-learning.md

@@ -0,0 +1,4 @@
+---
+title: Machine Learning
+name: Machine Learning
+---

_technologies/angular.md

@@ -0,0 +1,4 @@
+---
+title: Angular
+name: Angular
+---

_technologies/ionic.md

@@ -0,0 +1,4 @@
+---
+title: Ionic
+name: Ionic
+---