Commit graph

509 commits

Author SHA1 Message Date
Pavel Reznikov 8a419fbda7 Merge pull request #380 from troolee/release/0.2.5
v0.2.5
2016-03-02 20:41:35 -08:00
Pavel Reznikov c93ff95c03 v0.2.5 2016-03-02 19:58:52 -08:00
Pavel Reznikov 93bedb4404 Merge pull request #378 from troolee/tests/grid-height
Tests/grid height
2016-03-02 01:15:34 -08:00
Pavel Reznikov 373c1eab14 build dist 2016-03-02 01:09:21 -08:00
Pavel Reznikov 92d7e51d68 fix #373 2016-03-02 01:09:10 -08:00
Pavel Reznikov e4fecff7f7 error with setup height 2016-03-02 01:07:03 -08:00
Pavel Reznikov 208a8baf64 Merge pull request #377 from troolee/tests/end-to-end
move webdriver-manager start to grunt
2016-03-01 23:42:54 -08:00
Pavel Reznikov e2b88ec0d9 move webdriver-manager start to grunt 2016-03-01 23:32:10 -08:00
Pavel Reznikov de83c6230b Merge pull request #376 from troolee/tests/end-to-end
e2e tests
2016-03-01 23:21:59 -08:00
Pavel Reznikov 4862a61af3 protractor e2e test 2016-03-01 23:16:40 -08:00
radiolips 3d19aede54 Merge pull request #375 from radiolips/tests/frontend-1
Tests/frontend 1
2016-03-01 15:21:05 -05:00
d 398dccb7a9 Add default values for verticalMarginUnit and cellHeightUnit, update readme to have verticalMargin info, and several more unit tests. 2016-03-01 15:15:32 -05:00
Pavel Reznikov 1dd2420207 Update README.md 2016-03-01 11:26:28 -08:00
d 3d0c8baefe Merge branch 'master' into tests/frontend-1 2016-03-01 13:07:21 -05:00
d 620d190ba9 Merge commit '7f0d4921a5c39a7673b31071fffd3aa4f8d2035c' 2016-03-01 13:07:00 -05:00
radiolips 7f0d4921a5 Merge pull request #374 from radiolips/tests/frontend-1
Tests/frontend 1
2016-03-01 11:28:37 -05:00
d f29a34aaea Merge branch 'tests/frontend-1' of https://github.com/radiolips/gridstack.js into tests/frontend-1 2016-03-01 11:22:55 -05:00
Pavel Reznikov 0273bb66d8 Update dist. (+14 squashed commits)
Squashed commits:
[50607a9] build dist
[ff0c00b] Allow negative numbers to be passed to parseHeight function test case fix
[3ecc1ca] Allow negative numbers to be passed to parseHeight function test case
[d20f670] Allow negative numbers to be passed to parseHeight function fix
[0816163] Allow negative numbers to be passed to parseHeight function
[aa18c63] rebuild dist
[601b5d5] setGridWidth api documentation udpdate
[c309856] Add a parameter to setGridWidth method to allow not to propagate resizing to widgets.
[ea442d1] drag between grids
[50ce614] jqueryui + requirejs note
[3d8a8e1] drag between grids demo
[446dade] drag from sidebar/between grids
[e31d50e] check if element setup before detach
[67274f8] trash zone is accepting only widgets
2016-03-01 11:22:39 -05:00
d c14473fab1 Update dist. 2016-03-01 11:20:03 -05:00
d 6cd56abe11 Merge branch 'master' into tests/frontend-1 2016-03-01 11:15:26 -05:00
d 2ddd6d5adb Merge commit '50607a9797d98ce856ec8c4ee1e140928a88cf3a' 2016-03-01 11:14:54 -05:00
d 0b944927ab More tests (including all obsolete options), clean up unnecessary code. 2016-03-01 11:14:26 -05:00
Pavel Reznikov 50607a9797 build dist 2016-03-01 00:00:01 -08:00
Pavel Reznikov 156b8e40cb Merge pull request #370 from krema/master
Allow negative numbers to be passed to parseHeight function
2016-02-29 23:59:28 -08:00
André Kremser ff0c00bc34 Allow negative numbers to be passed to parseHeight function test case fix 2016-02-29 23:56:17 -08:00
André Kremser 3ecc1caab9 Allow negative numbers to be passed to parseHeight function test case 2016-02-29 23:53:59 -08:00
Pavel Reznikov aa18c6332e rebuild dist 2016-02-29 23:49:34 -08:00
Pavel Reznikov b3d5be137c Merge pull request #371 from pmoradei/setgridsize_propagate
Add a parameter to setGridWidth method to allow not to propagate resi…
2016-02-29 23:49:11 -08:00
pmoradei 601b5d54a3 setGridWidth api documentation udpdate 2016-03-01 08:42:22 +01:00
Pavel Reznikov 65d5110349 Merge pull request #372 from troolee/features/add-from-sidebar
Features/add from sidebar
2016-02-29 23:24:00 -08:00
Pavel Reznikov ea442d1936 drag between grids 2016-02-29 23:10:23 -08:00
Pavel Reznikov d010ddd93e Merge branch 'master' into features/add-from-sidebar 2016-02-29 22:06:53 -08:00
Pavel Reznikov 50ce614128 jqueryui + requirejs note 2016-02-29 22:05:28 -08:00
pmoradei c309856f8d Add a parameter to setGridWidth method to allow not to propagate resizing to widgets. 2016-02-29 19:52:46 +01:00
Pavel Reznikov 3d8a8e1e42 drag between grids demo 2016-02-28 22:08:33 -08:00
Pavel Reznikov 446dade5d0 drag from sidebar/between grids 2016-02-28 22:08:05 -08:00
André Kremser d20f6703c6 Allow negative numbers to be passed to parseHeight function fix 2016-02-28 15:55:45 -08:00
André Kremser 0816163693 Allow negative numbers to be passed to parseHeight function 2016-02-28 11:26:17 -08:00
Pavel Reznikov e31d50eedc check if element setup before detach 2016-02-27 18:47:24 -08:00
Pavel Reznikov 67274f873c trash zone is accepting only widgets 2016-02-27 18:46:41 -08:00
radiolips ba1ee253bb Merge pull request #364 from radiolips/tests/frontend-1
Fix _is_one_column_mode -> _isOneColumnMode and add in obsolete unit …
2016-02-25 16:52:19 -05:00
d eedf6d5716 Fix _is_one_column_mode -> _isOneColumnMode and add in obsolete unit checks for all gs, non-GSEngine code. 2016-02-25 16:48:57 -05:00
radiolips 6aae19b80d Merge pull request #363 from radiolips/tests/frontend-1
Tests/frontend 1
2016-02-25 15:55:53 -05:00
d 51d7a20116 Comments left in. Whoops. 2016-02-25 15:49:41 -05:00
d b9c916554e Added parseInt(x, 10) to cellWidth and added some unit tests. 2016-02-25 15:48:25 -05:00
d 4af1f27447 Merge commit 'f96dae55f32612344896a3b52318fa451bd69b83' 2016-02-24 13:29:13 -05:00
radiolips f96dae55f3 Merge pull request #361 from radiolips/bugfix/detach-grid-2
Bugfix/detach grid 2
2016-02-24 13:23:39 -05:00
d d521ef5330 Bit safer. 2016-02-24 13:22:36 -05:00
d 19f41a72a8 Fix one bug and another pops up. This fixes issue where passing detachNode=false to removeWidget would still cause it to be removed from the DOM. 2016-02-24 13:20:04 -05:00
d 1c040b7e0b Merge commit 'bc6222771710a1820e304ff9635664df448d939b' 2016-02-24 12:45:38 -05:00