Nick Sellen
d6d1723880
Reorder gitlab ci sections
2018-11-30 16:12:38 +00:00
Nick Sellen
fd79fbb35b
Only deploy from master, use when:manual for prod
2018-11-30 16:11:05 +00:00
Stephen Cox
690e65616d
Merge branch 'dev' into 45-update-text-on-home-page
2018-11-30 16:01:50 +00:00
Stephen Cox
f8e0ce8786
45 Updated text on the home page
2018-11-30 15:59:59 +00:00
Chris Lowis
2953c7fa30
Add co-operative web member count
...
I asked them how many members they have.
2018-11-30 15:05:46 +00:00
Chris Lowis
e8748d9e30
Add a sum of all members to the homepage
...
This replaces the hard-corded number we were using previously.
2018-11-30 13:02:21 +00:00
Chris Lowis
6ba79a775d
Add a members field to each file under _coops
...
I've populated the data, where available, from the field "Number of
current members The number of full members (owners) in the co-op." in
the wordpress admin.
2018-11-30 12:56:40 +00:00
Stephen Cox
e1154d2f87
Merge branch '24-fix-display-issue-on-technology-pages' of git.coop:cotech/website into 24-fix-display-issue-on-technology-pages
2018-11-30 12:17:47 +00:00
Stephen Cox
2fc5d7226b
#24 Fixed display of coop logos on technology pages
2018-11-30 12:17:10 +00:00
Nick Sellen
d5a725eabd
Include git checkout dev in the readme
2018-11-30 11:56:42 +00:00
Nick Sellen
d9e3246c27
Put it in a docker
2018-11-30 11:56:42 +00:00
Stephen Cox
ef6e94d08a
Removing merge conflict text
2018-11-30 11:47:58 +00:00
Stephen Cox
e575823428
Merged dev
2018-11-30 11:43:15 +00:00
Stephen Cox
d72317f436
Updated DOT Project logo
2018-11-30 11:36:29 +00:00
Stephen Cox
6749541cf5
#2 Hide coop services, technology and client listings when the coop hasn't included them in maekdown file
2018-11-30 11:35:54 +00:00
Stephen Cox
34fbb2f4e8
#2 Fixed markdown for coop pages
2018-11-30 11:34:46 +00:00
Nick Sellen
7101fedabe
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...
2018-11-29 18:23:36 +00:00
Nick Sellen
bf9a17a97a
Merge branch 'show-random-clients-on-homepage' into 'dev'
...
Show 6 random clients on homepage
See merge request cotech/website!17
2018-11-29 18:12:21 +00:00
Nick Sellen
9bd5d6ef8e
Merge branch 'update-aptivate-github' into 'dev'
...
Update Aptivate GitHub
See merge request cotech/website!13
2018-11-29 18:11:01 +00:00
Nick Sellen
776fe88458
Merge branch 'update-animorph-details' into 'dev'
...
Update Twitter for Animorph
See merge request cotech/website!11
2018-11-29 18:10:00 +00:00
Nick Sellen
11f9bc7502
Merge branch 'update-revenue-figure' into 'dev'
...
Update revenue figure on homepage
See merge request cotech/website!12
2018-11-29 18:09:53 +00:00
Nick Sellen
e3104df10c
Merge branch 'fix-autonomic-twitter' into 'dev'
...
Fix Autonomic Twitter link
See merge request cotech/website!14
2018-11-29 18:09:41 +00:00
Nick Sellen
14a86fdcae
Merge branch 'add-cetis-llp-twitter' into 'dev'
...
Add Twitter for Cetis LLP
See merge request cotech/website!16
2018-11-29 18:09:34 +00:00
Nick Sellen
20cd703675
Merge branch 'add-chapel-st-studio-twitter' into 'dev'
...
Add Twitter for Chapel St Studio
See merge request cotech/website!18
2018-11-29 18:09:21 +00:00
Nick Sellen
a9d8315923
Merge branch 'update-creative-coop-details' into 'dev'
...
Add email address and change phone number to match that on website
See merge request cotech/website!19
2018-11-29 18:09:12 +00:00
Nick Sellen
5ee0cdefe6
Merge branch 'also-cache-built-gems' into 'dev'
...
Also cache built gems
See merge request cotech/website!21
2018-11-29 17:57:58 +00:00
Nick Sellen
72f4216aac
Also cache built gems
2018-11-29 17:52:25 +00:00
Nick Sellen
95856d5fe8
Merge branch 'add-ci-cache' into 'dev'
...
Cache rubygems
See merge request cotech/website!20
2018-11-29 17:41:21 +00:00
Nick Sellen
4f90793c73
Cache rubygems
...
Save a bit of co2.
2018-11-29 17:35:40 +00:00
Martin Burchell
191cd55633
Add email address and change phone number to match that on website
2018-11-29 17:29:24 +00:00
Martin Burchell
fa6f0a338b
Add Twitter for Chapel St Studio
...
It's on their website so probably OK
2018-11-29 17:22:56 +00:00
Chris Lowis
6d12b87675
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.
2018-11-29 17:22:09 +00:00
Nick Sellen
3b72b647e0
Merge branch 'use-gitlab-environments' into 'dev'
...
Specify deployment information for GitLab
See merge request cotech/website!15
2018-11-29 17:20:50 +00:00
Martin Burchell
cc420d5b42
Add Twitter for Cetis LLP
...
It's on their website so presumably OK
2018-11-29 17:18:38 +00:00
Martin Burchell
3d61128040
Fix Autonomic Twitter link
2018-11-29 17:07:08 +00:00
Nick Sellen
c13211ff9e
Specify deployment information for GitLab
2018-11-29 17:00:24 +00:00
Martin Burchell
67218efa00
Update Aptivate GitHub
...
I work for Aptivate and I'm OK with this!
2018-11-29 16:58:45 +00:00
Chris Lowis
3d51cc1187
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`.
2018-11-29 16:56:35 +00:00
Nick Sellen
95aec4f04c
Merge branch 'fix-outlandish' into 'dev'
...
Added meta description to head (as well as og:description)
See merge request cotech/website!4
2018-11-29 16:54:36 +00:00
Nick Sellen
1c65783fad
Merge branch 'correct-staff-number-on-homepage' into 'dev'
...
Correct staff number on website
See merge request cotech/website!10
2018-11-29 16:54:07 +00:00
Nick Sellen
2df9b2319b
Merge branch 'alpha-communication-lat-long' into 'dev'
...
Add Lat/Long for Alpha Communication
See merge request cotech/website!9
2018-11-29 16:53:54 +00:00
Martin Burchell
a90d11bafc
Update Twitter for Animorph
2018-11-29 16:53:32 +00:00
Chris Lowis
dbd6a41c02
Merge branch 'agile-collective-update' into 'dev'
...
Add GitHub for Agile Collective
See merge request cotech/website!8
2018-11-29 16:47:34 +00:00
Nick Sellen
4e7c4eac25
Merge branch 'feature/19-remove-full-domain-from-links' into 'dev'
...
Remove use of site.github.url
Closes #19
See merge request cotech/website!7
2018-11-29 16:43:48 +00:00
Chris Lowis
048bda7d6e
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 .
2018-11-29 16:43:35 +00:00
Martin Burchell
fe6c67a3f6
Add Lat/Long for Alpha Communication
...
Can someone from Alpha Communication review this?
2018-11-29 16:33:32 +00:00
Martin Burchell
b940e750ef
Update info for Agile Collective
...
Can someone from Agile Collective review this?
2018-11-29 16:30:03 +00:00
Nick Sellen
8841cd2517
Merge branch 'dev' of git.coop:cotech/website into dev
2018-11-29 16:27:30 +00:00
Martin Burchell
9de6c66eae
Merge branch 'dev' of git.coop:cotech/website into dev
2018-11-29 16:24:47 +00:00
Martin Burchell
92bee8a897
Revert "Update info for Agile Collective"
...
This reverts commit 5961a015a3
2018-11-29 16:24:15 +00:00
