Skip to content

Commit

Permalink
Merge pull request #1665 from adumesny/develop
Browse files Browse the repository at this point in the history
doc & license tweaks
  • Loading branch information
adumesny authored Mar 20, 2021
2 parents 37523cf + 88c572d commit ac9fe7d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
v4 Copyright (c) 2021 Alain Dumesny
v4+ Copyright (c) 2021 Alain Dumesny
under MIT license

previous v3.x and older is:
Copyright (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov
/**
* https://gridstackjs.com/
* (c) 2014-2020 Alain Dumesny, Dylan Weiss, Pavel Reznikov
* gridstack.js may be freely distributed under the MIT license.
*/

The MIT License (MIT)

Expand Down
4 changes: 2 additions & 2 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Change log
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*

- [4.0.0](#400)
- [4.0.0 (2021-3-19)](#400-2021-3-19)
- [3.3.0 (2021-2-2)](#330-2021-2-2)
- [3.2.0 (2021-1-25)](#320-2021-1-25)
- [3.1.5 (2021-1-23)](#315-2021-1-23)
Expand Down Expand Up @@ -48,7 +48,7 @@ Change log
- [v0.1.0 (2014-11-18)](#v010-2014-11-18)

<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## 4.0.0
## 4.0.0 (2021-3-19)

- fix [#149](https://github.com/gridstack/gridstack.js/issues/149) [#1094](https://github.com/gridstack/gridstack.js/issues/1094) [#1605](https://github.com/gridstack/gridstack.js/issues/1605) [#1534](https://github.com/gridstack/gridstack.js/issues/1534) re-write of the **collision code - fixing 6 years old most requested request**
1. you can now swap items of the same size (vertical/horizontal) when grid is full, and is the default in `float:false` (top gravity) as it feels more natural. Could add Alt key for swap vs push behavior later.
Expand Down

0 comments on commit ac9fe7d

Please sign in to comment.