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
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
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
Nick Sellen
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
Nick Sellen
d308638462
Merge branch 'fixup-ci' into 'dev'
...
Fixup CI
See merge request cotech/website!5
2018-11-29 16:13:00 +00:00
Nick Sellen
af19045146
Fixup CI
...
master/dev need to have seperate bundle install/deploys
2018-11-29 16:07:23 +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
81dfff64a1
Greenpeace client image
2018-11-29 15:59:06 +00:00
Richard
5dc7ba9dc7
Update head to add meta description (as well as og:description)
2018-11-29 15:49:18 +00:00
Chris Lowis
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
Richard
e57af06c9c
Update outlandish.md to correct github link and Twitter handle
2018-11-29 15:27:38 +00:00
Nick Sellen
3b12a56f2d
Merge branch 'master' into dev
2018-11-29 15:14:08 +00:00
Nick Sellen
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
Chris Croome
444c277731
README updated
2018-11-29 14:53:51 +00:00
Chris Croome
a01c6362df
Test dev text removed
2018-11-29 14:50:26 +00:00
Chris Croome
37c2d2cfe8
rsync dev branch
2018-11-29 14:47:18 +00:00
Chris Croome
14c080193a
build dev branch
2018-11-29 14:43:27 +00:00
Chris Croome
0b5a99ebfe
test to update https://dev.static.coops.tech/
2018-11-29 13:43:30 +00:00
Chris Croome
c016347449
test to update title at https://dev.static.coops.tech/
2018-11-29 13:33:51 +00:00
Chris Croome
fce5d8bbc1
rsync to dev.static.coops.tech
2018-11-29 12:49:27 +00:00
Chris Croome
1461174ca1
Matomo code added #18
2018-11-29 12:42:53 +00:00
Chris Croome
6b1d1c024f
Webarchitects Twitter username corrected
2018-11-29 12:26:33 +00:00
James Mead
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
Chris Lowis
05ecdd50bf
Remove placeholder text
2018-11-20 22:10:29 +00:00
Chris Lowis
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
Chris Croome
26a10700a7
Metadata added to <head> and footer updated
2018-11-18 18:43:07 +00:00
Chris Croome
92b1459724
Add back necessary eval $(ssh-agent -s)
2018-11-18 16:07:00 +00:00
Chris Croome
e35afc0dcd
CI tweaks to make it less verbose
2018-11-18 16:05:08 +00:00
Chris Croome
0893e88391
Remove hello world test from .gitlab-ci.yml
2018-11-18 15:34:17 +00:00
Chris Croome
37a971b308
README updated to trigger CI
2018-11-18 15:25:52 +00:00
Chris Croome
7ee0f5bf24
Added hello world test
2018-11-18 15:17:01 +00:00
Chris Lowis
e733ed08e8
Install rsync on CI
2018-11-13 21:55:17 +00:00
Chris Lowis
97667077e1
Attempt to deploy site
...
@chris has setup a server[1] and added the public half of a key pair
generated using `ssh-keygen -o -t rsa -b 4096` as per the instructions
on docs.gitlab.com[2].
The `before_script` was taken from the same instructions. I set the
two variables SSH_PRIVATE_KEY and SSH_KNOWN_HOSTS in the CI/CD
settings[3].
To see if this works I'm calling `rsync` in the `script` section of
the deploy stage, using the dry-run option, `-n`.
[1] https://git.coop/cotech/website/issues/4#note_9890
[2] https://docs.gitlab.com/ee/ci/ssh_keys/#ssh-keys-when-using-the-docker-executor
[3] https://git.coop/cotech/website/settings/ci_cd
2018-11-13 20:19:19 +00:00
Chris Lowis
b8625a7e66
Update README.md
...
I've added some installation instructions and moved the improvements
that haven't been done to issues in gitlab[1].
[1] https://git.coop/cotech/website/issues
2018-11-12 21:29:02 +00:00
Chris Lowis
8ed88952dc
Fix client name under logo on co-op pages
...
The data files under _clients use 'title' instead of 'name'.
2018-11-11 21:20:38 +00:00
Chris Lowis
e8ff6e7499
Fix invalid YAML in _clients/now-pensions.md
2018-11-11 21:15:46 +00:00
Chris Lowis
e2923ac8e0
Convert all client images to png
2018-11-11 21:14:42 +00:00
Chris Lowis
3c1edd2c19
Migrate existing clients to jekyll site
...
I ran `migrate_clients.rb`.
2018-11-11 21:12:34 +00:00
Chris Lowis
146177184c
Add script to migrate clients from wordpress mirror
...
This script iterates over all of the coops to pull their clients from
the individual co-op pages, normalises the filenames of the images and
creates an entry under `_clients`.
2018-11-11 21:11:19 +00:00