From a696edb49ca156a04ce36b32cb68b2fa3e0701de Mon Sep 17 00:00:00 2001 From: James Mead <3169+floehopper@users.noreply.github.com> Date: Thu, 22 Nov 2018 21:10:22 +0000 Subject: [PATCH 01/26] Use branch of jekyll-sass-converter to fix deprecation warning This fixes the deprecation warning (see below) which appears on running a fresh `bundle install`. This branch contains the changes described in this PR [1]. The only outstanding problems seem to be Windows-related, so I think it's safe to use it. We should be able to switch back to the release version (required by default by the jekyll gem) when this PR is merged and released. Ruby Sass is deprecated and will be unmaintained as of 26 March 2019. * If you use Sass as a command-line tool, we recommend using Dart Sass, the new primary implementation: https://sass-lang.com/install * If you use Sass as a plug-in for a Ruby web framework, we recommend using the sassc gem: https://github.com/sass/sassc-ruby#readme * For more details, please refer to the Sass blog: http://sass.logdown.com/posts/7081811 [1]: https://github.com/jekyll/jekyll-sass-converter/pull/75 --- Gemfile | 3 +++ Gemfile.lock | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index e8a7006..caeca37 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,6 @@ source 'https://rubygems.org' gem 'jekyll' + +# Fixes deprecation warning - see https://github.com/jekyll/jekyll-sass-converter/pull/75 +gem 'jekyll-sass-converter', git: 'https://github.com/jekyll/jekyll-sass-converter.git', branch: 'sassc' diff --git a/Gemfile.lock b/Gemfile.lock index ec25974..cce78c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/jekyll/jekyll-sass-converter.git + revision: c4d4e3e5b1a2222bb94895f9a6ab7e0216236ab8 + branch: sassc + specs: + jekyll-sass-converter (1.5.2) + sassc (~> 2.0) + GEM remote: https://rubygems.org/ specs: @@ -27,8 +35,6 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) jekyll-watch (2.1.2) listen (~> 3.0) kramdown (1.17.0) @@ -41,23 +47,23 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (2.0.5) + rake (12.3.1) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (2.2.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.6.0) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.0.0) + ffi (~> 1.9.6) + rake PLATFORMS ruby DEPENDENCIES jekyll + jekyll-sass-converter! BUNDLED WITH 1.17.1 From fce5d8bbc1033de0e783a5508a9f82cda6278668 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Thu, 29 Nov 2018 12:49:27 +0000 Subject: [PATCH 02/26] rsync to dev.static.coops.tech --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4a9b54..20fd812 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,10 @@ pages: script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ + - cd public + - git checkout dev + - cd .. + - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ artifacts: paths: - public From 37c2d2cfe81403977eee2fe9849156136762ce32 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Thu, 29 Nov 2018 14:47:18 +0000 Subject: [PATCH 03/26] rsync dev branch --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20fd812..223deaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,9 +29,8 @@ pages: script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ - - cd public - - git checkout dev - - cd .. + - cd public ; git checkout dev ; cd - + - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ artifacts: paths: From e57af06c9cc3e7b0a4fd8cd4efda8f6e497ece4e Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 29 Nov 2018 15:27:38 +0000 Subject: [PATCH 04/26] Update outlandish.md to correct github link and Twitter handle --- _coops/outlandish.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_coops/outlandish.md b/_coops/outlandish.md index cbc0121..815b604 100644 --- a/_coops/outlandish.md +++ b/_coops/outlandish.md @@ -3,8 +3,8 @@ title: Outlandish name: Outlandish website: http://www.outlandish.com email: hello@outlandish.com -twitter: outlandishideas -github: hello%40outlandish.html +twitter: outlandish +github: outlandishideas telephone: +44 (0) 207 561 9968 address: 3rd Floor,149 Fonthill Road,Finsbury Park,London,United Kingdom,N4 3HF latitude: 51.56372160000001 From 5dc7ba9dc7eab05f47ee918240a593ceca13071d Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 29 Nov 2018 15:49:18 +0000 Subject: [PATCH 05/26] Update head to add meta description (as well as og:description) --- _includes/head.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/head.html b/_includes/head.html index 96b75ff..ad73ce5 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,5 +1,6 @@ + {{ page.title }} « Cooperative Technologists From 81dfff64a1275fe31c6754f3b34f35cbb7d931ba Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 29 Nov 2018 15:59:06 +0000 Subject: [PATCH 06/26] Greenpeace client image --- images/clients/greenpeace.png | Bin 0 -> 25430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/clients/greenpeace.png diff --git a/images/clients/greenpeace.png b/images/clients/greenpeace.png new file mode 100644 index 0000000000000000000000000000000000000000..f6ac4943b4362719018e590c8b7ba1b4cb7ee73e GIT binary patch literal 25430 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

