f0o
f535f27638
Fixed path issue
2015-04-08 09:23:33 +00:00
Daniel Preussker
ea4fb9dbe9
Merge pull request #752 from laf/issue-743
...
Shorten interface names on map
2015-04-08 08:01:27 +00:00
Daniel Preussker
be75c1113e
Merge pull request #751 from laf/issue-747
...
Lowerecased table name processors
2015-04-08 07:21:55 +00:00
Ultra2D
6f299a9679
Merge remote-tracking branch 'upstream/master' into issue-714
...
Conflicts:
html/includes/authentication/ldap.inc.php
2015-04-08 08:43:24 +02:00
Paul Gear
9323dbe285
Merge pull request #753 from laf/issue-laf-154
...
Couple of small issues fixed on alerts page
2015-04-08 16:06:11 +10:00
David Morse
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
David Morse
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
David Morse
35ba767c55
Merge remote-tracking branch 'Tropicalista/gridster.js/master'
2015-04-07 22:25:02 -06:00
David Morse
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
David Morse
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
David Morse
6d5e8ed248
Merge remote-tracking branch 'joaoafrmartins/gridster.js/master'
...
* joaoafrmartins/gridster.js/master:
commonjs
support UMD
2015-04-07 22:09:10 -06:00
David Morse
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
David Morse
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
David Morse
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
laf
7aa87224aa
Couple of small issues fixed on alerts page
2015-04-08 03:01:15 +01:00
David Morse
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
laf
bc285af35d
Shorten interface names on map
2015-04-08 02:46:03 +01:00
David Morse
acd80b4039
Merge remote-tracking branch 'Roger-Waters/gridster.js'
...
* Fix spelling mistake
2015-04-07 19:30:34 -06:00
David Morse
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
laf
688ffed961
Lowerecased table name processors
2015-04-08 02:24:01 +01:00
Neil Lathwood
2f5be1bab4
Merge pull request #749 from supertylerc/bug/gh739/iterate-ldap-groups
...
fixes #739
2015-04-08 01:04:22 +01:00
Paul Gear
b4548e116f
Merge pull request #670 from supertylerc/feat/f5-detection
...
add basic f5 support
2015-04-08 08:49:53 +10:00
Tyler Christiansen
1663b743db
remove array_push is inefficient and we dont care about its return value
2015-04-07 14:03:30 -07:00
Tyler Christiansen
d4f472e9cb
stop ldap_compare() from running against ldap_comparison, which would result in an error
2015-04-07 13:58:31 -07:00
David Morse
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
Tyler Christiansen
b41605a13a
clean up code and add more detection
2015-04-07 12:30:02 -07:00
Tyler Christiansen
cb5a62087e
make code more backward-compatible
2015-04-07 12:21:52 -07:00
Tyler Christiansen
2e233e0d5c
add global config, fix get_userlist
2015-04-07 12:10:55 -07:00
Tyler Christiansen
00f77f8bdf
add feature to loop all groups for auth
2015-04-07 11:48:29 -07:00
David Morse
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
Neil Lathwood
aca531bfab
Merge pull request #745 from f0o/issue-742
...
Supress further event-log message if ifAdminStatus or ifOperStatus is down
2015-04-07 15:30:17 +01:00
f0o
16aeee89e4
Supress further event-log message if ifAdminStatus or ifOperStatus is down.
2015-04-07 13:47:15 +00:00
Daniel Preussker
4e2ed5aa27
Merge pull request #744 from SaaldjorMike/ciscosb-5
...
Added missing CPU id for Cisco SB
2015-04-07 12:43:54 +00:00
Mike Rostermund
e5fcdeab9c
Added missing CPU id for Cisco SB
2015-04-07 04:54:55 -07:00
Daniel Preussker
7feb02707c
Merge pull request #738 from laf/cambium
...
Very basic Cambium (canopy) detection for a few PMP models
2015-04-07 10:08:12 +00:00
laf
1a075dc5f3
Updated logo to use http://findicons.com/icon/552644/wireless_signal_icon
2015-04-07 10:51:52 +01:00
Ultra2D
3eaaac4ce4
Add email address for LDAP users.
2015-04-07 09:52:21 +02:00
David Morse
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
David Morse
ec430f816f
Merge branch 'master' of https://github.com/DecksterTeam/gridster.js
2015-04-06 22:33:20 -06:00
laf
b3f368da07
More work for initial Cambium support
2015-04-06 23:05:13 +01:00
laf
8b7f8310f0
Added initial canopy files
2015-04-06 23:05:13 +01:00
floyd_hawkes
d5bf56c39d
chore(grunt): fixing versioning system
2015-04-06 16:19:38 -04:00
floyd_hawkes
f8d3d2d223
Release v0.6.5
2015-04-06 16:17:12 -04:00
floyd_hawkes
bbd9cd4803
Release v0.6.5
2015-04-06 16:09:08 -04:00
floyd_hawkes
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
laf
7a302c2763
Some last minute changes
2015-04-06 20:47:28 +01:00
laf
1d608dbdb6
Callback system done - hopefully
2015-04-06 20:41:50 +01:00
Daniel Preussker
de4a78f830
Merge pull request #737 from f0o/issue-736
...
JS typo
2015-04-06 17:05:09 +00:00
f0o
3abc93eba2
JS typo
2015-04-06 17:04:26 +00:00
Daniel Preussker
5b4ad29ca2
Merge pull request #735 from laf/changelog
...
Updated changelog 05/04/2015
2015-04-06 08:46:51 +00:00