Skip to content
This repository was archived by the owner on Jul 13, 2024. It is now read-only.

Commit e5f2521

Browse files
committed
Merge develop into master
2 parents c9e3142 + 70cac8f commit e5f2521

19 files changed

+4093
-1545
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,6 @@ Thumbs.db
143143

144144
# Temporary files
145145
*~
146+
147+
# VSCode
148+
.vscode/

Gruntfile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ module.exports = function ( grunt ) {
116116
src: [ "src/*.js" ],
117117
options: {
118118
force: true,
119-
jshintrc: ".jshintrc"
119+
jshintrc: ".jshintrc",
120+
reporterOutput : ""
120121
}
121122
},
122123

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![gitgraph.js](/assets/logo/gitgraph-logo.png)
22

3-
[![Build Status](https://secure.travis-ci.org/nicoespeon/gitgraph.js.png)](http://travis-ci.org/nicoespeon/gitgraph.js) [![devDependency Status](https://david-dm.org/nicoespeon/gitgraph.js/dev-status.png)](https://david-dm.org/nicoespeon/gitgraph.js#info=devDependencies)
3+
[![Build Status](https://secure.travis-ci.org/nicoespeon/gitgraph.js.png)](http://travis-ci.org/nicoespeon/gitgraph.js)
44
===========
55

66
A JavaScript library to draw pretty git graphs in the browser.
@@ -12,7 +12,7 @@ Project page: <http://gitgraphjs.com/>
1212
You have different options to start with the library:
1313

1414
- [Download the latest release](https://github.com/nicoespeon/gitgraph.js/releases/latest).
15-
- Clone the repo: `git clone git://github.com/nicoespeon/gitgraph.js.git`.
15+
- Clone the repo: `git clone git@github.com:nicoespeon/gitgraph.js.git`.
1616
- Install with [npm](https://www.npmjs.com): `npm install --save gitgraph.js`.
1717
- Install with [Bower](http://bower.io/): `bower install gitgraph.js`.
1818
- Use [the CDNjs hosted lib](https://cdnjs.com/libraries/gitgraph.js).

bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gitgraph.js",
3-
"version": "1.7.1",
4-
"main": [ "./build/gitgraph.js", "./build/gitgraph.css" ],
3+
"version": "1.8.0",
4+
"main": ["./build/gitgraph.js", "./build/gitgraph.css"],
55
"ignore": [
66
"**/.*"
77
]

0 commit comments

Comments
 (0)