Commit graph

641 commits

Author SHA1 Message Date
Pavel Reznikov a064a2ee6b readme 2016-08-17 09:22:42 -07:00
Pavel Reznikov 3928d05109 v0.2.6 2016-08-17 09:22:12 -07:00
radiolips 0d7c8edc92 Merge pull request #510 from radiolips/bugfix/505
Bugfix/505
2016-08-17 11:53:52 -04:00
Dylan Weiss 4ae4540bba README, dist. 2016-08-17 11:47:38 -04:00
Dylan Weiss 12605cceeb Don't mutate this.opts.draggable or this.opts.resizable when using _.extend. Fixes #505. 2016-08-17 11:45:52 -04:00
Dylan Weiss 8f072be871 Merge branch 'master' into bugfix/505 2016-08-17 11:44:46 -04:00
Dylan Weiss 75e936314b Merge commit '9c0bcd74e70aa1b5c8f97e32ca76cfad1a4a4466' 2016-08-17 11:44:29 -04:00
Dylan Weiss 5c4e44ef23 Merge commit '9c0bcd74e70aa1b5c8f97e32ca76cfad1a4a4466' into bugfix/505 2016-08-17 11:44:17 -04:00
radiolips 9c0bcd74e7 Merge pull request #509 from radiolips/bugfix/422
Bugfix/422
2016-08-17 11:08:35 -04:00
Dylan Weiss 042ba6a887 Merge branch 'master' into bugfix/422
# Conflicts:
#	README.md
#	dist/gridstack.js
#	dist/gridstack.min.js
#	dist/gridstack.min.map
#	src/gridstack.js
2016-08-17 10:55:22 -04:00
Dylan Weiss ceaffa8f54 Merge commit '723cb235b97f782f9c42fbb05d70ed3c3492e442' 2016-08-17 10:54:13 -04:00
radiolips 723cb235b9 Merge pull request #508 from radiolips/prep-for-026-release
Prep for 026 release
2016-08-17 10:49:39 -04:00
Dylan Weiss 137fe18995 Update readme and code for final 0.2.6. 2016-08-17 10:40:02 -04:00
Dylan Weiss ceef60d356 Fix #422, update to 0.2.7-dev. 2016-08-17 10:36:51 -04:00
Dylan Weiss 07ff68010e Merge commit 'fcd23271948583082959ade315653d3476112bd2' 2016-08-17 08:37:55 -04:00
Pavel Reznikov fcd2327194 readme 2016-08-16 22:06:05 -07:00
Pavel Reznikov 703c52dc59 Merge pull request #506 from troolee/fix/460
fix #460: fix cellWidth method
2016-08-16 22:03:26 -07:00
Pavel Reznikov d47ad9cd21 fix cellWidth test 2016-08-16 21:56:52 -07:00
Pavel Reznikov 11b6292d31 fix #460: fix cellWidth method 2016-08-16 21:43:28 -07:00
radiolips b09ae61fe2 Merge pull request #503 from radiolips/bugfix/481
Bugfix/481
2016-08-16 15:44:06 -04:00
d 696b0f7ca8 Fix #481. 2016-08-16 15:36:22 -04:00
d 56801119c2 Merge commit 'a04a2477439c520ad74bcfe3a7bf502b98df3f89' 2016-08-16 15:19:03 -04:00
radiolips a04a247743 Merge pull request #502 from radiolips/bugfix/notify-fix
Bugfix/notify fix - #411
2016-08-16 15:08:37 -04:00
d 34213e6fe9 411 and 141. Same thing, right? Womp. 2016-08-16 15:00:19 -04:00
d dbe642f294 Add fixes to readme. 2016-08-16 14:56:09 -04:00
d 491388379c Include built files. 2016-08-16 14:38:13 -04:00
d 0c424c2637 Always call notify when removing a widget. Only remove the actual element if detachNode is not false. Update tests to reflect these changes. 2016-08-16 14:36:02 -04:00
d c0704f18d4 Merge commit '1079cd4c1c1619d262a7d319925614d423dbed75' 2016-08-16 13:48:36 -04:00
radiolips 1079cd4c1c Merge pull request #501 from nikcub/nikcub-grunt-cli-requirement
Add grunt-cli as dev dependancy
2016-08-15 10:28:48 -04:00
radiolips 5498ce2bae Merge pull request #500 from nikcub/nikcub-droppable-requirement
Add jQuery UI droppable as requirement
2016-08-15 09:11:13 -04:00
Nik Cubrilovic 669c6747f2 Add grunt-cli as dev dependancy 2016-08-15 23:01:37 +10:00
Nik Cubrilovic cb7e0bdeb4 Add jQuery UI Droppable as module requirement - dist files 2016-08-15 22:57:17 +10:00
Nik Cubrilovic 7f1d362a29 Add jQuery UI Droppable as module requirement 2016-08-15 22:57:04 +10:00
Dylan Weiss 62f07b2da1 Merge commit '2de0c4ee00b1b3bd696dac7091a9c9c444337218' 2016-08-13 11:34:48 -04:00
Pavel Reznikov 2de0c4ee00 Merge pull request #497 from redstubble/master
Add https to CDN's with only network-path references.
2016-08-11 22:29:20 -07:00
John Williams 020523855e Add https to CDN's with only network-path references. 2016-08-12 13:21:00 +12:00
radiolips 9cc4396f2e Merge pull request #496 from radiolips/feature/update-jquery-ui-amd
Feature/update jquery ui amd
2016-08-11 16:46:18 -04:00
d d909458602 Add built files. 2016-08-11 16:36:50 -04:00
d 8f69732dda Update jquery-ui AMD requirements. 2016-08-11 16:35:44 -04:00
d d3b77baf8c Merge commit 'f29236a78fa14795745d36efcb79ee20e02e947b' 2016-08-10 12:45:43 -04:00
Pavel Reznikov f29236a78f Merge pull request #493 from troolee/troolee
Troolee
2016-08-09 19:52:37 -07:00
Pavel Reznikov 6579b4c93d dev dep 2016-08-09 19:49:05 -07:00
Pavel Reznikov 8c240d1e83 dev dep 2016-08-09 19:43:50 -07:00
Pavel Reznikov cabb0b886a update travis 2016-08-09 19:30:37 -07:00
Pavel Reznikov 8ea6b706ba update dev dependencies 2016-08-09 19:30:10 -07:00
Pavel Reznikov 47fbdd1ff3 Merge pull request #492 from troolee/develop
0.2.6-dev
2016-08-09 18:59:22 -07:00
Pavel Reznikov 9a9e8ece7e build js 2016-08-09 18:54:46 -07:00
Pavel Reznikov d7a4171b54 fix ident 2016-08-09 18:54:39 -07:00
Pavel Reznikov 4c3abe8e63 fix jquery size() 2016-08-09 18:54:26 -07:00
Pavel Reznikov fb157a3dd2 update requirements 2016-08-09 18:53:51 -07:00