08628126f5
Fix my merge error from the merge from remote-tracking branch 'cpascu/gridster.js/faux-rows-patch'
2015-04-08 22:40:49 -06:00
8f6d18ea9a
Release v0.6.6
2015-04-08 09:44:39 -06:00
853e1fc72e
Update Readme
2015-04-08 09:37:06 -06:00
a908eaecae
Merge remote-tracking branch 'Laboratory/gridster.js.git/master'
...
* Laboratory/gridster.js.git/master:
delete jquery dependency
2015-04-08 09:04:08 -06:00
4e2697e3d4
Merge remote-tracking branch 'yfix/gridster.js.git/master'
...
* yfix/gridster.js.git/master:
2015-04-08 08:36:18 -06:00
c220ecf311
Merge remote-tracking branch 'rebugger/gridster.js.git/resize-widget-dimensions'
...
* rebugger/gridster.js.git/resize-widget-dimensions:
fix min-width and min-height after resize
add resize_widget_dimension() resize widgets after initialization
fix min-width and min-height after resize
add resize_widget_dimension() resize widgets after initialization
2015-04-08 08:22:51 -06:00
e77e8d7e61
Merge remote-tracking branch 'andreas-trad/gridster.js.git/patch-1'
...
* andreas-trad/gridster.js.git/patch-1:
Prevent multi <style> generation
2015-04-08 08:13:58 -06:00
b87c0113c3
Merge remote-tracking branch 'kwak27/gridster.js/fix_add_widget'
...
* kwak27/gridster.js/fix_add_widget:
fix add_widget to use correct size_y when adding rows
2015-04-08 08:04:03 -06:00
2acdff1056
Merge remote-tracking branch 'AdrianTeh/gridster.js.git/master'
...
* AdrianTeh/gridster.js.git/master:
fixes-add-widget-overlapping-issue-#340
2015-04-08 07:19:26 -06:00
524ed2bb99
Merge remote-tracking branch 'dasmall/gridster.js.git/master'
...
* dasmall/gridster.js.git/master:
Removing previously added style tags before adding new one. Hopefully fixes #211 and #294 .
2015-04-08 07:14:45 -06:00
7ee8824250
Merge remote-tracking branch 'cpascu/gridster.js/faux-rows-patch'
...
* cpascu/gridster.js/faux-rows-patch:
Fixed typeof comparison to match against string.
Fixed issue where existing widget position would be overwritten on gridmap when adding a faux cell to accommodate another widget.
2015-04-08 07:06:12 -06:00
56e9f62912
Merge remote-tracking branch 'AWhetter/gridster.js/fix_doc_typo'
...
* AWhetter/gridster.js/fix_doc_typo:
Fixed a typo in Gridster class documentation
2015-04-07 22:40:45 -06:00
0d9d5c2833
Merge remote-tracking branch 'dragonier/gridster.js/master'
...
* dragonier/gridster.js/master:
add_resize_handle: multiple span (resizeable) entries in widgets
2015-04-07 22:30:38 -06:00
35ba767c55
Merge remote-tracking branch 'Tropicalista/gridster.js/master'
2015-04-07 22:25:02 -06:00
0b08e1fb81
Merge remote-tracking branch 'aegisrunestone/gridster.js/master'
...
* aegisrunestone/gridster.js/master:
Changed "instanceof jQuery" to "instanceof $"
2015-04-07 22:22:18 -06:00
85bc2f47ec
Merge remote-tracking branch 'rept/gridster.js/addition_problem_add_faux_rows'
...
* rept/gridster.js/addition_problem_add_faux_rows:
Also added parseInt to the add_faux_cols method
Also added parseInt to the add_faux_cols method
Wrong addition solved in add_faux_rows by adding parseInt
2015-04-07 22:19:48 -06:00
6d5e8ed248
Merge remote-tracking branch 'joaoafrmartins/gridster.js/master'
...
* joaoafrmartins/gridster.js/master:
commonjs
support UMD
2015-04-07 22:09:10 -06:00
3810daef1b
Merge remote-tracking branch 'Toosick/gridster.js/patch-1'
...
* Toosick/gridster.js/patch-1:
Update jquery.gridster.js
Fix gridster destroy
2015-04-07 21:51:55 -06:00
84598f6862
Merge remote-tracking branch 'mooglemoogle/gridster.js/master'
...
* mooglemoogle/gridster.js/master:
Added destroy of widget coords and resize api
Added ability to specify scroll container for drag/resize
2015-04-07 21:36:00 -06:00
e7509f0220
Merge remote-tracking branch 'bfarka/gridster.js/fix-trailing-comma'
...
* bfarka/gridster.js/fix-trailing-comma:
fix issue #469
2015-04-07 20:03:36 -06:00
72007139cb
Merge remote-tracking branch 'sogawa/gridster.js/strict-sort'
...
* sogawa/gridster.js/strict-sort:
Convert to integer type of property value when sorting.
add element "#qunit-testresult"
rename test files.
2015-04-07 19:56:44 -06:00
acd80b4039
Merge remote-tracking branch 'Roger-Waters/gridster.js'
...
* Fix spelling mistake
2015-04-07 19:30:34 -06:00
5b1dfbec94
Merge remote-tracking branch 'ducksboard/bug-493-jquery-no-global-fail'
...
* ducksboard/bug-493-jquery-no-global-fail:
Fix for bug #493 including unit tests to prove.
2015-04-07 19:24:36 -06:00
cec85c59a7
Merge remote-tracking branch 'eric/master'
...
Grunt changes
Add an optional final parameter to add_widget.
Bumping to v0.5.7
Grunt
Fix Widget Right Edge Collission Detection
re-name model_id parameter
add model_id parameter to add_widget method in order to create a relationship between widget and backbone model
Fix the memory leak that was incorrectly iterating rows and columns
Cache $(window) and $(this) selectors for performance
fix (Gridster.js): destroy resize_api
2015-04-07 13:50:05 -06:00
37d8e0ec25
Merge from abril/gridster.js
...
* merging:
add function move_widget in dist/jquery.gridster.js
Include move_widget function (Move a widget to a specific row and column.).
Change jQuery reference for $.
2015-04-07 11:55:30 -06:00
4783e6e726
fix a NAN error that could occur if using center_widget if the grid was in responsive mode.
...
Error check the shift cols, to ensure they can't move left past col 1
make a change from 100% to 100VW for better browser support of min-width
2015-04-06 22:49:51 -06:00
ec430f816f
Merge branch 'master' of https://github.com/DecksterTeam/gridster.js
2015-04-06 22:33:20 -06:00
d5bf56c39d
chore(grunt): fixing versioning system
2015-04-06 16:19:38 -04:00
f8d3d2d223
Release v0.6.5
2015-04-06 16:17:12 -04:00
bbd9cd4803
Release v0.6.5
2015-04-06 16:09:08 -04:00
86053f8be3
fix(gridster): fixed bugs in centering_widgets (widgets were getting smushed when being resized) and fixed bug with min_width
2015-04-06 16:05:40 -04:00
3ec0c6fa6e
Move the check for responsive width above the calculations of width. This will prevent the calculated values changing the width for browsers which don't respect min-width
2015-04-04 22:38:23 -06:00
aa8f4bf3d0
Move the check for responsive width above the calculations of width. This will prevent the calculated values changing the width for browsers which don't respect min-width
2015-04-04 22:11:16 -06:00
16a7a65953
#3 Adds ability to automatically center widgets in the grid.
2015-03-19 10:56:54 -04:00
e40a393aec
Release v0.6.4
2015-03-19 10:46:18 -04:00
8a5a723a2d
#3 Adds ability to automatically center widgets in the grid.
2015-03-19 10:43:15 -04:00
c261a4ebef
add function move_widget in dist/jquery.gridster.js
2015-03-17 17:35:26 -03:00
02a1580422
Include move_widget function (Move a widget to a specific row and column.).
2015-03-17 17:02:00 -03:00
ec253acf83
Change jQuery reference for $.
2015-03-16 17:22:29 -03:00
ee7b5be322
Merge in fade changes
2015-03-06 14:15:21 -08:00
7db7addfde
Grunt changes
2015-03-06 14:15:07 -08:00
41a183b22d
Add an optional final parameter to add_widget.
2015-03-06 12:22:29 -08:00
fc75ce5d46
Release v0.6.3
2015-03-06 14:41:24 -05:00
6bb47dc1ce
fix(gridster): fixing resize limits when in fixed width mode
...
feature(gridster): added fix_to_content function to fit widget dimensions to a given width and height
feature(gridster): added resize_widget_dimensions function
refactor(gridster): moved code to set number of columns in grid to helper function
2015-03-06 14:36:05 -05:00
14e08d9fe0
refactor(gridster): adding callback to add_widget function
2015-03-04 10:18:48 -05:00
c0a2bde09c
Fix for bug #493 including unit tests to prove.
...
Run npm install and visit test/jquery.gridster-amd.html in browser.
2015-03-03 00:46:11 +00:00
76544370d5
fix(gridster): adding bower.json file
2015-02-25 09:51:56 -05:00
5f86f9852d
Merge branch 'master' of github.com:DecksterTeam/gridster.js
2015-02-25 09:48:46 -05:00
fa296634eb
fix(gridster): adding bower.json file
2015-02-25 09:47:43 -05:00
04e2cf7c99
Merge pull request #2 from DecksterTeam/resize-overlap
...
fix(gridster): fixes bug where widgets would overlay other widgets after...
2015-02-23 21:31:32 -05:00
