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
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
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
72f4216aac
Also cache built gems
2018-11-29 17:52:25 +00:00
95856d5fe8
Merge branch 'add-ci-cache' into 'dev'
...
Cache rubygems
See merge request cotech/website!20
2018-11-29 17:41:21 +00:00
4f90793c73
Cache rubygems
...
Save a bit of co2.
2018-11-29 17:35:40 +00:00
191cd55633
Add email address and change phone number to match that on website
2018-11-29 17:29:24 +00:00
fa6f0a338b
Add Twitter for Chapel St Studio
...
It's on their website so probably OK
2018-11-29 17:22:56 +00:00
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
c13211ff9e
Specify deployment information for GitLab
2018-11-29 17:00:24 +00:00
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
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
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
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
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
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
fe6c67a3f6
Add Lat/Long for Alpha Communication
...
Can someone from Alpha Communication review this?
2018-11-29 16:33:32 +00:00
b940e750ef
Update info for Agile Collective
...
Can someone from Agile Collective review this?
2018-11-29 16:30:03 +00:00
8841cd2517
Merge branch 'dev' of git.coop:cotech/website into dev
2018-11-29 16:27:30 +00:00
9de6c66eae
Merge branch 'dev' of git.coop:cotech/website into dev
2018-11-29 16:24:47 +00:00
92bee8a897
Revert "Update info for Agile Collective"
...
This reverts commit 5961a015a3
2018-11-29 16:24:15 +00:00
cb6c07905e
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.
2018-11-29 16:20:30 +00:00
d308638462
Merge branch 'fixup-ci' into 'dev'
...
Fixup CI
See merge request cotech/website!5
2018-11-29 16:13:00 +00:00
af19045146
Fixup CI
...
master/dev need to have seperate bundle install/deploys
2018-11-29 16:07:23 +00:00
a2394a42d7
Merge branch 'dev' of git.coop:cotech/website into dev
2018-11-29 16:06:17 +00:00
5961a015a3
Update info for Agile Collective
...
Can someone from Agile collective review?
2018-11-29 16:06:05 +00:00
e4976435e8
Add Greenpeace client
2018-11-29 16:00:41 +00:00
81dfff64a1
Greenpeace client image
2018-11-29 15:59:06 +00:00
5dc7ba9dc7
Update head to add meta description (as well as og:description)
2018-11-29 15:49:18 +00:00
fa60cd806f
Merge branch 'fix-outlandish' into 'dev'
...
Update outlandish.md to correct github link and Twitter handle
See merge request cotech/website!3
2018-11-29 15:39:58 +00:00
e57af06c9c
Update outlandish.md to correct github link and Twitter handle
2018-11-29 15:27:38 +00:00
3b12a56f2d
Merge branch 'master' into dev
2018-11-29 15:14:08 +00:00
aab7cf7b2f
Merge branch 'fix-sass-gem-deprecation-warning-on-bundle-install' into 'master'
...
Use branch of jekyll-sass-converter to fix deprecation warning
Closes #27
See merge request cotech/website!1
2018-11-29 15:06:02 +00:00
444c277731
README updated
2018-11-29 14:53:51 +00:00
a01c6362df
Test dev text removed
2018-11-29 14:50:26 +00:00
37c2d2cfe8
rsync dev branch
2018-11-29 14:47:18 +00:00
14c080193a
build dev branch
2018-11-29 14:43:27 +00:00
0b5a99ebfe
test to update https://dev.static.coops.tech/
2018-11-29 13:43:30 +00:00
c016347449
test to update title at https://dev.static.coops.tech/
2018-11-29 13:33:51 +00:00
fce5d8bbc1
rsync to dev.static.coops.tech
2018-11-29 12:49:27 +00:00
1461174ca1
Matomo code added #18
2018-11-29 12:42:53 +00:00
6b1d1c024f
Webarchitects Twitter username corrected
2018-11-29 12:26:33 +00:00
a696edb49c
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
2018-11-22 21:10:22 +00:00
05ecdd50bf
Remove placeholder text
2018-11-20 22:10:29 +00:00
868aa2fb01
Depend on jekyll gem instead of github-pages
...
I don't think we need everything that github-pages pulls in, and this
should speed up the build.
2018-11-20 22:09:51 +00:00
26a10700a7
Metadata added to <head> and footer updated
2018-11-18 18:43:07 +00:00
92b1459724
Add back necessary eval $(ssh-agent -s)
2018-11-18 16:07:00 +00:00
e35afc0dcd
CI tweaks to make it less verbose
2018-11-18 16:05:08 +00:00
0893e88391
Remove hello world test from .gitlab-ci.yml
2018-11-18 15:34:17 +00:00
37a971b308
README updated to trigger CI
2018-11-18 15:25:52 +00:00
