Commit Graph
17185 Commits
Author SHA1 Message Date
laf 4873a83508 Added check for device_permitted to each device that is pulled out of the db 2015-04-11 10:17:27 +01:00
laf 0db0dd3cdb Enabled guidv4! 2015-04-10 21:27:40 +01:00
David Morse 385cc757ac bring the Demo's into master for testing & Automate the updates to gh-pages branch 2015-04-10 12:26:54 -06:00
laf 162775f3f4 Updated docs, updated callback to use new guidv4 function and links to stats url 2015-04-10 17:00:32 +01:00
laf 3dd23e3781 Small update 2015-04-09 22:59:52 +01:00
laf c268bc733e Added doc on stats use and privacy 2015-04-09 22:59:17 +01:00
Daniel Preussker 42d60532dc Merge pull request #766 from laf/docs
Updated install docs to have more headings
2015-04-09 21:06:15 +00:00
laf 44fb0c16f9 Updated ifSpeed 2015-04-09 20:32:31 +01:00
Neil Lathwood 7a2a1c284f Merge pull request #767 from laf/issue-746
Fixed spelling mistake
2015-04-09 20:05:03 +01:00
laf 2725bbeb64 Fixed spelling mistake 2015-04-09 20:04:58 +01:00
laf cfed2946a1 Updated install docs to have more headings 2015-04-09 19:18:42 +01:00
David Morse 69f9c81d48 Update Samples 2015-04-09 08:37:29 -06:00
Neil Lathwood 00cb26fd26 Merge pull request #765 from SaaldjorMike/ciscosb-6
Changed polling of OS to more appropriate MIB usage for Cisco SB devices
2015-04-09 15:36:06 +01:00
Mike Rostermund fe41c86fe0 Changed polling of OS to more appropriate MIB usage for Cisco SB devices 2015-04-09 07:14:15 -07:00
Daniel Preussker 9fd87e8021 Merge pull request #763 from laf/docs
Added another FAQ on how to help LibreNMS
2015-04-09 07:45:37 +00:00
laf de45742ca7 Fixed type 2015-04-09 08:04:11 +01:00
David Morse 59b475d0d1 Merge commit '6eb521015cda5212f6fa92492dbe4050bd92e00c'
* commit '6eb521015cda5212f6fa92492dbe4050bd92e00c':
  Update Readme
  Updated sample
  Better handling of widgets slideing down
  update readme
  rebuilt dist
  Added Swap Demo
  Added disabled dragging init feature gridster.js
  Working on Static widgets
2015-04-09 00:25:16 -06:00
David Morse f29ab737ed Merge from dustmoo/gridster.js
* commit '8f431a423302c7c58f511d5ede9270077993f9b3':
  Updated Readme
  Updated Readme
  Version Updates
  Serialize bug fix
  Added max_rows and drag restriction - ready for integration :)
  Removed console.logs
  Removed console.logs
  Good enough swap logic for now
  Swap queue awesomeness
  Swap queue awesomeness
  Fix row issue
  working on map grid functionality
2015-04-08 23:48:53 -06:00
David Morse 0cd0af947b Merge from dustmoo/gridster.js
* commit '262d115cf8b5bdaed40a7e5b6aaa6df6e71b6a07':
  Added swaping queue, better handling of large to small swaps
  Added swaping queue, better handling of large to small swaps
  More predictable default behavior
  Updated Readme
  Added property to prevent larger widget shifting
  Added grid-swap behavior
2015-04-08 23:22:58 -06:00
Daniel Preussker 8c3ff3ee2a Merge pull request #762 from laf/issue-746
Added powercode support
2015-04-09 05:11:19 +00:00
David Morse 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
laf 9def1c0079 some small fixes in the text 2015-04-08 22:44:43 +01:00
laf e44d0d852a Added another FAQ on how to help LibreNMS 2015-04-08 22:40:36 +01:00
laf e8608c0a2a Added logo 2015-04-08 22:14:49 +01:00
laf 95125183ae Added powercode support - no icon for now, using linux 2015-04-08 21:58:40 +01:00
laf 7bc5426f45 Updated css name 2015-04-08 21:40:35 +01:00
laf b79b0b0d8f Updated devices table to use bootgrid 2015-04-08 21:17:48 +01:00
Daniel Preussker 3cd2972c0a Merge pull request #760 from laf/auth-inc
Removed old include line
2015-04-08 17:34:59 +00:00
laf 2150ff1a3f Removed old include line 2015-04-08 18:29:17 +01:00
Walter Dal Mut 9da406ad4b Merge tag '0.3.2' into develop
Fixes file end with newline
2015-04-08 19:25:26 +02:00
Walter Dal Mut 2aec8b47f9 Merge branch 'release/0.3.2' 2015-04-08 19:25:14 +02:00
Walter Dal Mut 4fa3ad0efa Bumped version 0.3.2 2015-04-08 19:25:00 +02:00
Walter Dal Mut 4140300e32 Files should end with a newline character 2015-04-08 19:21:51 +02:00
David Morse 8f6d18ea9a Release v0.6.6 2015-04-08 09:44:39 -06:00
David Morse 853e1fc72e Update Readme 2015-04-08 09:37:06 -06:00
Neil Lathwood 9f7c59f2d9 Merge pull request #758 from f0o/issue-742
Simplify
2015-04-08 16:23:17 +01:00
David Morse 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
f0o 5bb325cf63 Simplify 2015-04-08 15:02:57 +00:00
David Morse 4e2697e3d4 Merge remote-tracking branch 'yfix/gridster.js.git/master'
* yfix/gridster.js.git/master:
2015-04-08 08:36:18 -06:00
David Morse 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
David Morse 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
David Morse 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
David Morse 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
David Morse 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
David Morse 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
laf bd10fd7c7d Updated install docs 2015-04-08 11:12:08 +01:00
laf cb2b782824 Updated sql statements 2015-04-08 11:10:06 +01:00
Neil Lathwood c3c9d6116d Merge pull request #757 from laf/auth-issue
Updated include to include_once
2015-04-08 10:52:51 +01:00
laf 86a3019e89 Updated include to include_once 2015-04-08 10:52:44 +01:00
Neil Lathwood 05e33b897d Merge pull request #756 from f0o/issue-755
Fixed path issue
2015-04-08 10:28:29 +01:00