Mike Sherov
|
c15481eeb1
|
Merge branch 'master' into interactions
Conflicts:
demos/draggable/constrain-movement.html
demos/draggable/cursor-style.html
demos/draggable/default.html
demos/draggable/events.html
demos/draggable/handle.html
demos/draggable/revert.html
demos/draggable/visual-feedback.html
demos/droppable/default.html
grunt.js
tests/unit/draggable/draggable.html
tests/unit/draggable/draggable_core.js
tests/unit/draggable/draggable_options.js
tests/unit/draggable/draggable_test_helpers.js
tests/unit/droppable/droppable.html
tests/unit/droppable/droppable_options.js
ui/draggable.js
ui/jquery.ui.droppable.js
ui/sortable.js
|
2014-02-10 14:43:24 -08:00 |
|
Scott González
|
c07ae398fa
|
Merge branch 'master' into interactions
Conflicts:
demos/draggable/constrain-movement.html
demos/draggable/cursor-style.html
demos/draggable/handle.html
demos/draggable/index.html
demos/draggable/revert.html
demos/draggable/visual-feedback.html
demos/index.html
ui/jquery.ui.draggable.js
ui/jquery.ui.droppable.js
|
2012-11-05 16:49:51 -05:00 |
|
Richard D. Worth
|
1359a53afb
|
Fixed demos to track update of jQuery from 1.7.1 to 1.7.2
|
2012-07-06 15:19:47 -04:00 |
|
Scott González
|
9d7b71bc29
|
Interaction demos: Cleanup.
|
2012-01-27 21:11:22 -05:00 |
|
Richard D. Worth
|
f5c2e29e16
|
Interaction demos: Added box demo
|
2012-01-26 14:04:01 -05:00 |
|
Richard D. Worth
|
2753173f40
|
Interaction demos: Added index and default
|
2012-01-26 11:11:16 -05:00 |
|