{}4-AWGOd5M22wi#4eQVqnM@>Jh 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 literal 0 HcmV?d00001 From e4976435e88b21e3fa2ae3a59968e31ee73d5cd0 Mon Sep 17 00:00:00 2001 From: Richard Date: Thu, 29 Nov 2018 16:00:41 +0000 Subject: [PATCH 07/26] Add Greenpeace client --- _coops/outlandish.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_coops/outlandish.md b/_coops/outlandish.md index 815b604..9611956 100644 --- a/_coops/outlandish.md +++ b/_coops/outlandish.md @@ -19,6 +19,7 @@ clients: - european-union - gender-action-for-peace-and-security - goethe-institut +- greenpeace - hachette-uk - hotwire-pr - indie-training-fund From 5961a015a3c3828d8ef586012b0642c47cda4359 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 16:06:05 +0000 Subject: [PATCH 08/26] Update info for Agile Collective Can someone from Agile collective review? --- _coops/agile-collective.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_coops/agile-collective.md b/_coops/agile-collective.md index d39eba0..26fa4bc 100644 --- a/_coops/agile-collective.md +++ b/_coops/agile-collective.md @@ -4,7 +4,7 @@ name: Agile Collective website: http://agile.coop/ email: info@agile.coop twitter: AgileCollective -github: +github: agilecollective telephone: 01865 403 120 address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE latitude: 51.7483161 @@ -55,4 +55,4 @@ technologies: Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team – including our client. As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the ‘Code Club’ on a Wednesday afternoon which is aimed at inspiring young people to get into coding. -There is also a company-wide obsession with cycling of various kinds. \ No newline at end of file +There is also a company-wide obsession with cycling of various kinds. From af190451463daea87bba09ccd4a5c25ab22f92c2 Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Thu, 29 Nov 2018 16:07:23 +0000 Subject: [PATCH 09/26] Fixup CI master/dev need to have seperate bundle install/deploys --- .gitlab-ci.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 223deaf..42ca27a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,16 +24,25 @@ test: except: - master -pages: +deploy:production: stage: deploy script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/ - - cd public ; git checkout dev ; cd - + artifacts: + paths: + - public + only: + - master + + +deploy:dev: + stage: deploy + script: - bundle exec jekyll build -d public - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/ artifacts: paths: - public only: - - master + - dev \ No newline at end of file From cb6c07905ee39b5ccb14066f20b7d6e62e53dd23 Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Thu, 29 Nov 2018 16:20:30 +0000 Subject: [PATCH 10/26] Remove use of site.github.url We don't need to include the whole url in each page if we're being served from the root of a domain. --- _includes/footer.html | 8 ++++---- _includes/head.html | 16 ++++++++-------- _includes/header.html | 6 +++--- _includes/javascripts.html | 2 +- _layouts/coop.html | 8 ++++---- _layouts/home.html | 4 ++-- _layouts/service.html | 4 ++-- _layouts/technology.html | 4 ++-- about.md | 6 +++--- index.html | 16 ++++++++-------- join.md | 4 ++-- manifesto.md | 4 ++-- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 0ba262a..855f2d1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,9 +5,9 @@

@@ -18,7 +18,7 @@
- +

Site developed by Glowbox Design & Outlandish.

Source code available on git.coop.

