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
7ee0f5bf24
Added hello world test
2018-11-18 15:17:01 +00:00
e733ed08e8
Install rsync on CI
2018-11-13 21:55:17 +00:00
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
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
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
e8ff6e7499
Fix invalid YAML in _clients/now-pensions.md
2018-11-11 21:15:46 +00:00
e2923ac8e0
Convert all client images to png
2018-11-11 21:14:42 +00:00
3c1edd2c19
Migrate existing clients to jekyll site
...
I ran `migrate_clients.rb`.
2018-11-11 21:12:34 +00:00
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
b41eb0f80e
Add rubygems source to scripts Gemfile
2018-11-11 21:11:00 +00:00
48d40e6ad1
Fix ruby version to 2.5.3
...
This is the latest stable version of ruby.
2018-11-10 22:51:01 +00:00
d7c5ca4cad
Add a .gitlab-ci.yml
...
Following the instructions[1] for building a jekyll site in gitlab,
I've added this file. Let's see if it works!
[1] https://gitlab.com/pages/jekyll
2018-11-10 22:26:23 +00:00
af3b0da124
Remove deprecation warning
2018-11-10 22:18:40 +00:00
d2fc574445
Convert all service logos to png
...
Some of the service logos were in jpg or gif format. For
consistency, and to make page generation simpler, this commit converts
them to png format.
2018-11-10 22:09:38 +00:00
8284159c04
Migrate services from old site
...
Ran the `migrate_services` script.
2018-11-10 22:08:20 +00:00
0e6c62df0d
Add script to migrate services from old site
...
This script copies the service logos, normalises the file names and
creates a corresponding entry in `_services`.
2018-11-10 22:07:32 +00:00
71afa7f0e5
Convert all technology logos to png
...
Some of the technology logos were in jpg or gif format. For
consistency, and to make page generation simpler, this commit converts
them to png format.
2018-11-10 21:59:37 +00:00
d9989ec794
Migrate technologies from old site
...
Ran the `migrate_technologies` script.
2018-11-10 21:53:06 +00:00
db17505a9b
Add script to migrate technologies from old site
...
This script copies the technology logos, normalises the file names and
creates a corresponding entry in `_technologies`.
2018-11-10 21:52:17 +00:00
396589820a
Fix members grid on homepage
...
We needed to add a "column" div for each thumbnail.
2018-11-10 21:23:50 +00:00
d7965c9a79
Fix twitter link and quote : in dev-the-developers-society.md
2018-11-10 21:21:18 +00:00
622dac7193
Fix twitter link in cbn.md
2018-11-10 21:20:59 +00:00
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
a08b88f85a
Convert co-op images to png format
...
It makes it easier to generate the templates if we have a consistent
file format for images. I've chosen png as most of the other co-op
logos are in png.
2018-11-10 21:10:34 +00:00
09d4895994
Exclude scripts directory when building site
2018-11-10 21:10:18 +00:00
11b3f3bdb3
Add missing co-op logos
...
I ran `scripts/migrate_coop_logos.rb` to migrate the logos from the
static mirror to jekyll. The script renamed the files in a consistent
way.
2018-11-09 21:51:28 +00:00
Richard
Chris Lowis
Nick Sellen
Nick Sellen
Chris Croome
James Mead
Chris Lowis