FVDE/ennstatus Changeset - 15a0838ef8e4 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 15a0838ef8e4

Parent rev.

Child rev.

[Not reviewed]

Merge v5.7.1 default

6 30 4

Dennis Fink - 7 years ago 2017-12-11 23:38:16
dennis.fink@c3l.lu

Merged dev

12 files changed:

ennstatus/static/images/btc.png

bin+new file

ennstatus/static/images/eth.png

bin+new file

ennstatus/static/images/partners/Logo-Piratepartei2014.png

bin+mod

ennstatus/static/images/partners/flokinet.png

bin+mod

ennstatus/static/images/partners/logo-c3l.png

bin+mod

ennstatus/static/images/partners/torservers.png

bin+mod

ennstatus/static/js/d3/.bower.json

ennstatus/static/js/d3/.gitattributes

ennstatus/static/js/d3/CONTRIBUTING.md

ennstatus/static/js/d3/LICENSE

ennstatus/static/js/d3/README.md

ennstatus/static/js/d3/bower.json

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

ennstatus/static/images/btc.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/static/images/eth.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

ennstatus/static/images/partners/Logo-Piratepartei2014.png

➞

Show inline comments

binary diff not shown

Show images

ennstatus/static/images/partners/flokinet.png

➞

Show inline comments

binary diff not shown

Show images

ennstatus/static/images/partners/logo-c3l.png

➞

Show inline comments

binary diff not shown

Show images

ennstatus/static/images/partners/torservers.png

➞

Show inline comments

binary diff not shown

Show images

ennstatus/static/js/d3/.bower.json

➞

Show inline comments

+{
   "name": "d3",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "main": "d3.js",
   "scripts": [
     "d3.js"
   ],
   "ignore": [
     ".DS_Store",
     ".git",
     ".gitignore",
     ".npmignore",
     ".spmignore",
     ".travis.yml",
     "Makefile",
     "bin",
     "component.json",
     "composer.json",
     "index.js",
     "lib",
     "node_modules",
     "package.json",
     "src",
     "test"
   ],
   "homepage": "https://github.com/mbostock/d3",
   "version": "3.5.6",
   "_release": "3.5.6",
   "license": "BSD-3-Clause",
   "ignore": [],
   "homepage": "https://github.com/mbostock-bower/d3-bower",
   "version": "3.5.17",
   "_release": "3.5.17",
   "_resolution": {
     "type": "version",
     "tag": "v3.5.6",
     "commit": "0e88ef5aacbc565b7282790c829ea51dd86c978d"
     "tag": "v3.5.17",
     "commit": "abe0262a205c9f3755c3a757de4dfd1d49f34b24"
   },
-  "_source": "git://github.com/mbostock/d3.git",
+  "_source": "https://github.com/mbostock-bower/d3-bower.git",
   "_target": "~3.5.6",
   "_originalSource": "d3",
   "_direct": true
   "_originalSource": "d3"
+}
@@ \ No newline at end of file @@

ennstatus/static/js/d3/.gitattributes

➞

Show inline comments

deleted file

ennstatus/static/js/d3/CONTRIBUTING.md

➞

Show inline comments

deleted file

ennstatus/static/js/d3/LICENSE

➞

Show inline comments

-Copyright (c) 2010-2015, Michael Bostock
+Copyright (c) 2010-2016, Michael Bostock
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.

ennstatus/static/js/d3/README.md

➞

Show inline comments

 # Data-Driven Documents
-<a href="http://d3js.org"><img src="http://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>
+<a href="https://d3js.org"><img src="https://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>
 **D3.js** is a JavaScript library for manipulating documents based on data. **D3** helps you bring data to life using HTML, SVG, and CSS. **D3** emphasizes web standards and combines powerful visualization components with a data-driven approach to DOM manipulation, giving you the full capabilities of modern browsers without tying yourself to a proprietary framework.
 Want to learn more? [See the wiki.](https://github.com/mbostock/d3/wiki)
 For examples, [see the gallery](https://github.com/mbostock/d3/wiki/Gallery) and [mbostock’s bl.ocks](http://bl.ocks.org/mbostock).
 ## Good News, Everyone!
 The next major release of D3, 4.0, is coming! See the [4.0 development branch](https://github.com/mbostock/d3/tree/4) and read the [new API reference](https://github.com/mbostock/d3/blob/4/README.md) to get ready.

ennstatus/static/js/d3/bower.json

➞

Show inline comments

+{
   "name": "d3",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "main": "d3.js",
   "scripts": [
     "d3.js"
   ],
   "ignore": [
     ".DS_Store",
     ".git",
     ".gitignore",
     ".npmignore",
     ".spmignore",
     ".travis.yml",
     "Makefile",
     "bin",
     "component.json",
     "composer.json",
     "index.js",
     "lib",
     "node_modules",
     "package.json",
     "src",
     "test"
+  ]
   "license": "BSD-3-Clause",
   "ignore": []
+}

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)