Hosted by Webarchitects for CoTech ©2018

diff --git a/_includes/head.html b/_includes/head.html index 96b75ff..d229db4 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -12,12 +12,12 @@ - - - - - - + + + + + + - - + + diff --git a/_includes/header.html b/_includes/header.html index 198e60d..6b96688 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -3,11 +3,11 @@
- - ← Go Back + ← Go Back
diff --git a/_includes/javascripts.html b/_includes/javascripts.html index 340fac3..743de34 100644 --- a/_includes/javascripts.html +++ b/_includes/javascripts.html @@ -1 +1 @@ - + diff --git a/_layouts/coop.html b/_layouts/coop.html index e3d185d..cebdf93 100644 --- a/_layouts/coop.html +++ b/_layouts/coop.html @@ -16,7 +16,7 @@
- +

{{ page.name }}

{{ page.website }} @@ -86,7 +86,7 @@ {% assign s = site.services | where: "slug", service | first %}
-
+
{{ s.name }}
@@ -104,7 +104,7 @@ {% assign t = site.technologies | where: "slug", technology | first %}
-
+
{{ t.name }}
@@ -121,7 +121,7 @@ {% for client in page.clients %} {% assign c = site.clients | where: "slug", client | first %}
-
+
{{ c.title }}
{% endfor %} diff --git a/_layouts/home.html b/_layouts/home.html index 739f709..f4a4b21 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -11,8 +11,8 @@
- diff --git a/_layouts/service.html b/_layouts/service.html index aa122ee..dc4206e 100644 --- a/_layouts/service.html +++ b/_layouts/service.html @@ -15,7 +15,7 @@
- +

Coops that offer {{ page.name }}

@@ -40,7 +40,7 @@ {% if coop.services contains page.slug %}
- +
{% endif %} diff --git a/_layouts/technology.html b/_layouts/technology.html index 25a176f..680f991 100644 --- a/_layouts/technology.html +++ b/_layouts/technology.html @@ -15,7 +15,7 @@
- +

Coops that use {{ page.name }}

