Skip to content

Commit 0ad2d93

Browse files
committed
Merge with devel
2 parents cb79118 + 48c945d commit 0ad2d93

11 files changed

+79
-56
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Next
2+
* fix IE inconsistency in key property for numpad calc keys (reported by @ovk [#362](https://github.com/jcubic/jquery.terminal/issues/362)
3+
* fix completion skipping letters (reported by @ovk [#361](https://github.com/jcubic/jquery.terminal/issues/361))
4+
* fix issue with last character in line beeing closing braket (reported by @arucil [#358](https://github.com/jcubic/jquery.terminal/issues/358))
5+
16
## 1.11.0
27
### Features
38
* update API method accept options 3rd argument

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
__ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
/ / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
\___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
\/ /____/ version 1.11.0
7+
\/ /____/ version DEV
88
```
99
http://terminal.jcubic.pl
1010

11-
[![npm](https://img.shields.io/badge/npm-1.11.0-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
12-
![bower](https://img.shields.io/badge/bower-1.11.0-yellow.svg)
13-
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master)](https://travis-ci.org/jcubic/jquery.terminal)
11+
[![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
12+
![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
13+
[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel)](https://travis-ci.org/jcubic/jquery.terminal)
1414
[![Known Vulnerabilities](https://snyk.io/test/npm/jquery.terminal/badge.svg)](https://snyk.io/test/npm/jquery.terminal)
15-
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=master&a5d5e31e60f437ec7098a886ab4bc6d8)](https://coveralls.io/github/jcubic/jquery.terminal?branch=master)
15+
[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&a5d5e31e60f437ec7098a886ab4bc6d8)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
1616
![downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
1717
[![package quality](http://npm.packagequality.com/shield/jquery.terminal.svg)](http://packagequality.com/#?package=jquery.terminal)
1818

@@ -67,20 +67,20 @@ Include jQuery library, you can use cdn from http://jquery.com/download/
6767
```
6868

6969

70-
Then include js/jquery.terminal-1.11.0.min.js and css/jquery.terminal-1.11.0.min.css
70+
Then include js/jquery.terminal-DEV.min.js and css/jquery.terminal-DEV.min.css
7171

7272
You can grab the files from CDN:
7373

7474
```html
75-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.11.0/js/jquery.terminal.min.js"></script>
76-
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.11.0/css/jquery.terminal.min.css" rel="stylesheet"/>
75+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/js/jquery.terminal.min.js"></script>
76+
<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/DEV/css/jquery.terminal.min.css" rel="stylesheet"/>
7777
```
7878

7979
or
8080

8181
```html
82-
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@1.11.0/js/jquery.terminal.min.js"></script>
83-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@1.11.0/css/jquery.terminal.min.css">
82+
<script src="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/js/jquery.terminal.min.js"></script>
83+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.terminal@DEV/css/jquery.terminal.min.css">
8484
```
8585

8686
If you always want latest version, you can grab the files directly from github using rawgit.com (that service grab the files from github and use propert MIME type so you can use it in your page, you can also grab from devel branch):

css/jquery.terminal-1.11.0.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
* \/ /____/ version 1.11.0
7+
* \/ /____/ version DEV
88
* http://terminal.jcubic.pl
99
*
1010
* This file is part of jQuery Terminal.
1111
*
1212
* Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
1313
* Released under the MIT license
1414
*
15-
* Date: Sun, 17 Dec 2017 14:45:53 +0000
15+
* Date: Sun, 24 Dec 2017 09:53:46 +0000
1616
*/
1717
.terminal .terminal-output .format, .cmd .format,
1818
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{

css/jquery.terminal-1.11.0.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/jquery.terminal.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* __ / // // // // // _ // _// // / / // _ // _// // // \/ // _ \/ /
55
* / / // // // // // ___// / / // / / // ___// / / / / // // /\ // // / /__
66
* \___//____ \\___//____//_/ _\_ / /_//____//_/ /_/ /_//_//_/ /_/ \__\_\___/
7-
* \/ /____/ version 1.11.0
7+
* \/ /____/ version DEV
88
* http://terminal.jcubic.pl
99
*
1010
* This file is part of jQuery Terminal.
1111
*
1212
* Copyright (c) 2011-2017 Jakub Jankiewicz <http://jcubic.pl>
1313
* Released under the MIT license
1414
*
15-
* Date: Sun, 17 Dec 2017 14:45:53 +0000
15+
* Date: Sun, 24 Dec 2017 09:53:46 +0000
1616
*/
1717
.terminal .terminal-output .format, .cmd .format,
1818
.cmd .prompt, .cmd .prompt div, .terminal .terminal-output div div{

0 commit comments

Comments
 (0)