Skip to content

Commit ac9fe7d

Browse files
authored
Merge pull request #1665 from adumesny/develop
doc & license tweaks
2 parents 37523cf + 88c572d commit ac9fe7d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

LICENSE

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
v4 Copyright (c) 2021 Alain Dumesny
1+
v4+ Copyright (c) 2021 Alain Dumesny
22
under MIT license
33

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

711
The MIT License (MIT)
812

doc/CHANGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Change log
55
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
66
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*
77

8-
- [4.0.0](#400)
8+
- [4.0.0 (2021-3-19)](#400-2021-3-19)
99
- [3.3.0 (2021-2-2)](#330-2021-2-2)
1010
- [3.2.0 (2021-1-25)](#320-2021-1-25)
1111
- [3.1.5 (2021-1-23)](#315-2021-1-23)
@@ -48,7 +48,7 @@ Change log
4848
- [v0.1.0 (2014-11-18)](#v010-2014-11-18)
4949

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

5353
- 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**
5454
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.

0 commit comments

Comments
 (0)