Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ Using gridstack.js with jQuery UI
* Using CDN (minimized):

```html
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/gridstack.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/gridstack.min.css" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/gridstack.all.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/gridstack.all.js"></script>
```

* Using CDN (debug):

```html
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/gridstack.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/gridstack.css" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/gridstack.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/jquery-ui.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/gridstack.jQueryUI.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/gridstack.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/jquery-ui.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/gridstack.jQueryUI.js"></script>
```

* or local:
Expand Down Expand Up @@ -194,7 +194,7 @@ $('.grid-stack').gridstack( {column: N} );

2) include `gridstack-extra.css` if **N < 12** (else custom CSS - see next). Without these, things will not render/work correctly.
```html
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.5/dist/gridstack-extra.css"/>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.6.0/dist/gridstack-extra.css"/>

<div class="grid-stack grid-stack-N">...</div>
```
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "0.5.5-dev",
"version": "0.6.0",
"homepage": "https://github.com/gridstack/gridstack.js",
"authors": [
"Pavel Reznikov <pashka.reznikov@gmail.com>",
Expand Down
9 changes: 7 additions & 2 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Change log
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*

- [v0.5.5-dev (upcoming changes)](#v055-dev-upcoming-changes)
- [v0.6.0-dev (upcoming changes)](#v060-dev-upcoming-changes)
- [v0.6.0 (2019-12-24)](#v060-2019-12-24)
- [v0.5.5 (2019-11-27)](#v055-2019-11-27)
- [v0.5.4 (2019-11-26)](#v054-2019-11-26)
- [v0.5.3 (2019-11-20)](#v053-2019-11-20)
Expand All @@ -25,7 +26,11 @@ Change log

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

## v0.5.5-dev (upcoming changes)
## v0.6.0-dev (upcoming changes)

- TBD

## v0.6.0 (2019-12-24)

- add `float(val)` to set/get the grid float mode, which will relayout [#1088](https://github.com/gridstack/gridstack.js/pull/1088)
- add `compact()` to reclaim any empty space and relayout grid items [#1101](https://github.com/gridstack/gridstack.js/pull/1101)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridstack",
"version": "0.5.5-dev",
"version": "0.6.0",
"description": "gridstack.js is a jQuery plugin for widget layout",
"main": "dist/gridstack.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack-poly.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** gridstack.js 0.5.5-dev - IE and older browsers Polyfills for this library @preserve*/
/** gridstack.js 0.6.0 - IE and older browsers Polyfills for this library @preserve*/
/**
* https://gridstackjs.com/
* (c) 2019 Alain Dumesny
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Type definitions for Gridstack 0.5.5-dev
// Type definitions for Gridstack 0.6.0
// Project: https://gridstackjs.com/
// Definitions by: Pascal Senn <https://github.com/PascalSenn>
// Ricky Blankenaufulland <https://github.com/ZoolWay>
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.jQueryUI.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** gridstack.js 0.5.5-dev - JQuery UI Drag&Drop plugin @preserve */
/** gridstack.js 0.6.0 - JQuery UI Drag&Drop plugin @preserve */
/**
* https://gridstackjs.com/
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
Expand Down
2 changes: 1 addition & 1 deletion src/gridstack.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* gridstack.js 0.5.5-dev
* gridstack.js 0.6.0
* https://gridstackjs.com/
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
* gridstack.js may be freely distributed under the MIT license.
Expand Down