femmefaytale/cotech-website
0
0
Fork 0
forked from autonomic-cooperative/cotech-website
Code Issues Pull Requests Projects Releases Wiki Activity
214 Commits 19 Branches 0 Tags 35 MiB
f8e0ce8786
Commit Graph

40 Commits

Author SHA1 Message Date
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
34fbb2f4e8 #2 Fixed markdown for coop pages 2018-11-30 11:34:46 +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
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
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
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
Martin Burchell
67218efa00 Update Aptivate GitHub 
I work for Aptivate and I'm OK with this!
 2018-11-29 16:58:45 +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
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
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
Martin Burchell
92bee8a897 Revert "Update info for Agile Collective" 
This reverts commit 5961a015a3.
 2018-11-29 16:24:15 +00:00
Martin Burchell
a2394a42d7 Merge branch 'dev' of git.coop:cotech/website into dev 2018-11-29 16:06:17 +00:00
Martin Burchell
5961a015a3 Update info for Agile Collective 
Can someone from Agile collective review?
 2018-11-29 16:06:05 +00:00
Richard
e4976435e8 Add Greenpeace client 2018-11-29 16:00:41 +00:00
Richard
e57af06c9c Update outlandish.md to correct github link and Twitter handle 2018-11-29 15:27:38 +00:00
Chris Croome
6b1d1c024f Webarchitects Twitter username corrected 2018-11-29 12:26:33 +00:00
Chris Lowis
d7965c9a79 Fix twitter link and quote : in dev-the-developers-society.md 2018-11-10 21:21:18 +00:00
Chris Lowis
622dac7193 Fix twitter link in cbn.md 2018-11-10 21:20:59 +00:00
Chris Lowis
54a2d68952 Migrate co-op pages from old site 
I ran `ruby migrate_coop_pages.rb` in `scripts`. There will need to be
some manual tidying up of the generated `.md` files under `_coops` but
I think this is a good start. As a one-off it doesn't warrant the time
it would take to improve the migration script.
 2018-11-10 21:16:42 +00:00
gfr-cloudcannon
198d5625e8 Updated Agile Collective 2017-07-05 20:57:54 +01:00
accounts+gfr-siteleaf@gofreerange.com
d38667768c Updated Go Free Range 2017-07-05 20:43:23 +01:00
accounts+gfr-siteleaf@gofreerange.com
af5e7f3ee2 Updated Go Free Range 2017-07-05 20:42:46 +01:00
Siteleaf
71be497ac6 Updated Config and 19 other files 2017-07-05 20:36:03 +01:00
GFR CloudCannon
066a6c2e30 Updated '_coops/agile-collective.md' via CloudCannon 2017-07-04 19:18:32 +00:00
M4TEU5
57244c600a Update outlandish.md 2017-07-04 14:03:46 +01:00
James Mead
44d6fe6ecd Enable map for home page 2017-07-01 20:03:52 +01:00
James Mead
0629ebb839 Add contact section to coop layout 2017-07-01 16:10:47 +01:00
James Mead
4d605b5e86 Add technlogies to home page 2017-07-01 14:54:54 +01:00
James Mead
876bcee6ea Add clients to home page 2017-07-01 14:38:04 +01:00
Chris Roos
c1d855e777 Add services 2017-06-27 16:08:54 +01:00
Chris Roos
5fc3481c0f Add info about coops 2017-06-27 15:13:48 +01:00
Chris Roos
549156c82b Use a collection for coops instead of data file 2017-06-27 14:58:29 +01:00