@@ -40,7 +40,7 @@ {% if coop.technologies contains page.slug %}
- +
{% endif %} diff --git a/about.md b/about.md index bdae04c..61895b4 100644 --- a/about.md +++ b/about.md @@ -22,6 +22,6 @@ Read [our manifesto][manifesto], [contact us if you want to work with us][contac [wiki]: https://wiki.coops.tech/ [mailing-list]: https://www.email-lists.org/mailman/listinfo/tech-coops [wortley-hall]: https://www.wortleyhall.org.uk/ -[manifesto]: {{ site.github.url }}/manifesto -[contact]: {{ site.github.url }}/#contact -[join]: {{ site.github.url }}/join +[manifesto]: /manifesto +[contact]: /#contact +[join]: /join diff --git a/index.html b/index.html index 3dc19f7..d8b9a00 100644 --- a/index.html +++ b/index.html @@ -8,22 +8,22 @@ layout: home
- +
Co-ops
{{ site.coops.size }}
- +
Staff
159+
- +
Revenue
£5.7m
- +
Clients
{{ site.clients.size }}+
@@ -55,7 +55,7 @@ layout: home {% for coop in site.coops %}
-
+
{% endfor %} @@ -101,7 +101,7 @@ layout: home
{% for client in site.clients %}
-
+
{% endfor %}
@@ -120,7 +120,7 @@ layout: home {% for service in site.services %}
-
+
{{ service.name }}
@@ -140,7 +140,7 @@ layout: home {% for technology in site.technologies %}
-
+
{{ technology.name }}
diff --git a/join.md b/join.md index e81416b..c7736de 100644 --- a/join.md +++ b/join.md @@ -45,5 +45,5 @@ We're still working our exactly what this entails but in essence you will provid If you'd like to find out more and help shape this official supporter role then please get in touch. You can also read more about us and check out our manifesto. You can also read more [about us][about] and check out our [manifesto][]. -[about]: {{ site.github.url }}/about -[manifesto]: {{ site.github.url }}/manifesto +[about]: /about +[manifesto]: /manifesto diff --git a/manifesto.md b/manifesto.md index 2309e13..d3d9595 100644 --- a/manifesto.md +++ b/manifesto.md @@ -16,5 +16,5 @@ We call upon consumers of digital products -- including trades unions, charities We hereby give notice to technology companies that do not treat their employees fairly, do not give their workers control of their businesses and do not seek to create a fairer world that your days are numbered. We are more creative, more committed and more resilient. [Join us][join]. -[Co-operative Technologists]: {{ site.github.url }}/about -[join]: {{ site.github.url }}/join +[Co-operative Technologists]: /about +[join]: /join From 92bee8a897c701509c4302aa9b146928c9418251 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 16:24:15 +0000 Subject: [PATCH 11/26] Revert "Update info for Agile Collective" This reverts commit 5961a015a3c3828d8ef586012b0642c47cda4359. --- _coops/agile-collective.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_coops/agile-collective.md b/_coops/agile-collective.md index 26fa4bc..d39eba0 100644 --- a/_coops/agile-collective.md +++ b/_coops/agile-collective.md @@ -4,7 +4,7 @@ name: Agile Collective website: http://agile.coop/ email: info@agile.coop twitter: AgileCollective -github: agilecollective +github: telephone: 01865 403 120 address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE latitude: 51.7483161 @@ -55,4 +55,4 @@ technologies: Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team – including our client. As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the ‘Code Club’ on a Wednesday afternoon which is aimed at inspiring young people to get into coding. -There is also a company-wide obsession with cycling of various kinds. +There is also a company-wide obsession with cycling of various kinds. \ No newline at end of file From b940e750efad25d118b03dc6bec31cd038f23d52 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 16:29:52 +0000 Subject: [PATCH 12/26] Update info for Agile Collective Can someone from Agile Collective review this? --- _coops/agile-collective.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_coops/agile-collective.md b/_coops/agile-collective.md index d39eba0..26fa4bc 100644 --- a/_coops/agile-collective.md +++ b/_coops/agile-collective.md @@ -4,7 +4,7 @@ name: Agile Collective website: http://agile.coop/ email: info@agile.coop twitter: AgileCollective -github: +github: agilecollective telephone: 01865 403 120 address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE latitude: 51.7483161 @@ -55,4 +55,4 @@ technologies: Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team – including our client. As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the ‘Code Club’ on a Wednesday afternoon which is aimed at inspiring young people to get into coding. -There is also a company-wide obsession with cycling of various kinds. \ No newline at end of file +There is also a company-wide obsession with cycling of various kinds. From fe6c67a3f6b8409e6a615e03ec219b38b3538110 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 16:33:32 +0000 Subject: [PATCH 13/26] Add Lat/Long for Alpha Communication Can someone from Alpha Communication review this? --- _coops/alpha-communication.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_coops/alpha-communication.md b/_coops/alpha-communication.md index 1f844ae..57d2184 100644 --- a/_coops/alpha-communication.md +++ b/_coops/alpha-communication.md @@ -7,8 +7,8 @@ twitter: alpha.coop github: AlphaCo_op telephone: +441912111938 address: 6 Charlotte Square,Newcastle upon Tyne,United Kingdom,NE1 4XF -latitude: -longitude: +latitude: 54.97101 +longitude: -1.61974 clients: services: - animation @@ -40,4 +40,4 @@ Branding, media, print and video all working together. We deliver on time and within budget. KNOWING After 30 years, we know what we’re doing. -We help you engage with the people you need to reach. \ No newline at end of file +We help you engage with the people you need to reach. From 048bda7d6e5cbf83b422ed57152090d4e345d901 Mon Sep 17 00:00:00 2001 From: Chris Lowis Date: Thu, 29 Nov 2018 16:43:35 +0000 Subject: [PATCH 14/26] Correct staff number on website This updates the number to be the same as it is today on coops.tech (the wordpress site). There's some extra work to do to make this "dynamic" in https://git.coop/cotech/website/issues/73. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3dc19f7..7d93d03 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@ layout: home
Staff
-
159+
+
253+
From a90d11bafcca7af14f3be3a9e002eae57397ff86 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 16:53:32 +0000 Subject: [PATCH 15/26] Update Twitter for Animorph --- _coops/animorph.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_coops/animorph.md b/_coops/animorph.md index 6e9eef4..c5b7191 100644 --- a/_coops/animorph.md +++ b/_coops/animorph.md @@ -3,9 +3,9 @@ title: Animorph name: Animorph website: https://animorph.coop email: we@animorph.coop -twitter: -github: -telephone: +twitter: animorphcoop +github: +telephone: address: Space4, 149 Fonthill Road,London,N4 3HF latitude: 51.5635499 longitude: -0.10782689999996364 @@ -36,4 +36,4 @@ We are an immersive media workers’ co-operative specialising in virtual, augme Our projects range from 3D interface integration, art and research, through simulations, education and app optimisation, to strictly practical applications. We collaboratively conceive and develop applications that provide quality matching the capacity of the new media realm. We look forward to engaging in cutting-edge endeavours that build bridges across disciplines and environments in order to bring people together. -Let’s forge alliances for the future we want to live in. \ No newline at end of file +Let’s forge alliances for the future we want to live in. From 3d51cc11873ca2507f0ed0e84581503c79d9c864 Mon Sep 17 00:00:00 2001 From: Chris Lowis Date: Thu, 29 Nov 2018 16:56:35 +0000 Subject: [PATCH 16/26] Update revenue figure on homepage This updates the number to be the same as it currently is on coops.tech. There's a separate issue (https://git.coop/cotech/website/issues/29) to populate this from the YAML front matter in each file under `_coops`. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 42d8af6..f37ba1f 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@ layout: home
Revenue
-
£5.7m
+
£10.3m
From 67218efa00fccff28ab0a78b7d39e5643fc3c4b5 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 16:58:45 +0000 Subject: [PATCH 17/26] Update Aptivate GitHub I work for Aptivate and I'm OK with this! --- _coops/aptivate.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_coops/aptivate.md b/_coops/aptivate.md index 0c91acd..3b4415d 100644 --- a/_coops/aptivate.md +++ b/_coops/aptivate.md @@ -4,7 +4,7 @@ name: Aptivate website: http://aptivate.org/ email: outreach@aptivate.org twitter: aptivateuk -github: +github: aptivate telephone: +44 (0)1223 967838 address: 25 Signet Court, Swann's Road, Cambridge,United Kingdom,CB5 8LA latitude: 52.21427610000001 @@ -34,4 +34,4 @@ technologies: --- Aptivate is a UK based NGO that provides IT services for international development. We believe in the power of knowledge and communication to alleviate poverty, suffering and conflict, and in the right of every individual to inform and be informed. We are dedicated to developing ICT services that facilitate communication for unconnected communities, empowering ordinary people across the developing world to improve their lives. -Please see http://aptivate.org/en/about/ for more information. \ No newline at end of file +Please see http://aptivate.org/en/about/ for more information. From c13211ff9e61ffb5929e5df94b60273faab9643c Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Thu, 29 Nov 2018 17:00:24 +0000 Subject: [PATCH 18/26] Specify deployment information for GitLab --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42ca27a..c28ea9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,9 @@ deploy:production: artifacts: paths: - public + environment: + name: production + url: https://static.coops.tech only: - master @@ -44,5 +47,8 @@ deploy:dev: artifacts: paths: - public + environment: + name: dev + url: https://dev.static.coops.tech only: - dev \ No newline at end of file From 3d61128040739f556056bc8de1079ed08459a84e Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 17:07:08 +0000 Subject: [PATCH 19/26] Fix Autonomic Twitter link --- _coops/autonomic.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_coops/autonomic.md b/_coops/autonomic.md index 875f3b8..057c9f8 100644 --- a/_coops/autonomic.md +++ b/_coops/autonomic.md @@ -3,9 +3,9 @@ title: Autonomic name: Autonomic website: https://autonomic.zone/ email: autonomic-coop@posteo.net -twitter: autonomic-coop%40posteo.html -github: -telephone: +twitter: autonomiccoop +github: +telephone: address: 1539 Pershore Road,Stirchley,Birmingham,United Kingdom,B30 2JH latitude: 51.563904 longitude: -0.10793179999996028 @@ -58,4 +58,4 @@ Sustainability Transparency Privacy -We design integrated infrastructure tailored to your needs utilising technologies from the best free and open source software projects available. Your data under your control. \ No newline at end of file +We design integrated infrastructure tailored to your needs utilising technologies from the best free and open source software projects available. Your data under your control. From cc420d5b4229e69398ffdad0e5c75fc383fb5d41 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 17:18:38 +0000 Subject: [PATCH 20/26] Add Twitter for Cetis LLP It's on their website so presumably OK --- _coops/cetis-llp.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_coops/cetis-llp.md b/_coops/cetis-llp.md index 4a87b59..0356cd1 100644 --- a/_coops/cetis-llp.md +++ b/_coops/cetis-llp.md @@ -3,8 +3,8 @@ title: Cetis LLP name: Cetis LLP website: http://www.cetis.org.uk/ email: info@cetis.org.uk -twitter: -github: +twitter: cetisllp +github: telephone: 07366025747 address: Halton Mill,Mill Lane,Halton,Lancaster,England,LA2 6ND latitude: 54.075809445607604 @@ -23,4 +23,4 @@ technologies: --- Cetis is a cooperative Limited Liability Partnership and an independent Strategic IT consultancy, specialising in learning, education and training. -We offer impartial strategic and technical advice and guidance in educational technology and process innovation, and we provide discovery services, technology solutions and training services. Our Partners and Associates are globally recognised as leading experts on educational technology innovation, interoperability and technology standards. Cetis LLP was established in 2015 by members of the Jisc Innovation Centres Cetis and OSS Watch. As the Centre for Educational Technology, Interoperability and Standards, Cetis has provided, for nearly two decades, impartial, strategic, technical and pedagogical advice on educational technology innovation, collaboration and standards to funding bodies, standards agencies, government, international organisations, institutions and commercial partners. \ No newline at end of file +We offer impartial strategic and technical advice and guidance in educational technology and process innovation, and we provide discovery services, technology solutions and training services. Our Partners and Associates are globally recognised as leading experts on educational technology innovation, interoperability and technology standards. Cetis LLP was established in 2015 by members of the Jisc Innovation Centres Cetis and OSS Watch. As the Centre for Educational Technology, Interoperability and Standards, Cetis has provided, for nearly two decades, impartial, strategic, technical and pedagogical advice on educational technology innovation, collaboration and standards to funding bodies, standards agencies, government, international organisations, institutions and commercial partners. From 6d12b8767538539e937671143b9389c22a3819f6 Mon Sep 17 00:00:00 2001 From: Chris Lowis Date: Thu, 29 Nov 2018 17:22:09 +0000 Subject: [PATCH 21/26] Show 6 random clients on homepage Showing all of the client logos adds a considerable amount to the page weight of the page. This change shows 6 random clients. It will be re-generated each time the page is deployed, which might be OK for now, although we could add timed pipeline to keep this fresh/fair. --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 42d8af6..8801be1 100644 --- a/index.html +++ b/index.html @@ -99,7 +99,8 @@ layout: home

Clients

Here are some of the amazing clients we have worked with so far

- {% for client in site.clients %} + {% assign clients = site.clients | sample:6 %} + {% for client in clients %}
From fa6f0a338b11948e7424e108478e48272949694a Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 17:22:56 +0000 Subject: [PATCH 22/26] Add Twitter for Chapel St Studio It's on their website so probably OK --- _coops/chapel-street-studio.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_coops/chapel-street-studio.md b/_coops/chapel-street-studio.md index 49496e5..9df152a 100644 --- a/_coops/chapel-street-studio.md +++ b/_coops/chapel-street-studio.md @@ -3,8 +3,8 @@ title: Chapel Street Studio name: Chapel Street Studio website: http://chapelstreetstudio.coop/ email: info@chapelstreetstudio.coop -twitter: -github: +twitter: chapelststudio +github: telephone: 07743 426 846 (Martyn Johnston | Secretary) address: Chapel Street Studio,Assembly Bradford, Market Pavilion, Rawson Place,Bradford,West Yorkshire,BD1 3QQ latitude: 53.795903 @@ -37,4 +37,4 @@ Motion graphics Photography Print finishing Printing -Web design \ No newline at end of file +Web design From 191cd556333f51c83c35b7da08f9b82b34a49b43 Mon Sep 17 00:00:00 2001 From: Martin Burchell Date: Thu, 29 Nov 2018 17:29:24 +0000 Subject: [PATCH 23/26] Add email address and change phone number to match that on website --- _coops/creative-coop.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_coops/creative-coop.md b/_coops/creative-coop.md index 054ae28..27d78d3 100644 --- a/_coops/creative-coop.md +++ b/_coops/creative-coop.md @@ -2,10 +2,10 @@ title: Creative Coop name: Creative Coop website: https://creative.coop -email: -twitter: -github: -telephone: 01274574147 +email: hello@creative.coop +twitter: +github: +telephone: 01206 574147 address: 2 Balkerne House, Balkerne Passage,Colchester,United Kingdom,CO1 1PA latitude: 51.89010188809361 longitude: 0.8957915683888586 @@ -54,4 +54,4 @@ technologies: We are a design studio specialising in Branding, Design and Web Development. Creative Coop started life as a small group of freelancers who wanted to pool resources, collaborate together on web projects, and, ultimately, work towards a vision of a more sharing society. Our headquarters are in Colchester, Essex. We chose to become a co-operative because we wanted to foster values of co-operation rather than competition between our members. We believe in the co-op vision of a fairer society run for mutual benefit rather than shareholder profit. We specialise in working with social enterprises, community projects and organisations, charities and the public sector. -We believe that co-operatives provide better products and services to clients. When we’re happy, and believe in what we’re doing, and when every member has a stake in the success of the company, we think that makes for happier clients too. \ No newline at end of file +We believe that co-operatives provide better products and services to clients. When we’re happy, and believe in what we’re doing, and when every member has a stake in the success of the company, we think that makes for happier clients too. From 4f90793c73090b0c9b6f034475b03f1be5e6d36c Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Thu, 29 Nov 2018 17:35:40 +0000 Subject: [PATCH 24/26] Cache rubygems Save a bit of co2. --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c28ea9e..4c6e3fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,11 @@ variables: JEKYLL_ENV: production LC_ALL: C.UTF-8 +cache: + key: gems + paths: + - /usr/local/bundle/cache/ + before_script: - 'which rsync || ( apt-get update -qq && apt-get install rsync -yqq )' - eval $(ssh-agent -s) From 72f4216aac50131320c5026843066742cdadce29 Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Thu, 29 Nov 2018 17:52:25 +0000 Subject: [PATCH 25/26] Also cache built gems --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c6e3fe..5224985 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ cache: key: gems paths: - /usr/local/bundle/cache/ + - /usr/local/bundle/gems/ before_script: - 'which rsync || ( apt-get update -qq && apt-get install rsync -yqq )' From 7101fedabe3218352cc2e867ae3d9311ec9caa29 Mon Sep 17 00:00:00 2001 From: Nick Sellen Date: Thu, 29 Nov 2018 18:23:36 +0000 Subject: [PATCH 26/26] Cache all of /usr/local/bundle/ ... it doesn't seem to be caching properly but perhaps that's because it's not setup in the runner properly yet... --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5224985..0888f71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,7 @@ variables: cache: key: gems paths: - - /usr/local/bundle/cache/ - - /usr/local/bundle/gems/ + - /usr/local/bundle/ before_script: - 'which rsync || ( apt-get update -qq && apt-get install rsync -yqq )'