summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2017-01-24 09:23:44 +0200
committerSauli Tähkäpää <sauli@vaadin.com>2017-01-24 09:23:44 +0200
commitb8613b49c5469275e1a177c55414d4fc4e206619 (patch)
tree0f3a8b33816a747e7faabe2323474f3fe51bccea
parent063f9020ad9b5964db5033ae7b56d93633e8762a (diff)
downloadvaadin-core-b8613b49c5469275e1a177c55414d4fc4e206619.tar.gz
vaadin-core-b8613b49c5469275e1a177c55414d4fc4e206619.zip
v1.4.0v1.4.0
-rw-r--r--README.md4
-rw-r--r--bower.json7
-rw-r--r--package.json2
-rw-r--r--vaadin-core-elements.html2
4 files changed, 10 insertions, 5 deletions
diff --git a/README.md b/README.md
index 4bfbf92..39e32b1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Bower version](https://badge.fury.io/bo/vaadin-core-elements.svg)
+![Bower version](https://badge.fury.io/bo/vaadin-core-elements.svg)
[![Published on webcomponents.org](https://img.shields.io/badge/webcomponents.org-published-blue.svg)](https://www.webcomponents.org/collection/vaadin/vaadin-core-elements)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/vaadin/vaadin-core-elements?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
@@ -15,6 +15,8 @@
| [vaadin-icons](https://github.com/vaadin/vaadin-icons) | ![Bower version](https://badge.fury.io/bo/vaadin-icons.svg) | [![npm version](https://badge.fury.io/js/vaadin-icons.svg)](https://www.npmjs.com/package/vaadin-icons) | |
| [vaadin-split-layout](https://github.com/vaadin/vaadin-split-layout) | ![Bower version](https://badge.fury.io/bo/vaadin-split-layout.svg) | [![npm version](https://badge.fury.io/js/vaaadin-split-layout.svg)](https://www.npmjs.com/package/vaadin-split-layout) | [![Build status](https://travis-ci.org/vaadin/vaadin-split-layout.svg?branch=master)](https://travis-ci.org/vaadin/vaadin-split-layout) |
| [vaadin-upload](https://github.com/vaadin/vaadin-upload) | ![Bower version](https://badge.fury.io/bo/vaadin-upload.svg) | [![npm version](https://badge.fury.io/js/vaadin-upload.svg)](https://www.npmjs.com/package/vaadin-upload) | [![Build Status](https://travis-ci.org/vaadin/vaadin-upload.svg?branch=master)](https://travis-ci.org/vaadin/vaadin-upload) |
+| [vaadin-split-layout](https://github.com/vaadin/vaadin-split-layout) | ![Bower version](https://badge.fury.io/bo/vaadin-split-layout.svg) | [![npm version](https://badge.fury.io/js/vaadin-split-layout.svg)](https://www.npmjs.com/package/vaadin-split-layout) | [![Build Status](https://travis-ci.org/vaadin/vaadin-split-layout.svg?branch=master)](https://travis-ci.org/vaadin/vaadin-split-layout) |
+| [vaadin-context-menu](https://github.com/vaadin/vaadin-context-menu) | ![Bower version](https://badge.fury.io/bo/vaadin-context-menu.svg) | [![npm version](https://badge.fury.io/js/vaadin-context-menu.svg)](https://www.npmjs.com/package/vaadin-context-menu) | [![Build Status](https://travis-ci.org/vaadin/vaadin-context-menu.svg?branch=master)](https://travis-ci.org/vaadin/vaadin-context-menu) |
Vaadin Core Elements is a bundle that contains all the free elements, licensed under the Apache License 2.0. In addition, we have commercially licensed elements, such as [Vaadin Charts](https://github.com/vaadin/vaadin-charts).
diff --git a/bower.json b/bower.json
index 95ed08d..e33a2b8 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,5 @@
{
"name": "vaadin-core-elements",
- "version": "1.3.0",
"authors": [
"Vaadin Ltd"
],
@@ -26,10 +25,12 @@
],
"dependencies": {
"vaadin-grid": "vaadin/vaadin-grid#1.2.x",
- "vaadin-combo-box": "vaadin/vaadin-combo-box#1.1.x",
+ "vaadin-combo-box": "vaadin/vaadin-combo-box#1.2.x",
"vaadin-icons": "vaadin/vaadin-icons#1.0.x",
"vaadin-date-picker": "vaadin/vaadin-date-picker#1.2.x",
- "vaadin-upload": "vaadin/vaadin-upload#1.1.x"
+ "vaadin-upload": "vaadin/vaadin-upload#1.1.x",
+ "vaadin-split-layout": "vaadin/vaadin-split-layout#1.0.x",
+ "vaadin-context-menu": "vaadin/vaadin-context-menu#1.0.x"
},
"devDependencies": {
"web-component-tester": "^4.0.3",
diff --git a/package.json b/package.json
index f3dfa3e..b0bd3aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vaadin-core-elements",
- "version": "1.1.0",
+ "version": "1.4.0",
"description": "Vaadin Core Elements is an evolving set of free, open sourced custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.",
"author": "Vaadin Ltd",
"license": "Apache-2.0",
diff --git a/vaadin-core-elements.html b/vaadin-core-elements.html
index a1c5fc1..ea0e874 100644
--- a/vaadin-core-elements.html
+++ b/vaadin-core-elements.html
@@ -3,3 +3,5 @@
<link rel="import" href="../vaadin-combo-box/vaadin-combo-box.html">
<link rel="import" href="../vaadin-upload/vaadin-upload.html">
<link rel="import" href="../vaadin-date-picker/vaadin-date-picker.html">
+<link rel="import" href="../vaadin-split-layout/vaadin-split-layout.html">
+<link rel="import" href="../vaadin-context-menu/vaadin-context-menu.html">