4
0
mirror of https://git.coop/cotech/website.git synced 2025-06-26 16:40:52 +00:00

Compare commits

..

16 Commits

Author SHA1 Message Date
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
7 changed files with 28 additions and 5 deletions

View File

@ -29,6 +29,9 @@ pages:
script:
- bundle exec jekyll build -d public
- rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
- cd public ; git checkout dev ; cd -
- bundle exec jekyll build -d public
- rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
artifacts:
paths:
- public

View File

@ -24,7 +24,7 @@ And visit [localhost:4000](http://localhost:4000) to view the site.
## Deploy CI
When changes are committed the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to https://static.coops.tech/
When changes are committed to the `master` branch the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to https://static.coops.tech/ and when changes are committed to the `dev` branch the site at https://dev.static.coops.tech/ is updated.
## Contributing

View File

@ -3,8 +3,8 @@ title: Outlandish
name: Outlandish
website: http://www.outlandish.com
email: hello@outlandish.com
twitter: outlandishideas
github: hello%40outlandish.html
twitter: outlandish
github: outlandishideas
telephone: +44 (0) 207 561 9968
address: 3rd Floor,149 Fonthill Road,Finsbury Park,London,United Kingdom,N4 3HF
latitude: 51.56372160000001
@ -19,6 +19,7 @@ clients:
- european-union
- gender-action-for-peace-and-security
- goethe-institut
- greenpeace
- hachette-uk
- hotwire-pr
- indie-training-fund

View File

@ -3,7 +3,7 @@ title: Webarchitects Co-operative
name: Webarchitects Co-operative
website: https://www.webarchitects.coop/
email: info@webarch.net
twitter: webarch-coop
twitter: webarchcoop
github: info%40webarch.html
telephone: +44 114 276 9709
address: Webarch Co-operative Limited,Harland Works,68a John Street,Sheffield,United Kingdom,S2 4QU

View File

@ -25,4 +25,22 @@
</div>
</div>
</div>
<!-- Matomo -->
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
_paq.push(["setDomains", ["*.coops.tech","*.dev.coops.tech","*.static.coops.tech","*.www.coops.tech"]]);
_paq.push(["disableCookies"]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://stats.webarch.net/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '223']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
</footer>

View File

@ -1,5 +1,6 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
<meta charset="UTF-8">
<title>{{ page.title }} &laquo; Cooperative Technologists</title>
<meta property="og:type" content="website" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB