Commit graph

351 commits

Author SHA1 Message Date
d bb0ce8fab1 Merge commit '47817a3489b063c1e3d92b9b36a7b731dab899a3' 2016-02-19 09:48:37 -05:00
radiolips 47817a3489 Merge pull request #334 from radiolips/bugfix/staticGrid
Bugfix/static grid
2016-02-18 20:20:14 -05:00
d 03ca75717c Merge branch 'master' into bugfix/staticGrid
# Conflicts:
#	dist/gridstack.min.map
2016-02-18 16:52:57 -05:00
d 1364e180e1 Merge commit 'a830cc51d0bdce57c331655caaac6a1ff8ab74c3' 2016-02-18 16:49:44 -05:00
d ca800454f1 #220. Add enableMove and enableResize. Fix staticGrid. 2016-02-18 16:48:16 -05:00
Pavel Reznikov a830cc51d0 build js 2016-02-18 09:51:30 -08:00
Pavel Reznikov 6e0aab4780 Revert "Viewport Size" 2016-02-18 09:49:33 -08:00
Stuardo -StR- Rodríguez b979982cc5 Viewport
- do not parseInt but parseFloat
2016-02-18 11:33:49 -05:00
Stuardo -StR- Rodríguez 71c15ee64c Merge pull request #1 from str/str-viewport-size
Viewport Size
2016-02-18 11:16:42 -05:00
Stuardo -StR- Rodríguez 331eef1f57 Viewport Size
Allow viewport height units. Allow to use float as size.
example:  1.5em;  33vh;
2016-02-18 11:15:58 -05:00
d 9c51fa040f Merge commit 'a4540dc118a1ba14d06513b652e0a566a431e3a5' 2016-02-18 10:23:44 -05:00
Pavel Reznikov a4540dc118 Update README.md 2016-02-17 22:30:54 -08:00
Pavel Reznikov fe865db460 remove knockout.js from requirements 2016-02-17 19:23:49 -08:00
Pavel Reznikov 02f0eba64d add maxWidth/maxHeight 2016-02-17 19:03:21 -08:00
Pavel Reznikov 29857f4131 update doc to be all functions in alphabetical order 2016-02-17 18:50:59 -08:00
Pavel Reznikov 45d39a0b3a Merge branch 'radiolips-style' 2016-02-17 18:48:26 -08:00
Pavel Reznikov 1527485f75 update demo 2016-02-17 18:48:03 -08:00
Pavel Reznikov 31c3eb494e update DOC 2016-02-17 18:41:10 -08:00
Pavel Reznikov f163d40e7f build js 2016-02-17 18:40:57 -08:00
Pavel Reznikov e146e0d943 replace tab with spaces 2016-02-17 18:40:47 -08:00
Pavel Reznikov a654096a39 remove static from serialization demo grid 2016-02-17 18:35:37 -08:00
d f9aafafb8f Merge branch 'master' into style
# Conflicts:
#	src/gridstack.js
2016-02-17 16:10:25 -05:00
d ab08669965 Merge commit '12e3d5f8ec347cfab7c0e0a15ef530a8251cc12a' 2016-02-17 16:08:15 -05:00
d 7bcbeba849 Added previous PR. 2016-02-17 16:07:40 -05:00
d 64de4684e3 Added obsoletion code for deprecated methods and options. Added jscs settings and ensured code passed. Ensured code passed jshint. 2016-02-17 15:46:48 -05:00
Pavel Reznikov 12e3d5f8ec Update README.md 2016-02-16 19:31:42 -08:00
Pavel Reznikov 2bb81a7085 update docs 2016-02-16 15:46:42 -08:00
Pavel Reznikov b968bb3501 last pr credenrials 2016-02-16 15:40:23 -08:00
Pavel Reznikov cc284c735f update docs 2016-02-16 15:38:53 -08:00
Pavel Reznikov 1cce0bd9f6 Merge pull request #325 from jlowcs/height_units
Add handling of em/rem/px units for cell_height and vertical_margin
2016-02-16 15:36:37 -08:00
Dylan Weiss e9bc1bb3ad Merge commit '707ab11f54f702cdce0e4a54d63007ce4620f15e' 2016-02-16 09:53:28 -05:00
Pavel Reznikov 707ab11f54 add install notes 2016-02-15 23:12:06 -08:00
Kevin Dietrich 0be3e4d1df Modified changes in README.md 2016-02-15 22:51:36 +01:00
Kevin Dietrich 1e75be19ed Preserve license comments in dist 2016-02-15 20:37:07 +01:00
Kevin Dietrich f4e8b9e03e Development of 0.2.5 started 2016-02-15 20:31:19 +01:00
Pavel Reznikov 1edda7f24c v0.2.4 2016-02-15 09:31:43 -08:00
Jerome Louis f34e93baac increased readability 2016-02-15 11:32:39 +01:00
Jerome Louis ef9328fdab Add handling of em/rem/px units for cell_height and vertical_margin, as well as no height option/full CSS heights 2016-02-15 10:43:21 +01:00
Kevin Dietrich 01e213a8e5 Changed version to dev 2016-02-14 11:31:38 +01:00
Kevin Dietrich 18ee70a2af Added grunt-doctoc 2016-02-14 10:47:20 +01:00
Kevin Dietrich 5ce3c17039 build js 2016-02-14 10:46:49 +01:00
Kevin Dietrich e85081b9d7 Merge pull request #324 from radiolips/bugfix/listeners
Fixed names of options.
2016-02-14 10:28:32 +01:00
Dylan Weiss 48ad1afd3b Merge branch 'bugfix/listeners' 2016-02-13 20:51:16 -05:00
Dylan Weiss cfb0dfc345 Fixed names of options. 2016-02-13 20:48:49 -05:00
Pavel Reznikov ca594a6ba2 build js 2016-02-13 14:42:09 -08:00
Pavel Reznikov dd4447920f Merge pull request #323 from radiolips/bugfix/listeners
Bugfix/listeners
2016-02-13 14:41:15 -08:00
Dylan Weiss 6433bfb9fc Merge branch 'bugfix/listeners' 2016-02-13 17:26:35 -05:00
Dylan Weiss 8b1f180135 Include resizable, draggable opts in all listeners for resizable, draggable, respectively. Fixes issue particularly when passing handle to draggable - was listening to everything on el rather than this.opts.draggable.handle. 2016-02-13 17:26:02 -05:00
Dylan Weiss 96b84ed45b Merge commit 'acc2acbec1a2839656bd1a04a30ab8b219dc1df5' 2016-02-13 17:12:38 -05:00
Pavel Reznikov acc2acbec1 Update README.md 2016-02-12 16:07:49 -08:00